repodiff: new option --ignore

This commit is contained in:
icedphoenix 2012-09-21 14:39:22 +04:00
parent bfeecbd388
commit 3a86cce6c7
4 changed files with 338 additions and 132 deletions

View file

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-09-13 19:00+0400\n"
"POT-Creation-Date: 2012-09-21 14:33+0400\n"
"PO-Revision-Date: 2012-08-21 16:35+0300\n"
"Last-Translator: Anton Kirilenko <anton.kirilenko@rosalab.ru>\n"
"Language-Team: RUSSIAN\n"
@ -20,115 +20,196 @@ msgstr ""
msgid "Tool for comparing sets of repositories."
msgstr "Инструмент для сравнения наборов репозиториев."
#: urpm-repodiff.py:85 urpm-tools/urpm-repodiff.py:85
#: urpm-repodiff.py:84
msgid "global parameters"
msgstr "глобальные параметры"
#: urpm-repodiff.py:85
msgid "Parameters used in all cases."
msgstr "Параметры, используемые во всех случаях."
#: urpm-repodiff.py:87 urpm-tools/urpm-repodiff.py:85
msgid "URL or PATH to old repositories"
msgstr "URL или пути к старым репозиториям"
#: urpm-repodiff.py:87 urpm-tools/urpm-repodiff.py:87
#: urpm-repodiff.py:89 urpm-tools/urpm-repodiff.py:87
msgid "URL or PATH to new repositories"
msgstr "URL или пути к новым репозиториям"
#: urpm-repodiff.py:89 urpm-tools/urpm-repodiff.py:89
msgid "Show differences in package sizes."
msgstr "Показывать различия в размерах пакетов."
#: urpm-repodiff.py:91 urpm-tools/urpm-repodiff.py:91
msgid "Simple output format."
msgstr "Упрощенный формат вывода."
#: urpm-repodiff.py:93 urpm-tools/urpm-repodiff.py:93
#: urpm-repodiff.py:91 urpm-tools/urpm-repodiff.py:93
msgid "Hide service messages."
msgstr "Не показывать служебные сообщения."
#: urpm-repodiff.py:95 urpm-tools/urpm-repodiff.py:95
#: urpm-repodiff.py:93
msgid "Ignore release during package compare."
msgstr "Не учитывать релиз при сравнении пакетов."
#: urpm-repodiff.py:95
msgid "Output summary."
msgstr ""
#: urpm-repodiff.py:97 urpm-tools/urpm-repodiff.py:101
msgid "Change standart output to \"OUTPUT_FILE\"."
msgstr "Перенаправить вывод в \"OUTPUT_FILE\""
#: urpm-repodiff.py:99
#, fuzzy
msgid "File with list of ignored packages"
msgstr "Загрузка списка установленных пакетов..."
#: urpm-repodiff.py:100
msgid "text mode parameters"
msgstr ""
#: urpm-repodiff.py:101
msgid "Parameters used only in text mode. (--html not present)"
msgstr ""
#: urpm-repodiff.py:103 urpm-tools/urpm-repodiff.py:89
msgid "Show differences in package sizes."
msgstr "Показывать различия в размерах пакетов."
#: urpm-repodiff.py:105 urpm-tools/urpm-repodiff.py:91
msgid "Simple output format."
msgstr "Упрощенный формат вывода."
#: urpm-repodiff.py:107 urpm-tools/urpm-repodiff.py:95
msgid "Show changelog difference."
msgstr "Показывать разницу списков изменений."
#: urpm-repodiff.py:97 urpm-tools/urpm-repodiff.py:97
#: urpm-repodiff.py:108
msgid "HTML mode parameters"
msgstr ""
#: urpm-repodiff.py:109
msgid "Parameters used only in HTML mode. (--html is present)"
msgstr ""
#: urpm-repodiff.py:111 urpm-tools/urpm-repodiff.py:97
#, python-format
msgid "Output in HTML format, if --output is not present \"%s\" will be created in current directory. --size, --simple and --changelog options are ignored."
msgstr "Вывод в формате HTML. Если --output не указан, то файл \"%s\" будет создан в текущей директории. Опции --size, --simple и --changelog будут игнорироваться."
#: urpm-repodiff.py:101
msgid "Ignore release during package compare."
msgstr "Не учитывать релиз при сравнении пакетов."
#: urpm-repodiff.py:115
#, fuzzy
msgid "Repository names for output."
msgstr "Формат вывода."
#: urpm-repodiff.py:103 urpm-tools/urpm-repodiff.py:101
msgid "Change standart output to \"OUTPUT_FILE\"."
msgstr "Перенаправить вывод в \"OUTPUT_FILE\""
#: urpm-repodiff.py:116
msgid "Filters"
msgstr ""
#: urpm-repodiff.py:127 urpm-repograph.py:157 urpm-tools/urpm-repodiff.py:125
#: urpm-repodiff.py:117
msgid "Filters for output. If none selected then every type will\t\t be shown"
msgstr ""
#: urpm-repodiff.py:120
#, fuzzy
msgid "Show new packages"
msgstr "Новый пакет: "
#: urpm-repodiff.py:122
#, fuzzy
msgid "Show removed packages"
msgstr "удалить более старые пакеты"
#: urpm-repodiff.py:124
#, fuzzy
msgid "Show updated packages"
msgstr " Всего обновлено пакетов: "
#: urpm-repodiff.py:126
#, fuzzy
msgid "Show downgraded packages"
msgstr " Всего пакетов с пониженной версией: "
#: urpm-repodiff.py:150 urpm-repograph.py:157 urpm-tools/urpm-repodiff.py:125
#: urpm-tools/urpm-repograph.py:157
#, python-format
msgid "Error: URL to repository \"%s\" is incorrect"
msgstr "Ошибка: Неверный URL репозитория \"%s\""
#: urpm-repodiff.py:149 urpm-repograph.py:179 urpm-tools/urpm-repodiff.py:147
#: urpm-repodiff.py:172 urpm-repograph.py:179 urpm-tools/urpm-repodiff.py:147
#: urpm-tools/urpm-repograph.py:179
#, python-format
msgid "Error: directory %s does not exist"
msgstr "Ошибка: директория %s не существует"
#: urpm-repodiff.py:159 urpm-repograph.py:189 urpm-tools/urpm-repodiff.py:157
#: urpm-repodiff.py:182 urpm-repograph.py:189 urpm-tools/urpm-repodiff.py:157
#: urpm-tools/urpm-repograph.py:189
#, python-format
msgid "Error: \"%s\" is not correct url, path or name of repository"
msgstr "Ошибка: \"%s\" не является корректным URL, путем или именем репозитория"
#: urpm-repodiff.py:176 urpm-tools/urpm-repodiff.py:174
#: urpm-repodiff.py:199 urpm-tools/urpm-repodiff.py:174
#, python-format
msgid "Error: Cannot open %s for writing."
msgstr "Ошибка: Не удалось открыть %s для записи."
#: urpm-repodiff.py:185 urpm-repograph.py:222 urpm-repograph.py:237
#: urpm-repodiff.py:208 urpm-repograph.py:222 urpm-repograph.py:237
#: urpm-tools/urpm-repodiff.py:183 urpm-tools/urpm-repograph.py:222
#: urpm-tools/urpm-repograph.py:237
#, python-format
msgid "Error: File %s already exists"
msgstr "Ошибка: Файл %s уже существует"
#: urpm-repodiff.py:194 urpm-repograph.py:246 urpm-tools/urpm-repodiff.py:192
#: urpm-repodiff.py:217 urpm-repograph.py:246 urpm-tools/urpm-repodiff.py:192
#: urpm-tools/urpm-repograph.py:246
#, python-format
msgid "Error: File %s cannot be created"
msgstr "Ошибка: Не удалось создать файл %s"
#: urpm-repodiff.py:198 urpm-repograph.py:250 urpm-tools/urpm-repodiff.py:196
#: urpm-repodiff.py:221 urpm-repograph.py:250 urpm-tools/urpm-repodiff.py:196
#: urpm-tools/urpm-repograph.py:250
#, python-format
msgid "Error: Path %s does not exist."
msgstr "Ошибка: Путь %s не существует."
#: urpm-repodiff.py:220 urpm-repograph.py:262 urpm-tools/urpm-repodiff.py:218
#: urpm-repodiff.py:235
#, python-format
msgid "Error: number of REPONAME's(%s) are not equal to number of groups(%s)"
msgstr ""
#: urpm-repodiff.py:249 urpm-repograph.py:262 urpm-tools/urpm-repodiff.py:218
#: urpm-tools/urpm-repograph.py:262
#, python-format
msgid "getting file %s from "
msgstr "получение файла %s из "
#: urpm-repodiff.py:225 urpm-repograph.py:267 urpm-tools/urpm-repodiff.py:223
#: urpm-repodiff.py:254 urpm-repograph.py:267 urpm-tools/urpm-repodiff.py:223
#: urpm-tools/urpm-repograph.py:267
#, python-format
msgid "Error: file %s was not copied"
msgstr "Ошибка: файл %s был скопирован"
#: urpm-repodiff.py:233 urpm-repograph.py:275 urpm-tools/urpm-repodiff.py:231
#: urpm-repodiff.py:262 urpm-repograph.py:275 urpm-tools/urpm-repodiff.py:231
#: urpm-tools/urpm-repograph.py:275
#, python-format
msgid "Error: file %(from)s was not downloaded to %(to)s"
msgstr "Ошибка: файл %(from)s не был скачан в %(to)s"
#: urpm-repodiff.py:274 urpm-repograph.py:288 urpm-tools/urpm-repodiff.py:272
#: urpm-repodiff.py:301
#, fuzzy, python-format
msgid "Error: file %s does not exist."
msgstr "Ошибка: Путь %s не существует."
#: urpm-repodiff.py:314
#, fuzzy, python-format
msgid "Error: file %s cannot be read."
msgstr "Ошибка: Не удалось создать файл %s"
#: urpm-repodiff.py:354 urpm-repograph.py:288 urpm-tools/urpm-repodiff.py:272
#: urpm-tools/urpm-repograph.py:288
msgid "Error: file not found: "
msgstr "Ошибка: файл не найден: "
#: urpm-repodiff.py:279 urpm-repograph.py:293 urpm-tools/urpm-repodiff.py:277
#: urpm-repodiff.py:359 urpm-repograph.py:293 urpm-tools/urpm-repodiff.py:277
#: urpm-tools/urpm-repograph.py:293
#, python-format
msgid "Error: cannot rename file %(from)s to %(to)s"
msgstr "Ошибка: не удалось переименовать файл %(from)s в %(to)s"
#: urpm-repodiff.py:283 urpm-repograph.py:297 urpm-repograph.py:313
#: urpm-repodiff.py:363 urpm-repograph.py:297 urpm-repograph.py:313
#: urpm-repograph.py:543 urpm-tools/urpm-repodiff.py:281
#: urpm-tools/urpm-repograph.py:297 urpm-tools/urpm-repograph.py:313
#: urpm-tools/urpm-repograph.py:543
@ -136,103 +217,103 @@ msgstr "Ошибка: не удалось переименовать файл %(
msgid "Error: file %s is missing."
msgstr "Ошибка: файл %s отсутствует."
#: urpm-repodiff.py:287 urpm-repograph.py:301 urpm-tools/urpm-repodiff.py:285
#: urpm-repodiff.py:367 urpm-repograph.py:301 urpm-tools/urpm-repodiff.py:285
#: urpm-tools/urpm-repograph.py:301
#, python-format
msgid "file %(from)s was renamed to %(to)s"
msgstr "файл %(from)s был переименован в %(to)s"
#: urpm-repodiff.py:296 urpm-repodiff.py:299 urpm-repograph.py:311
#: urpm-repodiff.py:376 urpm-repodiff.py:379 urpm-repograph.py:311
#: urpm-repograph.py:541 urpm-tools/urpm-repodiff.py:294
#: urpm-tools/urpm-repodiff.py:297 urpm-tools/urpm-repograph.py:311
#: urpm-tools/urpm-repograph.py:541
msgid "unpacking file "
msgstr "распаковка файла "
#: urpm-repodiff.py:354 urpm-repograph.py:406 urpm-tools/urpm-repodiff.py:351
#: urpm-repodiff.py:434 urpm-repograph.py:406 urpm-tools/urpm-repodiff.py:351
#: urpm-tools/urpm-repograph.py:406
#, python-format
msgid "Error: Synthesis file %s was not found."
msgstr "Ошибка: Synthesis файл %s не найден."
#: urpm-repodiff.py:357 urpm-tools/urpm-repodiff.py:354
#: urpm-repodiff.py:437 urpm-tools/urpm-repodiff.py:354
msgid "Parsing synthesis"
msgstr "Чтение synthesis файла"
#: urpm-repodiff.py:386 urpm-repograph.py:451 urpm-tools/urpm-repodiff.py:380
#: urpm-repodiff.py:466 urpm-repograph.py:451 urpm-tools/urpm-repodiff.py:380
#: urpm-tools/urpm-repograph.py:451
msgid "Error: Failed to open synthesis file "
msgstr "Ошибка: Не удалось открыть synthesis файл"
#: urpm-repodiff.py:395 urpm-tools/urpm-repodiff.py:389
#: urpm-repodiff.py:475 urpm-tools/urpm-repodiff.py:389
msgid "REPODIFF-Warning: strange format of <disttag> or <distepoch>: "
msgstr "REPODIFF-Предупреждение: необычный формат <disttag> или <distepoch>: "
#: urpm-repodiff.py:416 urpm-repograph.py:371 urpm-tools/urpm-repodiff.py:410
#: urpm-repodiff.py:496 urpm-repograph.py:371 urpm-tools/urpm-repodiff.py:410
#: urpm-tools/urpm-repograph.py:371
msgid "REPODIFF-Warning: strange <info>: "
msgstr "REPODIFF-Предупреждение: необычное поле <info>: "
#: urpm-repodiff.py:537 urpm-tools/urpm-repodiff.py:527
#: urpm-repodiff.py:626 urpm-tools/urpm-repodiff.py:527
msgid "New package: "
msgstr "Новый пакет: "
#: urpm-repodiff.py:552 urpm-tools/urpm-repodiff.py:542
#: urpm-repodiff.py:641 urpm-tools/urpm-repodiff.py:542
msgid "Generating obsoleted list."
msgstr "Создание списка устаревших пакетов."
#: urpm-repodiff.py:611 urpm-tools/urpm-repodiff.py:601
#: urpm-repodiff.py:700 urpm-tools/urpm-repodiff.py:601
msgid "Removed package: "
msgstr "Удален пакет: "
#: urpm-repodiff.py:619 urpm-tools/urpm-repodiff.py:609
#: urpm-repodiff.py:708 urpm-tools/urpm-repodiff.py:609
msgid " Obsoleted by "
msgstr " Устарел из-за добавления "
#: urpm-repodiff.py:640 urpm-tools/urpm-repodiff.py:630
#: urpm-repodiff.py:730 urpm-tools/urpm-repodiff.py:630
msgid "Reading changelog"
msgstr "Чтение списка изменений"
#: urpm-repodiff.py:642 urpm-tools/urpm-repodiff.py:632
#: urpm-repodiff.py:732 urpm-tools/urpm-repodiff.py:632
msgid "Error: Can't find changelog "
msgstr "Ошибка: Не удалось найти список изменений "
#: urpm-repodiff.py:646 urpm-tools/urpm-repodiff.py:636
#: urpm-repodiff.py:736 urpm-tools/urpm-repodiff.py:636
msgid "Error: Can't read changelog "
msgstr "Ошибка: Не удалось прочитать список изменений "
#: urpm-repodiff.py:650 urpm-tools/urpm-repodiff.py:640
#: urpm-repodiff.py:740 urpm-tools/urpm-repodiff.py:640
msgid "Error: Wrong changelog."
msgstr "Ошибка: Неправильный список изменений."
#: urpm-repodiff.py:672 urpm-tools/urpm-repodiff.py:662
#: urpm-repodiff.py:762 urpm-tools/urpm-repodiff.py:662
msgid "Error: Corrupted changelog"
msgstr "Ошибка: Поврежденный список изменений"
#: urpm-repodiff.py:766 urpm-tools/urpm-repodiff.py:756
#: urpm-repodiff.py:861 urpm-tools/urpm-repodiff.py:756
msgid "Generating changes list."
msgstr "Создание списка изменений."
#: urpm-repodiff.py:780 urpm-repodiff.py:783 urpm-tools/urpm-repodiff.py:770
#: urpm-repodiff.py:877 urpm-repodiff.py:880 urpm-tools/urpm-repodiff.py:770
#: urpm-tools/urpm-repodiff.py:773
#, python-format
msgid "REPODIFF-Warning: Package %s was not described in changelogs.xml"
msgstr "REPODIFF-Предупреждение: Пакет %s не описан в changelogs.xml"
#: urpm-repodiff.py:781 urpm-tools/urpm-repodiff.py:771
#: urpm-repodiff.py:878 urpm-tools/urpm-repodiff.py:771
msgid "REPODIFF-Warning: Changelogs of a package are absent in \"new\" repository."
msgstr "REPODIFF-Предупреждение: В репозитории \"новый\" отсутствует список изменений пакета."
#: urpm-repodiff.py:784 urpm-tools/urpm-repodiff.py:774
#: urpm-repodiff.py:881 urpm-tools/urpm-repodiff.py:774
msgid "REPODIFF-Warning: Changelogs of a package are absent."
msgstr "REPODIFF-Предупреждение: У пакета отсутствует список изменений."
#: urpm-repodiff.py:810 urpm-tools/urpm-repodiff.py:800
#: urpm-repodiff.py:910 urpm-tools/urpm-repodiff.py:800
#, python-format
msgid "Package %s has no changelog info\n"
msgstr "Пакет %s не имеет списка изменений\n"
#: urpm-repodiff.py:828 urpm-tools/urpm-repodiff.py:818
#: urpm-repodiff.py:930 urpm-tools/urpm-repodiff.py:818
msgid ""
"\n"
"\n"
@ -244,11 +325,11 @@ msgstr ""
"Обновленные пакеты:\n"
"\n"
#: urpm-repodiff.py:835 urpm-tools/urpm-repodiff.py:825
#: urpm-repodiff.py:938 urpm-tools/urpm-repodiff.py:825
msgid " ***DOWNGRADED***\n"
msgstr " ***УСТАНОВЛЕНА ПРЕДЫДУЩАЯ ВЕРСИЯ***\n"
#: urpm-repodiff.py:844 urpm-tools/urpm-repodiff.py:834
#: urpm-repodiff.py:956 urpm-tools/urpm-repodiff.py:834
#, python-format
msgid ""
"Size Change: %d bytes\n"
@ -257,23 +338,27 @@ msgstr ""
"Размер изменен: %d байт\n"
"\n"
#: urpm-repodiff.py:854 urpm-tools/urpm-repodiff.py:844
#: urpm-repodiff.py:971
msgid "Summary:"
msgstr ""
#: urpm-repodiff.py:979 urpm-tools/urpm-repodiff.py:844
msgid " Total added packages: "
msgstr " Всего добавлено пакетов: "
#: urpm-repodiff.py:857 urpm-tools/urpm-repodiff.py:847
#: urpm-repodiff.py:983 urpm-tools/urpm-repodiff.py:847
msgid " Total removed packages: "
msgstr " Всего удалено пакетов: "
#: urpm-repodiff.py:866 urpm-tools/urpm-repodiff.py:856
#: urpm-repodiff.py:994 urpm-tools/urpm-repodiff.py:856
msgid " Total updated packages: "
msgstr " Всего обновлено пакетов: "
#: urpm-repodiff.py:868 urpm-tools/urpm-repodiff.py:858
#: urpm-repodiff.py:997 urpm-tools/urpm-repodiff.py:858
msgid " Total downgraded packages: "
msgstr " Всего пакетов с пониженной версией: "
#: urpm-repodiff.py:1334 urpm-tools/urpm-repodiff.py:1316
#: urpm-repodiff.py:1498 urpm-tools/urpm-repodiff.py:1316
msgid "Creating HTML file."
msgstr "Создание HTML файла."

