[yum-git] 4 commits - callback.py cli.py i18n.py Makefile po/Makefile po/POTFILES.in po/ru.po po/yum.pot utils.py yumcommands.py yum/i18n.py yum/__init__.py yum.spec

[Tim Lauridsen]

 Makefile        |    2 
 callback.py     |    2 
 cli.py          |    2 
 i18n.py         |   32 
 po/Makefile     |   72 +
 po/POTFILES.in  |   43 +
 po/ru.po        | 2043 ++++++++++++++++++++++++++++++--------------------------
 po/yum.pot      | 1086 ++++++++++-------------------
 utils.py        |    2 
 yum.spec        |   10 
 yum/__init__.py |  233 +++---
 yum/i18n.py     |   32 
 yumcommands.py  |    2 
 13 files changed, 1767 insertions(+), 1794 deletions(-)

New commits:
commit cece14735e64ff55bd76cde5f4d5833d4fb67a5f
Author: Tim Lauridsen <tim at naboo.local>
Date:   Sat Jan 26 16:17:40 2008 +0100

    changelog entry and %find_lang %name to spec file

diff --git a/yum.spec b/yum.spec
index f8f9bc5..46c8148 100644
--- a/yum.spec
+++ b/yum.spec
@@ -53,6 +53,8 @@ make DESTDIR=$RPM_BUILD_ROOT install
 # install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/yum/yum.conf
 # install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.daily/yum.cron
 
+%find_lang %name
+
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
@@ -94,6 +96,10 @@ exit 0
 %{_mandir}/man*/yum-updatesd*
 
 %changelog
+* Sat Jan 26 2008 Tim Lauridsen <timlau at fedoraproject.org>
+- Added BuildRequires: intltool
+- Added -f %%{name}.lang to %%files
+- Added %%find_lang %%name to %%install
 * Thu Jan 24 2008 Seth Vidal <skvidal at fedoraproject.org>
 - 3.2.10
 
commit 4faed4c3690bcc35a517b42f162253c4d967c629
Author: Tim Lauridsen <tim at naboo.local>
Date:   Sat Jan 26 16:08:55 2008 +0100

    added  -f %{name}.lang to %files section

diff --git a/yum.spec b/yum.spec
index 1dd05e3..f8f9bc5 100644
--- a/yum.spec
+++ b/yum.spec
@@ -69,7 +69,7 @@ if [ $1 = 0 ]; then
 fi
 exit 0
 
-%files
+%files -f %{name}.lang
 %defattr(-, root, root)
 %doc README AUTHORS COPYING TODO INSTALL ChangeLog PLUGINS
 %config(noreplace) %{_sysconfdir}/yum/yum.conf
commit 9ff8c18774f64dfbdbc9aa24489bb8d2d85e1e78
Author: Tim Lauridsen <tim at naboo.local>
Date:   Sat Jan 26 16:05:18 2008 +0100

    added BuildRequires: intltool to support po/mo/pot file generation

diff --git a/yum.spec b/yum.spec
index 37b0797..1dd05e3 100644
--- a/yum.spec
+++ b/yum.spec
@@ -10,6 +10,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}root
 BuildArchitectures: noarch
 BuildRequires: python
 BuildRequires: gettext
+BuildRequires: intltool
+
 Requires: python >= 2.4
 Requires: rpm-python, rpm >= 0:4.4.2
 Requires: python-sqlite
commit 26eacab4d1817e9fb1f4c3da0a82e77169ff7113
Author: Tim Lauridsen <tim at naboo.local>
Date:   Sat Jan 26 16:02:50 2008 +0100

    * moved i18n.py to yum/i18n.py
    * created po/Makefile to handle generation/updating/installing of translation files
    * make main Makefile call po/Makefile
    * added _() translation wrappers to strings in yum/__init__.py

diff --git a/Makefile b/Makefile
index 255a2a4..e64b748 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-SUBDIRS = rpmUtils yum etc docs
+SUBDIRS = rpmUtils yum etc docs po
 PYFILES = $(wildcard *.py)
 
 PKGNAME = yum
diff --git a/callback.py b/callback.py
index 3c25ca8..e37e6ee 100644
--- a/callback.py
+++ b/callback.py
@@ -24,7 +24,7 @@ import sys
 import logging
 from yum.constants import *
 
-from i18n import _
+from yum.i18n import _
 
 class RPMInstallCallback:
 
diff --git a/cli.py b/cli.py
index ea512bf..41ae338 100644
--- a/cli.py
+++ b/cli.py
@@ -39,7 +39,7 @@ import rpmUtils.arch
 from rpmUtils.arch import isMultiLibArch
 import rpmUtils.miscutils
 from yum.packages import parsePackages, YumLocalPackage
-from i18n import _
+from yum.i18n import _
 from yum.rpmtrans import RPMTransaction
 import signal
 import yumcommands
