Resolve the libxfsm build order problem. Issue a detailed message if the

failsafe session couldn't be loaded. Imported the xfce4-session-logout
hack from Brian, requested too often to ignore. Update the man pages, esp.
mention the XDG variables in the xfce4-session man page. Update the po
files.


(Old svn revision: 4711)

1 files changed, 122 insertions, 122 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 74679912..e9ebc843 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-11 18:28+0200\n"
+"POT-Creation-Date: 2004-11-01 17:04+0100\n"
 "PO-Revision-Date: 2004-09-28 01:05-0700\n"
 "Last-Translator: Yongtao Yang <yongtao.yang@telia.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,6 +16,83 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: engines/balou/balou-theme.c:110
+msgid "No description given"
+msgstr "未提供描述"
+
+#: engines/balou/config.c:317
+msgid "Choose theme file to install..."
+msgstr "选择要安装的主题文件..."
+
+#: engines/balou/config.c:329
+#, c-format
+msgid ""
+"Unable to install splash theme from file %s, please check that the file is a "
+"valid splash theme archive."
+msgstr ""
+"无法从文件 %s 中安装飞溅主题，请检查该文件是否为一个有效的飞溅主题文档。"
+
+#: engines/balou/config.c:382
+#, c-format
+msgid "Unable to remove splash theme \"%s\" from directory %s."
+msgstr "无法从目录 %s 中删除飞溅屏幕主题: “%s”。"
+
+#: engines/balou/config.c:467
+msgid "Choose theme filename..."
+msgstr "选择主题文件名..."
+
+#: engines/balou/config.c:600
+msgid "_Install new theme"
+msgstr "安装新主题(_I)"
+
+#: engines/balou/config.c:609
+msgid "_Remove theme"
+msgstr "删除主题(_R)"
+
+#: engines/balou/config.c:626
+msgid "_Export theme"
+msgstr "导出主题(_E)"
+
+#: engines/balou/config.c:841
+msgid "Balou theme"
+msgstr "Balou 主题"
+
+#: engines/balou/config.c:924
+msgid "Configure Balou..."
+msgstr "设置 Balou ..."
+
+#: engines/simple/simple.c:315
+msgid "Choose image..."
+msgstr "选择图像..."
+
+#: engines/simple/simple.c:360
+msgid "Configure Simple..."
+msgstr "设置 Simple 主题..."
+
+#: engines/simple/simple.c:371
+msgid "Font"
+msgstr "字体"
+
+#: engines/simple/simple.c:380
+msgid "Colors"
+msgstr "颜色"
+
+#: engines/simple/simple.c:388
+msgid "Background color:"
+msgstr "背景颜色："
+
+#: engines/simple/simple.c:400
+msgid "Text color:"
+msgstr "字体颜色："
+
+#: engines/simple/simple.c:412
+msgid "Image"
+msgstr "图像"
+
+#: engines/simple/simple.c:420
+msgid "Use custom image"
+msgstr "使用自选图像"
+
 #: settings/session/session.c:133
 msgid "Session chooser"
 msgstr "会话选择"
@@ -173,82 +250,82 @@ msgstr "<b>主页：</b>"
 msgid "Splash Screen"
 msgstr "飞溅屏幕"
 
-#: xfce4-session/main.c:138
+#: xfce4-session/main.c:139
 msgid "Loading desktop settings"
 msgstr "正在加载桌面设置"
 
 #. verify that the DNS settings are ok
-#: xfce4-session/main.c:191
+#: xfce4-session/main.c:196
 msgid "Verifying DNS settings"
 msgstr "正在确认 DNS 设置"
 
-#: xfce4-session/main.c:194
+#: xfce4-session/main.c:199
 msgid "Loading session data"
 msgstr "正在读取会话数据"
 
-#: xfce4-session/shutdown.c:290
+#: xfce4-session/shutdown.c:291
 msgid "What do you want to do next?"
 msgstr "下一步您要干什么?"
 
-#: xfce4-session/shutdown.c:299
+#: xfce4-session/shutdown.c:300
 msgid "Quit current session"
 msgstr "退出当前会话"
 
-#: xfce4-session/shutdown.c:305
+#: xfce4-session/shutdown.c:306
 msgid "Reboot the computer"
 msgstr "重新启动计算机"
 
-#: xfce4-session/shutdown.c:310
+#: xfce4-session/shutdown.c:311
 msgid "Turn off the computer"
 msgstr "关闭计算机"
 
-#: xfce4-session/shutdown.c:317
+#: xfce4-session/shutdown.c:318
 msgid "_Save session for future logins"
 msgstr "为以后的登陆保存会话(_S)"
 
-#: xfce4-session/shutdown.c:392
+#: xfce4-session/shutdown.c:393
 msgid "Please enter your password:"
 msgstr "请输入您的密码："
 
