summaryrefslogtreecommitdiff
path: root/lib/libalpm
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libalpm')
-rw-r--r--lib/libalpm/po/ru.po12
-rw-r--r--lib/libalpm/po/zh_CN.po153
-rw-r--r--lib/libalpm/trans.c6
3 files changed, 85 insertions, 86 deletions
diff --git a/lib/libalpm/po/ru.po b/lib/libalpm/po/ru.po
index eb919c68..8430adf8 100644
--- a/lib/libalpm/po/ru.po
+++ b/lib/libalpm/po/ru.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: Pacman package manager 3.0.0\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
"POT-Creation-Date: 2008-08-23 10:54-0500\n"
-"PO-Revision-Date: 2008-08-24 02:00+0200\n"
+"PO-Revision-Date: 2008-08-24 02:01+0300\n"
"Last-Translator: Sergey Tereschenko <serg.partizan@gmail.com>\n"
"Language-Team: Russian\n"
"MIME-Version: 1.0\n"
@@ -145,7 +145,7 @@ msgstr "ошибка при чтении пакета %s: %s\n"
#, c-format
msgid "missing package metadata in %s\n"
-msgstr "отсутствуют метаданые пакета в %s\n"
+msgstr "отсутствуют метаданные пакета в %s\n"
#, c-format
msgid "attempt to re-register the 'local' DB\n"
@@ -337,7 +337,7 @@ msgstr "не удается загрузить данные пакета"
#, c-format
msgid "package not installed or lesser version"
-msgstr "пекет не установлен или ранней версии"
+msgstr "пакет не установлен или ранней версии"
#, c-format
msgid "cannot remove all files for package"
@@ -373,7 +373,7 @@ msgstr "конфликтующие зависимости"
#, c-format
msgid "conflicting files"
-msgstr "конфликрующие файлы"
+msgstr "конфликтующие файлы"
#, c-format
msgid "user aborted the operation"
@@ -421,7 +421,7 @@ msgstr "не могу удалить из базы данных запись %s-
#, c-format
msgid "could not remove entry '%s' from cache\n"
-msgstr "не могу удалить запись '%s' из кеша\n"
+msgstr "не могу удалить запись '%s' из кэша\n"
#, c-format
msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
@@ -461,7 +461,7 @@ msgstr "удаляю '%s' из списка целей, поскольку он
#, c-format
msgid "command: %s\n"
-msgstr "комманда: %s\n"
+msgstr "команда: %s\n"
#, c-format
msgid "failed to retrieve some files from %s\n"
diff --git a/lib/libalpm/po/zh_CN.po b/lib/libalpm/po/zh_CN.po
index 2d91420d..4d806ec6 100644
--- a/lib/libalpm/po/zh_CN.po
+++ b/lib/libalpm/po/zh_CN.po
@@ -10,8 +10,8 @@ msgstr ""
"Project-Id-Version: Pacman package manager 3.2.1\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
"POT-Creation-Date: 2008-08-23 10:54-0500\n"
-"PO-Revision-Date: 2008-08-25 08:33+0200\n"
-"Last-Translator: 甘露(Lu Gan) <rhythm.gan@gmail.com>\n"
+"PO-Revision-Date: 2008-10-28 16:20+0900\n"
+"Last-Translator: Lyman Li <lymanrb@gmail.com>\n"
"Language-Team: Chinese/Simplified <i18n-translation@lists.linux.net.cn>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,11 +19,11 @@ msgstr ""
#, c-format
msgid "replacing older version %s-%s by %s in target list\n"
-msgstr "正在替换老版本 %s-%s 通过在目标清单中的%s\n"
+msgstr "正在用目标清单中的 %3$s 替换老版本 %1$s-%2$s\n"
#, c-format
msgid "skipping %s-%s because newer version %s is in the target list\n"
-msgstr "跳过 %s-%s，因为较新版本的 %s 在目标清单中\n"
+msgstr "跳过 %1$s-%2$s，因为较新版本的 %3$s 在目标清单中\n"
#, c-format
msgid "conflicting packages were found in the target list\n"
@@ -35,51 +35,51 @@ msgstr "你不能同时安装有冲突的两个软件包\n"
#, c-format
msgid "replacing packages with -U is not supported yet\n"
-msgstr "正在覆盖软件包， -U 目前尚不支持\n"
+msgstr "目前尚不支持用 -U 参数替换软件包\n"
#, c-format
msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "你可以使用 -Rd 及 -U 来手动替代软件包\n"
+msgstr "你可以使用 -Rd 及 -U 来手动替换软件包\n"
#, c-format
msgid ""
"directory permissions differ on %s\n"
"filesystem: %o package: %o\n"
msgstr ""
-"目录权限不一致 %s\n"
-"文件系统：%o 软件包：%o\n"
+"目录权限不一致 %1$s\n"
+"文件系统：%2$o 软件包：%3$o\n"
#, c-format
msgid "extract: symlink %s does not point to dir\n"
-msgstr "解压缩：链接 %s 没有指向目录\n"
+msgstr "解压缩：符号链接 %s 没有指向目录\n"
#, c-format
msgid "extract: not overwriting dir with file %s\n"
-msgstr "解压缩：没有用 %s 覆盖目录\n"
+msgstr "解压缩：没有用文件 %s 覆盖目录\n"
#, c-format
msgid "could not extract %s (%s)\n"
-msgstr "无法解压缩 %s (%s)\n"
+msgstr "无法解压缩 %1$s (%2$s)\n"
#, c-format
msgid "could not rename %s to %s (%s)\n"
-msgstr "无法重命名 %s 为 %s (%s)\n"
+msgstr "无法将 %1$s 重命名为 %2$s (%3$s)\n"
#, c-format
msgid "%s saved as %s\n"
-msgstr "%s 已另存为 %s\n"
+msgstr "%1$s 已另存为 %2$s\n"
#, c-format
msgid "could not install %s as %s (%s)\n"
-msgstr "无法安装 %s 作为 %s (%s)\n"
+msgstr "无法将 %1$s 安装为 %2$s (%3$s)\n"
#, c-format
msgid "%s installed as %s\n"
-msgstr "%s 已作为 %s 安装\n"
+msgstr "%1$s 已安装为 %2$s\n"
#, c-format
msgid "extracting %s as %s.pacnew\n"
-msgstr "正在解压缩 %s 作为 %s.pacnew\n"
+msgstr "正在解压缩 %1$s 为 %2$s.pacnew\n"
#, c-format
msgid "could not get current working directory\n"
@@ -95,7 +95,7 @@ msgstr "安装 %s 时出现错误\n"
#, c-format
msgid "could not update database entry %s-%s\n"
-msgstr "无法更新数据库记录 %s-%s\n"
+msgstr "无法更新数据库记录 %1$s-%2$s\n"
#, c-format
msgid "could not add entry '%s' in cache\n"
@@ -103,7 +103,7 @@ msgstr "无法在缓存中添加记录 '%s' \n"
#, c-format
msgid "could not remove database entry %s%s\n"
-msgstr "无法删除数据库记录 %s%s\n"
+msgstr "无法删除数据库记录 %1$s%2$s\n"
#, c-format
msgid "invalid name for database entry '%s'\n"
@@ -115,19 +115,19 @@ msgstr "损坏的数据库记录 '%s'\n"
#, c-format
msgid "could not open file %s: %s\n"
-msgstr "无法打开文件 %s: %s\n"
+msgstr "无法打开文件 %1$s: %2$s\n"
#, c-format
msgid "%s database is inconsistent: name mismatch on package %s\n"
-msgstr "%s 数据库不一致：名字和软件包中的 %s 不一致\n"
+msgstr "%1$s 数据库不一致：名字和软件包中的 %2$s 不一致\n"
#, c-format
msgid "%s database is inconsistent: version mismatch on package %s\n"
-msgstr "%s 数据库不一致：版本和软件包中的 %s 不一致\n"
+msgstr "%1$s 数据库不一致：版本和软件包中的 %2$s 不一致\n"
#, c-format
msgid "could not parse package description file in %s\n"
-msgstr "无法分析 %s 中的软件包描述文件\n"
+msgstr "无法解析 %s 中的软件包描述文件\n"
#, c-format
msgid "missing package name in %s\n"
@@ -139,7 +139,7 @@ msgstr "%s 中缺少软件包版本号\n"
#, c-format
msgid "error while reading package %s: %s\n"
-msgstr "读取软件包%s: %s发生错误\n"
+msgstr "读取软件包 %1$s 发生错误: %2$s\n"
#, c-format
msgid "missing package metadata in %s\n"
@@ -151,35 +151,35 @@ msgstr "尝试重新登记“本地”数据库\n"
#, c-format
msgid "database path is undefined\n"
-msgstr "没有指定数据库路径\n"
+msgstr "数据库路径未定义\n"
#, c-format
msgid "dependency cycle detected:\n"
-msgstr "探测到依赖关系循环：\n"
+msgstr "检测到依赖关系环：\n"
#, c-format
msgid "%s will be removed after its %s dependency\n"
-msgstr "%s 将在它 %s 的依赖关系之后被删除\n"
+msgstr "%1$s 将在它 %2$s 的依赖关系之后被删除\n"
#, c-format
msgid "%s will be installed before its %s dependency\n"
-msgstr "%s 将在它 %s 的依赖关系之前被安装\n"
+msgstr "%1$s 将在它 %2$s 的依赖关系之前被安装\n"
#, c-format
msgid "provider package was selected (%s provides %s)\n"
-msgstr "已选定提供软件包 (%s 提供 %s)\n"
+msgstr "已选定提供软件包 (%1$s 提供 %2$s)\n"
#, c-format
msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
-msgstr "无法解决 \"%s\"，\"%s\" 的依赖关系\n"
+msgstr "无法解决 \"%1$s\"，\"%2$s\" 的一个依赖关系\n"
#, c-format
msgid "url '%s' is invalid\n"
-msgstr "url %s' 无效\n"
+msgstr "url '%s' 无效\n"
#, c-format
msgid "url scheme not specified, assuming HTTP\n"
-msgstr "url 结构没有指定，假定为 HTTP\n"
+msgstr "url scheme 未指定，假定为 HTTP\n"
#, c-format
msgid "disk"
@@ -187,7 +187,7 @@ msgstr "硬盘"
#, c-format
msgid "failed retrieving file '%s' from %s : %s\n"
-msgstr "无法从 %s : %s 获取文件 '%s' \n"
+msgstr "无法从 %2$s : %3$s 获取文件 '%1$s'\n"
#, c-format
msgid "cannot resume download, starting over\n"
@@ -199,31 +199,31 @@ msgstr "无法写入文件 '%s'\n"
#, c-format
msgid "error downloading '%s': %s\n"
-msgstr "下载 '%s': %s 时出错\n"
+msgstr "下载 '%1$s' 时出错: %2$s\n"
#, c-format
msgid "error writing to file '%s': %s\n"
-msgstr "写入文件 '%s': %s 时出错\n"
+msgstr "写入文件 '%1$s' 时出错: %2$s\n"
#, c-format
msgid "could not chdir to %s\n"
-msgstr "无法改变目录到 %s\n"
+msgstr "无法切换目录到 %s\n"
#, c-format
msgid "running XferCommand: fork failed!\n"
-msgstr "运行 XferCommand：分支失败！\n"
+msgstr "正在运行 XferCommand：fork 失败！\n"
#, c-format
msgid "failed to download %s\n"
-msgstr "下载%s失败\n"
+msgstr "下载 %s 失败\n"
#, c-format
msgid "out of memory!"
-msgstr "没有内存可用！"
+msgstr "内存不足！"
#, c-format
msgid "unexpected system error"
-msgstr "未预计的系统错误"
+msgstr "未预期的系统错误"
#, c-format
msgid "insufficient privileges"
@@ -239,11 +239,11 @@ msgstr "无法找到或读取目录"
#, c-format
msgid "wrong or NULL argument passed"
-msgstr "传递了错误的或空的参数"
+msgstr "传递了错误的或 NULL 参数"
#, c-format
msgid "library not initialized"
-msgstr "无法初始化函数库"
+msgstr "函数库未初始化"
#, c-format
msgid "library already initialized"
@@ -263,7 +263,7 @@ msgstr "无法创建数据库"
#, c-format
msgid "database not initialized"
-msgstr "数据库无法初始化"
+msgstr "数据库未初始化"
#, c-format
msgid "database already registered"
@@ -283,7 +283,7 @@ msgstr "无法删除数据库记录"
#, c-format
msgid "invalid url for server"
-msgstr "无效的服务器url"
+msgstr "无效的服务器 url"
#, c-format
msgid "transaction already initialized"
@@ -291,7 +291,7 @@ msgstr "处理已初始化"
#, c-format
msgid "transaction not initialized"
-msgstr "处理无法初始化"
+msgstr "处理未初始化"
#, c-format
msgid "duplicate target"
@@ -339,7 +339,7 @@ msgstr "软件包没有安装或版本较低"
#, c-format
msgid "cannot remove all files for package"
-msgstr "无法删除软件包全部文件"
+msgstr "无法为软件包删除全部文件"
#, c-format
msgid "package filename is not valid"
@@ -351,7 +351,7 @@ msgstr "没有该软件库"
#, c-format
msgid "invalid or corrupted delta"
-msgstr "无效的或已损坏的 delta 包"
+msgstr "无效的或已损坏的 delta"
#, c-format
msgid "delta patch failed"
@@ -375,7 +375,7 @@ msgstr "有冲突的文件"
#, c-format
msgid "user aborted the operation"
-msgstr "用户中断操作"
+msgstr "用户中断了操作"
#, c-format
msgid "internal error"
@@ -383,11 +383,11 @@ msgstr "内部错误"
#, c-format
msgid "not confirmed"
-msgstr "不能确认"
+msgstr "未确认"
#, c-format
msgid "invalid regular expression"
-msgstr "无效的常规表达式"
+msgstr "无效的正则表达式"
#, c-format
msgid "libarchive error"
@@ -399,7 +399,7 @@ msgstr "下载函数库出错"
#, c-format
msgid "error invoking external downloader"
-msgstr "激活外部下载程序时出现错误"
+msgstr "调用外部下载程序时出错"
#, c-format
msgid "unexpected error"
@@ -411,11 +411,11 @@ msgstr "无法在数据库中找到 %s -- 跳过\n"
#, c-format
msgid "cannot remove file '%s': %s\n"
-msgstr "无法删除文件 '%s': %s\n"
+msgstr "无法删除文件 '%1$s': %2$s\n"
#, c-format
msgid "could not remove database entry %s-%s\n"
-msgstr "无法删除数据库记录 %s-%s\n"
+msgstr "无法删除数据库记录 %1$s-%2$s\n"
#, c-format
msgid "could not remove entry '%s' from cache\n"
@@ -423,15 +423,15 @@ msgstr "无法从缓存中删除记录 '%s'\n"
#, c-format
msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
-msgstr "%s-%s：忽略软件包更新（由%s-%s替代）\n"
+msgstr "%1$s-%2$s：忽略软件包更新（由 %3$s-%4$s 替代）\n"
#, c-format
msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr "%s：本地（%s）比 %s 的版本更新(%s)\n"
+msgstr "%1$s：本地（%2$s）比 %3$s 的版本更新 (%4$s)\n"
#, c-format
msgid "%s: ignoring package upgrade (%s => %s)\n"
-msgstr "%s：忽略软件包更新（%s => %s）\n"
+msgstr "%1$s：忽略软件包更新（%2$s => %3$s）\n"
#, c-format
msgid "repository '%s' not found\n"
@@ -439,23 +439,23 @@ msgstr "没有找到软件库 '%s'\n"
#, c-format
msgid "%s-%s is up to date -- skipping\n"
-msgstr "%s-%s 已经为最新 -- 跳过\n"
+msgstr "%1$s-%2$s 已经为最新 -- 跳过\n"
#, c-format
msgid "%s-%s is up to date -- reinstalling\n"
-msgstr "%s-%s 已经为最新 -- 重新安装\n"
+msgstr "%1$s-%2$s 已经为最新 -- 重新安装\n"
#, c-format
msgid "downgrading package %s (%s => %s)\n"
-msgstr "正在降级软件包 %s (%s => %s)\n"
+msgstr "正在降级软件包 %1$s (%2$s => %3$s)\n"
#, c-format
msgid "unresolvable package conflicts detected\n"
-msgstr "探测到无法解决的软件包冲突\n"
+msgstr "检测到未解决的软件包冲突\n"
#, c-format
msgid "removing '%s' from target list because it conflicts with '%s'\n"
-msgstr "正在从目标清单中删除 '%s' ，因为它和 '%s' 有冲突\n"
+msgstr "正在从目标清单中删除 '%1$s' ，因为它和 '%2$s' 冲突\n"
#, c-format
msgid "command: %s\n"
@@ -463,23 +463,23 @@ msgstr "命令：%s\n"
#, c-format
msgid "failed to retrieve some files from %s\n"
-msgstr "某些文件无法从%s取回\n"
+msgstr "无法从 %s 获取某些文件\n"
#, c-format
msgid "could not create removal transaction\n"
-msgstr "无法生成可删除处理\n"
+msgstr "无法生成可撤销处理\n"
#, c-format
msgid "could not initialize the removal transaction\n"
-msgstr "无法初始化可删除处理\n"
+msgstr "无法初始化可撤销处理\n"
#, c-format
msgid "could not prepare removal transaction\n"
-msgstr "无法准备可删除处理\n"
+msgstr "无法准备可撤销处理\n"
#, c-format
msgid "could not commit removal transaction\n"
-msgstr "无法交付可删除处理\n"
+msgstr "无法交付可撤销处理\n"
#, c-format
msgid "could not create transaction\n"
@@ -503,7 +503,7 @@ msgstr "无法删除锁定文件 %s\n"
#, c-format
msgid "No /bin/sh in parent environment, aborting scriptlet\n"
-msgstr "父环境中没有 /bin/sh，正在中断脚本\n"
+msgstr "父环境中没有 /bin/sh，正在中断小脚本\n"
#, c-format
msgid "could not create temp directory\n"
@@ -511,43 +511,43 @@ msgstr "无法创建临时目录\n"
#, c-format
msgid "could not copy tempfile to %s (%s)\n"
-msgstr "无法复制临时文件到 %s (%s)\n"
+msgstr "无法复制临时文件到 %1$s (%2$s)\n"
#, c-format
msgid "could not change directory to %s (%s)\n"
-msgstr "无法更改目录到 %s (%s)\n"
+msgstr "无法更改目录到 %1$s (%2$s)\n"
#, c-format
msgid "could not fork a new process (%s)\n"
-msgstr "无法分支新进程(%s)\n"
+msgstr "无法 fork 新进程 (%s)\n"
#, c-format
msgid "could not change the root directory (%s)\n"
-msgstr "无法更改根目录(%s)\n"
+msgstr "无法更改根目录 (%s)\n"
#, c-format
msgid "could not change directory to / (%s)\n"
-msgstr "无法更改目录到/ (%s)\n"
+msgstr "无法切换目录到 / (%s)\n"
#, c-format
msgid "call to popen failed (%s)"
-msgstr "调用 popen 失败(%s)"
+msgstr "调用 popen 失败 (%s)"
#, c-format
msgid "call to waitpid failed (%s)\n"
-msgstr "调用 waitpid 失败(%s)\n"
+msgstr "调用 waitpid 失败 (%s)\n"
#, c-format
msgid "scriptlet failed to execute correctly\n"
-msgstr "脚本没有被正确执行\n"
+msgstr "小脚本未能被正确执行\n"
#, c-format
msgid "could not remove tmpdir %s\n"
-msgstr "无法删除临时目录%s\n"
+msgstr "无法删除临时目录 %s\n"
#, c-format
msgid "could not open %s: %s\n"
-msgstr "无法打开 %s: %s\n"
+msgstr "无法打开 %1$s: %2$s\n"
#, c-format
msgid "no %s cache exists, creating...\n"
@@ -556,4 +556,3 @@ msgstr "没有 %s 缓存存在，正在创建...\n"
#, c-format
msgid "couldn't create package cache, using /tmp instead\n"
msgstr "无法创建软件包缓存，正在使用 /tmp 代替\n"
-
diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c
index 73ae822e..96ac1bc8 100644
--- a/lib/libalpm/trans.c
+++ b/lib/libalpm/trans.c
@@ -551,8 +551,7 @@ int _alpm_runscriptlet(const char *root, const char *installfn,
if(!pipe) {
_alpm_log(PM_LOG_ERROR, _("call to popen failed (%s)"),
strerror(errno));
- retval = 1;
- goto cleanup;
+ exit(1);
}
while(!feof(pipe)) {
char line[PATH_MAX];
@@ -561,7 +560,8 @@ int _alpm_runscriptlet(const char *root, const char *installfn,
alpm_logaction("%s", line);
EVENT(trans, PM_TRANS_EVT_SCRIPTLET_INFO, line, NULL);
}
- exit(0);
+ retval = pclose(pipe);
+ exit(WEXITSTATUS(retval));
} else {
/* this code runs for the parent only (wait on the child) */
pid_t retpid;
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-27 23:24:05 +0000