diff --git a/i18n.py b/i18n.py
deleted file mode 100644
index 14e16dd..0000000
--- a/i18n.py
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env python
-"""i18n abstraction
-
-License: GPL
-Author: Vladimir Bormotov <bor at vb.dn.ua>
-
-$Id$
-"""
-# $RCSfile$
-__version__ = "$Revision$"[11:-2]
-__date__ = "$Date$"[7:-2]
-
-try: 
-    import gettext
-    import sys
-    if sys.version_info[0] == 2:
-        t = gettext.translation('yum')
-        _ = t.gettext
-    else:
-        gettext.bindtextdomain('yum', '/usr/share/locale')
-        gettext.textdomain('yum')
-        _ = gettext.gettext
-
-except:
-    def _(str):
-        """pass given string as-is"""
-        return str
-
-if __name__ == '__main__':
-    pass
-
-# vim: set ts=4 et :
diff --git a/po/Makefile b/po/Makefile
new file mode 100644
index 0000000..31257c4
--- /dev/null
+++ b/po/Makefile
@@ -0,0 +1,72 @@
+INSTALL= /usr/bin/install -c
+INSTALL_PROGRAM= ${INSTALL}
+INSTALL_DATA= ${INSTALL} -m 644
+INSTALLNLSDIR=$(DESTDIR)/usr/share/locale
+top_srcdir = "."
+
+
+MSGMERGE = intltool-update -x --gettext-package=$(NLSPACKAGE) --dist
+
+NLSPACKAGE = yum
+
+CATALOGS = $(shell ls *.po)
+FMTCATALOGS = $(patsubst %.po,%.mo,$(CATALOGS))
+
+PYFILES  = $(wildcard ../*.py) $(wildcard ../yum/*.py) $(wildcard ../rpmUtils/*.py)
+POTFILES  = $(PYFILES)
+
+all: $(NLSPACKAGE).pot $(FMTCATALOGS)
+
+POTFILES.in:
+	echo '[encoding: UTF-8]' > $@
+	for file in $(POTFILES); do \
+		echo "$${file#../}" ; \
+	done >> $@
+
+$(NLSPACKAGE).pot: $(POTFILES) POTFILES.in
+	intltool-update --gettext-package=$(NLSPACKAGE) --pot
+
+update-po: Makefile $(NLSPACKAGE).pot refresh-po
+
+refresh-po: Makefile POTFILES.in
+	catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+		lang=`basename $$cat .po`; \
+		cp $$lang.po $$lang.old.po; \
+		if $(MSGMERGE) $$lang ; then \
+			rm -f $$lang.old.po ; \
+			echo "$(MSGMERGE) of $$lang succeeded" ; \
+		else \
+			echo "$(MSGMERGE) of $$lang failed" ; \
+			mv $$lang.old.po $$lang.po ; \
+		fi \
+	done
+
+report:
+	@for cat in *.po ; do \
+		echo -n "$$cat: "; \
+		msgfmt --statistics -o /dev/null $$cat; \
+	done    
+
+clean:
+	@rm -fv *mo *~ .depend *.autosave
+   
+distclean: clean
+	rm -f *mo .depend Makefile $(NLSPACKAGE).pot POTFILES.in
+
+depend:
+
+install:	all
+	mkdir -p $(PREFIX)/$(INSTALLNLSDIR)
+	for n in $(CATALOGS); do \
+	    l=`basename $$n .po`; \
+	    mo=$$l.mo; \
+	    if [ ! -f $$mo ]; then continue; fi; \
+	    $(INSTALL) -m 755 -d $(PREFIX)/$(INSTALLNLSDIR)/$$l; \
+	    $(INSTALL) -m 755 -d $(PREFIX)/$(INSTALLNLSDIR)/$$l/LC_MESSAGES; \
+	    $(INSTALL) -m 644 $$mo \
+		$(PREFIX)/$(INSTALLNLSDIR)/$$l/LC_MESSAGES/$(NLSPACKAGE).mo; \
+	done
+
+%.mo: %.po
+	msgfmt -o $@ $<
diff --git a/po/POTFILES.in b/po/POTFILES.in
new file mode 100644
index 0000000..55e1a3e
--- /dev/null
+++ b/po/POTFILES.in
@@ -0,0 +1,43 @@
+[encoding: UTF-8]
+callback.py
+cli.py
+output.py
+progress_meter.py
+shell.py
+translate.py
+utils.py
+yumcommands.py
+yummain.py
+yum-updatesd.py
+yum/callbacks.py
+yum/comps.py
+yum/config.py
+yum/constants.py
+yum/depsolve.py
+yum/Errors.py
+yum/failover.py
+yum/i18n.py
+yum/__init__.py
+yum/logginglevels.py
+yum/mdparser.py
+yum/misc.py
+yum/packageSack.py
+yum/packages.py
+yum/parser.py
+yum/pgpmsg.py
+yum/plugins.py
+yum/repoMDObject.py
+yum/repos.py
+yum/rpmsack.py
+yum/rpmtrans.py
+yum/sqlitesack.py
+yum/sqlutils.py
+yum/transactioninfo.py
+yum/update_md.py
+yum/yumRepo.py
+rpmUtils/arch.py
+rpmUtils/__init__.py
+rpmUtils/miscutils.py
+rpmUtils/oldUtils.py
+rpmUtils/transaction.py
+rpmUtils/updates.py
diff --git a/po/ru.po b/po/ru.po
index 3a0ac5d..52a3693 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,9 +3,12 @@
 # Grigory Bakunov <black at asplinux.ru>, 2002,2003.
 # Vladimir Bormotov <bor at insight.donbass.com>, 2002.
 #
+#: ../translate.py:221
 msgid ""
 msgstr ""
 "Project-Id-Version: yum\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-01-26 15:54+0100\n"
 "PO-Revision-Date: 2003-10-14 15:36+0400\n"
 "Last-Translator: Grigory Bakunov <black at asplinux.ru>\n"
 "Language-Team: Russian <ru at li.org>\n"
@@ -14,1074 +17,1242 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.1\n"
 
-#: ../yummain.py:283
-#, c-format
-msgid "Dependencies resolved"
-msgstr "Зависимости разрешены"
-
-#: ../pullheaders.py:86
-#, c-format
-msgid "Directory of rpms must exist"
-msgstr "Должен существовать каталог с пакетами"
-
-#: ../config.py:52
-#, c-format
-msgid "Error accessing URL: %s"
-msgstr "Ошибка при доступе к URL: %s"
-
-#: ../urlgrabber.py:313 ../urlgrabber.py:346
-#, c-format
-msgid "OSError: %s"
-msgstr "ВВОшибка: %s"
-
-#: ../clientStuff.py:939
-#, c-format
-msgid "No Packages installed not included in a repository"
-msgstr "Установленных пакетов, не существуюющих в репозитории не обнаружено"
-
-#: ../pullheaders.py:293
-#, c-format
+#: ../callback.py:130
+msgid "No header - huh?"
+msgstr "Нет заголовка - блин?"
+
+#: ../callback.py:212
+#, fuzzy, python-format
+msgid "Erased: %s"
+msgstr "Удалено: "
+
+#: ../cli.py:181 ../utils.py:57
+#, fuzzy, python-format
+msgid "Config Error: %s"
+msgstr "Ошибка опции: %s"
+
+#: ../cli.py:184 ../cli.py:1061 ../utils.py:60
+#, python-format
+msgid "Options Error: %s"
+msgstr "Ошибка опции: %s"
+
+#: ../cli.py:227
+#, fuzzy
+msgid "You need to give some command"
+msgstr "Hеобходимы привилегии суперпользователя для выполнения этой команды"
+
+#: ../cli.py:482
+#, fuzzy
+msgid "Parsing package install arguments"
+msgstr "Ошибка при разборе параметров командной строки: %s"
+
+#: ../cli.py:597 ../yum/__init__.py:2213
+#, python-format
+msgid "%s"
+msgstr ""
+
+#: ../cli.py:601 ../yum/__init__.py:1976 ../yum/__init__.py:2216
+#, python-format
+msgid "No Match for argument: %s"
+msgstr ""
+
+#: ../cli.py:740
+#, fuzzy, python-format
+msgid "No Package Found for %s"
+msgstr "Пакет %s не найден"
+
+#: ../cli.py:834 ../cli.py:840
+#, fuzzy, python-format
+msgid "Warning: Group %s does not exist."
+msgstr "Группа %s не существует"
+
+#: ../output.py:267
+#, python-format
+msgid "Name   : %s"
+msgstr "Имя    : %s"
+
+#: ../output.py:268
+#, python-format
+msgid "Arch   : %s"
+msgstr "Арх.   : %s"
+
+#: ../output.py:270
+#, fuzzy, python-format
+msgid "Epoch  : %s"
+msgstr "Репозиторий: %s"
+
+#: ../output.py:271
+#, python-format
+msgid "Version: %s"
+msgstr "Версия : %s"
+
+#: ../output.py:272
+#, python-format
+msgid "Release: %s"
+msgstr "Релиз  : %s"
+
+#: ../output.py:273
+#, python-format
+msgid "Size   : %s"
+msgstr "Размер: %s"
+
+#: ../output.py:274
+#, python-format
+msgid "Repo   : %s"
+msgstr "Репозиторий: %s"
+
+#: ../output.py:275
+#, python-format
+msgid "Summary: %s"
+msgstr "Описание: %s"
+
+#: ../output.py:276
+#, fuzzy, python-format
 msgid ""
-"\n"
-"   Total: %d\n"
-"   Used: %d\n"
-"   Src: %d"
+"Description:\n"
+"%s"
 msgstr ""
+"Описание:\n"
+" %s"
+
+#: ../yumcommands.py:35
+#, fuzzy
+msgid "You need to be root to perform this command."
+msgstr "Hеобходимы привилегии суперпользователя для выполнения этой команды"
+
+#: ../yumcommands.py:42
+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"
-"   Всего: %d\n"
-"   Использовано: %d\n"
-"   SRC: %d"
+"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 ""
 
-#: ../serverStuff.py:82
-#, c-format
-msgid "ignoring srpm: %s"
-msgstr "игнорируется src пакет: %s"
+#: ../yumcommands.py:62
+#, fuzzy, python-format
+msgid "Error: Need to pass a list of pkgs to %s"
+msgstr "Необходимо указать список пакетов для установки"
+
+#: ../yumcommands.py:68
+#, fuzzy
+msgid "Error: Need an item to match"
+msgstr "Необходим параметр для поиска"
 
-#: ../lilocfg.py:49
-#, c-format
-msgid "Error restoring the backup of lilo.conf  The backup was:\n"
+#: ../yumcommands.py:74
+#, fuzzy
+msgid "Error: Need a group or list of groups"
+msgstr "Необходимо указать список пакетов для установки"
+
+#: ../yumcommands.py:83
+#, fuzzy, python-format
+msgid "Error: clean requires an option: %s"
+msgstr "Ошибка создания каталога %s: %s"
+
+#: ../yumcommands.py:88
+#, fuzzy, python-format
+msgid "Error: invalid clean argument: %r"
+msgstr "Ошибка при разборе параметров командной строки: %s"
+
+#: ../yumcommands.py:108
+#, python-format
+msgid "File %s given as argument to shell does not exist."
 msgstr ""
-"Ошибка восстановления резервной копии lilo.conf. Резервная копия была:\n"
 
-#: ../clientStuff.py:862 ../clientStuff.py:874
-#, c-format
-msgid "Looking in available packages for a providing package"
-msgstr "Просмотр доступных пакетов предоставляющих пакет"
+#: ../yumcommands.py:114
+msgid "Error: more than one file given as argument to shell."
+msgstr ""
 
-#: ../yummain.py:324
-#, c-format
-msgid "Errors installing:"
-msgstr "Ошибки установки:"
+#: ../yum/__init__.py:114
+msgid "doConfigSetup() will go away in a future version of Yum.\n"
+msgstr ""
 
-#: ../clientStuff.py:503
-#, c-format
-msgid "I will install/upgrade these to satisfy the dependencies:"
-msgstr "Необходимо обновить/установить это для разрешения зависимостей:"
+#: ../yum/__init__.py:270
+#, python-format
+msgid "Repository %r is missing name in configuration, using id"
+msgstr ""
 
-#: ../pullheaders.py:232
-#, c-format
-msgid "Cannot delete %s - check perms"
-msgstr "Невозможно удалить %s - проверьте права доступа"
+#: ../yum/__init__.py:306
+msgid "plugins already initialised"
+msgstr ""
 
-#: ../clientStuff.py:901
-#, c-format
-msgid "Need to pass a list of pkgs to erase"
-msgstr "Необходимо указать список пакетов для установки"
+#: ../yum/__init__.py:313
+msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
+msgstr ""
 
-#: ../clientStuff.py:859
-#, c-format
-msgid "Need a provides to match"
-msgstr "Необходим еще один параметр"
+#: ../yum/__init__.py:322
+msgid "Reading Local RPMDB"
+msgstr ""
 
-#: ../lilocfg.py:67
-#, c-format
-msgid ""
-"lilo options that are not supported by yum are used in the default lilo."
-"conf. This file will not be modified. The options include:\n"
+#: ../yum/__init__.py:340
+msgid "doRepoSetup() will go away in a future version of Yum.\n"
 msgstr ""
-"параметры lilo не поддерживаются yum. Будет использованы параметры из lilo."
-"conf. Файл lilo.conf останется неизмеренным.  Параметры включают:\n"
 
-#: ../clientStuff.py:525 ../clientStuff.py:564
-#, c-format
-msgid "Installed: "
-msgstr "Установлено: "
+#: ../yum/__init__.py:358
+msgid "doSackSetup() will go away in a future version of Yum.\n"
+msgstr ""
 
-#: ../clientStuff.py:735 ../clientStuff.py:771 ../clientStuff.py:824
-#: ../clientStuff.py:1037
-#, c-format
-msgid "Error getting file %s"
-msgstr "Ошибка получения файла: %s"
+#: ../yum/__init__.py:375
+#, fuzzy
+msgid "Setting up Package Sacks"
+msgstr "Удаление пакетов"
 
-#: ../yummain.py:55 ../yummain.py:112
-#, c-format
-msgid "Options Error: %s"
-msgstr "Ошибка опции: %s"
+#: ../yum/__init__.py:417
+#, python-format
+msgid "repo object for repo %s lacks a _resetSack method\n"
+msgstr ""
 
-#: ../pullheaders.py:200
-#, c-format
-msgid "%s is not writable"
-msgstr "Файл %s не доступен для записи"
+#: ../yum/__init__.py:418
+msgid "therefore this repo cannot be reset.\n"
+msgstr ""
 
-#: ../rpmUtils.py:132
-#, c-format
-msgid "Could not open RPM database for reading. Perhaps it is already in use?"
+#: ../yum/__init__.py:423
+msgid "doUpdateSetup() will go away in a future version of Yum.\n"
 msgstr ""
-"Невозможно открыть базу RPM для чтения. Возможно база уже используется."
 
-#: ../pullheaders.py:281
-#, c-format
-msgid ""
-"\n"
-"Already found tuple: %s %s:\n"
-"%s "
+#: ../yum/__init__.py:435
+msgid "Building updates object"
 msgstr ""
-"\n"
-"Уже найден кортеж: %s %s:\n"
-"%s "
-
-#: ../clientStuff.py:526 ../clientStuff.py:565
-#, c-format
-msgid "Dep Installed: "
-msgstr "Установлено по зависимостям: "
-
-#: ../serverStuff.py:88
-#, c-format
-msgid "errors found"
-msgstr "найдены ошибки"
-
-#: ../clientStuff.py:725
-#, c-format
-msgid "Getting groups from servers"
+
+#: ../yum/__init__.py:458
+msgid "doGroupSetup() will go away in a future version of Yum.\n"
+msgstr ""
+
+#: ../yum/__init__.py:481
+#, fuzzy
+msgid "Getting group metadata"
 msgstr "Получение групп с серверов"
 
-#: ../nevral.py:72
-#, c-format
-msgid "Header for pkg %s not found"
-msgstr "Заголовок пакета %s не найден"
+#: ../yum/__init__.py:507
+#, fuzzy, python-format
+msgid "Adding group file from repository: %s"
+msgstr "получение групп с сервера: %s"
 
-#: ../clientStuff.py:528 ../clientStuff.py:567
-#, c-format
-msgid "Erased: "
-msgstr "Удалено: "
+#: ../yum/__init__.py:512
+#, python-format
+msgid "Failed to add groups file for repository: %s - %s"
+msgstr ""
 
-#: ../checkbootloader.py:167
-#, c-format
-msgid "Unable to determine boot loader."
-msgstr "Невозможно определить загрузчик."
-
-#: ../clientStuff.py:819
-#, c-format
-msgid "getting %s"
-msgstr "получение %s"
-
-#: ../clientStuff.py:1053
-#, c-format
-msgid "Error Reading Header on %s"
-msgstr "Ошибка чтения заголовка %s"
-
-#: ../config.py:58
-#, c-format
-msgid "Error accessing File: %s"
-msgstr "Ошибка при доступе к файлу: %s"
-
-#: ../yummain.py:339
-#, c-format
-msgid "You're not root, we can't install things"
-msgstr "У вас нет достаточных прав для установки пакетов"
-
-#: ../yummain.py:78
-#, c-format
-msgid "Cannot find any conf file."
-msgstr "Не найден файл настроек."
-
-#: ../urlgrabber.py:291
-#, c-format
-msgid "Local file does not exist: %s"
-msgstr "Отсутствует локальный файл: %s"
-
-#: ../checkbootloader.py:165
-#, c-format
-msgid "Found %s."
-msgstr "Найден %s."
-
-#: ../yummain.py:209
-#, c-format
-msgid "Finding updated packages"
-msgstr "Поиск обновленных пакетов"
+#: ../yum/__init__.py:518
+msgid "No Groups Available in any repository"
+msgstr ""
 
-#: ../yummain.py:342
-#, c-format
-msgid "Transaction(s) Complete"
-msgstr "Транзакция Завершена"
+#: ../yum/__init__.py:569
+msgid "Importing additional filelist information"
+msgstr ""
 
-#: ../urlgrabber.py:311 ../urlgrabber.py:344
-#, c-format
-msgid "IOError: %s"
-msgstr "ВВОшибка: %s"
+#: ../yum/__init__.py:600
+#, python-format
+msgid "Skip-broken round %i"
+msgstr ""
 
-#: ../clientStuff.py:978
-#, c-format
-msgid "Cleaning packages and old headers"
-msgstr "Удаление пакетов и старых заголовков"
+#. bail out
+#: ../yum/__init__.py:629
+#, python-format
+msgid "Skip-broken took %i rounds "
+msgstr ""
 
-#: ../clientStuff.py:829
-#, c-format
+#: ../yum/__init__.py:630
 msgid ""
-"Cannot download %s in caching only mode or when running as non-root user."
-msgstr "Невозможно получить %s используя кэш или не от пользователя root."
+"\n"
+"Packages skipped because for dependency problems:"
+msgstr ""
 
-#: ../clientStuff.py:1049 ../clientStuff.py:1054 ../clientStuff.py:1058
-#: ../clientStuff.py:1063
-#, c-format
-msgid ""
-"Error: You may want to run yum clean or remove the file: \n"
-" %s"
+#: ../yum/__init__.py:689
+#, fuzzy, python-format
+msgid "Failed to remove transaction file %s"
+msgstr "Не найдена секция: %s"
+
+#: ../yum/__init__.py:729
+#, python-format
+msgid "excluding for cost: %s from %s"
 msgstr ""
-"Ошибка: Попробуйте выполнить команду yum clean или удалить файл:\n"
-" %s"
 
-#: ../bin/yum:49
-#, c-format
+#: ../yum/__init__.py:760
+msgid "Excluding Packages in global exclude list"
+msgstr ""
+
+#: ../yum/__init__.py:762
+#, python-format
+msgid "Excluding Packages from %s"
+msgstr ""
+
+#: ../yum/__init__.py:789
+#, fuzzy, python-format
+msgid "Reducing %s to included packages only"
+msgstr "Поиск устаревших пакетов"
+
+#: ../yum/__init__.py:794
+#, fuzzy, python-format
+msgid "Keeping included package %s"
+msgstr "Поиск обновленных пакетов"
+
+#: ../yum/__init__.py:800
+#, fuzzy, python-format
+msgid "Removing unmatched package %s"
+msgstr "Поиск обновленных пакетов"
+
+#: ../yum/__init__.py:803
+msgid "Finished"
+msgstr ""
+
+#. Whoa. What the heck happened?
+#: ../yum/__init__.py:833
+#, python-format
 msgid "Unable to check if PID %s is active"
 msgstr "Невозможно проверить активен ли процесс %s"
 
-#: ../lilocfg.py:61
-#, c-format
-msgid "Error reading lilo.conf: The messages was:\n"
-msgstr "Ошибка чтения lilo.conf:\n"
+#. Another copy seems to be running.
+#: ../yum/__init__.py:837
+#, fuzzy, python-format
+msgid "Existing lock %s: another copy is running as pid %s."
+msgstr "Файл %s существует, другая копия yum запущена. Выход."
 
-#: ../yummain.py:238
-#, c-format
-msgid "No groups provided or accessible on any server."
-msgstr "Группы не доступны ни на одном сервере."
+#: ../yum/__init__.py:884 ../yum/__init__.py:891
+msgid "Package does not match intended download"
+msgstr ""
 
-#: ../pkgaction.py:464
-#, c-format
-msgid "%s results returned"
-msgstr "Возвращено %s результатов"
+#: ../yum/__init__.py:905
+msgid "Could not perform checksum"
+msgstr ""
 
-#: ../pullheaders.py:170 ../pullheaders.py:176
-#, c-format
-msgid "Error moving %s to %s, fatal"
-msgstr "Фатальная ошибка перемещения %s в %s"
+#: ../yum/__init__.py:908
+msgid "Package does not match checksum"
+msgstr ""
 
-#: ../pullheaders.py:256
-#, c-format
-msgid ""
-"\n"
-"Checking sig on %s"
+#: ../yum/__init__.py:950
+#, python-format
+msgid "package fails checksum but caching is enabled for %s"
 msgstr ""
-"\n"
-"Проверка сигнатуры %s"
 
-#: ../pullheaders.py:262
-#, c-format
-msgid ""
-"\n"
-"ignoring bad rpm: %s"
+#: ../yum/__init__.py:956
+#, python-format
+msgid "using local copy of %s"
 msgstr ""
-"\n"
-"игнорируется пакет: %s"
-
-#: ../clientStuff.py:500
-#, c-format
-msgid "[erase: %s]"
-msgstr "[удалить: %s]"
-
-#: ../pullheaders.py:196
-#, c-format
-msgid "%s is not a dir"
-msgstr "%s это не каталог"
-
-#: ../clientStuff.py:424 ../nevral.py:237
-#, c-format
-msgid "Best version for %s is %s:%s-%s"
-msgstr "Наилучшая версия для  %s это %s:%s-%s"
-
-#: ../clientStuff.py:511 ../clientStuff.py:522
-#, c-format
-msgid "[deps: %s]"
-msgstr "[зависимость: %s]"
-
-#: ../pkgaction.py:267
-#, c-format
-msgid "Version"
-msgstr "Версия"
-
-#: ../clientStuff.py:941
-#, c-format
-msgid "Looking in Available Packages:"
-msgstr "Просмотр доступных пакетов"
-
-#: ../pullheaders.py:268
-#, c-format
-msgid ""
-"\n"
-"ignoring srpm: %s"
+
+#: ../yum/__init__.py:975
+#, python-format
+msgid "Insufficient space in download directory %s to download"
 msgstr ""
-"\n"
-"игнорируется src пакет: %s"
 
-#: ../serverStuff.py:77
-#, c-format
-msgid "Checking deps %d/%d complete"
-msgstr "Проверка зависимостей %d/d"
+#: ../yum/__init__.py:1008
+msgid "Header is not complete."
+msgstr ""
 
-#: ../pkgaction.py:457
-#, c-format
+#: ../yum/__init__.py:1048
+#, python-format
 msgid ""
-"Installed package: %s.%s %s:%s-%s matches with\n"
-" %s"
+"Header not in local cache and caching-only mode enabled. Cannot download %s"
 msgstr ""
-"Установленный пакет: %s.%s %s:%s-%s предоставляет\n"
-" %s"
 
-#: ../depchecktree.py:128 ../pullheaders.py:122
-#, c-format
-msgid ""
-"Errors within the dir(s):\n"
-" %s"
+#: ../yum/__init__.py:1103
+#, python-format
+msgid "Public key for %s is not installed"
 msgstr ""
-"Ошибка в каталоге(ах):\n"
-" %s"
 
-#: ../pkgaction.py:317
-#, c-format
-msgid "Summary: %s"
-msgstr "Описание: %s"
+#: ../yum/__init__.py:1107
+#, fuzzy, python-format
+msgid "Problem opening package %s"
+msgstr "Удаление пакетов"
 
-#: ../rpmUtils.py:260
-#, c-format
-msgid "Error opening rpm %s - error %s"
-msgstr "Невозможно открыть пакет %s - ошибка %s"
+#: ../yum/__init__.py:1115
+#, python-format
+msgid "Public key for %s is not trusted"
+msgstr ""
 
-#: ../clientStuff.py:783 ../clientStuff.py:809
-#, c-format
-msgid "Please run yum in non-caching mode to correct this header."
-msgstr "Запустите yum в нормальном режиме чтобы исправить этот заголовок."
+#: ../yum/__init__.py:1119
+#, python-format
+msgid "Package %s is not signed"
+msgstr ""
 
-#: ../pullheaders.py:222
-#, c-format
-msgid "Cannot delete file %s"
+#: ../yum/__init__.py:1157
+#, fuzzy, python-format
+msgid "Cannot remove %s"
 msgstr "Невозможно удалить файл %s"
 
-#: ../lilocfg.py:43
-#, c-format
-msgid "Error installing lilo.conf  The message was:\n"
-msgstr "Ошибка установки lilo.conf:\n"
+#: ../yum/__init__.py:1161
+#, python-format
+msgid "%s removed"
+msgstr ""
 
-#: ../clientStuff.py:1057
-#, c-format
-msgid "Error: Untrusted GPG key on %s"
-msgstr "Ошибка: Неверный GPG ключ в %s"
+#: ../yum/__init__.py:1193
+#, fuzzy, python-format
+msgid "Cannot remove %s file %s"
+msgstr "Невозможно удалить файл %s"
 
-#: ../clientStuff.py:943
-#, c-format
-msgid "Looking in Installed Packages:"
-msgstr "Просмотр установленных пакетов:"
+#: ../yum/__init__.py:1197
+#, python-format
+msgid "%s file %s removed"
+msgstr ""
 
-#: ../clientStuff.py:991
-#, c-format
-msgid "Invalid clean option %s"
-msgstr "Hеверная опция чистки %s"
+#: ../yum/__init__.py:1199
+#, python-format
+msgid "%d %s files removed"
+msgstr ""
 
-#: ../pullheaders.py:258
-#, c-format
-msgid ""
-"\n"
-"\n"
-"Problem with gpg sig or md5sum on %s\n"
-"\n"
+#: ../yum/__init__.py:1239
+#, python-format
+msgid "More than one identical match in sack for %s"
 msgstr ""
-"\n"
-"\n"
-"Проблема с подписью GPG или md5-суммой в %s\n"
 
-#: ../pkgaction.py:313
-#, c-format
-msgid "Release: %s"
-msgstr "Релиз  : %s"
+#: ../yum/__init__.py:1245
+#, python-format
+msgid "Nothing matches %s.%s %s:%s-%s from update"
+msgstr ""
 
-#: ../pkgaction.py:76
-#, c-format
-msgid "No Packages Available for Update or Install"
-msgstr "Нет пакетов доступных для установки или обновления"
+#: ../yum/__init__.py:1434
+msgid ""
+"searchPackages() will go away in a future version of "
+"Yum.                      Use searchGenerator() instead. \n"
+msgstr ""
 
-#: ../pkgaction.py:56 ../pkgaction.py:67
-#, c-format
-msgid "%s is installed and is the latest version."
-msgstr "%s уже установлен и это последняя версия."
+#: ../yum/__init__.py:1471
+#, fuzzy, python-format
+msgid "Searching %d packages"
+msgstr "Удаление пакетов"
 
-#: ../nevral.py:261
-#, c-format
-msgid "Found best arch for install only pkg %s"
-msgstr "Лучшая архитектура для установки пакета %s"
-
-#: ../clientStuff.py:864 ../clientStuff.py:876
-#, c-format
-msgid "Looking in installed packages for a providing package"
-msgstr "Поиск пакета среди установленных пакетов"
-
-#: ../clientStuff.py:473
-#, c-format
-msgid "I will do the following:"
-msgstr "Необходимо выполнить следующее:"
-
-#: ../urlgrabber.py:279 ../urlgrabber.py:309
-#, c-format
-msgid "Bad URL: %s"
-msgstr "Неверный URL: %s"
-
-#: ../clientStuff.py:1023
-#, c-format
-msgid "NonMatching RPM version, %s, removing."
-msgstr "Несовпадающая версия RPM, %s, удаляется."
-
-#: ../clientStuff.py:614
-#, c-format
-msgid "Is this ok [y/N]: "
-msgstr "Выполнить [y/N]: "
-
-#: ../clientStuff.py:514
-#, c-format
-msgid "I will erase these to satisfy the dependencies:"
-msgstr "Необходимо удалить эти пакеты для разрешения зависимостей:"
-
-#: ../clientStuff.py:1096
-#, c-format
-msgid "Error reported but not a disk space error"
-msgstr "Получена ошибка отлична от ошибки \"недостаточно места на диске\""
-
-#: ../lilocfg.py:407
-#, c-format
-msgid "Error parsing command line arguments: %s"
-msgstr "Ошибка при разборе параметров командной строки: %s"
+#: ../yum/__init__.py:1475
+#, fuzzy, python-format
+msgid "searching package %s"
+msgstr "Удаление пакетов"
 
-#: ../yummain.py:220
-#, c-format
-msgid "Finding obsoleted packages"
-msgstr "Поиск устаревших пакетов"
+#: ../yum/__init__.py:1484
+msgid "searching in file entries"
+msgstr ""
 
-#: ../urlgrabber.py:315 ../urlgrabber.py:348
-#, c-format
-msgid "HTTP Error (%s): %s"
-msgstr "Ошибка HTTP (%s): %s"
+#: ../yum/__init__.py:1490
+msgid "searching in provides entries"
+msgstr ""
 
-#: ../serverStuff.py:96
-#, c-format
-msgid "depcheck: package %s conflicts with %s"
-msgstr "зависимости: пакет %s конфликтует с %s"
+#: ../yum/__init__.py:1520
+#, python-format
+msgid "Provides-match: %s"
+msgstr ""
 
-#: ../clientStuff.py:781 ../clientStuff.py:807
-#, c-format
-msgid "Please ask your sysadmin to update the headers on this system."
-msgstr "Попросите администратора обновить заголовки в вашей системе."
+#: ../yum/__init__.py:1589 ../yum/__init__.py:1607 ../yum/__init__.py:1635
+#: ../yum/__init__.py:1640 ../yum/__init__.py:1695 ../yum/__init__.py:1699
+#, python-format
+msgid "No Group named %s exists"
+msgstr ""
 
-#: ../clientStuff.py:871
-#, c-format
-msgid "Need an item to search"
-msgstr "Необходим параметр для поиска"
+#: ../yum/__init__.py:1618 ../yum/__init__.py:1711
+#, python-format
+msgid "package %s was not marked in group %s"
+msgstr ""
 
-#: ../pullheaders.py:178
-#, c-format
-msgid "Putting back old headers"
-msgstr "Возврат старых заголовков"
+#: ../yum/__init__.py:1657
+#, python-format
+msgid "Adding package %s from group %s"
+msgstr ""
 
-#: ../yummain.py:294
-#, c-format
-msgid "Exiting on user command."
-msgstr "Выход по требованию пользователя"
+#: ../yum/__init__.py:1661
+#, fuzzy, python-format
+msgid "No package named %s available to be installed"
+msgstr "Нет доступных для просмотра пакетов"
 
-#: ../clientStuff.py:1064
-#, c-format
-msgid "Error: You may need to disable gpg checking to install this package\n"
+#: ../yum/__init__.py:1736
+#, python-format
+msgid "Package tuple %s could not be found in packagesack"
 msgstr ""
-"Ошибка: Возможно необходимо отключить проверку GPG для установки пакета\n"
 
-#: ../yummain.py:134
-#, c-format
-msgid "Options Error: no commands found"
-msgstr "Ошибка опций: команда не найдена"
+#: ../yum/__init__.py:1804 ../yum/__init__.py:1847
+msgid "Invalid versioned dependency string, try quoting it."
+msgstr ""
 
-#: ../serverStuff.py:85
-#, c-format
-msgid "adding %s"
-msgstr "добавление %s"
+#: ../yum/__init__.py:1806 ../yum/__init__.py:1849
+#, fuzzy
+msgid "Invalid version flag"
+msgstr "Hеверная опция чистки %s"
 
-#: ../clientStuff.py:1092
-#, c-format
-msgid "You appear to have insufficient disk space to handle these packages"
-msgstr ""
-"Не найдено достаточно дискового пространства для выполнения действий над "
-"пакетами"
-
-#: ../grubcfg.py:22
-#, c-format
-msgid "Unable to run grubby correctly: the message was:\n"
-msgstr "Hевозможно запустить grubby:\n"
-
-#: ../urlgrabber.py:293
-#, c-format
-msgid "Not a normal file: %s"
-msgstr "Не обычный файл: %s"
-
-#: ../bin/yum:71
-#, c-format
-msgid "IOError - # %s - %s"
-msgstr "Ошибка ввода-вывода - # %s - %s"
-
-#: ../pkgaction.py:510
-#, c-format
-msgid "Kernel Updated/Installed, checking for bootloader"
-msgstr "Ядро обновлено/установлено, обновляется загрузчик"
-
-#: ../clientStuff.py:741
-#, c-format
-msgid "Got a file - yay"
-msgstr "Найден файл - ой"
-
-#: ../clientStuff.py:1091
-#, c-format
-msgid "Error: Disk space Error"
-msgstr "Ошибка: Недостаточно места на диске"
-
-#: ../clientStuff.py:527 ../clientStuff.py:566
-#, c-format
-msgid "Updated: "
-msgstr "Обновлено: "
-
-#: ../clientStuff.py:848
-#, c-format
-msgid "Need to pass a list of pkgs to install"
-msgstr "Необходимо указать список пакетов для установки"
+#: ../yum/__init__.py:1821 ../yum/__init__.py:1825
+#, fuzzy, python-format
+msgid "No Package found for %s"
+msgstr "Пакет %s не найден"
 
-#: ../clientStuff.py:631
-#, c-format
-msgid "Mount error: %s"
-msgstr "Ошибка присоединения: %s"
+#: ../yum/__init__.py:1954
+msgid "Package Object was not a package object instance"
+msgstr ""
 
-#: ../clientStuff.py:810
-#, c-format
-msgid "Deleting entry from Available packages"
-msgstr "Удаление записи из списка доступных пакетов"
+#: ../yum/__init__.py:1958
+msgid "Nothing specified to install"
+msgstr ""
 
-#: ../config.py:213
-#, c-format
-msgid "using ftp, http[s], removable or file for servers, Aborting - %s"
+#. only one in there
+#: ../yum/__init__.py:1970
+#, python-format
+msgid "Checking for virtual provide or file-provide for %s"
 msgstr ""
-"Используйте только протоколы ftp, http[s], removable или file. Завершение "
-"работы - %s"
 
-#: ../config.py:225
-#, c-format
-msgid "Insufficient server config - no servers found. Aborting."
-msgstr "Не найден файл настроек сервера - репозиторий не найден. Завершение."
+#. FIXME - this is where we could check to see if it already installed
+#. for returning better errors
+#: ../yum/__init__.py:2008
+#, fuzzy
+msgid "No package(s) available to install"
+msgstr "Нет доступных для просмотра пакетов"
 
-#: ../yummain.py:277
-#, c-format
-msgid "Resolving dependencies"
-msgstr "Разрешение зависимостей"
+#: ../yum/__init__.py:2019
+#, python-format
+msgid "Package: %s  - already in transaction set"
+msgstr ""
 
-#: ../pkgaction.py:312
-#, c-format
-msgid "Version: %s"
-msgstr "Версия : %s"
+#: ../yum/__init__.py:2032
+#, fuzzy, python-format
+msgid "Package %s already installed and latest version"
+msgstr "%s уже установлен и это последняя версия."
 
-#: ../yummain.py:347
-#, c-format
-msgid ""
-"\n"
-"    Usage:  yum [options] <update | upgrade | install | info | remove | list "
-"|\n"
-"            clean | provides | search | check-update | groupinstall | "
-"groupupdate |\n"
-"            grouplist >\n"
-"                \n"
-"         Options:\n"
-"          -c [config file] - specify the config file to use\n"
-"          -e [error level] - set the error logging level\n"
-"          -d [debug level] - set the debugging level\n"
-"          -y answer yes to all questions\n"
-"          -t be tolerant about errors in package commands\n"
-"          -R [time in minutes] - set the max amount of time to randomly run "
-"in.\n"
-"          -C run from cache only - do not update the cache\n"
-"          --installroot=[path] - set the install root (default '/')\n"
-"          --version - output the version of yum\n"
-"          -h, --help this screen\n"
-"    "
+#. update everything (the easy case)
+#: ../yum/__init__.py:2073
+msgid "Updating Everything"
+msgstr ""
+
+#: ../yum/__init__.py:2085 ../yum/__init__.py:2164 ../yum/__init__.py:2176
+#, python-format
+msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
+msgstr ""
+
+#: ../yum/__init__.py:2157
+#, python-format
+msgid "Package is already obsoleted: %s.%s %s:%s-%s"
 msgstr ""
-"\n"
-"    Usage:  yum [options] <update | upgrade | install | info | remove | list "
-"|\n"
-"            clean | provides |search | check-update | groupinstall | "
-"groupupdate |\n"
-"            grouplist >\n"
-"                \n"
-"         Options:\n"
-"          -c [config file] - указать файл конфигурации\n"
-"          -e [error level] - установить подробность ошибок\n"
-"          -d [debug level] - установить подробность сообщений\n"
-"          -y отвечать \"да\" на все вопросы\n"
-"          -t пропускать ошибки при установке пакетов\n"
-"          -R [time in minutes] - установить время случайной задержки\n"
-"          -C работать только с кэшем, не обновляя его\n"
-"          --installroot=[path] - установить install root (по умолчанию '/')\n"
-"          --version - показать версию yum\n"
-"          -h, --help - показать это сообщение\n"
-"    "
-
-#: ../pkgaction.py:259
-#, c-format
-msgid "From %s installing %s"
-msgstr "Из %s устанавливается %s"
-
-#: ../pkgaction.py:538
-#, c-format
-msgid "No bootloader found, Cannot configure kernel, continuing."
-msgstr "Загрузчик не найден, загрузка нового ядра не настроена, продолжаю."
-
-#: ../clientStuff.py:708 ../clientStuff.py:715
-#, c-format
-msgid "Attempt to delete a missing file %s - ignoring."
-msgstr "Попытка удалить несуществующий файл %s - игнорируется."
-
-#: ../rpmUtils.py:25
-#, c-format
-msgid "Header cannot be opened or does not match %s, %s."
-msgstr "Заголовок не открывается или не совпадает %s, %s."
 
-#: ../clientStuff.py:1097
-#, c-format
-msgid "Unknown error testing transaction set:"
-msgstr "Неизвестная ошибка в тестой транзакции:"
+#. should this even be happening?
+#: ../yum/__init__.py:2228
+msgid "No package matched to remove"
+msgstr ""
 
-#: ../bin/yum:66
-#, c-format
-msgid "Exiting on User Cancel"
-msgstr "Выход по требованию пользователя"
+#: ../yum/__init__.py:2262
+#, fuzzy, python-format
+msgid "Cannot open file: %s. Skipping."
+msgstr "Невозможно удалить файл %s"
 
-#: ../clientStuff.py:1031
-#, c-format
-msgid "Getting %s"
-msgstr "Получение %s"
+#: ../yum/__init__.py:2265
+#, fuzzy, python-format
+msgid "Examining %s: %s"
+msgstr "игнорируется src пакет: %s"
 
-#: ../pullheaders.py:150
-#, c-format
+#: ../yum/__init__.py:2272
+#, python-format
 msgid ""
-"\n"
-"Writing header.info file"
+"Package %s not installed, cannot update it. Run yum install to install it "
+"instead."
 msgstr ""
-"\n"
-"Получение файла header.info"
 
-#: ../pullheaders.py:208
-#, c-format
-msgid "Error creating dir %s: %s"
-msgstr "Ошибка создания каталога %s: %s"
+#: ../yum/__init__.py:2304
+#, fuzzy, python-format
+msgid "Excluding %s"
+msgstr "добавление %s"
 
-#: ../pkgaction.py:267
-#, c-format
-msgid "Arch"
-msgstr "Арх."
+#: ../yum/__init__.py:2309
+#, python-format
+msgid "Marking %s to be installed"
+msgstr ""
 
-#: ../clientStuff.py:749
-#, c-format
-msgid "Gathering header information file(s) from server(s)"
-msgstr "Получение файлов заголовков с серверов"
+#: ../yum/__init__.py:2315
+#, python-format
+msgid "Marking %s as an update to %s"
+msgstr ""
 
-#: ../clientStuff.py:776
-#, c-format
-msgid "Using cached header.info file"
-msgstr "Используется кэшированный header.info"
+#: ../yum/__init__.py:2322
+#, python-format
+msgid "%s: does not update installed package."
+msgstr ""
 
-#: ../pkgaction.py:300
-#, c-format
-msgid "No Packages Available to List"
-msgstr "Нет доступных для просмотра пакетов"
+#: ../yum/__init__.py:2376
+#, python-format
+msgid "Retrieving GPG key from %s"
+msgstr ""
 
-#: ../clientStuff.py:1062
-#, c-format
-msgid "Error: Unsigned Package %s"
-msgstr "Ошибка: Не подписанный пакет %s"
-
-#: ../pkgaction.py:461
-#, c-format
-msgid "localrpmdb not defined"
-msgstr "localrpmdb не задана"
-
-#: ../lilocfg.py:55
-#, c-format
-msgid "Error installing the new bootloader: \n"
-msgstr "Ошибка установки нового загрузчика: \n"
-
-#: ../clientStuff.py:1048
-#, c-format
-msgid "Error: Could not find the GPG Key necessary to validate pkg %s"
-msgstr "Ошибка: Невозможно найти GPG ключ необходимый для проверки пакета %s"
-
-#: ../yummain.py:265
-#, c-format
-msgid "No actions to take"
-msgstr "Hикаких действий не нужно"
-
-#: ../pkgaction.py:431
-#, c-format
-msgid ""
-"Available package: %s.%s %s:%s-%s from %s matches with\n"
-" %s"
+#: ../yum/__init__.py:2382
+msgid "GPG key retrieval failed: "
 msgstr ""
-"Доступный пакет: %s.%s %s:%s-%s из %s предоставляет\n"
-" %s"
 
-#: ../yummain.py:304
-#, c-format
-msgid "Calculating available disk space - this could take a bit"
+#: ../yum/__init__.py:2395
+msgid "GPG key parsing failed: "
 msgstr ""
-"Проверка доступности необходимого места на диске.\n"
-"Это может занять некоторое время."
 
-#: ../rpmUtils.py:162
-#, c-format
-msgid "Got an empty Header, something has gone wrong"
-msgstr "Получен пустой заголовок, что-то не так"
+#: ../yum/__init__.py:2399
+#, python-format
+msgid "GPG key at %s (0x%s) is already installed"
+msgstr ""
 
-#: ../pullheaders.py:124
-#, c-format
-msgid "   "
-msgstr "   "
-
-#: ../config.py:223
-#, c-format
-msgid "Error: Cannot find baseurl or name for server '%s'. Skipping"
-msgstr "Ошибка: Невозможно определить URL или имя для сервера '%s'. Пропущено"
-
-#: ../pullheaders.py:224
-#, c-format
-msgid "Odd header %s suddenly disappeared"
-msgstr "Непарный заголовок %s внезапно исчез"
-
-#: ../depchecktree.py:132 ../pullheaders.py:127
-#, c-format
-msgid "All dependencies resolved and no conflicts detected"
-msgstr "Все зависимости проверены, конфликтов не обнаружено"
-
-#: ../pullheaders.py:115
-#, c-format
-msgid "No rpms to work with and no header dir. Exiting."
-msgstr "Не найдено пакетов и каталога заголовков. Завершение."
-
-#: ../clientStuff.py:988
-#, c-format
-msgid "Cleaning old headers"
-msgstr "Удаление старых заголовков"
-
-#: ../pkgaction.py:318
-#, c-format
-msgid ""
-"Description:\n"
-" %s"
+#. Try installing/updating GPG key
+#: ../yum/__init__.py:2404
+#, python-format
+msgid "Importing GPG key 0x%s \"%s\" from %s"
 msgstr ""
-"Описание:\n"
-" %s"
 
-#: ../clientStuff.py:953 ../clientStuff.py:969
-#, c-format
-msgid "Need a list of groups to update"
-msgstr "Необходимо указать список пакетов для установки"
+#: ../yum/__init__.py:2416
+#, fuzzy
+msgid "Not installing key"
+msgstr "Ошибки установки:"
 
-#: ../clientStuff.py:739
-#, c-format
-msgid "using cached groups from server: %s"
-msgstr "использование кэшированных групп с сервера: %s"
+#: ../yum/__init__.py:2422
+#, python-format
+msgid "Key import failed (code %d)"
+msgstr ""
 
-#: ../clientStuff.py:636
-#, c-format
-msgid "Wrong disk!"
-msgstr "Не тот диск!"
+#: ../yum/__init__.py:2425
+msgid "Key imported successfully"
+msgstr ""
 
-#: ../nevral.py:265
-#, c-format
-msgid "Removing dumb arch for install only pkg: %s"
-msgstr "Удаление пустой архитектуры для установки пакета: %s"
+#: ../yum/__init__.py:2430
+#, 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 ""
 
-#: ../pkgaction.py:316
-#, c-format
-msgid "Repo   : %s"
-msgstr "Репозиторий: %s"
+#: ../yum/__init__.py:2439
+msgid "Import of key(s) didn't help, wrong key(s)?"
+msgstr ""
 
-#: ../clientStuff.py:731
-#, c-format
-msgid "getting groups from server: %s"
-msgstr "получение групп с сервера: %s"
+#: ../yum/__init__.py:2513
+msgid "Unable to find a suitable mirror."
+msgstr ""
 
-#: ../clientStuff.py:843
-#, c-format
-msgid "You need to be root to perform these commands"
-msgstr "Hеобходимы привилегии суперпользователя для выполнения этой команды"
+#: ../yum/__init__.py:2515
+msgid "Errors were encountered while downloading packages."
+msgstr ""
 
-#: ../pkgaction.py:466
-#, c-format
-msgid "No packages found"
-msgstr "Пакеты не найдены"
+#: ../yum/__init__.py:2551
+msgid "Running rpm_check_debug"
+msgstr ""
 
-#: ../yummain.py:239
-#, c-format
-msgid "Exiting."
-msgstr "Завершение."
+#: ../yum/__init__.py:2554
+msgid "ERROR with rpm_check_debug vs depsolve:"
+msgstr ""
 
-#: ../nevral.py:183
-#, c-format
-msgid ""
-"asking for package %s.%s - does not exist in nevral - bailing out - check "
-"rpmdb for errors"
+#: ../yum/__init__.py:2556
+msgid "Please report this error in bugzilla"
 msgstr ""
-"Запрос на пакет %s.%s - не существует в nevral - выкинут - проверьте ошибки "
-"в rpmdb"
 
-#: ../pkgaction.py:518
-#, c-format
-msgid "Lilo found - adding kernel to lilo and making it the default"
-msgstr "Найден Lilo - новое ядро будет загружено по умолчанию"
+#: ../yum/__init__.py:2579
+msgid "Test Transaction Errors: "
+msgstr ""
 
-#: ../pkgaction.py:310
-#, c-format
-msgid "Name   : %s"
-msgstr "Имя    : %s"
+#: ../yum/__init__.py:2614
+#, python-format
+msgid "Package %s needs %s, this is not available."
+msgstr ""
 
-#: ../callback.py:88
-#, c-format
-msgid "Completing update for %s  - %d/%d"
-msgstr "Обновление пакетов для - %s - %d/%d"
-
-#: ../clientStuff.py:491
-#, c-format
-msgid "[update: %s]"
-msgstr "[обновить: %s]"
-
-#: ../pkgaction.py:71
-#, c-format
-msgid "Cannot find a package matching %s"
-msgstr "Hе удается найти пакет совпадающий с %s"
-
-#: ../urlgrabber.py:325
-#, c-format
-msgid "ERROR: Url Return no Content-Length  - something is wrong"
-msgstr "ОШИБКА: URL не возвращает параметр Content-Length  - что-то не так"
-
-#: ../pkgaction.py:201
-#, c-format
-msgid "Erase: No matches for %s"
-msgstr "Удалить: Нет совпадений с %s"
-
-#: ../pkgaction.py:257
-#, c-format
-msgid "From %s updating %s"
-msgstr "Из %s обновить %s"
-
-#: ../serverStuff.py:52
-#, c-format
-msgid ""
-"Usage:\n"
-"yum-arch [-v] [-z] [-l] [-c] [-n] [-d] [-q] [-vv] (path of dir where "
-"headers/ should/does live)\n"
-"   -d  = check dependencies and conflicts in tree\n"
-"   -v  = more verbose output\n"
-"   -vv = even more verbose output\n"
-"   -n  = don't generate headers\n"
-"   -c  = check pkgs with gpg and md5 checksums - cannot be used with -n\n"
-"   -z  = gzip compress the headers (default, deprecated as an option)\n"
-"   -s  = generate headers for source packages too\n"
-"   -l  = use symlinks as valid rpms when building headers\n"
-"   -q  = make the display more quiet"
-msgstr ""
-"Использование:\n"
-"    yum-arch [-v] [-z] [-l] [-c] [-n] [-d] [-q] [-vv] каталог-RPM\n"
-"         -d  = проверять конфликты и зависимости в дереве\n"
-"         -v  = выводить отладочную информацию\n"
-"         -vv = еще больше отладочной информации\n"
-"         -n  = не создавать заголовков\n"
-"         -c  = проверять пакеты с помощью gpg и md5 - невозможно "
-"использовать с -n\n"
-"         -z  = сжимать заголовки с помощью алгоритма gzip [по умолчанию "
-"включено]\n"
-"         -s  = создавать заголовки для src пакетов\n"
-"         -l  = разрешить использование символических ссылок\n"
-"         -q  = \"молчаливый\" режим"
-
-#: ../clientStuff.py:805
-#, c-format
-msgid "The file %s is damaged."
-msgstr "Файл %s поврежден."
-
-#: ../pkgaction.py:267
-#, c-format
-msgid "Repo"
-msgstr "Репозиторий"
-
-#: ../bin/yum:53
-#, c-format
-msgid "Existing lock %s: another copy is running. Aborting."
-msgstr "Файл %s существует, другая копия yum запущена. Выход."
+#: ../yum/__init__.py:2619
+#, fuzzy, python-format
+msgid "Package %s conflicts with %s."
+msgstr "зависимости: пакет %s конфликтует с %s"
+
+#: ../rpmUtils/oldUtils.py:26
+#, python-format
+msgid "Header cannot be opened or does not match %s, %s."
+msgstr "Заголовок не открывается или не совпадает %s, %s."
+
+#: ../rpmUtils/oldUtils.py:46
+#, python-format
+msgid "RPM %s fails md5 check"
+msgstr "Ошибка проверки md5-суммы пакета %s "
+
+#: ../rpmUtils/oldUtils.py:144
+msgid "Could not open RPM database for reading. Perhaps it is already in use?"
+msgstr ""
+"Невозможно открыть базу RPM для чтения. Возможно база уже используется."
 
-#: ../clientStuff.py:193 ../clientStuff.py:200 ../rpmUtils.py:232
-#: ../rpmUtils.py:239 ../rpmUtils.py:242 ../rpmUtils.py:245
-#, c-format
+#: ../rpmUtils/oldUtils.py:174
+msgid "Got an empty Header, something has gone wrong"
+msgstr "Получен пустой заголовок, что-то не так"
+
+#: ../rpmUtils/oldUtils.py:244 ../rpmUtils/oldUtils.py:251
+#: ../rpmUtils/oldUtils.py:254 ../rpmUtils/oldUtils.py:257
+#, python-format
 msgid "Damaged Header %s"
 msgstr "Плохой заголовок %s"
 
-#: ../clientStuff.py:982
-#, c-format
-msgid "Cleaning packages"
-msgstr "Удаление пакетов"
+#: ../rpmUtils/oldUtils.py:272
+#, python-format
+msgid "Error opening rpm %s - error %s"
+msgstr "Невозможно открыть пакет %s - ошибка %s"
 
-#: ../pkgaction.py:315
-#, c-format
-msgid "Group  : %s"
-msgstr "Группа: %s"
-
-#: ../clientStuff.py:754
-#, c-format
-msgid "Server: %s"
-msgstr "Сервер: %s"
-
-#: ../pkgaction.py:539
-#, c-format
-msgid "No bootloader found, Cannot configure kernel."
-msgstr "Загрузчик не найден, загрузка нового ядра не настроена."
-
-#: ../pkgaction.py:267
-#, c-format
-msgid "Name"
-msgstr "Название"
-
-#: ../clientStuff.py:482
-#, c-format
-msgid "[install: %s]"
-msgstr "[установить: %s]"
-
-#: ../yummain.py:213
-#, c-format
-msgid "Downloading needed headers"
-msgstr "Получение необходимых заголовков"
-
-#: ../pkgaction.py:314
-#, c-format
-msgid "Size   : %s"
-msgstr "Размер: %s"
+#~ msgid "Dependencies resolved"
+#~ msgstr "Зависимости разрешены"
 
-#: ../callback.py:55
-#, c-format
-msgid "No header - huh?"
-msgstr "Нет заголовка - блин?"
+#~ msgid "Directory of rpms must exist"
+#~ msgstr "Должен существовать каталог с пакетами"
 
-#: ../clientStuff.py:985
-#, c-format
-msgid "Cleaning all headers"
-msgstr "Удаление всех заголовков"
+#~ msgid "Error accessing URL: %s"
+#~ msgstr "Ошибка при доступе к URL: %s"
 
-#: ../serverStuff.py:93
-#, c-format
-msgid "depcheck: package %s needs %s"
-msgstr "зависимости: пакету %s необходим %s"
+#~ msgid "OSError: %s"
+#~ msgstr "ВВОшибка: %s"
 
-#: ../clientStuff.py:779
-#, c-format
-msgid "Error - %s cannot be found"
-msgstr "Ошибка - %s не найден"
+#~ msgid "No Packages installed not included in a repository"
+#~ msgstr "Установленных пакетов, не существуюющих в репозитории не обнаружено"
 
-#: ../rpmUtils.py:45
-#, c-format
-msgid "RPM %s fails md5 check"
-msgstr "Ошибка проверки md5-суммы пакета %s "
+#~ msgid ""
+#~ "\n"
+#~ "   Total: %d\n"
+#~ "   Used: %d\n"
+#~ "   Src: %d"
+#~ msgstr ""
+#~ "\n"
+#~ "   Всего: %d\n"
+#~ "   Использовано: %d\n"
+#~ "   SRC: %d"
 
-#: ../callback.py:85
-#, c-format
-msgid "Erasing: %s %d/%d"
-msgstr "Удаление: - %s - %d/%d"
+#~ msgid "Error restoring the backup of lilo.conf  The backup was:\n"
+#~ msgstr ""
+#~ "Ошибка восстановления резервной копии lilo.conf. Резервная копия была:\n"
 
-#: ../pkgaction.py:261
-#, c-format
-msgid "Nothing in any group to update or install"
-msgstr "Нечего обновлять или устанавливать"
+#~ msgid "Looking in available packages for a providing package"
+#~ msgstr "Просмотр доступных пакетов предоставляющих пакет"
 
-#: ../pkgaction.py:311
-#, c-format
-msgid "Arch   : %s"
-msgstr "Арх.   : %s"
+#~ msgid "I will install/upgrade these to satisfy the dependencies:"
+#~ msgstr "Необходимо обновить/установить это для разрешения зависимостей:"
 
-#: ../nevral.py:52
-#, c-format
-msgid "No Package %s, %s"
-msgstr "Нет пакета %s, %s"
-
-#: ../pkgaction.py:84
-#, c-format
-msgid "No Packages Available for Update"
-msgstr "Нет пакетов доступных для обновления"
-
-#: ../pkgaction.py:535
-#, c-format
-msgid "Grub found - making this kernel the default"
-msgstr "Обнаружен Grub - ядро устанавливается выбранным по умолчанию"
-
-#: ../pullheaders.py:250
-#, c-format
-msgid "Digesting rpm - %s - %d/%d"
-msgstr "Подшивка пакетов - %s - %d/%d"
-
-#: ../clientStuff.py:1014
-#, c-format
-msgid "Damaged RPM %s, removing."
-msgstr "Поврежденный пакет %s, удаление."
-
-#: ../nevral.py:86
-#, c-format
-msgid "Bad Header for pkg %s.%s trying to get headers for the nevral - exiting"
-msgstr "Поврежден заголовок пакет %s.%s завершает работу"
-
-#: ../clientStuff.py:1050 ../clientStuff.py:1059
-#, c-format
-msgid "Error: You may also check that you have the correct GPG keys installed"
-msgstr "Ошибка: Необходимо убедиться в том что вы имеете подходящий gpg ключ"
-
-#: ../pkgaction.py:215
-#, c-format
-msgid "Group %s does not exist"
-msgstr "Группа %s не существует"
+#~ msgid "Cannot delete %s - check perms"
+#~ msgstr "Невозможно удалить %s - проверьте права доступа"
 
-#: ../config.py:232
-#, c-format
-msgid "Failed to find section: %s"
-msgstr "Не найдена секция: %s"
+#~ msgid "Need a provides to match"
+#~ msgstr "Необходим еще один параметр"
 
-#: ../clientStuff.py:627
-#, c-format
-msgid "Insert disk \"%s\" and press enter\n"
-msgstr "Вставьте диск \"%s\" и нажмите 'Enter'\n"
-
-#: ../serverStuff.py:80
-#, c-format
-msgid "ignoring bad rpm: %s"
-msgstr "игнорируется пакет: %s"
-
-#: ../pullheaders.py:89
-#, c-format
-msgid "Directory of rpms must be a directory."
-msgstr "Каталог с пакетами должен быть КАТАЛОГОМ!"
-
-#: ../depchecktree.py:37
-#, c-format
-msgid "%s dirs you want to check"
-msgstr "%s каталоги, которые вы хотите проверить"
-
-#: ../clientStuff.py:766
-#, c-format
-msgid "Getting header.info from server"
-msgstr "Получение файла header.info"
-
-#: ../nevral.py:50
-#, c-format
-msgid "No Package %s"
-msgstr "Пакет %s не найден"
+#~ msgid ""
+#~ "lilo options that are not supported by yum are used in the default lilo."
+#~ "conf. This file will not be modified. The options include:\n"
+#~ msgstr ""
+#~ "параметры lilo не поддерживаются yum. Будет использованы параметры из "
+#~ "lilo.conf. Файл lilo.conf останется неизмеренным.  Параметры включают:\n"
+
+#~ msgid "Installed: "
+#~ msgstr "Установлено: "
+
+#~ msgid "Error getting file %s"
+#~ msgstr "Ошибка получения файла: %s"
+
+#~ msgid "%s is not writable"
+#~ msgstr "Файл %s не доступен для записи"
+
+#~ msgid ""
+#~ "\n"
+#~ "Already found tuple: %s %s:\n"
+#~ "%s "
+#~ msgstr ""
+#~ "\n"
+#~ "Уже найден кортеж: %s %s:\n"
+#~ "%s "
+
+#~ msgid "Dep Installed: "
+#~ msgstr "Установлено по зависимостям: "
+
+#~ msgid "errors found"
+#~ msgstr "найдены ошибки"
+
+#~ msgid "Header for pkg %s not found"
+#~ msgstr "Заголовок пакета %s не найден"
+
+#~ msgid "Unable to determine boot loader."
+#~ msgstr "Невозможно определить загрузчик."
+
+#~ msgid "getting %s"
+#~ msgstr "получение %s"
+
+#~ msgid "Error Reading Header on %s"
+#~ msgstr "Ошибка чтения заголовка %s"
+
+#~ msgid "Error accessing File: %s"
+#~ msgstr "Ошибка при доступе к файлу: %s"
+
+#~ msgid "You're not root, we can't install things"
+#~ msgstr "У вас нет достаточных прав для установки пакетов"
+
+#~ msgid "Cannot find any conf file."
+#~ msgstr "Не найден файл настроек."
+
+#~ msgid "Local file does not exist: %s"
+#~ msgstr "Отсутствует локальный файл: %s"
+
+#~ msgid "Found %s."
+#~ msgstr "Найден %s."
+
+#~ msgid "Transaction(s) Complete"
+#~ msgstr "Транзакция Завершена"
+
+#~ msgid "IOError: %s"
+#~ msgstr "ВВОшибка: %s"
+
+#~ msgid "Cleaning packages and old headers"
+#~ msgstr "Удаление пакетов и старых заголовков"
+
+#~ msgid ""
+#~ "Cannot download %s in caching only mode or when running as non-root user."
+#~ msgstr "Невозможно получить %s используя кэш или не от пользователя root."
+
+#~ msgid ""
+#~ "Error: You may want to run yum clean or remove the file: \n"
+#~ " %s"
+#~ msgstr ""
+#~ "Ошибка: Попробуйте выполнить команду yum clean или удалить файл:\n"
+#~ " %s"
+
+#~ msgid "Error reading lilo.conf: The messages was:\n"
+#~ msgstr "Ошибка чтения lilo.conf:\n"
+
+#~ msgid "No groups provided or accessible on any server."
+#~ msgstr "Группы не доступны ни на одном сервере."
+
+#~ msgid "%s results returned"
+#~ msgstr "Возвращено %s результатов"
+
+#~ msgid "Error moving %s to %s, fatal"
+#~ msgstr "Фатальная ошибка перемещения %s в %s"
+
+#~ msgid ""
+#~ "\n"
+#~ "Checking sig on %s"
+#~ msgstr ""
+#~ "\n"
+#~ "Проверка сигнатуры %s"
+
+#~ msgid ""
+#~ "\n"
+#~ "ignoring bad rpm: %s"
+#~ msgstr ""
+#~ "\n"
+#~ "игнорируется пакет: %s"
+
+#~ msgid "[erase: %s]"
+#~ msgstr "[удалить: %s]"
+
+#~ msgid "%s is not a dir"
+#~ msgstr "%s это не каталог"
+
+#~ msgid "Best version for %s is %s:%s-%s"
+#~ msgstr "Наилучшая версия для  %s это %s:%s-%s"
+
+#~ msgid "[deps: %s]"
+#~ msgstr "[зависимость: %s]"
+
+#~ msgid "Version"
+#~ msgstr "Версия"
+
+#~ msgid "Looking in Available Packages:"
+#~ msgstr "Просмотр доступных пакетов"
+
+#~ msgid ""
+#~ "\n"
+#~ "ignoring srpm: %s"
+#~ msgstr ""
+#~ "\n"
+#~ "игнорируется src пакет: %s"
+
+#~ msgid "Checking deps %d/%d complete"
+#~ msgstr "Проверка зависимостей %d/d"
+
+#~ msgid ""
+#~ "Installed package: %s.%s %s:%s-%s matches with\n"
+#~ " %s"
+#~ msgstr ""
+#~ "Установленный пакет: %s.%s %s:%s-%s предоставляет\n"
+#~ " %s"
+
+#~ msgid ""
+#~ "Errors within the dir(s):\n"
+#~ " %s"
+#~ msgstr ""
+#~ "Ошибка в каталоге(ах):\n"
+#~ " %s"
+
+#~ msgid "Please run yum in non-caching mode to correct this header."
+#~ msgstr "Запустите yum в нормальном режиме чтобы исправить этот заголовок."
+
+#~ msgid "Error installing lilo.conf  The message was:\n"
+#~ msgstr "Ошибка установки lilo.conf:\n"
+
+#~ msgid "Error: Untrusted GPG key on %s"
+#~ msgstr "Ошибка: Неверный GPG ключ в %s"
+
+#~ msgid "Looking in Installed Packages:"
+#~ msgstr "Просмотр установленных пакетов:"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Problem with gpg sig or md5sum on %s\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Проблема с подписью GPG или md5-суммой в %s\n"
+
+#~ msgid "No Packages Available for Update or Install"
+#~ msgstr "Нет пакетов доступных для установки или обновления"
+
+#~ msgid "Found best arch for install only pkg %s"
+#~ msgstr "Лучшая архитектура для установки пакета %s"
+
+#~ msgid "Looking in installed packages for a providing package"
+#~ msgstr "Поиск пакета среди установленных пакетов"
+
+#~ msgid "I will do the following:"
+#~ msgstr "Необходимо выполнить следующее:"
+
+#~ msgid "Bad URL: %s"
+#~ msgstr "Неверный URL: %s"
+
+#~ msgid "NonMatching RPM version, %s, removing."
+#~ msgstr "Несовпадающая версия RPM, %s, удаляется."
+
+#~ msgid "Is this ok [y/N]: "
+#~ msgstr "Выполнить [y/N]: "
+
+#~ msgid "I will erase these to satisfy the dependencies:"
+#~ msgstr "Необходимо удалить эти пакеты для разрешения зависимостей:"
+
+#~ msgid "Error reported but not a disk space error"
+#~ msgstr "Получена ошибка отлична от ошибки \"недостаточно места на диске\""
+
+#~ msgid "HTTP Error (%s): %s"
+#~ msgstr "Ошибка HTTP (%s): %s"
+
+#~ msgid "Please ask your sysadmin to update the headers on this system."
+#~ msgstr "Попросите администратора обновить заголовки в вашей системе."
+
+#~ msgid "Putting back old headers"
+#~ msgstr "Возврат старых заголовков"
+
+#~ msgid "Exiting on user command."
+#~ msgstr "Выход по требованию пользователя"
+
+#~ msgid ""
+#~ "Error: You may need to disable gpg checking to install this package\n"
+#~ msgstr ""
+#~ "Ошибка: Возможно необходимо отключить проверку GPG для установки пакета\n"
+
+#~ msgid "Options Error: no commands found"
+#~ msgstr "Ошибка опций: команда не найдена"
+
+#~ msgid "You appear to have insufficient disk space to handle these packages"
+#~ msgstr ""
+#~ "Не найдено достаточно дискового пространства для выполнения действий над "
+#~ "пакетами"
+
+#~ msgid "Unable to run grubby correctly: the message was:\n"
+#~ msgstr "Hевозможно запустить grubby:\n"
+
+#~ msgid "Not a normal file: %s"
+#~ msgstr "Не обычный файл: %s"
+
+#~ msgid "IOError - # %s - %s"
+#~ msgstr "Ошибка ввода-вывода - # %s - %s"
+
+#~ msgid "Kernel Updated/Installed, checking for bootloader"
+#~ msgstr "Ядро обновлено/установлено, обновляется загрузчик"
+
+#~ msgid "Got a file - yay"
+#~ msgstr "Найден файл - ой"
+
+#~ msgid "Error: Disk space Error"
+#~ msgstr "Ошибка: Недостаточно места на диске"
+
+#~ msgid "Updated: "
+#~ msgstr "Обновлено: "
+
+#~ msgid "Need to pass a list of pkgs to install"
+#~ msgstr "Необходимо указать список пакетов для установки"
+
+#~ msgid "Mount error: %s"
+#~ msgstr "Ошибка присоединения: %s"
+
+#~ msgid "Deleting entry from Available packages"
+#~ msgstr "Удаление записи из списка доступных пакетов"
+
+#~ msgid "using ftp, http[s], removable or file for servers, Aborting - %s"
+#~ msgstr ""
+#~ "Используйте только протоколы ftp, http[s], removable или file. Завершение "
+#~ "работы - %s"
+
+#~ msgid "Insufficient server config - no servers found. Aborting."
+#~ msgstr ""
+#~ "Не найден файл настроек сервера - репозиторий не найден. Завершение."
+
+#~ msgid "Resolving dependencies"
+#~ msgstr "Разрешение зависимостей"
+
+#~ msgid ""
+#~ "\n"
+#~ "    Usage:  yum [options] <update | upgrade | install | info | remove | "
+#~ "list |\n"
+#~ "            clean | provides | search | check-update | groupinstall | "
+#~ "groupupdate |\n"
+#~ "            grouplist >\n"
+#~ "                \n"
+#~ "         Options:\n"
+#~ "          -c [config file] - specify the config file to use\n"
+#~ "          -e [error level] - set the error logging level\n"
+#~ "          -d [debug level] - set the debugging level\n"
+#~ "          -y answer yes to all questions\n"
+#~ "          -t be tolerant about errors in package commands\n"
+#~ "          -R [time in minutes] - set the max amount of time to randomly "
+#~ "run in.\n"
+#~ "          -C run from cache only - do not update the cache\n"
+#~ "          --installroot=[path] - set the install root (default '/')\n"
+#~ "          --version - output the version of yum\n"
+#~ "          -h, --help this screen\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    Usage:  yum [options] <update | upgrade | install | info | remove | "
+#~ "list |\n"
+#~ "            clean | provides |search | check-update | groupinstall | "
+#~ "groupupdate |\n"
+#~ "            grouplist >\n"
+#~ "                \n"
+#~ "         Options:\n"
+#~ "          -c [config file] - указать файл конфигурации\n"
+#~ "          -e [error level] - установить подробность ошибок\n"
+#~ "          -d [debug level] - установить подробность сообщений\n"
+#~ "          -y отвечать \"да\" на все вопросы\n"
+#~ "          -t пропускать ошибки при установке пакетов\n"
+#~ "          -R [time in minutes] - установить время случайной задержки\n"
+#~ "          -C работать только с кэшем, не обновляя его\n"
+#~ "          --installroot=[path] - установить install root (по умолчанию "
+#~ "'/')\n"
+#~ "          --version - показать версию yum\n"
+#~ "          -h, --help - показать это сообщение\n"
+#~ "    "
+
+#~ msgid "From %s installing %s"
+#~ msgstr "Из %s устанавливается %s"
+
+#~ msgid "No bootloader found, Cannot configure kernel, continuing."
+#~ msgstr "Загрузчик не найден, загрузка нового ядра не настроена, продолжаю."
+
+#~ msgid "Attempt to delete a missing file %s - ignoring."
+#~ msgstr "Попытка удалить несуществующий файл %s - игнорируется."
+
+#~ msgid "Unknown error testing transaction set:"
+#~ msgstr "Неизвестная ошибка в тестой транзакции:"
+
+#~ msgid "Exiting on User Cancel"
+#~ msgstr "Выход по требованию пользователя"
+
+#~ msgid "Getting %s"
+#~ msgstr "Получение %s"
+
+#~ msgid ""
+#~ "\n"
+#~ "Writing header.info file"
+#~ msgstr ""
+#~ "\n"
+#~ "Получение файла header.info"
+
+#~ msgid "Arch"
+#~ msgstr "Арх."
+
+#~ msgid "Gathering header information file(s) from server(s)"
+#~ msgstr "Получение файлов заголовков с серверов"
+
+#~ msgid "Using cached header.info file"
+#~ msgstr "Используется кэшированный header.info"
+
+#~ msgid "Error: Unsigned Package %s"
+#~ msgstr "Ошибка: Не подписанный пакет %s"
+
+#~ msgid "localrpmdb not defined"
+#~ msgstr "localrpmdb не задана"
+
+#~ msgid "Error installing the new bootloader: \n"
+#~ msgstr "Ошибка установки нового загрузчика: \n"
+
+#~ msgid "Error: Could not find the GPG Key necessary to validate pkg %s"
+#~ msgstr ""
+#~ "Ошибка: Невозможно найти GPG ключ необходимый для проверки пакета %s"
+
+#~ msgid "No actions to take"
+#~ msgstr "Hикаких действий не нужно"
+
+#~ msgid ""
+#~ "Available package: %s.%s %s:%s-%s from %s matches with\n"
+#~ " %s"
+#~ msgstr ""
+#~ "Доступный пакет: %s.%s %s:%s-%s из %s предоставляет\n"
+#~ " %s"
+
+#~ msgid "Calculating available disk space - this could take a bit"
+#~ msgstr ""
+#~ "Проверка доступности необходимого места на диске.\n"
+#~ "Это может занять некоторое время."
+
+#~ msgid "   "
+#~ msgstr "   "
+
+#~ msgid "Error: Cannot find baseurl or name for server '%s'. Skipping"
+#~ msgstr ""
+#~ "Ошибка: Невозможно определить URL или имя для сервера '%s'. Пропущено"
+
+#~ msgid "Odd header %s suddenly disappeared"
+#~ msgstr "Непарный заголовок %s внезапно исчез"
+
+#~ msgid "All dependencies resolved and no conflicts detected"
+#~ msgstr "Все зависимости проверены, конфликтов не обнаружено"
+
+#~ msgid "No rpms to work with and no header dir. Exiting."
+#~ msgstr "Не найдено пакетов и каталога заголовков. Завершение."
+
+#~ msgid "Cleaning old headers"
+#~ msgstr "Удаление старых заголовков"
+
+#~ msgid "using cached groups from server: %s"
+#~ msgstr "использование кэшированных групп с сервера: %s"
+
+#~ msgid "Wrong disk!"
+#~ msgstr "Не тот диск!"
+
+#~ msgid "Removing dumb arch for install only pkg: %s"
+#~ msgstr "Удаление пустой архитектуры для установки пакета: %s"
+
+#~ msgid "No packages found"
+#~ msgstr "Пакеты не найдены"
+
+#~ msgid "Exiting."
+#~ msgstr "Завершение."
+
+#~ msgid ""
+#~ "asking for package %s.%s - does not exist in nevral - bailing out - check "
+#~ "rpmdb for errors"
+#~ msgstr ""
+#~ "Запрос на пакет %s.%s - не существует в nevral - выкинут - проверьте "
+#~ "ошибки в rpmdb"
+
+#~ msgid "Lilo found - adding kernel to lilo and making it the default"
+#~ msgstr "Найден Lilo - новое ядро будет загружено по умолчанию"
+
+#~ msgid "Completing update for %s  - %d/%d"
+#~ msgstr "Обновление пакетов для - %s - %d/%d"
+
+#~ msgid "[update: %s]"
+#~ msgstr "[обновить: %s]"
+
+#~ msgid "Cannot find a package matching %s"
+#~ msgstr "Hе удается найти пакет совпадающий с %s"
+
+#~ msgid "ERROR: Url Return no Content-Length  - something is wrong"
+#~ msgstr "ОШИБКА: URL не возвращает параметр Content-Length  - что-то не так"
+
+#~ msgid "Erase: No matches for %s"
+#~ msgstr "Удалить: Нет совпадений с %s"
+
+#~ msgid "From %s updating %s"
+#~ msgstr "Из %s обновить %s"
+
+#~ msgid ""
+#~ "Usage:\n"
+#~ "yum-arch [-v] [-z] [-l] [-c] [-n] [-d] [-q] [-vv] (path of dir where "
+#~ "headers/ should/does live)\n"
+#~ "   -d  = check dependencies and conflicts in tree\n"
+#~ "   -v  = more verbose output\n"
+#~ "   -vv = even more verbose output\n"
+#~ "   -n  = don't generate headers\n"
+#~ "   -c  = check pkgs with gpg and md5 checksums - cannot be used with -n\n"
+#~ "   -z  = gzip compress the headers (default, deprecated as an option)\n"
+#~ "   -s  = generate headers for source packages too\n"
+#~ "   -l  = use symlinks as valid rpms when building headers\n"
+#~ "   -q  = make the display more quiet"
+#~ msgstr ""
+#~ "Использование:\n"
+#~ "    yum-arch [-v] [-z] [-l] [-c] [-n] [-d] [-q] [-vv] каталог-RPM\n"
+#~ "         -d  = проверять конфликты и зависимости в дереве\n"
+#~ "         -v  = выводить отладочную информацию\n"
+#~ "         -vv = еще больше отладочной информации\n"
+#~ "         -n  = не создавать заголовков\n"
+#~ "         -c  = проверять пакеты с помощью gpg и md5 - невозможно "
+#~ "использовать с -n\n"
+#~ "         -z  = сжимать заголовки с помощью алгоритма gzip [по умолчанию "
+#~ "включено]\n"
+#~ "         -s  = создавать заголовки для src пакетов\n"
+#~ "         -l  = разрешить использование символических ссылок\n"
+#~ "         -q  = \"молчаливый\" режим"
+
+#~ msgid "The file %s is damaged."
+#~ msgstr "Файл %s поврежден."
+
+#~ msgid "Repo"
+#~ msgstr "Репозиторий"
+
+#~ msgid "Group  : %s"
+#~ msgstr "Группа: %s"
+
+#~ msgid "Server: %s"
+#~ msgstr "Сервер: %s"
+
+#~ msgid "No bootloader found, Cannot configure kernel."
+#~ msgstr "Загрузчик не найден, загрузка нового ядра не настроена."
+
+#~ msgid "Name"
+#~ msgstr "Название"
+
+#~ msgid "[install: %s]"
+#~ msgstr "[установить: %s]"
+
+#~ msgid "Downloading needed headers"
+#~ msgstr "Получение необходимых заголовков"
+
+#~ msgid "Cleaning all headers"
+#~ msgstr "Удаление всех заголовков"
+
+#~ msgid "depcheck: package %s needs %s"
+#~ msgstr "зависимости: пакету %s необходим %s"
+
+#~ msgid "Error - %s cannot be found"
+#~ msgstr "Ошибка - %s не найден"
+
+#~ msgid "Erasing: %s %d/%d"
+#~ msgstr "Удаление: - %s - %d/%d"
+
+#~ msgid "Nothing in any group to update or install"
+#~ msgstr "Нечего обновлять или устанавливать"
+
+#~ msgid "No Package %s, %s"
+#~ msgstr "Нет пакета %s, %s"
+
+#~ msgid "No Packages Available for Update"
+#~ msgstr "Нет пакетов доступных для обновления"
+
+#~ msgid "Grub found - making this kernel the default"
+#~ msgstr "Обнаружен Grub - ядро устанавливается выбранным по умолчанию"
+
+#~ msgid "Digesting rpm - %s - %d/%d"
+#~ msgstr "Подшивка пакетов - %s - %d/%d"
+
+#~ msgid "Damaged RPM %s, removing."
+#~ msgstr "Поврежденный пакет %s, удаление."
+
+#~ msgid ""
+#~ "Bad Header for pkg %s.%s trying to get headers for the nevral - exiting"
+#~ msgstr "Поврежден заголовок пакет %s.%s завершает работу"
+
+#~ msgid ""
+#~ "Error: You may also check that you have the correct GPG keys installed"
+#~ msgstr ""
+#~ "Ошибка: Необходимо убедиться в том что вы имеете подходящий gpg ключ"
+
+#~ msgid "Insert disk \"%s\" and press enter\n"
+#~ msgstr "Вставьте диск \"%s\" и нажмите 'Enter'\n"
+
+#~ msgid "ignoring bad rpm: %s"
+#~ msgstr "игнорируется пакет: %s"
+
+#~ msgid "Directory of rpms must be a directory."
+#~ msgstr "Каталог с пакетами должен быть КАТАЛОГОМ!"
+
+#~ msgid "%s dirs you want to check"
+#~ msgstr "%s каталоги, которые вы хотите проверить"
+
+#~ msgid "Getting header.info from server"
+#~ msgstr "Получение файла header.info"
diff --git a/po/yum.pot b/po/yum.pot
index 6eb265f..a3917c4 100644
--- a/po/yum.pot
+++ b/po/yum.pot
@@ -1,990 +1,668 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR ORGANIZATION
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
+#: ../translate.py:221
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: Sun Oct 19 17:01:22 2003\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-01-26 15:54+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
-"Generated-By: pygettext.py 1.1\n"
+"Content-Transfer-Encoding: 8bit\n"
 
-#: ../yummain.py:277
-#, c-format
-msgid "Dependencies resolved"
-msgstr ""
-
-#: ../pullheaders.py:86
-#, c-format
-msgid "Directory of rpms must exist"
-msgstr ""
-
-#: ../config.py:44
-#, c-format
-msgid "Error accessing URL: %s"
-msgstr ""
-
-#: ../urlgrabber.py:313 ../urlgrabber.py:346
-#, c-format
-msgid "OSError: %s"
-msgstr ""
-
-#: ../clientStuff.py:919
-#, c-format
-msgid "No Packages installed not included in a repository"
-msgstr ""
-
-#: ../pullheaders.py:293
-#, c-format
-msgid ""
-"\n"
-"   Total: %d\n"
-"   Used: %d\n"
-"   Src: %d"
-msgstr ""
-
-#: ../serverStuff.py:82
-#, c-format
-msgid "ignoring srpm: %s"
-msgstr ""
-
-#: ../lilocfg.py:49
-#, c-format
-msgid ""
-"Error restoring the backup of lilo.conf  The backup was:\n"
-msgstr ""
-
-#: ../clientStuff.py:842 ../clientStuff.py:854
-#, c-format
-msgid "Looking in available packages for a providing package"
-msgstr ""
-
-#: ../yummain.py:315
-#, c-format
-msgid "Errors installing:"
-msgstr ""
-
-#: ../clientStuff.py:1140
-#, c-format
-msgid ""
-"retrygrab() failed for:\n"
-"  %s%s\n"
-"  Executing failover method"
-msgstr ""
-
-#: ../clientStuff.py:498
-#, c-format
-msgid "I will install/upgrade these to satisfy the dependencies:"
-msgstr ""
-
-#: ../pullheaders.py:232
-#, c-format
-msgid "Cannot delete %s - check perms"
-msgstr ""
-
-#: ../clientStuff.py:881
-#, c-format
-msgid "Need to pass a list of pkgs to erase"
-msgstr ""
-
-#: ../clientStuff.py:839
-#, c-format
-msgid "Need a provides to match"
-msgstr ""
-
-#: ../lilocfg.py:67
-#, c-format
-msgid ""
-"lilo options that are not supported by yum are used in the default lilo.conf. This file will not be modified. The options include:\n"
+#: ../callback.py:130
+msgid "No header - huh?"
 msgstr ""
 
-#: ../clientStuff.py:520 ../clientStuff.py:559
-#, c-format
-msgid "Installed: "
+#: ../callback.py:212
+#, python-format
+msgid "Erased: %s"
 msgstr ""
 
-#: ../clientStuff.py:715 ../clientStuff.py:751 ../clientStuff.py:804
-#: ../clientStuff.py:1017
-#, c-format
-msgid "Error getting file %s"
+#: ../cli.py:181 ../utils.py:57
+#, python-format
+msgid "Config Error: %s"
 msgstr ""
 
-#: ../yummain.py:51 ../yummain.py:106
-#, c-format
+#: ../cli.py:184 ../cli.py:1061 ../utils.py:60
+#, python-format
 msgid "Options Error: %s"
 msgstr ""
 
-#: ../pullheaders.py:200
-#, c-format
-msgid "%s is not writable"
-msgstr ""
-
-#: ../pullheaders.py:281
-#, c-format
-msgid ""
-"\n"
-"Already found tuple: %s %s:\n"
-"%s "
-msgstr ""
-
-#: ../rpmUtils.py:132
-#, c-format
-msgid "Could not open RPM database for reading. Perhaps it is already in use?"
-msgstr ""
-
-#: ../serverStuff.py:88
-#, c-format
-msgid "errors found"
-msgstr ""
-
-#: ../pkgaction.py:314
-#, c-format
-msgid "Size   : %s"
-msgstr ""
-
-#: ../clientStuff.py:523 ../clientStuff.py:562
-#, c-format
-msgid "Erased: "
-msgstr ""
-
-#: ../checkbootloader.py:167
-#, c-format
-msgid "Unable to determine boot loader."
-msgstr ""
-
-#: ../clientStuff.py:799
-#, c-format
-msgid "getting %s"
+#: ../cli.py:227
+msgid "You need to give some command"
 msgstr ""
 
-#: ../clientStuff.py:1033
-#, c-format
-msgid "Error Reading Header on %s"
+#: ../cli.py:482
+msgid "Parsing package install arguments"
 msgstr ""
 
-#: ../config.py:50
-#, c-format
-msgid "Error accessing File: %s"
+#: ../cli.py:597 ../yum/__init__.py:2213
+#, python-format
+msgid "%s"
 msgstr ""
 
-#: ../yummain.py:330
-#, c-format
-msgid "You're not root, we can't install things"
+#: ../cli.py:601 ../yum/__init__.py:1976 ../yum/__init__.py:2216
+#, python-format
+msgid "No Match for argument: %s"
 msgstr ""
 
-#: ../yummain.py:72
-#, c-format
-msgid "Cannot find any conf file."
+#: ../cli.py:740
+#, python-format
+msgid "No Package Found for %s"
 msgstr ""
 
-#: ../urlgrabber.py:291
-#, c-format
-msgid "Local file does not exist: %s"
+#: ../cli.py:834 ../cli.py:840
+#, python-format
+msgid "Warning: Group %s does not exist."
 msgstr ""
 
-#: ../config.py:193
-#, c-format
-msgid "using ftp, http[s], or file for servers, Aborting - %s"
-msgstr ""
-
-#: ../checkbootloader.py:165
-#, c-format
-msgid "Found %s."
-msgstr ""
-
-#: ../yummain.py:203
-#, c-format
-msgid "Finding updated packages"
-msgstr ""
-
-#: ../yummain.py:333
-#, c-format
-msgid "Transaction(s) Complete"
-msgstr ""
-
-#: ../urlgrabber.py:311 ../urlgrabber.py:344
-#, c-format
-msgid "IOError: %s"
-msgstr ""
-
-#: ../clientStuff.py:958
-#, c-format
-msgid "Cleaning packages and old headers"
-msgstr ""
-
-#: ../clientStuff.py:809
-#, c-format
-msgid "Cannot download %s in caching only mode or when running as non-root user."
-msgstr ""
-
-#: ../clientStuff.py:1029 ../clientStuff.py:1034 ../clientStuff.py:1038
-#: ../clientStuff.py:1043
-#, c-format
-msgid ""
-"Error: You may want to run yum clean or remove the file: \n"
-" %s"
-msgstr ""
-
-#: ../bin/yum:49
-#, c-format
-msgid "Unable to check if PID %s is active"
-msgstr ""
-
-#: ../lilocfg.py:61
-#, c-format
-msgid ""
-"Error reading lilo.conf: The messages was:\n"
-msgstr ""
-
-#: ../yummain.py:232
-#, c-format
-msgid "No groups provided or accessible on any server."
-msgstr ""
-
-#: ../pkgaction.py:464
-#, c-format
-msgid "%s results returned"
-msgstr ""
-
-#: ../pullheaders.py:170 ../pullheaders.py:176
-#, c-format
-msgid "Error moving %s to %s, fatal"
-msgstr ""
-
-#: ../yummain.py:294
-#, c-format
-msgid "Running test transaction:"
-msgstr ""
-
-#: ../pullheaders.py:262
-#, c-format
-msgid ""
-"\n"
-"ignoring bad rpm: %s"
-msgstr ""
-
-#: ../clientStuff.py:495
-#, c-format
-msgid "[erase: %s]"
-msgstr ""
-
-#: ../pullheaders.py:196
-#, c-format
-msgid "%s is not a dir"
-msgstr ""
-
-#: ../nevral.py:349
-#, c-format
-msgid "bestarch = %s for %s"
-msgstr ""
-
-#: ../clientStuff.py:419 ../nevral.py:237
-#, c-format
-msgid "Best version for %s is %s:%s-%s"
-msgstr ""
-
-#: ../clientStuff.py:506 ../clientStuff.py:517
-#, c-format
-msgid "[deps: %s]"
+#: ../output.py:267
+#, python-format
+msgid "Name   : %s"
 msgstr ""
 
-#: ../pkgaction.py:267
-#, c-format
-msgid "Version"
+#: ../output.py:268
+#, python-format
+msgid "Arch   : %s"
 msgstr ""
 
-#: ../clientStuff.py:921
-#, c-format
-msgid "Looking in Available Packages:"
+#: ../output.py:270
+#, python-format
+msgid "Epoch  : %s"
 msgstr ""
 
-#: ../pullheaders.py:268
-#, c-format
-msgid ""
-"\n"
-"ignoring srpm: %s"
+#: ../output.py:271
+#, python-format
+msgid "Version: %s"
 msgstr ""
 
-#: ../serverStuff.py:77
-#, c-format
-msgid "Checking deps %d/%d complete"
+#: ../output.py:272
+#, python-format
+msgid "Release: %s"
 msgstr ""
 
-#: ../pkgaction.py:457
-#, c-format
-msgid ""
-"Installed package: %s.%s %s:%s-%s matches with\n"
-" %s"
+#: ../output.py:273
+#, python-format
+msgid "Size   : %s"
 msgstr ""
 
-#: ../pullheaders.py:122
-#, c-format
-msgid ""
-"Errors within the dir(s):\n"
-" %s"
+#: ../output.py:274
+#, python-format
+msgid "Repo   : %s"
 msgstr ""
 
-#: ../pkgaction.py:317
-#, c-format
+#: ../output.py:275
+#, python-format
 msgid "Summary: %s"
 msgstr ""
 
-#: ../rpmUtils.py:260
-#, c-format
-msgid "Error opening rpm %s - error %s"
-msgstr ""
-
-#: ../clientStuff.py:763 ../clientStuff.py:789
-#, c-format
-msgid "Please run yum in non-caching mode to correct this header."
-msgstr ""
-
-#: ../pullheaders.py:222
-#, c-format
-msgid "Cannot delete file %s"
-msgstr ""
-
-#: ../lilocfg.py:43
-#, c-format
+#: ../output.py:276
+#, python-format
 msgid ""
-"Error installing lilo.conf  The message was:\n"
-msgstr ""
-
-#: ../clientStuff.py:1037
-#, c-format
-msgid "Error: Untrusted GPG key on %s"
-msgstr ""
-
-#: ../clientStuff.py:923
-#, c-format
-msgid "Looking in Installed Packages:"
+"Description:\n"
+"%s"
 msgstr ""
 
-#: ../clientStuff.py:971
-#, c-format
-msgid "Invalid clean option %s"
+#: ../yumcommands.py:35
+msgid "You need to be root to perform this command."
 msgstr ""
 
-#: ../pullheaders.py:258
-#, c-format
+#: ../yumcommands.py:42
 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"
-"Problem with gpg sig or md5sum on %s\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 ""
 
-#: ../pkgaction.py:313
-#, c-format
-msgid "Release: %s"
-msgstr ""
-
-#: ../pkgaction.py:76
-#, c-format
-msgid "No Packages Available for Update or Install"
+#: ../yumcommands.py:62
+#, python-format
+msgid "Error: Need to pass a list of pkgs to %s"
 msgstr ""
 
-#: ../pkgaction.py:56 ../pkgaction.py:67
-#, c-format
-msgid "%s is installed and is the latest version."
+#: ../yumcommands.py:68
+msgid "Error: Need an item to match"
 msgstr ""
 
-#: ../nevral.py:261
-#, c-format
-msgid "Found best arch for install only pkg %s"
+#: ../yumcommands.py:74
+msgid "Error: Need a group or list of groups"
 msgstr ""
 
-#: ../clientStuff.py:844 ../clientStuff.py:856
-#, c-format
-msgid "Looking in installed packages for a providing package"
+#: ../yumcommands.py:83
+#, python-format
+msgid "Error: clean requires an option: %s"
 msgstr ""
 
-#: ../clientStuff.py:468
-#, c-format
-msgid "I will do the following:"
+#: ../yumcommands.py:88
+#, python-format
+msgid "Error: invalid clean argument: %r"
 msgstr ""
 
-#: ../urlgrabber.py:279 ../urlgrabber.py:309
-#, c-format
-msgid "Bad URL: %s"
+#: ../yumcommands.py:108
+#, python-format
+msgid "File %s given as argument to shell does not exist."
 msgstr ""
 
-#: ../clientStuff.py:1003
-#, c-format
-msgid "NonMatching RPM version, %s, removing."
+#: ../yumcommands.py:114
+msgid "Error: more than one file given as argument to shell."
 msgstr ""
 
-#: ../clientStuff.py:509
-#, c-format
-msgid "I will erase these to satisfy the dependencies:"
+#: ../yum/__init__.py:114
+msgid "doConfigSetup() will go away in a future version of Yum.\n"
 msgstr ""
 
-#: ../clientStuff.py:522 ../clientStuff.py:561
-#, c-format
-msgid "Updated: "
+#: ../yum/__init__.py:270
+#, python-format
+msgid "Repository %r is missing name in configuration, using id"
 msgstr ""
 
-#: ../lilocfg.py:407
-#, c-format
-msgid "Error parsing command line arguments: %s"
+#: ../yum/__init__.py:306
+msgid "plugins already initialised"
 msgstr ""
 
-#: ../yummain.py:214
-#, c-format
-msgid "Finding obsoleted packages"
+#: ../yum/__init__.py:313
+msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
 msgstr ""
 
-#: ../urlgrabber.py:315 ../urlgrabber.py:348
-#, c-format
-msgid "HTTP Error (%s): %s"
+#: ../yum/__init__.py:322
+msgid "Reading Local RPMDB"
 msgstr ""
 
-#: ../serverStuff.py:96
-#, c-format
-msgid "depcheck: package %s conflicts with %s"
+#: ../yum/__init__.py:340
+msgid "doRepoSetup() will go away in a future version of Yum.\n"
 msgstr ""
 
-#: ../clientStuff.py:761 ../clientStuff.py:787
-#, c-format
-msgid "Please ask your sysadmin to update the headers on this system."
+#: ../yum/__init__.py:358
+msgid "doSackSetup() will go away in a future version of Yum.\n"
 msgstr ""
 
-#: ../clientStuff.py:851
-#, c-format
-msgid "Need an item to search"
+#: ../yum/__init__.py:375
+msgid "Setting up Package Sacks"
 msgstr ""
 
-#: ../pullheaders.py:178
-#, c-format
-msgid "Putting back old headers"
+#: ../yum/__init__.py:417
+#, python-format
+msgid "repo object for repo %s lacks a _resetSack method\n"
 msgstr ""
 
-#: ../clientStuff.py:735
-#, c-format
-msgid "CacheDir: %s"
+#: ../yum/__init__.py:418
+msgid "therefore this repo cannot be reset.\n"
 msgstr ""
 
-#: ../callback.py:88
-#, c-format
-msgid "Completing update for %s  - %d/%d"
+#: ../yum/__init__.py:423
+msgid "doUpdateSetup() will go away in a future version of Yum.\n"
 msgstr ""
 
-#: ../clientStuff.py:1044
-#, c-format
-msgid ""
-"Error: You may need to disable gpg checking to install this package\n"
+#: ../yum/__init__.py:435
+msgid "Building updates object"
 msgstr ""
 
-#: ../yummain.py:128
-#, c-format
-msgid "Options Error: no commands found"
+#: ../yum/__init__.py:458
+msgid "doGroupSetup() will go away in a future version of Yum.\n"
 msgstr ""
 
-#: ../serverStuff.py:85
-#, c-format
-msgid "adding %s"
+#: ../yum/__init__.py:481
+msgid "Getting group metadata"
 msgstr ""
 
-#: ../grubcfg.py:22
-#, c-format
-msgid ""
-"Unable to run grubby correctly: the message was:\n"
+#: ../yum/__init__.py:507
+#, python-format
+msgid "Adding group file from repository: %s"
 msgstr ""
 
-#: ../urlgrabber.py:293
-#, c-format
-msgid "Not a normal file: %s"
+#: ../yum/__init__.py:512
+#, python-format
+msgid "Failed to add groups file for repository: %s - %s"
 msgstr ""
 
-#: ../bin/yum:71
-#, c-format
-msgid "IOError - # %s - %s"
+#: ../yum/__init__.py:518
+msgid "No Groups Available in any repository"
 msgstr ""
 
-#: ../pkgaction.py:510
-#, c-format
-msgid "Kernel Updated/Installed, checking for bootloader"
+#: ../yum/__init__.py:569
+msgid "Importing additional filelist information"
 msgstr ""
 
-#: ../clientStuff.py:828
-#, c-format
-msgid "Need to pass a list of pkgs to install"
+#: ../yum/__init__.py:600
+#, python-format
+msgid "Skip-broken round %i"
 msgstr ""
 
-#: ../clientStuff.py:790 ../clientStuff.py:810
-#, c-format
-msgid "Deleting entry from Available packages"
+#. bail out
+#: ../yum/__init__.py:629
+#, python-format
+msgid "Skip-broken took %i rounds "
 msgstr ""
 
-#: ../pullheaders.py:256
-#, c-format
+#: ../yum/__init__.py:630
 msgid ""
 "\n"
-"Checking sig on %s"
+"Packages skipped because for dependency problems:"
 msgstr ""
 
-#: ../config.py:205
-#, c-format
-msgid "Insufficient server config - no servers found. Aborting."
+#: ../yum/__init__.py:689
+#, python-format
+msgid "Failed to remove transaction file %s"
 msgstr ""
 
-#: ../yummain.py:271
-#, c-format
-msgid "Resolving dependencies"
+#: ../yum/__init__.py:729
+#, python-format
+msgid "excluding for cost: %s from %s"
 msgstr ""
 
-#: ../pkgaction.py:312
-#, c-format
-msgid "Version: %s"
+#: ../yum/__init__.py:760
+msgid "Excluding Packages in global exclude list"
 msgstr ""
 
-#: ../yummain.py:338
-#, c-format
-msgid ""
-"\n"
-"    Usage:  yum [options] <update | upgrade | install | info | remove | list |\n"
-"            clean | provides | search | check-update | groupinstall | groupupdate |\n"
-"            grouplist >\n"
-"                \n"
-"         Options:\n"
-"          -c [config file] - specify the config file to use\n"
-"          -e [error level] - set the error logging level\n"
-"          -d [debug level] - set the debugging level\n"
-"          -y answer yes to all questions\n"
-"          -t be tolerant about errors in package commands\n"
-"          -R [time in minutes] - set the max amount of time to randomly run in.\n"
-"          -C run from cache only - do not update the cache\n"
-"          --installroot=[path] - set the install root (default '/')\n"
-"          --version - output the version of yum\n"
-"          -h, --help this screen\n"
-"    "
+#: ../yum/__init__.py:762
+#, python-format
+msgid "Excluding Packages from %s"
 msgstr ""
 
-#: ../pkgaction.py:259
-#, c-format
-msgid "From %s installing %s"
+#: ../yum/__init__.py:789
+#, python-format
+msgid "Reducing %s to included packages only"
 msgstr ""
 
-#: ../pkgaction.py:538
-#, c-format
-msgid "No bootloader found, Cannot configure kernel, continuing."
+#: ../yum/__init__.py:794
+#, python-format
+msgid "Keeping included package %s"
 msgstr ""
 
-#: ../clientStuff.py:688 ../clientStuff.py:695
-#, c-format
-msgid "Attempt to delete a missing file %s - ignoring."
+#: ../yum/__init__.py:800
+#, python-format
+msgid "Removing unmatched package %s"
 msgstr ""
 
-#: ../rpmUtils.py:25
-#, c-format
-msgid "Header cannot be opened or does not match %s, %s."
+#: ../yum/__init__.py:803
+msgid "Finished"
 msgstr ""
 
-#: ../bin/yum:66
-#, c-format
-msgid "Exiting on User Cancel"
+#. Whoa. What the heck happened?
+#: ../yum/__init__.py:833
+#, python-format
+msgid "Unable to check if PID %s is active"
 msgstr ""
 
-#: ../clientStuff.py:1011
-#, c-format
-msgid "Getting %s"
+#. Another copy seems to be running.
+#: ../yum/__init__.py:837
+#, python-format
+msgid "Existing lock %s: another copy is running as pid %s."
 msgstr ""
 
-#: ../pullheaders.py:150
-#, c-format
-msgid ""
-"\n"
-"Writing header.info file"
+#: ../yum/__init__.py:884 ../yum/__init__.py:891
+msgid "Package does not match intended download"
 msgstr ""
 
-#: ../pullheaders.py:208
-#, c-format
-msgid "Error creating dir %s: %s"
+#: ../yum/__init__.py:905
+msgid "Could not perform checksum"
 msgstr ""
 
-#: ../pkgaction.py:267
-#, c-format
-msgid "Arch"
+#: ../yum/__init__.py:908
+msgid "Package does not match checksum"
 msgstr ""
 
-#: ../clientStuff.py:729
-#, c-format
-msgid "Gathering header information file(s) from server(s)"
+#: ../yum/__init__.py:950
+#, python-format
+msgid "package fails checksum but caching is enabled for %s"
 msgstr ""
 
-#: ../clientStuff.py:756
-#, c-format
-msgid "Using cached header.info file"
+#: ../yum/__init__.py:956
+#, python-format
+msgid "using local copy of %s"
 msgstr ""
 
-#: ../pkgaction.py:300
-#, c-format
-msgid "No Packages Available to List"
+#: ../yum/__init__.py:975
+#, python-format
+msgid "Insufficient space in download directory %s to download"
 msgstr ""
 
-#: ../clientStuff.py:1042
-#, c-format
-msgid "Error: Unsigned Package %s"
+#: ../yum/__init__.py:1008
+msgid "Header is not complete."
 msgstr ""
 
-#: ../pkgaction.py:461
-#, c-format
-msgid "localrpmdb not defined"
-msgstr ""
-
-#: ../lilocfg.py:55
-#, c-format
+#: ../yum/__init__.py:1048
+#, python-format
 msgid ""
-"Error installing the new bootloader: \n"
+"Header not in local cache and caching-only mode enabled. Cannot download %s"
 msgstr ""
 
-#: ../clientStuff.py:1028
-#, c-format
-msgid "Error: Could not find the GPG Key necessary to validate pkg %s"
+#: ../yum/__init__.py:1103
+#, python-format
+msgid "Public key for %s is not installed"
 msgstr ""
 
-#: ../yummain.py:259
-#, c-format
-msgid "No actions to take"
+#: ../yum/__init__.py:1107
+#, python-format
+msgid "Problem opening package %s"
 msgstr ""
 
-#: ../pkgaction.py:431
-#, c-format
-msgid ""
-"Available package: %s.%s %s:%s-%s from %s matches with\n"
-" %s"
+#: ../yum/__init__.py:1115
+#, python-format
+msgid "Public key for %s is not trusted"
 msgstr ""
 
-#: ../pkgaction.py:201
-#, c-format
-msgid "Erase: No matches for %s"
+#: ../yum/__init__.py:1119
+#, python-format
+msgid "Package %s is not signed"
 msgstr ""
 
-#: ../pullheaders.py:124
-#, c-format
-msgid "   "
+#: ../yum/__init__.py:1157
+#, python-format
+msgid "Cannot remove %s"
 msgstr ""
 
-#: ../config.py:203
-#, c-format
-msgid "Error: Cannot find baseurl or name for server '%s'. Skipping"
+#: ../yum/__init__.py:1161
+#, python-format
+msgid "%s removed"
 msgstr ""
 
-#: ../pullheaders.py:224
-#, c-format
-msgid "Odd header %s suddenly disappeared"
+#: ../yum/__init__.py:1193
+#, python-format
+msgid "Cannot remove %s file %s"
 msgstr ""
 
-#: ../pullheaders.py:127
-#, c-format
-msgid "All dependencies resolved and no conflicts detected"
+#: ../yum/__init__.py:1197
+#, python-format
+msgid "%s file %s removed"
 msgstr ""
 
-#: ../pkgaction.py:215
-#, c-format
-msgid "Group %s does not exist"
+#: ../yum/__init__.py:1199
+#, python-format
+msgid "%d %s files removed"
 msgstr ""
 
-#: ../clientStuff.py:968
-#, c-format
-msgid "Cleaning old headers"
+#: ../yum/__init__.py:1239
+#, python-format
+msgid "More than one identical match in sack for %s"
 msgstr ""
 
-#: ../pkgaction.py:318
-#, c-format
-msgid ""
-"Description:\n"
-" %s"
+#: ../yum/__init__.py:1245
+#, python-format
+msgid "Nothing matches %s.%s %s:%s-%s from update"
 msgstr ""
 
-#: ../clientStuff.py:933 ../clientStuff.py:949
-#, c-format
-msgid "Need a list of groups to update"
+#: ../yum/__init__.py:1434
+msgid ""
+"searchPackages() will go away in a future version of "
+"Yum.                      Use searchGenerator() instead. \n"
 msgstr ""
 
-#: ../clientStuff.py:719
-#, c-format
-msgid "using cached groups from server: %s"
+#: ../yum/__init__.py:1471
+#, python-format
+msgid "Searching %d packages"
 msgstr ""
 
-#: ../pkgaction.py:316
-#, c-format
-msgid "Repo   : %s"
+#: ../yum/__init__.py:1475
+#, python-format
+msgid "searching package %s"
 msgstr ""
 
-#: ../clientStuff.py:711
-#, c-format
-msgid "getting groups from server: %s"
+#: ../yum/__init__.py:1484
+msgid "searching in file entries"
 msgstr ""
 
-#: ../clientStuff.py:823
-#, c-format
-msgid "You need to be root to perform these commands"
+#: ../yum/__init__.py:1490
+msgid "searching in provides entries"
 msgstr ""
 
-#: ../pkgaction.py:466
-#, c-format
-msgid "No packages found"
+#: ../yum/__init__.py:1520
+#, python-format
+msgid "Provides-match: %s"
 msgstr ""
 
-#: ../yummain.py:233
-#, c-format
-msgid "Exiting."
+#: ../yum/__init__.py:1589 ../yum/__init__.py:1607 ../yum/__init__.py:1635
+#: ../yum/__init__.py:1640 ../yum/__init__.py:1695 ../yum/__init__.py:1699
+#, python-format
+msgid "No Group named %s exists"
 msgstr ""
 
-#: ../nevral.py:183
-#, c-format
-msgid "asking for package %s.%s - does not exist in nevral - bailing out - check rpmdb for errors"
+#: ../yum/__init__.py:1618 ../yum/__init__.py:1711
+#, python-format
+msgid "package %s was not marked in group %s"
 msgstr ""
 
-#: ../clientStuff.py:1068
-#, c-format
-msgid "Errors reported doing trial run"
+#: ../yum/__init__.py:1657
+#, python-format
+msgid "Adding package %s from group %s"
 msgstr ""
 
-#: ../pkgaction.py:518
-#, c-format
-msgid "Lilo found - adding kernel to lilo and making it the default"
+#: ../yum/__init__.py:1661
+#, python-format
+msgid "No package named %s available to be installed"
 msgstr ""
 
-#: ../pkgaction.py:310
-#, c-format
-msgid "Name   : %s"
+#: ../yum/__init__.py:1736
+#, python-format
+msgid "Package tuple %s could not be found in packagesack"
 msgstr ""
 
-#: ../clientStuff.py:521 ../clientStuff.py:560
-#, c-format
-msgid "Dep Installed: "
+#: ../yum/__init__.py:1804 ../yum/__init__.py:1847
+msgid "Invalid versioned dependency string, try quoting it."
 msgstr ""
 
-#: ../clientStuff.py:486
-#, c-format
-msgid "[update: %s]"
+#: ../yum/__init__.py:1806 ../yum/__init__.py:1849
+msgid "Invalid version flag"
 msgstr ""
 
-#: ../pkgaction.py:71
-#, c-format
-msgid "Cannot find a package matching %s"
+#: ../yum/__init__.py:1821 ../yum/__init__.py:1825
+#, python-format
+msgid "No Package found for %s"
 msgstr ""
 
-#: ../urlgrabber.py:325
-#, c-format
-msgid "ERROR: Url Return no Content-Length  - something is wrong"
+#: ../yum/__init__.py:1954
+msgid "Package Object was not a package object instance"
 msgstr ""
 
-#: ../clientStuff.py:721
-#, c-format
-msgid "Got a file - yay"
+#: ../yum/__init__.py:1958
+msgid "Nothing specified to install"
 msgstr ""
 
-#: ../pkgaction.py:257
-#, c-format
-msgid "From %s updating %s"
+#. only one in there
+#: ../yum/__init__.py:1970
+#, python-format
+msgid "Checking for virtual provide or file-provide for %s"
 msgstr ""
 
-#: ../yummain.py:298
-#, c-format
-msgid "Test transaction complete, Success!"
+#. FIXME - this is where we could check to see if it already installed
+#. for returning better errors
+#: ../yum/__init__.py:2008
+msgid "No package(s) available to install"
 msgstr ""
 
-#: ../serverStuff.py:52
-#, c-format
-msgid ""
-"Usage:\n"
-"yum-arch [-v] [-z] [-l] [-c] [-n] [-d] [-q] [-vv] (path of dir where headers/ should/does live)\n"
-"   -d  = check dependencies and conflicts in tree\n"
-"   -v  = more verbose output\n"
-"   -vv = even more verbose output\n"
-"   -n  = don't generate headers\n"
-"   -c  = check pkgs with gpg and md5 checksums - cannot be used with -n\n"
-"   -z  = gzip compress the headers (default, deprecated as an option)\n"
-"   -s  = generate headers for source packages too\n"
-"   -l  = use symlinks as valid rpms when building headers\n"
-"   -q  = make the display more quiet"
+#: ../yum/__init__.py:2019
+#, python-format
+msgid "Package: %s  - already in transaction set"
 msgstr ""
 
-#: ../clientStuff.py:785
-#, c-format
-msgid "The file %s is damaged."
+#: ../yum/__init__.py:2032
+#, python-format
+msgid "Package %s already installed and latest version"
 msgstr ""
 
-#: ../pkgaction.py:267
-#, c-format
-msgid "Repo"
+#. update everything (the easy case)
+#: ../yum/__init__.py:2073
+msgid "Updating Everything"
 msgstr ""
 
-#: ../bin/yum:53
-#, c-format
-msgid "Existing lock %s: another copy is running. Aborting."
+#: ../yum/__init__.py:2085 ../yum/__init__.py:2164 ../yum/__init__.py:2176
+#, python-format
+msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
 msgstr ""
 
-#: ../clientStuff.py:188 ../clientStuff.py:195 ../rpmUtils.py:232
-#: ../rpmUtils.py:239 ../rpmUtils.py:242 ../rpmUtils.py:245
-#, c-format
-msgid "Damaged Header %s"
+#: ../yum/__init__.py:2157
+#, python-format
+msgid "Package is already obsoleted: %s.%s %s:%s-%s"
 msgstr ""
 
-#: ../clientStuff.py:962
-#, c-format
-msgid "Cleaning packages"
+#. should this even be happening?
+#: ../yum/__init__.py:2228
+msgid "No package matched to remove"
 msgstr ""
 
-#: ../pkgaction.py:315
-#, c-format
-msgid "Group  : %s"
+#: ../yum/__init__.py:2262
+#, python-format
+msgid "Cannot open file: %s. Skipping."
 msgstr ""
 
-#: ../clientStuff.py:734
-#, c-format
-msgid "Server: %s"
+#: ../yum/__init__.py:2265
+#, python-format
+msgid "Examining %s: %s"
 msgstr ""
 
-#: ../pkgaction.py:539
-#, c-format
-msgid "No bootloader found, Cannot configure kernel."
+#: ../yum/__init__.py:2272
+#, python-format
+msgid ""
+"Package %s not installed, cannot update it. Run yum install to install it "
+"instead."
 msgstr ""
 
-#: ../pkgaction.py:267
-#, c-format
-msgid "Name"
+#: ../yum/__init__.py:2304
+#, python-format
+msgid "Excluding %s"
 msgstr ""
 
-#: ../clientStuff.py:477
-#, c-format
-msgid "[install: %s]"
+#: ../yum/__init__.py:2309
+#, python-format
+msgid "Marking %s to be installed"
 msgstr ""
 
-#: ../yummain.py:207
-#, c-format
-msgid "Downloading needed headers"
+#: ../yum/__init__.py:2315
+#, python-format
+msgid "Marking %s as an update to %s"
 msgstr ""
 
-#: ../nevral.py:72
-#, c-format
-msgid "Header for pkg %s not found"
+#: ../yum/__init__.py:2322
+#, python-format
+msgid "%s: does not update installed package."
 msgstr ""
 
-#: ../callback.py:55
-#, c-format
-msgid "No header - huh?"
+#: ../yum/__init__.py:2376
+#, python-format
+msgid "Retrieving GPG key from %s"
 msgstr ""
 
-#: ../clientStuff.py:965
-#, c-format
-msgid "Cleaning all headers"
+#: ../yum/__init__.py:2382
+msgid "GPG key retrieval failed: "
 msgstr ""
 
-#: ../serverStuff.py:93
-#, c-format
-msgid "depcheck: package %s needs %s"
+#: ../yum/__init__.py:2395
+msgid "GPG key parsing failed: "
 msgstr ""
 
-#: ../clientStuff.py:759
-#, c-format
-msgid "Error - %s cannot be found"
+#: ../yum/__init__.py:2399
+#, python-format
+msgid "GPG key at %s (0x%s) is already installed"
 msgstr ""
 
-#: ../rpmUtils.py:45
-#, c-format
-msgid "RPM %s fails md5 check"
+#. Try installing/updating GPG key
+#: ../yum/__init__.py:2404
+#, python-format
+msgid "Importing GPG key 0x%s \"%s\" from %s"
 msgstr ""
 
-#: ../callback.py:85
-#, c-format
-msgid "Erasing: %s %d/%d"
+#: ../yum/__init__.py:2416
+msgid "Not installing key"
 msgstr ""
 
-#: ../pkgaction.py:261
-#, c-format
-msgid "Nothing in any group to update or install"
+#: ../yum/__init__.py:2422
+#, python-format
+msgid "Key import failed (code %d)"
 msgstr ""
 
-#: ../pkgaction.py:311
-#, c-format
-msgid "Arch   : %s"
+#: ../yum/__init__.py:2425
+msgid "Key imported successfully"
 msgstr ""
 
-#: ../nevral.py:52
-#, c-format
-msgid "No Package %s, %s"
+#: ../yum/__init__.py:2430
+#, 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 ""
 
-#: ../pkgaction.py:84
-#, c-format
-msgid "No Packages Available for Update"
+#: ../yum/__init__.py:2439
+msgid "Import of key(s) didn't help, wrong key(s)?"
 msgstr ""
 
-#: ../pkgaction.py:535
-#, c-format
-msgid "Grub found - making this kernel the default"
+#: ../yum/__init__.py:2513
+msgid "Unable to find a suitable mirror."
 msgstr ""
 
-#: ../pullheaders.py:250
-#, c-format
-msgid "Digesting rpm - %s - %d/%d"
+#: ../yum/__init__.py:2515
+msgid "Errors were encountered while downloading packages."
 msgstr ""
 
-#: ../clientStuff.py:994
-#, c-format
-msgid "Damaged RPM %s, removing."
+#: ../yum/__init__.py:2551
+msgid "Running rpm_check_debug"
 msgstr ""
 
-#: ../nevral.py:86
-#, c-format
-msgid "Bad Header for pkg %s.%s trying to get headers for the nevral - exiting"
+#: ../yum/__init__.py:2554
+msgid "ERROR with rpm_check_debug vs depsolve:"
 msgstr ""
 
-#: ../clientStuff.py:1030 ../clientStuff.py:1039
-#, c-format
-msgid "Error: You may also check that you have the correct GPG keys installed"
+#: ../yum/__init__.py:2556
+msgid "Please report this error in bugzilla"
 msgstr ""
 
-#: ../pullheaders.py:115
-#, c-format
-msgid "No rpms to work with and no header dir. Exiting."
+#: ../yum/__init__.py:2579
+msgid "Test Transaction Errors: "
 msgstr ""
 
-#: ../yummain.py:288
-#, c-format
-msgid "Exiting on user command."
+#: ../yum/__init__.py:2614
+#, python-format
+msgid "Package %s needs %s, this is not available."
 msgstr ""
 
-#: ../config.py:212
-#, c-format
-msgid "Failed to find section: %s"
+#: ../yum/__init__.py:2619
+#, python-format
+msgid "Package %s conflicts with %s."
 msgstr ""
 
-#: ../rpmUtils.py:162
-#, c-format
-msgid "Got an empty Header, something has gone wrong"
+#: ../rpmUtils/oldUtils.py:26
+#, python-format
+msgid "Header cannot be opened or does not match %s, %s."
 msgstr ""
 
-#: ../serverStuff.py:80
-#, c-format
-msgid "ignoring bad rpm: %s"
+#: ../rpmUtils/oldUtils.py:46
+#, python-format
+msgid "RPM %s fails md5 check"
 msgstr ""
 
-#: ../pullheaders.py:89
-#, c-format
-msgid "Directory of rpms must be a directory."
+#: ../rpmUtils/oldUtils.py:144
+msgid "Could not open RPM database for reading. Perhaps it is already in use?"
 msgstr ""
 
-#: ../clientStuff.py:1149
-#, c-format
-msgid "failover: out of servers to try"
+#: ../rpmUtils/oldUtils.py:174
+msgid "Got an empty Header, something has gone wrong"
 msgstr ""
 
-#: ../clientStuff.py:746
-#, c-format
-msgid "Getting header.info from server"
+#: ../rpmUtils/oldUtils.py:244 ../rpmUtils/oldUtils.py:251
+#: ../rpmUtils/oldUtils.py:254 ../rpmUtils/oldUtils.py:257
+#, python-format
+msgid "Damaged Header %s"
 msgstr ""
 
-#: ../nevral.py:50
-#, c-format
-msgid "No Package %s"
+#: ../rpmUtils/oldUtils.py:272
+#, python-format
+msgid "Error opening rpm %s - error %s"
 msgstr ""
-
diff --git a/utils.py b/utils.py
index 10f980c..d132ba8 100644
--- a/utils.py
+++ b/utils.py
@@ -17,7 +17,7 @@ import sys
 
 import yum
 from cli import *
-from i18n import _
+from yum.i18n import _
 
 
 import yum.plugins as plugins
diff --git a/yum/__init__.py b/yum/__init__.py
index 29e00df..0ec2d19 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -61,6 +61,7 @@ warnings.simplefilter("ignore", Errors.YumFutureDeprecationWarning)
 from packages import parsePackages, YumAvailablePackage, YumLocalPackage, YumInstalledPackage
 from constants import *
 from yum.rpmtrans import RPMTransaction,SimpleCliCallBack
+from yum.i18n import _
 
 __version__ = '3.2.10'
 
@@ -110,7 +111,7 @@ class YumBase(depsolve.Depsolve):
     def doConfigSetup(self, fn='/etc/yum/yum.conf', root='/', init_plugins=True,
             plugin_types=(plugins.TYPE_CORE,), optparser=None, debuglevel=None,
             errorlevel=None):
-        warnings.warn('doConfigSetup() will go away in a future version of Yum.\n',
+        warnings.warn(_('doConfigSetup() will go away in a future version of Yum.\n'),
                 Errors.YumFutureDeprecationWarning, stacklevel=2)
                 
         return self._getConfig(fn=fn, root=root, init_plugins=init_plugins,
@@ -266,8 +267,8 @@ class YumBase(depsolve.Depsolve):
         # Ensure that the repo name is set
         if not repo.name:
             repo.name = section
-            self.logger.error('Repository %r is missing name in configuration, '
-                    'using id' % section)
+            self.logger.error(_('Repository %r is missing name in configuration, '
+                    'using id') % section)
 
         # Set attributes not from the config file
         repo.basecachedir = self.conf.cachedir
@@ -302,14 +303,14 @@ class YumBase(depsolve.Depsolve):
         @param disabled_plugins: Plugins to be disabled    
         '''
         if isinstance(self.plugins, plugins.YumPlugins):
-            raise RuntimeError("plugins already initialised")
+            raise RuntimeError(_("plugins already initialised"))
 
         self.plugins = plugins.YumPlugins(self, searchpath, optparser,
                 plugin_types, confpath, disabled_plugins)
 
     
     def doRpmDBSetup(self):
-        warnings.warn('doRpmDBSetup() will go away in a future version of Yum.\n',
+        warnings.warn(_('doRpmDBSetup() will go away in a future version of Yum.\n'),
                 Errors.YumFutureDeprecationWarning, stacklevel=2)
 
         return self._getRpmDB()
@@ -318,7 +319,7 @@ class YumBase(depsolve.Depsolve):
         """sets up a holder object for important information from the rpmdb"""
 
         if self._rpmdb is None:
-            self.verbose_logger.debug('Reading Local RPMDB')
+            self.verbose_logger.debug(_('Reading Local RPMDB'))
             self._rpmdb = rpmsack.RPMDBPackageSack(root=self.conf.installroot)
         
         return self._rpmdb
@@ -336,7 +337,7 @@ class YumBase(depsolve.Depsolve):
         self._ts = None
 
     def doRepoSetup(self, thisrepo=None):
-        warnings.warn('doRepoSetup() will go away in a future version of Yum.\n',
+        warnings.warn(_('doRepoSetup() will go away in a future version of Yum.\n'),
                 Errors.YumFutureDeprecationWarning, stacklevel=2)
 
         return self._getRepos(thisrepo, True)
@@ -354,7 +355,7 @@ class YumBase(depsolve.Depsolve):
         self._repos = RepoStorage(self)
     
     def doSackSetup(self, archlist=None, thisrepo=None):
-        warnings.warn('doSackSetup() will go away in a future version of Yum.\n',
+        warnings.warn(_('doSackSetup() will go away in a future version of Yum.\n'),
                 Errors.YumFutureDeprecationWarning, stacklevel=2)
 
         return self._getSacks(archlist=archlist, thisrepo=thisrepo)
@@ -371,7 +372,7 @@ class YumBase(depsolve.Depsolve):
         else:
             repos = self.repos.findRepos(thisrepo)
         
-        self.verbose_logger.debug('Setting up Package Sacks')
+        self.verbose_logger.debug(_('Setting up Package Sacks'))
         if not archlist:
             archlist = rpmUtils.arch.getArchList()
         
@@ -413,13 +414,13 @@ class YumBase(depsolve.Depsolve):
             if hasattr(repo, '_resetSack'):
                 repo._resetSack()
             else:
-                warnings.warn('repo object for repo %s lacks a _resetSack method\n' +
-                        'therefore this repo cannot be reset.\n',
+                warnings.warn(_('repo object for repo %s lacks a _resetSack method\n') +
+                        _('therefore this repo cannot be reset.\n'),
                         Errors.YumFutureDeprecationWarning, stacklevel=2)
             
            
     def doUpdateSetup(self):
-        warnings.warn('doUpdateSetup() will go away in a future version of Yum.\n',
+        warnings.warn(_('doUpdateSetup() will go away in a future version of Yum.\n'),
                 Errors.YumFutureDeprecationWarning, stacklevel=2)
 
         return self._getUpdates()
@@ -431,7 +432,7 @@ class YumBase(depsolve.Depsolve):
         if self._up:
             return self._up
 
-        self.verbose_logger.debug('Building updates object')
+        self.verbose_logger.debug(_('Building updates object'))
         sack_pkglist = self.pkgSack.simplePkgList()
         rpmdb_pkglist = self.rpmdb.simplePkgList()        
         self._up = rpmUtils.updates.Updates(rpmdb_pkglist, sack_pkglist)
@@ -454,7 +455,7 @@ class YumBase(depsolve.Depsolve):
         return self._up
     
     def doGroupSetup(self):
-        warnings.warn('doGroupSetup() will go away in a future version of Yum.\n',
+        warnings.warn(_('doGroupSetup() will go away in a future version of Yum.\n'),
                 Errors.YumFutureDeprecationWarning, stacklevel=2)
 
         self.comps = None
@@ -477,7 +478,7 @@ class YumBase(depsolve.Depsolve):
         if self._comps:
             return self._comps
             
-        self.verbose_logger.debug('Getting group metadata')
+        self.verbose_logger.debug(_('Getting group metadata'))
         reposWithGroups = []
         self.repos.doSetup()
         for repo in self.repos.listGroupsEnabled():
@@ -503,18 +504,18 @@ class YumBase(depsolve.Depsolve):
                 continue
                 
             self.verbose_logger.log(logginglevels.DEBUG_1,
-                'Adding group file from repository: %s', repo)
+                _('Adding group file from repository: %s'), repo)
             groupfile = repo.getGroups()
             try:
                 self._comps.add(groupfile)
             except (Errors.GroupsError,Errors.CompsException), e:
-                msg = 'Failed to add groups file for repository: %s - %s' % (repo, str(e))
+                msg = _('Failed to add groups file for repository: %s - %s') % (repo, str(e))
                 self.logger.critical(msg)
             else:
                 repo.groups_added = True
 
         if self._comps.compscount == 0:
-            raise Errors.GroupsError, 'No Groups Available in any repository'
+            raise Errors.GroupsError, _('No Groups Available in any repository')
         
         pkglist = self.rpmdb.simplePkgList()
         self._comps.compile(pkglist)
@@ -565,7 +566,7 @@ class YumBase(depsolve.Depsolve):
                     necessary = True
 
         if necessary:
-            msg = 'Importing additional filelist information'
+            msg = _('Importing additional filelist information')
             self.verbose_logger.log(logginglevels.INFO_2, msg)
             self.repos.populateSack(mdtype='filelists')
            
@@ -596,7 +597,7 @@ class YumBase(depsolve.Depsolve):
         skip_messages = []
         while len(self.po_with_problems) > 0 and rescode == 1:
             count += 1
-            self.verbose_logger.debug("Skip-broken round %i", count)
+            self.verbose_logger.debug(_("Skip-broken round %i"), count)
             depTree = self._buildDepTree()
             startTs = set(self.tsInfo)
             toRemove = set()
@@ -625,8 +626,8 @@ class YumBase(depsolve.Depsolve):
              # if there is no changes then we got a loop.
             if startTs-endTs == set():
                 break    # bail out
-        self.verbose_logger.debug("Skip-broken took %i rounds ", count)
-        self.verbose_logger.info('\nPackages skipped because for dependency problems:')
+        self.verbose_logger.debug(_("Skip-broken took %i rounds "), count)
+        self.verbose_logger.info(_('\nPackages skipped because for dependency problems:'))
         for msg in skip_messages:
             self.verbose_logger.info(msg)
         
@@ -685,7 +686,7 @@ class YumBase(depsolve.Depsolve):
                     try:
                         os.unlink(fn)
                     except (IOError, OSError), e:
-                        self.logger.critical('Failed to remove transaction file %s' % fn)
+                        self.logger.critical(_('Failed to remove transaction file %s') % fn)
 
         self.plugins.run('posttrans')
     
@@ -725,7 +726,7 @@ class YumBase(depsolve.Depsolve):
             #print '%s : %s : %s' % (pkgs[0], pkgs[0].repo, pkgs[0].repo.cost)
             for pkg in pkgs[1:]:
                 if pkg.repo.cost > lowcost:
-                    msg = 'excluding for cost: %s from %s' % (pkg, pkg.repo.id)
+                    msg = _('excluding for cost: %s from %s') % (pkg, pkg.repo.id)
                     self.verbose_logger.log(logginglevels.DEBUG_3, msg)
                     pkg.repo.sack.delPackage(pkg)
             
@@ -756,9 +757,9 @@ class YumBase(depsolve.Depsolve):
             return
 
         if not repo:
-            self.verbose_logger.log(logginglevels.INFO_2, 'Excluding Packages in global exclude list')
+            self.verbose_logger.log(logginglevels.INFO_2, _('Excluding Packages in global exclude list'))
         else:
-            self.verbose_logger.log(logginglevels.INFO_2, 'Excluding Packages from %s',
+            self.verbose_logger.log(logginglevels.INFO_2, _('Excluding Packages from %s'),
                 repo.name)
         
         exactmatch, matched, unmatched = \
@@ -785,21 +786,21 @@ class YumBase(depsolve.Depsolve):
            parsePackages(pkglist, includelist, casematch=1)
         
         self.verbose_logger.log(logginglevels.INFO_2,
-            'Reducing %s to included packages only', repo.name)
+            _('Reducing %s to included packages only'), repo.name)
         rmlist = []
         
         for po in pkglist:
             if po in exactmatch + matched:
-                self.verbose_logger.debug('Keeping included package %s', po)
+                self.verbose_logger.debug(_('Keeping included package %s'), po)
                 continue
             else:
                 rmlist.append(po)
         
         for po in rmlist:
-            self.verbose_logger.debug('Removing unmatched package %s', po)
+            self.verbose_logger.debug(_('Removing unmatched package %s'), po)
             po.repo.sack.delPackage(po)
             
-        self.verbose_logger.log(logginglevels.INFO_2, 'Finished')
+        self.verbose_logger.log(logginglevels.INFO_2, _('Finished'))
         
     def doLock(self, lockfile = YUM_PID_FILE):
         """perform the yum locking, raise yum-based exceptions, not OSErrors"""
@@ -829,11 +830,11 @@ class YumBase(depsolve.Depsolve):
                         self._unlock(lockfile)
                     else:
                         # Whoa. What the heck happened?
-                        msg = 'Unable to check if PID %s is active' % oldpid
+                        msg = _('Unable to check if PID %s is active') % oldpid
                         raise Errors.LockError(1, msg)
                 else:
                     # Another copy seems to be running.
-                    msg = 'Existing lock %s: another copy is running as pid %s.' % (lockfile, oldpid)
+                    msg = _('Existing lock %s: another copy is running as pid %s.') % (lockfile, oldpid)
                     raise Errors.LockError(0, msg)
     
     def doUnlock(self, lockfile = YUM_PID_FILE):
@@ -880,14 +881,14 @@ class YumBase(depsolve.Depsolve):
             
         if not po.verifyLocalPkg():
             if raiseError:
-                raise URLGrabError(-1, 'Package does not match intended download')
+                raise URLGrabError(-1, _('Package does not match intended download'))
             else:
                 return False
 
         ylp = YumLocalPackage(self.rpmdb.readOnlyTS(), fo)
         if ylp.pkgtup != po.pkgtup:
             if raiseError:
-                raise URLGrabError(-1, 'Package does not match intended download')
+                raise URLGrabError(-1, _('Package does not match intended download'))
             else:
                 return False
         
@@ -901,10 +902,10 @@ class YumBase(depsolve.Depsolve):
         try:
             filesum = misc.checksum(checksumType, fo)
         except Errors.MiscError, e:
-            raise URLGrabError(-3, 'Could not perform checksum')
+            raise URLGrabError(-3, _('Could not perform checksum'))
             
         if filesum != csum:
-            raise URLGrabError(-1, 'Package does not match checksum')
+            raise URLGrabError(-1, _('Package does not match checksum'))
         
         return 0
             
@@ -946,13 +947,13 @@ class YumBase(depsolve.Depsolve):
                 if not po.verifyLocalPkg():
                     if po.repo.cache:
                         repo_cached = True
-                        adderror(po, 'package fails checksum but caching is '
-                            'enabled for %s' % po.repo.id)
+                        adderror(po, _('package fails checksum but caching is '
+                            'enabled for %s') % po.repo.id)
                         
                     if cursize >= totsize: # otherwise keep it around for regetting
                         os.unlink(local)
                 else:
-                    self.verbose_logger.debug("using local copy of %s" %(po,))
+                    self.verbose_logger.debug(_("using local copy of %s") %(po,))
                     continue
                         
             remote_pkgs.append(po)
@@ -971,8 +972,8 @@ class YumBase(depsolve.Depsolve):
             checkfunc = (self.verifyPkg, (po, 1), {})
             dirstat = os.statvfs(po.repo.pkgdir)
             if (dirstat.f_bavail * dirstat.f_bsize) <= long(po.size):
-                adderror(po, 'Insufficient space in download directory %s '
-                        'to download' % po.repo.pkgdir)
+                adderror(po, _('Insufficient space in download directory %s '
+                        'to download') % po.repo.pkgdir)
                 continue
             
             try:
@@ -1004,7 +1005,7 @@ class YumBase(depsolve.Depsolve):
             hdr = hlist[0]
         except (rpm.error, IndexError):
             if raiseError:
-                raise URLGrabError(-1, 'Header is not complete.')
+                raise URLGrabError(-1, _('Header is not complete.'))
             else:
                 return 0
                 
@@ -1044,7 +1045,7 @@ class YumBase(depsolve.Depsolve):
         else:
             if self.conf.cache:
                 raise Errors.RepoError, \
-                'Header not in local cache and caching-only mode enabled. Cannot download %s' % po.hdrpath
+                _('Header not in local cache and caching-only mode enabled. Cannot download %s') % po.hdrpath
         
         if self.dsCallback: self.dsCallback.downloadHeader(po.name)
         
@@ -1099,11 +1100,11 @@ class YumBase(depsolve.Depsolve):
                     result = 1
                 else:
                     result = 2
-                msg = 'Public key for %s is not installed' % localfn
+                msg = _('Public key for %s is not installed') % localfn
 
             elif sigresult == 2:
                 result = 2
-                msg = 'Problem opening package %s' % localfn
+                msg = _('Problem opening package %s') % localfn
 
             elif sigresult == 3:
                 if hasgpgkey:
@@ -1111,11 +1112,11 @@ class YumBase(depsolve.Depsolve):
                 else:
                     result = 2
                 result = 1
-                msg = 'Public key for %s is not trusted' % localfn
+                msg = _('Public key for %s is not trusted') % localfn
 
             elif sigresult == 4:
                 result = 2 
-                msg = 'Package %s is not signed' % localfn
+                msg = _('Package %s is not signed') % localfn
             
         else:
             result =0
@@ -1153,11 +1154,11 @@ class YumBase(depsolve.Depsolve):
             try:
                 os.unlink(fn)
             except OSError, e:
-                self.logger.warning('Cannot remove %s', fn)
+                self.logger.warning(_('Cannot remove %s'), fn)
                 continue
             else:
                 self.verbose_logger.log(logginglevels.DEBUG_4,
-                    '%s removed', fn)
+                    _('%s removed'), fn)
         
     def cleanHeaders(self):
         exts = ['hdr']
@@ -1189,13 +1190,13 @@ class YumBase(depsolve.Depsolve):
             try:
                 os.unlink(item)
             except OSError, e:
-                self.logger.critical('Cannot remove %s file %s', filetype, item)
+                self.logger.critical(_('Cannot remove %s file %s'), filetype, item)
                 continue
             else:
                 self.verbose_logger.log(logginglevels.DEBUG_4,
-                    '%s file %s removed', filetype, item)
+                    _('%s file %s removed'), filetype, item)
                 removed+=1
-        msg = '%d %s files removed' % (removed, filetype)
+        msg = _('%d %s files removed') % (removed, filetype)
         return 0, [msg]
 
     def doPackageLists(self, pkgnarrow='all', patterns=None):
@@ -1235,13 +1236,13 @@ class YumBase(depsolve.Depsolve):
                 if len(matches) > 1:
                     updates.append(matches[0])
                     self.verbose_logger.log(logginglevels.DEBUG_1,
-                        'More than one identical match in sack for %s', 
+                        _('More than one identical match in sack for %s'), 
                         matches[0])
                 elif len(matches) == 1:
                     updates.append(matches[0])
                 else:
                     self.verbose_logger.log(logginglevels.DEBUG_1,
-                        'Nothing matches %s.%s %s:%s-%s from update', n,a,e,v,r)
+                        _('Nothing matches %s.%s %s:%s-%s from update'), n,a,e,v,r)
 
         # installed only
         elif pkgnarrow == 'installed':
@@ -1430,8 +1431,8 @@ class YumBase(depsolve.Depsolve):
            as you go. Callback is a simple function of:
            callback(po, matched values list). It will 
            just return a dict of dict[po]=matched values list"""
-        warnings.warn('searchPackages() will go away in a future version of Yum.\
-                      Use searchGenerator() instead. \n',
+        warnings.warn(_('searchPackages() will go away in a future version of Yum.\
+                      Use searchGenerator() instead. \n'),
                 Errors.YumFutureDeprecationWarning, stacklevel=2)           
         matches = {}
         match_gen = self.searchGenerator(fields, criteria)
@@ -1467,11 +1468,11 @@ class YumBase(depsolve.Depsolve):
                 usedDepString = False
                 where = self.pkgSack.searchAll(arg, False)
             self.verbose_logger.log(logginglevels.DEBUG_1,
-                'Searching %d packages', len(where))
+                _('Searching %d packages'), len(where))
             
             for po in where:
                 self.verbose_logger.log(logginglevels.DEBUG_2,
-                    'searching package %s', po)
+                    _('searching package %s'), po)
                 tmpvalues = []
                 
                 
@@ -1480,13 +1481,13 @@ class YumBase(depsolve.Depsolve):
 
                 if isglob or canBeFile:
                     self.verbose_logger.log(logginglevels.DEBUG_2,
-                        'searching in file entries')
+                        _('searching in file entries'))
                     for thisfile in po.dirlist + po.filelist + po.ghostlist:
                         if fnmatch.fnmatch(thisfile, arg):
                             tmpvalues.append(thisfile)
                 
                 self.verbose_logger.log(logginglevels.DEBUG_2,
-                    'searching in provides entries')
+                    _('searching in provides entries'))
                 for (p_name, p_flag, (p_e, p_v, p_r)) in po.provides:
                     prov = misc.prco_tuple_to_string((p_name, p_flag, (p_e, p_v, p_r)))
                     if not usedDepString:
@@ -1516,7 +1517,7 @@ class YumBase(depsolve.Depsolve):
                 usedDepString = True
                 for po in where:
                     tmpvalues = []
-                    msg = 'Provides-match: %s' % arg
+                    msg = _('Provides-match: %s') % arg
                     tmpvalues.append(msg)
 
                     if len(tmpvalues) > 0:
@@ -1585,7 +1586,7 @@ class YumBase(depsolve.Depsolve):
         
         thisgroup = self.comps.return_group(grpid)
         if not thisgroup:
-            raise Errors.GroupsError, "No Group named %s exists" % grpid
+            raise Errors.GroupsError, _("No Group named %s exists") % grpid
 
         thisgroup.toremove = True
         pkgs = thisgroup.packages
@@ -1603,7 +1604,7 @@ class YumBase(depsolve.Depsolve):
 
         thisgroup = self.comps.return_group(grpid)
         if not thisgroup:
-            raise Errors.GroupsError, "No Group named %s exists" % grpid
+            raise Errors.GroupsError, _("No Group named %s exists") % grpid
 
         thisgroup.toremove = False
         pkgs = thisgroup.packages
@@ -1614,7 +1615,7 @@ class YumBase(depsolve.Depsolve):
                         txmbr.groups.remove(grpid)
                     except ValueError:
                         self.verbose_logger.log(logginglevels.DEBUG_1,
-                            "package %s was not marked in group %s", txmbr.po,
+                           _("package %s was not marked in group %s"), txmbr.po,
                             grpid)
                         continue
                     
@@ -1631,12 +1632,12 @@ class YumBase(depsolve.Depsolve):
         txmbrs_used = []
         
         if not self.comps.has_group(grpid):
-            raise Errors.GroupsError, "No Group named %s exists" % grpid
+            raise Errors.GroupsError, _("No Group named %s exists") % grpid
             
         thisgroup = self.comps.return_group(grpid)
         
         if not thisgroup:
-            raise Errors.GroupsError, "No Group named %s exists" % grpid
+            raise Errors.GroupsError, _("No Group named %s exists") % grpid
         
         if thisgroup.selected:
             return txmbrs_used
@@ -1653,11 +1654,11 @@ class YumBase(depsolve.Depsolve):
 
         for pkg in pkgs:
             self.verbose_logger.log(logginglevels.DEBUG_2,
-                'Adding package %s from group %s', pkg, thisgroup.groupid)
+                _('Adding package %s from group %s'), pkg, thisgroup.groupid)
             try:
                 txmbrs = self.install(name = pkg)
             except Errors.InstallError, e:
-                self.verbose_logger.debug('No package named %s available to be installed',
+                self.verbose_logger.debug(_('No package named %s available to be installed'),
                     pkg)
             else:
                 txmbrs_used.extend(txmbrs)
@@ -1691,11 +1692,11 @@ class YumBase(depsolve.Depsolve):
         """de-mark all the packages in the group for install"""
         
         if not self.comps.has_group(grpid):
-            raise Errors.GroupsError, "No Group named %s exists" % grpid
+            raise Errors.GroupsError, _("No Group named %s exists") % grpid
             
         thisgroup = self.comps.return_group(grpid)
         if not thisgroup:
-            raise Errors.GroupsError, "No Group named %s exists" % grpid
+            raise Errors.GroupsError, _("No Group named %s exists") % grpid
         
         thisgroup.selected = False
         
@@ -1707,7 +1708,7 @@ class YumBase(depsolve.Depsolve):
                         txmbr.groups.remove(grpid)
                     except ValueError:
                         self.verbose_logger.log(logginglevels.DEBUG_1,
-                            "package %s was not marked in group %s", txmbr.po,
+                           _("package %s was not marked in group %s"), txmbr.po,
                             grpid)
                         continue
                     
@@ -1732,7 +1733,7 @@ class YumBase(depsolve.Depsolve):
         pkgs = self.pkgSack.searchPkgTuple(pkgtup)
 
         if len(pkgs) == 0:
-            raise Errors.DepError, 'Package tuple %s could not be found in packagesack' % str(pkgtup)
+            raise Errors.DepError, _('Package tuple %s could not be found in packagesack') % str(pkgtup)
             return None
             
         if len(pkgs) > 1: # boy it'd be nice to do something smarter here FIXME
@@ -1800,9 +1801,9 @@ class YumBase(depsolve.Depsolve):
                 try:
                     depname, flagsymbol, depver = depstring.split()
                 except ValueError, e:
-                    raise Errors.YumBaseError, 'Invalid versioned dependency string, try quoting it.'
+                    raise Errors.YumBaseError, _('Invalid versioned dependency string, try quoting it.')
                 if not SYMBOLFLAGS.has_key(flagsymbol):
-                    raise Errors.YumBaseError, 'Invalid version flag'
+                    raise Errors.YumBaseError, _('Invalid version flag')
                 depflags = SYMBOLFLAGS[flagsymbol]
                 
         sack = self.whatProvides(depname, depflags, depver)
@@ -1817,11 +1818,11 @@ class YumBase(depsolve.Depsolve):
         try:
             pkglist = self.returnPackagesByDep(depstring)
         except Errors.YumBaseError:
-            raise Errors.YumBaseError, 'No Package found for %s' % depstring
+            raise Errors.YumBaseError, _('No Package found for %s') % depstring
         
         result = self._bestPackageFromList(pkglist)
         if result is None:
-            raise Errors.YumBaseError, 'No Package found for %s' % depstring
+            raise Errors.YumBaseError, _('No Package found for %s') % depstring
         
         return result
 
@@ -1843,9 +1844,9 @@ class YumBase(depsolve.Depsolve):
                 try:
                     depname, flagsymbol, depver = depstring.split()
                 except ValueError:
-                    raise Errors.YumBaseError, 'Invalid versioned dependency string, try quoting it.'
+                    raise Errors.YumBaseError, _('Invalid versioned dependency string, try quoting it.')
                 if not SYMBOLFLAGS.has_key(flagsymbol):
-                    raise Errors.YumBaseError, 'Invalid version flag'
+                    raise Errors.YumBaseError, _('Invalid version flag')
                 depflags = SYMBOLFLAGS[flagsymbol]
         
         return self.rpmdb.getProvides(depname, depflags, depver).keys()
@@ -1950,11 +1951,11 @@ class YumBase(depsolve.Depsolve):
             if isinstance(po, YumAvailablePackage) or isinstance(po, YumLocalPackage):
                 pkgs.append(po)
             else:
-                raise Errors.InstallError, 'Package Object was not a package object instance'
+                raise Errors.InstallError, _('Package Object was not a package object instance')
             
         else:
             if not kwargs:
-                raise Errors.InstallError, 'Nothing specified to install'
+                raise Errors.InstallError, _('Nothing specified to install')
 
             if kwargs.has_key('pattern'):
                 exactmatch, matched, unmatched = \
@@ -1966,7 +1967,7 @@ class YumBase(depsolve.Depsolve):
                 
                 if len(unmatched) > 0:
                     arg = unmatched[0] #only one in there
-                    self.verbose_logger.debug('Checking for virtual provide or file-provide for %s', 
+                    self.verbose_logger.debug(_('Checking for virtual provide or file-provide for %s'), 
                         arg)
 
                     try:
@@ -2004,7 +2005,7 @@ class YumBase(depsolve.Depsolve):
         if len(pkgs) == 0:
             #FIXME - this is where we could check to see if it already installed
             # for returning better errors
-            raise Errors.InstallError, 'No package(s) available to install'
+            raise Errors.InstallError, _('No package(s) available to install')
         
         # FIXME - lots more checking here
         #  - install instead of erase
@@ -2015,7 +2016,7 @@ class YumBase(depsolve.Depsolve):
             if self.tsInfo.exists(pkgtup=po.pkgtup):
                 if self.tsInfo.getMembersWithState(po.pkgtup, TS_INSTALL_STATES):
                     self.verbose_logger.log(logginglevels.DEBUG_1,
-                        'Package: %s  - already in transaction set', po)
+                        _('Package: %s  - already in transaction set'), po)
                     tx_return.extend(self.tsInfo.getMembers(pkgtup=po.pkgtup))
                     continue
             
@@ -2028,7 +2029,7 @@ class YumBase(depsolve.Depsolve):
             # make sure it's not already installed
             if self.rpmdb.contains(po=po):
                 if not self.tsInfo.getMembersWithState(po.pkgtup, TS_REMOVE_STATES):
-                    self.verbose_logger.warning('Package %s already installed and latest version', po)
+                    self.verbose_logger.warning(_('Package %s already installed and latest version'), po)
                     continue
 
             
@@ -2069,7 +2070,7 @@ class YumBase(depsolve.Depsolve):
 
         tx_return = []
         if not po and not kwargs: # update everything (the easy case)
-            self.verbose_logger.log(logginglevels.DEBUG_2, 'Updating Everything')
+            self.verbose_logger.log(logginglevels.DEBUG_2, _('Updating Everything'))
             for (obsoleting, installed) in obsoletes:
                 obsoleting_pkg = self.getPackageObject(obsoleting)
                 installed_pkg =  self.rpmdb.searchPkgTuple(installed)[0]
@@ -2081,7 +2082,7 @@ class YumBase(depsolve.Depsolve):
                 
             for (new, old) in updates:
                 if self.tsInfo.isObsoleted(pkgtup=old):
-                    self.verbose_logger.log(logginglevels.DEBUG_2, 'Not Updating Package that is already obsoleted: %s.%s %s:%s-%s', 
+                    self.verbose_logger.log(logginglevels.DEBUG_2, _('Not Updating Package that is already obsoleted: %s.%s %s:%s-%s'), 
                         old)
                 else:
                     updating_pkg = self.getPackageObject(new)
@@ -2153,14 +2154,14 @@ class YumBase(depsolve.Depsolve):
                             txmbr.setAsDep(requiringPo)
                         tx_return.append(txmbr)
                         if self.tsInfo.isObsoleted(obsoleted):
-                            self.verbose_logger.log(logginglevels.DEBUG_2, 'Package is already obsoleted: %s.%s %s:%s-%s', obsoleted)
+                            self.verbose_logger.log(logginglevels.DEBUG_2, _('Package is already obsoleted: %s.%s %s:%s-%s'), obsoleted)
                         else:
                             txmbr = self.tsInfo.addObsoleted(obsoleted_pkg, available_pkg)
                             tx_return.append(txmbr)
             for available_pkg in availpkgs:
                 for updated in self.up.updating_dict.get(available_pkg.pkgtup, []):
                     if self.tsInfo.isObsoleted(updated):
-                        self.verbose_logger.log(logginglevels.DEBUG_2, 'Not Updating Package that is already obsoleted: %s.%s %s:%s-%s', 
+                        self.verbose_logger.log(logginglevels.DEBUG_2, _('Not Updating Package that is already obsoleted: %s.%s %s:%s-%s'), 
                                                 updated)
                     else:
                         updated_pkg =  self.rpmdb.searchPkgTuple(updated)[0]
@@ -2172,7 +2173,7 @@ class YumBase(depsolve.Depsolve):
                 for updating in self.up.updatesdict.get(installed_pkg.pkgtup, []):
                     updating_pkg = self.getPackageObject(updating)
                     if self.tsInfo.isObsoleted(installed_pkg.pkgtup):
-                        self.verbose_logger.log(logginglevels.DEBUG_2, 'Not Updating Package that is already obsoleted: %s.%s %s:%s-%s', 
+                        self.verbose_logger.log(logginglevels.DEBUG_2, _('Not Updating Package that is already obsoleted: %s.%s %s:%s-%s'), 
                                                 installed_pkg.pkgtup)
                     else:
                         txmbr = self.tsInfo.addUpdate(updating_pkg, installed_pkg)
@@ -2224,7 +2225,7 @@ class YumBase(depsolve.Depsolve):
                             ver=nevra_dict['version'], rel=nevra_dict['release'])
 
         if len(pkgs) == 0: # should this even be happening?
-            self.logger.warning("No package matched to remove")
+            self.logger.warning(_("No package matched to remove"))
 
         for po in pkgs:
             txmbr = self.tsInfo.addErase(po)
@@ -2258,17 +2259,17 @@ class YumBase(depsolve.Depsolve):
             try:
                 po = YumLocalPackage(ts=self.rpmdb.readOnlyTS(), filename=pkg)
             except yum.Errors.MiscError:
-                self.logger.critical('Cannot open file: %s. Skipping.', pkg)
+                self.logger.critical(_('Cannot open file: %s. Skipping.'), pkg)
                 return tx_return
             self.verbose_logger.log(logginglevels.INFO_2,
-                'Examining %s: %s', po.localpath, po)
+                _('Examining %s: %s'), po.localpath, po)
 
         # everything installed that matches the name
         installedByKey = self.rpmdb.searchNevra(name=po.name)
         # go through each package
         if len(installedByKey) == 0: # nothing installed by that name
             if updateonly:
-                self.logger.warning('Package %s not installed, cannot update it. Run yum install to install it instead.', po.name)
+                self.logger.warning(_('Package %s not installed, cannot update it. Run yum install to install it instead.'), po.name)
                 return tx_return
             else:
                 installpkgs.append(po)
@@ -2300,25 +2301,25 @@ class YumBase(depsolve.Depsolve):
            toexc = exactmatch + matched
 
         if po in toexc:
-           self.verbose_logger.debug('Excluding %s', po)
+           self.verbose_logger.debug(_('Excluding %s'), po)
            return tx_return
 
         for po in installpkgs:
             self.verbose_logger.log(logginglevels.INFO_2,
-                'Marking %s to be installed', po.localpath)
+                _('Marking %s to be installed'), po.localpath)
             self.localPackages.append(po)
             tx_return.extend(self.install(po=po))
 
         for (po, oldpo) in updatepkgs:
             self.verbose_logger.log(logginglevels.INFO_2,
-                'Marking %s as an update to %s', po.localpath, oldpo)
+                _('Marking %s as an update to %s'), po.localpath, oldpo)
             self.localPackages.append(po)
             self.tsInfo.addUpdate(po, oldpo)
             tx_return.append(txmbr)
 
         for po in donothingpkgs:
             self.verbose_logger.log(logginglevels.INFO_2,
-                '%s: does not update installed package.', po.localpath)
+                _('%s: does not update installed package.'), po.localpath)
 
         return tx_return
 
@@ -2372,13 +2373,13 @@ class YumBase(depsolve.Depsolve):
         ts = rpmUtils.transaction.TransactionWrapper(self.conf.installroot)
 
         for keyurl in keyurls:
-            self.logger.info('Retrieving GPG key from %s' % keyurl)
+            self.logger.info(_('Retrieving GPG key from %s') % keyurl)
 
             # Go get the GPG key from the given URL
             try:
                 rawkey = urlgrabber.urlread(keyurl, limit=9999)
             except urlgrabber.grabber.URLGrabError, e:
-                raise Errors.YumBaseError('GPG key retrieval failed: ' +
+                raise Errors.YumBaseError(_('GPG key retrieval failed: ') +
                                           str(e))
 
             # Parse the key
@@ -2391,16 +2392,16 @@ class YumBase(depsolve.Depsolve):
                 fingerprint = keyinfo['fingerprint']
             except ValueError, e:
                 raise Errors.YumBaseError, \
-                      'GPG key parsing failed: ' + str(e)
+                      _('GPG key parsing failed: ') + str(e)
 
             # Check if key is already installed
             if misc.keyInstalled(ts, keyid, timestamp) >= 0:
-                self.logger.info('GPG key at %s (0x%s) is already installed' % (
+                self.logger.info(_('GPG key at %s (0x%s) is already installed') % (
                     keyurl, hexkeyid))
                 continue
 
             # Try installing/updating GPG key
-            self.logger.critical('Importing GPG key 0x%s "%s" from %s' % (hexkeyid, userid, keyurl.replace("file://","")))
+            self.logger.critical(_('Importing GPG key 0x%s "%s" from %s') % (hexkeyid, userid, keyurl.replace("file://","")))
             rc = False
             if self.conf.assumeyes:
                 rc = True
@@ -2412,30 +2413,30 @@ class YumBase(depsolve.Depsolve):
                 rc = askcb(po, userid, hexkeyid)
 
             if not rc:
-                raise Errors.YumBaseError, "Not installing key"
+                raise Errors.YumBaseError, _("Not installing key")
             
             # Import the key
             result = ts.pgpImportPubkey(misc.procgpgkey(rawkey))
             if result != 0:
                 raise Errors.YumBaseError, \
-                      'Key import failed (code %d)' % result
+                      _('Key import failed (code %d)') % result
             misc.import_key_to_pubring(rawkey, po.repo.cachedir)
             
-            self.logger.info('Key imported successfully')
+            self.logger.info(_('Key imported successfully'))
             key_installed = True
 
             if not key_installed:
                 raise Errors.YumBaseError, \
-                      'The GPG keys listed for the "%s" repository are ' \
+                      _('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.' % (repo.name)
+                      'this repository.') % (repo.name)
 
         # Check if the newly installed keys helped
         result, errmsg = self.sigCheckPkg(po)
         if result != 0:
-            self.logger.info("Import of key(s) didn't help, wrong key(s)?")
+            self.logger.info(_("Import of key(s) didn't help, wrong key(s)?"))
             raise Errors.YumBaseError, errmsg
     def _limit_installonly_pkgs(self):
         if self.conf.installonly_limit < 1 :
@@ -2509,9 +2510,9 @@ class YumBase(depsolve.Depsolve):
             probs = self.downloadPkgs(dlpkgs)
 
         except IndexError:
-            raise Errors.YumBaseError, ["Unable to find a suitable mirror."]
+            raise Errors.YumBaseError, [_("Unable to find a suitable mirror.")]
         if len(probs) > 0:
-            errstr = ["Errors were encountered while downloading packages."]
+            errstr = [_("Errors were encountered while downloading packages.")]
             for key in probs:
                 errors = misc.unique(probs[key])
                 for error in errors:
@@ -2547,12 +2548,12 @@ class YumBase(depsolve.Depsolve):
         # This can be overloaded by a subclass.    
         if self.conf.rpm_check_debug:
             self.verbose_logger.log(logginglevels.INFO_2, 
-                 'Running rpm_check_debug')
+                 _('Running rpm_check_debug'))
             msgs = self._run_rpm_check_debug()
             if msgs:
-                retmsgs = ['ERROR with rpm_check_debug vs depsolve:']
+                retmsgs = [_('ERROR with rpm_check_debug vs depsolve:')]
                 retmsgs.extend(msgs) 
-                retmsgs.append('Please report this error in bugzilla')
+                retmsgs.append(_('Please report this error in bugzilla'))
                 raise Errors.YumRPMCheckError,retmsgs
         
         tsConf = {}
@@ -2575,7 +2576,7 @@ class YumBase(depsolve.Depsolve):
         del testcb
   
         if len( tserrors ) > 0:
-            errstring =  'Test Transaction Errors: '
+            errstring =  _('Test Transaction Errors: ')
             for descr in tserrors:
                  errstring += '  %s\n' % descr 
             raise Errors.YumTestTransactionError, errstring
@@ -2610,12 +2611,12 @@ class YumBase(depsolve.Depsolve):
             ((name, version, release), (needname, needversion), flags,
               suggest, sense) = deptuple
             if sense == rpm.RPMDEP_SENSE_REQUIRES:
-                msg = 'Package %s needs %s, this is not available.' % \
+                msg = _('Package %s needs %s, this is not available.') % \
                       (name, rpmUtils.miscutils.formatRequire(needname, 
                                                               needversion, flags))
                 results.append(msg)
             elif sense == rpm.RPMDEP_SENSE_CONFLICTS:
-                msg = 'Package %s conflicts with %s.' % \
+                msg = _('Package %s conflicts with %s.') % \
                       (name, rpmUtils.miscutils.formatRequire(needname, 
                                                               needversion, flags))
                 results.append(msg)
diff --git a/yum/i18n.py b/yum/i18n.py
new file mode 100644
index 0000000..14e16dd
--- /dev/null
+++ b/yum/i18n.py
@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+"""i18n abstraction
+
+License: GPL
+Author: Vladimir Bormotov <bor at vb.dn.ua>
+
+$Id$
+"""
+# $RCSfile$
+__version__ = "$Revision$"[11:-2]
+__date__ = "$Date$"[7:-2]
+
+try: 
+    import gettext
+    import sys
+    if sys.version_info[0] == 2:
+        t = gettext.translation('yum')
+        _ = t.gettext
+    else:
+        gettext.bindtextdomain('yum', '/usr/share/locale')
+        gettext.textdomain('yum')
+        _ = gettext.gettext
+
+except:
+    def _(str):
+        """pass given string as-is"""
+        return str
+
+if __name__ == '__main__':
+    pass
+
+# vim: set ts=4 et :
diff --git a/yumcommands.py b/yumcommands.py
index 97a3ea8..22599c3 100644
--- a/yumcommands.py
+++ b/yumcommands.py
@@ -23,7 +23,7 @@ import os
 import cli
 from yum import logginglevels
 import yum.Errors
-from i18n import _
+from yum.i18n import _
 
 def checkRootUID(base):
     """