-#: xfce4-session/shutdown.c:424
+#: xfce4-session/shutdown.c:425
 msgid "<b>An error occured</b>"
 msgstr "<b>出现错误</b>"
 
-#: xfce4-session/shutdown.c:438
+#: xfce4-session/shutdown.c:439
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
 msgstr "或者您所输入的密码不正确，或者系统管理员不允许您的帐户关闭该计算机。"
 
-#: xfce4-session/xfsm-chooser.c:208
+#: xfce4-session/xfsm-chooser.c:209
 msgid ""
 "Choose the session you want to restore. You can simply double-click the "
 "session name to restore it."
 msgstr "选择您希望恢复的会话。您可以简单地双击会话名来恢复该会话。"
 
 #. "Logout" button
-#: xfce4-session/xfsm-chooser.c:234
+#: xfce4-session/xfsm-chooser.c:235
 msgid "Logout"
 msgstr "注销"
 
-#: xfce4-session/xfsm-chooser.c:236
+#: xfce4-session/xfsm-chooser.c:237
 msgid "Cancel the login attempt and return to the login screen."
 msgstr "取消本次登录并且返回到登录屏幕。"
 
 #. "New" button
-#: xfce4-session/xfsm-chooser.c:244
+#: xfce4-session/xfsm-chooser.c:245
 msgid "New session"
 msgstr "新会话"
 
-#: xfce4-session/xfsm-chooser.c:246
+#: xfce4-session/xfsm-chooser.c:247
 msgid "Create a new session."
 msgstr "创建一个新的会话。"
 
-#: xfce4-session/xfsm-dns.c:76
+#: xfce4-session/xfsm-dns.c:77
 msgid "(Unknown)"
 msgstr "(未知)"
 
-#: xfce4-session/xfsm-dns.c:143
+#: xfce4-session/xfsm-dns.c:144
 #, c-format
 msgid ""
 "Could not look up internet address for %s.\n"
@@ -261,11 +338,11 @@ msgstr ""
 "将 %s 添加到您系统中的文件\n"
 " /etc/hosts 中可能解决该问题。"
 
-#: xfce4-session/xfsm-dns.c:150
+#: xfce4-session/xfsm-dns.c:151
 msgid "Continue anyway"
 msgstr "仍然继续"
 
-#: xfce4-session/xfsm-dns.c:151
+#: xfce4-session/xfsm-dns.c:152
 msgid "Try again"
 msgstr "重试"
 
@@ -281,176 +358,99 @@ msgstr "正在启动 Gnome Assistive Technologies"
 msgid "Starting KDE services"
 msgstr "正在启动 KDE 服务"
 
-#: xfce4-session/xfsm-splash-screen.c:177
+#: xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "选择会话"
 
-#: xfce4-session/xfsm-splash-screen.c:207
+#: xfce4-session/xfsm-splash-screen.c:208
 msgid "Choose session name"
 msgstr "选择回话名称"
 
-#: xfce4-session/xfsm-splash-screen.c:221
+#: xfce4-session/xfsm-splash-screen.c:222
 msgid "Choose a name for the new session:"
 msgstr "为新的会话选择名称："
 
-#: xfce4-session/xfsm-startup.c:92
+#: xfce4-session/xfsm-startup.c:93
 msgid "Starting the Volume Controller"
 msgstr "启动音量控制器"
 
-#: xfce4-session/xfsm-startup.c:94
+#: xfce4-session/xfsm-startup.c:95
 msgid "Starting the Panel"
 msgstr "正在启动面板"
 
-#: xfce4-session/xfsm-startup.c:96
+#: xfce4-session/xfsm-startup.c:97
 msgid "Starting the Desktop Manager"
 msgstr "正在启动桌面管理器"
 
-#: xfce4-session/xfsm-startup.c:98
+#: xfce4-session/xfsm-startup.c:99
 msgid "Starting the Taskbar"
 msgstr "正在启动任务条"
 
-#: xfce4-session/xfsm-startup.c:100
+#: xfce4-session/xfsm-startup.c:101
 msgid "Starting the Window Manager"
 msgstr "正在启动窗口管理器"
 
-#: xfce4-session/xfsm-startup.c:104
+#: xfce4-session/xfsm-startup.c:105
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "正在启动Gnome终端仿真程序"
 
-#: xfce4-session/xfsm-startup.c:108
+#: xfce4-session/xfsm-startup.c:109
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "正在启动KDE高级文本编辑器"
 
-#: xfce4-session/xfsm-startup.c:110
+#: xfce4-session/xfsm-startup.c:111
 msgid "Starting the KDE Clipboard Manager"
 msgstr "正在启动KDE剪贴板管理器"
 
-#: xfce4-session/xfsm-startup.c:112
+#: xfce4-session/xfsm-startup.c:113
 msgid "Starting the KDE Mail Reader"
 msgstr "正在启动KDE邮件阅读程序"
 
