diff options
author | Greg Lewis <glewis@FreeBSD.org> | 2002-05-03 05:32:23 +0000 |
---|---|---|
committer | Greg Lewis <glewis@FreeBSD.org> | 2002-05-03 05:32:23 +0000 |
commit | b2841c80771b3ba70a51ca94ecaef0ce92439eeb (patch) | |
tree | 48dfbbaca331d27c6650ded3969e4f1e5e7d10f5 /java/jdk15/files/patch-..::ext::plugin::oji-plugin::src::motif::resources::zh.GBK::sunw_java_plugin.po | |
parent | Security fix for token passing, see bugtraq for details. (diff) |
Really fix the incompatibilities with gettext 0.11. The previous
bandaid is reverted by this commit and instead patches are added
which will remove duplicate message entries from the .po files for
the plugin.
These are essentially the patches of marius@alchemy.franken.de, with
the first part of each patch removed (the message does actually have
two spaces in the code!). These patches were verified with the script
submitted by KANOU Hiroki-san and against the patches submitted by
SUGIMURA Takashi-san. Thanks to all of these people.
Apologies for the increasingly long patch names.
PR: 37087, 37147
Submitted by: marius@alchemy.franken.de
Reviewed by: sobomax
Approved by: sobomax
Notes
Notes:
svn path=/head/; revision=58482
Diffstat (limited to 'java/jdk15/files/patch-..::ext::plugin::oji-plugin::src::motif::resources::zh.GBK::sunw_java_plugin.po')
-rw-r--r-- | java/jdk15/files/patch-..::ext::plugin::oji-plugin::src::motif::resources::zh.GBK::sunw_java_plugin.po | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/java/jdk15/files/patch-..::ext::plugin::oji-plugin::src::motif::resources::zh.GBK::sunw_java_plugin.po b/java/jdk15/files/patch-..::ext::plugin::oji-plugin::src::motif::resources::zh.GBK::sunw_java_plugin.po new file mode 100644 index 000000000000..b562ec38b669 --- /dev/null +++ b/java/jdk15/files/patch-..::ext::plugin::oji-plugin::src::motif::resources::zh.GBK::sunw_java_plugin.po @@ -0,0 +1,25 @@ +$FreeBSD$ + +--- ../ext/plugin/oji-plugin/src/motif/resources/zh.GBK/sunw_java_plugin.po.orig Sun May 6 15:15:35 2001 ++++ ../ext/plugin/oji-plugin/src/motif/resources/zh.GBK/sunw_java_plugin.po Sat Apr 27 01:07:14 2002 +@@ -21,20 +21,12 @@ + msgstr "插件:从下列来源读取 Netscape 代理服务器配置 URL 有问题\n" + msgid "Plugin: couldn't read directory" + msgstr "插件:无法读取目录" +-msgid "plugin: java process exited with status" +-msgstr "插件:java 已带状态退出" + msgid "plugin: java process died due to signal" + msgstr "插件:java 进程已因信号而死" + msgid " a core file was generated" + msgstr " 生成了一个内核文件" +-msgid "Plugin: trouble with work request from child" +-msgstr "插件:处理来自子类的工作请求有问题" + msgid "Plugin: can't find IP address for current host" + msgstr "插件:找不到当前主机的 IP 地址" +-msgid "Plugin: trouble reading Netscape proxy configuration URL from\n" +-msgstr "插件:从下列来源读取 Netscape 代理服务器配置 URL 有问题\n" +-msgid "Plugin: can't find plugins/../java directory" +-msgstr "插件:找不到 plugins/../java 目录" + msgid "Plugin: unexpected work request from child" + msgstr "插件:来自子类的意外的工作请求" + msgid "Plugin: Java VM process has died." |