View file

@ -303,8 +303,11 @@ def ReadIgnoreList(arg):
try:
ifile = open(ignorefile)
for string in ifile:
if string != '':
ignorelist.append(string)
if string == '\n':
continue
if string.endswith('\n'):
string = string[:-1]
ignorelist.append(string)
ifile.close()
ignorelist.sort()
except:
@ -312,6 +315,34 @@ def ReadIgnoreList(arg):
exit_proc(arg)
return ignorelist
def RemoveIgnored(dict_in, ignorelist):
dict_out = {}
sorted_list = sorted(dict_in)
i = 0
imax = len(sorted_list)
j = 0
jmax = len(ignorelist)
while (i < imax) and (j < jmax):
if ignorelist[j].endswith('*'):
comp_str = ignorelist[j][:-1]
while (i < imax) and (sorted_list[i] < comp_str):
dict_out[sorted_list[i]] = dict_in[sorted_list[i]]
i = i + 1
while (i < imax) and sorted_list[i].startswith(comp_str):
i = i + 1
else:
comp_str = ignorelist[j]
while (i < imax) and (sorted_list[i] < comp_str):
dict_out[sorted_list[i]] = dict_in[sorted_list[i]]
i = i + 1
if (i < imax) and (sorted_list[i] == comp_str):
i = i + 1
j = j + 1
if (i < imax) and (j == jmax):
for i in range(i, imax):
dict_out[sorted_list[i]] = dict_in[sorted_list[i]]
return dict_out
def RenameSynthFile(localdir, arg):
"""Rename.
@ -519,6 +550,7 @@ def ParsePackage(arg):
"""
ifchangelog = arg.changelog
ifnotquiet = arg.quiet
ignorelist = arg.ignorelist
pkgdict_old = {}
for tmp_list in arg.temp_old:
for directory in tmp_list:
@ -531,6 +563,10 @@ def ParsePackage(arg):
RenameSynthFile(directory, arg)
UnpackFiles(directory, ifchangelog, ifnotquiet)
ParseSynthesis(directory + synthesis_file, pkgdict_new, arg)
pkgdict_old = RemoveIgnored(pkgdict_old, ignorelist)
pdkdict_new = RemoveIgnored(pkgdict_new, ignorelist)
ignorelist = ""
arg.ignorelist = ""
return pkgdict_old, pkgdict_new
def CreateDicts(dict_old, dict_new):
@ -972,6 +1008,7 @@ def HTML_ParsePackage(arg):
"""
ifchangelog = arg.changelog
ifnotquiet = arg.quiet
ignorelist = arg.ignorelist
html_old_dict_list = []
html_new_dict_list = []
@ -982,14 +1019,16 @@ def HTML_ParsePackage(arg):
RenameSynthFile(directory, arg)
UnpackFiles(directory, 0, ifnotquiet)
ParseSynthesis(directory + synthesis_file, tmp_dict, arg)
html_old_dict_list.append(tmp_dict)
html_old_dict_list.append(RemoveIgnored(tmp_dict, ignorelist))
for tmp_list in arg.temp_new:
tmp_dict = {}
for directory in tmp_list:
RenameSynthFile(directory, arg)
UnpackFiles(directory, 0, ifnotquiet)
ParseSynthesis(directory + synthesis_file, tmp_dict, arg)
html_new_dict_list.append(tmp_dict)
html_new_dict_list.append(RemoveIgnored(tmp_dict, ignorelist))
ignorelist = ""
arg.ignorelist = ""
return html_old_dict_list, html_new_dict_list
def HTML_UniteDicts(list_dict):
@ -1503,12 +1542,9 @@ def main(args):
arg.show_downgraded=True
if arg.ignore:
ignorelist = ReadIgnoreList(arg)
arg.ignorelist = ReadIgnoreList(arg)
else:
ignorelist = []
for s in ignorelist:
print s
arg.ignorelist = []
GetFiles(arg)

View file

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-09-13 19:00+0400\n"
"POT-Creation-Date: 2012-09-21 14:33+0400\n"
"PO-Revision-Date: 2012-08-21 16:35+0300\n"
"Last-Translator: Anton Kirilenko <anton.kirilenko@rosalab.ru>\n"
"Language-Team: RUSSIAN\n"
@ -20,115 +20,196 @@ msgstr ""
msgid "Tool for comparing sets of repositories."
msgstr "Инструмент для сравнения наборов репозиториев."
#: urpm-repodiff.py:85 urpm-tools/urpm-repodiff.py:85
#: urpm-repodiff.py:84
msgid "global parameters"
msgstr ""
#: urpm-repodiff.py:85
msgid "Parameters used in all cases."
msgstr ""
#: urpm-repodiff.py:87 urpm-tools/urpm-repodiff.py:85
msgid "URL or PATH to old repositories"
msgstr "URL или пути к старым репозиториям"
#: urpm-repodiff.py:87 urpm-tools/urpm-repodiff.py:87
#: urpm-repodiff.py:89 urpm-tools/urpm-repodiff.py:87
msgid "URL or PATH to new repositories"
msgstr "URL или пути к новым репозиториям"
#: urpm-repodiff.py:89 urpm-tools/urpm-repodiff.py:89
msgid "Show differences in package sizes."
msgstr "Показывать различия в размерах пакетов."
#: urpm-repodiff.py:91 urpm-tools/urpm-repodiff.py:91
msgid "Simple output format."
msgstr "Упрощенный формат вывода."
#: urpm-repodiff.py:93 urpm-tools/urpm-repodiff.py:93
#: urpm-repodiff.py:91 urpm-tools/urpm-repodiff.py:93
msgid "Hide service messages."
msgstr "Не показывать служебные сообщения."
#: urpm-repodiff.py:95 urpm-tools/urpm-repodiff.py:95
#: urpm-repodiff.py:93
msgid "Ignore release during package compare."
msgstr ""
#: urpm-repodiff.py:95
msgid "Output summary."
msgstr "Отобразить итог."
#: urpm-repodiff.py:97 urpm-tools/urpm-repodiff.py:101
msgid "Change standart output to \"OUTPUT_FILE\"."
msgstr "Перенаправить вывод в \"OUTPUT_FILE\""
#: urpm-repodiff.py:99
#, fuzzy
msgid "File with list of ignored packages"
msgstr "Загрузка списка установленных пакетов..."
#: urpm-repodiff.py:100
msgid "text mode parameters"
msgstr ""
#: urpm-repodiff.py:101
msgid "Parameters used only in text mode. (--html not present)"
msgstr ""
#: urpm-repodiff.py:103 urpm-tools/urpm-repodiff.py:89
msgid "Show differences in package sizes."
msgstr "Показывать различия в размерах пакетов."
#: urpm-repodiff.py:105 urpm-tools/urpm-repodiff.py:91
msgid "Simple output format."
msgstr "Упрощенный формат вывода."
#: urpm-repodiff.py:107 urpm-tools/urpm-repodiff.py:95
msgid "Show changelog difference."
msgstr "Показывать разницу списков изменений."
#: urpm-repodiff.py:97 urpm-tools/urpm-repodiff.py:97
#: urpm-repodiff.py:108
msgid "HTML mode parameters"
msgstr ""
#: urpm-repodiff.py:109
msgid "Parameters used only in HTML mode. (--html is present)"
msgstr ""
#: urpm-repodiff.py:111 urpm-tools/urpm-repodiff.py:97
#, python-format
msgid "Output in HTML format, if --output is not present \"%s\" will be created in current directory. --size, --simple and --changelog options are ignored."
msgstr "Вывод в формате HTML. Если --output не указан, то файл \"%s\" будет создан в текущей директории. Опции --size, --simple и --changelog будут игнорироваться."
#: urpm-repodiff.py:101
msgid "Ignore release during package compare."
#: urpm-repodiff.py:115
#, fuzzy
msgid "Repository names for output."
msgstr "Формат вывода."
#: urpm-repodiff.py:116
msgid "Filters"
msgstr ""
#: urpm-repodiff.py:103 urpm-tools/urpm-repodiff.py:101
msgid "Change standart output to \"OUTPUT_FILE\"."
msgstr "Перенаправить вывод в \"OUTPUT_FILE\""
#: urpm-repodiff.py:117
msgid "Filters for output. If none selected then every type will\t\t be shown"
msgstr ""
#: urpm-repodiff.py:127 urpm-repograph.py:157 urpm-tools/urpm-repodiff.py:125
#: urpm-repodiff.py:120
#, fuzzy
msgid "Show new packages"
msgstr "Новый пакет: "
#: urpm-repodiff.py:122
#, fuzzy
msgid "Show removed packages"
msgstr "удалить более старые пакеты"
#: urpm-repodiff.py:124
#, fuzzy
msgid "Show updated packages"
msgstr " Всего обновлено пакетов: "
#: urpm-repodiff.py:126
#, fuzzy
msgid "Show downgraded packages"
msgstr " Всего пакетов с пониженной версией: "
#: urpm-repodiff.py:150 urpm-repograph.py:157 urpm-tools/urpm-repodiff.py:125
#: urpm-tools/urpm-repograph.py:157
#, python-format
msgid "Error: URL to repository \"%s\" is incorrect"
msgstr "Ошибка: Неверный URL репозитория \"%s\""
#: urpm-repodiff.py:149 urpm-repograph.py:179 urpm-tools/urpm-repodiff.py:147
#: urpm-repodiff.py:172 urpm-repograph.py:179 urpm-tools/urpm-repodiff.py:147
#: urpm-tools/urpm-repograph.py:179
#, python-format
msgid "Error: directory %s does not exist"
msgstr "Ошибка: директория %s не существует"
#: urpm-repodiff.py:159 urpm-repograph.py:189 urpm-tools/urpm-repodiff.py:157
#: urpm-repodiff.py:182 urpm-repograph.py:189 urpm-tools/urpm-repodiff.py:157
#: urpm-tools/urpm-repograph.py:189
#, python-format
msgid "Error: \"%s\" is not correct url, path or name of repository"
msgstr "Ошибка: \"%s\" не является корректным URL, путем или именем репозитория"
#: urpm-repodiff.py:176 urpm-tools/urpm-repodiff.py:174
#: urpm-repodiff.py:199 urpm-tools/urpm-repodiff.py:174
#, python-format
msgid "Error: Cannot open %s for writing."
msgstr "Ошибка: Не удалось открыть %s для записи."
#: urpm-repodiff.py:185 urpm-repograph.py:222 urpm-repograph.py:237
#: urpm-repodiff.py:208 urpm-repograph.py:222 urpm-repograph.py:237
#: urpm-tools/urpm-repodiff.py:183 urpm-tools/urpm-repograph.py:222
#: urpm-tools/urpm-repograph.py:237
#, python-format
msgid "Error: File %s already exists"
msgstr "Ошибка: Файл %s уже существует"
#: urpm-repodiff.py:194 urpm-repograph.py:246 urpm-tools/urpm-repodiff.py:192
#: urpm-repodiff.py:217 urpm-repograph.py:246 urpm-tools/urpm-repodiff.py:192
#: urpm-tools/urpm-repograph.py:246
#, python-format
msgid "Error: File %s cannot be created"
msgstr "Ошибка: Не удалось создать файл %s"
#: urpm-repodiff.py:198 urpm-repograph.py:250 urpm-tools/urpm-repodiff.py:196
#: urpm-repodiff.py:221 urpm-repograph.py:250 urpm-tools/urpm-repodiff.py:196
#: urpm-tools/urpm-repograph.py:250
#, python-format
msgid "Error: Path %s does not exist."
msgstr "Ошибка: Путь %s не существует."
#: urpm-repodiff.py:220 urpm-repograph.py:262 urpm-tools/urpm-repodiff.py:218
#: urpm-repodiff.py:235
#, python-format
msgid "Error: number of REPONAME's(%s) are not equal to number of groups(%s)"
msgstr ""
#: urpm-repodiff.py:249 urpm-repograph.py:262 urpm-tools/urpm-repodiff.py:218
#: urpm-tools/urpm-repograph.py:262
#, python-format
msgid "getting file %s from "
msgstr "получение файла %s из "
#: urpm-repodiff.py:225 urpm-repograph.py:267 urpm-tools/urpm-repodiff.py:223
#: urpm-repodiff.py:254 urpm-repograph.py:267 urpm-tools/urpm-repodiff.py:223
#: urpm-tools/urpm-repograph.py:267
#, python-format
msgid "Error: file %s was not copied"
msgstr "Ошибка: файл %s был скопирован"
#: urpm-repodiff.py:233 urpm-repograph.py:275 urpm-tools/urpm-repodiff.py:231
#: urpm-repodiff.py:262 urpm-repograph.py:275 urpm-tools/urpm-repodiff.py:231
#: urpm-tools/urpm-repograph.py:275
#, python-format
msgid "Error: file %(from)s was not downloaded to %(to)s"
msgstr "Ошибка: файл %(from)s не был скачан в %(to)s"
#: urpm-repodiff.py:274 urpm-repograph.py:288 urpm-tools/urpm-repodiff.py:272
#: urpm-repodiff.py:301
#, fuzzy, python-format
msgid "Error: file %s does not exist."
msgstr "Ошибка: Путь %s не существует."
#: urpm-repodiff.py:314
#, fuzzy, python-format
msgid "Error: file %s cannot be read."
msgstr "Ошибка: Не удалось создать файл %s"
#: urpm-repodiff.py:354 urpm-repograph.py:288 urpm-tools/urpm-repodiff.py:272
#: urpm-tools/urpm-repograph.py:288
msgid "Error: file not found: "
msgstr "Ошибка: файл не найден: "
#: urpm-repodiff.py:279 urpm-repograph.py:293 urpm-tools/urpm-repodiff.py:277
#: urpm-repodiff.py:359 urpm-repograph.py:293 urpm-tools/urpm-repodiff.py:277
#: urpm-tools/urpm-repograph.py:293
#, python-format
msgid "Error: cannot rename file %(from)s to %(to)s"
msgstr "Ошибка: не удалось переименовать файл %(from)s в %(to)s"
#: urpm-repodiff.py:283 urpm-repograph.py:297 urpm-repograph.py:313
#: urpm-repodiff.py:363 urpm-repograph.py:297 urpm-repograph.py:313
#: urpm-repograph.py:543 urpm-tools/urpm-repodiff.py:281
#: urpm-tools/urpm-repograph.py:297 urpm-tools/urpm-repograph.py:313
#: urpm-tools/urpm-repograph.py:543
@ -136,103 +217,103 @@ msgstr "Ошибка: не удалось переименовать файл %(
msgid "Error: file %s is missing."
msgstr "Ошибка: файл %s отсутствует."
#: urpm-repodiff.py:287 urpm-repograph.py:301 urpm-tools/urpm-repodiff.py:285
#: urpm-repodiff.py:367 urpm-repograph.py:301 urpm-tools/urpm-repodiff.py:285
#: urpm-tools/urpm-repograph.py:301
#, python-format
msgid "file %(from)s was renamed to %(to)s"
msgstr "файл %(from)s был переименован в %(to)s"
#: urpm-repodiff.py:296 urpm-repodiff.py:299 urpm-repograph.py:311
#: urpm-repodiff.py:376 urpm-repodiff.py:379 urpm-repograph.py:311
#: urpm-repograph.py:541 urpm-tools/urpm-repodiff.py:294
#: urpm-tools/urpm-repodiff.py:297 urpm-tools/urpm-repograph.py:311
#: urpm-tools/urpm-repograph.py:541
msgid "unpacking file "
msgstr "распаковка файла "
#: urpm-repodiff.py:354 urpm-repograph.py:406 urpm-tools/urpm-repodiff.py:351
#: urpm-repodiff.py:434 urpm-repograph.py:406 urpm-tools/urpm-repodiff.py:351
#: urpm-tools/urpm-repograph.py:406
#, python-format
msgid "Error: Synthesis file %s was not found."
msgstr "Ошибка: Synthesis файл %s не найден."
#: urpm-repodiff.py:357 urpm-tools/urpm-repodiff.py:354
#: urpm-repodiff.py:437 urpm-tools/urpm-repodiff.py:354
msgid "Parsing synthesis"
msgstr "Чтение synthesis файла"
#: urpm-repodiff.py:386 urpm-repograph.py:451 urpm-tools/urpm-repodiff.py:380
#: urpm-repodiff.py:466 urpm-repograph.py:451 urpm-tools/urpm-repodiff.py:380
#: urpm-tools/urpm-repograph.py:451
msgid "Error: Failed to open synthesis file "
msgstr "Ошибка: Не удалось открыть synthesis файл"
#: urpm-repodiff.py:395 urpm-tools/urpm-repodiff.py:389
#: urpm-repodiff.py:475 urpm-tools/urpm-repodiff.py:389
msgid "REPODIFF-Warning: strange format of <disttag> or <distepoch>: "
msgstr "REPODIFF-Предупреждение: необычный формат <disttag> или <distepoch>: "
#: urpm-repodiff.py:416 urpm-repograph.py:371 urpm-tools/urpm-repodiff.py:410
#: urpm-repodiff.py:496 urpm-repograph.py:371 urpm-tools/urpm-repodiff.py:410
#: urpm-tools/urpm-repograph.py:371
msgid "REPODIFF-Warning: strange <info>: "
msgstr "REPODIFF-Предупреждение: необычное поле <info>: "
#: urpm-repodiff.py:537 urpm-tools/urpm-repodiff.py:527
#: urpm-repodiff.py:626 urpm-tools/urpm-repodiff.py:527
msgid "New package: "
msgstr "Новый пакет: "
#: urpm-repodiff.py:552 urpm-tools/urpm-repodiff.py:542
#: urpm-repodiff.py:641 urpm-tools/urpm-repodiff.py:542
msgid "Generating obsoleted list."
msgstr "Создание списка устаревших пакетов."
#: urpm-repodiff.py:611 urpm-tools/urpm-repodiff.py:601
#: urpm-repodiff.py:700 urpm-tools/urpm-repodiff.py:601
msgid "Removed package: "
msgstr "Удален пакет: "
#: urpm-repodiff.py:619 urpm-tools/urpm-repodiff.py:609
#: urpm-repodiff.py:708 urpm-tools/urpm-repodiff.py:609
msgid " Obsoleted by "
msgstr " Устарел из-за добавления "
#: urpm-repodiff.py:640 urpm-tools/urpm-repodiff.py:630
#: urpm-repodiff.py:730 urpm-tools/urpm-repodiff.py:630
msgid "Reading changelog"
msgstr "Чтение списка изменений"
#: urpm-repodiff.py:642 urpm-tools/urpm-repodiff.py:632
#: urpm-repodiff.py:732 urpm-tools/urpm-repodiff.py:632
msgid "Error: Can't find changelog "
msgstr "Ошибка: Не удалось найти список изменений "
#: urpm-repodiff.py:646 urpm-tools/urpm-repodiff.py:636
#: urpm-repodiff.py:736 urpm-tools/urpm-repodiff.py:636
msgid "Error: Can't read changelog "
msgstr "Ошибка: Не удалось прочитать список изменений "
#: urpm-repodiff.py:650 urpm-tools/urpm-repodiff.py:640
#: urpm-repodiff.py:740 urpm-tools/urpm-repodiff.py:640
msgid "Error: Wrong changelog."
msgstr "Ошибка: Неправильный список изменений."
#: urpm-repodiff.py:672 urpm-tools/urpm-repodiff.py:662
#: urpm-repodiff.py:762 urpm-tools/urpm-repodiff.py:662
msgid "Error: Corrupted changelog"
msgstr "Ошибка: Поврежденный список изменений"
#: urpm-repodiff.py:766 urpm-tools/urpm-repodiff.py:756
#: urpm-repodiff.py:861 urpm-tools/urpm-repodiff.py:756
msgid "Generating changes list."
msgstr "Создание списка изменений."
#: urpm-repodiff.py:780 urpm-repodiff.py:783 urpm-tools/urpm-repodiff.py:770
#: urpm-repodiff.py:877 urpm-repodiff.py:880 urpm-tools/urpm-repodiff.py:770
#: urpm-tools/urpm-repodiff.py:773
#, python-format
msgid "REPODIFF-Warning: Package %s was not described in changelogs.xml"
msgstr "REPODIFF-Предупреждение: Пакет %s не описан в changelogs.xml"
#: urpm-repodiff.py:781 urpm-tools/urpm-repodiff.py:771
#: urpm-repodiff.py:878 urpm-tools/urpm-repodiff.py:771
msgid "REPODIFF-Warning: Changelogs of a package are absent in \"new\" repository."
msgstr "REPODIFF-Предупреждение: В репозитории \"новый\" отсутствует список изменений пакета."
#: urpm-repodiff.py:784 urpm-tools/urpm-repodiff.py:774
#: urpm-repodiff.py:881 urpm-tools/urpm-repodiff.py:774
msgid "REPODIFF-Warning: Changelogs of a package are absent."
msgstr "REPODIFF-Предупреждение: У пакета отсутствует список изменений."
#: urpm-repodiff.py:810 urpm-tools/urpm-repodiff.py:800
#: urpm-repodiff.py:910 urpm-tools/urpm-repodiff.py:800
#, python-format
msgid "Package %s has no changelog info\n"
msgstr "Пакет %s не имеет списка изменений\n"
#: urpm-repodiff.py:828 urpm-tools/urpm-repodiff.py:818
#: urpm-repodiff.py:930 urpm-tools/urpm-repodiff.py:818
msgid ""
"\n"
"\n"
@ -244,11 +325,11 @@ msgstr ""
"Обновленные пакеты:\n"
"\n"
#: urpm-repodiff.py:835 urpm-tools/urpm-repodiff.py:825
#: urpm-repodiff.py:938 urpm-tools/urpm-repodiff.py:825
msgid " ***DOWNGRADED***\n"
msgstr " ***УСТАНОВЛЕНА ПРЕДЫДУЩАЯ ВЕРСИЯ***\n"
#: urpm-repodiff.py:844 urpm-tools/urpm-repodiff.py:834
#: urpm-repodiff.py:956 urpm-tools/urpm-repodiff.py:834
#, python-format
msgid ""
"Size Change: %d bytes\n"
@ -257,23 +338,27 @@ msgstr ""
"Размер изменен: %d байт\n"
"\n"
#: urpm-repodiff.py:854 urpm-tools/urpm-repodiff.py:844
#: urpm-repodiff.py:971
msgid "Summary:"
msgstr ""
#: urpm-repodiff.py:979 urpm-tools/urpm-repodiff.py:844
msgid " Total added packages: "
msgstr " Всего добавлено пакетов: "
#: urpm-repodiff.py:857 urpm-tools/urpm-repodiff.py:847
#: urpm-repodiff.py:983 urpm-tools/urpm-repodiff.py:847
msgid " Total removed packages: "
msgstr " Всего удалено пакетов: "
#: urpm-repodiff.py:866 urpm-tools/urpm-repodiff.py:856
#: urpm-repodiff.py:994 urpm-tools/urpm-repodiff.py:856
msgid " Total updated packages: "
msgstr " Всего обновлено пакетов: "
#: urpm-repodiff.py:868 urpm-tools/urpm-repodiff.py:858
#: urpm-repodiff.py:997 urpm-tools/urpm-repodiff.py:858
msgid " Total downgraded packages: "
msgstr " Всего пакетов с пониженной версией: "
#: urpm-repodiff.py:1334 urpm-tools/urpm-repodiff.py:1316
#: urpm-repodiff.py:1498 urpm-tools/urpm-repodiff.py:1316
msgid "Creating HTML file."
msgstr "Создание HTML файла."