-#: xfce4-session/xfsm-startup.c:114
+#: xfce4-session/xfsm-startup.c:115
 msgid "Starting the KDE News Reader"
 msgstr "正在启动KDE新闻阅读程序"
 
-#: xfce4-session/xfsm-startup.c:116
+#: xfce4-session/xfsm-startup.c:117
 msgid "Starting the Konqueror"
 msgstr "正在启动Konqueror"
 
-#: xfce4-session/xfsm-startup.c:118
+#: xfce4-session/xfsm-startup.c:119
 msgid "Starting the KDE Terminal Emulator"
 msgstr "正在启动KDE终端仿真程序"
 
-#: xfce4-session/xfsm-startup.c:122
+#: xfce4-session/xfsm-startup.c:123
 msgid "Starting the Beep Media Player"
 msgstr "正在启动 Beep 媒体播放器"
 
-#: xfce4-session/xfsm-startup.c:124
+#: xfce4-session/xfsm-startup.c:125
 msgid "Starting The Gimp"
 msgstr "正在启动 The Gimp"
 
-#: xfce4-session/xfsm-startup.c:126
+#: xfce4-session/xfsm-startup.c:127
 msgid "Starting the VI Improved Editor"
 msgstr "正在启动 VIM 编辑器"
 
-#: xfce4-session/xfsm-startup.c:128
+#: xfce4-session/xfsm-startup.c:129
 msgid "Starting the Session Management Proxy"
 msgstr "正在启动会话管理代理"
 
-#: xfce4-session/xfsm-startup.c:130
+#: xfce4-session/xfsm-startup.c:131
 msgid "Starting the X-Chat IRC Client"
 msgstr "正在启动 X-Chat IRC 客户程序"
 
-#: xfce4-session/xfsm-startup.c:132
+#: xfce4-session/xfsm-startup.c:133
 msgid "Starting the X Multimedia System"
 msgstr "正在启动 X 多媒体系统"
 
-#: xfce4-session/xfsm-startup.c:134
+#: xfce4-session/xfsm-startup.c:135
 msgid "Starting the X Terminal Emulator"
 msgstr "正在启动 X 终端仿真器"
 
-#: xfce4-session/xfsm-startup.c:136
+#: xfce4-session/xfsm-startup.c:137
 #, c-format
 msgid "Starting %s"
 msgstr "正在启动 %s"
 
-#: xfce4-session/xfsm-startup.c:158
+#: xfce4-session/xfsm-startup.c:159
 msgid "Performing Autostart..."
 msgstr "正在执行自动启动..."
-
-#: engines/balou/balou-theme.c:110
-msgid "No description given"
-msgstr "未提供描述"
-
-#: engines/balou/config.c:317
-msgid "Choose theme file to install..."
-msgstr "选择要安装的主题文件..."
-
-#: engines/balou/config.c:329
-#, c-format
-msgid ""
-"Unable to install splash theme from file %s, please check that the file is a "
-"valid splash theme archive."
-msgstr ""
-"无法从文件 %s 中安装飞溅主题，请检查该文件是否为一个有效的飞溅主题文档。"
-
-#: engines/balou/config.c:382
-#, c-format
-msgid "Unable to remove splash theme \"%s\" from directory %s."
-msgstr "无法从目录 %s 中删除飞溅屏幕主题: “%s”。"
-
-#: engines/balou/config.c:467
-msgid "Choose theme filename..."
-msgstr "选择主题文件名..."
-
-#: engines/balou/config.c:600
-msgid "_Install new theme"
-msgstr "安装新主题(_I)"
-
-#: engines/balou/config.c:609
-msgid "_Remove theme"
-msgstr "删除主题(_R)"
-
-#: engines/balou/config.c:626
-msgid "_Export theme"
-msgstr "导出主题(_E)"
-
-#: engines/balou/config.c:841
-msgid "Balou theme"
-msgstr "Balou 主题"
-
-#: engines/balou/config.c:924
-msgid "Configure Balou..."
-msgstr "设置 Balou ..."
-
-#: engines/simple/simple.c:315
-msgid "Choose image..."
-msgstr "选择图像..."
-
-#: engines/simple/simple.c:360
-msgid "Configure Simple..."
-msgstr "设置 Simple 主题..."
-
-#: engines/simple/simple.c:371
-msgid "Font"
-msgstr "字体"
-
-#: engines/simple/simple.c:380
-msgid "Colors"
-msgstr "颜色"
-
-#: engines/simple/simple.c:388
-msgid "Background color:"
-msgstr "背景颜色："
-
-#: engines/simple/simple.c:400
-msgid "Text color:"
-msgstr "字体颜色："
-
-#: engines/simple/simple.c:412
-msgid "Image"
-msgstr "图像"
-
-#: engines/simple/simple.c:420
-msgid "Use custom image"
-msgstr "使用自选图像"