mirror of
https://abf.rosa.ru/djam/urpm-tools.git
synced 2025-02-23 17:32:46 +00:00
repodiff: new option --title
This commit is contained in:
icedphoenix
parent
2c436e92e7
commit
4dc0eb3e56
6 changed files with 132 additions and 11658 deletions
|
|
@ -39,9 +39,11 @@ Show changelog difference.
|
|||
.SH "HTML OUTPUT OPTION"
|
||||
.IP "\fB\-\-html\fP"
|
||||
Output difference in format of html page. In case of using this option \fB--size, -s\fP, \fB--simple\fP and \fB--changelog\fP options are ignored.
|
||||
If \fB--output, -o\fP option is not present, page will be output to file 'repodiff.html' in the current directory.
|
||||
If \fB\-\-output, -o\fP option is not present, page will be output to file 'repodiff.html' in the current directory.
|
||||
.IP "\fB\-\-reponames REPONAME [REPONAME ...]\fP"
|
||||
Repository names for output.
|
||||
.IP "\fB\-\-title, -t TITLE\fP"
|
||||
Set title as TITLE. "Difference between repositories." by default.
|
||||
.SH "FILTER OPTION"
|
||||
.IP "\fB\-\-show-new, -N\fP"
|
||||
Show new packages.
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: 1\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2012-09-21 14:33+0400\n"
|
||||
"POT-Creation-Date: 2012-09-21 17:01+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"
|
||||
|
|
@ -93,117 +93,121 @@ msgstr "Вывод в формате HTML. Если --output не указан,
|
|||
msgid "Repository names for output."
|
||||
msgstr "Имена репозиториев для вывода."
|
||||
|
||||
#: urpm-repodiff.py:116
|
||||
#: urpm-repodiff.py:118
|
||||
msgid "Set title."
|
||||
msgstr "Установить заголовок."
|
||||
|
||||
#: urpm-repodiff.py:119
|
||||
msgid "Filters"
|
||||
msgstr "Фильтры"
|
||||
|
||||
#: urpm-repodiff.py:117
|
||||
#: urpm-repodiff.py:120
|
||||
msgid "Filters for output. If none selected then every type will\t\t be shown"
|
||||
msgstr "Фильтры для вывода. Если не выбран ни один - будут показаны все"
|
||||
|
||||
#: urpm-repodiff.py:120
|
||||
#: urpm-repodiff.py:123
|
||||
msgid "Show new packages"
|
||||
msgstr "Показать новые пакеты"
|
||||
|
||||
#: urpm-repodiff.py:122
|
||||
#: urpm-repodiff.py:125
|
||||
msgid "Show removed packages"
|
||||
msgstr "Показать удалённые пакеты"
|
||||
|
||||
#: urpm-repodiff.py:124
|
||||
#: urpm-repodiff.py:127
|
||||
msgid "Show updated packages"
|
||||
msgstr "Показать обновлённые пакеты"
|
||||
|
||||
#: urpm-repodiff.py:126
|
||||
#: urpm-repodiff.py:129
|
||||
msgid "Show downgraded packages"
|
||||
msgstr "Показать пакеты с версией, откаченной на предыдущую"
|
||||
|
||||
#: urpm-repodiff.py:150 urpm-repograph.py:157 urpm-tools/urpm-repodiff.py:125
|
||||
#: urpm-repodiff.py:153 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:172 urpm-repograph.py:179 urpm-tools/urpm-repodiff.py:147
|
||||
#: urpm-repodiff.py:175 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:182 urpm-repograph.py:189 urpm-tools/urpm-repodiff.py:157
|
||||
#: urpm-repodiff.py:185 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:199 urpm-tools/urpm-repodiff.py:174
|
||||
#: urpm-repodiff.py:202 urpm-tools/urpm-repodiff.py:174
|
||||
#, python-format
|
||||
msgid "Error: Cannot open %s for writing."
|
||||
msgstr "Ошибка: Не удалось открыть %s для записи."
|
||||
|
||||
#: urpm-repodiff.py:208 urpm-repograph.py:222 urpm-repograph.py:237
|
||||
#: urpm-repodiff.py:211 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:217 urpm-repograph.py:246 urpm-tools/urpm-repodiff.py:192
|
||||
#: urpm-repodiff.py:220 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:221 urpm-repograph.py:250 urpm-tools/urpm-repodiff.py:196
|
||||
#: urpm-repodiff.py:224 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:235
|
||||
#: urpm-repodiff.py:238
|
||||
#, python-format
|
||||
msgid "Error: number of REPONAME's(%s) are not equal to number of groups(%s)"
|
||||
msgstr "Ошибка: количество REPONAME - имён репозиториев(%s) не равно количеству групп(%s)"
|
||||
|
||||
#: urpm-repodiff.py:249 urpm-repograph.py:262 urpm-tools/urpm-repodiff.py:218
|
||||
#: urpm-repodiff.py:253 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:254 urpm-repograph.py:267 urpm-tools/urpm-repodiff.py:223
|
||||
#: urpm-repodiff.py:258 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:262 urpm-repograph.py:275 urpm-tools/urpm-repodiff.py:231
|
||||
#: urpm-repodiff.py:266 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:301
|
||||
#: urpm-repodiff.py:305
|
||||
#, python-format
|
||||
msgid "Error: file %s does not exist."
|
||||
msgstr "Ошибка: Файл %s не существует."
|
||||
|
||||
#: urpm-repodiff.py:314
|
||||
#: urpm-repodiff.py:318
|
||||
#, 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-repodiff.py:358 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:359 urpm-repograph.py:293 urpm-tools/urpm-repodiff.py:277
|
||||
#: urpm-repodiff.py:363 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:363 urpm-repograph.py:297 urpm-repograph.py:313
|
||||
#: urpm-repodiff.py:367 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
|
||||
|
|
@ -211,103 +215,103 @@ msgstr "Ошибка: не удалось переименовать файл %(
|
|||
msgid "Error: file %s is missing."
|
||||
msgstr "Ошибка: файл %s отсутствует."
|
||||
|
||||
#: urpm-repodiff.py:367 urpm-repograph.py:301 urpm-tools/urpm-repodiff.py:285
|
||||
#: urpm-repodiff.py:371 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:376 urpm-repodiff.py:379 urpm-repograph.py:311
|
||||
#: urpm-repodiff.py:380 urpm-repodiff.py:383 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:434 urpm-repograph.py:406 urpm-tools/urpm-repodiff.py:351
|
||||
#: urpm-repodiff.py:438 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:437 urpm-tools/urpm-repodiff.py:354
|
||||
#: urpm-repodiff.py:441 urpm-tools/urpm-repodiff.py:354
|
||||
msgid "Parsing synthesis"
|
||||
msgstr "Чтение synthesis файла"
|
||||
|
||||
#: urpm-repodiff.py:466 urpm-repograph.py:451 urpm-tools/urpm-repodiff.py:380
|
||||
#: urpm-repodiff.py:470 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:475 urpm-tools/urpm-repodiff.py:389
|
||||
#: urpm-repodiff.py:479 urpm-tools/urpm-repodiff.py:389
|
||||
msgid "REPODIFF-Warning: strange format of <disttag> or <distepoch>: "
|
||||
msgstr "REPODIFF-Предупреждение: необычный формат <disttag> или <distepoch>: "
|
||||
|
||||
#: urpm-repodiff.py:496 urpm-repograph.py:371 urpm-tools/urpm-repodiff.py:410
|
||||
#: urpm-repodiff.py:500 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:626 urpm-tools/urpm-repodiff.py:527
|
||||
#: urpm-repodiff.py:630 urpm-tools/urpm-repodiff.py:527
|
||||
msgid "New package: "
|
||||
msgstr "Новый пакет: "
|
||||
|
||||
#: urpm-repodiff.py:641 urpm-tools/urpm-repodiff.py:542
|
||||
#: urpm-repodiff.py:645 urpm-tools/urpm-repodiff.py:542
|
||||
msgid "Generating obsoleted list."
|
||||
msgstr "Создание списка устаревших пакетов."
|
||||
|
||||
#: urpm-repodiff.py:700 urpm-tools/urpm-repodiff.py:601
|
||||
#: urpm-repodiff.py:704 urpm-tools/urpm-repodiff.py:601
|
||||
msgid "Removed package: "
|
||||
msgstr "Удален пакет: "
|
||||
|
||||
#: urpm-repodiff.py:708 urpm-tools/urpm-repodiff.py:609
|
||||
#: urpm-repodiff.py:712 urpm-tools/urpm-repodiff.py:609
|
||||
msgid " Obsoleted by "
|
||||
msgstr " Устарел из-за добавления "
|
||||
|
||||
#: urpm-repodiff.py:730 urpm-tools/urpm-repodiff.py:630
|
||||
#: urpm-repodiff.py:734 urpm-tools/urpm-repodiff.py:630
|
||||
msgid "Reading changelog"
|
||||
msgstr "Чтение списка изменений"
|
||||
|
||||
#: urpm-repodiff.py:732 urpm-tools/urpm-repodiff.py:632
|
||||
#: urpm-repodiff.py:736 urpm-tools/urpm-repodiff.py:632
|
||||
msgid "Error: Can't find changelog "
|
||||
msgstr "Ошибка: Не удалось найти список изменений "
|
||||
|
||||
#: urpm-repodiff.py:736 urpm-tools/urpm-repodiff.py:636
|
||||
#: urpm-repodiff.py:740 urpm-tools/urpm-repodiff.py:636
|
||||
msgid "Error: Can't read changelog "
|
||||
msgstr "Ошибка: Не удалось прочитать список изменений "
|
||||
|
||||
#: urpm-repodiff.py:740 urpm-tools/urpm-repodiff.py:640
|
||||
#: urpm-repodiff.py:744 urpm-tools/urpm-repodiff.py:640
|
||||
msgid "Error: Wrong changelog."
|
||||
msgstr "Ошибка: Неправильный список изменений."
|
||||
|
||||
#: urpm-repodiff.py:762 urpm-tools/urpm-repodiff.py:662
|
||||
#: urpm-repodiff.py:766 urpm-tools/urpm-repodiff.py:662
|
||||
msgid "Error: Corrupted changelog"
|
||||
msgstr "Ошибка: Поврежденный список изменений"
|
||||
|
||||
#: urpm-repodiff.py:861 urpm-tools/urpm-repodiff.py:756
|
||||
#: urpm-repodiff.py:865 urpm-tools/urpm-repodiff.py:756
|
||||
msgid "Generating changes list."
|
||||
msgstr "Создание списка изменений."
|
||||
|
||||
#: urpm-repodiff.py:877 urpm-repodiff.py:880 urpm-tools/urpm-repodiff.py:770
|
||||
#: urpm-repodiff.py:881 urpm-repodiff.py:884 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:878 urpm-tools/urpm-repodiff.py:771
|
||||
#: urpm-repodiff.py:882 urpm-tools/urpm-repodiff.py:771
|
||||
msgid "REPODIFF-Warning: Changelogs of a package are absent in \"new\" repository."
|
||||
msgstr "REPODIFF-Предупреждение: В репозитории \"новый\" отсутствует список изменений пакета."
|
||||
|
||||
#: urpm-repodiff.py:881 urpm-tools/urpm-repodiff.py:774
|
||||
#: urpm-repodiff.py:885 urpm-tools/urpm-repodiff.py:774
|
||||
msgid "REPODIFF-Warning: Changelogs of a package are absent."
|
||||
msgstr "REPODIFF-Предупреждение: У пакета отсутствует список изменений."
|
||||
|
||||
#: urpm-repodiff.py:910 urpm-tools/urpm-repodiff.py:800
|
||||
#: urpm-repodiff.py:914 urpm-tools/urpm-repodiff.py:800
|
||||
#, python-format
|
||||
msgid "Package %s has no changelog info\n"
|
||||
msgstr "Пакет %s не имеет списка изменений\n"
|
||||
|
||||
#: urpm-repodiff.py:930 urpm-tools/urpm-repodiff.py:818
|
||||
#: urpm-repodiff.py:934 urpm-tools/urpm-repodiff.py:818
|
||||
msgid ""
|
||||
"\n"
|
||||
"\n"
|
||||
|
|
@ -319,11 +323,11 @@ msgstr ""
|
|||
"Обновленные пакеты:\n"
|
||||
"\n"
|
||||
|
||||
#: urpm-repodiff.py:938 urpm-tools/urpm-repodiff.py:825
|
||||
#: urpm-repodiff.py:942 urpm-tools/urpm-repodiff.py:825
|
||||
msgid " ***DOWNGRADED***\n"
|
||||
msgstr " ***УСТАНОВЛЕНА ПРЕДЫДУЩАЯ ВЕРСИЯ***\n"
|
||||
|
||||
#: urpm-repodiff.py:956 urpm-tools/urpm-repodiff.py:834
|
||||
#: urpm-repodiff.py:960 urpm-tools/urpm-repodiff.py:834
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Size Change: %d bytes\n"
|
||||
|
|
@ -332,27 +336,27 @@ msgstr ""
|
|||
"Размер изменен: %d байт\n"
|
||||
"\n"
|
||||
|
||||
#: urpm-repodiff.py:971
|
||||
#: urpm-repodiff.py:975
|
||||
msgid "Summary:"
|
||||
msgstr "Итог:"
|
||||
|
||||
#: urpm-repodiff.py:979 urpm-tools/urpm-repodiff.py:844
|
||||
#: urpm-repodiff.py:983 urpm-tools/urpm-repodiff.py:844
|
||||
msgid " Total added packages: "
|
||||
msgstr " Всего добавлено пакетов: "
|
||||
|
||||
#: urpm-repodiff.py:983 urpm-tools/urpm-repodiff.py:847
|
||||
#: urpm-repodiff.py:987 urpm-tools/urpm-repodiff.py:847
|
||||
msgid " Total removed packages: "
|
||||
msgstr " Всего удалено пакетов: "
|
||||
|
||||
#: urpm-repodiff.py:994 urpm-tools/urpm-repodiff.py:856
|
||||
#: urpm-repodiff.py:998 urpm-tools/urpm-repodiff.py:856
|
||||
msgid " Total updated packages: "
|
||||
msgstr " Всего обновлено пакетов: "
|
||||
|
||||
#: urpm-repodiff.py:997 urpm-tools/urpm-repodiff.py:858
|
||||
#: urpm-repodiff.py:1001 urpm-tools/urpm-repodiff.py:858
|
||||
msgid " Total downgraded packages: "
|
||||
msgstr " Всего пакетов с пониженной версией: "
|
||||
|
||||
#: urpm-repodiff.py:1498 urpm-tools/urpm-repodiff.py:1316
|
||||
#: urpm-repodiff.py:1505 urpm-tools/urpm-repodiff.py:1316
|
||||
msgid "Creating HTML file."
|
||||
msgstr "Создание HTML файла."
|
||||
|
||||
|
|
|
|||
11538
repodiff.html
11538
repodiff.html
File diff suppressed because it is too large
Load diff
|
|
@ -93,9 +93,9 @@ def ParseCommandLine():
|
|||
help=_("Ignore release during package compare."))
|
||||
group.add_argument("--show-summary", action="store_true",
|
||||
help=_("Output summary."))
|
||||
group.add_argument("--output", "-out", action="store", nargs=1, default='',
|
||||
group.add_argument("--output", "-out", action="store", default=default_output,
|
||||
metavar="OUTPUT_FILE", help=_("Change standart output to \"OUTPUT_FILE\"."))
|
||||
group.add_argument("--ignore", "-i", action="store", nargs=1, default='',
|
||||
group.add_argument("--ignore", "-i", action="store", default='',
|
||||
metavar="IGNORELIST", help=_("File with list of ignored packages"))
|
||||
group = parser.add_argument_group(_('text mode parameters'),
|
||||
description=_("Parameters used only in text mode. (--html not present)"))
|
||||
|
|
@ -113,6 +113,9 @@ def ParseCommandLine():
|
|||
--size, --simple and --changelog options are ignored.") % htmlname)
|
||||
group.add_argument("--reponames", action="store", nargs='+', default='',
|
||||
metavar="REPONAME", help=_("Repository names for output."))
|
||||
group.add_argument("--title", "-t", action="store",
|
||||
default="Difference between repositories.",
|
||||
help=_("Set title."))
|
||||
group = parser.add_argument_group(_('Filters'),
|
||||
description=_("Filters for output. If none selected then every type will\
|
||||
be shown"))
|
||||
|
|
@ -237,6 +240,7 @@ def CheckParam(arg):
|
|||
exit_proc(arg)
|
||||
else:
|
||||
arg.repnames = ''
|
||||
arg.title = ''
|
||||
|
||||
def GetFile(urlpath, filename, localdir, arg):
|
||||
"""Donwload archive.
|
||||
|
|
@ -1261,7 +1265,9 @@ function sort_diff(col, type) {
|
|||
"""
|
||||
return javacontent
|
||||
|
||||
def HTML_OutputHead(file_output):
|
||||
def HTML_OutputHead(arg):
|
||||
file_output = arg.output
|
||||
title = arg.title
|
||||
"""Output beginning of the document.
|
||||
|
||||
Outputs static text.
|
||||
|
|
@ -1270,7 +1276,7 @@ def HTML_OutputHead(file_output):
|
|||
'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\n' +\
|
||||
'<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">\n' +
|
||||
'<head>\n' +\
|
||||
'<title>Differences between repositories</title>\n' +\
|
||||
'<title>' + title + '</title>\n' +\
|
||||
'<meta name="keywords" content="Mandriva,Rosa,RPM,repository,difference,changes"/>\n' +\
|
||||
'<meta name="description" content="List of changes between repositories"/>\n' +\
|
||||
'<meta http-equiv="content-type" content="text/html; charset=UTF-8"/>\n' +\
|
||||
|
|
@ -1358,9 +1364,10 @@ def HTML_OutputBody(dict_packages, list_dict_old, list_dict_new, arg):
|
|||
ifreleaseignore = arg.no_release
|
||||
reponames = arg.reponames
|
||||
show_summary = arg.show_summary
|
||||
title = arg.title
|
||||
show_mask = [arg.show_new, arg.show_removed, arg.show_updated, arg.show_downgraded]
|
||||
|
||||
file_output.write('<h1>Difference between repositories.</h1>\n' +\
|
||||
file_output.write('<h1>' + title + '</h1>\n' +\
|
||||
'<p class="bold">The use of color coding in tables:</p>\n' +\
|
||||
'<table>\n' +\
|
||||
'<tbody><tr><td class="new">New</td>\n' +\
|
||||
|
|
@ -1496,7 +1503,7 @@ def HTML_Output(dict_packages, list_dict_old, list_dict_new, arg):
|
|||
|
||||
if ifnotquiet:
|
||||
print _("Creating HTML file.")
|
||||
HTML_OutputHead(file_output)
|
||||
HTML_OutputHead(arg)
|
||||
HTML_OutputBody(dict_packages, list_dict_old, list_dict_new, arg)
|
||||
HTML_OutputTail(file_output)
|
||||
|
||||
|
|
@ -1507,13 +1514,8 @@ def main(args):
|
|||
head_new = arg.temp_dir + new_dir
|
||||
arg.temp_old = []
|
||||
arg.temp_new = []
|
||||
if (arg.output):
|
||||
tmp_output = arg.output[0]
|
||||
else:
|
||||
tmp_output = default_output
|
||||
if (arg.ignore):
|
||||
arg.ignore = arg.ignore[0]
|
||||
arg.output = None;
|
||||
tmp_output = arg.output
|
||||
arg.output = None
|
||||
for i in range(len(arg.old)):
|
||||
arg.temp_old.append([])
|
||||
for j in range(len(arg.old[i])):
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -7,7 +7,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: 1\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2012-09-21 14:33+0400\n"
|
||||
"POT-Creation-Date: 2012-09-21 17:01+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"
|
||||
|
|
@ -95,121 +95,125 @@ msgstr "Вывод в формате HTML. Если --output не указан,
|
|||
msgid "Repository names for output."
|
||||
msgstr "Формат вывода."
|
||||
|
||||
#: urpm-repodiff.py:116
|
||||
#: urpm-repodiff.py:118
|
||||
msgid "Set title."
|
||||
msgstr ""
|
||||
|
||||
#: urpm-repodiff.py:119
|
||||
msgid "Filters"
|
||||
msgstr ""
|
||||
|
||||
#: urpm-repodiff.py:117
|
||||
#: urpm-repodiff.py:120
|
||||
msgid "Filters for output. If none selected then every type will\t\t be shown"
|
||||
msgstr ""
|
||||
|
||||
#: urpm-repodiff.py:120
|
||||
#: urpm-repodiff.py:123
|
||||
#, fuzzy
|
||||
msgid "Show new packages"
|
||||
msgstr "Новый пакет: "
|
||||
|
||||
#: urpm-repodiff.py:122
|
||||
#: urpm-repodiff.py:125
|
||||
#, fuzzy
|
||||
msgid "Show removed packages"
|
||||
msgstr "удалить более старые пакеты"
|
||||
|
||||
#: urpm-repodiff.py:124
|
||||
#: urpm-repodiff.py:127
|
||||
#, fuzzy
|
||||
msgid "Show updated packages"
|
||||
msgstr " Всего обновлено пакетов: "
|
||||
|
||||
#: urpm-repodiff.py:126
|
||||
#: urpm-repodiff.py:129
|
||||
#, fuzzy
|
||||
msgid "Show downgraded packages"
|
||||
msgstr " Всего пакетов с пониженной версией: "
|
||||
|
||||
#: urpm-repodiff.py:150 urpm-repograph.py:157 urpm-tools/urpm-repodiff.py:125
|
||||
#: urpm-repodiff.py:153 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:172 urpm-repograph.py:179 urpm-tools/urpm-repodiff.py:147
|
||||
#: urpm-repodiff.py:175 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:182 urpm-repograph.py:189 urpm-tools/urpm-repodiff.py:157
|
||||
#: urpm-repodiff.py:185 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:199 urpm-tools/urpm-repodiff.py:174
|
||||
#: urpm-repodiff.py:202 urpm-tools/urpm-repodiff.py:174
|
||||
#, python-format
|
||||
msgid "Error: Cannot open %s for writing."
|
||||
msgstr "Ошибка: Не удалось открыть %s для записи."
|
||||
|
||||
#: urpm-repodiff.py:208 urpm-repograph.py:222 urpm-repograph.py:237
|
||||
#: urpm-repodiff.py:211 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:217 urpm-repograph.py:246 urpm-tools/urpm-repodiff.py:192
|
||||
#: urpm-repodiff.py:220 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:221 urpm-repograph.py:250 urpm-tools/urpm-repodiff.py:196
|
||||
#: urpm-repodiff.py:224 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:235
|
||||
#: urpm-repodiff.py:238
|
||||
#, 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-repodiff.py:253 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:254 urpm-repograph.py:267 urpm-tools/urpm-repodiff.py:223
|
||||
#: urpm-repodiff.py:258 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:262 urpm-repograph.py:275 urpm-tools/urpm-repodiff.py:231
|
||||
#: urpm-repodiff.py:266 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:301
|
||||
#: urpm-repodiff.py:305
|
||||
#, fuzzy, python-format
|
||||
msgid "Error: file %s does not exist."
|
||||
msgstr "Ошибка: Путь %s не существует."
|
||||
|
||||
#: urpm-repodiff.py:314
|
||||
#: urpm-repodiff.py:318
|
||||
#, 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-repodiff.py:358 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:359 urpm-repograph.py:293 urpm-tools/urpm-repodiff.py:277
|
||||
#: urpm-repodiff.py:363 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:363 urpm-repograph.py:297 urpm-repograph.py:313
|
||||
#: urpm-repodiff.py:367 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
|
||||
|
|
@ -217,103 +221,103 @@ msgstr "Ошибка: не удалось переименовать файл %(
|
|||
msgid "Error: file %s is missing."
|
||||
msgstr "Ошибка: файл %s отсутствует."
|
||||
|
||||
#: urpm-repodiff.py:367 urpm-repograph.py:301 urpm-tools/urpm-repodiff.py:285
|
||||
#: urpm-repodiff.py:371 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:376 urpm-repodiff.py:379 urpm-repograph.py:311
|
||||
#: urpm-repodiff.py:380 urpm-repodiff.py:383 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:434 urpm-repograph.py:406 urpm-tools/urpm-repodiff.py:351
|
||||
#: urpm-repodiff.py:438 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:437 urpm-tools/urpm-repodiff.py:354
|
||||
#: urpm-repodiff.py:441 urpm-tools/urpm-repodiff.py:354
|
||||
msgid "Parsing synthesis"
|
||||
msgstr "Чтение synthesis файла"
|
||||
|
||||
#: urpm-repodiff.py:466 urpm-repograph.py:451 urpm-tools/urpm-repodiff.py:380
|
||||
#: urpm-repodiff.py:470 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:475 urpm-tools/urpm-repodiff.py:389
|
||||
#: urpm-repodiff.py:479 urpm-tools/urpm-repodiff.py:389
|
||||
msgid "REPODIFF-Warning: strange format of <disttag> or <distepoch>: "
|
||||
msgstr "REPODIFF-Предупреждение: необычный формат <disttag> или <distepoch>: "
|
||||
|
||||
#: urpm-repodiff.py:496 urpm-repograph.py:371 urpm-tools/urpm-repodiff.py:410
|
||||
#: urpm-repodiff.py:500 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:626 urpm-tools/urpm-repodiff.py:527
|
||||
#: urpm-repodiff.py:630 urpm-tools/urpm-repodiff.py:527
|
||||
msgid "New package: "
|
||||
msgstr "Новый пакет: "
|
||||
|
||||
#: urpm-repodiff.py:641 urpm-tools/urpm-repodiff.py:542
|
||||
#: urpm-repodiff.py:645 urpm-tools/urpm-repodiff.py:542
|
||||
msgid "Generating obsoleted list."
|
||||
msgstr "Создание списка устаревших пакетов."
|
||||
|
||||
#: urpm-repodiff.py:700 urpm-tools/urpm-repodiff.py:601
|
||||
#: urpm-repodiff.py:704 urpm-tools/urpm-repodiff.py:601
|
||||
msgid "Removed package: "
|
||||
msgstr "Удален пакет: "
|
||||
|
||||
#: urpm-repodiff.py:708 urpm-tools/urpm-repodiff.py:609
|
||||
#: urpm-repodiff.py:712 urpm-tools/urpm-repodiff.py:609
|
||||
msgid " Obsoleted by "
|
||||
msgstr " Устарел из-за добавления "
|
||||
|
||||
#: urpm-repodiff.py:730 urpm-tools/urpm-repodiff.py:630
|
||||
#: urpm-repodiff.py:734 urpm-tools/urpm-repodiff.py:630
|
||||
msgid "Reading changelog"
|
||||
msgstr "Чтение списка изменений"
|
||||
|
||||
#: urpm-repodiff.py:732 urpm-tools/urpm-repodiff.py:632
|
||||
#: urpm-repodiff.py:736 urpm-tools/urpm-repodiff.py:632
|
||||
msgid "Error: Can't find changelog "
|
||||
msgstr "Ошибка: Не удалось найти список изменений "
|
||||
|
||||
#: urpm-repodiff.py:736 urpm-tools/urpm-repodiff.py:636
|
||||
#: urpm-repodiff.py:740 urpm-tools/urpm-repodiff.py:636
|
||||
msgid "Error: Can't read changelog "
|
||||
msgstr "Ошибка: Не удалось прочитать список изменений "
|
||||
|
||||
#: urpm-repodiff.py:740 urpm-tools/urpm-repodiff.py:640
|
||||
#: urpm-repodiff.py:744 urpm-tools/urpm-repodiff.py:640
|
||||
msgid "Error: Wrong changelog."
|
||||
msgstr "Ошибка: Неправильный список изменений."
|
||||
|
||||
#: urpm-repodiff.py:762 urpm-tools/urpm-repodiff.py:662
|
||||
#: urpm-repodiff.py:766 urpm-tools/urpm-repodiff.py:662
|
||||
msgid "Error: Corrupted changelog"
|
||||
msgstr "Ошибка: Поврежденный список изменений"
|
||||
|
||||
#: urpm-repodiff.py:861 urpm-tools/urpm-repodiff.py:756
|
||||
#: urpm-repodiff.py:865 urpm-tools/urpm-repodiff.py:756
|
||||
msgid "Generating changes list."
|
||||
msgstr "Создание списка изменений."
|
||||
|
||||
#: urpm-repodiff.py:877 urpm-repodiff.py:880 urpm-tools/urpm-repodiff.py:770
|
||||
#: urpm-repodiff.py:881 urpm-repodiff.py:884 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:878 urpm-tools/urpm-repodiff.py:771
|
||||
#: urpm-repodiff.py:882 urpm-tools/urpm-repodiff.py:771
|
||||
msgid "REPODIFF-Warning: Changelogs of a package are absent in \"new\" repository."
|
||||
msgstr "REPODIFF-Предупреждение: В репозитории \"новый\" отсутствует список изменений пакета."
|
||||
|
||||
#: urpm-repodiff.py:881 urpm-tools/urpm-repodiff.py:774
|
||||
#: urpm-repodiff.py:885 urpm-tools/urpm-repodiff.py:774
|
||||
msgid "REPODIFF-Warning: Changelogs of a package are absent."
|
||||
msgstr "REPODIFF-Предупреждение: У пакета отсутствует список изменений."
|
||||
|
||||
#: urpm-repodiff.py:910 urpm-tools/urpm-repodiff.py:800
|
||||
#: urpm-repodiff.py:914 urpm-tools/urpm-repodiff.py:800
|
||||
#, python-format
|
||||
msgid "Package %s has no changelog info\n"
|
||||
msgstr "Пакет %s не имеет списка изменений\n"
|
||||
|
||||
#: urpm-repodiff.py:930 urpm-tools/urpm-repodiff.py:818
|
||||
#: urpm-repodiff.py:934 urpm-tools/urpm-repodiff.py:818
|
||||
msgid ""
|
||||
"\n"
|
||||
"\n"
|
||||
|
|
@ -325,11 +329,11 @@ msgstr ""
|
|||
"Обновленные пакеты:\n"
|
||||
"\n"
|
||||
|
||||
#: urpm-repodiff.py:938 urpm-tools/urpm-repodiff.py:825
|
||||
#: urpm-repodiff.py:942 urpm-tools/urpm-repodiff.py:825
|
||||
msgid " ***DOWNGRADED***\n"
|
||||
msgstr " ***УСТАНОВЛЕНА ПРЕДЫДУЩАЯ ВЕРСИЯ***\n"
|
||||
|
||||
#: urpm-repodiff.py:956 urpm-tools/urpm-repodiff.py:834
|
||||
#: urpm-repodiff.py:960 urpm-tools/urpm-repodiff.py:834
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Size Change: %d bytes\n"
|
||||
|
|
@ -338,27 +342,27 @@ msgstr ""
|
|||
"Размер изменен: %d байт\n"
|
||||
"\n"
|
||||
|
||||
#: urpm-repodiff.py:971
|
||||
#: urpm-repodiff.py:975
|
||||
msgid "Summary:"
|
||||
msgstr ""
|
||||
|
||||
#: urpm-repodiff.py:979 urpm-tools/urpm-repodiff.py:844
|
||||
#: urpm-repodiff.py:983 urpm-tools/urpm-repodiff.py:844
|
||||
msgid " Total added packages: "
|
||||
msgstr " Всего добавлено пакетов: "
|
||||
|
||||
#: urpm-repodiff.py:983 urpm-tools/urpm-repodiff.py:847
|
||||
#: urpm-repodiff.py:987 urpm-tools/urpm-repodiff.py:847
|
||||
msgid " Total removed packages: "
|
||||
msgstr " Всего удалено пакетов: "
|
||||
|
||||
#: urpm-repodiff.py:994 urpm-tools/urpm-repodiff.py:856
|
||||
#: urpm-repodiff.py:998 urpm-tools/urpm-repodiff.py:856
|
||||
msgid " Total updated packages: "
|
||||
msgstr " Всего обновлено пакетов: "
|
||||
|
||||
#: urpm-repodiff.py:997 urpm-tools/urpm-repodiff.py:858
|
||||
#: urpm-repodiff.py:1001 urpm-tools/urpm-repodiff.py:858
|
||||
msgid " Total downgraded packages: "
|
||||
msgstr " Всего пакетов с пониженной версией: "
|
||||
|
||||
#: urpm-repodiff.py:1498 urpm-tools/urpm-repodiff.py:1316
|
||||
#: urpm-repodiff.py:1505 urpm-tools/urpm-repodiff.py:1316
|
||||
msgid "Creating HTML file."
|
||||
msgstr "Создание HTML файла."
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue