diff --git a/po/ChangeLog b/po/ChangeLog index f164f2364..25a309ef4 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,8 @@ +2006-05-05 Funda Wang + + * zh_CN.po: Updated Simplified Chinese translation. + * POTFILES.in: Removed obsolete files. + 2006-04-29 Alexander Shopov * bg.po: Updated Bulgarian translation by diff --git a/po/POTFILES.in b/po/POTFILES.in index 0ace143f6..0bb25ced3 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -59,7 +59,6 @@ capplets/theme-switcher/gnome-theme-installer.c capplets/theme-switcher/gnome-theme-manager.c capplets/theme-switcher/gnome-theme-save.c capplets/theme-switcher/gtk-theme-selector.desktop.in.in -capplets/theme-switcher/theme-install.glade capplets/theme-switcher/theme-properties.glade capplets/ui-properties/gnome-ui-properties.c capplets/ui-properties/gnome-ui-properties.desktop.in.in @@ -70,7 +69,6 @@ capplets/windows/window-properties.desktop.in.in control-center/control-center-categories.c control-center/control-center.c control-center/gnomecc.desktop.in.in -gnome-settings-daemon/actions/acme-fb-level.c gnome-settings-daemon/actions/acme.glade gnome-settings-daemon/factory.c gnome-settings-daemon/gnome-settings-accessibility-keyboard.c diff --git a/po/zh_CN.po b/po/zh_CN.po index 71b3c320b..4c62c6127 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: gnome-control-center\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-06 22:58+0100\n" -"PO-Revision-Date: 2006-03-07 12:52+0800\n" +"POT-Creation-Date: 2006-05-05 17:39+0800\n" +"PO-Revision-Date: 2006-05-05 17:42+0800\n" "Last-Translator: Funda Wang \n" "Language-Team: zh_CN \n" "MIME-Version: 1.0\n" @@ -473,7 +473,6 @@ msgstr "此系统好像没有 XKB 扩展。键盘辅助功能必须依赖该扩 #: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:2 -#: ../capplets/theme-switcher/theme-install.glade.h:1 msgid "*" msgstr "*" @@ -685,7 +684,7 @@ msgid "_Finish" msgstr "完成(_F)" #: ../capplets/background/gnome-background-properties.glade.h:7 -#: ../capplets/theme-switcher/theme-properties.glade.h:19 +#: ../capplets/theme-switcher/theme-properties.glade.h:20 msgid "_Remove" msgstr "删除(_R)" @@ -965,27 +964,27 @@ msgid "Could not display help" msgstr "无法显示帮助" #: ../capplets/default-applications/gnome-da-capplet.c:57 -#: ../capplets/default-applications/gnome-da-capplet.c:765 +#: ../capplets/default-applications/gnome-da-capplet.c:756 msgid "Please make sure that the applet is properly installed" msgstr "请确定小程序已经正确安装了。" #: ../capplets/default-applications/gnome-da-capplet.c:92 -#: ../capplets/default-applications/gnome-da-capplet.c:125 -#: ../capplets/default-applications/gnome-da-capplet.c:170 -#: ../capplets/default-applications/gnome-da-capplet.c:215 -#: ../capplets/default-applications/gnome-da-capplet.c:269 -#: ../capplets/default-applications/gnome-da-capplet.c:318 -#: ../capplets/default-applications/gnome-da-capplet.c:600 -#: ../capplets/default-applications/gnome-da-capplet.c:621 +#: ../capplets/default-applications/gnome-da-capplet.c:116 +#: ../capplets/default-applications/gnome-da-capplet.c:161 +#: ../capplets/default-applications/gnome-da-capplet.c:206 +#: ../capplets/default-applications/gnome-da-capplet.c:260 +#: ../capplets/default-applications/gnome-da-capplet.c:309 +#: ../capplets/default-applications/gnome-da-capplet.c:591 +#: ../capplets/default-applications/gnome-da-capplet.c:612 #, c-format msgid "Error saving configuration: %s" msgstr "保存配置出错：%s" -#: ../capplets/default-applications/gnome-da-capplet.c:743 +#: ../capplets/default-applications/gnome-da-capplet.c:734 msgid "Custom" msgstr "自定义" -#: ../capplets/default-applications/gnome-da-capplet.c:763 +#: ../capplets/default-applications/gnome-da-capplet.c:754 msgid "Could not load the main interface" msgstr "无法装入主界面" @@ -1114,18 +1113,22 @@ msgid "Standard XTerminal" msgstr "标准 X 终端" #: ../capplets/default-applications/gnome-default-applications.xml.in.h:32 +msgid "Sylpheed" +msgstr "Sylpheed" + +#: ../capplets/default-applications/gnome-default-applications.xml.in.h:33 msgid "Sylpheed-Claws" msgstr "Sylpheed-Claws" -#: ../capplets/default-applications/gnome-default-applications.xml.in.h:33 +#: ../capplets/default-applications/gnome-default-applications.xml.in.h:34 msgid "Thunderbird" msgstr "Thunderbird" -#: ../capplets/default-applications/gnome-default-applications.xml.in.h:34 +#: ../capplets/default-applications/gnome-default-applications.xml.in.h:35 msgid "W3M Text Browser" msgstr "W3M 文字浏览器" -#: ../capplets/default-applications/gnome-default-applications.xml.in.h:35 +#: ../capplets/default-applications/gnome-default-applications.xml.in.h:36 msgid "aterm" msgstr "aterm" @@ -1468,29 +1471,29 @@ msgid "The type of accelerator." msgstr "加速键类型。" #: ../capplets/keybindings/eggcellrendererkeys.c:242 -#: ../capplets/keybindings/gnome-keybinding-properties.c:197 +#: ../capplets/keybindings/gnome-keybinding-properties.c:187 #: ../libbackground/applier.c:624 ../typing-break/drwright.c:471 msgid "Disabled" msgstr "禁用" -#: ../capplets/keybindings/gnome-keybinding-properties.c:544 +#: ../capplets/keybindings/gnome-keybinding-properties.c:534 msgid "" msgstr "<未知操作>" -#: ../capplets/keybindings/gnome-keybinding-properties.c:565 +#: ../capplets/keybindings/gnome-keybinding-properties.c:555 msgid "Desktop" msgstr "桌面" -#: ../capplets/keybindings/gnome-keybinding-properties.c:566 +#: ../capplets/keybindings/gnome-keybinding-properties.c:556 #: ../capplets/sound/gnome-settings-sound.desktop.in.in.h:2 msgid "Sound" msgstr "音效" -#: ../capplets/keybindings/gnome-keybinding-properties.c:570 +#: ../capplets/keybindings/gnome-keybinding-properties.c:560 msgid "Window Management" msgstr "窗口管理器" -#: ../capplets/keybindings/gnome-keybinding-properties.c:676 +#: ../capplets/keybindings/gnome-keybinding-properties.c:666 #, c-format msgid "" "The shortcut \"%s\" cannot be used because it will become unusable to type " @@ -1500,7 +1503,7 @@ msgstr "" "无法使用快捷键“%s”，原因是使用此键将无法输入。\n" "请同时使用 Ctrl、Alt 或 Shift 再试一次。\n" -#: ../capplets/keybindings/gnome-keybinding-properties.c:705 +#: ../capplets/keybindings/gnome-keybinding-properties.c:695 #, c-format msgid "" "The shortcut \"%s\" is already used for:\n" @@ -1509,21 +1512,21 @@ msgstr "" "快捷键“%s”已经用于：\n" "“%s”\n" -#: ../capplets/keybindings/gnome-keybinding-properties.c:737 +#: ../capplets/keybindings/gnome-keybinding-properties.c:727 #, c-format msgid "Error setting new accelerator in configuration database: %s\n" msgstr "在配置数据库中设置新加速键时出错：%s\n" -#: ../capplets/keybindings/gnome-keybinding-properties.c:787 +#: ../capplets/keybindings/gnome-keybinding-properties.c:777 #, c-format msgid "Error unsetting accelerator in configuration database: %s\n" msgstr "在配置数据库中取消设置新加速键时出错：%s\n" -#: ../capplets/keybindings/gnome-keybinding-properties.c:894 +#: ../capplets/keybindings/gnome-keybinding-properties.c:884 msgid "Action" msgstr "动作" -#: ../capplets/keybindings/gnome-keybinding-properties.c:918 +#: ../capplets/keybindings/gnome-keybinding-properties.c:908 msgid "Shortcut" msgstr "快捷键" @@ -1542,11 +1545,11 @@ msgstr "要编辑快捷键，请单击相应的行，然后输入新加速键， msgid "Assign shortcut keys to commands" msgstr "为命令指定快捷键" -#: ../capplets/keyboard/gnome-keyboard-properties-xkb.c:84 +#: ../capplets/keyboard/gnome-keyboard-properties-xkb.c:87 msgid "Unknown" msgstr "未知" -#: ../capplets/keyboard/gnome-keyboard-properties-xkblt.c:273 +#: ../capplets/keyboard/gnome-keyboard-properties-xkblt.c:281 msgid "Layout" msgstr "布局" @@ -1554,12 +1557,12 @@ msgstr "布局" #. the below options are to be included in the selected list. #. This is a HIG-compliant alternative to allowing no #. selection in the group. -#: ../capplets/keyboard/gnome-keyboard-properties-xkblt.c:277 -#: ../capplets/keyboard/gnome-keyboard-properties-xkbot.c:228 +#: ../capplets/keyboard/gnome-keyboard-properties-xkblt.c:285 +#: ../capplets/keyboard/gnome-keyboard-properties-xkbot.c:229 msgid "Default" msgstr "默认" -#: ../capplets/keyboard/gnome-keyboard-properties-xkbmc.c:75 +#: ../capplets/keyboard/gnome-keyboard-properties-xkbmc.c:77 msgid "Models" msgstr "型号" @@ -2051,7 +2054,7 @@ msgstr "主题已经成功删除。请另外选择一个主题。" msgid "Theme can not be deleted" msgstr "主题无法删除" -#: ../capplets/theme-switcher/gnome-theme-details.c:529 +#: ../capplets/theme-switcher/gnome-theme-details.c:535 msgid "" "No themes could be found on your system. This probably means that your " "\"Theme Preferences\" dialog was improperly installed, or you haven't " @@ -2060,15 +2063,15 @@ msgstr "" "在您的系统中找不到主题。可能是您的“主题首选项”对话框安装不正确，或者没有安" "装“gnome-themes”包。" -#: ../capplets/theme-switcher/gnome-theme-installer.c:227 +#: ../capplets/theme-switcher/gnome-theme-installer.c:254 msgid "This theme is not in a supported format." msgstr "主题的格式不被支持。" -#: ../capplets/theme-switcher/gnome-theme-installer.c:242 +#: ../capplets/theme-switcher/gnome-theme-installer.c:272 msgid "Failed to create temporary directory" msgstr "创建临时目录失败" -#: ../capplets/theme-switcher/gnome-theme-installer.c:260 +#: ../capplets/theme-switcher/gnome-theme-installer.c:293 msgid "" "Can not install theme. \n" "The bzip2 utility is not installed." @@ -2076,13 +2079,13 @@ msgstr "" "无法安装主题。\n" "系统中没有安装 bzip2 工具。" -#: ../capplets/theme-switcher/gnome-theme-installer.c:276 -#: ../capplets/theme-switcher/gnome-theme-installer.c:309 -#: ../capplets/theme-switcher/gnome-theme-installer.c:383 +#: ../capplets/theme-switcher/gnome-theme-installer.c:312 +#: ../capplets/theme-switcher/gnome-theme-installer.c:351 +#: ../capplets/theme-switcher/gnome-theme-installer.c:434 msgid "Installation Failed" msgstr "主题失败" -#: ../capplets/theme-switcher/gnome-theme-installer.c:294 +#: ../capplets/theme-switcher/gnome-theme-installer.c:333 msgid "" "Can not install themes. \n" "The gzip utility is not installed." @@ -2090,7 +2093,7 @@ msgstr "" "无法安装主题。\n" "系统中没有安装 gzip 工具。" -#: ../capplets/theme-switcher/gnome-theme-installer.c:330 +#: ../capplets/theme-switcher/gnome-theme-installer.c:375 #, c-format msgid "" "Icon Theme %s correctly installed.\n" @@ -2099,12 +2102,12 @@ msgstr "" "图标主题 %s 已正确安装。\n" "您可以在主题细节中选择该主题。" -#: ../capplets/theme-switcher/gnome-theme-installer.c:333 +#: ../capplets/theme-switcher/gnome-theme-installer.c:378 #, c-format msgid "Gnome Theme %s correctly installed" msgstr "Gnmoe 主题 %s 已正确安装" -#: ../capplets/theme-switcher/gnome-theme-installer.c:336 +#: ../capplets/theme-switcher/gnome-theme-installer.c:381 #, c-format msgid "" "Windows Border Theme %s correctly installed.\n" @@ -2113,7 +2116,7 @@ msgstr "" "窗口边框主题 %s 已正确安装。\n" "您可以在主题细节中选择该主题。" -#: ../capplets/theme-switcher/gnome-theme-installer.c:339 +#: ../capplets/theme-switcher/gnome-theme-installer.c:384 #, c-format msgid "" "Controls Theme %s correctly installed.\n" @@ -2122,23 +2125,23 @@ msgstr "" "控件主题 %s 已正确安装。\n" "您可以在主题细节中选择该主题。" -#: ../capplets/theme-switcher/gnome-theme-installer.c:345 +#: ../capplets/theme-switcher/gnome-theme-installer.c:390 msgid "The theme is an engine. You need to compile the theme." msgstr "主题是一个引擎。您需要编译主题。" -#: ../capplets/theme-switcher/gnome-theme-installer.c:360 +#: ../capplets/theme-switcher/gnome-theme-installer.c:408 msgid "The file format is invalid" msgstr "文件格式无效" -#: ../capplets/theme-switcher/gnome-theme-installer.c:450 +#: ../capplets/theme-switcher/gnome-theme-installer.c:499 msgid "No theme file location specified to install" msgstr "没有指定要安装的主题的文件位置" -#: ../capplets/theme-switcher/gnome-theme-installer.c:469 +#: ../capplets/theme-switcher/gnome-theme-installer.c:514 msgid "The theme file location specified to install is invalid" msgstr "所指定要安装的主题文件的位置无效" -#: ../capplets/theme-switcher/gnome-theme-installer.c:489 +#: ../capplets/theme-switcher/gnome-theme-installer.c:534 #, c-format msgid "" "Insufficient permissions to install the theme in:\n" @@ -2147,18 +2150,18 @@ msgstr "" "没有足够的权限将主题安装到：\n" "%s" -#: ../capplets/theme-switcher/gnome-theme-installer.c:510 +#: ../capplets/theme-switcher/gnome-theme-installer.c:555 msgid "The file format is invalid." msgstr "文件格式无效。" -#: ../capplets/theme-switcher/gnome-theme-installer.c:537 +#: ../capplets/theme-switcher/gnome-theme-installer.c:582 #, c-format msgid "" "%s is the path where the theme files will be installed. This can not be " "selected as the source location" msgstr "%s 将要作为主题文件安装的目的路径。所以，您不能将其选为源位置" -#: ../capplets/theme-switcher/gnome-theme-installer.c:591 +#: ../capplets/theme-switcher/gnome-theme-installer.c:647 msgid "" "Cannot install theme.\n" "The tar program is not installed on your system." @@ -2174,7 +2177,7 @@ msgstr "自定义主题" msgid "You can save this theme by pressing the Save Theme button." msgstr "按保存主题按钮可以保存此主题。" -#: ../capplets/theme-switcher/gnome-theme-manager.c:1584 +#: ../capplets/theme-switcher/gnome-theme-manager.c:1579 msgid "" "The default theme schemas could not be found on your system. This means " "that you probably don't have metacity installed, or that your gconf is " @@ -2183,11 +2186,11 @@ msgstr "" "在您的系统中找不到默认主题配对。这意味着您可能没有安装 metacity，或者您的 " "gconf 配置不正确。" -#: ../capplets/theme-switcher/gnome-theme-save.c:72 +#: ../capplets/theme-switcher/gnome-theme-save.c:73 msgid "Theme name must be present" msgstr "必须有主题名称" -#: ../capplets/theme-switcher/gnome-theme-save.c:104 +#: ../capplets/theme-switcher/gnome-theme-save.c:144 msgid "The theme already exists. Would you like to replace it?" msgstr "主题已经存在。您想要替换吗？" @@ -2200,106 +2203,90 @@ msgstr "选择桌面的不同部分的主题" msgid "Theme" msgstr "主题" -#: ../capplets/theme-switcher/theme-install.glade.h:2 -msgid "Install a Theme" -msgstr "安装主题" - -#: ../capplets/theme-switcher/theme-install.glade.h:3 -msgid "Theme Installation" -msgstr "主题安装" - -#: ../capplets/theme-switcher/theme-install.glade.h:4 -msgid "_Install" -msgstr "安装(_I)" - -#: ../capplets/theme-switcher/theme-install.glade.h:5 -msgid "_Location:" -msgstr "位置(_L)：" - #: ../capplets/theme-switcher/theme-properties.glade.h:1 -msgid "Save Theme to Disk" -msgstr "将主题保存到磁盘" - -#: ../capplets/theme-switcher/theme-properties.glade.h:2 msgid "Apply _Background" msgstr "应用背景(_B)" -#: ../capplets/theme-switcher/theme-properties.glade.h:3 +#: ../capplets/theme-switcher/theme-properties.glade.h:2 msgid "Apply _Font" msgstr "应用字体(_F)" -#: ../capplets/theme-switcher/theme-properties.glade.h:4 +#: ../capplets/theme-switcher/theme-properties.glade.h:3 msgid "Controls" msgstr "控件" -#: ../capplets/theme-switcher/theme-properties.glade.h:5 +#: ../capplets/theme-switcher/theme-properties.glade.h:4 msgid "Icons" msgstr "图标" -#: ../capplets/theme-switcher/theme-properties.glade.h:6 -msgid "New themes can also be installed by dragging them into the window." -msgstr "也可以通过拖动主题文件到本窗口中的方法来安装新主题。" - -#: ../capplets/theme-switcher/theme-properties.glade.h:7 +#: ../capplets/theme-switcher/theme-properties.glade.h:5 msgid "Save Theme" msgstr "保存主题" -#: ../capplets/theme-switcher/theme-properties.glade.h:8 +#: ../capplets/theme-switcher/theme-properties.glade.h:6 +msgid "Save _Background Image" +msgstr "保存背景图像(_B)" + +#: ../capplets/theme-switcher/theme-properties.glade.h:7 msgid "Select theme for the desktop" msgstr "为桌面选择主题" -#: ../capplets/theme-switcher/theme-properties.glade.h:9 -msgid "Short _description:" -msgstr "简要描述(_D)：" - -#: ../capplets/theme-switcher/theme-properties.glade.h:10 +#: ../capplets/theme-switcher/theme-properties.glade.h:8 msgid "Theme Details" msgstr "主题细节" -#: ../capplets/theme-switcher/theme-properties.glade.h:11 +#: ../capplets/theme-switcher/theme-properties.glade.h:9 msgid "Theme Preferences" msgstr "主题首选项" -#: ../capplets/theme-switcher/theme-properties.glade.h:12 +#: ../capplets/theme-switcher/theme-properties.glade.h:10 msgid "Theme _Details" msgstr "主题细节(_D)" -#: ../capplets/theme-switcher/theme-properties.glade.h:13 +#: ../capplets/theme-switcher/theme-properties.glade.h:11 msgid "This theme does not suggest any particular font or background." msgstr "该主题未建议任何特定的字体或背景。" -#: ../capplets/theme-switcher/theme-properties.glade.h:14 +#: ../capplets/theme-switcher/theme-properties.glade.h:12 msgid "This theme suggests a background:" msgstr "该主题建议使用背景：" -#: ../capplets/theme-switcher/theme-properties.glade.h:15 +#: ../capplets/theme-switcher/theme-properties.glade.h:13 msgid "This theme suggests a font and a background:" msgstr "该主题建议使用的字体和背景：" -#: ../capplets/theme-switcher/theme-properties.glade.h:16 +#: ../capplets/theme-switcher/theme-properties.glade.h:14 msgid "This theme suggests a font:" msgstr "该主题建议使用字体：" -#: ../capplets/theme-switcher/theme-properties.glade.h:17 +#: ../capplets/theme-switcher/theme-properties.glade.h:15 msgid "Window Border" msgstr "窗口边框" -#: ../capplets/theme-switcher/theme-properties.glade.h:18 +#: ../capplets/theme-switcher/theme-properties.glade.h:16 +msgid "_Description:" +msgstr "描述(_D)：" + +#: ../capplets/theme-switcher/theme-properties.glade.h:17 msgid "_Install Theme..." msgstr "安装主题(_I)..." -#: ../capplets/theme-switcher/theme-properties.glade.h:20 +#: ../capplets/theme-switcher/theme-properties.glade.h:18 +msgid "_Install..." +msgstr "安装(_I)..." + +#: ../capplets/theme-switcher/theme-properties.glade.h:19 +msgid "_Name:" +msgstr "名称(_N)：" + +#: ../capplets/theme-switcher/theme-properties.glade.h:21 msgid "_Revert" msgstr "复原(_R)" -#: ../capplets/theme-switcher/theme-properties.glade.h:21 +#: ../capplets/theme-switcher/theme-properties.glade.h:22 msgid "_Save Theme..." msgstr "保存主题(_S)..." -#: ../capplets/theme-switcher/theme-properties.glade.h:22 -msgid "_Theme name:" -msgstr "主题名称(_T)：" - #: ../capplets/theme-switcher/theme-properties.glade.h:23 msgid "theme selection tree" msgstr "主题选择树" @@ -2500,23 +2487,11 @@ msgstr "GNOME 控制中心" msgid "The GNOME configuration tool" msgstr "GNOME 配置工具" -#: ../gnome-settings-daemon/actions/acme-fb-level.c:149 -msgid "No '/dev/pmu' device found" -msgstr "未找到“/dev/pmu”设备" - -#: ../gnome-settings-daemon/actions/acme-fb-level.c:156 -msgid "Not a powerbook" -msgstr "不是 Powerbook" - -#: ../gnome-settings-daemon/actions/acme-fb-level.c:173 -msgid "Wrong permission for '/dev/pmu' device" -msgstr "“/dev/pmu”设备的权限出错" - #: ../gnome-settings-daemon/actions/acme.glade.h:1 msgid "Volume" msgstr "音量" -#: ../gnome-settings-daemon/factory.c:37 +#: ../gnome-settings-daemon/factory.c:60 msgid "Could not initialize Bonobo" msgstr "无法能初始化 Bonobo" @@ -2646,7 +2621,7 @@ msgstr "" "试图运行(%s)时出错\n" "与按键(%s)相关联" -#: ../gnome-settings-daemon/gnome-settings-keyboard-xkb.c:103 +#: ../gnome-settings-daemon/gnome-settings-keyboard-xkb.c:105 #, c-format msgid "" "Error activating XKB configuration.\n" @@ -2677,7 +2652,7 @@ msgstr "" "- %s 的结果\n" "- %s 的结果" -#: ../gnome-settings-daemon/gnome-settings-keyboard-xkb.c:117 +#: ../gnome-settings-daemon/gnome-settings-keyboard-xkb.c:119 msgid "" "You are using XFree 4.3.0.\n" "There are known problems with complex XKB configurations.\n" @@ -2688,25 +2663,36 @@ msgstr "" "复杂的 XKB 配置有一些已知的问题。\n" "请试着使用较简单的配置，或者获得更新版本的 XFree 软件。" -#: ../gnome-settings-daemon/gnome-settings-keyboard-xkb.c:223 +#: ../gnome-settings-daemon/gnome-settings-keyboard-xkb.c:244 msgid "Do _not show this warning again" msgstr "不再显示此警告(_N)" -#: ../gnome-settings-daemon/gnome-settings-keyboard-xkb.c:234 +#. !! temporary one +#: ../gnome-settings-daemon/gnome-settings-keyboard-xkb.c:253 +#, c-format msgid "" -"The X system keyboard settings differ from your current GNOME keyboard " -"settings. Which set would you like to use?" -msgstr "X 系统键盘设置与您当前的 GNOME 键盘设置不同。您想要使用哪一个设置？" +"The X system keyboard settings differ from your current GNOME keyboard " +"settings.\n" +"\n" +"Expected was %s, but the the following settings were found: %s.\n" +"\n" +"Which set would you like to use?" +msgstr "" +"X 系统键盘设置与您当前的 GNOME 键盘设置不同。您想要使用哪一个设置？\n" +"\n" +"期待的值是 %s，但找到了下列设置：%s。\n" +"\n" +"您想要使用哪个设置？" -#: ../gnome-settings-daemon/gnome-settings-keyboard-xkb.c:247 +#: ../gnome-settings-daemon/gnome-settings-keyboard-xkb.c:275 msgid "Use X settings" msgstr "使用 X 设置" -#: ../gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249 -msgid "Use GNOME settings" -msgstr "使用 GNOME 设置" +#: ../gnome-settings-daemon/gnome-settings-keyboard-xkb.c:277 +msgid "Keep GNOME settings" +msgstr "保留 GNOME 设置" -#: ../gnome-settings-daemon/gnome-settings-multimedia-keys.c:129 +#: ../gnome-settings-daemon/gnome-settings-multimedia-keys.c:118 #, c-format msgid "" "Couldn't execute command: %s\n" @@ -2715,7 +2701,7 @@ msgstr "" "无法执行命令：%s\n" "请检查此命令是否存在。" -#: ../gnome-settings-daemon/gnome-settings-multimedia-keys.c:145 +#: ../gnome-settings-daemon/gnome-settings-multimedia-keys.c:134 msgid "" "Couldn't put the machine to sleep.\n" "Verify that the machine is correctly configured." @@ -2723,7 +2709,7 @@ msgstr "" "无法将机器转入休眠。\n" "请检查机器是否已正确配置。" -#: ../gnome-settings-daemon/gnome-settings-multimedia-keys.c:180 +#: ../gnome-settings-daemon/gnome-settings-multimedia-keys.c:168 msgid "" "Couldn't load the Glade file.\n" "Make sure that this daemon is properly installed." @@ -2828,11 +2814,36 @@ msgstr "屏幕" msgid "Screen on which BGApplier is to draw" msgstr "BGApplier 绘图的屏幕" -#: ../libgswitchit/gswitchit_config.c:1036 +#: ../libgswitchit/gswitchit_config.c:1074 #, c-format msgid "There was an error loading an image: %s" msgstr "装入图像时出错：%s" +#: ../libgswitchit/gswitchit_config.c:1399 +#, c-format +msgid "layout \"%s\"" +msgid_plural "layouts \"%s\"" +msgstr[0] "布局“%s”" + +#: ../libgswitchit/gswitchit_config.c:1416 +#, c-format +msgid "option \"%s\"" +msgid_plural "options \"%s\"" +msgstr[0] "选项“%s”" + +#: ../libgswitchit/gswitchit_config.c:1424 +#, c-format +msgid "model \"%s\", %s and %s" +msgstr "型号“%s”，%s 和 %s" + +#: ../libgswitchit/gswitchit_config.c:1425 +msgid "no layout" +msgstr "无布局" + +#: ../libgswitchit/gswitchit_config.c:1426 +msgid "no options" +msgstr "无选项" + #: ../libsounds/sound-view.c:43 msgid "Login" msgstr "登录" @@ -2851,7 +2862,7 @@ msgstr "鸣笛" #: ../libsounds/sound-view.c:47 msgid "Clink" -msgstr "丁当" +msgstr "叮咚" #: ../libsounds/sound-view.c:48 msgid "Beep" @@ -2913,162 +2924,146 @@ msgid "Sync text/plain and text/* handlers" msgstr "同步 text/plain 和 text/* 的处理程序" #: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:1 -msgid "Brightness down" -msgstr "亮度降低" - -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:2 -msgid "Brightness down's shortcut." -msgstr "亮度降低的快捷键。" - -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:3 -msgid "Brightness up" -msgstr "亮度升高" - -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:4 -msgid "Brightness up's shortcut." -msgstr "亮度升高的快捷键。" - -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:5 msgid "E-mail" msgstr "电子邮件" -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:6 +#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:2 msgid "E-mail's shortcut." msgstr "电子邮件快捷键。" -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:7 +#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:3 msgid "Eject" msgstr "弹出" -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:8 +#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:4 msgid "Eject's shortcut." msgstr "弹出的快捷键。" -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:9 +#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:5 msgid "Home folder" msgstr "主文件夹" -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:10 +#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:6 msgid "Home folder's shortcut." msgstr "主文件夹的快捷键。" -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:11 +#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:7 msgid "Launch help browser" msgstr "调用帮助浏览器" -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:12 +#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:8 msgid "Launch help browser's shortcut." msgstr "调用帮助浏览器的快捷键。" -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:13 +#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:9 msgid "Launch web browser" msgstr "调用 Web 浏览器" -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:14 +#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:10 msgid "Launch web browser's shortcut." msgstr "调用 Web 浏览器的快捷键。" -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:15 +#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:11 msgid "Lock screen" msgstr "锁住屏幕" -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:16 +#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:12 msgid "Lock screen's shortcut." msgstr "锁住屏幕的快捷键。" -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:17 +#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:13 msgid "Log out" msgstr "注销" -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:18 +#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:14 msgid "Log out's shortcut." msgstr "注销的快捷键。" -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:19 +#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:15 msgid "Next track key's shortcut." msgstr "下一首歌的快捷键。" -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:20 +#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:16 msgid "Pause" msgstr "暂停" -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:21 +#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:17 msgid "Pause key's shortcut." msgstr "暂停的快捷键。" -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:22 +#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:18 msgid "Play (or play/pause)" msgstr "播放(或播放/暂停)" -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:23 +#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:19 msgid "Play (or play/pause) key's shortcut." msgstr "播放(或播放/暂停)的快捷键。" -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:24 +#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:20 msgid "Previous track key's shortcut." msgstr "上一首歌的快捷键。" -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:25 +#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:21 msgid "Search" msgstr "搜索" -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:26 +#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:22 msgid "Search's shortcut." msgstr "搜索的快捷键。" -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:27 +#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:23 msgid "Skip to next track" msgstr "跳到下一首歌" -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:28 +#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:24 msgid "Skip to previous track" msgstr "跳到上一首歌" -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:29 +#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:25 msgid "Sleep" msgstr "休眠" -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:30 +#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:26 msgid "Sleep's shortcut." msgstr "休眠的快捷键。" -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:31 +#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:27 msgid "Stop playback key" msgstr "停止回放按键" -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:32 +#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:28 msgid "Stop playback key's shortcut." msgstr "停止回放的快捷键。" -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:33 +#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:29 msgid "Volume down" msgstr "音量降低" -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:34 +#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:30 msgid "Volume down's shortcut." msgstr "音量降低的快捷键。" -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:35 +#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:31 msgid "Volume mute" msgstr "静音" -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:36 +#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:32 msgid "Volume mute's shortcut" msgstr "静音的快捷键" -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:37 +#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:33 msgid "Volume step" msgstr "音量步进" -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:38 +#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:34 msgid "Volume step as percentage of volume." msgstr "以音量百分比步进音量。" -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:39 +#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:35 msgid "Volume up" msgstr "音量升高" -#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:40 +#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:36 msgid "Volume up's shortcut." msgstr "音量升高的快捷键。" @@ -3147,6 +3142,22 @@ msgid "Suppress the \"X sysconfig changed\" warning message" msgstr "禁止“X 系统配置更改”警告消息" #: ../schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14 +msgid "The Keyboard Preview, X offset" +msgstr "键盘预览，X 偏移" + +#: ../schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:15 +msgid "The Keyboard Preview, Y offset" +msgstr "键盘预览，Y 偏移" + +#: ../schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:16 +msgid "The Keyboard Preview, height" +msgstr "键盘预览，高度" + +#: ../schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:17 +msgid "The Keyboard Preview, width" +msgstr "键盘预览，宽度" + +#: ../schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:18 msgid "" "Very soon, keyboard settings in gconf will be overridden (from the system " "configuration) This key has been deprecated since GNOME 2.12, please unset " @@ -3155,15 +3166,15 @@ msgstr "" "gconf 中的键盘设置将会被系统配置中的键盘设置立即覆盖。此键自 GNOME 2.12 起不" "再使用，请取消模型、布局及选项键以便获得系统的默认配置。" -#: ../schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:15 +#: ../schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:19 msgid "keyboard layout" msgstr "键盘布局" -#: ../schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:16 +#: ../schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:20 msgid "keyboard model" msgstr "键盘型号" -#: ../schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:17 +#: ../schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:21 msgid "modmap file list" msgstr "modmap 文件列表"