Binary files /tmp/WBXKOk_QQr/language-pack-zh-hans-base-14.04+20140223/data/extra.tar and /tmp/gXeXL8bUKU/language-pack-zh-hans-base-14.04+20140320/data/extra.tar differ
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/acl.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/acl.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/acl.po	2014-02-24 08:24:30.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/acl.po	2014-03-24 09:42:37.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:29+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 11:39+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: ../chacl/chacl.c:46
 #, c-format
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/adduser.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/adduser.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/adduser.po	2014-02-24 08:24:23.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/adduser.po	2014-03-24 09:42:30.000000000 +0000
@@ -17,8 +17,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 10:31+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 10:31+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #. everyone can issue "--help" and "--version", but only root can go on
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/alsa-utils.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/alsa-utils.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/alsa-utils.po	2014-02-24 08:24:23.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/alsa-utils.po	2014-03-24 09:42:31.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 10:31+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 10:31+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: alsamixer/card_select.c:126 alsamixer/device_name.c:126
 msgid "Sound Card"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/apparmorapplet.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/apparmorapplet.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/apparmorapplet.po	2014-02-24 08:24:41.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/apparmorapplet.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-# Copyright (C) 2006 SuSE Linux Products GmbH, Nuernberg
-# This file is distributed under the same license as the package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: apparmorapplet\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-06 14:27-0800\n"
-"PO-Revision-Date: 2009-07-11 15:49+0000\n"
-"Last-Translator: Novell Language <Unknown>\n"
-"Language-Team: Novell Language <language@novell.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-12 13:31+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
-
-#: src/apparmor-applet.c:244
-msgid ""
-"AppArmorApplet is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version."
-msgstr ""
-"AppArmorApplet 是自由软件；您可以根据自由软件基金会\n"
-"发布的 GNU 通用公共许可证（第 2 版或您选择的任何更高版本）\n"
-"的条款重新分发和/或\n"
-"修改它。"
-
-#: src/preferences_dialog.c:31
-msgid "AppArmor Desktop Preferences"
-msgstr "AppArmor 桌面自选设置"
-
-#: src/preferences_dialog.c:46
-msgid "Profile Generation"
-msgstr "配置文件生成"
-
-#: src/preferences_dialog.c:54
-msgid "Path"
-msgstr "路径"
-
-#: src/preferences_dialog.c:76
-msgid "YAST"
-msgstr "YAST"
-
-#: src/preferences_dialog.c:77
-msgid "genprof"
-msgstr "genprof"
-
-#: src/reject_list.c:58
-msgid "AppArmor Rejections"
-msgstr "AppArmor 拒绝"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/apparmor-parser.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/apparmor-parser.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/apparmor-parser.po	2014-02-24 08:24:41.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/apparmor-parser.po	2014-03-24 09:42:48.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:48+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:13+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: ../parser_include.c:113
 msgid "Error: Out of memory.\n"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/app-install-data.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/app-install-data.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/app-install-data.po	2014-02-24 08:24:42.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/app-install-data.po	2014-03-24 09:42:48.000000000 +0000
@@ -3,15 +3,15 @@
 msgstr ""
 "Project-Id-Version: app-install-data-ubuntu\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-07-18 20:09+0000\n"
+"POT-Creation-Date: 2014-03-18 10:38+0000\n"
 "PO-Revision-Date: 2013-03-07 02:31+0000\n"
 "Last-Translator: Wylmer Wang <Unknown>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-12 13:37+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:19+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: \n"
 
 #: ../menu-data-additional/7zip.desktop.in.h:1
@@ -550,10 +550,12 @@
 msgstr "配置要在 Zeitgeist 活动日志中记录的内容"
 
 #: ../menu-data/activity-log-manager:gnome-activity-log-manager-panel.desktop.in.h:1
+#: ../menu-data/activity-log-manager:unity-activity-log-manager-panel.desktop.in.h:1
 msgid "Security & Privacy"
 msgstr ""
 
 #: ../menu-data/activity-log-manager:gnome-activity-log-manager-panel.desktop.in.h:2
+#: ../menu-data/activity-log-manager:unity-activity-log-manager-panel.desktop.in.h:2
 msgid "Privacy and Activity Manager"
 msgstr "隐私和活动管理器"
 
@@ -566,7 +568,14 @@
 msgstr "在 4D 环境下驾驶您的飞船"
 
 #: ../menu-data/address-book-app:address-book-app.desktop.in.h:1
-msgid "Address Book"
+#: ../menu-data/gnome-contacts:gnome-contacts.desktop.in.h:1
+#: ../menu-data/kaddressbook-mobile:kde4__kaddressbook-mobile.desktop.in.h:1
+#: ../menu-data/thunderbird:thunderbird.desktop.in.h:4
+msgid "Contacts"
+msgstr "联系人"
+
+#: ../menu-data/address-book-app:address-book-app.desktop.in.h:2
+msgid "Contacts Address Book"
 msgstr ""
 
 #: ../menu-data/adonthell-data:adonthell-data.desktop.in.h:1
@@ -711,6 +720,14 @@
 msgid "Retro platform game"
 msgstr "复古平台游戏"
 
+#: ../menu-data/algobox:algobox.desktop.in.h:1
+msgid "Algorithmics introduction software"
+msgstr ""
+
+#: ../menu-data/algobox:algobox.desktop.in.h:2
+msgid "AlgoBox"
+msgstr ""
+
 #: ../menu-data/alien-arena:alien-arena.desktop.in.h:1
 msgid "Alien Arena"
 msgstr "Alien Arena"
@@ -801,13 +818,21 @@
 msgid "Amarok - Rediscover Your Music!"
 msgstr "Amarok - 重新发现您的音乐！"
 
+#: ../menu-data/amarok:kde4__amzdownloader.desktop.in.h:1
+msgid "AMZ Downloader"
+msgstr ""
+
+#: ../menu-data/amarok:kde4__amzdownloader.desktop.in.h:2
+msgid "Download with AMZ Downloader"
+msgstr ""
+
 #: ../menu-data/amide:amide.desktop.in.h:1
 msgid "Amide"
 msgstr "Amide"
 
 #: ../menu-data/amide:amide.desktop.in.h:2
-msgid "A Medical Image Data Examiner"
-msgstr "医学影像数据的检验工具"
+msgid "analysis tool for medical images"
+msgstr ""
 
 #: ../menu-data/amoebax:amoebax.desktop.in.h:1
 msgid "Defeat your opponent by filling up their grid up with garbage."
@@ -889,6 +914,14 @@
 msgid "fast paced anagram puzzle game using SDL"
 msgstr "使用SDL开发的高速拼词游戏"
 
+#: ../menu-data/androidsdk-ddms:ddms.desktop.in.h:1
+msgid "Dalvik Debug Monitor"
+msgstr ""
+
+#: ../menu-data/androidsdk-hierarchyviewer:hierarchyviewer.desktop.in.h:1
+msgid "Android Hierarchy Viewer"
+msgstr ""
+
 #: ../menu-data/angband:angband-gtk.desktop.in.h:1
 msgid "Angband (GTK)"
 msgstr "Angband (GTK)"
@@ -913,8 +946,8 @@
 msgstr "愤怒的醉酒小矮人"
 
 #: ../menu-data/angrydd:angrydd.desktop.in.h:2
-msgid "\"Falling blocks puzzle game\""
-msgstr "俄罗斯方块游戏"
+msgid "Falling blocks puzzle game"
+msgstr ""
 
 #: ../menu-data/anjuta:anjuta.desktop.in.h:1
 msgid "Anjuta"
@@ -959,6 +992,14 @@
 msgid "Application to get and manage software"
 msgstr "获取和管理软件的应用程序"
 
+#: ../menu-data/apper:kde4__apper_appsetup.desktop.in.h:1
+msgid "Listaller Package Installer"
+msgstr ""
+
+#: ../menu-data/apper:kde4__apper_appsetup.desktop.in.h:2
+msgid "Tool to install new 3rd-party software"
+msgstr ""
+
 #: ../menu-data/apper:kde4__apper_installer.desktop.in.h:1
 msgid "Apper Installer"
 msgstr "Apper 安装工具"
@@ -1109,10 +1150,15 @@
 msgstr "Ardour 数字音频工作站"
 
 #: ../menu-data/ardour-i686:ardour.desktop.in.h:2
+#: ../menu-data/ardour3:ardour3.desktop.in.h:2
 #: ../menu-data/ardour:ardour.desktop.in.h:2
 msgid "Record, mix and master multi-track audio"
 msgstr "记录、组合和控制多轨音频"
 
+#: ../menu-data/ardour3:ardour3.desktop.in.h:1
+msgid "Ardour3"
+msgstr ""
+
 #: ../menu-data/arduino:arduino.desktop.in.h:1
 msgid "Arduino IDE"
 msgstr "Arduino 集成开发环境"
@@ -1182,6 +1228,14 @@
 msgid "Handy thesaurus based on WordNet"
 msgstr "基于 WordNet 的手边词典"
 
+#: ../menu-data/artikulate:kde4__artikulate.desktop.in.h:1
+msgid "Artikulate Pronunciation Trainer"
+msgstr ""
+
+#: ../menu-data/artikulate:kde4__artikulate.desktop.in.h:2
+msgid "Artikulate"
+msgstr ""
+
 #: ../menu-data/asc:asc.desktop.in.h:1
 msgid "Advanced Strategic Command"
 msgstr "高级策略控制"
@@ -1434,10 +1488,15 @@
 msgstr "Back In Time"
 
 #: ../menu-data/backintime-gnome:backintime-gnome.desktop.in.h:2
+#: ../menu-data/backintime-kde:kde4__backintime-kde4-root.desktop.in.h:2
 #: ../menu-data/backintime-kde:kde4__backintime-kde4.desktop.in.h:2
 msgid "Simple backup system"
 msgstr "简单的备份系统"
 
+#: ../menu-data/backintime-kde:kde4__backintime-kde4-root.desktop.in.h:1
+msgid "Back In Time (root)"
+msgstr ""
+
 #: ../menu-data/bacula-console-qt:bat.desktop.in.h:1
 msgid "Bacula Administration Tool"
 msgstr "Bacula 管理工具"
@@ -1609,6 +1668,14 @@
 "the future"
 msgstr "一个开始于幻想未来世界末日的科幻冒险游戏"
 
+#: ../menu-data/berusky2:berusky2.desktop.in.h:1
+msgid "Berusky2"
+msgstr ""
+
+#: ../menu-data/berusky2:berusky2.desktop.in.h:2
+msgid "Rescue the bugs!"
+msgstr ""
+
 #: ../menu-data/berusky:berusky.desktop.in.h:1
 msgid "Berusky"
 msgstr "Berusky"
@@ -1733,14 +1800,6 @@
 "evolution of organisms"
 msgstr "模拟生物进化过程的人工生命程序"
 
-#: ../menu-data/bitcoin-qt:bitcoin-qt.desktop.in.h:1
-msgid "Bitcoin"
-msgstr ""
-
-#: ../menu-data/bitcoin-qt:bitcoin-qt.desktop.in.h:2
-msgid "Bitcoin P2P Cryptocurrency"
-msgstr ""
-
 #: ../menu-data/bitmeter:bitmeter.desktop.in.h:1
 msgid "Bitmeter"
 msgstr "Bitmeter"
@@ -1958,6 +2017,18 @@
 msgid "Race scenario drawing tool"
 msgstr "绘制比赛规则的工具"
 
+#: ../menu-data/bodega-client:kde4__active-addons.desktop.in.h:1
+msgid "Add Ons"
+msgstr ""
+
+#: ../menu-data/bodega-client:kde4__active-addons.desktop.in.h:2
+msgid "Content store for Plasma Active"
+msgstr ""
+
+#: ../menu-data/bodega-client:kde4__vivaldi-primavera.desktop.in.h:1
+msgid "primavera"
+msgstr ""
+
 #: ../menu-data/boinc-manager:boinc-manager.desktop.in.h:1
 msgid "BOINC Manager"
 msgstr "BOINC 管理器"
@@ -2006,6 +2077,14 @@
 msgid "Impose PDF documents to create booklets"
 msgstr ""
 
+#: ../menu-data/bossa:bossa.desktop.in.h:1
+msgid "BOSSA"
+msgstr ""
+
+#: ../menu-data/bossa:bossa.desktop.in.h:2
+msgid "Program Atmel's SAM ARM microcontrollers"
+msgstr ""
+
 #: ../menu-data/boswars:boswars.desktop.in.h:1
 msgid "Bos Wars"
 msgstr "Bos Wars"
@@ -2090,14 +2169,6 @@
 msgid "Play 3d chess with reflection of the chessmen"
 msgstr "像国际象棋选手一样玩3D象棋游戏"
 
-#: ../menu-data/bsnes:bsnes.desktop.in.h:1
-msgid "bsnes"
-msgstr "bsnes"
-
-#: ../menu-data/bsnes:bsnes.desktop.in.h:2
-msgid "SNES emulator"
-msgstr "SNES 模拟器"
-
 #: ../menu-data/btanks:btanks.desktop.in.h:1
 msgid "Battle Tanks"
 msgstr "战地坦克"
@@ -2194,14 +2265,6 @@
 msgid "GUI application for using Bazaar"
 msgstr "用于 Bazaar 的图形界面程序"
 
-#: ../menu-data/bzr-gtk:bzr-handle-patch.desktop.in.h:1
-msgid "Bazaar"
-msgstr "Bazaar"
-
-#: ../menu-data/bzr-gtk:bzr-handle-patch.desktop.in.h:2
-msgid "Apply Bazaar Bundle"
-msgstr "Bazzar 版本控制系统"
-
 #: ../menu-data/cadabra:cadabra.desktop.in.h:1
 msgid "Cadabra"
 msgstr "Cadabra"
@@ -2227,21 +2290,25 @@
 msgstr "一个很好的模拟时钟"
 
 #: ../menu-data/cairo-dock-core:cairo-dock.desktop.in.h:1
-msgid "Cairo-Dock with OpenGL (hardware acceleration)"
-msgstr "使用了 OpenGL(硬件加速) 的 Cario-Dock"
+msgid "Cairo-Dock"
+msgstr ""
 
 #: ../menu-data/cairo-dock-core:cairo-dock.desktop.in.h:2
-msgid "GLX-Dock (Cairo-Dock with OpenGL)"
-msgstr "GLX-Dock (使用 OpenGL 的 Cairo-Dock)"
+msgid "A light and eye-candy dock and desklets for your desktop."
+msgstr ""
 
-#: ../menu-data/calibre:calibre.desktop.in.h:1
+#: ../menu-data/calibre:calibre-gui.desktop.in.h:1
 msgid "calibre"
 msgstr "calibre"
 
-#: ../menu-data/calibre:calibre.desktop.in.h:2
+#: ../menu-data/calibre:calibre-gui.desktop.in.h:2
 msgid "E-book library management"
 msgstr "电子书图书馆管理"
 
+#: ../menu-data/calibre:ebook-viewer.desktop.in.h:1
+msgid "E-Book Viewer"
+msgstr ""
+
 #: ../menu-data/calligra-data:kde4__calligra.desktop.in.h:1
 msgid "Calligra"
 msgstr "Calligra 办公套件"
@@ -2303,14 +2370,6 @@
 msgid "Write documents"
 msgstr "编写文档"
 
-#: ../menu-data/cameleon:cameleon.desktop.in.h:1
-msgid "Cameleon"
-msgstr "Cameleon"
-
-#: ../menu-data/cameleon:cameleon.desktop.in.h:2
-msgid "Visual environment to develop OCaml application"
-msgstr "开发 OCaml 应用程序的可视化环境"
-
 #: ../menu-data/camera-app:camera-app.desktop.in.h:1
 #: ../menu-data/camera.app:Camera.desktop.in.h:1
 msgid "Camera"
@@ -2328,6 +2387,14 @@
 msgid "Camera Monitor"
 msgstr "摄像头监视器"
 
+#: ../menu-data/camitk-imp:camitk-imp.desktop.in.h:1
+msgid "CamiTK-imp"
+msgstr ""
+
+#: ../menu-data/camitk-imp:camitk-imp.desktop.in.h:2
+msgid "Computer Assisted Medical Intervention ToolKit Workbench"
+msgstr ""
+
 #: ../menu-data/camorama:camorama.desktop.in.h:1
 msgid "Camorama Webcam Viewer"
 msgstr "Camorama 网络摄像头查看器"
@@ -2431,6 +2498,7 @@
 msgstr "Cecilia"
 
 #: ../menu-data/cecilia:cecilia.desktop.in.h:2
+#: ../menu-data/python-pyo:E-Pyo.desktop.in.h:2
 msgid "Sound synthesis and audio signal processing environment"
 msgstr ""
 
@@ -2491,13 +2559,13 @@
 msgid "Character map for GNUstep"
 msgstr "GNUstep 的字符映射表"
 
-#: ../menu-data/checkbox-qt:checkbox-qt.desktop.in.h:1
+#: ../menu-data/checkbox-gui:checkbox-gui.desktop.in.h:1
 msgid "System Testing"
 msgstr "系统测试"
 
-#: ../menu-data/checkbox-qt:checkbox-qt.desktop.in.h:2
-msgid "Test your system and submit results to the Ubuntu Friendly project"
-msgstr "测试您的系统并向 Ubuntu Friendly 项目提交结果"
+#: ../menu-data/checkbox-gui:checkbox-gui.desktop.in.h:2
+msgid "Test your systems compatibility with Ubuntu."
+msgstr ""
 
 #: ../menu-data/checkgmail:checkgmail.desktop.in.h:1
 msgid "CheckGMail"
@@ -2532,6 +2600,14 @@
 msgid "Hierarchical Note Taking"
 msgstr "多层次笔记工具"
 
+#: ../menu-data/chessx:chessx.desktop.in.h:1
+msgid "ChessX"
+msgstr ""
+
+#: ../menu-data/chessx:chessx.desktop.in.h:2
+msgid "Chess database"
+msgstr ""
+
 #: ../menu-data/childsplay:childsplay.desktop.in.h:1
 msgid "Childsplay"
 msgstr "Childsplay"
@@ -2556,14 +2632,6 @@
 msgid "CHIRP Radio Programming Tool"
 msgstr "CHIRP 电台编程工具"
 
-#: ../menu-data/chmsee:chmsee.desktop.in.h:1
-msgid "ChmSee"
-msgstr "CHM 查看器"
-
-#: ../menu-data/chmsee:chmsee.desktop.in.h:2
-msgid "HTML Help(CHM) viewer"
-msgstr "CHM 阅读器"
-
 #: ../menu-data/chocolate-doom:chocolate-doom.desktop.in.h:1
 #: ../menu-data/chocolate-doom:screensavers__chocolate-doom-screensaver.desktop.in.h:1
 msgid "Chocolate Doom"
@@ -2621,47 +2689,6 @@
 msgid "Scrolling space shooter"
 msgstr "卷轴式太空射击游戏"
 
-#: ../menu-data/cinnamon-common:cinnamon-add-panel-launcher.desktop.in.h:1
-msgid "Panel Launcher Editor"
-msgstr ""
-
-#: ../menu-data/cinnamon-common:cinnamon-add-panel-launcher.desktop.in.h:2
-msgid "Add or edit panel launcher applet entries"
-msgstr ""
-
-#: ../menu-data/cinnamon:cinnamon-menu-editor.desktop.in.h:1
-msgid "Cinnamon Menu Editor"
-msgstr ""
-
-#: ../menu-data/cinnamon:cinnamon-menu-editor.desktop.in.h:2
-msgid "Edit the entries of the Cinnamon menu applet"
-msgstr ""
-
-#: ../menu-data/cinnamon:cinnamon-settings.desktop.in.h:1
-#: ../menu-data/systemsettings:kde4__systemsettings.desktop.in.h:1
-#: ../menu-data/ubuntu-system-settings:ubuntu-system-settings.desktop.in.h:1
-msgid "System Settings"
-msgstr "系统设置"
-
-#: ../menu-data/cinnamon:cinnamon-settings.desktop.in.h:2
-msgid "Control Center"
-msgstr ""
-
-#: ../menu-data/cinnamon:cinnamon.desktop.in.h:1
-msgid "Cinnamon"
-msgstr ""
-
-#: ../menu-data/cinnamon:cinnamon.desktop.in.h:2
-#: ../menu-data/cinnamon:cinnamon2d.desktop.in.h:2
-#: ../menu-data/gnome-shell-extensions:gnome-shell-classic.desktop.in.h:2
-#: ../menu-data/gnome-shell:gnome-shell.desktop.in.h:2
-msgid "Window management and application launching"
-msgstr "管理窗口、启动应用程序"
-
-#: ../menu-data/cinnamon:cinnamon2d.desktop.in.h:1
-msgid "Cinnamon 2D"
-msgstr ""
-
 #: ../menu-data/circuslinux:circuslinux.desktop.in.h:1
 msgid "Circus Linux!"
 msgstr "Circus Linux!"
@@ -2670,6 +2697,14 @@
 msgid "Throw the clowns before they fall and hit the balloons with them"
 msgstr "将小丑们在落下前掷出并用他们击打气球。"
 
+#: ../menu-data/cirkuit:kde4__cirkuit.desktop.in.h:1
+msgid "Cirkuit"
+msgstr ""
+
+#: ../menu-data/cirkuit:kde4__cirkuit.desktop.in.h:2
+msgid "A program to draw circuits and diagrams"
+msgstr ""
+
 #: ../menu-data/clam-chordata:Chordata.desktop.in.h:1
 msgid "CLAM Chordata"
 msgstr "CLAM 和弦分析器"
@@ -2754,32 +2789,39 @@
 
 #: ../menu-data/clementine:clementine.desktop.in.h:4
 #: ../menu-data/qmmp:qmmp.desktop.in.h:4
-#: ../menu-data/wallch:wallch.desktop.in.h:4
 msgid "Pause"
 msgstr "暂停"
 
 #: ../menu-data/clementine:clementine.desktop.in.h:5
 #: ../menu-data/qmmp:qmmp.desktop.in.h:5
-#: ../menu-data/wallch:wallch.desktop.in.h:5
 msgid "Stop"
 msgstr "停止"
 
 #: ../menu-data/clementine:clementine.desktop.in.h:6
 #: ../menu-data/minitube:minitube.desktop.in.h:5
 #: ../menu-data/qmmp:qmmp.desktop.in.h:6
+#: ../menu-data/quodlibet:quodlibet.desktop.in.h:5
 #: ../menu-data/totem:totem.desktop.in.h:5
-#: ../menu-data/wallch:wallch.desktop.in.h:7
 msgid "Previous"
 msgstr "上一曲"
 
 #: ../menu-data/clementine:clementine.desktop.in.h:7
 #: ../menu-data/minitube:minitube.desktop.in.h:4
 #: ../menu-data/qmmp:qmmp.desktop.in.h:7
+#: ../menu-data/quodlibet:quodlibet.desktop.in.h:4
 #: ../menu-data/totem:totem.desktop.in.h:4
-#: ../menu-data/wallch:wallch.desktop.in.h:6
 msgid "Next"
 msgstr "下一曲"
 
+#: ../menu-data/click-update-manager:click-update-manager.desktop.in.h:1
+#: ../menu-data/muon-updater:kde4__muon-updater.desktop.in.h:2
+msgid "Update Manager"
+msgstr "更新管理器"
+
+#: ../menu-data/click-update-manager:click-update-manager.desktop.in.h:2
+msgid "UpdateManager for Click packages"
+msgstr ""
+
 #: ../menu-data/clinica:clinica.desktop.in.h:1
 msgid "Clinica"
 msgstr "Clinica"
@@ -2788,6 +2830,14 @@
 msgid "Medical records manager"
 msgstr "医疗记录管理器"
 
+#: ../menu-data/clinica:clinica.desktop.in.h:3
+msgid "Create a new patient"
+msgstr ""
+
+#: ../menu-data/clinica:clinica.desktop.in.h:4
+msgid "Show the calendar"
+msgstr ""
+
 #: ../menu-data/clipit:clipit.desktop.in.h:1
 msgid "ClipIt"
 msgstr "ClipIt"
@@ -2840,6 +2890,14 @@
 msgid "Graphical command editor for Code_Aster."
 msgstr "Code_Aster 的图形化命令编辑器。"
 
+#: ../menu-data/code-of-conduct-signing-assistant:codeOfConductSigningAssistant.desktop.in.h:1
+msgid "Code of Conduct Signing Assistant"
+msgstr ""
+
+#: ../menu-data/code-of-conduct-signing-assistant:codeOfConductSigningAssistant.desktop.in.h:2
+msgid "Sign the Code of Conduct easily."
+msgstr ""
+
 #: ../menu-data/codeblocks:codeblocks.desktop.in.h:1
 msgid "Code::Blocks IDE"
 msgstr "Code::Blocks IDE"
@@ -2860,6 +2918,14 @@
 msgid "Computes Italian Fiscal codes"
 msgstr "计算意大利财会代码"
 
+#: ../menu-data/colobot:colobot.desktop.in.h:1
+msgid "Colobot"
+msgstr ""
+
+#: ../menu-data/colobot:colobot.desktop.in.h:2
+msgid "Colonize with bots"
+msgstr ""
+
 #: ../menu-data/colorcode:colorcode.desktop.in.h:1
 msgid "ColorCode"
 msgstr "ColorCode"
@@ -2878,6 +2944,16 @@
 msgid "Install ICC profiles"
 msgstr "安装 ICC 颜色特性描述文件"
 
+#: ../menu-data/colord-kde:kde4__kcm_colord.desktop.in.h:1
+#: ../menu-data/gnome-color-manager:gcm-calibrate.desktop.in.h:1
+#: ../menu-data/unity-control-center:unity-color-panel.desktop.in.h:1
+msgid "Color"
+msgstr "颜色"
+
+#: ../menu-data/colord-kde:kde4__kcm_colord.desktop.in.h:2
+msgid "Manage color correction of devices"
+msgstr ""
+
 #: ../menu-data/colorhug-client:colorhug-ccmx.desktop.in.h:1
 msgid "CCMX Loader"
 msgstr ""
@@ -2970,13 +3046,21 @@
 msgid "Teacher tool to control classroom computers"
 msgstr "控制教室里计算机的工具"
 
+#: ../menu-data/converseen:converseen.desktop.in.h:1
+msgid "Converseen"
+msgstr ""
+
+#: ../menu-data/converseen:converseen.desktop.in.h:2
+msgid "Batch image converter"
+msgstr ""
+
 #: ../menu-data/convertall:convertall.desktop.in.h:1
 msgid "ConvertAll"
 msgstr "ConvertAll"
 
 #: ../menu-data/convertall:convertall.desktop.in.h:2
-msgid "Convert between many different units"
-msgstr "在不同单位间转换"
+msgid "Convert between various units"
+msgstr ""
 
 #: ../menu-data/coqide:coqide.desktop.in.h:1
 msgid "CoqIDE Proof Assistant"
@@ -2986,6 +3070,22 @@
 msgid "Graphical interface for the Coq proof assistant"
 msgstr "Coq 校验助手图形接口"
 
+#: ../menu-data/cordova-ubuntu-2.8-examples:CordovaExampleQRCodeScanner.desktop.in.h:1
+msgid "Cordova Example QRCodeScanner"
+msgstr ""
+
+#: ../menu-data/cordova-ubuntu-tests:cordova-ubuntu-tests.desktop.in.h:1
+msgid "cordova-ubuntu-tests"
+msgstr ""
+
+#: ../menu-data/core-network-gui:core-gui.desktop.in.h:1
+msgid "CORE Network Emulator"
+msgstr ""
+
+#: ../menu-data/core-network-gui:core-gui.desktop.in.h:2
+msgid "Intuitive net emulator that interacts with real networks"
+msgstr ""
+
 #: ../menu-data/cortina:cortina.desktop.in.h:1
 msgid "Cortina"
 msgstr "Cortina"
@@ -3022,6 +3122,14 @@
 msgid "Dungeon Crawl"
 msgstr "Dungeon Crawl"
 
+#: ../menu-data/cream-melange:cream-melange.desktop.in.h:1
+msgid "Melange"
+msgstr ""
+
+#: ../menu-data/cream-melange:cream-melange.desktop.in.h:2
+msgid "Widgets for your desktop"
+msgstr ""
+
 #: ../menu-data/criticalmass-data:criticalmass.desktop.in.h:1
 msgid "Criticalmass"
 msgstr "Criticalmass"
@@ -3051,7 +3159,6 @@
 msgstr ""
 
 #: ../menu-data/crrcsim:crrcsim.desktop.in.h:2
-#: ../menu-data/flightgear:flightgear.desktop.in.h:2
 msgid "A flight simulator"
 msgstr "一个飞行模拟器"
 
@@ -3067,14 +3174,6 @@
 msgid "3D tabletennis game"
 msgstr "三维台球游戏"
 
-#: ../menu-data/cssed:cssed.desktop.in.h:1
-msgid "Cssed Editor"
-msgstr "Cssed编辑器"
-
-#: ../menu-data/cssed:cssed.desktop.in.h:2
-msgid "Css and Web Development Editor"
-msgstr "CSS 和网页开发编辑器"
-
 #: ../menu-data/ctsim:ctsim.desktop.in.h:1
 msgid "CTSim Computed Tomography Simulator"
 msgstr "CTSim 计算机断层扫描成像模拟器"
@@ -3127,6 +3226,24 @@
 msgid "Cycle"
 msgstr "周期"
 
+#: ../menu-data/cyclograph-gtk2:cyclograph-gtk.desktop.in.h:1
+msgid "Cyclograph GTK"
+msgstr ""
+
+#: ../menu-data/cyclograph-gtk2:cyclograph-gtk.desktop.in.h:2
+#: ../menu-data/cyclograph-gtk3:cyclograph-gtk3.desktop.in.h:2
+#: ../menu-data/cyclograph-qt4:cyclograph-qt.desktop.in.h:2
+msgid "Plots slopes of bycicle routes."
+msgstr ""
+
+#: ../menu-data/cyclograph-gtk3:cyclograph-gtk3.desktop.in.h:1
+msgid "Cyclograph GTK3"
+msgstr ""
+
+#: ../menu-data/cyclograph-qt4:cyclograph-qt.desktop.in.h:1
+msgid "Cyclograph Qt"
+msgstr ""
+
 #: ../menu-data/cynthiune.app:Cynthiune.desktop.in.h:1
 msgid "Cynthiune"
 msgstr "Cynthiune"
@@ -3299,16 +3416,27 @@
 
 #: ../menu-data/deja-dup:deja-dup.desktop.in.h:1
 #: ../menu-data/deja-dup:gnome-deja-dup-panel.desktop.in.h:1
-msgid "Backup"
-msgstr "备份"
+#: ../menu-data/deja-dup:unity-deja-dup-panel.desktop.in.h:1
+msgid "Backups"
+msgstr ""
 
 #: ../menu-data/deja-dup:gnome-deja-dup-panel.desktop.in.h:2
+#: ../menu-data/deja-dup:unity-deja-dup-panel.desktop.in.h:2
 msgid "Change your backup settings"
 msgstr "更改备份设置"
 
 #: ../menu-data/deja-dup:gnome-deja-dup-panel.desktop.in.h:3
-msgid "Back Up Now"
-msgstr "立即备份"
+#: ../menu-data/deja-dup:unity-deja-dup-panel.desktop.in.h:3
+msgid "Back Up"
+msgstr ""
+
+#: ../menu-data/delaboratory:delaboratory.desktop.in.h:1
+msgid "delaboratory"
+msgstr ""
+
+#: ../menu-data/delaboratory:delaboratory.desktop.in.h:2
+msgid "enhance color and contrast"
+msgstr ""
 
 #: ../menu-data/dell-recovery:dell-driver-installer.desktop.in.h:1
 msgid "Dell Driver Installer"
@@ -3425,6 +3553,22 @@
 msgid "Edit your Diagrams"
 msgstr "编辑您的图表"
 
+#: ../menu-data/dialer-app:dialer-app.desktop.in.h:1
+msgid "Dialer"
+msgstr ""
+
+#: ../menu-data/dialer-app:dialer-app.desktop.in.h:2
+msgid "Dialer application"
+msgstr ""
+
+#: ../menu-data/dianara:dianara.desktop.in.h:1
+msgid "Dianara"
+msgstr ""
+
+#: ../menu-data/dianara:dianara.desktop.in.h:2
+msgid "A pump.io social network client"
+msgstr ""
+
 #: ../menu-data/dicompyler:dicompyler.desktop.in.h:1
 msgid "Dicompyler"
 msgstr "Dicompyler"
@@ -3572,6 +3716,16 @@
 msgid "Little shoot-'em-up arcade game for one or two player"
 msgstr ""
 
+#: ../menu-data/dolibarr:dolibarr.desktop.in.h:1
+msgid "Dolibarr ERP & CRM"
+msgstr ""
+
+#: ../menu-data/dolibarr:dolibarr.desktop.in.h:2
+msgid ""
+"The easy to use manager (ERP & CRM) for small and medium enterprises or "
+"foundations"
+msgstr ""
+
 #: ../menu-data/dolphin:kde4__dolphin.desktop.in.h:1
 msgid "Dolphin"
 msgstr "Dolphin"
@@ -3617,6 +3771,16 @@
 msgid "Isola game with nice graphics"
 msgstr "画面漂亮的伊索拉游戏"
 
+#: ../menu-data/doublecmd-common:doublecmd.desktop.in.h:1
+msgid "Double Commander"
+msgstr ""
+
+#: ../menu-data/doublecmd-common:doublecmd.desktop.in.h:2
+msgid ""
+"Double Commander is a cross platform open source file manager with two "
+"panels side by side."
+msgstr ""
+
 #: ../menu-data/dozzaqueux:dozzaqueux.desktop.in.h:1
 msgid "Dozzaqueux"
 msgstr ""
@@ -3828,14 +3992,6 @@
 msgid "Visualize scientific, engineering and analytical data"
 msgstr "可视化科学, 工程和分析数据"
 
-#: ../menu-data/e-uae:e-uae.desktop.in.h:1
-msgid "E-UAE"
-msgstr "E-UAE"
-
-#: ../menu-data/e-uae:e-uae.desktop.in.h:2
-msgid "E-UAE Amiga emulator"
-msgstr "E-UAE Amiga 模拟器"
-
 #: ../menu-data/e17-data:enlightenment_filemanager.desktop.in.h:1
 msgid "Enlightenment File Manager"
 msgstr ""
@@ -3879,7 +4035,7 @@
 msgstr "使用鼠标手势控制您的桌面"
 
 #: ../menu-data/easystroke:easystroke.desktop.in.h:3
-#: ../menu-data/plasma-active-data:kde4__active-about.desktop.in.h:1
+#: ../menu-data/plasma-active:kde4__active-about.desktop.in.h:1
 msgid "About"
 msgstr "关于"
 
@@ -3896,16 +4052,12 @@
 msgstr ""
 
 #: ../menu-data/easytag:easytag.desktop.in.h:1
-msgid "EasyTAG Audio File Tag Viewer/Editor"
-msgstr "EasyTAG 音频文件标签阅读器/编辑器"
+msgid "EasyTAG"
+msgstr "EasyTAG"
 
 #: ../menu-data/easytag:easytag.desktop.in.h:2
-msgid ""
-"EasyTAG is an utility for viewing and editing tags for MP3, MP2, FLAC, Ogg "
-"Vorbis, MusePack and Monkey's Audio files, with a GTK+ GUI"
+msgid "Edit sound file metadata"
 msgstr ""
-"EasyTAG 是用于查看和编辑 MP3、MP2、FLAC、Ogg Vorbis、MusePack 和 Monkey's Audio 文件的实用工具，带 "
-"GTK+ 界面"
 
 #: ../menu-data/eboard:eboard.desktop.in.h:1
 msgid "eboard"
@@ -4063,12 +4215,18 @@
 msgid "Electrical CAD System"
 msgstr "电气 CAD 系统"
 
-#: ../menu-data/elinks-lite:elinks.desktop.in.h:1
+#: ../menu-data/electrum:electrum.desktop.in.h:1
+msgid "Lightweight Bitcoin Client"
+msgstr ""
+
+#: ../menu-data/electrum:electrum.desktop.in.h:2
+msgid "Electrum Bitcoin Wallet"
+msgstr ""
+
 #: ../menu-data/elinks:elinks.desktop.in.h:1
 msgid "ELinks Web Browser"
 msgstr "ELinks 网络浏览器"
 
-#: ../menu-data/elinks-lite:elinks.desktop.in.h:2
 #: ../menu-data/elinks:elinks.desktop.in.h:2
 msgid "Browse the web in text mode"
 msgstr "用文字模式浏览网页"
@@ -4088,6 +4246,8 @@
 #: ../menu-data/emacs23:emacs23.desktop.in.h:2
 #: ../menu-data/emacs24-lucid:emacs24-lucid.desktop.in.h:2
 #: ../menu-data/emacs24:emacs24.desktop.in.h:2
+#: ../menu-data/yi:yi-emacs.desktop.in.h:2
+#: ../menu-data/yi:yi-vim.desktop.in.h:2
 #: ../menu-data/yudit:yudit.desktop.in.h:2
 msgid "View and edit files"
 msgstr "查看和编辑文件"
@@ -4105,14 +4265,6 @@
 msgid "Set/modify your personal email reminders"
 msgstr "设置和修改个人电子邮件提醒"
 
-#: ../menu-data/ember:ember.desktop.in.h:1
-msgid "Ember"
-msgstr "Ember"
-
-#: ../menu-data/ember:ember.desktop.in.h:2
-msgid "3d client for Worldforge MMORPGs"
-msgstr "Worldforge MMORPG 的 3D 客户端"
-
 #: ../menu-data/emboss-explorer:emboss-explorer.desktop.in.h:1
 msgid "EMBOSS Explorer"
 msgstr "EMBOSS 浏览器"
@@ -4173,6 +4325,14 @@
 msgid "multi-touch-and-shoot 2d game"
 msgstr "多点触控射击的 2D 游戏"
 
+#: ../menu-data/empire:empire.desktop.in.h:1
+msgid "VMS Empire"
+msgstr ""
+
+#: ../menu-data/empire:empire.desktop.in.h:2
+msgid "war game of the century"
+msgstr ""
+
 #: ../menu-data/emu8051:emu8051.desktop.in.h:1
 msgid "emu8051"
 msgstr "emu8051"
@@ -4181,6 +4341,15 @@
 msgid "intel 8051 emulator"
 msgstr "intel 8051 仿真器"
 
+#: ../menu-data/encuentro:encuentro.desktop.in.h:1
+msgid "Encuentro"
+msgstr ""
+
+#: ../menu-data/encuentro:encuentro.desktop.in.h:2
+msgid ""
+"Simple program to download and see the content from Canal Encuentro y otros"
+msgstr ""
+
 #: ../menu-data/enemylines3:enemylines3.desktop.in.h:1
 msgid "Enemylines3"
 msgstr "Enemylines3"
@@ -4213,14 +4382,6 @@
 msgid "Uncover pairs of stones while navigating obstacles using a marble"
 msgstr "克服重重障碍，用弹子打开一对对的石头"
 
-#: ../menu-data/enna:enna.desktop.in.h:1
-msgid "Enna"
-msgstr "Enna"
-
-#: ../menu-data/enna:enna.desktop.in.h:2
-msgid "EFL Multimedia Center"
-msgstr "EFL 多媒体中心"
-
 #: ../menu-data/entagged:entagged.desktop.in.h:1
 msgid "Entagged"
 msgstr "Entagged"
@@ -4234,7 +4395,7 @@
 msgstr ""
 
 #: ../menu-data/entangle:entangle.desktop.in.h:2
-msgid "Tethered Camera Control"
+msgid "Tethered Camera Control & Capture"
 msgstr ""
 
 #: ../menu-data/eog:eog.desktop.in.h:1
@@ -4254,11 +4415,11 @@
 msgid "Epidemics Simulator"
 msgstr "疫情模拟器"
 
-#: ../menu-data/epiphany-browser-data:epiphany-browser.desktop.in.h:1
+#: ../menu-data/epiphany-browser-data:epiphany.desktop.in.h:1
 msgid "Epiphany Web Browser"
 msgstr "Epiphany 网页浏览器"
 
-#: ../menu-data/epiphany-browser-data:epiphany-browser.desktop.in.h:2
+#: ../menu-data/epiphany-browser-data:epiphany.desktop.in.h:2
 #: ../menu-data/exo-utils:exo-web-browser.desktop.in.h:2
 msgid "Browse the web"
 msgstr "浏览网页"
@@ -4322,6 +4483,14 @@
 msgid "Graphical Network Monitor"
 msgstr "图形化网络监视器"
 
+#: ../menu-data/etm-qt:etm_qt.desktop.in.h:1
+msgid "etm_qt"
+msgstr ""
+
+#: ../menu-data/etm-qt:etm_qt.desktop.in.h:2
+msgid "Manage events and tasks using simple text files"
+msgstr ""
+
 #: ../menu-data/etoys:etoys.desktop.in.h:1
 msgid "eToys"
 msgstr "eToys"
@@ -4335,7 +4504,7 @@
 msgstr ""
 
 #: ../menu-data/ettercap-graphical:ettercap.desktop.in.h:2
-msgid "Network sniffer/analyser"
+msgid "Nework sniffer/analyser"
 msgstr ""
 
 #: ../menu-data/etw:etw.desktop.in.h:1
@@ -4354,6 +4523,14 @@
 msgid "An interactive mathematical program"
 msgstr "一个交互性数学程序"
 
+#: ../menu-data/eureka:eureka.desktop.in.h:1
+msgid "Eureka DOOM Editor"
+msgstr ""
+
+#: ../menu-data/eureka:eureka.desktop.in.h:2
+msgid "Edit maps for the game DOOM"
+msgstr ""
+
 #: ../menu-data/evilvte:evilvte.desktop.in.h:1
 msgid "evilvte"
 msgstr "evilvte"
@@ -4376,10 +4553,10 @@
 msgstr ""
 
 #: ../menu-data/evince-common:evince.desktop.in.h:1
-#: ../menu-data/kdegraphics-mobipocket:kde4__okularApplication_mobi.desktop.in.h:2
 #: ../menu-data/okular-backend-odp:kde4__okularApplication_odp.desktop.in.h:2
 #: ../menu-data/okular-extra-backends:kde4__okularApplication_chm.desktop.in.h:2
 #: ../menu-data/okular:kde4__okular.desktop.in.h:2
+#: ../menu-data/okular:kde4__okularApplication_mobi.desktop.in.h:2
 #: ../menu-data/okular:kde4__okularApplication_plucker.desktop.in.h:2
 #: ../menu-data/okular:kde4__okularApplication_txt.desktop.in.h:2
 msgid "Document Viewer"
@@ -4389,11 +4566,11 @@
 msgid "View multi-page documents"
 msgstr "查看多页文档"
 
-#: ../menu-data/evolution-data-server-uoa:evolution-data-server-uoa.desktop.in.h:1
+#: ../menu-data/evolution-data-server-online-accounts:evolution-data-server-uoa.desktop.in.h:1
 msgid "Evolution Data Server"
 msgstr ""
 
-#: ../menu-data/evolution-data-server-uoa:evolution-data-server-uoa.desktop.in.h:2
+#: ../menu-data/evolution-data-server-online-accounts:evolution-data-server-uoa.desktop.in.h:2
 msgid "Required to have EDS appear in UOA"
 msgstr ""
 
@@ -4421,6 +4598,14 @@
 msgid "Listen to, explore, or manage your audio collection"
 msgstr "聆听、浏览或管理您的音乐"
 
+#: ../menu-data/excellent-bifurcation:excellent-bifurcation.desktop.in.h:1
+msgid "Excellent Bifurcation"
+msgstr ""
+
+#: ../menu-data/excellent-bifurcation:excellent-bifurcation.desktop.in.h:2
+msgid "Abstract vertical shooter with two sides to play on"
+msgstr ""
+
 #: ../menu-data/exfalso:exfalso.desktop.in.h:1
 msgid "Ex Falso"
 msgstr "Ex Falso"
@@ -4430,6 +4615,8 @@
 msgstr "编辑您的音频文件中的标签"
 
 #: ../menu-data/exo-utils:exo-file-manager.desktop.in.h:2
+#: ../menu-data/spacefm-gtk3:spacefm.desktop.in.h:2
+#: ../menu-data/spacefm:spacefm.desktop.in.h:2
 msgid "Browse the file system"
 msgstr "浏览文件系统"
 
@@ -4445,6 +4632,9 @@
 #: ../menu-data/gnome-terminal:gnome-terminal.desktop.in.h:2
 #: ../menu-data/roxterm-gtk2:roxterm.desktop.in.h:2
 #: ../menu-data/roxterm-gtk3:roxterm.desktop.in.h:2
+#: ../menu-data/rxvt-unicode-256color:rxvt-unicode.desktop.in.h:2
+#: ../menu-data/rxvt-unicode-lite:rxvt-unicode.desktop.in.h:2
+#: ../menu-data/rxvt-unicode:rxvt-unicode.desktop.in.h:2
 #: ../menu-data/sakura:sakura.desktop.in.h:2
 msgid "Use the command line"
 msgstr "使用命令行"
@@ -4470,6 +4660,10 @@
 msgid "expEYES Junior User Manual"
 msgstr ""
 
+#: ../menu-data/expeyes-doc-common:progman-jr-doc.desktop.in.h:1
+msgid "expEYES Junior Programmer Manual"
+msgstr ""
+
 #: ../menu-data/expeyes:expeyes-junior.desktop.in.h:1
 msgid "ExpEYES Junior"
 msgstr ""
@@ -4571,26 +4765,31 @@
 msgstr "运行 NES ROM"
 
 #: ../menu-data/fceux:fceux.desktop.in.h:1
-msgid "FCEUX NES Emulator"
-msgstr "FCEUX NES 模拟器"
+msgid "Fceux"
+msgstr ""
 
 #: ../menu-data/fceux:fceux.desktop.in.h:2
-#: ../menu-data/gfceu:gfceu.desktop.in.h:2
-msgid "Play Nintendo ROM files"
-msgstr "运行任天堂 ROM 文件"
+msgid "Emulate NES ROMs"
+msgstr ""
 
 #: ../menu-data/fcitx-config-gtk2:fcitx-config-gtk2.desktop.in.h:1
 #: ../menu-data/fcitx-config-gtk:fcitx-config-gtk3.desktop.in.h:1
-#: ../menu-data/fcitx-data:fcitx-configtool.desktop.in.h:1
 msgid "Fcitx Config Tool"
 msgstr "Fcitx 配置工具"
 
 #: ../menu-data/fcitx-config-gtk2:fcitx-config-gtk2.desktop.in.h:2
 #: ../menu-data/fcitx-config-gtk:fcitx-config-gtk3.desktop.in.h:2
-#: ../menu-data/fcitx-data:fcitx-configtool.desktop.in.h:2
 msgid "Fcitx GUI Config Tool"
 msgstr "Fcitx 图形界面配置工具"
 
+#: ../menu-data/fcitx-data:fcitx-configtool.desktop.in.h:1
+msgid "Fcitx Configuration"
+msgstr ""
+
+#: ../menu-data/fcitx-data:fcitx-configtool.desktop.in.h:2
+msgid "Change Fcitx Configuration"
+msgstr ""
+
 #: ../menu-data/fcitx-data:fcitx-skin-installer.desktop.in.h:1
 msgid "Fcitx Skin Installer"
 msgstr "Fcitx 皮肤安装器"
@@ -4604,10 +4803,16 @@
 msgstr "Fcitx"
 
 #: ../menu-data/fcitx-data:fcitx.desktop.in.h:2
-#: ../menu-data/im-config:im-config.desktop.in.h:1
-#: ../menu-data/uim-gtk2.0:uim.desktop.in.h:1
-msgid "Input Method"
-msgstr "输入法"
+msgid "Start Input Method"
+msgstr ""
+
+#: ../menu-data/fcitx-qimpanel-configtool:fcitx-qimpanel-configtool.desktop.in.h:1
+msgid "fcitx-qimpanel-configtool"
+msgstr ""
+
+#: ../menu-data/fcitx-qimpanel-configtool:fcitx-qimpanel-configtool.desktop.in.h:2
+msgid "fcitx皮肤配置向导-UbuntuKylin"
+msgstr ""
 
 #: ../menu-data/fcitx-ui-light:fcitx-light.desktop.in.h:1
 msgid "Fcitx Light UI"
@@ -4746,15 +4951,12 @@
 msgid "Open a New Private Window"
 msgstr ""
 
-#: ../menu-data/firewall-applet:firewall-applet.desktop.in.h:1
-msgid "Firewall Applet"
-msgstr ""
-
 #: ../menu-data/firewall-applet:firewall-config.desktop.in.h:1
 msgid "Firewall"
 msgstr ""
 
 #: ../menu-data/firewall-applet:firewall-config.desktop.in.h:2
+#: ../menu-data/gufw:gufw.desktop.in.h:1
 msgid "Firewall Configuration"
 msgstr "防火墙配置"
 
@@ -4838,6 +5040,10 @@
 msgid "FlightGear"
 msgstr "FlightGear"
 
+#: ../menu-data/flightgear:flightgear.desktop.in.h:2
+msgid "open-source flight simulator"
+msgstr ""
+
 #: ../menu-data/flmsg:flmsg.desktop.in.h:1
 msgid "flmsg"
 msgstr ""
@@ -4867,14 +5073,6 @@
 msgid "Edit media to create movies"
 msgstr ""
 
-#: ../menu-data/flphoto:flphoto.desktop.in.h:1
-msgid "flPhoto"
-msgstr "flPhoto"
-
-#: ../menu-data/flphoto:flphoto.desktop.in.h:2
-msgid "FLTK Photo Software"
-msgstr "FLTK 照片软件"
-
 #: ../menu-data/flpsed:flpsed.desktop.in.h:1
 msgid "flpsed PDF Annotator"
 msgstr "flpsed PDF 注释程序"
@@ -5009,13 +5207,13 @@
 msgid "Organ synthesizer"
 msgstr "YC 20 电子琴模拟器"
 
-#: ../menu-data/foobillard:foobillard.desktop.in.h:1
-msgid "Foobillard"
-msgstr "Foobillard"
-
-#: ../menu-data/foobillard:foobillard.desktop.in.h:2
-msgid "3D billiards game using OpenGL"
-msgstr "使用 OpenGL 的三维台球游戏"
+#: ../menu-data/foobillardplus:foobillardplus.desktop.in.h:1
+msgid "FooBillard++"
+msgstr ""
+
+#: ../menu-data/foobillardplus:foobillardplus.desktop.in.h:2
+msgid "3D OpenGL Billiard Game"
+msgstr ""
 
 #: ../menu-data/fotowall:fotowall.desktop.in.h:1
 msgid "Fotowall"
@@ -5107,14 +5305,6 @@
 msgid "Mandelbrot family fractal generator"
 msgstr "Mandelbrot 系列分形发生器"
 
-#: ../menu-data/freeaccount:freeaccount.desktop.in.h:1
-msgid "FreeAccount"
-msgstr ""
-
-#: ../menu-data/freeaccount:freeaccount.desktop.in.h:2
-msgid "Medical billing and accountancy"
-msgstr ""
-
 #: ../menu-data/freealchemist:freealchemist.desktop.in.h:1
 msgid "FreeAlchemist"
 msgstr "FreeAlchemist"
@@ -5152,11 +5342,16 @@
 msgstr "Freeciv"
 
 #: ../menu-data/freeciv-client-gtk:freeciv-gtk.desktop.in.h:2
+#: ../menu-data/freeciv-client-gtk:freeciv-gtk3.desktop.in.h:2
 #: ../menu-data/freeciv-server:freeciv-server.desktop.in.h:2
 msgid ""
 "Turn-based strategy game inspired by the history of human civilization"
 msgstr "灵感来自人类文明史上的回合制战略游戏"
 
+#: ../menu-data/freeciv-client-gtk:freeciv-gtk3.desktop.in.h:1
+msgid "Freeciv (gtk3)"
+msgstr ""
+
 #: ../menu-data/freeciv-server:freeciv-server.desktop.in.h:1
 msgid "Freeciv server"
 msgstr "Freeciv 服务器"
@@ -5174,7 +5369,7 @@
 msgstr ""
 
 #: ../menu-data/freediams:freediams.desktop.in.h:2
-msgid "Pharmaceutical Drugs Prescriptor"
+msgid "Pharmaceutical drugs prescriptor assistant"
 msgstr ""
 
 #: ../menu-data/freedink-dfarc:freedink-dfarc.desktop.in.h:1
@@ -5198,15 +5393,17 @@
 msgstr "Free DM"
 
 #: ../menu-data/freedm:freedm.desktop.in.h:2
-#: ../menu-data/freedoom:freedoom.desktop.in.h:2
-#: ../menu-data/vavoom:vavoom.desktop.in.h:2
-msgid "First Person Shooter Game"
-msgstr "第一人称射击游戏"
+msgid "Multiplayer-only Clone of the first person shooter Doom"
+msgstr ""
 
 #: ../menu-data/freedoom:freedoom.desktop.in.h:1
 msgid "Freedoom"
 msgstr "Freedoom"
 
+#: ../menu-data/freedoom:freedoom.desktop.in.h:2
+msgid "Clone of the legendary first person shooter Doom"
+msgstr ""
+
 #: ../menu-data/freedroid:freedroid.desktop.in.h:1
 msgid "Freedroid"
 msgstr "Freedroid"
@@ -5246,7 +5443,7 @@
 msgstr ""
 
 #: ../menu-data/freemedforms-emr:freemedforms.desktop.in.h:2
-msgid "Open source EMR"
+msgid "Open source Electronic Medical Record manager"
 msgstr ""
 
 #: ../menu-data/freemind:freemind.desktop.in.h:1
@@ -5257,6 +5454,14 @@
 msgid "A free mind mapping tool"
 msgstr "一个免费的思维导图工具"
 
+#: ../menu-data/freeorion:freeorion.desktop.in.h:1
+msgid "FreeOrion"
+msgstr ""
+
+#: ../menu-data/freeorion:freeorion.desktop.in.h:2
+msgid "turn-based space empire and galactic conquest computer game (client)"
+msgstr ""
+
 #: ../menu-data/freeplane:freeplane.desktop.in.h:1
 msgid "Freeplane"
 msgstr "Freeplane"
@@ -5347,6 +5552,7 @@
 msgstr "抱起键盘开始摇滚"
 
 #: ../menu-data/friends-app:friends-app.desktop.in.h:1
+#: ../menu-data/steam:steam.desktop.in.h:11
 msgid "Friends"
 msgstr ""
 
@@ -5386,8 +5592,24 @@
 msgid "Pop out the bubbles!"
 msgstr ""
 
-#: ../menu-data/fsl-4.1:fsl-4.1.desktop.in.h:1
-msgid "Software Collection for (f)MRI Data Analysis"
+#: ../menu-data/fs-uae-launcher:fs-uae-launcher.desktop.in.h:1
+msgid "FS-UAE Launcher"
+msgstr ""
+
+#: ../menu-data/fs-uae-launcher:fs-uae-launcher.desktop.in.h:2
+msgid "Launcher for FS-UAE Amiga Emulator"
+msgstr ""
+
+#: ../menu-data/fs-uae:fs-uae.desktop.in.h:1
+msgid "FS-UAE"
+msgstr ""
+
+#: ../menu-data/fs-uae:fs-uae.desktop.in.h:2
+msgid "FS-UAE Amiga Emulator"
+msgstr ""
+
+#: ../menu-data/fsl-4.1:fsl-4.1.desktop.in.h:1
+msgid "Software Collection for (f)MRI Data Analysis"
 msgstr "(f)MRI 数据分析软件集"
 
 #: ../menu-data/fsl-4.1:fsl-4.1.desktop.in.h:2
@@ -5414,6 +5636,14 @@
 msgid "FTP"
 msgstr "FTP"
 
+#: ../menu-data/funguloids:funguloids.desktop.in.h:1
+msgid "Funguloids"
+msgstr "Funguloids"
+
+#: ../menu-data/funguloids:funguloids.desktop.in.h:2
+msgid "Those Funny Funguloids!"
+msgstr ""
+
 #: ../menu-data/funnyboat:funnyboat.desktop.in.h:1
 msgid "Funny Boat"
 msgstr "轮船大冒险"
@@ -5449,8 +5679,8 @@
 msgstr "Compiz Fusion 图标"
 
 #: ../menu-data/fusion-icon:fusion-icon.desktop.in.h:2
-msgid "Start and manage Compiz Fusion"
-msgstr "启动和管理 Compiz Fusion"
+msgid "Manage Compiz Fusion and switch between the available window managers"
+msgstr ""
 
 #: ../menu-data/fuss-launcher:fuss-launcher.desktop.in.h:1
 msgid "Fuss Application Launcher"
@@ -5561,8 +5791,8 @@
 msgstr "寻找同义词和同音词"
 
 #: ../menu-data/gajim:gajim.desktop.in.h:1
-msgid "Gajim Instant Messenger"
-msgstr "Gajim 即时通讯软件"
+msgid "Gajim"
+msgstr ""
 
 #: ../menu-data/gajim:gajim.desktop.in.h:2
 msgid "A GTK+ Jabber client"
@@ -5987,10 +6217,6 @@
 msgid "Send and receive email"
 msgstr ""
 
-#: ../menu-data/geary:geary.desktop.in.h:3
-msgid "Compose Message"
-msgstr ""
-
 #: ../menu-data/gebabbel:gebabbel.desktop.in.h:1
 msgid "Gebabbel"
 msgstr "Gebabbel"
@@ -6055,6 +6281,10 @@
 msgid "geisview"
 msgstr "geisview"
 
+#: ../menu-data/geis-tools:geisview.desktop.in.h:2
+msgid "GEIS gesture event viewer"
+msgstr ""
+
 #: ../menu-data/gelemental:gelemental.desktop.in.h:1
 msgid "Periodic Table"
 msgstr "周期表"
@@ -6171,6 +6401,18 @@
 msgid "GFCE Ultra NES Emulator"
 msgstr "GFCE Ultra 任天堂模拟器"
 
+#: ../menu-data/gfceu:gfceu.desktop.in.h:2
+msgid "Play Nintendo ROM files"
+msgstr "运行任天堂 ROM 文件"
+
+#: ../menu-data/gfm:gfm.desktop.in.h:1
+msgid "GFM"
+msgstr ""
+
+#: ../menu-data/gfm:gfm.desktop.in.h:2
+msgid "TI Calculators Group File Manager"
+msgstr ""
+
 #: ../menu-data/gfpoken:gfpoken.desktop.in.h:1
 msgid "GFingerPoken"
 msgstr "GFingerPoken"
@@ -6295,20 +6537,21 @@
 msgid "Track and sync the files in your Git Annex"
 msgstr ""
 
+#: ../menu-data/git-cola:git-cola-folder-handler.desktop.in.h:1
 #: ../menu-data/git-cola:git-cola.desktop.in.h:1
-msgid "Cola Git GUI"
-msgstr "Cola Git  图形用户界面"
+msgid "Git Cola"
+msgstr ""
 
 #: ../menu-data/git-cola:git-cola.desktop.in.h:2
-msgid "A highly caffeinated git GUI"
-msgstr "一个高效的 GIT 前端"
+msgid "The highly caffeinated Git GUI"
+msgstr ""
 
 #: ../menu-data/git-cola:git-dag.desktop.in.h:1
 msgid "Git DAG"
 msgstr ""
 
 #: ../menu-data/git-cola:git-dag.desktop.in.h:2
-msgid "An advanced git DAG visualizer"
+msgid "Git DAG visualizer"
 msgstr ""
 
 #: ../menu-data/gitg:gitg.desktop.in.h:1
@@ -6319,6 +6562,14 @@
 msgid "Git repository browser"
 msgstr "Git 仓库浏览器"
 
+#: ../menu-data/gitso:gitso.desktop.in.h:1
+msgid "Gitso"
+msgstr ""
+
+#: ../menu-data/gitso:gitso.desktop.in.h:2
+msgid "Connect to others using VNC protocol"
+msgstr ""
+
 #: ../menu-data/gjacktransport:gjackclock.desktop.in.h:1
 msgid "G. JACK Clock"
 msgstr "G. JACK 时钟"
@@ -6392,7 +6643,7 @@
 msgstr "飞行模拟器"
 
 #: ../menu-data/glabels:glabels-3.0.desktop.in.h:1
-msgid "gLables"
+msgid "gLabels"
 msgstr ""
 
 #: ../menu-data/glabels:glabels-3.0.desktop.in.h:2
@@ -6809,10 +7060,6 @@
 msgid "Customize your GNOME desktop"
 msgstr "自定义您的 GNOME 桌面"
 
-#: ../menu-data/gnome-color-manager:gcm-calibrate.desktop.in.h:1
-msgid "Color"
-msgstr "颜色"
-
 #: ../menu-data/gnome-color-manager:gcm-calibrate.desktop.in.h:2
 msgid "Color Calibration"
 msgstr "色彩校准"
@@ -6841,35 +7088,6 @@
 msgid "A two paned file manager"
 msgstr "双面板文件管理器"
 
-#: ../menu-data/gnome-contacts:gnome-contacts.desktop.in.h:1
-#: ../menu-data/kaddressbook-mobile:kde4__kaddressbook-mobile.desktop.in.h:1
-#: ../menu-data/thunderbird:thunderbird.desktop.in.h:4
-msgid "Contacts"
-msgstr "联系人"
-
-#: ../menu-data/gnome-control-center-signon:credentials-preferences.desktop.in.h:1
-#: ../menu-data/gnome-control-center-signon:gnome-credentials-panel.desktop.in.h:1
-msgid "Online Accounts"
-msgstr ""
-
-#: ../menu-data/gnome-control-center-signon:credentials-preferences.desktop.in.h:2
-#: ../menu-data/gnome-control-center-signon:gnome-credentials-panel.desktop.in.h:2
-msgid "Online account credentials and settings"
-msgstr ""
-
-#: ../menu-data/gnome-control-center-signon:update-accounts.desktop.in.h:1
-msgid "Account update tool"
-msgstr ""
-
-#: ../menu-data/gnome-control-center-unity:gnome-unity-appearance-panel.desktop.in.h:1
-#: ../menu-data/unity-tweak-tool:unity-tweak-tool.desktop.in.h:5
-msgid "Appearance"
-msgstr ""
-
-#: ../menu-data/gnome-control-center-unity:gnome-unity-appearance-panel.desktop.in.h:2
-msgid "Change the background and the theme"
-msgstr ""
-
 #: ../menu-data/gnome-disk-utility:gnome-disk-image-mounter.desktop.in.h:1
 msgid "Disk Image Mounter"
 msgstr ""
@@ -6878,6 +7096,14 @@
 msgid "Mount Disk Images"
 msgstr ""
 
+#: ../menu-data/gnome-disk-utility:gnome-disk-image-writer.desktop.in.h:1
+msgid "Disk Image Writer"
+msgstr ""
+
+#: ../menu-data/gnome-disk-utility:gnome-disk-image-writer.desktop.in.h:2
+msgid "Write Disk Images to Devices"
+msgstr ""
+
 #: ../menu-data/gnome-disk-utility:gnome-disks.desktop.in.h:1
 msgid "Disks"
 msgstr ""
@@ -6973,6 +7199,15 @@
 msgid "Disassemble a pile of tiles by removing matching pairs"
 msgstr "配对和消除麻将牌"
 
+#: ../menu-data/gnome-maps:gnome-maps.desktop.in.h:1
+#: ../menu-data/openstreetmap-client:maps.desktop.in.h:1
+msgid "Maps"
+msgstr ""
+
+#: ../menu-data/gnome-maps:gnome-maps.desktop.in.h:2
+msgid "A simple maps application"
+msgstr ""
+
 #: ../menu-data/gnome-mastermind:gnome-mastermind.desktop.in.h:1
 msgid "Mastermind"
 msgstr "Mastermind"
@@ -7032,6 +7267,16 @@
 msgid "The GNOME MUD Client"
 msgstr "GNOME MUD 客户端"
 
+#: ../menu-data/gnome-music:gnome-music.desktop.in.h:1
+msgid "Music"
+msgstr ""
+
+#: ../menu-data/gnome-music:gnome-music.desktop.in.h:2
+#: ../menu-data/gogglesmm:gogglesmm.desktop.in.h:2
+#: ../menu-data/rhythmbox:rhythmbox.desktop.in.h:2
+msgid "Play and organize your music collection"
+msgstr "播放和组织您的音乐收藏"
+
 #: ../menu-data/gnome-nettool:gnome-nettool.desktop.in.h:1
 msgid "Network Tools"
 msgstr "网络工具"
@@ -7040,15 +7285,6 @@
 msgid "View information about your network"
 msgstr "查看网络信息"
 
-#: ../menu-data/gnome-network-admin:network.desktop.in.h:1
-#: ../menu-data/network-manager-gnome:nm-applet.desktop.in.h:1
-msgid "Network"
-msgstr "网络"
-
-#: ../menu-data/gnome-network-admin:network.desktop.in.h:2
-msgid "Configure network devices and connections"
-msgstr "配置网络设备和连接"
-
 #: ../menu-data/gnome-nibbles:gnibbles.desktop.in.h:1
 msgid "Nibbles"
 msgstr "Nibbles"
@@ -7067,6 +7303,31 @@
 "and/or refreshable braille"
 msgstr "通过合成语音和/或盲文显示机提供对图形桌面环境的访问"
 
+#: ../menu-data/gnome-packagekit-session:gpk-dbus-service.desktop.in.h:1
+msgid "Software Install"
+msgstr ""
+
+#: ../menu-data/gnome-packagekit-session:gpk-dbus-service.desktop.in.h:2
+msgid "Install selected software on the system"
+msgstr ""
+
+#: ../menu-data/gnome-packagekit-session:gpk-log.desktop.in.h:1
+msgid "Software Log Viewer"
+msgstr ""
+
+#: ../menu-data/gnome-packagekit-session:gpk-log.desktop.in.h:2
+msgid "View past package management tasks"
+msgstr ""
+
+#: ../menu-data/gnome-packagekit-session:gpk-prefs.desktop.in.h:1
+msgid "Software Settings"
+msgstr ""
+
+#: ../menu-data/gnome-packagekit-session:gpk-prefs.desktop.in.h:2
+msgid ""
+"Change software update preferences and enable or disable software sources"
+msgstr ""
+
 #: ../menu-data/gnome-packagekit-tools:gpk-install-catalog.desktop.in.h:1
 msgid "Catalog Installer"
 msgstr ""
@@ -7099,6 +7360,14 @@
 msgid "Receive and send text messages from your mobile phone"
 msgstr "从移动电话接收或发送信息"
 
+#: ../menu-data/gnome-photos:gnome-photos.desktop.in.h:1
+msgid "Photos"
+msgstr ""
+
+#: ../menu-data/gnome-photos:gnome-photos.desktop.in.h:2
+msgid "Access, organize and share photos"
+msgstr ""
+
 #: ../menu-data/gnome-pie:gnome-pie.desktop.in.h:1
 msgid "Gnome-Pie"
 msgstr "Gnome-Pie"
@@ -7139,6 +7408,10 @@
 msgid "Manage your system tasks"
 msgstr "管理系统任务"
 
+#: ../menu-data/gnome-session-flashback:gnome-flashback-services.desktop.in.h:1
+msgid "GNOME Flashback Services"
+msgstr ""
+
 #: ../menu-data/gnome-session-flashback:gnome-wm.desktop.in.h:1
 #: ../menu-data/unity-tweak-tool:unity-tweak-tool.desktop.in.h:4
 #: ../menu-data/xfwm4:xfce-wm-settings.desktop.in.h:1
@@ -7149,6 +7422,11 @@
 msgid "GNOME Shell Classic"
 msgstr ""
 
+#: ../menu-data/gnome-shell-extensions:gnome-shell-classic.desktop.in.h:2
+#: ../menu-data/gnome-shell:gnome-shell.desktop.in.h:2
+msgid "Window management and application launching"
+msgstr "管理窗口、启动应用程序"
+
 #: ../menu-data/gnome-shell-timer:gnome-shell-timer-config.desktop.in.h:1
 msgid "gnome-shell-timer Preference"
 msgstr ""
@@ -7173,22 +7451,6 @@
 msgid "GNOME Shell"
 msgstr "GNOME Shell"
 
-#: ../menu-data/gnome-software-manager:gpk-application.desktop.in.h:1
-msgid "Software"
-msgstr ""
-
-#: ../menu-data/gnome-software-manager:gpk-application.desktop.in.h:2
-msgid "Add or remove software installed on the system"
-msgstr ""
-
-#: ../menu-data/gnome-software-manager:gpk-install-local-file.desktop.in.h:1
-msgid "Software Install"
-msgstr ""
-
-#: ../menu-data/gnome-software-manager:gpk-install-local-file.desktop.in.h:2
-msgid "Install selected software on the system"
-msgstr ""
-
 #: ../menu-data/gnome-specimen:gnome-specimen.desktop.in.h:1
 msgid "Specimen Font Previewer"
 msgstr "Specimen 字体预览器"
@@ -7248,14 +7510,6 @@
 msgid "Complete the puzzle by matching numbered tiles"
 msgstr "匹配编号的牌片来完成谜题"
 
-#: ../menu-data/gnome-time-admin:time.desktop.in.h:1
-msgid "Time and Date"
-msgstr "时间和日期"
-
-#: ../menu-data/gnome-time-admin:time.desktop.in.h:2
-msgid "Change system time, date, and timezone"
-msgstr "更改系统时间、日期和时区"
-
 #: ../menu-data/gnome-translate:gnome-translate.desktop.in.h:1
 msgid "Language Translator"
 msgstr "语言翻译"
@@ -7269,18 +7523,9 @@
 msgstr ""
 
 #: ../menu-data/gnome-tweak-tool:gnome-tweak-tool.desktop.in.h:2
-#: ../menu-data/ubuntukylin-default-settings:theme-tool.desktop.in.h:2
 msgid "Tweak advanced GNOME 3 settings"
 msgstr "调整高级 GNOME 3 设置"
 
-#: ../menu-data/gnome-update-viewer:gpk-update-viewer.desktop.in.h:1
-msgid "Software Update"
-msgstr ""
-
-#: ../menu-data/gnome-update-viewer:gpk-update-viewer.desktop.in.h:2
-msgid "Update software installed on the system"
-msgstr ""
-
 #: ../menu-data/gnome-user-share:gnome-user-share-properties.desktop.in.h:1
 msgid "Personal File Sharing"
 msgstr "个人文件共享"
@@ -7297,6 +7542,14 @@
 msgid "Play classic arcade games"
 msgstr "回味多种经典街机游戏"
 
+#: ../menu-data/gnome-weather:org.gnome.Weather.Application.desktop.in.h:1
+msgid "Weather"
+msgstr ""
+
+#: ../menu-data/gnome-weather:org.gnome.Weather.Application.desktop.in.h:2
+msgid "Show weather conditions and forecast"
+msgstr ""
+
 #: ../menu-data/gnomecatalog:gnomecatalog.desktop.in.h:1
 msgid "Gnome Catalog"
 msgstr "Gnome 目录"
@@ -7314,7 +7567,7 @@
 msgstr "Gnome 的 KiSSeake 玩偶查看器"
 
 #: ../menu-data/gnomeradio:gnomeradio.desktop.in.h:1
-msgid "Gnomeradio FM Radio Tuner"
+msgid "Gnomeradio"
 msgstr ""
 
 #: ../menu-data/gnomeradio:gnomeradio.desktop.in.h:2
@@ -7347,12 +7600,12 @@
 msgstr "待办事项列表组织、日志记录和计费系统"
 
 #: ../menu-data/gns3:gns3.desktop.in.h:1
-msgid "gns3 Graphical Network Simulator"
-msgstr "gns3 图形化网络模拟器"
+msgid "GNS3"
+msgstr ""
 
 #: ../menu-data/gns3:gns3.desktop.in.h:2
-msgid "program to simulate networks"
-msgstr "模拟网络的程序"
+msgid "GNS3 Graphical Network Simulator"
+msgstr ""
 
 #: ../menu-data/gnubg:gnubg.desktop.in.h:1
 msgid "GNU Backgammon"
@@ -7395,6 +7648,14 @@
 msgid "GNUDoQ, Su Doku generator and solver."
 msgstr "GNUDoQ、数独发生器和求解器。"
 
+#: ../menu-data/gnugo:gnugo.desktop.in.h:1
+msgid "GnuGo"
+msgstr ""
+
+#: ../menu-data/gnugo:gnugo.desktop.in.h:2
+msgid "Play Go against computer opponent"
+msgstr ""
+
 #: ../menu-data/gnujump:gnujump.desktop.in.h:1
 msgid "GNUjump"
 msgstr "GNUjump"
@@ -7496,11 +7757,6 @@
 msgid "Goggles Music Manager"
 msgstr "Goggles 音乐管理器"
 
-#: ../menu-data/gogglesmm:gogglesmm.desktop.in.h:2
-#: ../menu-data/rhythmbox:rhythmbox.desktop.in.h:2
-msgid "Play and organize your music collection"
-msgstr "播放和组织您的音乐收藏"
-
 #: ../menu-data/goldencheetah:GoldenCheetah.desktop.in.h:1
 msgid "GoldenCheetah"
 msgstr "黄金豹"
@@ -7677,6 +7933,7 @@
 msgstr "定点设备"
 
 #: ../menu-data/gpointing-device-settings:gpointing-device-settings.desktop.in.h:2
+#: ../menu-data/unity-control-center:unity-mouse-panel.desktop.in.h:2
 msgid "Set your mouse and touchpad preferences"
 msgstr "设置您的鼠标和触摸板的偏好设置"
 
@@ -7815,6 +8072,8 @@
 msgstr ""
 
 #: ../menu-data/grass-core:grass64.desktop.in.h:2
+#: ../menu-data/qgis:qbrowser.desktop.in.h:2
+#: ../menu-data/qgis:qgis.desktop.in.h:2
 msgid "Geographic Information System"
 msgstr ""
 
@@ -7914,6 +8173,14 @@
 msgid "Personnal finances manager"
 msgstr "个人财务管理软件"
 
+#: ../menu-data/gromit-mpx:gromit-mpx.desktop.in.h:1
+msgid "Gromit-MPX"
+msgstr ""
+
+#: ../menu-data/gromit-mpx:gromit-mpx.desktop.in.h:2
+msgid "GRaphics Over MIscelaneous Things, a multi pointer annotation tool"
+msgstr ""
+
 #: ../menu-data/gromit:gromit.desktop.in.h:1
 msgid "gromit"
 msgstr "gromit"
@@ -7922,14 +8189,6 @@
 msgid "draw freehand screen annotations"
 msgstr "在屏幕上添加手绘注释"
 
-#: ../menu-data/groundcontrol:groundcontrol.desktop.in.h:1
-msgid "Ground Control Configuration"
-msgstr "地面控制配置工具"
-
-#: ../menu-data/groundcontrol:groundcontrol.desktop.in.h:2
-msgid "Setup Ground Control with your Launchpad account."
-msgstr "使用您的 Launchpad 帐户设置地面控制。"
-
 #: ../menu-data/grpn:grpn.desktop.in.h:1
 msgid "Grpn Calculator"
 msgstr "Grpn 计算器"
@@ -7997,14 +8256,6 @@
 msgid "RF Impedance calculator"
 msgstr "RF 阻抗计算器"
 
-#: ../menu-data/gsoko:gsoko.desktop.in.h:1
-msgid "Sokoban"
-msgstr "推箱子游戏"
-
-#: ../menu-data/gsoko:gsoko.desktop.in.h:2
-msgid "Clone of the Sokoban game"
-msgstr "推箱子游戏的克隆"
-
 #: ../menu-data/gspiceui:gspiceui.desktop.in.h:1
 msgid "GSpiceUI"
 msgstr ""
@@ -8123,13 +8374,13 @@
 msgid "Record a video of your desktop"
 msgstr "录制桌面的视频"
 
-#: ../menu-data/gtk-redshift:gtk-redshift.desktop.in.h:1
-msgid "Redshift"
-msgstr "红移"
+#: ../menu-data/gtk-theme-config:gtk-theme-config.desktop.in.h:1
+msgid "Theme Configuration"
+msgstr ""
 
-#: ../menu-data/gtk-redshift:gtk-redshift.desktop.in.h:2
-msgid "Color temperature adjustment tool"
-msgstr "色温调整工具"
+#: ../menu-data/gtk-theme-config:gtk-theme-config.desktop.in.h:2
+msgid "Configure GTK theme colors"
+msgstr ""
 
 #: ../menu-data/gtk-vector-screenshot:take-vector-screenshot.desktop.in.h:1
 msgid "Take Vector Screenshot"
@@ -8275,12 +8526,8 @@
 msgid "Insert special characters into documents"
 msgstr "在文档中插入特殊字符"
 
-#: ../menu-data/gufw:gufw.desktop.in.h:1
-msgid "Gufw Firewall Configuration"
-msgstr ""
-
 #: ../menu-data/gufw:gufw.desktop.in.h:2
-msgid "Allows you to configure your ufw firewall"
+msgid "An easy way to configure your firewall"
 msgstr ""
 
 #: ../menu-data/gui-apt-key:gui-apt-key.desktop.in.h:1
@@ -8549,9 +8796,17 @@
 msgid "Hamster Indicator"
 msgstr "仓鼠指示器"
 
+#: ../menu-data/handbrake:ghb.desktop.in.h:1
+msgid "HandBrake"
+msgstr ""
+
+#: ../menu-data/handbrake:ghb.desktop.in.h:2
+msgid "Transcodes DVD, Bluray, and other media"
+msgstr ""
+
 #: ../menu-data/hannah-foo2zjs:hannah-foo2zjs.desktop.in.h:1
-msgid "Foo2ZJS Firmware Installer (Hannah)"
-msgstr "Foo2ZJS 固件安装程序 (Hanah)"
+msgid "Hannah"
+msgstr ""
 
 #: ../menu-data/hannah-foo2zjs:hannah-foo2zjs.desktop.in.h:2
 msgid "Foo2ZJS Firmware Downloader and Installer"
@@ -8641,6 +8896,19 @@
 msgid "Hexalate"
 msgstr "Hexalate"
 
+#: ../menu-data/hexalate:hexalate.desktop.in.h:2
+msgid "Color Matching Game"
+msgstr ""
+
+#: ../menu-data/hexchat:hexchat.desktop.in.h:1
+msgid "HexChat"
+msgstr ""
+
+#: ../menu-data/hexchat:hexchat.desktop.in.h:2
+#: ../menu-data/xchat:xchat.desktop.in.h:2
+msgid "Chat with other people using Internet Relay Chat"
+msgstr "使用互联网中继聊天来和其他人交流"
+
 #: ../menu-data/hexter:hexter.desktop.in.h:1
 msgid "Hexter"
 msgstr "Hexter"
@@ -8649,6 +8917,14 @@
 msgid "Yamaha DX7 modeling DSSI plugin"
 msgstr "雅马哈 DX7 DSSI 建模插件"
 
+#: ../menu-data/higan:higan.desktop.in.h:1
+msgid "higan"
+msgstr ""
+
+#: ../menu-data/higan:higan.desktop.in.h:2
+msgid "SNES emulator"
+msgstr "SNES 模拟器"
+
 #: ../menu-data/hijra-applet:hijra-applet.desktop.in.h:1
 msgid "Hijra Applet"
 msgstr "Hijra 托盘小程序"
@@ -8665,6 +8941,14 @@
 msgid "Setup utility for hime input method"
 msgstr "hime 输入法配置程序"
 
+#: ../menu-data/history-service:history-daemon.desktop.in.h:1
+msgid "History Service Daemon"
+msgstr ""
+
+#: ../menu-data/history-service:history-daemon.desktop.in.h:2
+msgid "Listens for calls and messages and stores them."
+msgstr ""
+
 #: ../menu-data/hitori:hitori.desktop.in.h:1
 msgid "Hitori"
 msgstr "Hitori"
@@ -8805,6 +9089,22 @@
 msgid "Show System Processes"
 msgstr "显示系统进程"
 
+#: ../menu-data/httraqt:httraqt.desktop.in.h:1
+msgid "HTTraQt"
+msgstr ""
+
+#: ../menu-data/httraqt:httraqt.desktop.in.h:2
+msgid "Web copier"
+msgstr ""
+
+#: ../menu-data/hud-tools:hud-gui.desktop.in.h:1
+msgid "Hud Gui"
+msgstr ""
+
+#: ../menu-data/hud-tools:hud-gui.desktop.in.h:2
+msgid "Test user interface for HUD"
+msgstr ""
+
 #: ../menu-data/hugin:calibrate_lens_gui.desktop.in.h:1
 msgid "Hugin Calibrate Lens"
 msgstr ""
@@ -8849,6 +9149,14 @@
 msgid "Create drum sequences"
 msgstr "创建鼓点序列"
 
+#: ../menu-data/hyperrogue:hyperrogue.desktop.in.h:1
+msgid "HyperRogue"
+msgstr ""
+
+#: ../menu-data/hyperrogue:hyperrogue.desktop.in.h:2
+msgid "A non-euclidean graphical rogue-like game"
+msgstr ""
+
 #: ../menu-data/i3-wm:i3.desktop.in.h:1
 msgid "i3"
 msgstr ""
@@ -8865,19 +9173,31 @@
 msgid "Dominate the board in a classic version of Reversi"
 msgstr "经典的翻转棋游戏"
 
-#: ../menu-data/ibus-cangjie:ibus-setup-cangjie.desktop.in.h:1
-msgid "Cangjie Preferences"
+#: ../menu-data/ibus-anthy:ibus-setup-anthy.desktop.in.h:1
+msgid "IBus Anthy Setup"
 msgstr ""
 
+#: ../menu-data/ibus-anthy:ibus-setup-anthy.desktop.in.h:2
+msgid "Set up IBus Anthy engine"
+msgstr ""
+
+#. The title of the preferences window for Cangjie
 #: ../menu-data/ibus-cangjie:ibus-setup-cangjie.desktop.in.h:2
+msgid "Cangjie Preferences"
+msgstr ""
+
+#. Tooltip for the preferences app for Cangjie
+#: ../menu-data/ibus-cangjie:ibus-setup-cangjie.desktop.in.h:4
 msgid "Set preferences for the Cangjie input method"
 msgstr ""
 
-#: ../menu-data/ibus-cangjie:ibus-setup-quick.desktop.in.h:1
+#. The title of the preferences window for Quick
+#: ../menu-data/ibus-cangjie:ibus-setup-quick.desktop.in.h:2
 msgid "Quick Preferences"
 msgstr ""
 
-#: ../menu-data/ibus-cangjie:ibus-setup-quick.desktop.in.h:2
+#. Tooltip for the preferences app for Quick
+#: ../menu-data/ibus-cangjie:ibus-setup-quick.desktop.in.h:4
 msgid "Set preferences for the Quick input method"
 msgstr ""
 
@@ -8889,6 +9209,14 @@
 msgid "Set IBus Hangul Preferences"
 msgstr ""
 
+#: ../menu-data/ibus-input-pad:ibus-setup-input-pad.desktop.in.h:1
+msgid "IBus Input Pad Setup"
+msgstr ""
+
+#: ../menu-data/ibus-input-pad:ibus-setup-input-pad.desktop.in.h:2
+msgid "Set up IBus Input Pad engine"
+msgstr ""
+
 #: ../menu-data/ibus-libpinyin:ibus-setup-libbopomofo.desktop.in.h:1
 msgid "IBus LibBopomofo Preferences"
 msgstr ""
@@ -8905,6 +9233,22 @@
 msgid "Set ibus-libpinyin Preferences"
 msgstr ""
 
+#: ../menu-data/ibus-pinyin:ibus-setup-bopomofo.desktop.in.h:1
+msgid "IBus Bopomofo Preferences"
+msgstr ""
+
+#: ../menu-data/ibus-pinyin:ibus-setup-bopomofo.desktop.in.h:2
+msgid "Set ibus-Bopomofo Preferences"
+msgstr ""
+
+#: ../menu-data/ibus-pinyin:ibus-setup-pinyin.desktop.in.h:1
+msgid "IBus Pinyin Setup"
+msgstr ""
+
+#: ../menu-data/ibus-pinyin:ibus-setup-pinyin.desktop.in.h:2
+msgid "Set ibus-pinyin Preferences"
+msgstr ""
+
 #: ../menu-data/ibus:ibus-setup.desktop.in.h:1
 msgid "Keyboard Input Methods"
 msgstr "键盘输入方法"
@@ -8913,14 +9257,6 @@
 msgid "Adjust methods for keyboard input."
 msgstr "调整键盘输入方法。"
 
-#: ../menu-data/ibus:ibus.desktop.in.h:1
-msgid "IBus"
-msgstr "IBus"
-
-#: ../menu-data/ibus:ibus.desktop.in.h:2
-msgid "Start IBus Input Method Framework"
-msgstr "启动 IBus 输入法框架"
-
 #: ../menu-data/icebreaker:icebreaker.desktop.in.h:1
 msgid "IceBreaker"
 msgstr "IceBreaker"
@@ -8973,6 +9309,14 @@
 msgid "Integrated Development Environment for Python (using Python-3.3)"
 msgstr ""
 
+#: ../menu-data/idle-python3.4:idle-python3.4.desktop.in.h:1
+msgid "IDLE (using Python-3.4)"
+msgstr ""
+
+#: ../menu-data/idle-python3.4:idle-python3.4.desktop.in.h:2
+msgid "Integrated Development Environment for Python (using Python-3.4)"
+msgstr ""
+
 #: ../menu-data/idle3:idle3.desktop.in.h:1
 msgid "IDLE 3"
 msgstr "IDLE 3"
@@ -9013,6 +9357,19 @@
 msgid "HIZ's ES"
 msgstr "HIZ's ES"
 
+#: ../menu-data/ike-qtgui:ike.desktop.in.h:1
+msgid "Shrew Soft VPN Access Manager"
+msgstr "Shrew Soft VPN 访问管理器"
+
+#: ../menu-data/ike-qtgui:ike.desktop.in.h:2
+msgid "Application to manage remote site configurations"
+msgstr "管理远程站点配置的应用程序"
+
+#: ../menu-data/im-config:im-config.desktop.in.h:1
+#: ../menu-data/uim-gtk2.0:uim.desktop.in.h:1
+msgid "Input Method"
+msgstr "输入法"
+
 #: ../menu-data/im-config:im-config.desktop.in.h:2
 #: ../menu-data/im-switch:im-switch.desktop.in.h:2
 msgid "Set Keyboard Input Method"
@@ -9038,14 +9395,6 @@
 msgid "Display and edit image files"
 msgstr ""
 
-#: ../menu-data/imageshack-uploader:imageshackuploader.desktop.in.h:1
-msgid "ImageShack Uploader"
-msgstr "ImageShack 上传程序"
-
-#: ../menu-data/imageshack-uploader:imageshackuploader.desktop.in.h:2
-msgid "Upload your images and videos to ImageShack"
-msgstr "将您的图像和视频上传到 ImageShack"
-
 #: ../menu-data/imagevis3d:imagevis3d.desktop.in.h:1
 msgid "ImageVis3D"
 msgstr "ImageVis3D"
@@ -9117,8 +9466,8 @@
 msgstr "Intone"
 
 #: ../menu-data/intone:intone.desktop.in.h:2
-msgid "e Media Player"
-msgstr "e 媒体播放器"
+msgid "Simple music player for mobile devices"
+msgstr ""
 
 #: ../menu-data/invesalius:invesalius-3.0.desktop.in.h:1
 msgid "InVesalius-3.0"
@@ -9224,13 +9573,13 @@
 msgid "Record a video of your desktop session"
 msgstr "将您的桌面会话录制为视频"
 
-#: ../menu-data/italc-master:italc.desktop.in.h:1
-msgid "iTalc master interface"
-msgstr "iTalc 主界面"
-
-#: ../menu-data/italc-master:italc.desktop.in.h:2
-msgid "Computer room overview"
-msgstr "机房监控"
+#: ../menu-data/italc-client:italc-client.desktop.in.h:1
+msgid "iTALC Client"
+msgstr ""
+
+#: ../menu-data/italc-master:italc-master.desktop.in.h:1
+msgid "iTALC Master"
+msgstr ""
 
 #: ../menu-data/itksnap:itksnap.desktop.in.h:1
 msgid "3D Structure Segmentation"
@@ -9420,6 +9769,14 @@
 msgid "Photo puzzle game for children"
 msgstr "适合儿童的照片益智游戏"
 
+#: ../menu-data/jitsi:jitsi.desktop.in.h:1
+msgid "Jitsi"
+msgstr ""
+
+#: ../menu-data/jitsi:jitsi.desktop.in.h:2
+msgid "VoIP and Instant Messaging client"
+msgstr ""
+
 #: ../menu-data/jkmeter:jkmeter.desktop.in.h:1
 msgid "Jkmeter"
 msgstr "Jkmeter"
@@ -9469,22 +9826,6 @@
 msgid "Manage system jobs present on your computer"
 msgstr "管理计算机上运行的系统作业"
 
-#: ../menu-data/jockey-kde:jockey-kde.desktop.in.h:1
-msgid "Additional Drivers"
-msgstr "附加驱动"
-
-#: ../menu-data/jockey-kde:jockey-kde.desktop.in.h:2
-msgid "Configure third-party and proprietary drivers"
-msgstr "配置第三方和专有驱动"
-
-#: ../menu-data/jokosher:jokosher.desktop.in.h:1
-msgid "Jokosher Audio Editor"
-msgstr "Jokosher 音频编辑器"
-
-#: ../menu-data/jokosher:jokosher.desktop.in.h:2
-msgid "Simply and easily create multi-track audio"
-msgstr "容易地创建多轨音频"
-
 #: ../menu-data/josm:josm.desktop.in.h:1
 msgid "Josm"
 msgstr "Josm"
@@ -9545,14 +9886,6 @@
 msgid "JuK"
 msgstr "JuK"
 
-#: ../menu-data/jumpapplet:jumpapplet.desktop.in.h:1
-msgid "Autojump applet"
-msgstr "Autojump 小程序"
-
-#: ../menu-data/jumpapplet:jumpapplet.desktop.in.h:2
-msgid "Quickly jump to frequently used directories"
-msgstr "快速跳转到经常使用的目录"
-
 #: ../menu-data/jumpnbump:jumpnbump.desktop.in.h:1
 msgid "Jump'n'Bump"
 msgstr "Jump'n'Bump"
@@ -9954,13 +10287,13 @@
 msgid "View keyboard layout"
 msgstr ""
 
-#: ../menu-data/kde-config-touchpad:kde4__synaptiks.desktop.in.h:1
-msgid "synaptiks"
-msgstr "synaptiks"
-
-#: ../menu-data/kde-config-touchpad:kde4__synaptiks.desktop.in.h:2
-msgid "Touchpad management"
-msgstr "触控板管理"
+#: ../menu-data/kde-developer-sdk:kde4__kde-developer-sdk.desktop.in.h:1
+msgid "KDE SDK"
+msgstr ""
+
+#: ../menu-data/kde-developer-sdk:kde4__kde-developer-sdk.desktop.in.h:2
+msgid "Metapackage for developing KDE Software"
+msgstr ""
 
 #: ../menu-data/kde-runtime:kde4__knetattach.desktop.in.h:1
 msgid "KNetAttach"
@@ -9998,13 +10331,13 @@
 msgid "A panel applet for resizing and reorientating X screens."
 msgstr "用于改变 X 屏幕尺寸和方向的面板小程序。"
 
-#: ../menu-data/kdegraphics-mobipocket:kde4__okularApplication_mobi.desktop.in.h:1
-#: ../menu-data/okular-extra-backends:kde4__okularApplication_chm.desktop.in.h:1
-#: ../menu-data/okular:kde4__okular.desktop.in.h:1
-#: ../menu-data/okular:kde4__okularApplication_plucker.desktop.in.h:1
-#: ../menu-data/okular:kde4__okularApplication_txt.desktop.in.h:1
-msgid "Okular"
-msgstr "Okular"
+#: ../menu-data/kdeconnect:kde4__kdeconnect.desktop.in.h:1
+msgid "KDE Connect"
+msgstr ""
+
+#: ../menu-data/kdeconnect:kde4__kdeconnect.desktop.in.h:2
+msgid "Connect smartphones to your KDE Plasma Workspace"
+msgstr ""
 
 #. KMailService is the handler for mailto URLs
 #: ../menu-data/kdelibs5-data:kde4__kmailservice.desktop.in.h:2
@@ -10039,6 +10372,18 @@
 msgid "Akonadi Tray Utility"
 msgstr "Akonadi 托盘工具"
 
+#: ../menu-data/kdepim-themeeditors:kde4__contactthemeeditor.desktop.in.h:1
+msgid "Contact Theme Editor"
+msgstr ""
+
+#: ../menu-data/kdepim-themeeditors:kde4__headerthemeeditor.desktop.in.h:1
+msgid "KMail Header Theme Editor"
+msgstr ""
+
+#: ../menu-data/kdepim-themeeditors:kde4__headerthemeeditor.desktop.in.h:2
+msgid "Mail Header Theme Editor"
+msgstr ""
+
 #: ../menu-data/kdesrc-build:kde4__kdesrc-build.desktop.in.h:1
 msgid "KDE Source Builder"
 msgstr "KDE 源构建器"
@@ -10188,6 +10533,14 @@
 msgid "Send keys to multiple windows simultaneously"
 msgstr "同时发送按键到多个窗口"
 
+#: ../menu-data/keysync:keysync.desktop.in.h:1
+msgid "KeySync"
+msgstr ""
+
+#: ../menu-data/keysync:keysync.desktop.in.h:2
+msgid "Sync all the OTR trust relationships between multiple chat apps"
+msgstr ""
+
 #: ../menu-data/keytouch-editor:keytouch-editor.desktop.in.h:1
 msgid "KeyTouch Editor"
 msgstr "KeyTouch 编辑器"
@@ -10291,22 +10644,6 @@
 msgid "KGrab"
 msgstr "KGrab"
 
-#: ../menu-data/kgraphviewer:kde4__kgrapheditor.desktop.in.h:1
-msgid "kgrapheditor"
-msgstr "kgrapheditor"
-
-#: ../menu-data/kgraphviewer:kde4__kgrapheditor.desktop.in.h:2
-msgid "A Graphviz dot graph editor for KDE"
-msgstr "用于 KDE 的 Graphviz 散点图编辑器"
-
-#: ../menu-data/kgraphviewer:kde4__kgraphviewer.desktop.in.h:1
-msgid "kgraphviewer"
-msgstr "kgraphviewer"
-
-#: ../menu-data/kgraphviewer:kde4__kgraphviewer.desktop.in.h:2
-msgid "A Graphviz dot graph viewer for KDE"
-msgstr "用于 KDE 的 Graphviz 散点图查看器"
-
 #: ../menu-data/khangman:kde4__khangman.desktop.in.h:1
 msgid "KDE Hangman Game"
 msgstr "KDE 猜字游戏"
@@ -10634,14 +10971,6 @@
 msgid "Mail Client"
 msgstr "邮件客户端"
 
-#: ../menu-data/kmail:kde4__headerthemeeditor.desktop.in.h:1
-msgid "KMail Header Theme Editor"
-msgstr ""
-
-#: ../menu-data/kmail:kde4__headerthemeeditor.desktop.in.h:2
-msgid "Mail Header Theme Editor"
-msgstr ""
-
 #: ../menu-data/kmail:kde4__importwizard.desktop.in.h:1
 msgid "KMail Import Wizard"
 msgstr ""
@@ -10652,23 +10981,12 @@
 "thunderbird/evolution etc."
 msgstr ""
 
-#: ../menu-data/kmail:kde4__ktnef.desktop.in.h:1
-msgid "KTnef"
-msgstr ""
-
-#: ../menu-data/kmail:kde4__ktnef.desktop.in.h:2
-msgid "A viewer/extractor for TNEF files"
+#: ../menu-data/kmail:kde4__mboximporter.desktop.in.h:1
+msgid "MBoxImporter"
 msgstr ""
 
-#: ../menu-data/kmediafactory:kde4__kmediafactory.desktop.in.h:1
-msgid "KMediaFactory"
-msgstr "KMediaFactory"
-
-#: ../menu-data/kmediafactory:kde4__kmediafactory.desktop.in.h:2
-msgid "Template based DVD authoring software"
-msgstr "基于模板的 DVD 制作软件"
-
 #: ../menu-data/kmenuedit:kde4__kmenuedit.desktop.in.h:1
+#: ../menu-data/menulibre:menulibre.desktop.in.h:1
 msgid "Menu Editor"
 msgstr "菜单编辑器"
 
@@ -10760,11 +11078,11 @@
 msgid "Personal Finance Manager"
 msgstr "个人财务管理器"
 
-#: ../menu-data/knavalbattle:kde4__kbattleship.desktop.in.h:1
+#: ../menu-data/knavalbattle:kde4__knavalbattle.desktop.in.h:1
 msgid "Naval Battle"
 msgstr "海战"
 
-#: ../menu-data/knavalbattle:kde4__kbattleship.desktop.in.h:2
+#: ../menu-data/knavalbattle:kde4__knavalbattle.desktop.in.h:2
 msgid "Ship Sinking Game"
 msgstr "沉船游戏"
 
@@ -10804,6 +11122,14 @@
 msgid "KNotes"
 msgstr "KNotes"
 
+#: ../menu-data/knutclient:kde4__knutclient.desktop.in.h:1
+msgid "KNutClient"
+msgstr ""
+
+#: ../menu-data/knutclient:kde4__knutclient.desktop.in.h:2
+msgid "Client for NUT"
+msgstr ""
+
 #: ../menu-data/kobodeluxe:kobodeluxe.desktop.in.h:1
 msgid "Kobo Deluxe"
 msgstr "要塞大作战"
@@ -11072,6 +11398,8 @@
 msgstr "Krita"
 
 #: ../menu-data/krita:kde4__krita.desktop.in.h:2
+#: ../menu-data/kritagemini:kde4__kritagemini.desktop.in.h:1
+#: ../menu-data/kritasketch:kde4__kritasketch.desktop.in.h:2
 msgid "Digital Painting"
 msgstr ""
 
@@ -11079,6 +11407,14 @@
 msgid "Application for Drawing and Handling of Images"
 msgstr ""
 
+#: ../menu-data/kritagemini:kde4__kritagemini.desktop.in.h:2
+msgid "Krita Gemini"
+msgstr ""
+
+#: ../menu-data/kritasketch:kde4__kritasketch.desktop.in.h:1
+msgid "Krita Sketch"
+msgstr ""
+
 #: ../menu-data/kruler:kde4__kruler.desktop.in.h:1
 #: ../menu-data/screenruler:screenruler.desktop.in.h:1
 msgid "Screen Ruler"
@@ -11249,6 +11585,14 @@
 msgid "Personal Time Tracker"
 msgstr "个人时间跟踪器"
 
+#: ../menu-data/ktnef:kde4__ktnef.desktop.in.h:1
+msgid "KTnef"
+msgstr ""
+
+#: ../menu-data/ktnef:kde4__ktnef.desktop.in.h:2
+msgid "A viewer/extractor for TNEF files"
+msgstr ""
+
 #: ../menu-data/ktorrent:kde4__ktorrent.desktop.in.h:1
 msgid "KTorrent"
 msgstr "KTorrent"
@@ -11321,14 +11665,6 @@
 msgid "Connect to Internet Relay Chat"
 msgstr "连接到互联网中继聊天(IRC)"
 
-#: ../menu-data/kvkbd:kde4__kvkbd.desktop.in.h:1
-msgid "Kvkbd"
-msgstr "Kvkbd"
-
-#: ../menu-data/kvkbd:kde4__kvkbd.desktop.in.h:2
-msgid "A virtual keyboard for KDE"
-msgstr "KDE 虚拟键盘"
-
 #: ../menu-data/kvpm:kde4__kvpm.desktop.in.h:1
 msgid "KVPM"
 msgstr "KVPM"
@@ -11373,14 +11709,6 @@
 msgid "KWrite"
 msgstr "KWrite"
 
-#: ../menu-data/kx11grab:qx11grab.desktop.in.h:1
-msgid "QX11Grab"
-msgstr ""
-
-#: ../menu-data/kx11grab:qx11grab.desktop.in.h:2
-msgid "A Application to record X11 desktops"
-msgstr ""
-
 #: ../menu-data/l2tp-ipsec-vpn:L2TP-Ipsec-VPN-Manager.desktop.in.h:1
 msgid "L2TP Ipsec VPN Manager"
 msgstr "L2TP Ipsec VPN 管理器"
@@ -11453,14 +11781,6 @@
 msgid "Manage and configure JACK and ladish"
 msgstr ""
 
-#: ../menu-data/laevateinn:laevateinn.desktop.in.h:1
-msgid "laevateinn"
-msgstr ""
-
-#: ../menu-data/laevateinn:laevateinn.desktop.in.h:2
-msgid "bsnes debugger"
-msgstr ""
-
 #: ../menu-data/landell:landell.desktop.in.h:1
 msgid "Landell"
 msgstr "Landell"
@@ -11485,6 +11805,14 @@
 msgid "Configure multiple and native language support on your system"
 msgstr "配置您系统上的多语言和本地语言支持"
 
+#: ../menu-data/laptop-mode-tools:laptop-mode-tools.desktop.in.h:1
+msgid "Laptop Mode Tools Configuration Tool"
+msgstr ""
+
+#: ../menu-data/laptop-mode-tools:laptop-mode-tools.desktop.in.h:2
+msgid "Tool to enable/disable Laptop Mode Tools settings"
+msgstr ""
+
 #: ../menu-data/lastfm:lastfm.desktop.in.h:1
 msgid "Last.fm"
 msgstr "Last.fm"
@@ -11529,12 +11857,12 @@
 msgid "Keystroke Launcher"
 msgstr ""
 
-#: ../menu-data/lazarus-ide-0.9.30.4:lazarus-0.9.30.4.desktop.in.h:1
-msgid "Lazarus (0.9.30.4)"
+#: ../menu-data/lazarus-ide-1.0.10:lazarus-1.0.10.desktop.in.h:1
+msgid "Lazarus (1.0.10)"
 msgstr ""
 
-#: ../menu-data/lazarus-ide-0.9.30.4:lazarus-0.9.30.4.desktop.in.h:2
-msgid "Lazarus IDE (0.9.30.4)"
+#: ../menu-data/lazarus-ide-1.0.10:lazarus-1.0.10.desktop.in.h:2
+msgid "Lazarus IDE (1.0.10)"
 msgstr ""
 
 #: ../menu-data/lbreakout2:lbreakout2.desktop.in.h:1
@@ -11610,10 +11938,22 @@
 "LGeneral is a turn-based strategy engine heavily inspired by Panzer General."
 msgstr ""
 
-#: ../menu-data/libfm-gtk-bin:libfm-pref-apps.desktop.in.h:1
+#: ../menu-data/libcamitk3-dev:camitk-wizard.desktop.in.h:1
+msgid "CamiTK-wizard"
+msgstr ""
+
+#: ../menu-data/libcamitk3-dev:camitk-wizard.desktop.in.h:2
+msgid "Computer Assisted Medical Intervention ToolKit Wizard"
+msgstr ""
+
+#: ../menu-data/libfm-tools:libfm-pref-apps.desktop.in.h:1
 msgid "Preferred Applications"
 msgstr "首选应用程序"
 
+#: ../menu-data/libfm-tools:libfm-pref-apps.desktop.in.h:2
+msgid "Select applications called on click on Web link or e-mail address"
+msgstr ""
+
 #: ../menu-data/librecad:librecad.desktop.in.h:1
 msgid "LibreCAD"
 msgstr "LibreCAD"
@@ -11660,6 +12000,30 @@
 "document format. Supported by The Document Foundation."
 msgstr "兼容开放和标准化 ODF 文档格式的办公室生产力套装软件。由文档基金会的支持。"
 
+#: ../menu-data/libreoffice-common:libreoffice-startcenter.desktop.in.h:3
+msgid "Text Document"
+msgstr ""
+
+#: ../menu-data/libreoffice-common:libreoffice-startcenter.desktop.in.h:4
+msgid "Spreadsheet"
+msgstr ""
+
+#: ../menu-data/libreoffice-common:libreoffice-startcenter.desktop.in.h:5
+msgid "Presentation"
+msgstr ""
+
+#: ../menu-data/libreoffice-common:libreoffice-startcenter.desktop.in.h:6
+msgid "Drawing"
+msgstr ""
+
+#: ../menu-data/libreoffice-common:libreoffice-startcenter.desktop.in.h:7
+msgid "Database"
+msgstr ""
+
+#: ../menu-data/libreoffice-common:libreoffice-startcenter.desktop.in.h:8
+msgid "Formula"
+msgstr ""
+
 #: ../menu-data/libreoffice-common:libreoffice-xsltfilter.desktop.in.h:1
 msgid "LibreOffice XSLT based filters"
 msgstr ""
@@ -11720,6 +12084,18 @@
 msgid "New Document"
 msgstr "新建文档"
 
+#: ../menu-data/libu1db-qt5-examples:u1db-qt-gallery.desktop.in.h:1
+msgid "U1Db QML Example Gallery"
+msgstr ""
+
+#: ../menu-data/libunity-mir-tests:unity-mir-test-helper-app.desktop.in.h:1
+msgid "My Fake App"
+msgstr ""
+
+#: ../menu-data/libunity-mir-tests:unity-mir-test-helper-app.desktop.in.h:2
+msgid "My Fake App Comment"
+msgstr ""
+
 #: ../menu-data/libxfce4ui-utils:xfce4-about.desktop.in.h:1
 msgid "About Xfce"
 msgstr ""
@@ -11741,21 +12117,21 @@
 msgid "Earthworm action game"
 msgstr ""
 
-#: ../menu-data/lifeograph:lifeograph.desktop.in.h:1
-msgid "Lifeograph"
-msgstr "Lifeograph"
-
-#: ../menu-data/lifeograph:lifeograph.desktop.in.h:2
-msgid "Keep a private journal of your life"
-msgstr "保存您的私人日记"
-
 #: ../menu-data/liferea:liferea.desktop.in.h:1
 msgid "Liferea Feed Reader"
 msgstr "Liferea Feed 阅读器"
 
 #: ../menu-data/liferea:liferea.desktop.in.h:2
-msgid "Download and view feeds"
-msgstr "下载和查看 feed 订阅"
+msgid "Read news feeds and blogs"
+msgstr ""
+
+#: ../menu-data/light-locker-settings:light-locker-settings.desktop.in.h:1
+msgid "Light Locker Settings"
+msgstr ""
+
+#: ../menu-data/light-locker-settings:light-locker-settings.desktop.in.h:2
+msgid "Configure locking your session"
+msgstr ""
 
 #: ../menu-data/lightsoff:lightsoff.desktop.in.h:1
 msgid "Lights Off"
@@ -12002,6 +12378,14 @@
 msgid "Sports video analysis tool for coaches"
 msgstr "供教练使用的体育视频分析工具"
 
+#: ../menu-data/loook:loook.desktop.in.h:1
+msgid "Loook"
+msgstr ""
+
+#: ../menu-data/loook:loook.desktop.in.h:2
+msgid "Search strings in ODF documents"
+msgstr ""
+
 #: ../menu-data/loqui:loqui.desktop.in.h:1
 msgid "Loqui"
 msgstr "Loqui"
@@ -12076,6 +12460,14 @@
 msgid "Fast, small, webkit based micro-browser extensible by Lua"
 msgstr "快速、小型、基于 webkit 的微型浏览器，可通过 Lua 扩展"
 
+#: ../menu-data/lubuntu-nexus7-extra-files:lubuntu-nexus7-identica.desktop.in.h:1
+msgid "identi.ca"
+msgstr ""
+
+#: ../menu-data/lubuntu-nexus7-extra-files:lubuntu-nexus7-rotate.desktop.in.h:1
+msgid "Rotate your screen"
+msgstr ""
+
 #: ../menu-data/lubuntu-software-center:lubuntu-software-center.desktop.in.h:1
 msgid "Lubuntu Software Center"
 msgstr "Lubuntu 软件中心"
@@ -12101,16 +12493,6 @@
 msgid "Backup & sync your data with the power of rsync"
 msgstr "通过强大的 rsync 备份和同步您的数据"
 
-#: ../menu-data/lugaru:lugaru.desktop.in.h:1
-msgid "Lugaru"
-msgstr "复仇格斗兔"
-
-#: ../menu-data/lugaru:lugaru.desktop.in.h:2
-msgid ""
-"Third-person action game about an anthropomorphic rabbit with curiously well "
-"developed combat skills"
-msgstr "一个关于武艺高强的拟人化兔子冒险史的第三人称动作游戏"
-
 #: ../menu-data/luminance-hdr:luminance-hdr.desktop.in.h:1
 msgid "Luminance HDR"
 msgstr ""
@@ -12163,6 +12545,14 @@
 msgid "Change the default applications on LXDE"
 msgstr ""
 
+#: ../menu-data/lxshortcut:lxshortcut.desktop.in.h:1
+msgid "Shortcut Editor"
+msgstr ""
+
+#: ../menu-data/lxshortcut:lxshortcut.desktop.in.h:2
+msgid "Create new or change existing desktop entry"
+msgstr ""
+
 #: ../menu-data/lxtask:lxtask.desktop.in.h:1
 msgid "Task Manager"
 msgstr "任务管理器"
@@ -12283,11 +12673,11 @@
 msgid "A notifier for new emails"
 msgstr ""
 
-#: ../menu-data/maitreya:maitreya6.desktop.in.h:1
-msgid "Maitreya6"
+#: ../menu-data/maitreya:maitreya7.desktop.in.h:1
+msgid "Maitreya7"
 msgstr ""
 
-#: ../menu-data/maitreya:maitreya6.desktop.in.h:2
+#: ../menu-data/maitreya:maitreya7.desktop.in.h:2
 msgid "Astrology Software"
 msgstr ""
 
@@ -12348,6 +12738,9 @@
 msgid "Share mouse and pointer with other Computers"
 msgstr "与其他计算机共享鼠标和指针"
 
+#: ../menu-data/marble-qt:kde4__marble-qt.desktop.in.h:1
+#: ../menu-data/marble-touch:kde4__marble-touch.desktop.in.h:1
+#: ../menu-data/marble:kde4__marble-mobile.desktop.in.h:1
 #: ../menu-data/marble:kde4__marble.desktop.in.h:1
 #: ../menu-data/marble:kde4__marble_gpx.desktop.in.h:1
 #: ../menu-data/marble:kde4__marble_kml.desktop.in.h:1
@@ -12357,6 +12750,9 @@
 msgid "Marble"
 msgstr "弹珠"
 
+#: ../menu-data/marble-qt:kde4__marble-qt.desktop.in.h:2
+#: ../menu-data/marble-touch:kde4__marble-touch.desktop.in.h:2
+#: ../menu-data/marble:kde4__marble-mobile.desktop.in.h:2
 #: ../menu-data/marble:kde4__marble.desktop.in.h:2
 #: ../menu-data/marble:kde4__marble_gpx.desktop.in.h:2
 #: ../menu-data/marble:kde4__marble_kml.desktop.in.h:2
@@ -12366,13 +12762,13 @@
 msgid "Virtual Globe"
 msgstr ""
 
-#: ../menu-data/massif-visualizer:kde4__massif-visualizer.desktop.in.h:1
-msgid "Massif-Visualizer"
-msgstr "地块观察仪"
-
-#: ../menu-data/massif-visualizer:kde4__massif-visualizer.desktop.in.h:2
-msgid "Visualization of Memory Profiling Data"
-msgstr "内存分析文件数据的可视化工具"
+#: ../menu-data/marsshooter:mars.desktop.in.h:1
+msgid "M.A.R.S."
+msgstr ""
+
+#: ../menu-data/marsshooter:mars.desktop.in.h:2
+msgid "M.A.R.S. - a ridiculous shooter"
+msgstr ""
 
 #: ../menu-data/massxpert:massxpert.desktop.in.h:1
 msgid "massXpert"
@@ -12383,10 +12779,23 @@
 msgstr "生物聚合物质谱分析法软件"
 
 #: ../menu-data/mat:mat.desktop.in.h:1
+msgid "MAT"
+msgstr ""
+
+#: ../menu-data/mat:mat.desktop.in.h:2
 msgid "Metadata Anonymisation Toolkit"
 msgstr ""
 
+#: ../menu-data/matanza:matanza.desktop.in.h:1
+msgid "Matanza"
+msgstr ""
+
+#: ../menu-data/matanza:matanza.desktop.in.h:2
+msgid "Space ascii war game"
+msgstr ""
+
 #: ../menu-data/matchbox-keyboard:inputmethods__matchbox-keyboard.desktop.in.h:1
+#: ../menu-data/unity-control-center:unity-keyboard-panel.desktop.in.h:1
 msgid "Keyboard"
 msgstr "键盘"
 
@@ -12394,6 +12803,22 @@
 msgid "Virtual Keyboard"
 msgstr "虚拟键盘"
 
+#: ../menu-data/mate-desktop:mate-about.desktop.in.h:1
+msgid "About MATE"
+msgstr ""
+
+#: ../menu-data/mate-desktop:mate-about.desktop.in.h:2
+msgid "Learn more about MATE"
+msgstr ""
+
+#: ../menu-data/mate-notification-daemon:mate-notification-properties.desktop.in.h:1
+msgid "Pop-Up Notifications"
+msgstr "弹出通知"
+
+#: ../menu-data/mate-notification-daemon:mate-notification-properties.desktop.in.h:2
+msgid "Set your pop-up notification preferences"
+msgstr "设置您的弹出通知偏好"
+
 #: ../menu-data/mathomatic:mathomatic.desktop.in.h:1
 msgid "Mathomatic"
 msgstr "Mathomatic"
@@ -12519,6 +12944,22 @@
 msgid "MegaGlest"
 msgstr "MegaGlest"
 
+#: ../menu-data/megaglest:megaglest_editor.desktop.in.h:1
+msgid "Map Editor"
+msgstr ""
+
+#: ../menu-data/megaglest:megaglest_editor.desktop.in.h:2
+msgid "MegaGlest Map Editor"
+msgstr ""
+
+#: ../menu-data/megaglest:megaglest_g3dviewer.desktop.in.h:1
+msgid "G3d Model Viewer"
+msgstr ""
+
+#: ../menu-data/megaglest:megaglest_g3dviewer.desktop.in.h:2
+msgid "MegaGlest Model Viewer"
+msgstr ""
+
 #: ../menu-data/meld:meld.desktop.in.h:1
 msgid "Meld Diff Viewer"
 msgstr "Meld Diff 查看器"
@@ -12543,6 +12984,18 @@
 msgid "Builds avatars for all your applications."
 msgstr "为您所有的应用程序构建形象化符号。"
 
+#: ../menu-data/menulibre:menulibre.desktop.in.h:2
+msgid "Add or remove applications from the menu"
+msgstr ""
+
+#: ../menu-data/meritous:meritous.desktop.in.h:1
+msgid "Meritous"
+msgstr "Meritous"
+
+#: ../menu-data/meritous:meritous.desktop.in.h:2
+msgid "action-adventure dungeon crawl game"
+msgstr "动作冒险地下城游戏"
+
 #: ../menu-data/merkaartor:merkaartor.desktop.in.h:1
 msgid "Merkaartor"
 msgstr "Merkaartor"
@@ -12639,6 +13092,14 @@
 msgid "Emulateur multi systèmes"
 msgstr ""
 
+#: ../menu-data/messaging-app:messaging-app.desktop.in.h:1
+msgid "Messaging"
+msgstr ""
+
+#: ../menu-data/messaging-app:messaging-app.desktop.in.h:2
+msgid "Messaging application"
+msgstr ""
+
 #: ../menu-data/metacity:metacity.desktop.in.h:1
 msgid "Metacity"
 msgstr "Metacity"
@@ -12664,11 +13125,11 @@
 msgstr "录制、播放、编辑和转换声音文件"
 
 #: ../menu-data/mialmpick:mia-lmpick.desktop.in.h:1
-msgid "mialmpick Version  0.2.9"
+msgid "mialmpick Version  0.2.10"
 msgstr ""
 
 #: ../menu-data/mialmpick:mia-lmpick.desktop.in.h:2
-msgid "mia-lmpick Version  0.2.9"
+msgid "mia-lmpick Version  0.2.10"
 msgstr ""
 
 #: ../menu-data/miceamaze:miceamaze.desktop.in.h:1
@@ -12679,6 +13140,22 @@
 msgid "video game with mice in a maze"
 msgstr ""
 
+#: ../menu-data/microhope:microhope-avr.desktop.in.h:1
+msgid "µHOPE"
+msgstr ""
+
+#: ../menu-data/microhope:microhope-avr.desktop.in.h:2
+msgid "MicroHOPE microcontroller programming system"
+msgstr ""
+
+#: ../menu-data/microhope:microhope-doc.desktop.in.h:1
+msgid "microHOPE Manual"
+msgstr ""
+
+#: ../menu-data/microhope:microhope-doc.desktop.in.h:2
+msgid "microHOPE User Manual"
+msgstr ""
+
 #: ../menu-data/micropolis:micropolis.desktop.in.h:1
 msgid "Micropolis"
 msgstr "Micropolis"
@@ -12723,6 +13200,14 @@
 msgid "New P_rivate Browsing Window"
 msgstr "新建隐私浏览窗口(_R)"
 
+#: ../menu-data/mikutter:mikutter.desktop.in.h:1
+msgid "mikutter"
+msgstr ""
+
+#: ../menu-data/mikutter:mikutter.desktop.in.h:2
+msgid "Twitter Client"
+msgstr ""
+
 #: ../menu-data/milkytracker:milkytracker.desktop.in.h:1
 msgid "MilkyTracker"
 msgstr "MilkyTracker"
@@ -12765,6 +13250,7 @@
 
 #: ../menu-data/minitube:minitube.desktop.in.h:3
 #: ../menu-data/parole:parole.desktop.in.h:3
+#: ../menu-data/quodlibet:quodlibet.desktop.in.h:3
 #: ../menu-data/totem:totem.desktop.in.h:3
 msgid "Play/Pause"
 msgstr "播放 / 暂停"
@@ -12798,6 +13284,10 @@
 msgid "Author DVDs and slideshows"
 msgstr "制作 DVD 和幻灯片"
 
+#: ../menu-data/mit-scheme:mit-scheme.desktop.in.h:1
+msgid "MIT/GNU Scheme"
+msgstr ""
+
 #: ../menu-data/mixxx:mixxx.desktop.in.h:1
 msgid "Mixxx"
 msgstr "Mixxx"
@@ -12886,6 +13376,14 @@
 msgid "Graphical ODE simulator"
 msgstr "图形化 ODE 模拟器"
 
+#: ../menu-data/modem-manager-gui:modem-manager-gui.desktop.in.h:1
+msgid "Modem Manager GUI"
+msgstr ""
+
+#: ../menu-data/modem-manager-gui:modem-manager-gui.desktop.in.h:2
+msgid "Graphical interface for Modem manager daemon control"
+msgstr ""
+
 #: ../menu-data/mokomaze:mokomaze.desktop.in.h:1
 msgid "Mokomaze"
 msgstr "Mokomaze"
@@ -12922,14 +13420,14 @@
 msgid "Open With MkS"
 msgstr ""
 
-#: ../menu-data/mono-runtime:mono-runtime-terminal.desktop.in.h:1
-msgid "Mono Runtime (Terminal)"
-msgstr "Mono 运行时(终端)"
-
-#: ../menu-data/mono-runtime:mono-runtime.desktop.in.h:1
+#: ../menu-data/mono-runtime-common:mono-runtime-common.desktop.in.h:1
 msgid "Mono Runtime"
 msgstr "Mono 运行时"
 
+#: ../menu-data/mono-runtime-common:mono-runtime-terminal.desktop.in.h:1
+msgid "Mono Runtime (Terminal)"
+msgstr "Mono 运行时(终端)"
+
 #: ../menu-data/mono-tools-gui:gsharp.desktop.in.h:1
 msgid "gsharp"
 msgstr "gsharp"
@@ -12996,13 +13494,21 @@
 msgid "Fun game based on the classic moon lander"
 msgstr "基于经典登月者游戏的趣味性游戏"
 
-#: ../menu-data/moovida:moovida.desktop.in.h:1
-msgid "Moovida Media Center"
-msgstr "Moovida 媒体中心"
-
-#: ../menu-data/moovida:moovida.desktop.in.h:2
-msgid "Play movies and songs on TV with remote"
-msgstr "遥控 TV 播放电影和音乐"
+#: ../menu-data/mopidy:mopidy.desktop.in.h:1
+msgid "Mopidy Music Server"
+msgstr ""
+
+#: ../menu-data/mopidy:mopidy.desktop.in.h:2
+msgid "MPD music server with Spotify support"
+msgstr ""
+
+#: ../menu-data/morris:morris.desktop.in.h:1
+msgid "Morris"
+msgstr ""
+
+#: ../menu-data/morris:morris.desktop.in.h:2
+msgid "Nine Men's Morris Game"
+msgstr ""
 
 #: ../menu-data/moserial:moserial.desktop.in.h:1
 msgid "moserial Terminal"
@@ -13020,6 +13526,14 @@
 msgid "Simple Text Editor"
 msgstr ""
 
+#: ../menu-data/mozc-utils-gui:setup-mozc.desktop.in.h:1
+msgid "Mozc Setup"
+msgstr ""
+
+#: ../menu-data/mozc-utils-gui:setup-mozc.desktop.in.h:2
+msgid "Set up Mozc engine"
+msgstr ""
+
 #. DocPath=
 #: ../menu-data/mp3diags:mp3diags.desktop.in.h:2
 msgid "MP3 Diags - diagnosis and repair tool"
@@ -13058,6 +13572,7 @@
 msgstr "MPlayer 媒体播放器"
 
 #: ../menu-data/mplayer-gui:mplayer.desktop.in.h:2
+#: ../menu-data/mpv:mpv.desktop.in.h:2
 msgid "Play movies and songs"
 msgstr "播放影片和歌曲"
 
@@ -13069,6 +13584,10 @@
 msgid "Manage your MPMan portable mp3 player"
 msgstr "管理您的 MPMan 便携式 MP3 播放器"
 
+#: ../menu-data/mpv:mpv.desktop.in.h:1
+msgid "mpv Media Player"
+msgstr ""
+
 #: ../menu-data/mricron:dcm2niigui.desktop.in.h:1
 msgid "DICOM to NIfTI Conversion"
 msgstr "DICOM 到 NIfTI 的转换"
@@ -13153,6 +13672,14 @@
 msgid "Muffin"
 msgstr ""
 
+#: ../menu-data/mugshot:mugshot.desktop.in.h:1
+msgid "About Me"
+msgstr ""
+
+#: ../menu-data/mugshot:mugshot.desktop.in.h:2
+msgid "Configure your profile image and contact details"
+msgstr ""
+
 #: ../menu-data/multiget:multiget.desktop.in.h:1
 msgid "MultiGet"
 msgstr "MultiGet"
@@ -13198,10 +13725,6 @@
 msgid "Muon Update Manager"
 msgstr "Muon 更新管理器"
 
-#: ../menu-data/muon-updater:kde4__muon-updater.desktop.in.h:2
-msgid "Update Manager"
-msgstr "更新管理器"
-
 #: ../menu-data/muon:kde4__muon.desktop.in.h:1
 msgid "Muon Package Manager"
 msgstr "Muon 软件包管理器"
@@ -13294,11 +13817,11 @@
 msgid "Painting program for digital artists"
 msgstr "给数字艺术家的绘画程序"
 
-#: ../menu-data/mysql-workbench:MySQLWorkbench.desktop.in.h:1
+#: ../menu-data/mysql-workbench:mysql-workbench.desktop.in.h:1
 msgid "MySQL Workbench"
 msgstr ""
 
-#: ../menu-data/mysql-workbench:MySQLWorkbench.desktop.in.h:2
+#: ../menu-data/mysql-workbench:mysql-workbench.desktop.in.h:2
 msgid "MySQL Database Design, Administration and Development Tool"
 msgstr ""
 
@@ -13519,6 +14042,14 @@
 msgid "X NetHack"
 msgstr "X NetHack"
 
+#: ../menu-data/netmate:netmate.desktop.in.h:1
+msgid "Netmate"
+msgstr ""
+
+#: ../menu-data/netmate:netmate.desktop.in.h:2
+msgid "shows pcap dump lines in network header style"
+msgstr ""
+
 #: ../menu-data/netpanzer:netpanzer.desktop.in.h:1
 msgid "NetPanzer"
 msgstr "NetPanzer"
@@ -13536,13 +14067,18 @@
 msgstr "NetSurf 网络浏览器"
 
 #: ../menu-data/nettoe:nettoe.desktop.in.h:1
-msgid "Nettoe"
+msgid "netToe"
 msgstr ""
 
 #: ../menu-data/nettoe:nettoe.desktop.in.h:2
 msgid "Play a game of Tic Tac Toe."
 msgstr ""
 
+#: ../menu-data/network-manager-gnome:nm-applet.desktop.in.h:1
+#: ../menu-data/unity-control-center:unity-network-panel.desktop.in.h:1
+msgid "Network"
+msgstr "网络"
+
 #: ../menu-data/network-manager-gnome:nm-applet.desktop.in.h:2
 msgid "Manage your network connections"
 msgstr "管理您的网络连接"
@@ -13666,6 +14202,10 @@
 msgid "NmapSI4 - User mode"
 msgstr "NmapSI4 - 用户模式"
 
+#: ../menu-data/noblenote:noblenote.desktop.in.h:1
+msgid "nobleNote"
+msgstr ""
+
 #: ../menu-data/noiz2sa:noiz2sa.desktop.in.h:1
 msgid "Noiz2sa"
 msgstr "Noiz2sa"
@@ -13702,6 +14242,22 @@
 msgid "Display notifications"
 msgstr "显示通知"
 
+#: ../menu-data/nrefactory-samples:nrefactory-demo-gtk.desktop.in.h:1
+msgid "NRefactory Demo (GTK#)"
+msgstr ""
+
+#: ../menu-data/nrefactory-samples:nrefactory-demo-gtk.desktop.in.h:2
+msgid "NRefactory C# analysis library Demo (GTK#)"
+msgstr ""
+
+#: ../menu-data/nrefactory-samples:nrefactory-demo-swf.desktop.in.h:1
+msgid "NRefactory Demo (System.Windows.Forms)"
+msgstr ""
+
+#: ../menu-data/nrefactory-samples:nrefactory-demo-swf.desktop.in.h:2
+msgid "NRefactory C# analysis library Demo (System.Windows.Forms)"
+msgstr ""
+
 #: ../menu-data/nted:nted.desktop.in.h:1
 msgid "NtEd"
 msgstr "NtEd"
@@ -13746,6 +14302,22 @@
 msgid "Overclock and Monitor NVIDIA cards"
 msgstr "NVIDIA 显示卡超频和监控"
 
+#: ../menu-data/nvidia-settings:nvidia-settings.desktop.in.h:1
+msgid "NVIDIA X Server Settings"
+msgstr "NVIDIA X 服务器设置"
+
+#: ../menu-data/nvidia-settings:nvidia-settings.desktop.in.h:2
+msgid "Configure NVIDIA X Server Settings"
+msgstr "配置 NVIDIA X 服务器设置"
+
+#: ../menu-data/nvpy:nvpy.desktop.in.h:1
+msgid "nvPY"
+msgstr ""
+
+#: ../menu-data/nvpy:nvpy.desktop.in.h:2
+msgid "Cross-platform simplenote-syncing note-taking tool"
+msgstr ""
+
 #: ../menu-data/nvtv:nvtv.desktop.in.h:1
 msgid "Nvtv TV Out"
 msgstr "Nvtv 电视输出"
@@ -13767,8 +14339,8 @@
 msgstr "Openbox 配置管理器"
 
 #: ../menu-data/obconf:obconf.desktop.in.h:2
-msgid "Configure and personalize the Openbox window manager"
-msgstr "配置和个性化 Openbox 窗口管理器"
+msgid "Tweak settings for Openbox"
+msgstr ""
 
 #: ../menu-data/obextool:obextool.desktop.in.h:1
 msgid "ObexTool"
@@ -13787,12 +14359,10 @@
 msgstr "晶体结构测定"
 
 #: ../menu-data/oce-draw:oce-draw.desktop.in.h:1
-#: ../menu-data/opencascade-draw:opencascade-draw.desktop.in.h:1
 msgid "OpenCASCADE"
 msgstr "OpenCASCADE"
 
 #: ../menu-data/oce-draw:oce-draw.desktop.in.h:2
-#: ../menu-data/opencascade-draw:opencascade-draw.desktop.in.h:2
 msgid "OpenCASCADE DRAWEXE test harness"
 msgstr "OpenCASCADE DRAWEXE 测试工具"
 
@@ -13840,6 +14410,14 @@
 msgid "okular"
 msgstr "okular"
 
+#: ../menu-data/okular-extra-backends:kde4__okularApplication_chm.desktop.in.h:1
+#: ../menu-data/okular:kde4__okular.desktop.in.h:1
+#: ../menu-data/okular:kde4__okularApplication_mobi.desktop.in.h:1
+#: ../menu-data/okular:kde4__okularApplication_plucker.desktop.in.h:1
+#: ../menu-data/okular:kde4__okularApplication_txt.desktop.in.h:1
+msgid "Okular"
+msgstr "Okular"
+
 #: ../menu-data/omegat:omegat.desktop.in.h:1
 msgid "OmegaT"
 msgstr "OmegaT"
@@ -13914,14 +14492,6 @@
 msgid "Logs GSM and GPS and uploads to openBmap."
 msgstr "记录 GSM 和 GPS 并上传到 openBmap。"
 
-#: ../menu-data/openbox:openbox.desktop.in.h:1
-msgid "Openbox"
-msgstr "Openbox"
-
-#: ../menu-data/openbox:openbox.desktop.in.h:2
-msgid "Log in using the Openbox window manager (without a session manager)"
-msgstr "使用 Openbox 窗口管理器登录(无会话管理器)"
-
 #: ../menu-data/openbve:openbve.desktop.in.h:1
 msgid "OpenBVE"
 msgstr "OpenBVE"
@@ -13982,10 +14552,26 @@
 msgid "OpenLP"
 msgstr ""
 
+#: ../menu-data/openlugaru:openlugaru.desktop.in.h:1
+msgid "OpenLugaru"
+msgstr ""
+
+#: ../menu-data/openlugaru:openlugaru.desktop.in.h:2
+msgid "Single-player game featuring rabbits"
+msgstr ""
+
 #: ../menu-data/openmcdf:structuredstorageexplorer.desktop.in.h:1
 msgid "Structured Storage Explorer"
 msgstr ""
 
+#: ../menu-data/openmsx-catapult:openmsx-catapult.desktop.in.h:1
+msgid "openMSX Catapult"
+msgstr ""
+
+#: ../menu-data/openmsx-catapult:openmsx-catapult.desktop.in.h:2
+msgid "Graphical interface for openMSX"
+msgstr ""
+
 #: ../menu-data/openrocket:openrocket.desktop.in.h:1
 msgid "OpenRocket"
 msgstr "OpenRocket"
@@ -14030,10 +14616,6 @@
 msgid "Create 3D autostereograms"
 msgstr ""
 
-#: ../menu-data/openstreetmap-client:maps.desktop.in.h:1
-msgid "Maps"
-msgstr ""
-
 #: ../menu-data/openstreetmap-client:maps.desktop.in.h:2
 msgid "Maps application"
 msgstr ""
@@ -14078,10 +14660,6 @@
 msgid "GTK+-2 Client for OpenVAS Security Scanner"
 msgstr "OpenVAS 安全扫描器的 GTK+-2 客户端"
 
-#: ../menu-data/openwalnut-qt4:openwalnut.desktop.in.h:1
-msgid "OpenWalnut"
-msgstr "OpenWalnut"
-
 #: ../menu-data/openyahtzee:openyahtzee.desktop.in.h:1
 msgid "Open Yahtzee"
 msgstr "开放式快艇游戏"
@@ -14179,12 +14757,12 @@
 "Scientific visualization and analysis software for atomistic simulation data."
 msgstr "用于原子模拟数据的科学可视化和分析软件。"
 
-#: ../menu-data/owncloud-client:owncloud-client.desktop.in.h:1
-msgid "ownCloud client"
+#: ../menu-data/owncloud-client:owncloud.desktop.in.h:1
+msgid "ownCloud desktop sync client "
 msgstr ""
 
-#: ../menu-data/owncloud-client:owncloud-client.desktop.in.h:2
-msgid "Sync client for ownCloud"
+#: ../menu-data/owncloud-client:owncloud.desktop.in.h:2
+msgid "Folder Sync"
 msgstr ""
 
 #: ../menu-data/pacemaker-mgmt-client:crm_gui.desktop.in.h:1
@@ -14227,14 +14805,6 @@
 msgid "An Applet for Quick Device Changing"
 msgstr ""
 
-#: ../menu-data/padre:padre.desktop.in.h:1
-msgid "Padre"
-msgstr "Padre"
-
-#: ../menu-data/padre:padre.desktop.in.h:2
-msgid "Perl Application Development and Refactoring Environment"
-msgstr "Perl 应用程序开发和重构环境"
-
 #: ../menu-data/pairs:kde4__pairs.desktop.in.h:1
 msgid "Pairs"
 msgstr ""
@@ -14371,6 +14941,14 @@
 msgid "a password manager"
 msgstr "一个密码管理器"
 
+#: ../menu-data/pasystray:pasystray.desktop.in.h:1
+msgid "PulseAudio System Tray"
+msgstr ""
+
+#: ../menu-data/pasystray:pasystray.desktop.in.h:2
+msgid "An Applet for PulseAudio"
+msgstr ""
+
 #: ../menu-data/patchage:patchage.desktop.in.h:1
 msgid "Patchage"
 msgstr "Patchage"
@@ -14598,8 +15176,8 @@
 msgstr "Pentobi"
 
 #: ../menu-data/pentobi:pentobi.desktop.in.h:2
-msgid "Computer program that plays the board game Blokus"
-msgstr "Blokus 棋类游戏程序"
+msgid "Computer opponent for the board game Blokus"
+msgstr ""
 
 #: ../menu-data/performous:performous.desktop.in.h:1
 msgid "Performous"
@@ -14756,6 +15334,14 @@
 msgid "Guide a horde of penguins through various obstacles"
 msgstr "引导企鹅部落通过各种障碍"
 
+#: ../menu-data/pink-pony:pink-pony.desktop.in.h:1
+msgid "Pink Pony"
+msgstr ""
+
+#: ../menu-data/pink-pony:pink-pony.desktop.in.h:2
+msgid "A Tron-like multiplayer racing game"
+msgstr ""
+
 #: ../menu-data/pinot:pinot.desktop.in.h:1
 msgid "Pinot Metasearch Tool"
 msgstr "Pinot 元数据搜素工具"
@@ -14820,6 +15406,66 @@
 msgid "Create an image consisting of many small images"
 msgstr "创建包含多个小图像的图像"
 
+#: ../menu-data/pixelmed-webstart-apps:ConvertAmicasJPEG2000FilesetToDicom.desktop.in.h:1
+msgid "ConvertAmicasJPEG2000FilesetToDicom"
+msgstr ""
+
+#: ../menu-data/pixelmed-webstart-apps:ConvertAmicasJPEG2000FilesetToDicom.desktop.in.h:2
+msgid "Convert Amicas JPEG2000 Fileset to Dicom."
+msgstr ""
+
+#: ../menu-data/pixelmed-webstart-apps:DicomCleaner.desktop.in.h:1
+msgid "DicomCleaner"
+msgstr ""
+
+#: ../menu-data/pixelmed-webstart-apps:DicomCleaner.desktop.in.h:2
+msgid ""
+"A simple application to query, retrieve, import, de-identify and remap UIDs "
+"and send DICOM instances."
+msgstr ""
+
+#: ../menu-data/pixelmed-webstart-apps:DicomImageBlackout.desktop.in.h:1
+msgid "DicomImageBlackout"
+msgstr ""
+
+#: ../menu-data/pixelmed-webstart-apps:DicomImageBlackout.desktop.in.h:2
+msgid "A simple DICOM image blackout tool."
+msgstr ""
+
+#: ../menu-data/pixelmed-webstart-apps:DicomImageViewer.desktop.in.h:1
+msgid "DicomImageViewer"
+msgstr ""
+
+#: ../menu-data/pixelmed-webstart-apps:DicomImageViewer.desktop.in.h:2
+msgid "A simple DICOM image and spectroscopy viewer."
+msgstr ""
+
+#: ../menu-data/pixelmed-webstart-apps:DoseUtility.desktop.in.h:1
+msgid "DoseUtility"
+msgstr ""
+
+#: ../menu-data/pixelmed-webstart-apps:DoseUtility.desktop.in.h:2
+msgid ""
+"A simple application to query, retrieve, import, and extract and report "
+"radiation dose information."
+msgstr ""
+
+#: ../menu-data/pixelmed-webstart-apps:MediaImporter.desktop.in.h:1
+msgid "MediaImporter"
+msgstr ""
+
+#: ../menu-data/pixelmed-webstart-apps:MediaImporter.desktop.in.h:2
+msgid "A simple media checker that searches for DICOMDIR and/or DICOM files."
+msgstr ""
+
+#: ../menu-data/pixelmed-webstart-apps:WatchFolderAndSend.desktop.in.h:1
+msgid "WatchFolderAndSend"
+msgstr ""
+
+#: ../menu-data/pixelmed-webstart-apps:WatchFolderAndSend.desktop.in.h:2
+msgid "WatchFolderAndSend Application."
+msgstr ""
+
 #: ../menu-data/pixfrogger:pixfrogger.desktop.in.h:1
 msgid "PIX Frogger"
 msgstr "PIX Frogger"
@@ -14856,19 +15502,8 @@
 msgid "Handle the tasks, resources, and cost of your projects"
 msgstr ""
 
-#: ../menu-data/plasma-active-data:kde4__active-about.desktop.in.h:2
-msgid "Information about Plasma Active"
-msgstr ""
-
-#: ../menu-data/plasma-active-data:kde4__widget-strip.desktop.in.h:1
-msgid "Widget Strip"
-msgstr "Widget Strip"
-
-#: ../menu-data/plasma-active-data:kde4__widget-strip.desktop.in.h:2
-msgid "A collection of widgets"
-msgstr "小部件的集合"
-
 #: ../menu-data/plasma-active-settings:kde4__active-settings.desktop.in.h:1
+#: ../menu-data/steam:steam.desktop.in.h:9
 msgid "Settings"
 msgstr "设置"
 
@@ -14885,6 +15520,10 @@
 msgid "A web browser reader for touch tablets"
 msgstr "用于平板电脑的浏览器"
 
+#: ../menu-data/plasma-active:kde4__active-about.desktop.in.h:2
+msgid "Information about Plasma Active"
+msgstr ""
+
 #: ../menu-data/plasma-active:kde4__active-alarms.desktop.in.h:1
 msgid "Alarms"
 msgstr ""
@@ -14913,14 +15552,30 @@
 msgid "An image viewer for touch tablets"
 msgstr "用于平板电脑的图像查看器"
 
-#: ../menu-data/plasma-mediacenter:kde4__plasma-mediacenter.desktop.in.h:1
-msgid "Plasma Media Center"
-msgstr ""
+#: ../menu-data/plasma-active:kde4__widget-strip.desktop.in.h:1
+msgid "Widget Strip"
+msgstr "Widget Strip"
+
+#: ../menu-data/plasma-active:kde4__widget-strip.desktop.in.h:2
+msgid "A collection of widgets"
+msgstr "小部件的集合"
+
+#: ../menu-data/plasma-mediacenter:kde4__plasma-mediacenter.desktop.in.h:1
+msgid "Plasma Media Center"
+msgstr ""
 
 #: ../menu-data/plasma-mediacenter:kde4__plasma-mediacenter.desktop.in.h:2
 msgid "A mediacenter user interface written with the Plasma framework"
 msgstr ""
 
+#: ../menu-data/plasma-nm:kde4__kde-nm-connection-editor.desktop.in.h:1
+msgid "kde-nm-connection-editor"
+msgstr ""
+
+#: ../menu-data/plasma-nm:kde4__kde-nm-connection-editor.desktop.in.h:2
+msgid "Edit your network connections"
+msgstr ""
+
 #: ../menu-data/plasma-scriptengine-superkaramba:kde4__superkaramba.desktop.in.h:1
 msgid "SuperKaramba"
 msgstr "SuperKaramba"
@@ -14945,6 +15600,14 @@
 msgid "Plasma Addon Creator"
 msgstr ""
 
+#: ../menu-data/plasmidomics:plasmidomics.desktop.in.h:1
+msgid "Plasmidomics"
+msgstr ""
+
+#: ../menu-data/plasmidomics:plasmidomics.desktop.in.h:2
+msgid "Tool for drawing of plasmids and vector maps"
+msgstr ""
+
 #: ../menu-data/playitslowly:playitslowly.desktop.in.h:1
 msgid "Play it Slowly"
 msgstr "慢速播放"
@@ -14969,6 +15632,14 @@
 msgid "Catch your son, he ate all the honey then ran away"
 msgstr "以小熊为主角的横版卷轴游戏"
 
+#: ../menu-data/plm:plm.desktop.in.h:1
+msgid "PLM"
+msgstr ""
+
+#: ../menu-data/plm:plm.desktop.in.h:2
+msgid "Learn programming interactively"
+msgstr ""
+
 #: ../menu-data/ploader:ploader.desktop.in.h:1
 msgid "pLoader"
 msgstr "pLoader"
@@ -15053,6 +15724,14 @@
 msgid "An easy-to-use personal database application"
 msgstr ""
 
+#: ../menu-data/postbooks-updater:postbooks-updater.desktop.in.h:1
+msgid "PostBooks Updater"
+msgstr ""
+
+#: ../menu-data/postbooks:postbooks.desktop.in.h:1
+msgid "PostBooks"
+msgstr ""
+
 #: ../menu-data/posterazor:posterazor.desktop.in.h:1
 msgid "PosteRazor"
 msgstr "PosteRazor"
@@ -15085,14 +15764,6 @@
 msgid "Play a vertical shoot 'em up game"
 msgstr "一个纵向射击游戏"
 
-#: ../menu-data/pptview:pptview.desktop.in.h:1
-msgid "View PowerPoint presentations"
-msgstr "查看 PowerPoint 演示文稿"
-
-#: ../menu-data/pptview:pptview.desktop.in.h:2
-msgid "PowerPoint Viewer"
-msgstr "PowerPoint 查看器"
-
 #: ../menu-data/pq:pq.desktop.in.h:1
 msgid "Progress Quest"
 msgstr "Progress Quest"
@@ -15109,6 +15780,14 @@
 msgid "Analyze, synthesize and manipulate speech"
 msgstr "分析、合成和处理语音"
 
+#: ../menu-data/prboom-plus:prboom-plus.desktop.in.h:1
+msgid "PrBoom+"
+msgstr ""
+
+#: ../menu-data/prboom-plus:prboom-plus.desktop.in.h:2
+msgid "enhanced clone of the classic first-person shooter Doom"
+msgstr ""
+
 #: ../menu-data/prefixsuffix:prefixsuffix.desktop.in.h:1
 msgid "PrefixSuffix"
 msgstr "PrefixSuffix"
@@ -15162,6 +15841,16 @@
 msgid "Captivating tile-clearing puzzle game"
 msgstr "精致的清除砖块益智游戏"
 
+#: ../menu-data/printer-driver-foo2zjs-common:hplj1020.desktop.in.h:1
+msgid "Reactivate HP LaserJet 1018/1020 after reloading paper"
+msgstr ""
+
+#: ../menu-data/printer-driver-foo2zjs-common:hplj1020.desktop.in.h:2
+msgid ""
+"Click the button in this program when your printer ran out of paper and you "
+"have refilled the paper"
+msgstr ""
+
 #: ../menu-data/project-x:projectx.desktop.in.h:1
 msgid "A video editing and demultiplexing tool"
 msgstr "视频编辑和多路分解工具"
@@ -15228,26 +15917,26 @@
 msgstr "Psensor 是一个Linux 上的图形界面温度监视器"
 
 #: ../menu-data/psi-plus-webkit:psi-plus-webkit.desktop.in.h:1
-msgid "Psi Plus Webkit"
-msgstr "Psi Plus Webkit"
+msgid "Psi+ Webkit"
+msgstr ""
 
 #: ../menu-data/psi-plus-webkit:psi-plus-webkit.desktop.in.h:2
-#: ../menu-data/psi:psi.desktop.in.h:2
-msgid "Communicate over the Jabber network"
-msgstr "通过 Jabber 网络进行交流"
+#: ../menu-data/psi-plus:psi-plus.desktop.in.h:2
+msgid "Communicate over the XMPP network"
+msgstr ""
 
 #: ../menu-data/psi-plus:psi-plus.desktop.in.h:1
 msgid "Psi+"
 msgstr "Psi+"
 
-#: ../menu-data/psi-plus:psi-plus.desktop.in.h:2
-msgid "Communicate over the XMPP network"
-msgstr ""
-
 #: ../menu-data/psi:psi.desktop.in.h:1
 msgid "Psi"
 msgstr "Psi"
 
+#: ../menu-data/psi:psi.desktop.in.h:2
+msgid "Communicate over the Jabber network"
+msgstr "通过 Jabber 网络进行交流"
+
 #: ../menu-data/pspp:pspp.desktop.in.h:1
 msgid "GNU PSPP"
 msgstr "GNU PSPP"
@@ -15280,6 +15969,10 @@
 msgid "Audio Tag Editor"
 msgstr "音频标签编辑器"
 
+#: ../menu-data/pumpa:pumpa.desktop.in.h:1
+msgid "Pumpa"
+msgstr ""
+
 #: ../menu-data/pureadmin:pureadmin.desktop.in.h:1
 msgid "PureAdmin"
 msgstr "PureAdmin"
@@ -15342,13 +16035,13 @@
 msgid "Python Programs"
 msgstr ""
 
-#: ../menu-data/pygmy:pygmy.desktop.in.h:1
-msgid "Pygmy"
-msgstr "Pygmy"
-
-#: ../menu-data/pygmy:pygmy.desktop.in.h:2
-msgid "GTK+ MPD client"
-msgstr "GTK+ MPD 客户端"
+#: ../menu-data/pycorrfit:pycorrfit.desktop.in.h:1
+msgid "PyCorrFit"
+msgstr ""
+
+#: ../menu-data/pycorrfit:pycorrfit.desktop.in.h:2
+msgid "FCS Data Analysis"
+msgstr ""
 
 #: ../menu-data/pyhoca-gui:pyhoca-gui.desktop.in.h:1
 msgid "PyHoca-GUI"
@@ -15374,6 +16067,14 @@
 msgid "Universal karaoke songs and movies player"
 msgstr "通用卡拉 OK 歌曲和电影播放器"
 
+#: ../menu-data/pylang:pylang.desktop.in.h:1
+msgid "Practice Languages"
+msgstr ""
+
+#: ../menu-data/pylang:pylang.desktop.in.h:2
+msgid "Complete the right sentence with random words in English, Spanish..."
+msgstr ""
+
 #: ../menu-data/pymca:edfviewer.desktop.in.h:1
 msgid "EDFviewer"
 msgstr "EDFviewer"
@@ -15522,6 +16223,14 @@
 msgid "A classical game of words"
 msgstr "一个经典的单词游戏"
 
+#: ../menu-data/pysiogame:pysiogame.desktop.in.h:1
+msgid "pySioGame"
+msgstr ""
+
+#: ../menu-data/pysiogame:pysiogame.desktop.in.h:2
+msgid "A little set of educational apps for kids"
+msgstr ""
+
 #: ../menu-data/pysolfc:pysol.desktop.in.h:1
 msgid "PySol Fan Club Edition"
 msgstr "PySol 牌类游戏大全"
@@ -15615,6 +16324,18 @@
 msgid "Interactive tool to track moving points in video framesets"
 msgstr "在视频框架中跟踪移动点的交互式工具"
 
+#: ../menu-data/python-nxt-filer:python-nxt-filer.desktop.in.h:1
+msgid "NXT filer"
+msgstr ""
+
+#: ../menu-data/python-nxt-filer:python-nxt-filer.desktop.in.h:2
+msgid "Lego Mindstorm NXT file viewer"
+msgstr ""
+
+#: ../menu-data/python-pyo:E-Pyo.desktop.in.h:1
+msgid "E-Pyo"
+msgstr ""
+
 #: ../menu-data/python-sqlkit:sqlkit.desktop.in.h:1
 msgid "sqledit"
 msgstr ""
@@ -15636,10 +16357,12 @@
 msgstr "python-whiteboard"
 
 #: ../menu-data/python-windowmocker:window-mocker.desktop.in.h:1
+#: ../menu-data/python3-windowmocker:window-mocker3.desktop.in.h:1
 msgid "Window Mocker"
 msgstr ""
 
 #: ../menu-data/python-windowmocker:window-mocker.desktop.in.h:2
+#: ../menu-data/python3-windowmocker:window-mocker3.desktop.in.h:2
 msgid "Create windows according to a specification"
 msgstr ""
 
@@ -15659,6 +16382,14 @@
 msgid "Python Interpreter (v3.3)"
 msgstr ""
 
+#: ../menu-data/python3.4:python3.4.desktop.in.h:1
+msgid "Python (v3.4)"
+msgstr ""
+
+#: ../menu-data/python3.4:python3.4.desktop.in.h:2
+msgid "Python Interpreter (v3.4)"
+msgstr ""
+
 #: ../menu-data/pythoncad:pythoncad.desktop.in.h:1
 msgid "PyCAD"
 msgstr "PyCAD"
@@ -15676,8 +16407,8 @@
 msgstr "自由的运动训练中心"
 
 #: ../menu-data/q4wine:q4wine.desktop.in.h:1
-msgid "Qt4 utility for Wine applications and prefixes management."
-msgstr "用于 Wine 应用程序和前缀管理的 Qt4 实用程序。"
+msgid "utility for Wine applications and prefixes management."
+msgstr ""
 
 #: ../menu-data/q4wine:q4wine.desktop.in.h:2
 msgid "Q4Wine"
@@ -15797,13 +16528,13 @@
 msgid "ID-card Utility"
 msgstr "ID 卡实用工具"
 
-#: ../menu-data/qgis:qgis.desktop.in.h:1
-msgid "Quantum GIS"
-msgstr "量子 GIS"
+#: ../menu-data/qgis:qbrowser.desktop.in.h:1
+msgid "QGIS Browser"
+msgstr ""
 
-#: ../menu-data/qgis:qgis.desktop.in.h:2
-msgid "Geographical Information System"
-msgstr "桌面地理信息系统"
+#: ../menu-data/qgis:qgis.desktop.in.h:1
+msgid "QGIS Desktop"
+msgstr ""
 
 #: ../menu-data/qgit:qgit.desktop.in.h:1
 msgid "qgit"
@@ -15845,6 +16576,14 @@
 msgid "A simple Jack recorder"
 msgstr ""
 
+#: ../menu-data/qjoypad:kde4__qjoypad.desktop.in.h:1
+msgid "QJoyPad"
+msgstr ""
+
+#: ../menu-data/qjoypad:kde4__qjoypad.desktop.in.h:2
+msgid "Trigger keystrokes and mouse actions with gamepads/joysticks"
+msgstr ""
+
 #: ../menu-data/qlandkartegt:qlandkartegt.desktop.in.h:1
 msgid "QLandkarteGT"
 msgstr "QLandkarteGT"
@@ -15928,6 +16667,14 @@
 msgid "A tabbed PDF viewer using the poppler library."
 msgstr ""
 
+#: ../menu-data/qpdfview:qpdfview.desktop.in.h:3
+msgid "Choose instance"
+msgstr ""
+
+#: ../menu-data/qpdfview:qpdfview.desktop.in.h:4
+msgid "Non-unique instance"
+msgstr ""
+
 #: ../menu-data/qprogram-starter:qprogram-starter.desktop.in.h:1
 msgid "qprogram-starter"
 msgstr "qprogram 启动程序"
@@ -15940,6 +16687,42 @@
 msgid "CD/DVD media quality checker"
 msgstr "CD/DVD 媒体质量检查程序"
 
+#: ../menu-data/qreator:qreator.desktop.in.h:1
+msgid "Qreator"
+msgstr ""
+
+#: ../menu-data/qreator:qreator.desktop.in.h:2
+msgid "Create your own QR codes"
+msgstr ""
+
+#: ../menu-data/qreator:qreator.desktop.in.h:3
+msgid "New QR code for URL"
+msgstr ""
+
+#: ../menu-data/qreator:qreator.desktop.in.h:4
+msgid "New QR code for Text"
+msgstr ""
+
+#: ../menu-data/qreator:qreator.desktop.in.h:5
+msgid "New QR code for Location"
+msgstr ""
+
+#: ../menu-data/qreator:qreator.desktop.in.h:6
+msgid "New QR code for WiFi network"
+msgstr ""
+
+#: ../menu-data/qreator:qreator.desktop.in.h:7
+msgid "New QR code for a Software Center app"
+msgstr ""
+
+#: ../menu-data/qreator:qreator.desktop.in.h:8
+msgid "New QR code for a Business card"
+msgstr ""
+
+#: ../menu-data/qreator:qreator.desktop.in.h:9
+msgid "New QR code for a Call or text message"
+msgstr ""
+
 #: ../menu-data/qrfcview:qrfcview.desktop.in.h:1
 msgid "qRFCView"
 msgstr "qRFCView"
@@ -16151,6 +16934,15 @@
 msgid "Fit falling blocks together"
 msgstr "将下落的方块组合在一起"
 
+#: ../menu-data/quake2:quake2.desktop.in.h:1
+msgid "Quake II"
+msgstr ""
+
+#: ../menu-data/quake2:quake2.desktop.in.h:2
+#: ../menu-data/quake:quake.desktop.in.h:2
+msgid "Classic first person shooter"
+msgstr "经典第一人称射击游戏"
+
 #: ../menu-data/quake3:quake3.desktop.in.h:1
 msgid "Quake III Arena"
 msgstr "雷神之锤三：竞技场"
@@ -16179,10 +16971,6 @@
 msgid "Quake"
 msgstr "雷神之锤"
 
-#: ../menu-data/quake:quake.desktop.in.h:2
-msgid "Classic first person shooter"
-msgstr "经典第一人称射击游戏"
-
 #: ../menu-data/quarry:quarry.desktop.in.h:1
 msgid "Quarry"
 msgstr "Quarry"
@@ -16232,6 +17020,14 @@
 msgid "Simple counter showing your gains since you quit smoking"
 msgstr "一个显示您戒烟以来省下了多少开支的简单统计程序"
 
+#: ../menu-data/quiterss:quiterss.desktop.in.h:1
+msgid "QuiteRSS"
+msgstr ""
+
+#: ../menu-data/quiterss:quiterss.desktop.in.h:2
+msgid "QuiteRSS is a RSS/Atom feed reader written in C++/Qt4"
+msgstr ""
+
 #: ../menu-data/quodlibet:quodlibet.desktop.in.h:1
 msgid "Quod Libet"
 msgstr "Quod Libet"
@@ -16279,8 +17075,8 @@
 msgstr "通过即时消息交流"
 
 #: ../menu-data/qv4l2:qv4l2.desktop.in.h:1
-msgid "QT V4L2 test Utility"
-msgstr "QT V4L2 测试实用工具"
+msgid "Qt V4L2 test Utility"
+msgstr ""
 
 #: ../menu-data/qv4l2:qv4l2.desktop.in.h:2
 msgid "Allow testing Video4Linux devices"
@@ -16499,14 +17295,6 @@
 msgid "Configure Razor-Qt session module"
 msgstr ""
 
-#: ../menu-data/rbbr:rbbr.desktop.in.h:1
-msgid "Ruby Browser"
-msgstr "Ruby 浏览器"
-
-#: ../menu-data/rbbr:rbbr.desktop.in.h:2
-msgid "Browse Ruby Classes and Modules"
-msgstr "浏览 Ruby 类和模块"
-
 #: ../menu-data/rdsconsole:rdsconsole.desktop.in.h:1
 msgid "Resara Server Admin Console"
 msgstr ""
@@ -16548,6 +17336,14 @@
 msgid "Daily journal with calendar, templates and keyword searching "
 msgstr "带有日历、模板和关键字搜索的日记程序 "
 
+#: ../menu-data/redshift-gtk:redshift-gtk.desktop.in.h:1
+msgid "Redshift"
+msgstr "红移"
+
+#: ../menu-data/redshift-gtk:redshift-gtk.desktop.in.h:2
+msgid "Color temperature adjustment tool"
+msgstr "色温调整工具"
+
 #: ../menu-data/referencer:referencer.desktop.in.h:1
 msgid "Referencer"
 msgstr "Referencer"
@@ -16773,6 +17569,22 @@
 msgid "allow you to cut graphics with a Graphtec plotters"
 msgstr "使您可以用 Graphtec 绘图仪分割图形"
 
+#: ../menu-data/robojournal:robojournal.desktop.in.h:1
+msgid "RoboJournal"
+msgstr ""
+
+#: ../menu-data/robojournal:robojournal.desktop.in.h:2
+msgid "Keep a journal/diary of day-to-day events in your life."
+msgstr ""
+
+#: ../menu-data/rockdodger:rockdodger.desktop.in.h:1
+msgid "Addictive rock-dodging greeblie-killing platform game"
+msgstr ""
+
+#: ../menu-data/rockdodger:rockdodger.desktop.in.h:2
+msgid "Rock Dodger"
+msgstr ""
+
 #: ../menu-data/rocs:kde4__rocs.desktop.in.h:1
 msgid "Rocs"
 msgstr "Rocs"
@@ -16843,6 +17655,18 @@
 msgid "Manage your wireless network interfaces"
 msgstr "管理您的无线网络接口"
 
+#: ../menu-data/rxvt-unicode-256color:rxvt-unicode.desktop.in.h:1
+#: ../menu-data/rxvt-unicode-lite:rxvt-unicode.desktop.in.h:1
+#: ../menu-data/rxvt-unicode:rxvt-unicode.desktop.in.h:1
+msgid "Rxvt Color Unicode Terminal"
+msgstr ""
+
+#: ../menu-data/rxvt-unicode-256color:rxvt-unicode.desktop.in.h:3
+#: ../menu-data/rxvt-unicode-lite:rxvt-unicode.desktop.in.h:3
+#: ../menu-data/rxvt-unicode:rxvt-unicode.desktop.in.h:3
+msgid "New Rxvt Color Unicode Terminal"
+msgstr ""
+
 #: ../menu-data/rygel:rygel.desktop.in.h:1
 msgid "Rygel"
 msgstr "Rygel"
@@ -16863,13 +17687,13 @@
 msgid "Sadms"
 msgstr "Sadms"
 
-#: ../menu-data/saga:saga_gui.desktop.in.h:1
+#: ../menu-data/saga:saga.desktop.in.h:1
 msgid "SAGA GIS"
 msgstr "SAGA GIS"
 
-#: ../menu-data/saga:saga_gui.desktop.in.h:2
-msgid "View and manipulate geographical information"
-msgstr "查看和编辑地理信息"
+#: ../menu-data/saga:saga.desktop.in.h:2
+msgid "Geodata Processing and Analysis"
+msgstr ""
 
 #: ../menu-data/sagasu:sagasu.desktop.in.h:1
 msgid "Sagasu"
@@ -17082,6 +17906,14 @@
 msgid "Multiplatform basic interpreter for the development of videogames"
 msgstr "用于开发视频游戏的多平台基本解释器程序"
 
+#: ../menu-data/seahorse-adventures:seahorse-adventures.desktop.in.h:1
+msgid "Seahorse Adventures"
+msgstr ""
+
+#: ../menu-data/seahorse-adventures:seahorse-adventures.desktop.in.h:2
+msgid "Help Barbie the seahorse float on bubbles to the moon"
+msgstr ""
+
 #: ../menu-data/seahorse-nautilus:seahorse-pgp-encrypted.desktop.in.h:1
 msgid "Decrypt File"
 msgstr "解密文件"
@@ -17111,8 +17943,8 @@
 msgstr "Searchmonkey"
 
 #: ../menu-data/searchmonkey:searchmonkey.desktop.in.h:2
-msgid "Regular expression power search utilty"
-msgstr "强大的正则表达式搜索工具"
+msgid "Regular expression power search utility"
+msgstr ""
 
 #: ../menu-data/seaview:seaview.desktop.in.h:1
 msgid "SeaView"
@@ -17131,6 +17963,14 @@
 msgid "A graphical user interface for SSH and SCP"
 msgstr "SSH 和 SCP 的一个图形用户界面"
 
+#: ../menu-data/seetxt:seetxt.desktop.in.h:1
+msgid "Seetxt"
+msgstr ""
+
+#: ../menu-data/seetxt:seetxt.desktop.in.h:2
+msgid "Lightweight text file and man page viewer"
+msgstr ""
+
 #: ../menu-data/semantik:kde4__semantik.desktop.in.h:1
 msgid "Semantik"
 msgstr "Semantik"
@@ -17176,9 +18016,14 @@
 msgstr "SFLphone VoIP 客户端"
 
 #: ../menu-data/sflphone-gnome:sflphone.desktop.in.h:2
+#: ../menu-data/sflphone-kde:kde4__sflphone-client-kde.desktop.in.h:2
 msgid "Call and receive calls with SIP or IAX protocols"
 msgstr "使用 SIP 或 IAX 协议拨打和接听电话"
 
+#: ../menu-data/sflphone-kde:kde4__sflphone-client-kde.desktop.in.h:1
+msgid "SFLphone VoIP KDE4 client"
+msgstr ""
+
 #: ../menu-data/sgt-puzzles:sgt-blackbox.desktop.in.h:1
 msgid "Black Box"
 msgstr "黑盒"
@@ -17494,14 +18339,6 @@
 msgid "Shisen"
 msgstr "Shisen"
 
-#: ../menu-data/shoes:shoes.desktop.in.h:1
-msgid "Shoes"
-msgstr "Shoes"
-
-#: ../menu-data/shoes:shoes.desktop.in.h:2
-msgid "Interpreter for Shoes programs"
-msgstr "Shoes 图形界面工具箱解释器"
-
 #: ../menu-data/shotwell-common:shotwell-viewer.desktop.in.h:1
 msgid "Photo Viewer"
 msgstr ""
@@ -17539,18 +18376,22 @@
 msgstr "获取、编辑和共享截图"
 
 #: ../menu-data/shutter:shutter.desktop.in.h:3
+msgid "Redo last screenshot"
+msgstr ""
+
+#: ../menu-data/shutter:shutter.desktop.in.h:4
 msgid "Capture an area of the screen"
 msgstr "截取屏幕的某个区域"
 
-#: ../menu-data/shutter:shutter.desktop.in.h:4
+#: ../menu-data/shutter:shutter.desktop.in.h:5
 msgid "Capture the entire screen"
 msgstr "截取整个屏幕"
 
-#: ../menu-data/shutter:shutter.desktop.in.h:5
+#: ../menu-data/shutter:shutter.desktop.in.h:6
 msgid "Select a window to capture"
 msgstr "选择要截取的窗口"
 
-#: ../menu-data/shutter:shutter.desktop.in.h:6
+#: ../menu-data/shutter:shutter.desktop.in.h:7
 msgid "Capture the current active window"
 msgstr "截取当前活动窗口"
 
@@ -17651,6 +18492,14 @@
 msgid "Scan Documents"
 msgstr "扫描文档"
 
+#: ../menu-data/simpleburn:simpleburn.desktop.in.h:1
+msgid "SimpleBurn"
+msgstr ""
+
+#: ../menu-data/simpleburn:simpleburn.desktop.in.h:2
+msgid "CD / DVD burning and extraction"
+msgstr ""
+
 #: ../menu-data/simutrans:simutrans.desktop.in.h:1
 msgid "Simutrans"
 msgstr ""
@@ -17863,6 +18712,14 @@
 msgid "SMPlayer"
 msgstr "SMPlayer"
 
+#: ../menu-data/smtube:smtube.desktop.in.h:1
+msgid "Search and download videos from YouTube"
+msgstr ""
+
+#: ../menu-data/smtube:smtube.desktop.in.h:2
+msgid "SMPlayer YouTube Browser"
+msgstr ""
+
 #: ../menu-data/smuxi-frontend-gnome:smuxi-frontend-gnome.desktop.in.h:1
 msgid "Smuxi IRC Client"
 msgstr "Smuxi IRC 客户端"
@@ -17966,6 +18823,10 @@
 msgid "SooperLooper"
 msgstr "SooperLooper"
 
+#: ../menu-data/sooperlooper:sooperlooper.desktop.in.h:2
+msgid "Looping Sampler"
+msgstr ""
+
 #: ../menu-data/sopwith:sopwith.desktop.in.h:1
 msgid "Sopwith"
 msgstr "Sopwith"
@@ -18006,6 +18867,31 @@
 msgid "Develop, modify or debug a source-highlight definition file"
 msgstr "开发、修改或调试源代码高亮显示定义文件"
 
+#: ../menu-data/spacefm-gtk3:spacefm-find.desktop.in.h:1
+#: ../menu-data/spacefm:spacefm-find.desktop.in.h:1
+msgid "SpaceFM File Search"
+msgstr ""
+
+#: ../menu-data/spacefm-gtk3:spacefm-find.desktop.in.h:2
+#: ../menu-data/spacefm:spacefm-find.desktop.in.h:2
+msgid "Search for files and folders"
+msgstr ""
+
+#: ../menu-data/spacefm-gtk3:spacefm-folder-handler.desktop.in.h:1
+#: ../menu-data/spacefm:spacefm-folder-handler.desktop.in.h:1
+msgid "SpaceFM Open Folder"
+msgstr ""
+
+#: ../menu-data/spacefm-gtk3:spacefm-folder-handler.desktop.in.h:2
+#: ../menu-data/spacefm:spacefm-folder-handler.desktop.in.h:2
+msgid "Open folder"
+msgstr ""
+
+#: ../menu-data/spacefm-gtk3:spacefm.desktop.in.h:1
+#: ../menu-data/spacefm:spacefm.desktop.in.h:1
+msgid "SpaceFM"
+msgstr ""
+
 #: ../menu-data/spacezero:spacezero.desktop.in.h:1
 msgid "Spacezero"
 msgstr "Spacezero"
@@ -18150,14 +19036,6 @@
 msgid "Squeak"
 msgstr "Squeak"
 
-#: ../menu-data/squeeze:squeeze.desktop.in.h:1
-msgid "Squeeze"
-msgstr "Squeeze"
-
-#: ../menu-data/squeeze:squeeze.desktop.in.h:2
-msgid "Xfce archive manager"
-msgstr "Xfce 归档管理器"
-
 #. appear in desktop menus (once they are updated; e.g. update-menus command).
 #: ../menu-data/ssvnc:ssvnc.desktop.in.h:2
 msgid "SSL/SSH VNC Viewer"
@@ -18199,6 +19077,42 @@
 msgid "Steadyflow Download Manager"
 msgstr "Steadyflow 下载管理器"
 
+#: ../menu-data/steam:steam.desktop.in.h:1
+msgid "Steam"
+msgstr ""
+
+#: ../menu-data/steam:steam.desktop.in.h:2
+msgid "Application for managing and playing games on Steam"
+msgstr ""
+
+#: ../menu-data/steam:steam.desktop.in.h:3
+msgid "Store"
+msgstr ""
+
+#: ../menu-data/steam:steam.desktop.in.h:4
+msgid "Community"
+msgstr ""
+
+#: ../menu-data/steam:steam.desktop.in.h:5
+msgid "Library"
+msgstr ""
+
+#: ../menu-data/steam:steam.desktop.in.h:6
+msgid "Servers"
+msgstr ""
+
+#: ../menu-data/steam:steam.desktop.in.h:7
+msgid "Screenshots"
+msgstr ""
+
+#: ../menu-data/steam:steam.desktop.in.h:8
+msgid "News"
+msgstr ""
+
+#: ../menu-data/steam:steam.desktop.in.h:10
+msgid "Big Picture"
+msgstr ""
+
 #: ../menu-data/stella:stella.desktop.in.h:1
 msgid "Stella"
 msgstr "Stella"
@@ -18337,10 +19251,12 @@
 msgstr "一个基于 GStreamer 和 Gtk+ 的字幕编辑器"
 
 #: ../menu-data/sugar-emulator-0.96:sugar-emulator.desktop.in.h:1
+#: ../menu-data/sugar-emulator-0.98:sugar-emulator.desktop.in.h:1
 msgid "Sugar"
 msgstr "Sugar"
 
 #: ../menu-data/sugar-emulator-0.96:sugar-emulator.desktop.in.h:2
+#: ../menu-data/sugar-emulator-0.98:sugar-emulator.desktop.in.h:2
 msgid "The emulator for the Sugar Desktop Environment"
 msgstr "Sugar 桌面环境模拟器"
 
@@ -18368,6 +19284,10 @@
 msgid "Emacs environment for SuperCollider"
 msgstr "SuperCollide 的 Emacs 环境"
 
+#: ../menu-data/supercollider-ide:SuperColliderIDE.desktop.in.h:1
+msgid "SuperCollider IDE"
+msgstr ""
+
 #: ../menu-data/supercollider-vim:scvim.desktop.in.h:1
 msgid "SuperCollider Vim"
 msgstr "SuperCollider Vim"
@@ -18477,8 +19397,10 @@
 msgstr "Sweet Home 3D"
 
 #: ../menu-data/sweethome3d:sweethome3d.desktop.in.h:2
-msgid "Interior 2D design application with 3D preview"
-msgstr "具有 3D 预览的室内 2D 设计应用程序"
+msgid ""
+"Interior design Java application for quickly choosing and placing furniture "
+"on a house 2D plan drawn by the end-user with a 3D preview"
+msgstr ""
 
 #: ../menu-data/swell-foop:swell-foop.desktop.in.h:1
 msgid "Swell Foop"
@@ -18512,14 +19434,6 @@
 msgid "E-Mail client"
 msgstr "轻量级电子邮件客户端"
 
-#: ../menu-data/synapse:synapse.desktop.in.h:1
-msgid "Synapse"
-msgstr "Synapse"
-
-#: ../menu-data/synapse:synapse.desktop.in.h:2
-msgid "Search everything you do."
-msgstr "搜索你所做的一切。"
-
 #: ../menu-data/synaptic:synaptic.desktop.in.h:1
 msgid "Synaptic Package Manager"
 msgstr "新立得软件包管理器"
@@ -18589,14 +19503,6 @@
 msgid "A system-wide linux profiler"
 msgstr "系统级信息分析器"
 
-#: ../menu-data/system-config-cluster:system-config-cluster.desktop.in.h:1
-msgid "Cluster Management"
-msgstr "群集管理"
-
-#: ../menu-data/system-config-cluster:system-config-cluster.desktop.in.h:2
-msgid "Configure and manage clusters in a graphical setting"
-msgstr "使用图形界面配置并管理群集"
-
 #: ../menu-data/system-config-date:system-config-date.desktop.in.h:1
 msgid "Date & Time"
 msgstr "日期和时间"
@@ -18641,6 +19547,12 @@
 msgid "KDE System Settings"
 msgstr "KDE 系统设置"
 
+#: ../menu-data/systemsettings:kde4__systemsettings.desktop.in.h:1
+#: ../menu-data/ubuntu-system-settings:ubuntu-system-settings.desktop.in.h:1
+#: ../menu-data/unity-control-center:unity-control-center.desktop.in.h:1
+msgid "System Settings"
+msgstr "系统设置"
+
 #: ../menu-data/tagainijisho:tagainijisho.desktop.in.h:1
 msgid "Tagaini Jisho"
 msgstr "Tagaini Jisho"
@@ -18657,6 +19569,14 @@
 msgid "MP3 and Ogg Vorbis tag editor"
 msgstr "MP3 和 Ogg Vorbis 标签编辑器"
 
+#: ../menu-data/tagua:kde4__tagua.desktop.in.h:1
+msgid "Tagua"
+msgstr "Tagua"
+
+#: ../menu-data/tagua:kde4__tagua.desktop.in.h:2
+msgid "A generic board game application."
+msgstr "通用棋盘游戏应用程序。"
+
 #: ../menu-data/tali:gtali.desktop.in.h:1
 msgid "Tali"
 msgstr "掷骰子"
@@ -18689,6 +19609,14 @@
 msgid "Single player variant of Boggle"
 msgstr "Boggle 游戏的单玩家模式克隆版本"
 
+#: ../menu-data/taskcoach:taskcoach.desktop.in.h:1
+msgid "Task Coach"
+msgstr ""
+
+#: ../menu-data/taskcoach:taskcoach.desktop.in.h:2
+msgid "Your friendly task manager"
+msgstr ""
+
 #: ../menu-data/tasks-mobile:kde4__tasks-mobile.desktop.in.h:1
 msgid "Tasks"
 msgstr "任务"
@@ -18757,14 +19685,6 @@
 msgid "Text editor with hundreds of functions"
 msgstr "有上百种功能的文本编辑器"
 
-#: ../menu-data/teamspeak-client:teamspeak.desktop.in.h:1
-msgid "TeamSpeak"
-msgstr "TeamSpeak"
-
-#: ../menu-data/teamspeak-client:teamspeak.desktop.in.h:2
-msgid "VoIP chat for online gaming"
-msgstr "网络游戏的 IP 电话聊天室"
-
 #: ../menu-data/tecnoballz:tecnoballz.desktop.in.h:1
 msgid "TecnoballZ"
 msgstr ""
@@ -18813,13 +19733,13 @@
 msgid "Viewer for Teletext pages"
 msgstr "图文页面浏览器"
 
-#: ../menu-data/teleport:teleport.desktop.in.h:1
-msgid "Teleport"
-msgstr "Teleport"
-
-#: ../menu-data/teleport:teleport.desktop.in.h:2
-msgid "Move applications between displays"
-msgstr "将应用程序在多个显示器之间移动"
+#: ../menu-data/telephony-service:telephony-service-call.desktop.in.h:1
+msgid "Phone Calls"
+msgstr ""
+
+#: ../menu-data/telephony-service:telephony-service-sms.desktop.in.h:1
+msgid "SMS"
+msgstr ""
 
 #: ../menu-data/tellico:kde4__tellico.desktop.in.h:1
 msgid "A collection manager"
@@ -19043,12 +19963,20 @@
 msgid "Tile map editor"
 msgstr ""
 
+#: ../menu-data/tilem:tilem2.desktop.in.h:1
+msgid "TilEm"
+msgstr ""
+
+#: ../menu-data/tilem:tilem2.desktop.in.h:2
+msgid "Graphing calculator emulator"
+msgstr ""
+
 #: ../menu-data/tilp2:tilp.desktop.in.h:1
 msgid "TILP"
 msgstr ""
 
 #: ../menu-data/tilp2:tilp.desktop.in.h:2
-msgid "TI Linking Program"
+msgid "TI Calculators Linking Program"
 msgstr ""
 
 #: ../menu-data/timemachine:timemachine.desktop.in.h:1
@@ -19120,7 +20048,7 @@
 msgstr ""
 
 #: ../menu-data/tomahawk:tomahawk.desktop.in.h:2
-msgid "Tomahawk - Social Music Player"
+msgid "Tomahawk — Social Music Player"
 msgstr ""
 
 #: ../menu-data/tomatoes:tomatoes.desktop.in.h:1
@@ -19143,6 +20071,19 @@
 msgid "Toonloop Live Animation Editor"
 msgstr "Toonloop 即时动画编辑器"
 
+#: ../menu-data/topp:TOPPAS.desktop.in.h:1
+msgid "TOPPAS"
+msgstr ""
+
+#: ../menu-data/topp:TOPPAS.desktop.in.h:2
+#: ../menu-data/topp:TOPPView.desktop.in.h:2
+msgid "viewer for mass spectrometry data"
+msgstr ""
+
+#: ../menu-data/topp:TOPPView.desktop.in.h:1
+msgid "TOPPView"
+msgstr ""
+
 #: ../menu-data/toppler:toppler.desktop.in.h:1
 msgid "Tower Toppler"
 msgstr "Tower Toppler"
@@ -19175,11 +20116,11 @@
 msgid "3D racing cars simulator game"
 msgstr "3D 赛车模拟游戏"
 
-#: ../menu-data/tortoisehg:tortoisehg.desktop.in.h:1
+#: ../menu-data/tortoisehg:thg.desktop.in.h:1
 msgid "TortoiseHg"
 msgstr ""
 
-#: ../menu-data/tortoisehg:tortoisehg.desktop.in.h:2
+#: ../menu-data/tortoisehg:thg.desktop.in.h:2
 msgid "GUI application for using Mercurial"
 msgstr ""
 
@@ -19285,6 +20226,14 @@
 msgid "Start Transmission Minimized"
 msgstr "启动 Transmission 时自动最小化"
 
+#: ../menu-data/transmission-remote-gtk:transmission-remote-gtk.desktop.in.h:1
+msgid "Transmission Remote"
+msgstr ""
+
+#: ../menu-data/transmission-remote-gtk:transmission-remote-gtk.desktop.in.h:2
+msgid "Remotely manage the Transmission BitTorrent client"
+msgstr ""
+
 #: ../menu-data/traverso:traverso.desktop.in.h:1
 msgid "Multitrack Recorder"
 msgstr "多声道录音机"
@@ -19310,14 +20259,6 @@
 "Displays, modifies, prints and exports in SVG format phylogenetic trees"
 msgstr "以 SVG 格式显示、修改、打印和导出进化树图案"
 
-#: ../menu-data/tribler:swarmplayer.desktop.in.h:1
-msgid "SwarmPlayer"
-msgstr ""
-
-#: ../menu-data/tribler:swarmplayer.desktop.in.h:2
-msgid "Bittorrent Video-On-Demand / Live streaming client"
-msgstr ""
-
 #: ../menu-data/tribler:tribler.desktop.in.h:1
 msgid "Tribler"
 msgstr ""
@@ -19467,8 +20408,8 @@
 msgstr "Turpial"
 
 #: ../menu-data/turpial:turpial.desktop.in.h:2
-msgid "Twitter client written in Python"
-msgstr "Python 编写的推特客户"
+msgid "A light, beautiful and functional microblogging client"
+msgstr ""
 
 #: ../menu-data/turtleart:turtleart.desktop.in.h:1
 msgid "TurtleArt"
@@ -19558,6 +20499,14 @@
 msgid "World Clock and CW ID for Ham Radio Operators"
 msgstr "业余无线电操作爱好者的世界时钟和 CW ID 工具"
 
+#: ../menu-data/twinkle:twinkle.desktop.in.h:1
+msgid "Twinkle"
+msgstr "Twinkle"
+
+#: ../menu-data/twinkle:twinkle.desktop.in.h:2
+msgid "A SIP softphone"
+msgstr "一个 SIP 软电话"
+
 #: ../menu-data/tworld:tworld.desktop.in.h:1
 msgid "Tile World"
 msgstr "瓷片世界"
@@ -19578,13 +20527,17 @@
 msgid "Read text novels and more"
 msgstr "阅读文字小说和其他内容"
 
-#: ../menu-data/uae:uae.desktop.in.h:1
-msgid "UAE"
-msgstr "UAE"
-
-#: ../menu-data/uae:uae.desktop.in.h:2
-msgid "UAE Amiga emulator"
-msgstr "UAE Amiga 模拟器"
+#: ../menu-data/typecatcher:typecatcher.desktop.in.h:1
+msgid "TypeCatcher"
+msgstr ""
+
+#: ../menu-data/typecatcher:typecatcher.desktop.in.h:2
+msgid "Download Google webfonts for off-line use"
+msgstr ""
+
+#: ../menu-data/ubuntu-html5-ui-toolkit-examples:ubuntu-html5-ui-gallery.desktop.in.h:1
+msgid "Ubuntu HTML5 UI Gallery"
+msgstr ""
 
 #: ../menu-data/ubuntu-online-tour:ubuntu-online-tour.desktop.in.h:1
 msgid "Ubuntu Tour"
@@ -19594,22 +20547,26 @@
 msgid "Experience Ubuntu in your web browser"
 msgstr ""
 
+#: ../menu-data/ubuntu-system-settings-online-accounts:online-accounts-ui.desktop.in.h:1
+#: ../menu-data/unity-control-center-signon:credentials-preferences.desktop.in.h:1
+#: ../menu-data/unity-control-center-signon:unity-credentials-panel.desktop.in.h:1
+msgid "Online Accounts"
+msgstr ""
+
+#: ../menu-data/ubuntu-system-settings-online-accounts:online-accounts-ui.desktop.in.h:2
+msgid "Create and edit Online Accounts"
+msgstr ""
+
 #: ../menu-data/ubuntu-ui-toolkit-examples:calculator.desktop.in.h:1
 msgid "calculator"
 msgstr ""
 
 #: ../menu-data/ubuntu-ui-toolkit-examples:calculator.desktop.in.h:2
-#: ../menu-data/ubuntu-ui-toolkit-examples:jokes.desktop.in.h:2
 #: ../menu-data/ubuntu-ui-toolkit-examples:locale.desktop.in.h:2
 #: ../menu-data/ubuntu-ui-toolkit-examples:unit-converter.desktop.in.h:2
 msgid "My project description"
 msgstr ""
 
-#: ../menu-data/ubuntu-ui-toolkit-examples:jokes.desktop.in.h:1
-#: ../menu-data/ubuntu-ui-toolkit-examples:unit-converter.desktop.in.h:1
-msgid "converter"
-msgstr ""
-
 #: ../menu-data/ubuntu-ui-toolkit-examples:locale.desktop.in.h:1
 msgid "Locale"
 msgstr ""
@@ -19618,8 +20575,8 @@
 msgid "Ubuntu UI Toolkit Gallery"
 msgstr ""
 
-#: ../menu-data/ubuntukylin-default-settings:theme-tool.desktop.in.h:1
-msgid "主题设置"
+#: ../menu-data/ubuntu-ui-toolkit-examples:unit-converter.desktop.in.h:1
+msgid "converter"
 msgstr ""
 
 #: ../menu-data/ubuntuone-control-panel-qt:ubuntuone-control-panel-qt-gnome.desktop.in.h:1
@@ -19640,7 +20597,143 @@
 msgid "Change settings for multimedia production"
 msgstr "更改多媒体制作的设置"
 
-#: ../menu-data/uck:uck.desktop.in.h:1
+#: ../menu-data/ubuntustudio-installer:ubuntustudio-installer.desktop.in.h:1
+msgid "Ubuntu Studio Meta Installer"
+msgstr ""
+
+#: ../menu-data/ubuntustudio-installer:ubuntustudio-installer.desktop.in.h:2
+msgid "Used to install Ubuntu Studio Software Metas"
+msgstr ""
+
+#: ../menu-data/ubuntustudio-menu:ubuntustudio-extra-audio.desktop.in.h:1
+msgid "Extra Audio Production Applications"
+msgstr ""
+
+#: ../menu-data/ubuntustudio-menu:ubuntustudio-extra-audio.desktop.in.h:2
+msgid "Allows the installation of more audio software"
+msgstr ""
+
+#: ../menu-data/ubuntustudio-menu:ubuntustudio-extra-dtp.desktop.in.h:1
+msgid "Extra publishing applications"
+msgstr ""
+
+#: ../menu-data/ubuntustudio-menu:ubuntustudio-extra-dtp.desktop.in.h:2
+msgid "Allows the installation of more publishing applications"
+msgstr ""
+
+#: ../menu-data/ubuntustudio-menu:ubuntustudio-extra-effects.desktop.in.h:1
+msgid "Extra Audio Effects"
+msgstr ""
+
+#: ../menu-data/ubuntustudio-menu:ubuntustudio-extra-effects.desktop.in.h:2
+msgid "Allows the installation of more Audio Effects"
+msgstr ""
+
+#: ../menu-data/ubuntustudio-menu:ubuntustudio-extra-graphic.desktop.in.h:1
+msgid "Extra Graphics Applications"
+msgstr ""
+
+#: ../menu-data/ubuntustudio-menu:ubuntustudio-extra-graphic.desktop.in.h:2
+msgid "Allows the installation of Graphics Applications"
+msgstr ""
+
+#: ../menu-data/ubuntustudio-menu:ubuntustudio-extra-midi.desktop.in.h:1
+msgid "Extra MIDI Utilities"
+msgstr ""
+
+#: ../menu-data/ubuntustudio-menu:ubuntustudio-extra-midi.desktop.in.h:2
+msgid "Allows the installation of more MIDI Utilities"
+msgstr ""
+
+#: ../menu-data/ubuntustudio-menu:ubuntustudio-extra-mixer.desktop.in.h:1
+msgid "Extra mixers"
+msgstr ""
+
+#: ../menu-data/ubuntustudio-menu:ubuntustudio-extra-mixer.desktop.in.h:2
+msgid "Allows the installation of other mixers"
+msgstr ""
+
+#: ../menu-data/ubuntustudio-menu:ubuntustudio-extra-office.desktop.in.h:1
+msgid "Extra Office Applications"
+msgstr ""
+
+#: ../menu-data/ubuntustudio-menu:ubuntustudio-extra-office.desktop.in.h:2
+msgid "Allows the installation of abiword, gnumeric and libreoffice"
+msgstr ""
+
+#: ../menu-data/ubuntustudio-menu:ubuntustudio-extra-photo.desktop.in.h:1
+msgid "Extra Photography Applications"
+msgstr ""
+
+#: ../menu-data/ubuntustudio-menu:ubuntustudio-extra-photo.desktop.in.h:2
+msgid "Allows the installation of more Photography applications"
+msgstr ""
+
+#: ../menu-data/ubuntustudio-menu:ubuntustudio-extra-synth.desktop.in.h:1
+msgid "Extra Sound Generators"
+msgstr ""
+
+#: ../menu-data/ubuntustudio-menu:ubuntustudio-extra-synth.desktop.in.h:2
+msgid "Allows the installation of Soft Synths and Sound Generators"
+msgstr ""
+
+#: ../menu-data/ubuntustudio-menu:ubuntustudio-extra-video.desktop.in.h:1
+msgid "Extra Video Applications"
+msgstr ""
+
+#: ../menu-data/ubuntustudio-menu:ubuntustudio-extra-video.desktop.in.h:2
+msgid "Allows the installation of Video Applications"
+msgstr ""
+
+#: ../menu-data/ubuntustudio-menu:ubuntustudio-forum.desktop.in.h:1
+msgid "Ubuntu Studio Forum"
+msgstr ""
+
+#: ../menu-data/ubuntustudio-menu:ubuntustudio-forum.desktop.in.h:2
+msgid "Go to the Ubuntu Studio Forum"
+msgstr ""
+
+#: ../menu-data/ubuntustudio-menu:ubuntustudio-help.desktop.in.h:1
+msgid "Help and Documentation"
+msgstr ""
+
+#: ../menu-data/ubuntustudio-menu:ubuntustudio-help.desktop.in.h:2
+msgid "Help and Documentation for using UbuntuStudio"
+msgstr ""
+
+#: ../menu-data/ubuntustudio-menu:ubuntustudio-irc.desktop.in.h:1
+msgid "UbuntuStudio IRC"
+msgstr ""
+
+#: ../menu-data/ubuntustudio-menu:ubuntustudio-irc.desktop.in.h:2
+msgid "UbuntuStudio's IRC support channel"
+msgstr ""
+
+#: ../menu-data/ubuntustudio-menu:ubuntustudio-list-dev.desktop.in.h:1
+msgid "Ubuntu Studio You can help"
+msgstr ""
+
+#: ../menu-data/ubuntustudio-menu:ubuntustudio-list-dev.desktop.in.h:2
+msgid "Join the Ubuntu Studio Team"
+msgstr ""
+
+#: ../menu-data/ubuntustudio-menu:ubuntustudio-list.desktop.in.h:1
+msgid "ubuntustudio mail list page"
+msgstr ""
+
+#: ../menu-data/ubuntustudio-menu:ubuntustudio-list.desktop.in.h:2
+msgid "join the UbuntuStudio mail list"
+msgstr ""
+
+#: ../menu-data/ubuntustudio-menu:ubuntustudio-web.desktop.in.h:1
+msgid "ubuntustudio.org"
+msgstr ""
+
+#: ../menu-data/ubuntustudio-menu:ubuntustudio-web.desktop.in.h:2
+msgid "Ubuntu Studio Home Page"
+msgstr ""
+
+#: ../menu-data/uck:uck.desktop.in.h:1
 msgid "Ubuntu Customization Kit"
 msgstr "Ubuntu 定制套件"
 
@@ -19648,6 +20741,14 @@
 msgid "Customize your Ubuntu Desktop CDs easily"
 msgstr "方便地定制您的 Ubuntu 桌面 CD"
 
+#: ../menu-data/udav:udav.desktop.in.h:1
+msgid "UDAV"
+msgstr ""
+
+#: ../menu-data/udav:udav.desktop.in.h:2
+msgid "Data handling and plotting tool"
+msgstr ""
+
 #: ../menu-data/udev-discover:udev-discover.desktop.in.h:1
 msgid "Udev Discover"
 msgstr ""
@@ -19688,6 +20789,14 @@
 msgid "Download multiple URLs and apply it to one of setting/queue."
 msgstr "将多个网址排成队列依次下载。"
 
+#: ../menu-data/uhexen2:uhexen2.desktop.in.h:1
+msgid "Hexen 2"
+msgstr ""
+
+#: ../menu-data/uhexen2:uhexen2.desktop.in.h:2
+msgid "Hexen II"
+msgstr ""
+
 #: ../menu-data/uim-gtk2.0:uim.desktop.in.h:2
 msgid "Customize uim input method environment"
 msgstr "定制 uim 输入法环境"
@@ -19761,6 +20870,129 @@
 msgid "GTK interface for the unison file synchronization tool 2.32.52"
 msgstr ""
 
+#: ../menu-data/unity-control-center-signon:credentials-preferences.desktop.in.h:2
+#: ../menu-data/unity-control-center-signon:unity-credentials-panel.desktop.in.h:2
+msgid "Online account credentials and settings"
+msgstr ""
+
+#: ../menu-data/unity-control-center-signon:update-accounts.desktop.in.h:1
+msgid "Account update tool"
+msgstr ""
+
+#: ../menu-data/unity-control-center:unity-appearance-panel.desktop.in.h:1
+#: ../menu-data/unity-tweak-tool:unity-tweak-tool.desktop.in.h:5
+msgid "Appearance"
+msgstr ""
+
+#: ../menu-data/unity-control-center:unity-appearance-panel.desktop.in.h:2
+msgid "Change the background and the theme"
+msgstr ""
+
+#: ../menu-data/unity-control-center:unity-bluetooth-panel.desktop.in.h:1
+msgid "Bluetooth"
+msgstr "蓝牙"
+
+#: ../menu-data/unity-control-center:unity-bluetooth-panel.desktop.in.h:2
+msgid "Configure Bluetooth settings"
+msgstr "配置蓝牙"
+
+#: ../menu-data/unity-control-center:unity-color-panel.desktop.in.h:2
+msgid "Color management settings"
+msgstr ""
+
+#: ../menu-data/unity-control-center:unity-datetime-panel.desktop.in.h:1
+msgid "Time & Date"
+msgstr ""
+
+#: ../menu-data/unity-control-center:unity-datetime-panel.desktop.in.h:2
+msgid "Change your clock and date settings"
+msgstr ""
+
+#: ../menu-data/unity-control-center:unity-display-panel.desktop.in.h:1
+msgid "Displays"
+msgstr ""
+
+#: ../menu-data/unity-control-center:unity-display-panel.desktop.in.h:2
+msgid "Change resolution and position of monitors and projectors"
+msgstr ""
+
+#: ../menu-data/unity-control-center:unity-info-panel.desktop.in.h:1
+msgid "Details"
+msgstr ""
+
+#: ../menu-data/unity-control-center:unity-info-panel.desktop.in.h:2
+msgid "System Information"
+msgstr ""
+
+#: ../menu-data/unity-control-center:unity-keyboard-panel.desktop.in.h:2
+msgid "Change keyboard settings"
+msgstr ""
+
+#: ../menu-data/unity-control-center:unity-mouse-panel.desktop.in.h:1
+msgid "Mouse & Touchpad"
+msgstr ""
+
+#: ../menu-data/unity-control-center:unity-network-panel.desktop.in.h:2
+msgid "Network settings"
+msgstr "网络设置"
+
+#: ../menu-data/unity-control-center:unity-power-panel.desktop.in.h:1
+msgid "Power"
+msgstr ""
+
+#: ../menu-data/unity-control-center:unity-power-panel.desktop.in.h:2
+msgid "Power management settings"
+msgstr ""
+
+#: ../menu-data/unity-control-center:unity-region-panel.desktop.in.h:1
+msgid "Text Entry"
+msgstr ""
+
+#: ../menu-data/unity-control-center:unity-region-panel.desktop.in.h:2
+msgid "Change your keyboard or input method settings"
+msgstr ""
+
+#: ../menu-data/unity-control-center:unity-screen-panel.desktop.in.h:1
+msgid "Brightness & Lock"
+msgstr ""
+
+#: ../menu-data/unity-control-center:unity-screen-panel.desktop.in.h:2
+msgid "Screen brightness and lock settings"
+msgstr ""
+
+#: ../menu-data/unity-control-center:unity-sound-panel.desktop.in.h:1
+msgid "Sound"
+msgstr ""
+
+#: ../menu-data/unity-control-center:unity-sound-panel.desktop.in.h:2
+msgid "Change sound volume and sound events"
+msgstr ""
+
+#: ../menu-data/unity-control-center:unity-universal-access-panel.desktop.in.h:1
+msgid "Universal Access"
+msgstr ""
+
+#: ../menu-data/unity-control-center:unity-universal-access-panel.desktop.in.h:2
+msgid "Universal Access Preferences"
+msgstr ""
+
+#: ../menu-data/unity-control-center:unity-user-accounts-panel.desktop.in.h:1
+msgid "User Accounts"
+msgstr ""
+
+#: ../menu-data/unity-control-center:unity-user-accounts-panel.desktop.in.h:2
+msgid "Add or remove users"
+msgstr ""
+
+#: ../menu-data/unity-control-center:unity-wacom-panel.desktop.in.h:1
+msgid "Wacom Tablet"
+msgstr ""
+
+#: ../menu-data/unity-control-center:unity-wacom-panel.desktop.in.h:2
+msgid ""
+"Set button mappings and adjust stylus sensitivity for graphics tablets"
+msgstr ""
+
 #: ../menu-data/unity-lens-photos:unity-lens-photos.desktop.in.h:1
 msgid "Photos lens for Unity"
 msgstr ""
@@ -19801,6 +21033,14 @@
 msgid "Google Drive scope for Unity"
 msgstr ""
 
+#: ../menu-data/unity-scope-tool:unity-scope-tool.desktop.in.h:1
+msgid "Unity Scope Tool"
+msgstr ""
+
+#: ../menu-data/unity-scope-tool:unity-scope-tool.desktop.in.h:2
+msgid "Developer tool for Unity scopes."
+msgstr ""
+
 #: ../menu-data/unity-tweak-tool:unity-tweak-tool.desktop.in.h:1
 msgid "Unity Tweak Tool"
 msgstr ""
@@ -19817,6 +21057,195 @@
 msgid "System"
 msgstr ""
 
+#: ../menu-data/unity-webapps-amazoncloudreader:AmazonCloudReaderreadamazoncom.desktop.in.h:1
+msgid "AmazonCloudReader"
+msgstr ""
+
+#: ../menu-data/unity-webapps-bbcnews:BBCNewsbbccouk.desktop.in.h:1
+msgid "BBC News"
+msgstr ""
+
+#: ../menu-data/unity-webapps-cnn-news:cnn-newscnncom.desktop.in.h:1
+msgid "cnn-news"
+msgstr ""
+
+#: ../menu-data/unity-webapps-common:UbuntuOneMusiconeubuntucom.desktop.in.h:1
+msgid "Ubuntu One Music"
+msgstr ""
+
+#: ../menu-data/unity-webapps-common:ubuntu-amazon-default.desktop.in.h:1
+msgid "Amazon"
+msgstr ""
+
+#: ../menu-data/unity-webapps-deezer:Deezerdeezercom.desktop.in.h:1
+msgid "Deezer"
+msgstr ""
+
+#: ../menu-data/unity-webapps-deviantart:DeviantArtdeviantartcom.desktop.in.h:1
+msgid "DeviantArt"
+msgstr ""
+
+#: ../menu-data/unity-webapps-facebookmessenger:FacebookMessengerfacebookcom.desktop.in.h:1
+msgid "FacebookMessenger"
+msgstr ""
+
+#: ../menu-data/unity-webapps-gmail:GMailmailgooglecom.desktop.in.h:1
+msgid "GMail"
+msgstr ""
+
+#: ../menu-data/unity-webapps-googlecalendar:GoogleCalendargooglecom.desktop.in.h:1
+msgid "GoogleCalendar"
+msgstr ""
+
+#: ../menu-data/unity-webapps-googledocs:GoogleDocsdocsgooglecom.desktop.in.h:1
+msgid "GoogleDocs"
+msgstr ""
+
+#: ../menu-data/unity-webapps-googlenews:GoogleNewsgooglecom.desktop.in.h:1
+msgid "GoogleNews"
+msgstr ""
+
+#: ../menu-data/unity-webapps-googleplus:GooglePlusplusgooglecom.desktop.in.h:1
+msgid "GooglePlus"
+msgstr ""
+
+#: ../menu-data/unity-webapps-googleplusgames:GooglePlusGamesplusgooglecom.desktop.in.h:1
+msgid "GooglePlusGames"
+msgstr ""
+
+#: ../menu-data/unity-webapps-grooveshark:groovesharkgroovesharkcom.desktop.in.h:1
+msgid "grooveshark"
+msgstr ""
+
+#: ../menu-data/unity-webapps-hulu-player:hulu-playerhulucom.desktop.in.h:1
+msgid "hulu-player"
+msgstr ""
+
+#: ../menu-data/unity-webapps-lastfm-radio:lastfm-radiolastfm.desktop.in.h:1
+msgid "lastfm-radio"
+msgstr ""
+
+#: ../menu-data/unity-webapps-launchpad:Launchpadlaunchpadnet.desktop.in.h:1
+msgid "Launchpad"
+msgstr ""
+
+#: ../menu-data/unity-webapps-librefm:LibreFmlibrefm.desktop.in.h:1
+msgid "LibreFm"
+msgstr ""
+
+#: ../menu-data/unity-webapps-linkedin:LinkedInlinkedincom.desktop.in.h:1
+msgid "LinkedIn"
+msgstr ""
+
+#: ../menu-data/unity-webapps-livemail:LiveMailmaillivecom.desktop.in.h:1
+msgid "LiveMail"
+msgstr ""
+
+#: ../menu-data/unity-webapps-mail-ru:mail-rumailru.desktop.in.h:1
+msgid "mail-ru"
+msgstr ""
+
+#: ../menu-data/unity-webapps-newsblur:Newsblurnewsblurcom.desktop.in.h:1
+msgid "Newsblur"
+msgstr ""
+
+#: ../menu-data/unity-webapps-pandora:pandorapandoracom.desktop.in.h:1
+msgid "pandora"
+msgstr ""
+
+#: ../menu-data/unity-webapps-qml-examples:unity-webapps-qml-basic-example.desktop.in.h:1
+msgid "Unity WebApp QML Comonent - Basic API Showcase App"
+msgstr ""
+
+#: ../menu-data/unity-webapps-qml-examples:unity-webapps-qml-basic-example.desktop.in.h:2
+msgid "Unity WebApp QML Comonent for Ubuntu Basic API Showcase App"
+msgstr ""
+
+#: ../menu-data/unity-webapps-qml-examples:unity-webapps-qml-bbcnews-example.desktop.in.h:1
+msgid "BBCNewsWebappsQMLExample"
+msgstr ""
+
+#: ../menu-data/unity-webapps-qml-examples:unity-webapps-qml-bbcnews-example.desktop.in.h:2
+msgid "Unity WebApp QML Component for Ubuntu Example using BBCNews binding"
+msgstr ""
+
+#: ../menu-data/unity-webapps-qml-examples:unity-webapps-qml-facebookmessenger-example.desktop.in.h:1
+msgid "FacebookMessengerWebappsQMLExample"
+msgstr ""
+
+#: ../menu-data/unity-webapps-qml-examples:unity-webapps-qml-facebookmessenger-example.desktop.in.h:2
+msgid "FacebookMessenger WebBrowser Container Example"
+msgstr ""
+
+#: ../menu-data/unity-webapps-qml-examples:unity-webapps-qml-model-example.desktop.in.h:1
+msgid "Unity WebApp QML Comonent - Example of WebApps Applications Model"
+msgstr ""
+
+#: ../menu-data/unity-webapps-qml-examples:unity-webapps-qml-model-example.desktop.in.h:2
+msgid ""
+"Unity WebApp QML Comonent for Ubuntu Example of WebApps Applications Model"
+msgstr ""
+
+#: ../menu-data/unity-webapps-qml:unitywebappsqmllauncher.desktop.in.h:1
+msgid "Unity Webapps QML Test Launcher"
+msgstr ""
+
+#: ../menu-data/unity-webapps-qq-mail:qq-mailmailqqcom.desktop.in.h:1
+msgid "qq-mail"
+msgstr ""
+
+#: ../menu-data/unity-webapps-reddit:Redditredditcom.desktop.in.h:1
+msgid "Reddit"
+msgstr ""
+
+#: ../menu-data/unity-webapps-tumblr:Tumblrtumblrcom.desktop.in.h:1
+msgid "Tumblr"
+msgstr ""
+
+#: ../menu-data/unity-webapps-twitter:Twittertwittercom.desktop.in.h:1
+msgid "Twitter"
+msgstr ""
+
+#: ../menu-data/unity-webapps-vkcom:Vkcomvkcom.desktop.in.h:1
+msgid "Vkcom"
+msgstr ""
+
+#: ../menu-data/unity-webapps-wordpress:wordpresswordpresscom.desktop.in.h:1
+msgid "wordpress"
+msgstr ""
+
+#: ../menu-data/unity-webapps-yahoomail:YahooMailmailyahoocom.desktop.in.h:1
+msgid "YahooMail"
+msgstr ""
+
+#: ../menu-data/unity-webapps-yahoonews:YahooNewsyahoocom.desktop.in.h:1
+msgid "YahooNews"
+msgstr ""
+
+#: ../menu-data/unity-webapps-yandexmail:YandexMailyandexcom.desktop.in.h:1
+msgid "YandexMail"
+msgstr ""
+
+#: ../menu-data/unity-webapps-yandexmusic:yandexmusicmusicyandexru.desktop.in.h:1
+msgid "yandexmusic"
+msgstr ""
+
+#: ../menu-data/unity-webapps-yandexnews:YandexNewsnewsyandexru.desktop.in.h:1
+msgid "YandexNews"
+msgstr ""
+
+#: ../menu-data/unity-webapps-youtube:YouTubeyoutubecom.desktop.in.h:1
+msgid "YouTube"
+msgstr ""
+
+#: ../menu-data/unity8:unity8.desktop.in.h:1
+msgid "Unity 8"
+msgstr ""
+
+#: ../menu-data/unity8:unity8.desktop.in.h:2
+msgid "The converged Unity shell"
+msgstr ""
+
 #: ../menu-data/unknown-horizons:unknown-horizons.desktop.in.h:1
 msgid "Unknown Horizons"
 msgstr ""
@@ -19917,11 +21346,11 @@
 msgid "UTF-8 Migration Wizard"
 msgstr "UTF-8 迁移向导"
 
-#: ../menu-data/v-sim-common:v-sim.desktop.in.h:1
+#: ../menu-data/v-sim:v-sim.desktop.in.h:1
 msgid "V_Sim"
 msgstr "V_Sim"
 
-#: ../menu-data/v-sim-common:v-sim.desktop.in.h:2
+#: ../menu-data/v-sim:v-sim.desktop.in.h:2
 msgid "Atomic visualisation"
 msgstr "原子可视化工具"
 
@@ -19965,6 +21394,10 @@
 msgid "Vavoom"
 msgstr ""
 
+#: ../menu-data/vavoom:vavoom.desktop.in.h:2
+msgid "First Person Shooter Game"
+msgstr "第一人称射击游戏"
+
 #: ../menu-data/vbaexpress:vbaexpress.desktop.in.h:1
 msgid "VBA Express"
 msgstr "VBA Express"
@@ -20053,6 +21486,14 @@
 msgid "Make and export image slideshows"
 msgstr "制作和导出图像幻灯片"
 
+#: ../menu-data/view3dscene:view3dscene.desktop.in.h:1
+msgid "view3dscene"
+msgstr ""
+
+#: ../menu-data/view3dscene:view3dscene.desktop.in.h:2
+msgid "View 3D models in various formats, play with VRML / X3D worlds"
+msgstr ""
+
 #: ../menu-data/viewmol:viewmol.desktop.in.h:1
 msgid "Viewmol"
 msgstr "Viewmol"
@@ -20196,11 +21637,6 @@
 msgid "Virtual MIDI Piano Keyboard"
 msgstr "虚拟 MIDI 钢琴键盘"
 
-#. TRANSLATORS: Ignore this string; do not translate.
-#: ../menu-data/vmware-view-open-client:vmware-view.desktop.in.h:2
-msgid "VMware View Open Client"
-msgstr "VMware 浏览公开客户端"
-
 #: ../menu-data/vodovod:vodovod.desktop.in.h:1
 msgid "Vodovod"
 msgstr ""
@@ -20211,6 +21647,14 @@
 "tank."
 msgstr ""
 
+#: ../menu-data/vokoscreen:vokoscreen.desktop.in.h:1
+msgid "screencast"
+msgstr ""
+
+#: ../menu-data/vokoscreen:vokoscreen.desktop.in.h:2
+msgid "vokoscreen"
+msgstr ""
+
 #: ../menu-data/volti:volti.desktop.in.h:1
 msgid "Volti"
 msgstr ""
@@ -20288,25 +21732,21 @@
 "A talking and fully customizable alarm clock that will operate from poweroff"
 msgstr "高度定制的闹钟程序"
 
-#: ../menu-data/wallch:wallch.desktop.in.h:1
+#: ../menu-data/wallch:wallch-nautilus.desktop.in.h:1
 msgid "Wallch"
 msgstr "Wallch"
 
-#: ../menu-data/wallch:wallch.desktop.in.h:2
+#: ../menu-data/wallch:wallch-nautilus.desktop.in.h:2
 msgid "Change desktop wallpapers automatically"
 msgstr "自动更换桌面壁纸"
 
-#: ../menu-data/wallch:wallch.desktop.in.h:3
-msgid "Start"
-msgstr "Start"
-
-#: ../menu-data/wallch:wallch.desktop.in.h:8
-msgid "Change Wallpaper"
-msgstr "更换壁纸"
-
-#: ../menu-data/wallch:wallch.desktop.in.h:9
-msgid "Live Earth Wallpaper"
-msgstr "地球实时壁纸"
+#: ../menu-data/wallch:wallch-nautilus.desktop.in.h:3
+msgid "Change Wallpaper Once"
+msgstr ""
+
+#: ../menu-data/wallch:wallch-nautilus.desktop.in.h:4
+msgid "Start/Stop Wallpapers"
+msgstr ""
 
 #: ../menu-data/wally:wally.desktop__wally.desktop.in.h:1
 msgid "Wally"
@@ -20414,6 +21854,14 @@
 msgid "Search housings"
 msgstr ""
 
+#: ../menu-data/weboob-qt:qhandjoob.desktop.in.h:1
+msgid "QHandJoob"
+msgstr ""
+
+#: ../menu-data/weboob-qt:qhandjoob.desktop.in.h:2
+msgid "Search for jobs"
+msgstr ""
+
 #: ../menu-data/weboob-qt:qhavedate.desktop.in.h:1
 msgid "QHaveDate"
 msgstr ""
@@ -20540,7 +21988,7 @@
 msgid "Tool for connecting to wireless networks"
 msgstr "用于连接无线网络的工具"
 
-#: ../menu-data/wine1.4:wine.desktop.in.h:1
+#: ../menu-data/wine1.6:wine.desktop.in.h:1
 msgid "Wine Windows Program Loader"
 msgstr "Wine Windows 程序加载器"
 
@@ -20560,13 +22008,13 @@
 msgid "GUI for avconv"
 msgstr ""
 
-#: ../menu-data/wings3d:wings3d.desktop.in.h:1
-msgid "Wings3D polygon mesh modeller"
-msgstr "Wings3D 多边形网格建模工具"
-
-#: ../menu-data/wings3d:wings3d.desktop.in.h:2
-msgid "Create and edit 3D models of objects"
-msgstr "为对象创建并编辑三维模型"
+#: ../menu-data/wing:wing.desktop.in.h:1
+msgid "WING"
+msgstr ""
+
+#: ../menu-data/wing:wing.desktop.in.h:2
+msgid "Play Galaga-like arcade game"
+msgstr ""
 
 #: ../menu-data/wininfo:xdg-wininfo.desktop.in.h:1
 msgid "A window information utility for X"
@@ -20694,9 +22142,14 @@
 msgstr ""
 
 #: ../menu-data/wsjt:wsjt.desktop.in.h:2
+#: ../menu-data/wsjtx:wsjtx.desktop.in.h:2
 msgid "Weak Signal Ham Radio"
 msgstr ""
 
+#: ../menu-data/wsjtx:wsjtx.desktop.in.h:1
+msgid "wsjtx"
+msgstr ""
+
 #: ../menu-data/wxbanker:wxbanker.desktop.in.h:1
 msgid "wxBanker Finance Manager"
 msgstr "wxBanker 财务管理"
@@ -20880,10 +22333,6 @@
 msgid "XChat IRC"
 msgstr "XChat IRC"
 
-#: ../menu-data/xchat:xchat.desktop.in.h:2
-msgid "Chat with other people using Internet Relay Chat"
-msgstr "使用互联网中继聊天来和其他人交流"
-
 #: ../menu-data/xchm:xchm.desktop.in.h:1
 msgid "xCHM"
 msgstr "xCHM"
@@ -20932,6 +22381,14 @@
 msgid "Interactive viewer for Graphviz dot files"
 msgstr "用于 Graphviz dot 文件的交互式查看器"
 
+#: ../menu-data/xdx:Xdx.desktop.in.h:1
+msgid "Xdx"
+msgstr "Xdx"
+
+#: ../menu-data/xdx:Xdx.desktop.in.h:2
+msgid "DX-cluster client for amateur radio"
+msgstr "用于业余无线电爱好者的 DX-集群 客户端"
+
 #: ../menu-data/xenwatch:xenwatch.desktop.in.h:1
 msgid "xenwatch"
 msgstr "xenwatch"
@@ -21112,10 +22569,12 @@
 msgid "A colorful solitaire Mah Jongg game"
 msgstr "一个彩色的纸牌麻将游戏"
 
+#: ../menu-data/xmakemol-gl:xmakemol.desktop.in.h:1
 #: ../menu-data/xmakemol:xmakemol.desktop.in.h:1
 msgid "XMakemol"
 msgstr "XMakemol"
 
+#: ../menu-data/xmakemol-gl:xmakemol.desktop.in.h:2
 #: ../menu-data/xmakemol:xmakemol.desktop.in.h:2
 msgid "View and manipulate atomic and other chemical systems"
 msgstr "查看和操纵原子和其他化学系统"
@@ -21356,14 +22815,19 @@
 msgid "Read News from Usenet"
 msgstr "从 Usenet 读取新闻"
 
-#: ../menu-data/xpra:xpra_launcher.desktop.in.h:1
-msgid "Xpra Launcher"
+#: ../menu-data/xpra:xpra.desktop.in.h:1
+msgid "Xpra"
 msgstr ""
 
+#: ../menu-data/xpra:xpra.desktop.in.h:2
 #: ../menu-data/xpra:xpra_launcher.desktop.in.h:2
 msgid "Connect to an Xpra session"
 msgstr ""
 
+#: ../menu-data/xpra:xpra_launcher.desktop.in.h:1
+msgid "Xpra Launcher"
+msgstr ""
+
 #: ../menu-data/xpuzzles:xbarrel.desktop.in.h:1
 msgid "xbarrel"
 msgstr "xbarrel"
@@ -21490,7 +22954,8 @@
 msgid "XTerm"
 msgstr "XTerm"
 
-#: ../menu-data/xterm:debian-xterm.desktop.in.h:2
+#. GenericName=Terminal
+#: ../menu-data/xterm:debian-xterm.desktop.in.h:3
 msgid "standard terminal emulator for the X window system"
 msgstr "用于 X 窗口系统的标准终端仿真器"
 
@@ -21544,7 +23009,8 @@
 msgstr ""
 
 #: ../menu-data/xye:xye.desktop.in.h:2
-msgid "Get all the gems in the room"
+msgid ""
+"Solve puzzles and action challenges in order to get all the gems in the room."
 msgstr ""
 
 #: ../menu-data/xyscan:xyscan.desktop.in.h:1
@@ -21636,6 +23102,14 @@
 msgid "Produce simple xy-plots of scientific data"
 msgstr "为科学数据产生简单的 XY 绘图"
 
+#: ../menu-data/yi:yi-emacs.desktop.in.h:1
+msgid "Yi (Emacs keymap)"
+msgstr ""
+
+#: ../menu-data/yi:yi-vim.desktop.in.h:1
+msgid "Yi (Vim keymap)"
+msgstr ""
+
 #: ../menu-data/yofrankie:yofrankie-bge.desktop.in.h:1
 msgid "Yo Frankie!"
 msgstr "Yo Frankie!"
@@ -21652,6 +23126,14 @@
 msgid "Cubeview"
 msgstr "Cubeview"
 
+#: ../menu-data/yorick-gyoto:gyotoy.desktop.in.h:1
+msgid "Gyotoy"
+msgstr ""
+
+#: ../menu-data/yorick-gyoto:gyotoy.desktop.in.h:2
+msgid "General Relativity Orbit Tracer"
+msgstr ""
+
 #: ../menu-data/yorick-spydr:spydr.desktop.in.h:1
 msgid "FITS image display and simple analysis"
 msgstr "FITS 图像显示和简单分析"
@@ -21668,6 +23150,10 @@
 msgid "Software Synthesizer based on ZynAddSubFX"
 msgstr "基于 ZynAddSubFX 的软件合成器"
 
+#: ../menu-data/youker-assistant:youker-assistant.desktop.in.h:1
+msgid "youker-assistant"
+msgstr ""
+
 #: ../menu-data/youtranslate:youtranslate.desktop.in.h:1
 msgid "Online Translator YouTranslate!"
 msgstr "在线翻译器 YouTranslate！"
@@ -21752,6 +23238,16 @@
 msgid "Interactive tool plot mathematic objects"
 msgstr ""
 
+#: ../menu-data/zeitgeist-explorer:zeitgeist-explorer.desktop.in.h:1
+msgid "Zeitgeist Explorer"
+msgstr ""
+
+#: ../menu-data/zeitgeist-explorer:zeitgeist-explorer.desktop.in.h:2
+msgid ""
+"A tool which can be used to monitor and explore the events logged by "
+"zeitgeist"
+msgstr ""
+
 #: ../menu-data/zekr:zekr.desktop.in.h:1
 msgid "Zekr "
 msgstr "Zekr "
@@ -21808,6 +23304,14 @@
 msgid "Correct the pitch of a voice singing out of tune"
 msgstr "调整唱歌走调声音的音高"
 
+#: ../menu-data/zita-bls1:zita-bls1.desktop.in.h:1
+msgid "Zita-bls1"
+msgstr ""
+
+#: ../menu-data/zita-bls1:zita-bls1.desktop.in.h:2
+msgid "converter of binaural signals into a convential stereo signals."
+msgstr ""
+
 #: ../menu-data/zita-mu1:zita-mu1.desktop.in.h:1
 msgid "Zita-mu1"
 msgstr ""
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/apport.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/apport.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/apport.po	2014-02-24 08:24:39.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/apport.po	2014-03-24 09:42:46.000000000 +0000
@@ -7,76 +7,78 @@
 msgstr ""
 "Project-Id-Version: apport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-18 21:49+0000\n"
+"POT-Creation-Date: 2014-03-07 15:50+0000\n"
 "PO-Revision-Date: 2013-09-17 08:42+0000\n"
 "Last-Translator: Z.X.Lyn <Unknown>\n"
 "Language-Team: Chinese (China) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:34+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:57+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: \n"
 
-#: ../debian/tmp/usr/share/apport/kernel_oops.py:30 ../data/kernel_oops.py:30
-msgid "Your system might become unstable now and might need to be restarted."
-msgstr "您的系统可能现在不稳定，它也许需要重启。"
-
-#: ../gtk/apport-gtk.ui.h:1 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:1
-#: ../kde/apport-kde.py:450 ../kde/apport-kde.py:486
-#: ../debian/tmp/usr/share/apport/apport-kde.py:450
-#: ../debian/tmp/usr/share/apport/apport-kde.py:486
-msgid "Apport"
-msgstr "Apport"
-
-#: ../gtk/apport-gtk.ui.h:2 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:2
-msgid "Crash report"
-msgstr "崩溃报告"
-
-#: ../gtk/apport-gtk.ui.h:3 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:3
-msgid "<big><b>Sorry, an internal error happened.</b></big>"
-msgstr "<big><b>对不起，发生内部错误。</b></big>"
+#: ../debian/tmp/usr/share/apport/apport-kde.py:162 ../bin/apport-cli.py:178
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:286
+#: ../debian/tmp/usr/bin/apport-cli.py:178
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:404
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:429
+#: ../gtk/apport-gtk.py:177 ../debian/tmp/usr/share/apport/apport-gtk.py:177
+#: ../kde/apport-kde.py:162
+msgid "Send problem report to the developers?"
+msgstr "向开发者发送问题报告？"
 
-#: ../gtk/apport-gtk.ui.h:4 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:4
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:300
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:256
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:302
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:342
-#: ../kde/apport-kde.py:220 ../gtk/apport-gtk.py:300
-#: ../debian/tmp/usr/share/apport/apport-kde.py:220
-msgid "If you notice further problems, try restarting the computer."
-msgstr "如果您注意到更多问题，请尝试重新启动计算机。"
+#: ../debian/tmp/usr/share/apport/apport-kde.py:170
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:292
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:412
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:437
+#: ../gtk/apport-gtk.py:186 ../debian/tmp/usr/share/apport/apport-gtk.py:186
+#: ../kde/apport-kde.py:170
+msgid "Send"
+msgstr "发送"
 
-#: ../gtk/apport-gtk.ui.h:5 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:5
-msgid "Send an error report to help fix this problem"
-msgstr "请发送错误报告，以帮助修复此问题"
+#: ../debian/tmp/usr/share/apport/apport-kde.py:176
+#: ../debian/tmp/usr/share/apport/apport-kde.py:217
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:110
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:254
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:108
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:300
+#: ../gtk/apport-gtk.py:165 ../debian/tmp/usr/share/apport/apport-gtk.py:165
+#: ../kde/apport-kde.py:176 ../kde/apport-kde.py:217
+#, python-format
+msgid "Sorry, %s has experienced an internal error."
+msgstr "对不起，%s 出现了内部错误。"
 
-#: ../gtk/apport-gtk.ui.h:6 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:6
-msgid "Ignore future problems of this program version"
-msgstr "以后忽略此版本程序的问题"
+#: ../debian/tmp/usr/share/apport/apport-kde.py:184 ../gtk/apport-gtk.py:257
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:257 ../kde/apport-kde.py:184
+#, python-format
+msgid "Package: %s"
+msgstr "软件包：%s"
 
-#: ../gtk/apport-gtk.ui.h:7 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:7
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:204
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:573 ../kde/apport-kde.py:271
-#: ../gtk/apport-gtk.py:204 ../gtk/apport-gtk.py:573
-#: ../debian/tmp/usr/share/apport/apport-kde.py:271
-msgid "Show Details"
-msgstr "显示详细信息"
+#: ../debian/tmp/usr/share/apport/apport-kde.py:190
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:136
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:137
+#: ../gtk/apport-gtk.py:264 ../debian/tmp/usr/share/apport/apport-gtk.py:264
+#: ../kde/apport-kde.py:190
+msgid "Sorry, a problem occurred while installing software."
+msgstr "对不起，安装软件时出现问题。"
 
-#: ../gtk/apport-gtk.ui.h:8 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:8
-msgid "_Examine locally"
-msgstr "本地检查(&E)"
+#: ../debian/tmp/usr/share/apport/apport-kde.py:197 ../gtk/apport-gtk.py:273
+#: ../gtk/apport-gtk.py:292 ../debian/tmp/usr/share/apport/apport-gtk.py:273
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:292 ../kde/apport-kde.py:197
+#, python-format
+msgid "The application %s has experienced an internal error."
+msgstr "应用程序 %s 发生内部错误。"
 
-#: ../gtk/apport-gtk.ui.h:9 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:9
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:287 ../kde/apport-kde.py:213
-#: ../gtk/apport-gtk.py:287 ../debian/tmp/usr/share/apport/apport-kde.py:213
-msgid "Leave Closed"
-msgstr "保持关闭状态"
+#: ../debian/tmp/usr/share/apport/apport-kde.py:201 ../gtk/apport-gtk.py:276
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:276 ../kde/apport-kde.py:201
+#, python-format
+msgid "The application %s has closed unexpectedly."
+msgstr "应用程序 %s 已意外关闭。"
 
-#: ../gtk/apport-gtk.ui.h:10 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:10
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:216
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:284
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:303
+#: ../debian/tmp/usr/share/apport/apport-kde.py:210
+#: ../debian/tmp/usr/share/apport/apport-kde.py:223
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:10
 #: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:115
 #: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:141
 #: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:153
@@ -90,59 +92,165 @@
 #: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:310
 #: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:350
 #: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:479
-#: ../kde/apport-kde.py:210 ../kde/apport-kde.py:223 ../gtk/apport-gtk.py:216
-#: ../gtk/apport-gtk.py:284 ../gtk/apport-gtk.py:303
-#: ../debian/tmp/usr/share/apport/apport-kde.py:210
-#: ../debian/tmp/usr/share/apport/apport-kde.py:223
+#: ../gtk/apport-gtk.ui.h:10 ../gtk/apport-gtk.py:216 ../gtk/apport-gtk.py:284
+#: ../gtk/apport-gtk.py:303 ../debian/tmp/usr/share/apport/apport-gtk.py:216
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:284
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:303 ../kde/apport-kde.py:210
+#: ../kde/apport-kde.py:223
 msgid "Continue"
 msgstr "继续"
 
-#: ../gtk/apport-gtk.ui.h:11 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:11
-msgid "<big><b>Collecting problem information</b></big>"
-msgstr "<big><b>正在收集问题信息</b></big>"
+#: ../debian/tmp/usr/share/apport/apport-kde.py:213
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:9 ../gtk/apport-gtk.ui.h:9
+#: ../gtk/apport-gtk.py:287 ../debian/tmp/usr/share/apport/apport-gtk.py:287
+#: ../kde/apport-kde.py:213
+msgid "Leave Closed"
+msgstr "保持关闭状态"
+
+#: ../debian/tmp/usr/share/apport/apport-kde.py:214
+#: ../debian/tmp/usr/share/apport/apport-kde.py:361
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:226
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:232
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:273
+#: ../gtk/apport-gtk.py:229 ../gtk/apport-gtk.py:288
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:229
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:288 ../kde/apport-kde.py:214
+#: ../kde/apport-kde.py:361
+msgid "Relaunch"
+msgstr "重新启动程序"
+
+#: ../debian/tmp/usr/share/apport/apport-kde.py:220
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:4
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:256
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:302
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:342
+#: ../gtk/apport-gtk.ui.h:4 ../gtk/apport-gtk.py:300
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:300 ../kde/apport-kde.py:220
+msgid "If you notice further problems, try restarting the computer."
+msgstr "如果您注意到更多问题，请尝试重新启动计算机。"
+
+#: ../debian/tmp/usr/share/apport/apport-kde.py:224 ../gtk/apport-gtk.py:304
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:304 ../kde/apport-kde.py:224
+msgid "Ignore future problems of this type"
+msgstr "以后忽略此类错误"
+
+#: ../debian/tmp/usr/share/apport/apport-kde.py:268 ../gtk/apport-gtk.py:577
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:577 ../kde/apport-kde.py:268
+msgid "Hide Details"
+msgstr "隐藏详细信息"
+
+#: ../debian/tmp/usr/share/apport/apport-kde.py:271
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:7 ../gtk/apport-gtk.ui.h:7
+#: ../gtk/apport-gtk.py:204 ../gtk/apport-gtk.py:573
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:204
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:573 ../kde/apport-kde.py:271
+msgid "Show Details"
+msgstr "显示详细信息"
+
+#: ../debian/tmp/usr/share/apport/apport-kde.py:294 ../kde/apport-kde.py:294
+msgid "Username:"
+msgstr "用户名："
+
+#: ../debian/tmp/usr/share/apport/apport-kde.py:295 ../kde/apport-kde.py:295
+msgid "Password:"
+msgstr "密码："
+
+#: ../debian/tmp/usr/share/apport/apport-kde.py:342 ../bin/apport-cli.py:150
+#: ../debian/tmp/usr/bin/apport-cli.py:150 ../gtk/apport-gtk.py:142
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:142 ../kde/apport-kde.py:342
+msgid "(binary data)"
+msgstr "(二进制数据)"
+
+#: ../debian/tmp/usr/share/apport/apport-kde.py:386 ../kde/apport-kde.py:386
+msgid "Collecting Problem Information"
+msgstr "正在收集问题信息"
+
+#: ../debian/tmp/usr/share/apport/apport-kde.py:387 ../bin/apport-cli.py:238
+#: ../debian/tmp/usr/bin/apport-cli.py:238 ../kde/apport-kde.py:387
+msgid "Collecting problem information"
+msgstr "正在收集问题信息"
 
-#: ../gtk/apport-gtk.ui.h:12 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:12
+#: ../debian/tmp/usr/share/apport/apport-kde.py:388 ../kde/apport-kde.py:388
 msgid ""
-"Information is being collected that may help the developers fix the problem "
-"you report."
-msgstr "正在收集信息，这些信息将会帮助开发人员修复您报告的问题。"
+"The collected information can be sent to the developers to improve the "
+"application. This might take a few minutes."
+msgstr "收集到的信息可以发送给开发者来改进程序。这可能要花费几分钟的时间。"
 
-#: ../gtk/apport-gtk.ui.h:13 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:13
-#: ../kde/apport-kde.py:415 ../bin/apport-cli.py:251
-#: ../debian/tmp/usr/bin/apport-cli.py:251
-#: ../debian/tmp/usr/share/apport/apport-kde.py:415
-msgid "Uploading problem information"
+#: ../debian/tmp/usr/share/apport/apport-kde.py:414 ../kde/apport-kde.py:414
+msgid "Uploading Problem Information"
 msgstr "上传问题信息"
 
-#: ../gtk/apport-gtk.ui.h:14 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:14
-msgid "<big><b>Uploading problem information</b></big>"
-msgstr "<big><b>正在上传问题信息</b></big>"
+#: ../debian/tmp/usr/share/apport/apport-kde.py:415 ../bin/apport-cli.py:251
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:13
+#: ../debian/tmp/usr/bin/apport-cli.py:251 ../gtk/apport-gtk.ui.h:13
+#: ../kde/apport-kde.py:415
+msgid "Uploading problem information"
+msgstr "上传问题信息"
 
-#: ../gtk/apport-gtk.ui.h:15 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:15
-#: ../kde/apport-kde.py:416 ../debian/tmp/usr/share/apport/apport-kde.py:416
+#: ../debian/tmp/usr/share/apport/apport-kde.py:416
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:15 ../gtk/apport-gtk.ui.h:15
+#: ../kde/apport-kde.py:416
 msgid ""
 "The collected information is being sent to the bug tracking system. This "
 "might take a few minutes."
 msgstr "正在将收集的信息到缺陷跟踪系统。可能需要几分钟时间。"
 
+#: ../debian/tmp/usr/share/apport/apport-kde.py:450
+#: ../debian/tmp/usr/share/apport/apport-kde.py:486
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:1 ../gtk/apport-gtk.ui.h:1
+#: ../kde/apport-kde.py:450 ../kde/apport-kde.py:486
+msgid "Apport"
+msgstr "Apport"
+
+#: ../data/apportcheckresume.py:68
+#: ../debian/tmp/usr/share/apport/apportcheckresume.py:68
+msgid ""
+"This occured during a previous suspend and prevented it from resuming "
+"properly."
+msgstr "这是在上一个挂起中发生的，并阻止了它正确地恢复。"
+
+#: ../data/apportcheckresume.py:70
+#: ../debian/tmp/usr/share/apport/apportcheckresume.py:70
+msgid ""
+"This occured during a previous hibernate and prevented it from resuming "
+"properly."
+msgstr "这是在上一个休眠中发生的，并阻止了它正确地恢复。"
+
+#: ../data/apportcheckresume.py:75
+#: ../debian/tmp/usr/share/apport/apportcheckresume.py:75
+msgid ""
+"The resume processing hung very near the end and will have appeared to have "
+"completed normally."
+msgstr "这个恢复过程已经非常接近尾声，将正常结束。"
+
+#: ../kde/apport-kde.desktop.in.h:1 ../kde/apport-kde-mime.desktop.in.h:1
+#: ../gtk/apport-gtk.desktop.in.h:1
+msgid "Report a problem..."
+msgstr "提交一份问题报告…"
+
+#: ../kde/apport-kde.desktop.in.h:2 ../kde/apport-kde-mime.desktop.in.h:2
+#: ../gtk/apport-gtk.desktop.in.h:2
+msgid "Report a malfunction to the developers"
+msgstr "向开发者报告一个故障"
+
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:124
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:124
 #: ../apport/ui.py:124
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:124
 msgid "This package does not seem to be installed correctly"
 msgstr "该软件包似乎没有被正确安装"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:128
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:128
 #: ../apport/ui.py:128
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:128
 #, python-format
 msgid ""
 "This is not an official %s package. Please remove any third party package "
 "and try again."
 msgstr "这不是官方的 %s 软件包。请删除所有第三方软件包，然后重试。"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:145
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:145
 #: ../apport/ui.py:145
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:145
 #, python-format
 msgid ""
 "You have some obsolete package versions installed. Please upgrade the "
@@ -154,37 +262,50 @@
 "\n"
 "%s"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:269
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:269
 #: ../apport/ui.py:269
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:269
 msgid "unknown program"
 msgstr "未知程序"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:270
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:270
 #: ../apport/ui.py:270
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:270
 #, python-format
 msgid "Sorry, the program \"%s\" closed unexpectedly"
 msgstr "对不起，%s 程序异常退出"
 
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:272
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1287
-#: ../apport/ui.py:272 ../apport/ui.py:1287
 #: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:272
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1287
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1306
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:272
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1306
+#: ../apport/ui.py:272 ../apport/ui.py:1306
 #, python-format
 msgid "Problem in %s"
 msgstr "%s 中的问题"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:273
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:273
 #: ../apport/ui.py:273
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:273
 msgid ""
 "Your computer does not have enough free memory to automatically analyze the "
 "problem and send a report to the developers."
 msgstr "您的计算机剩余空间不足，程序无法自动诊断问题并向开发者发送问题报告。"
 
 #. package does not exist
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:288
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:294
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:300
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:343
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:351
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:478
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:481
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:682
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1113
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1278
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1282
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:276
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1049
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:288
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:294
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:300
@@ -194,142 +315,129 @@
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:481
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:682
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1113
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1259
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1263
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:276
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1049
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1278
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1282
 #: ../apport/ui.py:288 ../apport/ui.py:294 ../apport/ui.py:300
 #: ../apport/ui.py:343 ../apport/ui.py:351 ../apport/ui.py:478
 #: ../apport/ui.py:481 ../apport/ui.py:682 ../apport/ui.py:1113
-#: ../apport/ui.py:1259 ../apport/ui.py:1263
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:288
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:294
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:300
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:343
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:351
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:478
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:481
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:682
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1113
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1259
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1263
+#: ../apport/ui.py:1278 ../apport/ui.py:1282
 msgid "Invalid problem report"
 msgstr "无效的问题报告"
 
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:289
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1265
-#: ../apport/ui.py:289 ../apport/ui.py:1265
 #: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:289
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1265
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1284
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:289
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1284
+#: ../apport/ui.py:289 ../apport/ui.py:1284
 msgid "This problem report is damaged and cannot be processed."
 msgstr "该问题报告已损坏，无法处理。"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:295
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:295
 #: ../apport/ui.py:295
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:295
 msgid "The report belongs to a package that is not installed."
 msgstr "该报告属于一个未安装的软件包。"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:301
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:301
 #: ../apport/ui.py:301
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:301
 msgid "An error occurred while attempting to process this problem report:"
 msgstr "尝试处理此问题报告时出现错误："
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:344
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:344
 #: ../apport/ui.py:344
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:344
 msgid "You are not allowed to access this problem report."
 msgstr "您没有访问这个问题报告的权限。"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:347
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:347
 #: ../apport/ui.py:347
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:347
 msgid "Error"
 msgstr "错误"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:348
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:348
 #: ../apport/ui.py:348
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:348
 msgid "There is not enough disk space available to process this report."
 msgstr "没有足够的空间来执行报告。"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:432
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:432
 #: ../apport/ui.py:432
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:432
 msgid "No package specified"
 msgstr "没有指定软件包"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:433
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:433
 #: ../apport/ui.py:433
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:433
 msgid ""
 "You need to specify a package or a PID. See --help for more information."
 msgstr "您需要指定一个软件包或者 PID。使用 --help 选项来获取更多信息。"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:456
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:456
 #: ../apport/ui.py:456
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:456
 msgid "Permission denied"
 msgstr "拒绝访问"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:457
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:457
 #: ../apport/ui.py:457
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:457
 msgid ""
 "The specified process does not belong to you. Please run this program as the "
 "process owner or as root."
 msgstr "指定的进程不属于您。请作为进程的所有者或 root 运行这个进程。"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:459
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:459
 #: ../apport/ui.py:459
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:459
 msgid "Invalid PID"
 msgstr "无效的 PID"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:460
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:460
 #: ../apport/ui.py:460
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:460
 msgid "The specified process ID does not belong to a program."
 msgstr "指定的进程 ID 不属于一个程序。"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:479
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:479
 #: ../apport/ui.py:479
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:479
 #, python-format
 msgid "Symptom script %s did not determine an affected package"
 msgstr "症状脚本 %s 没有划定受影响的包"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:482
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:482
 #: ../apport/ui.py:482
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:482
 #, python-format
 msgid "Package %s does not exist"
 msgstr "软件包 %s 不存在"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:506
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:694
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:699
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:506
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:694
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:699
 #: ../apport/ui.py:506 ../apport/ui.py:694 ../apport/ui.py:699
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:506
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:694
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:699
 msgid "Cannot create report"
 msgstr "不能创建报告"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:521
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:567
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:584
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:521
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:567
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:584
 #: ../apport/ui.py:521 ../apport/ui.py:567 ../apport/ui.py:584
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:521
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:567
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:584
 msgid "Updating problem report"
 msgstr "更新问题报告"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:522
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:522
 #: ../apport/ui.py:522
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:522
 msgid ""
 "You are not the reporter or subscriber of this problem report, or the report "
 "is a duplicate or already closed.\n"
@@ -339,9 +447,9 @@
 "您不是该问题报告的报告者或订阅者，或者该报告被视为重复或已经关闭。\n"
 "请使用 apport-bug 新建一份报告。"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:531
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:531
 #: ../apport/ui.py:531
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:531
 msgid ""
 "You are not the reporter of this problem report. It is much easier to mark a "
 "bug as a duplicate of another than to move your comments and attachments to "
@@ -356,79 +464,79 @@
 "因此，我们建议您使用 apport-bug 来提交新的错误报告，并在当前报告中对您新提交的报告进行评论。\n"
 "您确定要继续么？"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:568
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:585
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:568
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:585
 #: ../apport/ui.py:568 ../apport/ui.py:585
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:568
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:585
 msgid "No additional information collected."
 msgstr "未收集更多信息。"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:636
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:636
 #: ../apport/ui.py:636
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:636
 msgid "What kind of problem do you want to report?"
 msgstr "您想报告什么类型的问题？"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:653
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:653
 #: ../apport/ui.py:653
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:653
 msgid "Unknown symptom"
 msgstr "未知症状"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:654
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:654
 #: ../apport/ui.py:654
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:654
 #, python-format
 msgid "The symptom \"%s\" is not known."
 msgstr "症状 %s 未知。"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:685
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:685
 #: ../apport/ui.py:685
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:685
 msgid ""
 "After closing this message please click on an application window to report a "
 "problem about it."
 msgstr "在关闭这个消息只后，请点击要报告问题的程序窗口。"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:695
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:700
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:695
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:700
 #: ../apport/ui.py:695 ../apport/ui.py:700
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:695
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:700
 msgid "xprop failed to determine process ID of the window"
 msgstr "xprop 无法确定窗口的进程 ID"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:714
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:714
 #: ../apport/ui.py:714
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:714
 msgid "%prog <report number>"
 msgstr "%prog <报告号>"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:716
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:716
 #: ../apport/ui.py:716
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:716
 msgid "Specify package name."
 msgstr "请指定包的名称。"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:718
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:769
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:718
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:769
 #: ../apport/ui.py:718 ../apport/ui.py:769
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:718
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:769
 msgid "Add an extra tag to the report. Can be specified multiple times."
 msgstr "向报告中添加额外的标记，可多次指定。"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:748
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:748
 #: ../apport/ui.py:748
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:748
 msgid ""
 "%prog [options] [symptom|pid|package|program path|.apport/.crash file]"
 msgstr "%prog [选项] [症状|PID|软件包|程序目录|.apport/.crash file]"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:751
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:751
 #: ../apport/ui.py:751
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:751
 msgid ""
 "Start in bug filing mode. Requires --package and an optional --pid, or just "
 "a --pid. If neither is given, display a list of known symptoms. (Implied if "
@@ -436,504 +544,210 @@
 msgstr ""
 "以填写 bug 模式启动。需要 --package 和可选的 --pid 参数，或单独使用 --pid 参数。如果二者均未给出，将显示一系列症状供选择。"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:753
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:753
 #: ../apport/ui.py:753
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:753
 msgid "Click a window as a target for filing a problem report."
 msgstr "点击一个窗口作为提交问题报告的目标。"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:755
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:755
 #: ../apport/ui.py:755
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:755
 msgid "Start in bug updating mode. Can take an optional --package."
 msgstr "启动错误更新模式。可以使用选项 --package 来指定软件包。"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:757
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:757
 #: ../apport/ui.py:757
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:757
 msgid ""
 "File a bug report about a symptom. (Implied if symptom name is given as only "
 "argument.)"
 msgstr "针对某个症状报告 bug。"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:759
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:759
 #: ../apport/ui.py:759
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:759
 msgid ""
 "Specify package name in --file-bug mode. This is optional if a --pid is "
 "specified. (Implied if package name is given as only argument.)"
 msgstr "--file-bug 模式中指定软件包名。如果指定了 --pid，则是可选的。(如果只给定软件包名这一个参数则为必需。)"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:761
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:761
 #: ../apport/ui.py:761
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:761
 msgid ""
 "Specify a running program in --file-bug mode. If this is specified, the bug "
 "report will contain more information.  (Implied if pid is given as only "
 "argument.)"
 msgstr "在 --file-bug 模式中指定运行的程序。如果指定，该问题报告将包含更多的信息。(默认指定 pid 作为唯一参数。)"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:763
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:763
 #: ../apport/ui.py:763
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:763
 msgid "The provided pid is a hanging application."
 msgstr "此进程号的程序是挂起的。"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:765
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:765
 #: ../apport/ui.py:765
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:765
 #, python-format
 msgid ""
 "Report the crash from given .apport or .crash file instead of the pending "
 "ones in %s. (Implied if file is given as only argument.)"
 msgstr "从给定的 .apport 或者  .crash 文件，而不是从正在处理的 %s 中汇报崩溃。(如果文件只给定了参数时实现。)"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:767
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:767
 #: ../apport/ui.py:767
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:767
 msgid ""
 "In bug filing mode, save the collected information into a file instead of "
 "reporting it. This file can then be reported later on from a different "
 "machine."
 msgstr "在提交报告过程中，将收集到的信息保存到要报告的文件中。该文件可用于稍后在另一台机器上提交。"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:771
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:771
 #: ../apport/ui.py:771
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:771
 msgid "Print the Apport version number."
 msgstr "输出 Apport 版本号"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:911
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:911
 #: ../apport/ui.py:911
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:911
 msgid ""
 "This will launch apport-retrace in a terminal window to examine the crash."
 msgstr "这将在终端窗口中启动 apport-retrace，以检查此崩溃。"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:912
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:912
 #: ../apport/ui.py:912
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:912
 msgid "Run gdb session"
 msgstr "运行 gdb 会话"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:913
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:913
 #: ../apport/ui.py:913
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:913
 msgid "Run gdb session without downloading debug symbols"
 msgstr "不下载调试符号的情况下运行 gdb 会话"
 
 #. TRANSLATORS: %s contains the crash report file name
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:915
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:915
 #: ../apport/ui.py:915
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:915
 #, python-format
 msgid "Update %s with fully symbolic stack trace"
 msgstr "利用全符号化堆栈轨迹更新 %s"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:991
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1001
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:991
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1001
 #: ../apport/ui.py:991 ../apport/ui.py:1001
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:991
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1001
 msgid ""
 "This problem report applies to a program which is not installed any more."
 msgstr "这一问题报告适用于不再安装的程序。"
 
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1016
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1016
 #: ../apport/ui.py:1016
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1016
 #, python-format
 msgid ""
 "The problem happened with the program %s which changed since the crash "
-"occurred."
-msgstr "自崩溃发生起已更改的程序 %s 出现问题。"
-
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1114
-#: ../apport/ui.py:1114
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1114
-msgid "Could not determine the package or source package name."
-msgstr "无法检测包或者源码包的名称。"
-
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1132
-#: ../apport/ui.py:1132
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1132
-msgid "Unable to start web browser"
-msgstr "无法打开浏览器"
-
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1133
-#: ../apport/ui.py:1133
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1133
-#, python-format
-msgid "Unable to start web browser to open %s."
-msgstr "无法用浏览器打开网页 %s"
-
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1213
-#: ../apport/ui.py:1213
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1213
-#, python-format
-msgid "Please enter your account information for the %s bug tracking system"
-msgstr "请为 %s 错误追踪系统输入您的帐户信息"
-
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1225
-#: ../apport/ui.py:1225
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1225
-msgid "Network problem"
-msgstr "网络问题"
-
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1227
-#: ../apport/ui.py:1227
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1227
-msgid ""
-"Cannot connect to crash database, please check your Internet connection."
-msgstr "无法连接到崩溃数据库，请检查您的 Internet 连接。"
-
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1254
-#: ../apport/ui.py:1254
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1254
-msgid "Memory exhaustion"
-msgstr "内存耗尽"
-
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1255
-#: ../apport/ui.py:1255
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1255
-msgid "Your system does not have enough memory to process this crash report."
-msgstr "你的系统没有足够的内存来处理这一次崩溃报告。"
-
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1290
-#: ../apport/ui.py:1290
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1290
-#, python-format
-msgid ""
-"The problem cannot be reported:\n"
-"\n"
-"%s"
-msgstr ""
-"无法报告问题：\n"
-"\n"
-"%s"
-
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1346
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1353
-#: ../apport/ui.py:1346 ../apport/ui.py:1353
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1346
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1353
-msgid "Problem already known"
-msgstr "该问题为已知问题"
-
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1347
-#: ../apport/ui.py:1347
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1347
-msgid ""
-"This problem was already reported in the bug report displayed in the web "
-"browser. Please check if you can add any further information that might be "
-"helpful for the developers."
-msgstr "关于这个问题，之前已经有如网页所示的报告。您是否有所补充？"
-
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1354
-#: ../apport/ui.py:1354
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1354
-msgid "This problem was already reported to developers. Thank you!"
-msgstr "已将此问题报告给开发人员。谢谢！"
-
-#: ../data/general-hooks/ubuntu.py:130
-#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:130
-msgid ""
-"An Ubuntu package has a file conflict with a package that is not a genuine "
-"Ubuntu package"
-msgstr "Ubuntu 软件包与非原生 Ubuntu 软件包发生文件冲突"
-
-#: ../data/general-hooks/ubuntu.py:147
-#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:147
-msgid ""
-"Your system was initially configured with grub version 2, but you have "
-"removed it from your system in favor of grub 1 without configuring it.  To "
-"ensure your bootloader configuration is updated whenever a new kernel is "
-"available, open a terminal and run:\n"
-"\n"
-"      sudo apt-get install grub-pc\n"
-msgstr ""
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:142 ../kde/apport-kde.py:342
-#: ../gtk/apport-gtk.py:142 ../bin/apport-cli.py:150
-#: ../debian/tmp/usr/bin/apport-cli.py:150
-#: ../debian/tmp/usr/share/apport/apport-kde.py:342
-msgid "(binary data)"
-msgstr "(二进制数据)"
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:157 ../gtk/apport-gtk.py:157
-#, python-format
-msgid "Sorry, the application %s has stopped unexpectedly."
-msgstr "对不起，应用程序 %s 意外停止。"
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:160 ../gtk/apport-gtk.py:160
-#, python-format
-msgid "Sorry, %s has closed unexpectedly."
-msgstr "对不起，%s 已意外关闭。"
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:165
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:110
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:254
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:108
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:300
-#: ../kde/apport-kde.py:176 ../kde/apport-kde.py:217 ../gtk/apport-gtk.py:165
-#: ../debian/tmp/usr/share/apport/apport-kde.py:176
-#: ../debian/tmp/usr/share/apport/apport-kde.py:217
-#, python-format
-msgid "Sorry, %s has experienced an internal error."
-msgstr "对不起，%s 出现了内部错误。"
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:177
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:286
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:404
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:429
-#: ../kde/apport-kde.py:162 ../gtk/apport-gtk.py:177 ../bin/apport-cli.py:178
-#: ../debian/tmp/usr/bin/apport-cli.py:178
-#: ../debian/tmp/usr/share/apport/apport-kde.py:162
-msgid "Send problem report to the developers?"
-msgstr "向开发者发送问题报告？"
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:186
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:292
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:412
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:437
-#: ../kde/apport-kde.py:170 ../gtk/apport-gtk.py:186
-#: ../debian/tmp/usr/share/apport/apport-kde.py:170
-msgid "Send"
-msgstr "发送"
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:228
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:276
-#: ../gtk/apport-gtk.py:228
-msgid "Force Closed"
-msgstr "强制关闭"
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:229
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:288
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:226
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:232
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:273
-#: ../kde/apport-kde.py:214 ../kde/apport-kde.py:361 ../gtk/apport-gtk.py:229
-#: ../gtk/apport-gtk.py:288 ../debian/tmp/usr/share/apport/apport-kde.py:214
-#: ../debian/tmp/usr/share/apport/apport-kde.py:361
-msgid "Relaunch"
-msgstr "重新启动程序"
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:238 ../gtk/apport-gtk.py:238
-#, python-format
-msgid "The application %s has stopped responding."
-msgstr "应用程序 %s 停止响应。"
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:242 ../gtk/apport-gtk.py:242
-#, python-format
-msgid "The program \"%s\" has stopped responding."
-msgstr "程序 %s 停止响应。"
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:257 ../kde/apport-kde.py:184
-#: ../gtk/apport-gtk.py:257 ../debian/tmp/usr/share/apport/apport-kde.py:184
-#, python-format
-msgid "Package: %s"
-msgstr "软件包：%s"
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:264
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:136
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:137
-#: ../kde/apport-kde.py:190 ../gtk/apport-gtk.py:264
-#: ../debian/tmp/usr/share/apport/apport-kde.py:190
-msgid "Sorry, a problem occurred while installing software."
-msgstr "对不起，安装软件时出现问题。"
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:273
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:292 ../kde/apport-kde.py:197
-#: ../gtk/apport-gtk.py:273 ../gtk/apport-gtk.py:292
-#: ../debian/tmp/usr/share/apport/apport-kde.py:197
-#, python-format
-msgid "The application %s has experienced an internal error."
-msgstr "应用程序 %s 发生内部错误。"
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:276 ../kde/apport-kde.py:201
-#: ../gtk/apport-gtk.py:276 ../debian/tmp/usr/share/apport/apport-kde.py:201
-#, python-format
-msgid "The application %s has closed unexpectedly."
-msgstr "应用程序 %s 已意外关闭。"
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:304 ../kde/apport-kde.py:224
-#: ../gtk/apport-gtk.py:304 ../debian/tmp/usr/share/apport/apport-kde.py:224
-msgid "Ignore future problems of this type"
-msgstr "以后忽略此类错误"
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:577 ../kde/apport-kde.py:268
-#: ../gtk/apport-gtk.py:577 ../debian/tmp/usr/share/apport/apport-kde.py:268
-msgid "Hide Details"
-msgstr "隐藏详细信息"
-
-#: ../debian/tmp/usr/share/apport/apportcheckresume.py:68
-#: ../data/apportcheckresume.py:68
-msgid ""
-"This occured during a previous suspend and prevented it from resuming "
-"properly."
-msgstr "这是在上一个挂起中发生的，并阻止了它正确地恢复。"
-
-#: ../debian/tmp/usr/share/apport/apportcheckresume.py:70
-#: ../data/apportcheckresume.py:70
-msgid ""
-"This occured during a previous hibernate and prevented it from resuming "
-"properly."
-msgstr "这是在上一个休眠中发生的，并阻止了它正确地恢复。"
-
-#: ../debian/tmp/usr/share/apport/apportcheckresume.py:75
-#: ../data/apportcheckresume.py:75
-msgid ""
-"The resume processing hung very near the end and will have appeared to have "
-"completed normally."
-msgstr "这个恢复过程已经非常接近尾声，将正常结束。"
-
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1069
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1080
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1091
-msgid "Problem in bash"
-msgstr ""
-
-#: ../bin/apport-unpack.py:22 ../debian/tmp/usr/bin/apport-unpack.py:22
-#, python-format
-msgid "Usage: %s <report> <target directory>"
-msgstr "用法：%s <报告> <目标目录>"
-
-#: ../bin/apport-unpack.py:46 ../debian/tmp/usr/bin/apport-unpack.py:46
-msgid "Destination directory exists and is not empty."
-msgstr "目标目录存在且不为空。"
-
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:144
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:148
-msgid "Package: apport 1.2.3~0ubuntu1"
-msgstr "软件包：apport 1.2.3~0ubuntu1"
-
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:180
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:221
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:184
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:225
-msgid "The application Apport has closed unexpectedly."
-msgstr "应用程序  Apport 意外关闭。"
-
-#: ../apport/com.ubuntu.apport.policy.in.h:1
-msgid "Collect system information"
-msgstr "收集系统信息"
-
-#: ../apport/com.ubuntu.apport.policy.in.h:2
-msgid ""
-"Authentication is required to collect system information for this problem "
-"report"
-msgstr "为此问题报告收集系统信息需要授权"
-
-#: ../apport/com.ubuntu.apport.policy.in.h:3
-msgid "System problem reports"
-msgstr "系统问题报告"
-
-#: ../apport/com.ubuntu.apport.policy.in.h:4
-msgid ""
-"Please enter your password to access problem reports of system programs"
-msgstr "请输入您的密码以查看系统程序问题报告。"
-
-#: ../kde/apport-kde.desktop.in.h:1 ../gtk/apport-gtk.desktop.in.h:1
-#: ../kde/apport-kde-mime.desktop.in.h:1
-msgid "Report a problem..."
-msgstr "提交一份问题报告…"
-
-#: ../kde/apport-kde.desktop.in.h:2 ../gtk/apport-gtk.desktop.in.h:2
-#: ../kde/apport-kde-mime.desktop.in.h:2
-msgid "Report a malfunction to the developers"
-msgstr "向开发者报告一个故障"
-
-#: ../bin/apport-valgrind.py:37 ../debian/tmp/usr/bin/apport-valgrind.py:37
-msgid "See man page for details."
-msgstr "更多细节请查看 man 手册。"
-
-#: ../bin/apport-valgrind.py:43 ../debian/tmp/usr/bin/apport-valgrind.py:43
-msgid "specify the log file name produced by valgrind"
-msgstr "请指定 valgrind 生成的日志文件名"
-
-#: ../bin/apport-valgrind.py:46 ../debian/tmp/usr/bin/apport-valgrind.py:46
-msgid ""
-"reuse a previously created sandbox dir (SDIR) or, if it does not exist, "
-"create it"
-msgstr ""
-
-#: ../bin/apport-valgrind.py:50 ../debian/tmp/usr/bin/apport-valgrind.py:50
-msgid ""
-"do  not  create  or reuse a sandbox directory for additional debug symbols "
-"but rely only on installed debug symbols."
-msgstr ""
-
-#: ../bin/apport-valgrind.py:54 ../debian/tmp/usr/bin/apport-valgrind.py:54
-msgid ""
-"reuse a previously created cache dir (CDIR) or, if it does not exist, create "
-"it"
-msgstr ""
-
-#: ../bin/apport-valgrind.py:58 ../debian/tmp/usr/bin/apport-valgrind.py:58
-msgid ""
-"report download/install progress when installing packages into sandbox"
-msgstr ""
+"occurred."
+msgstr "自崩溃发生起已更改的程序 %s 出现问题。"
 
-#: ../bin/apport-valgrind.py:62 ../debian/tmp/usr/bin/apport-valgrind.py:62
-msgid ""
-"the executable that is run under valgrind's memcheck tool  for memory leak "
-"detection"
-msgstr ""
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1114
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1114
+#: ../apport/ui.py:1114
+msgid "Could not determine the package or source package name."
+msgstr "无法检测包或者源码包的名称。"
 
-#: ../bin/apport-valgrind.py:66 ../debian/tmp/usr/bin/apport-retrace.py:59
-#: ../bin/apport-retrace.py:59 ../debian/tmp/usr/bin/apport-valgrind.py:66
-msgid ""
-"Install an extra package into the sandbox (can be specified multiple times)"
-msgstr "将其他软件包安装到沙盒(可多次加以指定)中"
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1132
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1132
+#: ../apport/ui.py:1132
+msgid "Unable to start web browser"
+msgstr "无法打开浏览器"
 
-#: ../bin/apport-valgrind.py:97 ../debian/tmp/usr/bin/apport-valgrind.py:97
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1133
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1133
+#: ../apport/ui.py:1133
 #, python-format
-msgid "Error: %s is not an executable. Stopping."
-msgstr "错误：%s 不是可执行文件，停止。"
-
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:263
-msgid "The application Apport has stopped responding."
-msgstr "应用程序  Apport 停止响应。"
+msgid "Unable to start web browser to open %s."
+msgstr "无法用浏览器打开网页 %s"
 
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:265
-msgid "You can wait to see if it wakes up, or close or relaunch it."
-msgstr ""
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1232
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1232
+#: ../apport/ui.py:1232
+#, python-format
+msgid "Please enter your account information for the %s bug tracking system"
+msgstr "请为 %s 错误追踪系统输入您的帐户信息"
 
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:340
-msgid "Sorry, the application apport has stopped unexpectedly."
-msgstr "对不起，应用程序已经意外停止。"
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1244
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1244
+#: ../apport/ui.py:1244
+msgid "Network problem"
+msgstr "网络问题"
 
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:357
-msgid "Sorry, apport has closed unexpectedly."
-msgstr "对不起，Apport 意外关闭。"
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1246
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1246
+#: ../apport/ui.py:1246
+msgid ""
+"Cannot connect to crash database, please check your Internet connection."
+msgstr "无法连接到崩溃数据库，请检查您的 Internet 连接。"
 
-#: ../kde/apport-kde.py:294 ../debian/tmp/usr/share/apport/apport-kde.py:294
-msgid "Username:"
-msgstr "用户名："
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1273
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1273
+#: ../apport/ui.py:1273
+msgid "Memory exhaustion"
+msgstr "内存耗尽"
 
-#: ../kde/apport-kde.py:295 ../debian/tmp/usr/share/apport/apport-kde.py:295
-msgid "Password:"
-msgstr "密码："
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1274
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1274
+#: ../apport/ui.py:1274
+msgid "Your system does not have enough memory to process this crash report."
+msgstr "你的系统没有足够的内存来处理这一次崩溃报告。"
 
-#: ../kde/apport-kde.py:386 ../debian/tmp/usr/share/apport/apport-kde.py:386
-msgid "Collecting Problem Information"
-msgstr "正在收集问题信息"
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1309
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1309
+#: ../apport/ui.py:1309
+#, python-format
+msgid ""
+"The problem cannot be reported:\n"
+"\n"
+"%s"
+msgstr ""
+"无法报告问题：\n"
+"\n"
+"%s"
 
-#: ../kde/apport-kde.py:387 ../bin/apport-cli.py:238
-#: ../debian/tmp/usr/bin/apport-cli.py:238
-#: ../debian/tmp/usr/share/apport/apport-kde.py:387
-msgid "Collecting problem information"
-msgstr "正在收集问题信息"
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1365
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1372
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1365
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1372
+#: ../apport/ui.py:1365 ../apport/ui.py:1372
+msgid "Problem already known"
+msgstr "该问题为已知问题"
 
-#: ../kde/apport-kde.py:388 ../debian/tmp/usr/share/apport/apport-kde.py:388
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1366
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1366
+#: ../apport/ui.py:1366
 msgid ""
-"The collected information can be sent to the developers to improve the "
-"application. This might take a few minutes."
-msgstr "收集到的信息可以发送给开发者来改进程序。这可能要花费几分钟的时间。"
+"This problem was already reported in the bug report displayed in the web "
+"browser. Please check if you can add any further information that might be "
+"helpful for the developers."
+msgstr "关于这个问题，之前已经有如网页所示的报告。您是否有所补充？"
 
-#: ../kde/apport-kde.py:414 ../debian/tmp/usr/share/apport/apport-kde.py:414
-msgid "Uploading Problem Information"
-msgstr "上传问题信息"
+#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1373
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1373
+#: ../apport/ui.py:1373
+msgid "This problem was already reported to developers. Thank you!"
+msgstr "已将此问题报告给开发人员。谢谢！"
+
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1069
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1080
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1091
+msgid "Problem in bash"
+msgstr ""
 
 #: ../debian/tmp/usr/bin/apport-retrace.py:31 ../bin/apport-retrace.py:31
 msgid "%prog [options] <apport problem report | crash ID>"
@@ -1005,6 +819,13 @@
 "downloaded package is also extracted to this sandbox."
 msgstr ""
 
+#: ../debian/tmp/usr/bin/apport-retrace.py:59
+#: ../debian/tmp/usr/bin/apport-valgrind.py:66 ../bin/apport-retrace.py:59
+#: ../bin/apport-valgrind.py:66
+msgid ""
+"Install an extra package into the sandbox (can be specified multiple times)"
+msgstr "将其他软件包安装到沙盒(可多次加以指定)中"
+
 #: ../debian/tmp/usr/bin/apport-retrace.py:61 ../bin/apport-retrace.py:61
 msgid ""
 "Path to a file with the crash database authentication information. This is "
@@ -1042,10 +863,6 @@
 msgid "OK to send these as attachments? [y/n]"
 msgstr "确定以附件形式发送这些？[y/n]"
 
-#: ../kde/apport-kde-mimelnk.desktop.in.h:1
-msgid "Apport crash file"
-msgstr "Apport 崩溃文件"
-
 #: ../bin/apport-cli.py:74 ../debian/tmp/usr/bin/apport-cli.py:74
 msgid "Press any key to continue..."
 msgstr "按任意键继续…"
@@ -1178,3 +995,186 @@
 #: ../bin/apport-cli.py:371 ../debian/tmp/usr/bin/apport-cli.py:371
 msgid "No pending crash reports. Try --help for more information."
 msgstr "没有已知的崩溃报告，尝试 --help 以获得更多信息。"
+
+#: ../apport/com.ubuntu.apport.policy.in.h:1
+msgid "Collect system information"
+msgstr "收集系统信息"
+
+#: ../apport/com.ubuntu.apport.policy.in.h:2
+msgid ""
+"Authentication is required to collect system information for this problem "
+"report"
+msgstr "为此问题报告收集系统信息需要授权"
+
+#: ../apport/com.ubuntu.apport.policy.in.h:3
+msgid "System problem reports"
+msgstr "系统问题报告"
+
+#: ../apport/com.ubuntu.apport.policy.in.h:4
+msgid ""
+"Please enter your password to access problem reports of system programs"
+msgstr "请输入您的密码以查看系统程序问题报告。"
+
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:2 ../gtk/apport-gtk.ui.h:2
+msgid "Crash report"
+msgstr "崩溃报告"
+
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:3 ../gtk/apport-gtk.ui.h:3
+msgid "<big><b>Sorry, an internal error happened.</b></big>"
+msgstr "<big><b>对不起，发生内部错误。</b></big>"
+
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:5 ../gtk/apport-gtk.ui.h:5
+msgid "Send an error report to help fix this problem"
+msgstr "请发送错误报告，以帮助修复此问题"
+
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:6 ../gtk/apport-gtk.ui.h:6
+msgid "Ignore future problems of this program version"
+msgstr "以后忽略此版本程序的问题"
+
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:8 ../gtk/apport-gtk.ui.h:8
+msgid "_Examine locally"
+msgstr "本地检查(&E)"
+
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:11 ../gtk/apport-gtk.ui.h:11
+msgid "<big><b>Collecting problem information</b></big>"
+msgstr "<big><b>正在收集问题信息</b></big>"
+
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:12 ../gtk/apport-gtk.ui.h:12
+msgid ""
+"Information is being collected that may help the developers fix the problem "
+"you report."
+msgstr "正在收集信息，这些信息将会帮助开发人员修复您报告的问题。"
+
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:14 ../gtk/apport-gtk.ui.h:14
+msgid "<big><b>Uploading problem information</b></big>"
+msgstr "<big><b>正在上传问题信息</b></big>"
+
+#: ../debian/tmp/usr/bin/apport-valgrind.py:37 ../bin/apport-valgrind.py:37
+msgid "See man page for details."
+msgstr "更多细节请查看 man 手册。"
+
+#: ../debian/tmp/usr/bin/apport-valgrind.py:43 ../bin/apport-valgrind.py:43
+msgid "specify the log file name produced by valgrind"
+msgstr "请指定 valgrind 生成的日志文件名"
+
+#: ../debian/tmp/usr/bin/apport-valgrind.py:46 ../bin/apport-valgrind.py:46
+msgid ""
+"reuse a previously created sandbox dir (SDIR) or, if it does not exist, "
+"create it"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-valgrind.py:50 ../bin/apport-valgrind.py:50
+msgid ""
+"do  not  create  or reuse a sandbox directory for additional debug symbols "
+"but rely only on installed debug symbols."
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-valgrind.py:54 ../bin/apport-valgrind.py:54
+msgid ""
+"reuse a previously created cache dir (CDIR) or, if it does not exist, create "
+"it"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-valgrind.py:58 ../bin/apport-valgrind.py:58
+msgid ""
+"report download/install progress when installing packages into sandbox"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-valgrind.py:62 ../bin/apport-valgrind.py:62
+msgid ""
+"the executable that is run under valgrind's memcheck tool  for memory leak "
+"detection"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-valgrind.py:97 ../bin/apport-valgrind.py:97
+#, python-format
+msgid "Error: %s is not an executable. Stopping."
+msgstr "错误：%s 不是可执行文件，停止。"
+
+#: ../bin/apport-unpack.py:22 ../debian/tmp/usr/bin/apport-unpack.py:22
+#, python-format
+msgid "Usage: %s <report> <target directory>"
+msgstr "用法：%s <报告> <目标目录>"
+
+#: ../bin/apport-unpack.py:46 ../debian/tmp/usr/bin/apport-unpack.py:46
+msgid "Destination directory exists and is not empty."
+msgstr "目标目录存在且不为空。"
+
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:144
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:148
+msgid "Package: apport 1.2.3~0ubuntu1"
+msgstr "软件包：apport 1.2.3~0ubuntu1"
+
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:180
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:221
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:184
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:225
+msgid "The application Apport has closed unexpectedly."
+msgstr "应用程序  Apport 意外关闭。"
+
+#: ../kde/apport-kde-mimelnk.desktop.in.h:1
+msgid "Apport crash file"
+msgstr "Apport 崩溃文件"
+
+#: ../data/kernel_oops.py:30 ../debian/tmp/usr/share/apport/kernel_oops.py:30
+msgid "Your system might become unstable now and might need to be restarted."
+msgstr "您的系统可能现在不稳定，它也许需要重启。"
+
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:263
+msgid "The application Apport has stopped responding."
+msgstr "应用程序  Apport 停止响应。"
+
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:265
+msgid "You can wait to see if it wakes up, or close or relaunch it."
+msgstr ""
+
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:276
+#: ../gtk/apport-gtk.py:228 ../debian/tmp/usr/share/apport/apport-gtk.py:228
+msgid "Force Closed"
+msgstr "强制关闭"
+
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:340
+msgid "Sorry, the application apport has stopped unexpectedly."
+msgstr "对不起，应用程序已经意外停止。"
+
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:357
+msgid "Sorry, apport has closed unexpectedly."
+msgstr "对不起，Apport 意外关闭。"
+
+#: ../gtk/apport-gtk.py:157 ../debian/tmp/usr/share/apport/apport-gtk.py:157
+#, python-format
+msgid "Sorry, the application %s has stopped unexpectedly."
+msgstr "对不起，应用程序 %s 意外停止。"
+
+#: ../gtk/apport-gtk.py:160 ../debian/tmp/usr/share/apport/apport-gtk.py:160
+#, python-format
+msgid "Sorry, %s has closed unexpectedly."
+msgstr "对不起，%s 已意外关闭。"
+
+#: ../gtk/apport-gtk.py:238 ../debian/tmp/usr/share/apport/apport-gtk.py:238
+#, python-format
+msgid "The application %s has stopped responding."
+msgstr "应用程序 %s 停止响应。"
+
+#: ../gtk/apport-gtk.py:242 ../debian/tmp/usr/share/apport/apport-gtk.py:242
+#, python-format
+msgid "The program \"%s\" has stopped responding."
+msgstr "程序 %s 停止响应。"
+
+#: ../data/general-hooks/ubuntu.py:130
+#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:130
+msgid ""
+"An Ubuntu package has a file conflict with a package that is not a genuine "
+"Ubuntu package"
+msgstr "Ubuntu 软件包与非原生 Ubuntu 软件包发生文件冲突"
+
+#: ../data/general-hooks/ubuntu.py:147
+#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:147
+msgid ""
+"Your system was initially configured with grub version 2, but you have "
+"removed it from your system in favor of grub 1 without configuring it.  To "
+"ensure your bootloader configuration is updated whenever a new kernel is "
+"available, open a terminal and run:\n"
+"\n"
+"      sudo apt-get install grub-pc\n"
+msgstr ""
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/aptitude.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/aptitude.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/aptitude.po	2014-02-24 08:24:23.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/aptitude.po	2014-03-24 09:42:31.000000000 +0000
@@ -22,8 +22,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-02-20 10:34+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 10:34+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/apt-listchanges.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/apt-listchanges.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/apt-listchanges.po	2014-02-24 08:24:23.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/apt-listchanges.po	2014-03-24 09:42:31.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 10:32+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 10:33+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Generated-By: pygettext.py 1.4\n"
 
 #: ../apt-listchanges.py:80
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/apt.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/apt.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/apt.po	2014-02-24 08:24:23.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/apt.po	2014-03-24 09:42:31.000000000 +0000
@@ -10,15 +10,15 @@
 "Project-Id-Version: apt 0.8.0~pre1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-03-15 19:05+0000\n"
-"PO-Revision-Date: 2014-02-17 19:06+0000\n"
+"PO-Revision-Date: 2014-02-28 15:01+0000\n"
 "Last-Translator: Aron Xu <Unknown>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-02-20 10:32+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 10:32+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: \n"
 
 #: cmdline/apt-cache.cc:141
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/apturl.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/apturl.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/apturl.po	2014-02-24 08:24:42.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/apturl.po	2014-03-24 09:42:49.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: apturl\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-02-17 17:31+0000\n"
+"POT-Creation-Date: 2014-03-16 03:03+0000\n"
 "PO-Revision-Date: 2011-08-20 10:38+0000\n"
 "Last-Translator: David Gao <Unknown>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:59+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:31+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: ../apturl-gtk:49 ../apturl-kde:52
 msgid "User requested interrupt."
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/aspell.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/aspell.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/aspell.po	2014-02-24 08:24:23.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/aspell.po	2014-03-24 09:42:31.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 10:34+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 10:35+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: common/info.cpp:232
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/attr.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/attr.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/attr.po	2014-02-24 08:24:23.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/attr.po	2014-03-24 09:42:31.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 10:34+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 10:35+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: ../attr/attr.c:46
 #, c-format
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/avahi.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/avahi.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/avahi.po	2014-02-24 08:24:37.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/avahi.po	2014-03-24 09:42:44.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:16+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:34+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: \n"
 
 #: ../avahi-common/error.c:30
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/bacula.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/bacula.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/bacula.po	2014-02-24 08:24:35.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/bacula.po	2014-03-24 09:42:42.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:02+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:19+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: src/dird/jobq.c:74
 #, c-format
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/bash.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/bash.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/bash.po	2014-02-24 08:24:24.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/bash.po	2014-03-24 09:42:31.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-02-20 10:35+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 10:36+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: arrayfunc.c:50
 msgid "bad array subscript"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/bfd.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/bfd.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/bfd.po	2014-02-24 08:24:24.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/bfd.po	2014-03-24 09:42:31.000000000 +0000
@@ -7,14 +7,14 @@
 "Project-Id-Version: bfd 2.12.91\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-10-25 11:58+0100\n"
-"PO-Revision-Date: 2014-02-19 02:54+0000\n"
+"PO-Revision-Date: 2014-03-05 07:58+0000\n"
 "Last-Translator: Wang Li <Unknown>\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"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 10:36+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 10:37+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: aout-adobe.c:127
 msgid "%B: Unknown section type in a.out.adobe file: %x\n"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/binutils.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/binutils.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/binutils.po	2014-02-24 08:24:24.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/binutils.po	2014-03-24 09:42:31.000000000 +0000
@@ -7,14 +7,14 @@
 "Project-Id-Version: binutils 2.12.91\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-10-25 11:20+0100\n"
-"PO-Revision-Date: 2014-02-19 02:49+0000\n"
+"PO-Revision-Date: 2014-03-05 05:59+0000\n"
 "Last-Translator: Wang Li <Unknown>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 10:37+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 10:38+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: addr2line.c:81
 #, c-format
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/bison.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/bison.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/bison.po	2014-02-24 08:24:24.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/bison.po	2014-03-24 09:42:32.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-02-20 10:39+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 10:41+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: src/complain.c:322
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/bison-runtime.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/bison-runtime.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/bison-runtime.po	2014-02-24 08:24:24.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/bison-runtime.po	2014-03-24 09:42:32.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 10:39+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 10:42+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: data/glr.c:770 data/yacc.c:643
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/byobu.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/byobu.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/byobu.po	2014-02-24 08:24:44.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/byobu.po	2014-03-24 09:42:52.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:16+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:50+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: bin/menu:34 byobu-config:129 byobu-config:401 byobu-config:409
 msgid "Menu"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/bzr.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/bzr.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/bzr.po	2014-02-24 08:24:37.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/bzr.po	2014-03-24 09:42:44.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:17+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:36+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: bzrlib/add.py:93
 msgid "skipping {0} (larger than {1} of {2} bytes)"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/colord.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/colord.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/colord.po	2014-02-24 08:24:47.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/colord.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,641 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Translators:
-# Tommy He <lovenemesis@gmail.com>, 2012
-msgid ""
-msgstr ""
-"Project-Id-Version: colord\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-11 03:30+0000\n"
-"PO-Revision-Date: 2012-12-25 17:57+0000\n"
-"Last-Translator: Richard Hughes <richard@hughsie.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-12 14:42+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
-"Language: zh_CN\n"
-
-#. TRANSLATORS: command line option
-#: ../client/cd-create-profile.c:329
-msgid "The profile description"
-msgstr "配置文件描述"
-
-#. TRANSLATORS: command line option
-#: ../client/cd-create-profile.c:332
-msgid "The profile copyright"
-msgstr "配置文件版权"
-
-#. TRANSLATORS: command line option
-#: ../client/cd-create-profile.c:335
-msgid "The device model"
-msgstr "设备型号"
-
-#. TRANSLATORS: command line option
-#: ../client/cd-create-profile.c:338
-msgid "The device manufacturer"
-msgstr "设备制造商"
-
-#. TRANSLATORS: command line option
-#: ../client/cd-create-profile.c:341
-msgid "Profile to create"
-msgstr "要创建的配置文件"
-
-#. TRANSLATORS: command line option
-#: ../client/cd-create-profile.c:344
-msgid "Named color CSV filename"
-msgstr "命名色彩 CSV 文件"
-
-#. TRANSLATORS: command line option
-#: ../client/cd-create-profile.c:347
-msgid "Named color type, e.g. 'lab' or 'srgb'"
-msgstr "命名色彩类型，例如 'lab' 或 'srgb'"
-
-#. TRANSLATORS: command line option
-#: ../client/cd-create-profile.c:350
-msgid "A gamma string, e.g. '0.8,0.8,0.6'"
-msgstr "Gamma 字符串，例如 '0.8,0.8,0.6'"
-
-#. TRANSLATORS: command line option
-#: ../client/cd-create-profile.c:353
-msgid "Named color prefix"
-msgstr "命名色彩前缀"
-
-#. TRANSLATORS: command line option
-#: ../client/cd-create-profile.c:356
-msgid "Named color suffix"
-msgstr "命名色彩后缀"
-
-#. TRANSLATORS: command line option
-#: ../client/cd-create-profile.c:359
-msgid "The metadata in 'key1=value1,key2=value2' format"
-msgstr "如 'key1=value1,key2=value2' 格式的元数据"
-
-#. TRANSLATORS: command line tool
-#: ../client/cd-create-profile.c:370
-msgid "ICC profile creation program"
-msgstr "ICC 配置文件创建程序"
-
-#: ../client/cd-create-profile.c:376
-msgid "Failed to parse arguments"
-msgstr "传递参数失败"
-
-#. TRANSLATORS: the user forgot to use -o
-#: ../client/cd-create-profile.c:386
-msgid "No output filename specified"
-msgstr "未指定输出文件名"
-
-#. TRANSLATORS: the user forgot to use an action
-#: ../client/cd-create-profile.c:402
-msgid "No data to create profile"
-msgstr "没有数据可用来创建配置文件"
-
-#. TRANSLATORS: this is a command alias
-#: ../client/cd-fix-profile.c:91 ../client/cd-util.c:496
-#, c-format
-msgid "Alias to %s"
-msgstr "别名为 %s"
-
-#: ../client/cd-fix-profile.c:169 ../client/cd-util.c:574
-msgid "Command not found, valid commands are:"
-msgstr "未找到命令，有效的命令为："
-
-#: ../client/cd-fix-profile.c:924
-msgid "Description"
-msgstr "描述"
-
-#: ../client/cd-fix-profile.c:927
-msgid "Manufacturer"
-msgstr "制造商"
-
-#. TRANSLATORS: the device model
-#. TRANSLATORS: sensor model
-#: ../client/cd-fix-profile.c:930 ../client/cd-util.c:227
-#: ../client/cd-util.c:376
-msgid "Model"
-msgstr "型号"
-
-#: ../client/cd-fix-profile.c:933
-msgid "Copyright"
-msgstr "版权"
-
-#: ../client/cd-fix-profile.c:938
-msgid "No metadata"
-msgstr "没有元数据"
-
-#. TRANSLATORS: the metadata for the device
-#: ../client/cd-fix-profile.c:948 ../client/cd-util.c:182
-#: ../client/cd-util.c:296
-msgid "Metadata"
-msgstr "元数据"
-
-#. TRANSLATORS: command line option
-#: ../client/cd-fix-profile.c:995
-msgid "Show extra debugging information"
-msgstr "显示额外的除错信息"
-
-#. TRANSLATORS: command description
-#: ../client/cd-fix-profile.c:1023
-msgid "Show all the details about the profile"
-msgstr "显示关于此配置文件的所有详情"
-
-#. TRANSLATORS: command description
-#: ../client/cd-fix-profile.c:1028
-msgid "Clear any metadata in the profile"
-msgstr "清除该配置文件的所有元数据"
-
-#. TRANSLATORS: command description
-#: ../client/cd-fix-profile.c:1033
-msgid "Initialize any metadata for the profile"
-msgstr "初始化该配置文件的元数据"
-
-#. TRANSLATORS: command description
-#: ../client/cd-fix-profile.c:1038
-msgid "Add a metadata item to the profile"
-msgstr "向该配置文件添加一个元数据项目"
-
-#. TRANSLATORS: command description
-#: ../client/cd-fix-profile.c:1043
-msgid "Remove a metadata item from the profile"
-msgstr "从该配置文件移除一个元数据项目"
-
-#. TRANSLATORS: command description
-#: ../client/cd-fix-profile.c:1048
-msgid "Sets the copyright string"
-msgstr "设定版权字符串"
-
-#. TRANSLATORS: command description
-#: ../client/cd-fix-profile.c:1053
-msgid "Sets the description string"
-msgstr "设定描述字符串"
-
-#. TRANSLATORS: command description
-#: ../client/cd-fix-profile.c:1058
-msgid "Sets the manufacturer string"
-msgstr "设定制造商字符串"
-
-#. TRANSLATORS: command description
-#: ../client/cd-fix-profile.c:1063
-msgid "Sets the model string"
-msgstr "设定型号字符串"
-
-#. TRANSLATORS: command description
-#: ../client/cd-fix-profile.c:1068
-msgid "Automatically fix metadata in the profile"
-msgstr "自动修复配置文件中的元数据"
-
-#. TRANSLATORS: program name
-#: ../client/cd-fix-profile.c:1081 ../client/cd-util.c:2012
-#: ../src/cd-main.c:1808
-msgid "Color Management"
-msgstr "色彩管理"
-
-#. TRANSLATORS: this is the profile creation date strftime format
-#: ../client/cd-util.c:86
-msgid "%B %e %Y, %I:%M:%S %p"
-msgstr "%B %e %Y, %I:%M:%S %p"
-
-#. TRANSLATORS: profile owner
-#: ../client/cd-util.c:101
-msgid "Owner"
-msgstr "拥有者"
-
-#. TRANSLATORS: the internal DBus path
-#: ../client/cd-util.c:120 ../client/cd-util.c:207 ../client/cd-util.c:333
-msgid "Object Path"
-msgstr "对象路径"
-
-#. TRANSLATORS: the profile format, e.g.
-#. * ColorModel.OutputMode.OutputResolution
-#. TRANSLATORS: the device format, e.g.
-#. * ColorModel.OutputMode.OutputResolution
-#: ../client/cd-util.c:127 ../client/cd-util.c:247
-msgid "Format"
-msgstr "格式"
-
-#. TRANSLATORS: the profile title, e.g.
-#. * "ColorMunki, HP Deskjet d1300 Series"
-#: ../client/cd-util.c:133
-msgid "Title"
-msgstr "标题"
-
-#. TRANSLATORS: the profile qualifier, e.g. RGB.Plain.300dpi
-#: ../client/cd-util.c:138
-msgid "Qualifier"
-msgstr "限定符"
-
-#. TRANSLATORS: the profile type, e.g. 'output'
-#. TRANSLATORS: the device type, e.g. "printer"
-#. TRANSLATORS: the sensor type, e.g. 'output'
-#: ../client/cd-util.c:143 ../client/cd-util.c:223 ../client/cd-util.c:355
-msgid "Type"
-msgstr "类型"
-
-#. TRANSLATORS: the profile colorspace, e.g. 'rgb'
-#. TRANSLATORS: the device colorspace, e.g. "rgb"
-#: ../client/cd-util.c:149 ../client/cd-util.c:258
-msgid "Colorspace"
-msgstr "色彩空间"
-
-#. TRANSLATORS: the object scope, e.g. temp, disk, etc
-#: ../client/cd-util.c:155 ../client/cd-util.c:253
-msgid "Scope"
-msgstr "范围"
-
-#. TRANSLATORS: if the profile has a Video Card Gamma Table lookup
-#: ../client/cd-util.c:160
-msgid "Gamma Table"
-msgstr "Gamma 表"
-
-#. TRANSLATORS: profile filename
-#: ../client/cd-util.c:164
-msgid "Filename"
-msgstr "文件名"
-
-#. TRANSLATORS: profile identifier
-#: ../client/cd-util.c:168
-msgid "Profile ID"
-msgstr "配置文件 ID"
-
-#. TRANSLATORS: this is the time the device was registered
-#. * with colord, and probably is the same as the system startup
-#. * unless the device has been explicitly saved in the database
-#: ../client/cd-util.c:214
-msgid "Created"
-msgstr "创建于"
-
-#. TRANSLATORS: this is the time of the last calibration or when
-#. * the manufacturer-provided profile was assigned by the user
-#: ../client/cd-util.c:219
-msgid "Modified"
-msgstr "修改于"
-
-#. TRANSLATORS: the device vendor
-#. TRANSLATORS: sensor vendor
-#: ../client/cd-util.c:231 ../client/cd-util.c:383
-msgid "Vendor"
-msgstr "厂商"
-
-#: ../client/cd-util.c:236
-msgid "Inhibitors"
-msgstr ""
-
-#. TRANSLATORS: the device serial number
-#: ../client/cd-util.c:240
-msgid "Serial"
-msgstr "序列号"
-
-#. TRANSLATORS: the device identifier
-#: ../client/cd-util.c:262
-msgid "Device ID"
-msgstr "设备 ID"
-
-#. TRANSLATORS: the profile for the device
-#: ../client/cd-util.c:270
-msgid "Profile"
-msgstr "配置文件"
-
-#. TRANSLATORS: the sensor state, e.g. 'idle'
-#: ../client/cd-util.c:362
-msgid "State"
-msgstr "状态"
-
-#. TRANSLATORS: sensor serial
-#: ../client/cd-util.c:369
-msgid "Serial number"
-msgstr "序列号"
-
-#. TRANSLATORS: the options for the sensor
-#: ../client/cd-util.c:403
-msgid "Options"
-msgstr "选项"
-
-#. TRANSLATORS: if the sensor has a colord native driver
-#: ../client/cd-util.c:408
-msgid "Native"
-msgstr "原生"
-
-#. TRANSLATORS: if the sensor is locked
-#: ../client/cd-util.c:412
-msgid "Locked"
-msgstr "锁定"
-
-#. TRANSLATORS: if the sensor supports calibrating an LCD display
-#: ../client/cd-util.c:416
-msgid "LCD"
-msgstr "LCD"
-
-#. TRANSLATORS: if the sensor supports calibrating a CRT display
-#: ../client/cd-util.c:420
-msgid "CRT"
-msgstr "CRT"
-
-#. TRANSLATORS: if the sensor supports calibrating a printer
-#: ../client/cd-util.c:424
-msgid "Printer"
-msgstr "打印机"
-
-#. TRANSLATORS: if the sensor supports spot measurements
-#: ../client/cd-util.c:428
-msgid "Spot"
-msgstr "点距"
-
-#. TRANSLATORS: if the sensor supports calibrating a projector
-#: ../client/cd-util.c:432
-msgid "Projector"
-msgstr "投影仪"
-
-#. TRANSLATORS: if the sensor supports getting the ambient light level
-#: ../client/cd-util.c:436
-msgid "Ambient"
-msgstr "环境光"
-
-#: ../client/cd-util.c:709 ../client/cd-util.c:747 ../client/cd-util.c:810
-#: ../client/cd-util.c:899
-msgid "There are no supported sensors attached"
-msgstr "未连结任何支持的传感器"
-
-#. TRANSLATORS: this is the sensor title
-#: ../client/cd-util.c:846 ../client/cd-util.c:922
-msgid "Sensor"
-msgstr "传感器"
-
-#: ../client/cd-util.c:857
-msgid "Color"
-msgstr "色彩"
-
-#. TRANSLATORS: command description
-#: ../client/cd-util.c:1869
-msgid "Gets all the color managed devices"
-msgstr "获取全部色彩管理设备"
-
-#. TRANSLATORS: command description
-#: ../client/cd-util.c:1874
-msgid "Gets all the color managed devices of a specific kind"
-msgstr "获取指定类型的全部色彩管理设备"
-
-#. TRANSLATORS: command description
-#: ../client/cd-util.c:1879
-msgid "Gets all the available color profiles"
-msgstr "获取所有可用的色彩配置文件"
-
-#. TRANSLATORS: command description
-#: ../client/cd-util.c:1884
-msgid "Gets all the available color sensors"
-msgstr "获取所有可用的色彩传感器"
-
-#. TRANSLATORS: command description
-#: ../client/cd-util.c:1889
-msgid "Gets a reading from a sensor"
-msgstr "获得传感器读数"
-
-#. TRANSLATORS: command description
-#: ../client/cd-util.c:1894
-msgid "Locks the color sensor"
-msgstr "锁定色彩传感器"
-
-#. TRANSLATORS: command description
-#: ../client/cd-util.c:1899
-msgid "Sets one or more sensor options"
-msgstr "设定一个或多个传感器选项"
-
-#. TRANSLATORS: command description
-#: ../client/cd-util.c:1904
-msgid "Create a device"
-msgstr "创建设备"
-
-#. TRANSLATORS: command description
-#: ../client/cd-util.c:1909
-msgid "Find a device"
-msgstr "查找设备"
-
-#. TRANSLATORS: command description
-#: ../client/cd-util.c:1914
-msgid "Find a device that has a specific property"
-msgstr "查找包含指定属性的设备"
-
-#. TRANSLATORS: command description
-#: ../client/cd-util.c:1919
-msgid "Find a profile"
-msgstr "查找配置文件"
-
-#. TRANSLATORS: command description
-#: ../client/cd-util.c:1924
-msgid "Find a profile by filename"
-msgstr "依据文件名查找配置文件"
-
-#. TRANSLATORS: command description
-#: ../client/cd-util.c:1929
-msgid "Get a standard colorspace"
-msgstr "获取标准色彩空间"
-
-#. TRANSLATORS: command description
-#: ../client/cd-util.c:1934
-msgid "Create a profile"
-msgstr "创建配置文件"
-
-#. TRANSLATORS: command description
-#: ../client/cd-util.c:1939
-msgid "Add a profile to a device"
-msgstr "关联一个配置文件到设备"
-
-#. TRANSLATORS: command description
-#: ../client/cd-util.c:1944
-msgid "Makes a profile default for a device"
-msgstr "设定设备的默认配置文件"
-
-#. TRANSLATORS: command description
-#: ../client/cd-util.c:1949
-msgid "Deletes a device"
-msgstr "删除设备"
-
-#. TRANSLATORS: command description
-#: ../client/cd-util.c:1954
-msgid "Deletes a profile"
-msgstr "删除配置文件"
-
-#. TRANSLATORS: command description
-#: ../client/cd-util.c:1959
-msgid "Sets the profile qualifier"
-msgstr "设定配置文件限定符"
-
-#. TRANSLATORS: command description
-#: ../client/cd-util.c:1964
-msgid "Sets the profile filename"
-msgstr "设定配置文件名"
-
-#. TRANSLATORS: command description
-#: ../client/cd-util.c:1969
-msgid "Sets the device model"
-msgstr "设定设备型号"
-
-#. TRANSLATORS: command description
-#: ../client/cd-util.c:1974
-msgid "Gets the default profile for a device"
-msgstr "获取设备的默认配置文件"
-
-#. TRANSLATORS: command description
-#: ../client/cd-util.c:1979
-msgid "Sets the device vendor"
-msgstr "设定设备厂商"
-
-#. TRANSLATORS: command description
-#: ../client/cd-util.c:1984
-msgid "Sets the device serial"
-msgstr "设定设备序列号"
-
-#. TRANSLATORS: command description
-#: ../client/cd-util.c:1989
-msgid "Sets the device kind"
-msgstr "设定设备类型"
-
-#. TRANSLATORS: command description
-#: ../client/cd-util.c:1994
-msgid "Inhibits color profiles for this device"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: ../client/cd-util.c:1999
-msgid "Returns all the profiles that match a qualifier"
-msgstr "返回所有符合限定符的配置文件"
-
-#. TRANSLATORS: no colord available
-#: ../client/cd-util.c:2020
-msgid "No connection to colord:"
-msgstr "未连结到 colord："
-
-#. SECURITY:
-#. - Normal users should not have to authenticate to add devices
-#. 
-#: ../policy/org.freedesktop.color.policy.in.in.h:4
-msgid "Create a color managed device"
-msgstr "创建色彩管理设备"
-
-#: ../policy/org.freedesktop.color.policy.in.in.h:5
-msgid "Authentication is required to create a color managed device"
-msgstr "需要授权来创建色彩管理设备"
-
-#. SECURITY:
-#. - Normal users should not have to authenticate to add profiles
-#. 
-#: ../policy/org.freedesktop.color.policy.in.in.h:9
-msgid "Create a color profile"
-msgstr "创建色彩配置文件"
-
-#: ../policy/org.freedesktop.color.policy.in.in.h:10
-msgid "Authentication is required to create a color profile"
-msgstr "需要授权来创建色彩配置文件"
-
-#. SECURITY:
-#. - Normal users should not have to authenticate to delete devices
-#. 
-#: ../policy/org.freedesktop.color.policy.in.in.h:14
-msgid "Remove a color managed device"
-msgstr "移除色彩管理设备"
-
-#: ../policy/org.freedesktop.color.policy.in.in.h:15
-msgid "Authentication is required to remove a color managed device"
-msgstr "需要授权来移除色彩管理设备"
-
-#. SECURITY:
-#. - Normal users should not have to authenticate to delete profiles
-#. 
-#: ../policy/org.freedesktop.color.policy.in.in.h:19
-msgid "Remove a color profile"
-msgstr "移除色彩配置文件"
-
-#: ../policy/org.freedesktop.color.policy.in.in.h:20
-msgid "Authentication is required to remove a color profile"
-msgstr "需要授权来移除色彩配置文件"
-
-#. SECURITY:
-#. - Normal users should not have to authenticate to modify devices
-#. 
-#: ../policy/org.freedesktop.color.policy.in.in.h:24
-msgid "Modify color settings for a device"
-msgstr "修改指定设备的色彩设定"
-
-#: ../policy/org.freedesktop.color.policy.in.in.h:25
-msgid "Authentication is required to modify the color settings for a device"
-msgstr "需要授权来修改指定设备的色彩设定"
-
-#. SECURITY:
-#. - Normal users should not have to authenticate to modify profiles
-#. 
-#: ../policy/org.freedesktop.color.policy.in.in.h:29
-msgid "Modify a color profile"
-msgstr "修改色彩配置文件"
-
-#: ../policy/org.freedesktop.color.policy.in.in.h:30
-msgid "Authentication is required to modify a color profile"
-msgstr "需要授权来修改色彩配置文件"
-
-#. SECURITY:
-#. - Normal users require admin authentication to install files system
-#. wide to apply color profiles for sessions that have not explicitly
-#. chosen profiles to apply.
-#. - This should not be set to 'yes' as unprivileged users could then
-#. set a profile set to all-white or all-black and thus make the
-#. other sessions unusable.
-#. 
-#: ../policy/org.freedesktop.color.policy.in.in.h:39
-msgid "Install system color profiles"
-msgstr "禁止系统色彩配置文件"
-
-#: ../policy/org.freedesktop.color.policy.in.in.h:40
-msgid "Authentication is required to install the color profile for all users"
-msgstr "需要授权来为所有用户安装色彩配置文件"
-
-#. SECURITY:
-#. - Normal users should not have to authenticate to profile
-#. devices.
-#. 
-#: ../policy/org.freedesktop.color.policy.in.in.h:45
-msgid "Inhibit color profile selection"
-msgstr "禁止选择色彩配置文件"
-
-#: ../policy/org.freedesktop.color.policy.in.in.h:46
-msgid "Authentication is required to disable profile matching for a device"
-msgstr "需要授权来禁用禁用设备的配置文件匹配"
-
-#. SECURITY:
-#. - Normal users should not have to authenticate to use the
-#. colorimeter device.
-#. 
-#: ../policy/org.freedesktop.color.policy.in.in.h:51
-msgid "Use color sensor"
-msgstr "使用色彩传感器"
-
-#: ../policy/org.freedesktop.color.policy.in.in.h:52
-msgid "Authentication is required to use the color sensor"
-msgstr "需要授权来使用色彩传感器"
-
-#. TRANSLATORS: turn on all debugging
-#: ../src/cd-debug.c:112
-msgid "Show debugging information for all files"
-msgstr "显示所有文件的除错信息"
-
-#: ../src/cd-debug.c:170
-msgid "Debugging Options"
-msgstr "除错设置"
-
-#: ../src/cd-debug.c:171
-msgid "Show debugging options"
-msgstr "显示除错设置"
-
-#. TRANSLATORS: exit after we've started up, used for user profiling
-#: ../src/cd-main.c:1792
-msgid "Exit after a small delay"
-msgstr "短暂延迟后退出"
-
-#. TRANSLATORS: exit straight away, used for automatic profiling
-#: ../src/cd-main.c:1795
-msgid "Exit after the engine has loaded"
-msgstr "引擎载入后退出"
-
-#: ../src/cd-main.c:1812
-msgid "Color Management D-Bus Service"
-msgstr "色彩管理 D-Bus 服务"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/command-not-found.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/command-not-found.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/command-not-found.po	2014-02-24 08:24:39.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/command-not-found.po	2014-03-24 09:42:46.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: command-not-found\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-02-17 17:49+0000\n"
+"POT-Creation-Date: 2014-02-23 14:37+0000\n"
 "PO-Revision-Date: 2009-10-26 08:37+0000\n"
 "Last-Translator: Kyle WANG <Unknown>\n"
 "Language-Team: Chinese (China) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:34+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:57+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: ../CommandNotFound/CommandNotFound.py:148
 #, python-format
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/coreutils.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/coreutils.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/coreutils.po	2014-02-24 08:24:25.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/coreutils.po	2014-03-24 09:42:32.000000000 +0000
@@ -20,8 +20,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-02-20 10:43+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 10:46+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: lib/argmatch.c:133
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/cpio.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/cpio.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/cpio.po	2014-02-24 08:24:25.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/cpio.po	2014-03-24 09:42:32.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-02-20 10:44+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 10:46+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: gnu/argmatch.c:135
 #, c-format
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/cpplib-4.7.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/cpplib-4.7.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/cpplib-4.7.po	2014-02-24 08:24:48.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/cpplib-4.7.po	2014-03-24 09:42:54.000000000 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: cpplib 4.6.0\n"
 "Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n"
 "POT-Creation-Date: 2012-01-27 16:12+0000\n"
-"PO-Revision-Date: 2014-01-13 03:08+0000\n"
+"PO-Revision-Date: 2014-02-25 19:05+0000\n"
 "Last-Translator: Meng Jie <Unknown>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:43+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 14:23+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "X-Poedit-Country: CHINA\n"
 "Language: zh_CN\n"
 "X-Poedit-Language: Chinese\n"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/cracklib.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/cracklib.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/cracklib.po	2014-02-24 08:24:25.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/cracklib.po	2014-03-24 09:42:32.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 10:44+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 10:46+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: \n"
 
 #: lib/fascist.c:516
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/cryptsetup-luks.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/cryptsetup-luks.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/cryptsetup-luks.po	2014-02-24 08:24:35.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/cryptsetup-luks.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,306 +0,0 @@
-# Simplified Chinese translation for cryptsetup
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the cryptsetup package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: cryptsetup\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2007-01-02 16:49+0100\n"
-"PO-Revision-Date: 2009-08-08 13:05+0000\n"
-"Last-Translator: Tao Wei <weitao1979@gmail.com>\n"
-"Language-Team: Simplified Chinese <zh_CN@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-12 12:34+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
-
-#: luks/keyencryption.c:61
-#, c-format
-msgid "Unable to obtain sector size for %s"
-msgstr "不能为%s获得扇区大小"
-
-#: luks/keyencryption.c:109
-msgid "Failed to obtain device mapper directory."
-msgstr "获取设备映射目录失败"
-
-#: luks/keymanage.c:79 luks/keymanage.c:120 luks/keymanage.c:390
-#, c-format
-msgid "Can't open device: %s\n"
-msgstr "不能打开设备: %s\n"
-
-#: luks/keymanage.c:86
-#, c-format
-msgid "%s is not a LUKS partition\n"
-msgstr "%s 不是一个 LUKS 分区\n"
-
-#: luks/keymanage.c:89
-msgid "unknown hash spec in phdr"
-msgstr "未知的散列分区(hash spec)，在分区头(phdr)"
-
-#: luks/keymanage.c:92
-#, c-format
-msgid "unknown version %d\n"
-msgstr "未知版本 %d\n"
-
-#: luks/keymanage.c:213
-#, c-format
-msgid "key %d active, purge first.\n"
-msgstr "密钥 %d 激活, 首先清除.\n"
-
-#: luks/keymanage.c:218
-#, c-format
-msgid ""
-"key material section %d includes too few stripes. Header manipulation?\n"
-msgstr "密钥分区 %d 包含太多的stripes. 处理 Header 吗？\n"
-
-#: luks/keymanage.c:281
-#, c-format
-msgid "key %d is disabled.\n"
-msgstr "密钥 %d 被禁用.\n"
-
-#: luks/keymanage.c:427
-#, c-format
-msgid "Key %d not active. Can't wipe.\n"
-msgstr "密钥 %d 没有激活. 不能清除.\n"
-
-#: src/cryptsetup.c:56
-msgid "<name> <device>"
-msgstr "<名称> <设备>"
-
-#: src/cryptsetup.c:56
-msgid "create device"
-msgstr "创建设备"
-
-#: src/cryptsetup.c:57 src/cryptsetup.c:58 src/cryptsetup.c:59
-#: src/cryptsetup.c:60 src/cryptsetup.c:67
-msgid "<name>"
-msgstr "<名称>"
-
-#: src/cryptsetup.c:57
-msgid "remove device"
-msgstr "删除设备"
-
-#: src/cryptsetup.c:58
-msgid "modify active device"
-msgstr "设置激活分区"
-
-#: src/cryptsetup.c:59
-msgid "resize active device"
-msgstr "改变激活分区大小"
-
-#: src/cryptsetup.c:60
-msgid "show device status"
-msgstr "显示设备状态"
-
-#: src/cryptsetup.c:61 src/cryptsetup.c:64
-msgid "<device> [<new key file>]"
-msgstr "<设备> [<新密钥文件>]"
-
-#: src/cryptsetup.c:61
-msgid "formats a LUKS device"
-msgstr "格式化成一个LUKS设备"
-
-#: src/cryptsetup.c:62
-msgid "<device> <name> "
-msgstr "<设备> <名称> "
-
-#: src/cryptsetup.c:62
-msgid "open LUKS device as mapping <name>"
-msgstr "打开LUKS设备映射为<名称>"
-
-#: src/cryptsetup.c:63
-msgid "<device> <key slot>"
-msgstr "<设备> <key slot>"
-
-#: src/cryptsetup.c:63
-msgid "wipes key with number <key slot> from LUKS device"
-msgstr "从LUKS 设备用数字<key slot>清除密钥"
-
-#: src/cryptsetup.c:64
-msgid "add key to LUKS device"
-msgstr "添加密钥到LUKS设备"
-
-#: src/cryptsetup.c:65 src/cryptsetup.c:66 src/cryptsetup.c:68
-msgid "<device>"
-msgstr "<设备>"
-
-#: src/cryptsetup.c:65
-msgid "print UUID of LUKS device"
-msgstr "显示LUKS设备的UUID"
-
-#: src/cryptsetup.c:66
-msgid "tests <device> for LUKS partition header"
-msgstr "为LUKS分区头检测<设备>"
-
-#: src/cryptsetup.c:67
-msgid "remove LUKS mapping"
-msgstr "卸载LUKS 映射"
-
-#: src/cryptsetup.c:68
-msgid "dump LUKS partition information"
-msgstr "复制LUKS分区信息"
-
-#: src/cryptsetup.c:77
-#, c-format
-msgid "Command successful.\n"
-msgstr "命令成功.\n"
-
-#: src/cryptsetup.c:90
-#, c-format
-msgid "Command failed"
-msgstr "命令失败"
-
-#: src/cryptsetup.c:226
-#, c-format
-msgid "This will overwrite data on %s irrevocably."
-msgstr "这将不能取消地在 %s 上覆盖数据"
-
-#: src/cryptsetup.c:227
-msgid "memory allocation error in action_luksFormat"
-msgstr "内存配置错误在 action_luksFormat"
-
-#: src/cryptsetup.c:269
-msgid ""
-"This is the last keyslot. Device will become unusable after purging this key."
-msgstr "这是最后的 keyslot. 设备将不可用在清除这个密钥后."
-
-#: src/cryptsetup.c:349
-#, c-format
-msgid ""
-"\n"
-"<action> is one of:\n"
-msgstr ""
-"\n"
-"<action> 是其中之一:\n"
-
-#: src/cryptsetup.c:355
-#, c-format
-msgid ""
-"\n"
-"<name> is the device to create under %s\n"
-"<device> is the encrypted device\n"
-"<key slot> is the LUKS key slot number to modify\n"
-"<key file> optional key file for the new key for luksAddKey action\n"
-msgstr ""
-"\n"
-"<名称> 是这个设备创建在 %s 之下\n"
-"<设备> 是这个加密的设备\n"
-"<key slot> 是 LUKS key slot 数字去设置\n"
-"<key file> optional key file for the new key for luksAddKey action\n"
-
-#: src/cryptsetup.c:371
-msgid "Show this help message"
-msgstr "显示该帮助信息"
-
-#: src/cryptsetup.c:372
-msgid "Display brief usage"
-msgstr "显示简短用法"
-
-#: src/cryptsetup.c:376
-msgid "Help options:"
-msgstr "帮助选项:"
-
-#: src/cryptsetup.c:377
-msgid "Shows more detailed error messages"
-msgstr "显示更多的详细错误信息"
-
-#: src/cryptsetup.c:378
-msgid "The cipher used to encrypt the disk (see /proc/crypto)"
-msgstr "这个密码用于加密这个磁盘(参看 /proc/crypto)"
-
-#: src/cryptsetup.c:379
-msgid "The hash used to create the encryption key from the passphrase"
-msgstr "hash用于从密钥中创建加密密钥"
-
-#: src/cryptsetup.c:380
-msgid "Verifies the passphrase by asking for it twice"
-msgstr "通过两次来校验密钥"
-
-#: src/cryptsetup.c:381
-msgid "Read the key from a file (can be /dev/random)"
-msgstr "读取密码从一个文件(可能在 /dev/random)"
-
-#: src/cryptsetup.c:382
-msgid "The size of the encryption key"
-msgstr "加密密码的长度"
-
-#: src/cryptsetup.c:382
-msgid "BITS"
-msgstr "位数"
-
-#: src/cryptsetup.c:383
-msgid "The size of the device"
-msgstr "设备尺寸"
-
-#: src/cryptsetup.c:383 src/cryptsetup.c:384 src/cryptsetup.c:385
-#: src/cryptsetup.c:393
-msgid "SECTORS"
-msgstr "扇区数"
-
-#: src/cryptsetup.c:384
-msgid "The start offset in the backend device"
-msgstr "在后台设备中的开始偏移量"
-
-#: src/cryptsetup.c:385
-msgid "How many sectors of the encrypted data to skip at the beginning"
-msgstr "加密数据在开始跳过多少扇区"
-
-#: src/cryptsetup.c:386
-msgid "Create a readonly mapping"
-msgstr "创建一个只读映射"
-
-#: src/cryptsetup.c:387
-msgid "PBKDF2 iteration time for LUKS (in ms)"
-msgstr "用于LUKS的PBKDF2 重复时间 (毫秒内)"
-
-#: src/cryptsetup.c:388
-msgid "msecs"
-msgstr "毫秒"
-
-#: src/cryptsetup.c:389
-msgid "Do not ask for confirmation"
-msgstr "不询问确认"
-
-#: src/cryptsetup.c:390
-msgid "Print package version"
-msgstr "显示包版本"
-
-#: src/cryptsetup.c:391
-msgid "Timeout for interactive passphrase prompt (in seconds)"
-msgstr "交互密钥提示的时间限制(秒数)"
-
-#: src/cryptsetup.c:391
-msgid "secs"
-msgstr "秒"
-
-#: src/cryptsetup.c:392
-msgid "How often the input of the passphrase can be retried"
-msgstr "多久能重试再输入密钥"
-
-#: src/cryptsetup.c:393
-msgid "Align payload at <n> sector boundaries - for luksFormat"
-msgstr "为luksFormat排列有效负荷在<n>扇区边界"
-
-#: src/cryptsetup.c:409
-msgid "[OPTION...] <action> <action-specific>]"
-msgstr "[选项...] <action> <action-specific>]"
-
-#: src/cryptsetup.c:445
-msgid "Key size must be a multiple of 8 bits"
-msgstr "密码长度必须是8的倍数"
-
-#: src/cryptsetup.c:449
-msgid "Argument <action> missing."
-msgstr "缺少<action>参数."
-
-#: src/cryptsetup.c:455
-msgid "Unknown action."
-msgstr "未知操作。"
-
-#: src/cryptsetup.c:470
-#, c-format
-msgid "%s: requires %s as arguments"
-msgstr "%s: requires %s 作为参数"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/cryptsetup.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/cryptsetup.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/cryptsetup.po	2014-02-24 08:24:35.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/cryptsetup.po	2014-03-24 09:42:42.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:02+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:20+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: lib/libdevmapper.c:232
 msgid "Cannot initialize device-mapper, running as non-root user.\n"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/cwidget.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/cwidget.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/cwidget.po	2014-02-24 08:24:43.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/cwidget.po	2014-03-24 09:42:50.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:03+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:35+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: src/cwidget/config/column_definition.cc:273
 msgid "Bad format parameter"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/dctrl-tools.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/dctrl-tools.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/dctrl-tools.po	2014-02-24 08:24:39.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/dctrl-tools.po	2014-03-24 09:42:46.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:34+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:56+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: lib/ifile.c:58
 #, c-format
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/debconf.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/debconf.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/debconf.po	2014-02-24 08:24:25.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/debconf.po	2014-03-24 09:42:32.000000000 +0000
@@ -9,14 +9,14 @@
 "Project-Id-Version: debconf 1.5.7\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-08-26 13:28-0400\n"
-"PO-Revision-Date: 2013-12-13 20:31+0000\n"
+"PO-Revision-Date: 2014-02-24 07:31+0000\n"
 "Last-Translator: Xingyou-Chen <Unknown>\n"
 "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 10:44+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 10:47+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: ../Debconf/AutoSelect.pm:76
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/debian-tasks.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/debian-tasks.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/debian-tasks.po	2014-02-24 08:24:37.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/debian-tasks.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,203 +0,0 @@
-# Simplified Chinese translation for tasksel tasks.
-# This file is distributed under the same license as the tasksel package.
-#
-# Copyright:
-# Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004,2005,2006.
-# Ming Hua <minghua-guest@users.alioth.debian.org>, 2005,2006,2007,2008.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: tasksel\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-31 21:35-0300\n"
-"PO-Revision-Date: 2013-03-20 00:37+0000\n"
-"Last-Translator: YunQiang Su <wzssyqa@gmail.com>\n"
-"Language-Team: Simplified Chinese <debian-chinese-gb@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-12 12:48+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
-"Language: \n"
-
-#. Description
-#: ../po/debian-tasks.desc:1001
-msgid "SQL database"
-msgstr "SQL 数据库"
-
-#. Description
-#: ../po/debian-tasks.desc:1001
-msgid ""
-"This task selects client and server packages for the PostgreSQL database."
-msgstr "此软件集选择 PostgreSQL 数据库的服务器端和客户端软件。"
-
-#. Description
-#: ../po/debian-tasks.desc:1001
-msgid ""
-"PostgreSQL is an SQL relational database, offering increasing SQL92 "
-"compliance and some SQL3 features.  It is suitable for use with multi-user "
-"database access, through its facilities for transactions and fine-grained "
-"locking."
-msgstr ""
-"PostgreSQL 是一种 SQL 关系数据库，遵从 SQL92 标准并提供一些 SQL3 的特性。它具有便利的事务处理和细粒度锁定(fine-"
-"grained locking)功能，因此很适合多用户存取环境。"
-
-#. Description
-#: ../po/debian-tasks.desc:2001
-msgid "Graphical desktop environment"
-msgstr "图形桌面环境"
-
-#. Description
-#: ../po/debian-tasks.desc:2001
-msgid ""
-"This task provides basic desktop software and serves as a basis for the "
-"GNOME and KDE desktop tasks."
-msgstr "此软件集将提供基本的桌面软件和服务以作为 GNOME 和 KDE 桌面软件集的基础。"
-
-#. Description
-#: ../po/debian-tasks.desc:3001
-msgid "DNS server"
-msgstr "DNS 服务器"
-
-#. Description
-#: ../po/debian-tasks.desc:3001
-msgid ""
-"Selects the BIND DNS server, and related documentation and utility packages."
-msgstr "选择 BIND DNS 服务器以及相关文档和工具软件包。"
-
-#. Description
-#: ../po/debian-tasks.desc:4001
-msgid "File server"
-msgstr "文件服务器"
-
-#. Description
-#: ../po/debian-tasks.desc:4001
-msgid ""
-"This task sets up your system to be a file server, supporting both CIFS and "
-"NFS."
-msgstr "此软件集将把您的系统设置成一台同时支持 CIFS 和 NFS 的文件服务器。"
-
-#. Description
-#: ../po/debian-tasks.desc:5001
-msgid "GNOME desktop environment"
-msgstr "GNOME 桌面环境"
-
-#. Description
-#: ../po/debian-tasks.desc:5001
-msgid ""
-"This task provides basic \"desktop\" software using the GNOME desktop "
-"environment."
-msgstr "此软件集将使用 GNOME 桌面环境提供基本的“桌面”软件。"
-
-#. Description
-#: ../po/debian-tasks.desc:6001
-msgid "KDE desktop environment"
-msgstr "KDE 桌面环境"
-
-#. Description
-#: ../po/debian-tasks.desc:6001
-msgid ""
-"This task provides basic \"desktop\" software using the K Desktop "
-"Environment."
-msgstr "此软件集将使用 KDE 桌面环境提供基本的“桌面”软件。"
-
-#. Description
-#: ../po/debian-tasks.desc:7001
-msgid "Laptop"
-msgstr "笔记本电脑"
-
-#. Description
-#: ../po/debian-tasks.desc:7001
-msgid "This task installs software useful for a laptop."
-msgstr "此软件集将安装对笔记本电脑有用的软件。"
-
-#. Description
-#: ../po/debian-tasks.desc:8001
-msgid "LXDE desktop environment"
-msgstr "LXDE 桌面环境"
-
-#. Description
-#: ../po/debian-tasks.desc:8001
-msgid ""
-"This task provides basic \"desktop\" software using the LXDE desktop "
-"environment."
-msgstr "此软件集将使用 LXDE 桌面环境提供基本的“桌面”软件。"
-
-#. Description
-#: ../po/debian-tasks.desc:9001
-msgid "Mail server"
-msgstr "邮件服务器"
-
-#. Description
-#: ../po/debian-tasks.desc:9001
-msgid ""
-"This task selects a variety of package useful for a general purpose mail "
-"server system."
-msgstr "此软件集选择了对通用邮件服务器系统有用的一些软件包。"
-
-#. Description
-#: ../po/debian-tasks.desc:10001
-msgid "manual package selection"
-msgstr "手动软件包选择"
-
-#. Description
-#: ../po/debian-tasks.desc:10001
-msgid "Manually select packages to install in aptitude."
-msgstr "在 aptitude 中手动选择要安装的软件包。"
-
-#. Description
-#: ../po/debian-tasks.desc:11001
-msgid "Print server"
-msgstr "打印服务器"
-
-#. Description
-#: ../po/debian-tasks.desc:11001
-msgid "This task sets up your system to be a print server."
-msgstr "此软件集将会把您的系统设置成一台打印服务器。"
-
-#. Description
-#: ../po/debian-tasks.desc:12001
-msgid "SSH server"
-msgstr "SSH 服务器"
-
-#. Description
-#: ../po/debian-tasks.desc:12001
-msgid ""
-"This task sets up your system to be remotely accessed through SSH "
-"connections."
-msgstr "此软件集将会把您的系统设置为可以通过 SSH 连接远程访问。"
-
-#. Description
-#: ../po/debian-tasks.desc:13001
-msgid "Standard system utilities"
-msgstr "标准系统工具"
-
-#. Description
-#: ../po/debian-tasks.desc:13001
-msgid ""
-"This task sets up a basic user environment, providing a reasonably small "
-"selection of services and tools usable on the command line."
-msgstr "此软件集设置一个基本的用户环境，其提供一个合理且小的在命令行上可用的服务和工具的选择。"
-
-#. Description
-#: ../po/debian-tasks.desc:14001
-msgid "Web server"
-msgstr "Web 服务器"
-
-#. Description
-#: ../po/debian-tasks.desc:14001
-msgid ""
-"This task selects packages useful for a general purpose web server system."
-msgstr "此软件集选择一些对通用 web 服务器系统有用的软件包。"
-
-#. Description
-#: ../po/debian-tasks.desc:15001
-msgid "Xfce desktop environment"
-msgstr "Xfce 桌面环境"
-
-#. Description
-#: ../po/debian-tasks.desc:15001
-msgid ""
-"This task provides basic \"desktop\" software using the Xfce desktop "
-"environment."
-msgstr "此软件集将使用 Xfce 桌面环境提供基本的“桌面”软件。"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/debianutils.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/debianutils.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/debianutils.po	2014-02-24 08:24:25.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/debianutils.po	2014-03-24 09:42:32.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 10:44+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 10:47+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. type: TH
 #: ../add-shell.8:1
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/devscripts.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/devscripts.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/devscripts.po	2014-02-24 08:24:25.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/devscripts.po	2014-03-24 09:42:33.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 10:46+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 10:49+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. type: TH
 #: ../scripts/annotate-output.1:1
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/diffutils.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/diffutils.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/diffutils.po	2014-02-24 08:24:37.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/diffutils.po	2014-03-24 09:42:44.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:18+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:36+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: lib/c-stack.c:204 lib/c-stack.c:297
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/dnsmasq.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/dnsmasq.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/dnsmasq.po	2014-02-24 08:24:36.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/dnsmasq.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,1402 +0,0 @@
-# Simplified Chinese translation for dnsmasq
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the dnsmasq package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: dnsmasq\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-09-01 22:27+0000\n"
-"PO-Revision-Date: 2010-04-15 10:08+0000\n"
-"Last-Translator: Heling Yao <Unknown>\n"
-"Language-Team: Simplified Chinese <zh_CN@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-12 12:34+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
-
-#: cache.c:764
-#, c-format
-msgid "failed to load names from %s: %s"
-msgstr "从%s载入名称失败：%s"
-
-#: cache.c:798 dhcp.c:783
-#, c-format
-msgid "bad address at %s line %d"
-msgstr ""
-
-#: cache.c:853 dhcp.c:797
-#, c-format
-msgid "bad name at %s line %d"
-msgstr "%s行%d名称错误"
-
-#: cache.c:860 dhcp.c:863
-#, c-format
-msgid "read %s - %d addresses"
-msgstr "读取%s - %d地址"
-
-#: cache.c:899
-msgid "cleared cache"
-msgstr "清除缓存"
-
-#: cache.c:930 option.c:1026
-#, c-format
-msgid "cannot access directory %s: %s"
-msgstr "无法访问目录 %s: %s"
-
-#: cache.c:1049
-#, c-format
-msgid ""
-"not giving name %s to the DHCP lease of %s because the name exists in %s "
-"with address %s"
-msgstr ""
-
-#: cache.c:1126
-#, c-format
-msgid "time %lu"
-msgstr ""
-
-#: cache.c:1127
-#, c-format
-msgid ""
-"cache size %d, %d/%d cache insertions re-used unexpired cache entries."
-msgstr ""
-
-#: cache.c:1129
-#, c-format
-msgid "queries forwarded %u, queries answered locally %u"
-msgstr ""
-
-#: cache.c:1152
-#, c-format
-msgid "server %s#%d: queries sent %u, retried or failed %u"
-msgstr ""
-
-#: util.c:56
-#, c-format
-msgid "failed to seed the random number generator: %s"
-msgstr ""
-
-#: util.c:164
-msgid "could not get memory"
-msgstr ""
-
-#: util.c:174
-#, c-format
-msgid "cannot create pipe: %s"
-msgstr ""
-
-#: util.c:182
-#, c-format
-msgid "failed to allocate %d bytes"
-msgstr ""
-
-#: util.c:287
-#, c-format
-msgid "infinite"
-msgstr ""
-
-#: option.c:228
-msgid "Specify local address(es) to listen on."
-msgstr ""
-
-#: option.c:229
-msgid "Return ipaddr for all hosts in specified domains."
-msgstr ""
-
-#: option.c:230
-msgid "Fake reverse lookups for RFC1918 private address ranges."
-msgstr ""
-
-#: option.c:231
-msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)."
-msgstr ""
-
-#: option.c:232
-#, c-format
-msgid "Specify the size of the cache in entries (defaults to %s)."
-msgstr ""
-
-#: option.c:233
-#, c-format
-msgid "Specify configuration file (defaults to %s)."
-msgstr "指定配置文件(默认为 %s)"
-
-#: option.c:234
-msgid "Do NOT fork into the background: run in debug mode."
-msgstr ""
-
-#: option.c:235
-msgid "Do NOT forward queries with no domain part."
-msgstr ""
-
-#: option.c:236
-msgid "Return self-pointing MX records for local hosts."
-msgstr ""
-
-#: option.c:237
-msgid "Expand simple names in /etc/hosts with domain-suffix."
-msgstr ""
-
-#: option.c:238
-msgid "Don't forward spurious DNS requests from Windows hosts."
-msgstr ""
-
-#: option.c:239
-msgid "Enable DHCP in the range given with lease duration."
-msgstr ""
-
-#: option.c:240
-#, c-format
-msgid "Change to this group after startup (defaults to %s)."
-msgstr ""
-
-#: option.c:241
-msgid "Set address or hostname for a specified machine."
-msgstr ""
-
-#: option.c:242
-msgid "Read DHCP host specs from file"
-msgstr ""
-
-#: option.c:243
-msgid "Read DHCP option specs from file"
-msgstr ""
-
-#: option.c:244
-#, c-format
-msgid "Do NOT load %s file."
-msgstr ""
-
-#: option.c:245
-#, c-format
-msgid "Specify a hosts file to be read in addition to %s."
-msgstr ""
-
-#: option.c:246
-msgid "Specify interface(s) to listen on."
-msgstr ""
-
-#: option.c:247
-msgid "Specify interface(s) NOT to listen on."
-msgstr ""
-
-#: option.c:248
-msgid "Map DHCP user class to tag."
-msgstr ""
-
-#: option.c:249
-msgid "Map RFC3046 circuit-id to tag."
-msgstr ""
-
-#: option.c:250
-msgid "Map RFC3046 remote-id to tag."
-msgstr ""
-
-#: option.c:251
-msgid "Map RFC3993 subscriber-id to tag."
-msgstr ""
-
-#: option.c:252
-msgid "Don't do DHCP for hosts with tag set."
-msgstr ""
-
-#: option.c:253
-msgid "Force broadcast replies for hosts with tag set."
-msgstr ""
-
-#: option.c:254
-msgid "Do NOT fork into the background, do NOT run in debug mode."
-msgstr ""
-
-#: option.c:255
-msgid "Assume we are the only DHCP server on the local network."
-msgstr ""
-
-#: option.c:256
-#, c-format
-msgid "Specify where to store DHCP leases (defaults to %s)."
-msgstr ""
-
-#: option.c:257
-msgid "Return MX records for local hosts."
-msgstr ""
-
-#: option.c:258
-msgid "Specify an MX record."
-msgstr ""
-
-#: option.c:259
-msgid "Specify BOOTP options to DHCP server."
-msgstr ""
-
-#: option.c:260
-#, c-format
-msgid "Do NOT poll %s file, reload only on SIGHUP."
-msgstr ""
-
-#: option.c:261
-msgid "Do NOT cache failed search results."
-msgstr ""
-
-#: option.c:262
-#, c-format
-msgid "Use nameservers strictly in the order given in %s."
-msgstr ""
-
-#: option.c:263
-msgid "Specify options to be sent to DHCP clients."
-msgstr ""
-
-#: option.c:264
-msgid "DHCP option sent even if the client does not request it."
-msgstr ""
-
-#: option.c:265
-msgid "Specify port to listen for DNS requests on (defaults to 53)."
-msgstr ""
-
-#: option.c:266
-#, c-format
-msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)."
-msgstr ""
-
-#: option.c:267
-msgid "Log DNS queries."
-msgstr ""
-
-#: option.c:268
-msgid "Force the originating port for upstream DNS queries."
-msgstr ""
-
-#: option.c:269
-msgid "Do NOT read resolv.conf."
-msgstr ""
-
-#: option.c:270
-#, c-format
-msgid "Specify path to resolv.conf (defaults to %s)."
-msgstr ""
-
-#: option.c:271
-msgid "Specify address(es) of upstream servers with optional domains."
-msgstr ""
-
-#: option.c:272
-msgid "Never forward queries to specified domains."
-msgstr ""
-
-#: option.c:273
-msgid "Specify the domain to be assigned in DHCP leases."
-msgstr ""
-
-#: option.c:274
-msgid "Specify default target in an MX record."
-msgstr ""
-
-#: option.c:275
-msgid "Specify time-to-live in seconds for replies from /etc/hosts."
-msgstr ""
-
-#: option.c:276
-msgid "Specify time-to-live in seconds for negative caching."
-msgstr ""
-
-#: option.c:277
-#, c-format
-msgid "Change to this user after startup. (defaults to %s)."
-msgstr ""
-
-#: option.c:278
-msgid "Map DHCP vendor class to tag."
-msgstr ""
-
-#: option.c:279
-msgid "Display dnsmasq version and copyright information."
-msgstr ""
-
-#: option.c:280
-msgid "Translate IPv4 addresses from upstream servers."
-msgstr ""
-
-#: option.c:281
-msgid "Specify a SRV record."
-msgstr ""
-
-#: option.c:282
-msgid "Display this message. Use --help dhcp for known DHCP options."
-msgstr ""
-
-#: option.c:283
-#, c-format
-msgid "Specify path of PID file (defaults to %s)."
-msgstr ""
-
-#: option.c:284
-#, c-format
-msgid "Specify maximum number of DHCP leases (defaults to %s)."
-msgstr ""
-
-#: option.c:285
-msgid "Answer DNS queries based on the interface a query was sent to."
-msgstr ""
-
-#: option.c:286
-msgid "Specify TXT DNS record."
-msgstr ""
-
-#: option.c:287
-msgid "Specify PTR DNS record."
-msgstr ""
-
-#: option.c:288
-msgid "Give DNS name to IPv4 address of interface."
-msgstr ""
-
-#: option.c:289
-msgid "Bind only to interfaces in use."
-msgstr ""
-
-#: option.c:290
-#, c-format
-msgid "Read DHCP static host information from %s."
-msgstr ""
-
-#: option.c:291
-msgid "Enable the DBus interface for setting upstream servers, etc."
-msgstr ""
-
-#: option.c:292
-msgid "Do not provide DHCP on this interface, only provide DNS."
-msgstr ""
-
-#: option.c:293
-msgid "Enable dynamic address allocation for bootp."
-msgstr ""
-
-#: option.c:294
-msgid "Map MAC address (with wildcards) to option set."
-msgstr ""
-
-#: option.c:295
-msgid "Treat DHCP requests on aliases as arriving from interface."
-msgstr ""
-
-#: option.c:296
-msgid "Disable ICMP echo address checking in the DHCP server."
-msgstr ""
-
-#: option.c:297
-msgid "Script to run on DHCP lease creation and destruction."
-msgstr ""
-
-#: option.c:298
-msgid "Read configuration from all the files in this directory."
-msgstr ""
-
-#: option.c:299
-msgid "Log to this syslog facility or file. (defaults to DAEMON)"
-msgstr ""
-
-#: option.c:300
-msgid "Do not use leasefile."
-msgstr ""
-
-#: option.c:301
-#, c-format
-msgid "Maximum number of concurrent DNS queries. (defaults to %s)"
-msgstr ""
-
-#: option.c:302
-#, c-format
-msgid "Clear DNS cache when reloading %s."
-msgstr ""
-
-#: option.c:303
-msgid "Ignore hostnames provided by DHCP clients."
-msgstr ""
-
-#: option.c:304
-msgid "Do NOT reuse filename and server fields for extra DHCP options."
-msgstr ""
-
-#: option.c:305
-msgid "Enable integrated read-only TFTP server."
-msgstr ""
-
-#: option.c:306
-msgid "Export files by TFTP only from the specified subtree."
-msgstr ""
-
-#: option.c:307
-msgid "Add client IP address to tftp-root."
-msgstr ""
-
-#: option.c:308
-msgid "Allow access only to files owned by the user running dnsmasq."
-msgstr ""
-
-#: option.c:309
-#, c-format
-msgid "Maximum number of conncurrent TFTP transfers (defaults to %s)."
-msgstr ""
-
-#: option.c:310
-msgid "Disable the TFTP blocksize extension."
-msgstr ""
-
-#: option.c:311
-msgid "Ephemeral port range for use by TFTP transfers."
-msgstr ""
-
-#: option.c:312
-msgid "Extra logging for DHCP."
-msgstr ""
-
-#: option.c:313
-msgid "Enable async. logging; optionally set queue length."
-msgstr ""
-
-#: option.c:314
-msgid "Stop DNS rebinding. Filter private IP ranges when resolving."
-msgstr ""
-
-#: option.c:315
-msgid "Always perform DNS queries to all servers."
-msgstr ""
-
-#: option.c:316
-msgid "Set tag if client includes matching option in request."
-msgstr ""
-
-#: option.c:317
-msgid "Use alternative ports for DHCP."
-msgstr ""
-
-#: option.c:318
-msgid "Run lease-change script as this user."
-msgstr ""
-
-#: option.c:319
-msgid "Specify NAPTR DNS record."
-msgstr ""
-
-#: option.c:320
-msgid "Specify lowest port available for DNS query transmission."
-msgstr ""
-
-#: option.c:321
-msgid "Use only fully qualified domain names for DHCP clients."
-msgstr ""
-
-#: option.c:322
-msgid "Specify alias name for LOCAL DNS name."
-msgstr ""
-
-#: option.c:323
-msgid "Prompt to send to PXE clients."
-msgstr ""
-
-#: option.c:324
-msgid "Boot service for PXE menu."
-msgstr ""
-
-#: option.c:325
-msgid "Check configuration syntax."
-msgstr ""
-
-#: option.c:601
-#, c-format
-msgid ""
-"Usage: dnsmasq [options]\n"
-"\n"
-msgstr ""
-
-#: option.c:603
-#, c-format
-msgid "Use short options only on the command line.\n"
-msgstr ""
-
-#: option.c:605
-#, c-format
-msgid "Valid options are:\n"
-msgstr ""
-
-#: option.c:646
-#, c-format
-msgid "Known DHCP options:\n"
-msgstr ""
-
-#: option.c:723
-msgid "bad dhcp-option"
-msgstr ""
-
-#: option.c:780
-msgid "bad IP address"
-msgstr ""
-
-#: option.c:878
-msgid "bad domain in dhcp-option"
-msgstr ""
-
-#: option.c:936
-msgid "dhcp-option too long"
-msgstr ""
-
-#: option.c:945
-msgid "illegal dhcp-match"
-msgstr ""
-
-#: option.c:981
-msgid "illegal repeated flag"
-msgstr ""
-
-#: option.c:989
-msgid "illegal repeated keyword"
-msgstr ""
-
-#: option.c:1046 tftp.c:345
-#, c-format
-msgid "cannot access %s: %s"
-msgstr ""
-
-#: option.c:1084
-msgid "only one dhcp-hostsfile allowed"
-msgstr ""
-
-#: option.c:1091
-msgid "only one dhcp-optsfile allowed"
-msgstr ""
-
-#: option.c:1135
-msgid "bad MX preference"
-msgstr ""
-
-#: option.c:1139
-msgid "bad MX name"
-msgstr ""
-
-#: option.c:1153
-msgid "bad MX target"
-msgstr ""
-
-#: option.c:1165
-msgid "cannot run scripts under uClinux"
-msgstr ""
-
-#: option.c:1395 option.c:1399
-msgid "bad port"
-msgstr ""
-
-#: option.c:1418 option.c:1443
-msgid "interface binding not supported"
-msgstr ""
-
-#: option.c:1564
-msgid "bad port range"
-msgstr ""
-
-#: option.c:1581
-msgid "bad bridge-interface"
-msgstr ""
-
-#: option.c:1622
-msgid "bad dhcp-range"
-msgstr ""
-
-#: option.c:1648
-msgid "only one netid tag allowed"
-msgstr ""
-
-#: option.c:1693
-msgid "inconsistent DHCP range"
-msgstr ""
-
-#: option.c:1865
-msgid "bad DHCP host name"
-msgstr ""
-
-#: option.c:2155 option.c:2427
-msgid "invalid port number"
-msgstr ""
-
-#: option.c:2238
-msgid "invalid alias range"
-msgstr ""
-
-#: option.c:2250
-msgid "bad interface name"
-msgstr ""
-
-#: option.c:2273
-msgid "duplicate CNAME"
-msgstr ""
-
-#: option.c:2290
-msgid "bad PTR record"
-msgstr ""
-
-#: option.c:2320
-msgid "bad NAPTR record"
-msgstr ""
-
-#: option.c:2346
-msgid "TXT record string too long"
-msgstr ""
-
-#: option.c:2350
-msgid "bad TXT record"
-msgstr ""
-
-#: option.c:2410
-msgid "bad SRV record"
-msgstr ""
-
-#: option.c:2419
-msgid "bad SRV target"
-msgstr ""
-
-#: option.c:2434
-msgid "invalid priority"
-msgstr ""
-
-#: option.c:2441
-msgid "invalid weight"
-msgstr ""
-
-#: option.c:2460
-msgid ""
-"unsupported option (check that dnsmasq was compiled with DHCP/TFTP/DBus "
-"support)"
-msgstr ""
-
-#: option.c:2503
-#, c-format
-msgid "files nested too deep in %s"
-msgstr ""
-
-#: option.c:2511 tftp.c:499
-#, c-format
-msgid "cannot read %s: %s"
-msgstr ""
-
-#: option.c:2572
-msgid "missing \""
-msgstr ""
-
-#: option.c:2619
-msgid "bad option"
-msgstr ""
-
-#: option.c:2621
-msgid "extraneous parameter"
-msgstr ""
-
-#: option.c:2623
-msgid "missing parameter"
-msgstr ""
-
-#: option.c:2631
-msgid "error"
-msgstr ""
-
-#: option.c:2637
-#, c-format
-msgid "%s at line %d of %%s"
-msgstr ""
-
-#: option.c:2686 option.c:2717
-#, c-format
-msgid "read %s"
-msgstr ""
-
-#: option.c:2789
-#, c-format
-msgid "Dnsmasq version %s  %s\n"
-msgstr ""
-
-#: option.c:2790
-#, c-format
-msgid ""
-"Compile time options %s\n"
-"\n"
-msgstr ""
-
-#: option.c:2791
-#, c-format
-msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
-msgstr ""
-
-#: option.c:2792
-#, c-format
-msgid "Dnsmasq is free software, and you are welcome to redistribute it\n"
-msgstr ""
-
-#: option.c:2793
-#, c-format
-msgid "under the terms of the GNU General Public License, version 2 or 3.\n"
-msgstr ""
-
-#: option.c:2804
-msgid "try --help"
-msgstr ""
-
-#: option.c:2806
-msgid "try -w"
-msgstr ""
-
-#: option.c:2809
-#, c-format
-msgid "bad command line options: %s"
-msgstr ""
-
-#: option.c:2850
-#, c-format
-msgid "cannot get host-name: %s"
-msgstr ""
-
-#: option.c:2878
-msgid "only one resolv.conf file allowed in no-poll mode."
-msgstr ""
-
-#: option.c:2888
-msgid "must have exactly one resolv.conf to read domain from."
-msgstr ""
-
-#: option.c:2891 network.c:748 dhcp.c:734
-#, c-format
-msgid "failed to read %s: %s"
-msgstr ""
-
-#: option.c:2909
-#, c-format
-msgid "no search directive found in %s"
-msgstr ""
-
-#: option.c:2930
-msgid "there must be a default domain when --dhcp-fqdn is set"
-msgstr ""
-
-#: option.c:2934
-msgid "syntax check OK"
-msgstr ""
-
-#: forward.c:405
-#, c-format
-msgid "nameserver %s refused to do a recursive query"
-msgstr ""
-
-#: forward.c:433
-msgid "possible DNS-rebind attack detected"
-msgstr ""
-
-#: network.c:73
-#, c-format
-msgid "unknown interface %s in bridge-interface"
-msgstr ""
-
-#: network.c:411 dnsmasq.c:184
-#, c-format
-msgid "failed to create listening socket: %s"
-msgstr ""
-
-#: network.c:418
-#, c-format
-msgid "failed to set IPV6 options on listening socket: %s"
-msgstr ""
-
-#: network.c:444
-#, c-format
-msgid "failed to bind listening socket for %s: %s"
-msgstr ""
-
-#: network.c:449
-#, c-format
-msgid "failed to listen on socket: %s"
-msgstr ""
-
-#: network.c:461
-#, c-format
-msgid "failed to create TFTP socket: %s"
-msgstr ""
-
-#: network.c:655
-#, c-format
-msgid "failed to bind server socket for %s: %s"
-msgstr ""
-
-#: network.c:688
-#, c-format
-msgid "ignoring nameserver %s - local interface"
-msgstr ""
-
-#: network.c:699
-#, c-format
-msgid "ignoring nameserver %s - cannot make/bind socket: %s"
-msgstr ""
-
-#: network.c:714
-msgid "unqualified"
-msgstr ""
-
-#: network.c:714
-msgid "names"
-msgstr ""
-
-#: network.c:716
-msgid "default"
-msgstr ""
-
-#: network.c:718
-msgid "domain"
-msgstr ""
-
-#: network.c:721
-#, c-format
-msgid "using local addresses only for %s %s"
-msgstr ""
-
-#: network.c:723
-#, c-format
-msgid "using nameserver %s#%d for %s %s"
-msgstr ""
-
-#: network.c:726
-#, c-format
-msgid "using nameserver %s#%d(via %s)"
-msgstr ""
-
-#: network.c:728
-#, c-format
-msgid "using nameserver %s#%d"
-msgstr ""
-
-#: dnsmasq.c:141
-msgid "TFTP server not available: set HAVE_TFTP in src/config.h"
-msgstr ""
-
-#: dnsmasq.c:146
-msgid "asychronous logging is not available under Solaris"
-msgstr ""
-
-#: dnsmasq.c:165
-#, c-format
-msgid "failed to find list of interfaces: %s"
-msgstr ""
-
-#: dnsmasq.c:173
-#, c-format
-msgid "unknown interface %s"
-msgstr ""
-
-#: dnsmasq.c:179
-#, c-format
-msgid "no interface with address %s"
-msgstr ""
-
-#: dnsmasq.c:196 dnsmasq.c:660
-#, c-format
-msgid "DBus error: %s"
-msgstr ""
-
-#: dnsmasq.c:199
-msgid "DBus not available: set HAVE_DBUS in src/config.h"
-msgstr ""
-
-#: dnsmasq.c:225
-#, c-format
-msgid "unknown user or group: %s"
-msgstr ""
-
-#: dnsmasq.c:282
-#, c-format
-msgid "cannot chdir to filesystem root: %s"
-msgstr ""
-
-#: dnsmasq.c:443
-#, c-format
-msgid "started, version %s DNS disabled"
-msgstr ""
-
-#: dnsmasq.c:445
-#, c-format
-msgid "started, version %s cachesize %d"
-msgstr ""
-
-#: dnsmasq.c:447
-#, c-format
-msgid "started, version %s cache disabled"
-msgstr ""
-
-#: dnsmasq.c:449
-#, c-format
-msgid "compile time options: %s"
-msgstr ""
-
-#: dnsmasq.c:455
-msgid "DBus support enabled: connected to system bus"
-msgstr ""
-
-#: dnsmasq.c:457
-msgid "DBus support enabled: bus connection pending"
-msgstr ""
-
-#: dnsmasq.c:462
-#, c-format
-msgid "warning: failed to change owner of %s: %s"
-msgstr ""
-
-#: dnsmasq.c:466
-msgid "setting --bind-interfaces option because of OS limitations"
-msgstr ""
-
-#: dnsmasq.c:471
-#, c-format
-msgid "warning: interface %s does not currently exist"
-msgstr ""
-
-#: dnsmasq.c:476
-msgid "warning: ignoring resolv-file flag because no-resolv is set"
-msgstr ""
-
-#: dnsmasq.c:479
-msgid "warning: no upstream servers configured"
-msgstr ""
-
-#: dnsmasq.c:483
-#, c-format
-msgid "asynchronous logging enabled, queue limit is %d messages"
-msgstr ""
-
-#: dnsmasq.c:496
-#, c-format
-msgid "DHCP, static leases only on %.0s%s, lease time %s"
-msgstr ""
-
-#: dnsmasq.c:498
-#, c-format
-msgid "DHCP, proxy on subnet %.0s%s%.0s"
-msgstr ""
-
-#: dnsmasq.c:499
-#, c-format
-msgid "DHCP, IP range %s -- %s, lease time %s"
-msgstr ""
-
-#: dnsmasq.c:514
-msgid "root is "
-msgstr ""
-
-#: dnsmasq.c:514
-msgid "enabled"
-msgstr ""
-
-#: dnsmasq.c:516
-msgid "secure mode"
-msgstr ""
-
-#: dnsmasq.c:542
-#, c-format
-msgid "restricting maximum simultaneous TFTP transfers to %d"
-msgstr ""
-
-#: dnsmasq.c:662
-msgid "connected to system DBus"
-msgstr ""
-
-#: dnsmasq.c:752
-#, c-format
-msgid "cannot fork into background: %s"
-msgstr ""
-
-#: dnsmasq.c:755
-#, c-format
-msgid "failed to create helper: %s"
-msgstr ""
-
-#: dnsmasq.c:758
-#, c-format
-msgid "setting capabilities failed: %s"
-msgstr ""
-
-#: dnsmasq.c:762
-#, c-format
-msgid "failed to change user-id to %s: %s"
-msgstr ""
-
-#: dnsmasq.c:767
-#, c-format
-msgid "failed to change group-id to %s: %s"
-msgstr ""
-
-#: dnsmasq.c:770
-#, c-format
-msgid "failed to open pidfile %s: %s"
-msgstr ""
-
-#: dnsmasq.c:773
-#, c-format
-msgid "cannot open %s: %s"
-msgstr ""
-
-#: dnsmasq.c:828
-#, c-format
-msgid "child process killed by signal %d"
-msgstr ""
-
-#: dnsmasq.c:832
-#, c-format
-msgid "child process exited with status %d"
-msgstr ""
-
-#: dnsmasq.c:836
-#, c-format
-msgid "failed to execute %s: %s"
-msgstr ""
-
-#: dnsmasq.c:880
-msgid "exiting on receipt of SIGTERM"
-msgstr ""
-
-#: dnsmasq.c:898
-#, c-format
-msgid "failed to access %s: %s"
-msgstr ""
-
-#: dnsmasq.c:920
-#, c-format
-msgid "reading %s"
-msgstr ""
-
-#: dnsmasq.c:931
-#, c-format
-msgid "no servers found in %s, will retry"
-msgstr ""
-
-#: dhcp.c:40
-#, c-format
-msgid "cannot create DHCP socket: %s"
-msgstr ""
-
-#: dhcp.c:52
-#, c-format
-msgid "failed to set options on DHCP socket: %s"
-msgstr ""
-
-#: dhcp.c:65
-#, c-format
-msgid "failed to set SO_REUSE{ADDR|PORT} on DHCP socket: %s"
-msgstr ""
-
-#: dhcp.c:77
-#, c-format
-msgid "failed to bind DHCP server socket: %s"
-msgstr ""
-
-#: dhcp.c:90
-#, c-format
-msgid "cannot create ICMP raw socket: %s."
-msgstr ""
-
-#: dhcp.c:226
-#, c-format
-msgid "DHCP packet received on %s which has no address"
-msgstr ""
-
-#: dhcp.c:385
-#, c-format
-msgid "DHCP range %s -- %s is not consistent with netmask %s"
-msgstr ""
-
-#: dhcp.c:770
-#, c-format
-msgid "bad line at %s line %d"
-msgstr ""
-
-#: dhcp.c:885
-#, c-format
-msgid "duplicate IP address %s in dhcp-config directive."
-msgstr ""
-
-#: dhcp.c:888
-#, c-format
-msgid "duplicate IP address %s in %s."
-msgstr ""
-
-#: dhcp.c:931
-#, c-format
-msgid "%s has more than one address in hostsfile, using %s for DHCP"
-msgstr ""
-
-#: dhcp.c:936
-#, c-format
-msgid "duplicate IP address %s (%s) in dhcp-config directive"
-msgstr ""
-
-#: lease.c:60
-#, c-format
-msgid "cannot open or create lease file %s: %s"
-msgstr ""
-
-#: lease.c:86
-msgid "too many stored leases"
-msgstr ""
-
-#: lease.c:127
-#, c-format
-msgid "cannot run lease-init script %s: %s"
-msgstr ""
-
-#: lease.c:133
-#, c-format
-msgid "lease-init script returned exit code %s"
-msgstr ""
-
-#: lease.c:240
-#, c-format
-msgid "failed to write %s: %s (retry in %us)"
-msgstr ""
-
-#: rfc2131.c:336
-#, c-format
-msgid "no address range available for DHCP request %s %s"
-msgstr ""
-
-#: rfc2131.c:337
-msgid "with subnet selector"
-msgstr ""
-
-#: rfc2131.c:337
-msgid "via"
-msgstr ""
-
-#: rfc2131.c:352
-#, c-format
-msgid "%u Available DHCP subnet: %s/%s"
-msgstr ""
-
-#: rfc2131.c:355
-#, c-format
-msgid "%u Available DHCP range: %s -- %s"
-msgstr ""
-
-#: rfc2131.c:384 rfc2131.c:418
-msgid "disabled"
-msgstr ""
-
-#: rfc2131.c:433 rfc2131.c:1096
-msgid "address in use"
-msgstr ""
-
-#: rfc2131.c:447 rfc2131.c:933
-msgid "no address available"
-msgstr ""
-
-#: rfc2131.c:454 rfc2131.c:1059
-msgid "wrong network"
-msgstr ""
-
-#: rfc2131.c:467
-msgid "no address configured"
-msgstr ""
-
-#: rfc2131.c:473 rfc2131.c:1109
-msgid "no leases left"
-msgstr ""
-
-#: rfc2131.c:558
-#, c-format
-msgid "%u client provides name: %s"
-msgstr ""
-
-#: rfc2131.c:696
-#, c-format
-msgid "%u Vendor class: %s"
-msgstr ""
-
-#: rfc2131.c:698
-#, c-format
-msgid "%u User class: %s"
-msgstr ""
-
-#: rfc2131.c:733
-msgid "PXE BIS not supported"
-msgstr ""
-
-#: rfc2131.c:849
-#, c-format
-msgid "disabling DHCP static address %s for %s"
-msgstr ""
-
-#: rfc2131.c:870
-msgid "unknown lease"
-msgstr ""
-
-#: rfc2131.c:879 rfc2131.c:1223
-msgid "ignored"
-msgstr ""
-
-#: rfc2131.c:902
-#, c-format
-msgid "not using configured address %s because it is leased to %s"
-msgstr ""
-
-#: rfc2131.c:912
-#, c-format
-msgid ""
-"not using configured address %s because it is in use by the server or relay"
-msgstr ""
-
-#: rfc2131.c:915
-#, c-format
-msgid "not using configured address %s because it was previously declined"
-msgstr ""
-
-#: rfc2131.c:931 rfc2131.c:1102
-msgid "no unique-id"
-msgstr ""
-
-#: rfc2131.c:999
-msgid "wrong server-ID"
-msgstr ""
-
-#: rfc2131.c:1018
-msgid "wrong address"
-msgstr ""
-
-#: rfc2131.c:1035
-msgid "lease not found"
-msgstr ""
-
-#: rfc2131.c:1067
-msgid "address not available"
-msgstr ""
-
-#: rfc2131.c:1078
-msgid "static lease available"
-msgstr ""
-
-#: rfc2131.c:1082
-msgid "address reserved"
-msgstr ""
-
-#: rfc2131.c:1090
-#, c-format
-msgid "abandoning lease to %s of %s"
-msgstr ""
-
-#: rfc2131.c:1567
-#, c-format
-msgid "%u tags: %s"
-msgstr ""
-
-#: rfc2131.c:1580
-#, c-format
-msgid "%u bootfile name: %s"
-msgstr ""
-
-#: rfc2131.c:1589
-#, c-format
-msgid "%u server name: %s"
-msgstr ""
-
-#: rfc2131.c:1597
-#, c-format
-msgid "%u next server: %s"
-msgstr ""
-
-#: rfc2131.c:1664
-#, c-format
-msgid "cannot send DHCP/BOOTP option %d: no space left in packet"
-msgstr ""
-
-#: rfc2131.c:1903
-msgid "PXE menu too large"
-msgstr ""
-
-#: rfc2131.c:2018
-#, c-format
-msgid "Ignoring domain %s for DHCP host name %s"
-msgstr ""
-
-#: rfc2131.c:2036
-#, c-format
-msgid "%u requested options: %s"
-msgstr ""
-
-#: netlink.c:66
-#, c-format
-msgid "cannot create netlink socket: %s"
-msgstr ""
-
-#: netlink.c:265
-#, c-format
-msgid "netlink returns error: %s"
-msgstr ""
-
-#: dbus.c:150
-msgid "attempt to set an IPv6 server address via DBus - no IPv6 support"
-msgstr ""
-
-#: dbus.c:286
-msgid "setting upstream servers from DBus"
-msgstr ""
-
-#: dbus.c:324
-msgid "could not register a DBus message handler"
-msgstr ""
-
-#: bpf.c:150
-#, c-format
-msgid "cannot create DHCP BPF socket: %s"
-msgstr ""
-
-#: bpf.c:178
-#, c-format
-msgid "DHCP request for unsupported hardware type (%d) received on %s"
-msgstr ""
-
-#: tftp.c:172
-msgid "unable to get free port for TFTP"
-msgstr ""
-
-#: tftp.c:187
-#, c-format
-msgid "unsupported request from %s"
-msgstr ""
-
-#: tftp.c:268
-#, c-format
-msgid "TFTP sent %s to %s"
-msgstr ""
-
-#: tftp.c:291
-#, c-format
-msgid "file %s not found"
-msgstr "没找到文件 %s"
-
-#: tftp.c:402
-#, c-format
-msgid "TFTP error %d %s received from %s"
-msgstr ""
-
-#: tftp.c:433
-#, c-format
-msgid "TFTP failed sending %s to %s"
-msgstr ""
-
-#: log.c:169
-#, c-format
-msgid "overflow: %d log entries lost"
-msgstr ""
-
-#: log.c:246
-#, c-format
-msgid "log failed: %s"
-msgstr ""
-
-#: log.c:415
-msgid "FAILED to start up"
-msgstr "启动失败"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/dpkg-dev.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/dpkg-dev.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/dpkg-dev.po	2014-02-24 08:24:26.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/dpkg-dev.po	2014-03-24 09:42:33.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-02-20 10:48+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 10:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: scripts/dpkg-architecture.pl:37 scripts/dpkg-buildflags.pl:33
 #: scripts/dpkg-buildpackage.pl:44 scripts/dpkg-checkbuilddeps.pl:39
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/dpkg.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/dpkg.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/dpkg.po	2014-02-24 08:24:26.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/dpkg.po	2014-03-24 09:42:33.000000000 +0000
@@ -15,15 +15,15 @@
 "Project-Id-Version: dpkg 1.15.8.7\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
 "POT-Creation-Date: 2013-12-12 08:36+0100\n"
-"PO-Revision-Date: 2014-02-17 20:18+0000\n"
+"PO-Revision-Date: 2014-03-08 07:30+0000\n"
 "Last-Translator: Aron Xu <Unknown>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-02-20 10:47+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 10:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: lib/dpkg/ar.c:66
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/dselect.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/dselect.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/dselect.po	2014-02-24 08:24:26.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/dselect.po	2014-03-24 09:42:33.000000000 +0000
@@ -12,14 +12,14 @@
 "Project-Id-Version: dselect 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
 "POT-Creation-Date: 2013-12-12 08:35+0100\n"
-"PO-Revision-Date: 2014-02-17 20:26+0000\n"
+"PO-Revision-Date: 2014-03-08 07:45+0000\n"
 "Last-Translator: Tchaikov <Unknown>\n"
 "Language-Team: Chinese (simplified) <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 10:48+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 10:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: dselect/basecmds.cc:125
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/duplicity.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/duplicity.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/duplicity.po	2014-02-24 08:24:36.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/duplicity.po	2014-03-24 09:42:42.000000000 +0000
@@ -15,287 +15,287 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:02+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:20+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
-#: ../bin/duplicity:106
+#: ../bin/duplicity:98
 msgid "Reuse configured PASSPHRASE as SIGN_PASSPHRASE"
 msgstr ""
 
-#: ../bin/duplicity:113
+#: ../bin/duplicity:104
 msgid "Reuse configured SIGN_PASSPHRASE as PASSPHRASE"
 msgstr ""
 
-#: ../bin/duplicity:152
+#: ../bin/duplicity:143
 msgid "PASSPHRASE variable not set, asking user."
 msgstr ""
 
-#: ../bin/duplicity:167
+#: ../bin/duplicity:158
 msgid "GnuPG passphrase for signing key:"
 msgstr ""
 
-#: ../bin/duplicity:172
+#: ../bin/duplicity:163
 msgid "GnuPG passphrase:"
 msgstr ""
 
-#: ../bin/duplicity:177
+#: ../bin/duplicity:168
 msgid "Retype passphrase for signing key to confirm: "
 msgstr ""
 
-#: ../bin/duplicity:179
+#: ../bin/duplicity:170
 msgid "Retype passphrase to confirm: "
 msgstr ""
 
-#: ../bin/duplicity:182
+#: ../bin/duplicity:173
 msgid "First and second passphrases do not match!  Please try again."
 msgstr ""
 
-#: ../bin/duplicity:187
+#: ../bin/duplicity:178
 msgid ""
 "Cannot use empty passphrase with symmetric encryption!  Please try again."
 msgstr ""
 
-#: ../bin/duplicity:243
+#: ../bin/duplicity:227
 #, python-format
 msgid ""
 "File %s complete in backup set.\n"
 "Continuing restart on file %s."
 msgstr ""
 
-#: ../bin/duplicity:252
+#: ../bin/duplicity:233
 #, python-format
 msgid ""
 "File %s missing in backup set.\n"
 "Continuing restart on file %s."
 msgstr ""
 
-#: ../bin/duplicity:303
+#: ../bin/duplicity:285
 #, python-format
 msgid "File %s was corrupted during upload."
 msgstr ""
 
-#: ../bin/duplicity:337
+#: ../bin/duplicity:318
 msgid ""
 "Restarting backup, but current encryption settings do not match original "
 "settings"
 msgstr ""
 
-#: ../bin/duplicity:576
+#: ../bin/duplicity:526
 msgid ""
 "Fatal Error: Unable to start incremental backup.  Old signatures not found "
 "and incremental specified"
 msgstr ""
 
-#: ../bin/duplicity:580
+#: ../bin/duplicity:530
 msgid "No signatures found, switching to full backup."
 msgstr "找不到标记，转换到完全备份。"
 
-#: ../bin/duplicity:594
+#: ../bin/duplicity:544
 msgid "Backup Statistics"
 msgstr "备份统计"
 
-#: ../bin/duplicity:698
+#: ../bin/duplicity:625
 #, python-format
 msgid "%s not found in archive, no files restored."
 msgstr ""
 
-#: ../bin/duplicity:702
+#: ../bin/duplicity:629
 msgid "No files found in archive - nothing restored."
 msgstr "压缩包中找不到文件 - 没有进行任何还原。"
 
-#: ../bin/duplicity:735
+#: ../bin/duplicity:662
 #, python-format
 msgid "Processed volume %d of %d"
 msgstr ""
 
-#: ../bin/duplicity:760
+#: ../bin/duplicity:687
 #, python-format
 msgid "Invalid data - %s hash mismatch for file:"
 msgstr ""
 
-#: ../bin/duplicity:762
+#: ../bin/duplicity:689
 #, python-format
 msgid "Calculated hash: %s"
 msgstr "计算 hash 值： %s"
 
-#: ../bin/duplicity:763
+#: ../bin/duplicity:690
 #, python-format
 msgid "Manifest hash: %s"
 msgstr "清单的 hash 值：%s"
 
-#: ../bin/duplicity:801
+#: ../bin/duplicity:728
 #, python-format
 msgid "Volume was signed by key %s, not %s"
 msgstr ""
 
-#: ../bin/duplicity:831
+#: ../bin/duplicity:758
 #, python-format
 msgid "Verify complete: %s, %s."
 msgstr ""
 
-#: ../bin/duplicity:832
+#: ../bin/duplicity:759
 #, python-format
 msgid "%d file compared"
 msgid_plural "%d files compared"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../bin/duplicity:834
+#: ../bin/duplicity:761
 #, python-format
 msgid "%d difference found"
 msgid_plural "%d differences found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../bin/duplicity:853
+#: ../bin/duplicity:780
 msgid "No extraneous files found, nothing deleted in cleanup."
 msgstr ""
 
-#: ../bin/duplicity:858
+#: ../bin/duplicity:785
 msgid "Deleting this file from backend:"
 msgid_plural "Deleting these files from backend:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../bin/duplicity:870
+#: ../bin/duplicity:797
 msgid "Found the following file to delete:"
 msgid_plural "Found the following files to delete:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../bin/duplicity:874
+#: ../bin/duplicity:801
 msgid "Run duplicity again with the --force option to actually delete."
 msgstr ""
 
-#: ../bin/duplicity:917
+#: ../bin/duplicity:840
 msgid "There are backup set(s) at time(s):"
 msgstr ""
 
-#: ../bin/duplicity:919
+#: ../bin/duplicity:842
 msgid "Which can't be deleted because newer sets depend on them."
 msgstr ""
 
-#: ../bin/duplicity:923
+#: ../bin/duplicity:846
 msgid ""
 "Current active backup chain is older than specified time.  However, it will "
 "not be deleted.  To remove all your backups, manually purge the repository."
 msgstr ""
 
-#: ../bin/duplicity:929
+#: ../bin/duplicity:852
 msgid "No old backup sets found, nothing deleted."
 msgstr ""
 
-#: ../bin/duplicity:932
+#: ../bin/duplicity:941
 msgid "Deleting backup chain at time:"
 msgid_plural "Deleting backup chains at times:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../bin/duplicity:943
+#: ../bin/duplicity:952
 #, python-format
 msgid "Deleting incremental signature chain %s"
 msgstr ""
 
-#: ../bin/duplicity:945
+#: ../bin/duplicity:954
 #, python-format
 msgid "Deleting incremental backup chain %s"
 msgstr ""
 
-#: ../bin/duplicity:948
+#: ../bin/duplicity:957
 #, python-format
 msgid "Deleting complete signature chain %s"
 msgstr ""
 
-#: ../bin/duplicity:950
+#: ../bin/duplicity:959
 #, python-format
 msgid "Deleting complete backup chain %s"
 msgstr ""
 
-#: ../bin/duplicity:956
+#: ../bin/duplicity:965
 msgid "Found old backup chain at the following time:"
 msgid_plural "Found old backup chains at the following times:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../bin/duplicity:960
+#: ../bin/duplicity:876
 msgid "Rerun command with --force option to actually delete."
 msgstr ""
 
-#: ../bin/duplicity:1037
+#: ../bin/duplicity:954
 #, python-format
 msgid "Deleting local %s (not authoritative at backend)."
 msgstr ""
 
-#: ../bin/duplicity:1041
+#: ../bin/duplicity:958
 #, python-format
 msgid "Unable to delete %s: %s"
 msgstr ""
 
-#: ../bin/duplicity:1069 ../duplicity/dup_temp.py:263
+#: ../bin/duplicity:986 ../duplicity/dup_temp.py:260
 #, python-format
 msgid "Failed to read %s: %s"
 msgstr ""
 
-#: ../bin/duplicity:1083
+#: ../bin/duplicity:997
 #, python-format
 msgid "Copying %s to local cache."
 msgstr ""
 
-#: ../bin/duplicity:1131
+#: ../bin/duplicity:1045
 msgid "Local and Remote metadata are synchronized, no sync needed."
 msgstr ""
 
-#: ../bin/duplicity:1136
+#: ../bin/duplicity:1050
 msgid "Synchronizing remote metadata to local cache..."
 msgstr ""
 
-#: ../bin/duplicity:1149
+#: ../bin/duplicity:1063
 msgid "Sync would copy the following from remote to local:"
 msgstr ""
 
-#: ../bin/duplicity:1152
+#: ../bin/duplicity:1066
 msgid "Sync would remove the following spurious local files:"
 msgstr ""
 
-#: ../bin/duplicity:1195
+#: ../bin/duplicity:1109
 msgid "Unable to get free space on temp."
 msgstr ""
 
-#: ../bin/duplicity:1203
+#: ../bin/duplicity:1117
 #, python-format
 msgid "Temp space has %d available, backup needs approx %d."
 msgstr ""
 
-#: ../bin/duplicity:1206
+#: ../bin/duplicity:1120
 #, python-format
 msgid "Temp has %d available, backup will use approx %d."
 msgstr ""
 
-#: ../bin/duplicity:1214
+#: ../bin/duplicity:1128
 msgid "Unable to get max open files."
 msgstr ""
 
-#: ../bin/duplicity:1218
+#: ../bin/duplicity:1132
 #, python-format
 msgid ""
 "Max open files of %s is too low, should be >= 1024.\n"
 "Use 'ulimit -n 1024' or higher to correct.\n"
 msgstr ""
 
-#: ../bin/duplicity:1267
+#: ../bin/duplicity:1181
 msgid ""
 "RESTART: The first volume failed to upload before termination.\n"
 "         Restart is impossible...starting backup from beginning."
 msgstr ""
 
-#: ../bin/duplicity:1273
+#: ../bin/duplicity:1187
 #, python-format
 msgid ""
 "RESTART: Volumes %d to %d failed to upload before termination.\n"
 "         Restarting backup at volume %d."
 msgstr ""
 
-#: ../bin/duplicity:1280
+#: ../bin/duplicity:1194
 #, python-format
 msgid ""
 "RESTART: Impossible backup state: manifest has %d vols, remote has %d vols.\n"
@@ -304,43 +304,43 @@
 "         backup then restart the backup from the beginning."
 msgstr ""
 
-#: ../bin/duplicity:1392
+#: ../bin/duplicity:1287
 #, python-format
 msgid "Last %s backup left a partial set, restarting."
 msgstr ""
 
-#: ../bin/duplicity:1396
+#: ../bin/duplicity:1291
 #, python-format
 msgid "Cleaning up previous partial %s backup set, restarting."
 msgstr ""
 
-#: ../bin/duplicity:1407
+#: ../bin/duplicity:1302
 msgid "Last full backup date:"
 msgstr ""
 
-#: ../bin/duplicity:1409
+#: ../bin/duplicity:1304
 msgid "Last full backup date: none"
 msgstr ""
 
-#: ../bin/duplicity:1411
+#: ../bin/duplicity:1306
 msgid "Last full backup is too old, forcing full backup"
 msgstr ""
 
-#: ../bin/duplicity:1507
+#: ../bin/duplicity:1404
 msgid "INT intercepted...exiting."
 msgstr ""
 
-#: ../bin/duplicity:1515
+#: ../bin/duplicity:1410
 #, python-format
 msgid "GPG error detail: %s"
 msgstr ""
 
-#: ../bin/duplicity:1525
+#: ../bin/duplicity:1419
 #, python-format
 msgid "User error detail: %s"
 msgstr ""
 
-#: ../bin/duplicity:1535
+#: ../bin/duplicity:1428
 #, python-format
 msgid "Backend error detail: %s"
 msgstr ""
@@ -381,210 +381,210 @@
 msgid "task execution done (success: %s)"
 msgstr ""
 
-#: ../duplicity/backend.py:164
+#: ../duplicity/backend.py:165
 #, python-format
 msgid "Could not initialize backend: %s"
 msgstr ""
 
-#: ../duplicity/backend.py:546 ../duplicity/backend.py:570
+#: ../duplicity/backend.py:489 ../duplicity/backend.py:513
 #, python-format
 msgid "Reading results of '%s'"
 msgstr ""
 
-#: ../duplicity/backend.py:585
+#: ../duplicity/backend.py:528
 #, python-format
 msgid "Running '%s' failed with code %d (attempt #%d)"
 msgid_plural "Running '%s' failed with code %d (attempt #%d)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../duplicity/backend.py:589
+#: ../duplicity/backend.py:532
 #, python-format
 msgid ""
 "Error is:\n"
 "%s"
 msgstr ""
 
-#: ../duplicity/backend.py:591
+#: ../duplicity/backend.py:534
 #, python-format
 msgid "Giving up trying to execute '%s' after %d attempt"
 msgid_plural "Giving up trying to execute '%s' after %d attempts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../duplicity/collections.py:186
+#: ../duplicity/collections.py:187
 msgid "Fatal Error: No manifests found for most recent backup"
 msgstr ""
 
-#: ../duplicity/collections.py:195
+#: ../duplicity/collections.py:196
 msgid ""
 "Fatal Error: Remote manifest does not match local one.  Either the remote "
 "backup set or the local archive directory has been corrupted."
 msgstr ""
 
-#: ../duplicity/collections.py:203
+#: ../duplicity/collections.py:204
 msgid "Fatal Error: Neither remote nor local manifest is readable."
 msgstr ""
 
-#: ../duplicity/collections.py:314
+#: ../duplicity/collections.py:315
 msgid "Preferring Backupset over previous one!"
 msgstr ""
 
-#: ../duplicity/collections.py:317
+#: ../duplicity/collections.py:318
 #, python-format
 msgid "Ignoring incremental Backupset (start_time: %s; needed: %s)"
 msgstr ""
 
-#: ../duplicity/collections.py:322
+#: ../duplicity/collections.py:323
 #, python-format
 msgid "Added incremental Backupset (start_time: %s / end_time: %s)"
 msgstr ""
 
-#: ../duplicity/collections.py:392
+#: ../duplicity/collections.py:393
 msgid "Chain start time: "
 msgstr ""
 
-#: ../duplicity/collections.py:393
+#: ../duplicity/collections.py:394
 msgid "Chain end time: "
 msgstr ""
 
-#: ../duplicity/collections.py:394
+#: ../duplicity/collections.py:395
 #, python-format
 msgid "Number of contained backup sets: %d"
 msgstr ""
 
-#: ../duplicity/collections.py:396
+#: ../duplicity/collections.py:397
 #, python-format
 msgid "Total number of contained volumes: %d"
 msgstr ""
 
-#: ../duplicity/collections.py:398
+#: ../duplicity/collections.py:399
 msgid "Type of backup set:"
 msgstr ""
 
-#: ../duplicity/collections.py:398
+#: ../duplicity/collections.py:399
 msgid "Time:"
 msgstr ""
 
-#: ../duplicity/collections.py:398
+#: ../duplicity/collections.py:399
 msgid "Num volumes:"
 msgstr ""
 
-#: ../duplicity/collections.py:402
+#: ../duplicity/collections.py:403
 msgid "Full"
 msgstr ""
 
-#: ../duplicity/collections.py:405
+#: ../duplicity/collections.py:406
 msgid "Incremental"
 msgstr ""
 
-#: ../duplicity/collections.py:465
+#: ../duplicity/collections.py:466
 msgid "local"
 msgstr ""
 
-#: ../duplicity/collections.py:467
+#: ../duplicity/collections.py:468
 msgid "remote"
 msgstr ""
 
-#: ../duplicity/collections.py:622
+#: ../duplicity/collections.py:621
 msgid "Collection Status"
 msgstr ""
 
-#: ../duplicity/collections.py:624
+#: ../duplicity/collections.py:623
 #, python-format
 msgid "Connecting with backend: %s"
 msgstr ""
 
-#: ../duplicity/collections.py:626
+#: ../duplicity/collections.py:625
 #, python-format
 msgid "Archive dir: %s"
 msgstr ""
 
-#: ../duplicity/collections.py:629
+#: ../duplicity/collections.py:628
 #, python-format
 msgid "Found %d secondary backup chain."
 msgid_plural "Found %d secondary backup chains."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../duplicity/collections.py:634
+#: ../duplicity/collections.py:633
 #, python-format
 msgid "Secondary chain %d of %d:"
 msgstr ""
 
-#: ../duplicity/collections.py:640
+#: ../duplicity/collections.py:639
 msgid "Found primary backup chain with matching signature chain:"
 msgstr ""
 
-#: ../duplicity/collections.py:644
+#: ../duplicity/collections.py:643
 msgid "No backup chains with active signatures found"
 msgstr ""
 
-#: ../duplicity/collections.py:647
+#: ../duplicity/collections.py:646
 #, python-format
 msgid "Also found %d backup set not part of any chain,"
 msgid_plural "Also found %d backup sets not part of any chain,"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../duplicity/collections.py:651
+#: ../duplicity/collections.py:650
 #, python-format
 msgid "and %d incomplete backup set."
 msgid_plural "and %d incomplete backup sets."
 msgstr[0] ""
 msgstr[1] ""
 
-#. TRANSL: "cleanup" is a hard-coded command, so do not translate it
-#: ../duplicity/collections.py:656
+#. "cleanup" is a hard-coded command, so do not translate it
+#: ../duplicity/collections.py:655
 msgid ""
 "These may be deleted by running duplicity with the \"cleanup\" command."
 msgstr ""
 
-#: ../duplicity/collections.py:659
+#: ../duplicity/collections.py:658
 msgid "No orphaned or incomplete backup sets found."
 msgstr ""
 
-#: ../duplicity/collections.py:675
+#: ../duplicity/collections.py:674
 #, python-format
 msgid "%d file exists on backend"
 msgid_plural "%d files exist on backend"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../duplicity/collections.py:682
+#: ../duplicity/collections.py:681
 #, python-format
 msgid "%d file exists in cache"
 msgid_plural "%d files exist in cache"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../duplicity/collections.py:734
+#: ../duplicity/collections.py:733
 msgid ""
 "Warning, discarding last backup set, because of missing signature file."
 msgstr ""
 
-#: ../duplicity/collections.py:757
+#: ../duplicity/collections.py:756
 msgid "Warning, found the following local orphaned signature file:"
 msgid_plural "Warning, found the following local orphaned signature files:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../duplicity/collections.py:766
+#: ../duplicity/collections.py:765
 msgid "Warning, found the following remote orphaned signature file:"
 msgid_plural "Warning, found the following remote orphaned signature files:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../duplicity/collections.py:775
+#: ../duplicity/collections.py:774
 msgid "Warning, found signatures but no corresponding backup files"
 msgstr ""
 
-#: ../duplicity/collections.py:779
+#: ../duplicity/collections.py:778
 msgid ""
 "Warning, found incomplete backup sets, probably left from aborted session"
 msgstr ""
 
-#: ../duplicity/collections.py:783
+#: ../duplicity/collections.py:782
 msgid "Warning, found the following orphaned backup file:"
 msgid_plural "Warning, found the following orphaned backup files:"
 msgstr[0] ""
@@ -632,7 +632,7 @@
 "starting at time %s."
 msgstr ""
 
-#: ../duplicity/commandline.py:68
+#: ../duplicity/commandline.py:67
 #, python-format
 msgid ""
 "Warning: Option %s is pending deprecation and will be removed in a future "
@@ -645,314 +645,307 @@
 msgid "Unable to load gio backend: %s"
 msgstr ""
 
-#: ../bin/rdiffdir:56 ../duplicity/commandline.py:237
+#: ../duplicity/commandline.py:236
 #, python-format
 msgid "Error opening file %s"
 msgstr ""
 
-#. TRANSL: Used in usage help to represent a Unix-style path name. Example:
+#. Used in usage help to represent a Unix-style path name. Example:
 #. --archive-dir <path>
-#: ../duplicity/commandline.py:258 ../duplicity/commandline.py:268
-#: ../duplicity/commandline.py:285 ../duplicity/commandline.py:351
-#: ../duplicity/commandline.py:539 ../duplicity/commandline.py:755
+#: ../duplicity/commandline.py:257 ../duplicity/commandline.py:265
+#: ../duplicity/commandline.py:282 ../duplicity/commandline.py:339
+#: ../duplicity/commandline.py:505 ../duplicity/commandline.py:721
 msgid "path"
 msgstr ""
 
-#. TRANSL: Used in usage help to represent an ID for a GnuPG key. Example:
+#. Used in usage help to represent an ID for a GnuPG key. Example:
 #. --encrypt-key <gpg_key_id>
-#. TRANSL: Used in usage help to represent an ID for a hidden GnuPG key. Example:
-#. --hidden-encrypt-key <gpg_key_id>
-#. TRANSL: Used in usage help to represent an ID for a GnuPG key. Example:
-#. --encrypt-key <gpg_key_id>
-#: ../duplicity/commandline.py:280 ../duplicity/commandline.py:287
-#: ../duplicity/commandline.py:371 ../duplicity/commandline.py:520
-#: ../duplicity/commandline.py:728
+#: ../duplicity/commandline.py:277 ../duplicity/commandline.py:284
+#: ../duplicity/commandline.py:494 ../duplicity/commandline.py:694
 msgid "gpg-key-id"
 msgstr ""
 
-#. TRANSL: Used in usage help to represent a "glob" style pattern for
+#. Used in usage help to represent a "glob" style pattern for
 #. matching one or more files, as described in the documentation.
 #. Example:
 #. --exclude <shell_pattern>
-#: ../duplicity/commandline.py:295 ../duplicity/commandline.py:397
-#: ../duplicity/commandline.py:778
+#: ../duplicity/commandline.py:292 ../duplicity/commandline.py:379
+#: ../duplicity/commandline.py:744
 msgid "shell_pattern"
 msgstr ""
 
-#. TRANSL: Used in usage help to represent the name of a file. Example:
+#. Used in usage help to represent the name of a file. Example:
 #. --log-file <filename>
-#: ../duplicity/commandline.py:301 ../duplicity/commandline.py:308
-#: ../duplicity/commandline.py:313 ../duplicity/commandline.py:399
-#: ../duplicity/commandline.py:404 ../duplicity/commandline.py:415
-#: ../duplicity/commandline.py:724
+#: ../duplicity/commandline.py:298 ../duplicity/commandline.py:305
+#: ../duplicity/commandline.py:310 ../duplicity/commandline.py:381
+#: ../duplicity/commandline.py:386 ../duplicity/commandline.py:397
+#: ../duplicity/commandline.py:690
 msgid "filename"
 msgstr ""
 
-#. TRANSL: Used in usage help to represent a regular expression (regexp).
-#: ../duplicity/commandline.py:320 ../duplicity/commandline.py:406
+#. Used in usage help to represent a regular expression (regexp).
+#: ../duplicity/commandline.py:317 ../duplicity/commandline.py:388
 msgid "regular_expression"
 msgstr ""
 
-#. TRANSL: Used in usage help to represent a time spec for a previous
+#. Used in usage help to represent a time spec for a previous
 #. point in time, as described in the documentation. Example:
 #. duplicity remove-older-than time [options] target_url
-#: ../duplicity/commandline.py:363 ../duplicity/commandline.py:471
-#: ../duplicity/commandline.py:810
+#: ../duplicity/commandline.py:351 ../duplicity/commandline.py:444
+#: ../duplicity/commandline.py:776
 msgid "time"
 msgstr ""
 
-#. TRANSL: Used in usage help. (Should be consistent with the "Options:"
+#. Used in usage help. (Should be consistent with the "Options:"
 #. header.) Example:
 #. duplicity [full|incremental] [options] source_dir target_url
-#: ../duplicity/commandline.py:367 ../duplicity/commandline.py:474
-#: ../duplicity/commandline.py:531 ../duplicity/commandline.py:743
+#: ../duplicity/commandline.py:355 ../duplicity/commandline.py:447
+#: ../duplicity/commandline.py:502 ../duplicity/commandline.py:709
 msgid "options"
 msgstr ""
 
-#: ../duplicity/commandline.py:382
+#: ../duplicity/commandline.py:364
 #, python-format
 msgid ""
 "Running in 'ignore errors' mode due to %s; please re-consider if this was "
 "not intended"
 msgstr ""
 
-#. TRANSL: Used in usage help to represent an imap mailbox
-#: ../duplicity/commandline.py:395
+#. Used in usage help to represent an imap mailbox
+#: ../duplicity/commandline.py:377
 msgid "imap_mailbox"
 msgstr ""
 
-#: ../duplicity/commandline.py:409
+#: ../duplicity/commandline.py:391
 msgid "file_descriptor"
 msgstr ""
 
-#. TRANSL: Used in usage help to represent a desired number of
+#. Used in usage help to represent a desired number of
 #. something. Example:
 #. --num-retries <number>
-#: ../duplicity/commandline.py:420 ../duplicity/commandline.py:442
-#: ../duplicity/commandline.py:457 ../duplicity/commandline.py:495
-#: ../duplicity/commandline.py:569 ../duplicity/commandline.py:738
+#: ../duplicity/commandline.py:421 ../duplicity/commandline.py:468
+#: ../duplicity/commandline.py:535 ../duplicity/commandline.py:704
 msgid "number"
 msgstr ""
 
-#. TRANSL: Used in usage help (noun)
-#: ../duplicity/commandline.py:423
+#. Used in usage help (noun)
+#: ../duplicity/commandline.py:402
 msgid "backup name"
 msgstr ""
 
-#. TRANSL: noun
-#: ../duplicity/commandline.py:504 ../duplicity/commandline.py:507
-#: ../duplicity/commandline.py:510 ../duplicity/commandline.py:709
+#. noun
+#: ../duplicity/commandline.py:675
 msgid "command"
 msgstr ""
 
-#: ../duplicity/commandline.py:528
+#: ../duplicity/commandline.py:539
 msgid "paramiko|pexpect"
 msgstr ""
 
-#: ../duplicity/commandline.py:534
+#: ../duplicity/commandline.py:545
 msgid "pem formatted bundle of certificate authorities"
 msgstr ""
 
-#. TRANSL: Used in usage help. Example:
+#. Used in usage help. Example:
 #. --timeout <seconds>
-#: ../duplicity/commandline.py:544 ../duplicity/commandline.py:772
+#: ../duplicity/commandline.py:510 ../duplicity/commandline.py:738
 msgid "seconds"
 msgstr ""
 
-#. TRANSL: abbreviation for "character" (noun)
-#: ../duplicity/commandline.py:550 ../duplicity/commandline.py:706
+#. abbreviation for "character" (noun)
+#: ../duplicity/commandline.py:516 ../duplicity/commandline.py:672
 msgid "char"
 msgstr ""
 
-#: ../duplicity/commandline.py:672
+#: ../duplicity/commandline.py:638
 #, python-format
 msgid "Using archive dir: %s"
 msgstr ""
 
-#: ../duplicity/commandline.py:673
+#: ../duplicity/commandline.py:639
 #, python-format
 msgid "Using backup name: %s"
 msgstr ""
 
-#: ../duplicity/commandline.py:680
+#: ../duplicity/commandline.py:646
 #, python-format
 msgid "Command line error: %s"
 msgstr ""
 
-#: ../duplicity/commandline.py:681
+#: ../duplicity/commandline.py:647
 msgid "Enter 'duplicity --help' for help screen."
 msgstr ""
 
-#. TRANSL: Used in usage help to represent a Unix-style path name. Example:
+#. Used in usage help to represent a Unix-style path name. Example:
 #. rsync://user[:password]@other_host[:port]//absolute_path
-#: ../duplicity/commandline.py:694
+#: ../duplicity/commandline.py:660
 msgid "absolute_path"
 msgstr ""
 
-#. TRANSL: Used in usage help. Example:
+#. Used in usage help. Example:
 #. tahoe://alias/some_dir
-#: ../duplicity/commandline.py:698
+#: ../duplicity/commandline.py:664
 msgid "alias"
 msgstr ""
 
-#. TRANSL: Used in help to represent a "bucket name" for Amazon Web
+#. Used in help to represent a "bucket name" for Amazon Web
 #. Services' Simple Storage Service (S3). Example:
 #. s3://other.host/bucket_name[/prefix]
-#: ../duplicity/commandline.py:703
+#: ../duplicity/commandline.py:669
 msgid "bucket_name"
 msgstr ""
 
-#. TRANSL: Used in usage help to represent the name of a container in
+#. Used in usage help to represent the name of a container in
 #. Amazon Web Services' Cloudfront. Example:
 #. cf+http://container_name
-#: ../duplicity/commandline.py:714
+#: ../duplicity/commandline.py:680
 msgid "container_name"
 msgstr ""
 
-#. TRANSL: noun
-#: ../duplicity/commandline.py:717
+#. noun
+#: ../duplicity/commandline.py:683
 msgid "count"
 msgstr ""
 
-#. TRANSL: Used in usage help to represent the name of a file directory
-#: ../duplicity/commandline.py:720
+#. Used in usage help to represent the name of a file directory
+#: ../duplicity/commandline.py:686
 msgid "directory"
 msgstr ""
 
-#. TRANSL: Used in usage help, e.g. to represent the name of a code
+#. Used in usage help, e.g. to represent the name of a code
 #. module. Example:
 #. rsync://user[:password]@other.host[:port]::/module/some_dir
-#: ../duplicity/commandline.py:733
+#: ../duplicity/commandline.py:699
 msgid "module"
 msgstr ""
 
-#. TRANSL: Used in usage help to represent an internet hostname. Example:
+#. Used in usage help to represent an internet hostname. Example:
 #. ftp://user[:password]@other.host[:port]/some_dir
-#: ../duplicity/commandline.py:747
+#: ../duplicity/commandline.py:713
 msgid "other.host"
 msgstr ""
 
-#. TRANSL: Used in usage help. Example:
+#. Used in usage help. Example:
 #. ftp://user[:password]@other.host[:port]/some_dir
-#: ../duplicity/commandline.py:751
+#: ../duplicity/commandline.py:717
 msgid "password"
 msgstr ""
 
-#. TRANSL: Used in usage help to represent a TCP port number. Example:
+#. Used in usage help to represent a TCP port number. Example:
 #. ftp://user[:password]@other.host[:port]/some_dir
-#: ../duplicity/commandline.py:759
+#: ../duplicity/commandline.py:725
 msgid "port"
 msgstr ""
 
-#. TRANSL: Used in usage help. This represents a string to be used as a
+#. Used in usage help. This represents a string to be used as a
 #. prefix to names for backup files created by Duplicity. Example:
 #. s3://other.host/bucket_name[/prefix]
-#: ../duplicity/commandline.py:764
+#: ../duplicity/commandline.py:730
 msgid "prefix"
 msgstr ""
 
-#. TRANSL: Used in usage help to represent a Unix-style path name. Example:
+#. Used in usage help to represent a Unix-style path name. Example:
 #. rsync://user[:password]@other.host[:port]/relative_path
-#: ../duplicity/commandline.py:768
+#: ../duplicity/commandline.py:734
 msgid "relative_path"
 msgstr ""
 
-#. TRANSL: Used in usage help to represent the name of a single file
+#. Used in usage help to represent the name of a single file
 #. directory or a Unix-style path to a directory. Example:
 #. file:///some_dir
-#: ../duplicity/commandline.py:783
+#: ../duplicity/commandline.py:749
 msgid "some_dir"
 msgstr ""
 
-#. TRANSL: Used in usage help to represent the name of a single file
+#. Used in usage help to represent the name of a single file
 #. directory or a Unix-style path to a directory where files will be
 #. coming FROM. Example:
 #. duplicity [full|incremental] [options] source_dir target_url
-#: ../duplicity/commandline.py:789
+#: ../duplicity/commandline.py:755
 msgid "source_dir"
 msgstr ""
 
-#. TRANSL: Used in usage help to represent a URL files will be coming
+#. Used in usage help to represent a URL files will be coming
 #. FROM. Example:
 #. duplicity [restore] [options] source_url target_dir
-#: ../duplicity/commandline.py:794
+#: ../duplicity/commandline.py:760
 msgid "source_url"
 msgstr ""
 
-#. TRANSL: Used in usage help to represent the name of a single file
+#. Used in usage help to represent the name of a single file
 #. directory or a Unix-style path to a directory. where files will be
 #. going TO. Example:
 #. duplicity [restore] [options] source_url target_dir
-#: ../duplicity/commandline.py:800
+#: ../duplicity/commandline.py:766
 msgid "target_dir"
 msgstr ""
 
-#. TRANSL: Used in usage help to represent a URL files will be going TO.
+#. Used in usage help to represent a URL files will be going TO.
 #. Example:
 #. duplicity [full|incremental] [options] source_dir target_url
-#: ../duplicity/commandline.py:805
+#: ../duplicity/commandline.py:771
 msgid "target_url"
 msgstr ""
 
-#. TRANSL: Used in usage help to represent a user name (i.e. login).
+#. Used in usage help to represent a user name (i.e. login).
 #. Example:
 #. ftp://user[:password]@other.host[:port]/some_dir
-#: ../duplicity/commandline.py:815
+#: ../duplicity/commandline.py:781
 msgid "user"
 msgstr ""
 
-#. TRANSL: Header in usage help
-#: ../duplicity/commandline.py:832
+#. Header in usage help
+#: ../duplicity/commandline.py:798
 msgid "Backends and their URL formats:"
 msgstr ""
 
-#. TRANSL: Header in usage help
-#: ../duplicity/commandline.py:857
+#. Header in usage help
+#: ../duplicity/commandline.py:820
 msgid "Commands:"
 msgstr ""
 
-#: ../duplicity/commandline.py:881
+#: ../duplicity/commandline.py:844
 #, python-format
 msgid ""
 "Specified archive directory '%s' does not exist, or is not a directory"
 msgstr ""
 
-#: ../duplicity/commandline.py:890
+#: ../duplicity/commandline.py:853
 #, python-format
 msgid ""
 "Sign key should be an 8 character hex string, like 'AA0E73D2'.\n"
 "Received '%s' instead."
 msgstr ""
 
-#: ../duplicity/commandline.py:950
+#: ../duplicity/commandline.py:913
 #, python-format
 msgid ""
 "Restore destination directory %s already exists.\n"
 "Will not overwrite."
 msgstr ""
 
-#: ../duplicity/commandline.py:955
+#: ../duplicity/commandline.py:918
 #, python-format
 msgid "Verify directory %s does not exist"
 msgstr ""
 
-#: ../duplicity/commandline.py:961
+#: ../duplicity/commandline.py:924
 #, python-format
 msgid "Backup source directory %s does not exist."
 msgstr ""
 
-#: ../duplicity/commandline.py:990
+#: ../duplicity/commandline.py:953
 #, python-format
 msgid "Command line warning: %s"
 msgstr ""
 
-#: ../duplicity/commandline.py:990
+#: ../duplicity/commandline.py:953
 msgid ""
 "Selection options --exclude/--include\n"
 "currently work only when backing up,not restoring."
 msgstr ""
 
-#: ../duplicity/commandline.py:1038
+#: ../duplicity/commandline.py:1001
 #, python-format
 msgid ""
 "Bad URL '%s'.\n"
@@ -960,36 +953,36 @@
 "\"file:///usr/local\".  See the man page for more information."
 msgstr ""
 
-#: ../duplicity/commandline.py:1063
+#: ../duplicity/commandline.py:1026
 msgid "Main action: "
 msgstr ""
 
-#: ../duplicity/diffdir.py:103 ../duplicity/diffdir.py:394
+#: ../duplicity/diffdir.py:101 ../duplicity/diffdir.py:390
 #, python-format
 msgid "Error %s getting delta for %s"
 msgstr ""
 
-#: ../duplicity/diffdir.py:117
+#: ../duplicity/diffdir.py:115
 #, python-format
 msgid "Getting delta of %s and %s"
 msgstr ""
 
-#: ../duplicity/diffdir.py:162
+#: ../duplicity/diffdir.py:160
 #, python-format
 msgid "A %s"
 msgstr ""
 
-#: ../duplicity/diffdir.py:169
+#: ../duplicity/diffdir.py:167
 #, python-format
 msgid "M %s"
 msgstr ""
 
-#: ../duplicity/diffdir.py:191
+#: ../duplicity/diffdir.py:189
 #, python-format
 msgid "Comparing %s and %s"
 msgstr ""
 
-#: ../duplicity/diffdir.py:199
+#: ../duplicity/diffdir.py:195
 #, python-format
 msgid "D %s"
 msgstr ""
@@ -1027,7 +1020,7 @@
 msgid "Error '%s' processing %s"
 msgstr ""
 
-#: ../duplicity/lazy.py:410
+#: ../duplicity/lazy.py:408
 #, python-format
 msgid "Skipping %s because of previous error"
 msgstr ""
@@ -1056,129 +1049,129 @@
 "seeing this message"
 msgstr ""
 
-#: ../duplicity/manifest.py:209
+#: ../duplicity/manifest.py:198
 msgid "Manifests not equal because different volume numbers"
 msgstr ""
 
-#: ../duplicity/manifest.py:214
+#: ../duplicity/manifest.py:203
 msgid "Manifests not equal because volume lists differ"
 msgstr ""
 
-#: ../duplicity/manifest.py:219
+#: ../duplicity/manifest.py:208
 msgid "Manifests not equal because hosts or directories differ"
 msgstr ""
 
-#: ../duplicity/manifest.py:366
+#: ../duplicity/manifest.py:355
 msgid "Warning, found extra Volume identifier"
 msgstr ""
 
-#: ../duplicity/manifest.py:392
+#: ../duplicity/manifest.py:381
 msgid "Other is not VolumeInfo"
 msgstr ""
 
-#: ../duplicity/manifest.py:395
+#: ../duplicity/manifest.py:384
 msgid "Volume numbers don't match"
 msgstr ""
 
-#: ../duplicity/manifest.py:398
+#: ../duplicity/manifest.py:387
 msgid "start_indicies don't match"
 msgstr ""
 
-#: ../duplicity/manifest.py:401
+#: ../duplicity/manifest.py:390
 msgid "end_index don't match"
 msgstr ""
 
-#: ../duplicity/manifest.py:408
+#: ../duplicity/manifest.py:397
 msgid "Hashes don't match"
 msgstr ""
 
-#: ../duplicity/misc.py:100
+#: ../duplicity/misc.py:99
 #, python-format
 msgid "Starting to write %s"
 msgstr ""
 
-#: ../duplicity/misc.py:108
+#: ../duplicity/misc.py:107
 #, python-format
 msgid ""
 "One only volume required.\n"
 "Renaming %s to %s"
 msgstr ""
 
-#: ../duplicity/patchdir.py:75 ../duplicity/patchdir.py:80
+#: ../duplicity/patchdir.py:74 ../duplicity/patchdir.py:79
 #, python-format
 msgid "Patching %s"
 msgstr ""
 
-#: ../duplicity/patchdir.py:582
+#: ../duplicity/patchdir.py:568
 #, python-format
 msgid "Writing %s of type %s"
 msgstr ""
 
-#: ../duplicity/path.py:222 ../duplicity/path.py:281
+#: ../duplicity/path.py:221 ../duplicity/path.py:280
 #, python-format
 msgid "Warning: %s has negative mtime, treating as 0."
 msgstr ""
 
-#: ../duplicity/path.py:346
+#: ../duplicity/path.py:345
 msgid "Difference found:"
 msgstr ""
 
-#: ../duplicity/path.py:352
+#: ../duplicity/path.py:351
 #, python-format
 msgid "New file %s"
 msgstr ""
 
-#: ../duplicity/path.py:355
+#: ../duplicity/path.py:354
 #, python-format
 msgid "File %s is missing"
 msgstr ""
 
-#: ../duplicity/path.py:358
+#: ../duplicity/path.py:357
 #, python-format
 msgid "File %%s has type %s, expected %s"
 msgstr ""
 
-#: ../duplicity/path.py:364 ../duplicity/path.py:390
+#: ../duplicity/path.py:363 ../duplicity/path.py:389
 #, python-format
 msgid "File %%s has permissions %s, expected %s"
 msgstr ""
 
-#: ../duplicity/path.py:369
+#: ../duplicity/path.py:368
 #, python-format
 msgid "File %%s has mtime %s, expected %s"
 msgstr ""
 
-#: ../duplicity/path.py:377
+#: ../duplicity/path.py:376
 #, python-format
 msgid "Data for file %s is different"
 msgstr ""
 
-#: ../duplicity/path.py:385
+#: ../duplicity/path.py:384
 #, python-format
 msgid "Symlink %%s points to %s, expected %s"
 msgstr ""
 
-#: ../duplicity/path.py:394
+#: ../duplicity/path.py:393
 #, python-format
 msgid "Device file %%s has numbers %s, expected %s"
 msgstr ""
 
-#: ../duplicity/path.py:554
+#: ../duplicity/path.py:553
 #, python-format
 msgid "Making directory %s"
 msgstr ""
 
-#: ../duplicity/path.py:564
+#: ../duplicity/path.py:563
 #, python-format
 msgid "Deleting %s"
 msgstr ""
 
-#: ../duplicity/path.py:573
+#: ../duplicity/path.py:572
 #, python-format
 msgid "Touching %s"
 msgstr ""
 
-#: ../duplicity/path.py:580
+#: ../duplicity/path.py:579
 #, python-format
 msgid "Deleting tree %s"
 msgstr ""
@@ -1289,52 +1282,52 @@
 msgid "Using temporary directory %s"
 msgstr ""
 
-#: ../duplicity/tempdir.py:163
+#: ../duplicity/tempdir.py:157
 #, python-format
 msgid "Registering (mktemp) temporary file %s"
 msgstr ""
 
-#: ../duplicity/tempdir.py:185
+#: ../duplicity/tempdir.py:179
 #, python-format
 msgid "Registering (mkstemp) temporary file %s"
 msgstr ""
 
-#: ../duplicity/tempdir.py:217
+#: ../duplicity/tempdir.py:211
 #, python-format
 msgid "Forgetting temporary file %s"
 msgstr ""
 
-#: ../duplicity/tempdir.py:220
+#: ../duplicity/tempdir.py:214
 #, python-format
 msgid "Attempt to forget unknown tempfile %s - this is probably a bug."
 msgstr ""
 
-#: ../duplicity/tempdir.py:239
+#: ../duplicity/tempdir.py:233
 #, python-format
 msgid "Removing still remembered temporary file %s"
 msgstr ""
 
-#: ../duplicity/tempdir.py:242
+#: ../duplicity/tempdir.py:236
 #, python-format
 msgid "Cleanup of temporary file %s failed"
 msgstr ""
 
-#: ../duplicity/tempdir.py:247
+#: ../duplicity/tempdir.py:241
 #, python-format
 msgid "Cleanup of temporary directory %s failed - this is probably a bug."
 msgstr ""
 
-#: ../duplicity/util.py:85
+#: ../duplicity/util.py:68
 #, python-format
 msgid "IGNORED_ERROR: Warning: ignoring error as requested: %s: %s"
 msgstr ""
 
-#: ../duplicity/backends/giobackend.py:106
+#: ../duplicity/backends/giobackend.py:89
 #, python-format
 msgid "Connection failed, please check your password: %s"
 msgstr ""
 
-#: ../duplicity/backends/giobackend.py:130
+#: ../duplicity/backends/giobackend.py:113
 #, python-format
 msgid "Writing %s"
 msgstr ""
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/e2fsprogs.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/e2fsprogs.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/e2fsprogs.po	2014-02-24 08:24:24.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/e2fsprogs.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,4263 +0,0 @@
-# Simplified Chinese translation for e2fsprogs
-# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the e2fsprogs package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: e2fsprogs\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2008-06-17 22:16-0400\n"
-"PO-Revision-Date: 2009-09-23 16:19+0000\n"
-"Last-Translator: Careone <zzbusagain@yahoo.com.cn>\n"
-"Language-Team: Simplified Chinese <zh_CN@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-12 10:44+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
-
-#: e2fsck/badblocks.c:22 misc/mke2fs.c:157
-#, c-format
-msgid "Bad block %u out of range; ignored.\n"
-msgstr "坏道 %u 超出范围；忽略。\n"
-
-#: e2fsck/badblocks.c:45
-msgid "while sanity checking the bad blocks inode"
-msgstr "当对坏块中的inode节点进行全面检查时"
-
-#: e2fsck/badblocks.c:57
-msgid "while reading the bad blocks inode"
-msgstr ""
-
-#: e2fsck/badblocks.c:71 e2fsck/iscan.c:112 e2fsck/scantest.c:109
-#: e2fsck/unix.c:1016 e2fsck/unix.c:1099 misc/badblocks.c:1025
-#: misc/badblocks.c:1033 misc/badblocks.c:1047 misc/badblocks.c:1059
-#: misc/dumpe2fs.c:483 misc/e2image.c:571 misc/e2image.c:667
-#: misc/e2image.c:683 misc/mke2fs.c:173 misc/tune2fs.c:917 resize/main.c:296
-#, c-format
-msgid "while trying to open %s"
-msgstr "当试图打开%s时"
-
-#: e2fsck/badblocks.c:82
-#, c-format
-msgid "while trying popen '%s'"
-msgstr "当试图打开 '%s'"
-
-#: e2fsck/badblocks.c:93 misc/mke2fs.c:180
-msgid "while reading in list of bad blocks from file"
-msgstr "从文件读取坏块列表时"
-
-#: e2fsck/badblocks.c:104
-msgid "while updating bad block inode"
-msgstr "更新坏块节点时"
-
-#: e2fsck/badblocks.c:130
-#, c-format
-msgid "Warning: illegal block %u found in bad block inode.  Cleared.\n"
-msgstr ""
-
-#: e2fsck/ehandler.c:53
-#, c-format
-msgid "Error reading block %lu (%s) while %s.  "
-msgstr ""
-
-#: e2fsck/ehandler.c:56
-#, c-format
-msgid "Error reading block %lu (%s).  "
-msgstr "读取块 %lu (%s) 出错。  "
-
-#: e2fsck/ehandler.c:59 e2fsck/ehandler.c:106
-msgid "Ignore error"
-msgstr "忽略错误"
-
-#: e2fsck/ehandler.c:60
-msgid "Force rewrite"
-msgstr "强制重写"
-
-#: e2fsck/ehandler.c:100
-#, c-format
-msgid "Error writing block %lu (%s) while %s.  "
-msgstr "写入块 %lu (%s) 时出错当 %s。  "
-
-#: e2fsck/ehandler.c:103
-#, c-format
-msgid "Error writing block %lu (%s).  "
-msgstr "写入块 %lu (%s) 出错。  "
-
-#: e2fsck/emptydir.c:56
-msgid "empty dirblocks"
-msgstr "空的目录块"
-
-#: e2fsck/emptydir.c:61
-msgid "empty dir map"
-msgstr ""
-
-#: e2fsck/emptydir.c:97
-#, c-format
-msgid "Empty directory block %u (#%d) in inode %u\n"
-msgstr ""
-
-#: e2fsck/extend.c:21
-#, c-format
-msgid "%s: %s filename nblocks blocksize\n"
-msgstr ""
-
-#: e2fsck/extend.c:43
-#, c-format
-msgid "Illegal number of blocks!\n"
-msgstr ""
-
-#: e2fsck/extend.c:49
-#, c-format
-msgid "Couldn't allocate block buffer (size=%d)\n"
-msgstr "不能为块分配缓存(大小=%d)\n"
-
-#: e2fsck/flushb.c:34
-#, c-format
-msgid "Usage: %s disk\n"
-msgstr ""
-
-#: e2fsck/flushb.c:63
-#, c-format
-msgid "BLKFLSBUF ioctl not supported!  Can't flush buffers.\n"
-msgstr ""
-
-#: e2fsck/iscan.c:46
-#, c-format
-msgid "Usage: %s [-F] [-I inode_buffer_blocks] device\n"
-msgstr "用法：%s [-F] [-I 节点缓冲块] 设备名\n"
-
-#: e2fsck/iscan.c:83 e2fsck/unix.c:791
-#, c-format
-msgid "while opening %s for flushing"
-msgstr ""
-
-#: e2fsck/iscan.c:88 e2fsck/unix.c:797 resize/main.c:274
-#, c-format
-msgid "while trying to flush %s"
-msgstr ""
-
-#: e2fsck/iscan.c:121 e2fsck/scantest.c:116 misc/e2image.c:480
-msgid "while opening inode scan"
-msgstr ""
-
-#: e2fsck/iscan.c:129 misc/e2image.c:498
-msgid "while getting next inode"
-msgstr ""
-
-#: e2fsck/iscan.c:138
-#, c-format
-msgid "%u inodes scanned.\n"
-msgstr ""
-
-#: e2fsck/journal.c:501
-msgid "reading journal superblock\n"
-msgstr ""
-
-#: e2fsck/journal.c:558
-#, c-format
-msgid "%s: no valid journal superblock found\n"
-msgstr ""
-
-#: e2fsck/journal.c:567
-#, c-format
-msgid "%s: journal too short\n"
-msgstr ""
-
-#: e2fsck/journal.c:841
-#, c-format
-msgid "%s: recovering journal\n"
-msgstr ""
-
-#: e2fsck/journal.c:843
-#, c-format
-msgid "%s: won't do journal recovery while read-only\n"
-msgstr ""
-
-#: e2fsck/journal.c:864
-#, c-format
-msgid "while trying to re-open %s"
-msgstr ""
-
-#: e2fsck/message.c:109
-msgid "aextended attribute"
-msgstr ""
-
-#: e2fsck/message.c:110
-msgid "Aerror allocating"
-msgstr ""
-
-#: e2fsck/message.c:111
-msgid "bblock"
-msgstr ""
-
-#: e2fsck/message.c:112
-msgid "Bbitmap"
-msgstr ""
-
-#: e2fsck/message.c:113
-msgid "ccompress"
-msgstr ""
-
-#: e2fsck/message.c:114
-msgid "Cconflicts with some other fs @b"
-msgstr ""
-
-#: e2fsck/message.c:115
-msgid "iinode"
-msgstr ""
-
-#: e2fsck/message.c:116
-msgid "Iillegal"
-msgstr ""
-
-#: e2fsck/message.c:117
-msgid "jjournal"
-msgstr ""
-
-#: e2fsck/message.c:118
-msgid "Ddeleted"
-msgstr ""
-
-#: e2fsck/message.c:119
-msgid "ddirectory"
-msgstr ""
-
-#: e2fsck/message.c:120
-msgid "eentry"
-msgstr ""
-
-#: e2fsck/message.c:121
-msgid "E@e '%Dn' in %p (%i)"
-msgstr ""
-
-#: e2fsck/message.c:122
-msgid "ffilesystem"
-msgstr ""
-
-#: e2fsck/message.c:123
-msgid "Ffor @i %i (%Q) is"
-msgstr ""
-
-#: e2fsck/message.c:124
-msgid "ggroup"
-msgstr ""
-
-#: e2fsck/message.c:125
-msgid "hHTREE @d @i"
-msgstr ""
-
-#: e2fsck/message.c:126
-msgid "llost+found"
-msgstr ""
-
-#: e2fsck/message.c:127
-msgid "Lis a link"
-msgstr ""
-
-#: e2fsck/message.c:128
-msgid "mmultiply-claimed"
-msgstr ""
-
-#: e2fsck/message.c:129
-msgid "ninvalid"
-msgstr ""
-
-#: e2fsck/message.c:130
-msgid "oorphaned"
-msgstr ""
-
-#: e2fsck/message.c:131
-msgid "pproblem in"
-msgstr ""
-
-#: e2fsck/message.c:132
-msgid "rroot @i"
-msgstr ""
-
-#: e2fsck/message.c:133
-msgid "sshould be"
-msgstr ""
-
-#: e2fsck/message.c:134
-msgid "Ssuper@b"
-msgstr ""
-
-#: e2fsck/message.c:135
-msgid "uunattached"
-msgstr ""
-
-#: e2fsck/message.c:136
-msgid "vdevice"
-msgstr ""
-
-#: e2fsck/message.c:137
-msgid "zzero-length"
-msgstr ""
-
-#: e2fsck/message.c:148
-msgid "<The NULL inode>"
-msgstr ""
-
-#: e2fsck/message.c:149
-msgid "<The bad blocks inode>"
-msgstr ""
-
-#: e2fsck/message.c:151
-msgid "<The ACL index inode>"
-msgstr ""
-
-#: e2fsck/message.c:152
-msgid "<The ACL data inode>"
-msgstr ""
-
-#: e2fsck/message.c:153
-msgid "<The boot loader inode>"
-msgstr ""
-
-#: e2fsck/message.c:154
-msgid "<The undelete directory inode>"
-msgstr ""
-
-#: e2fsck/message.c:155
-msgid "<The group descriptor inode>"
-msgstr ""
-
-#: e2fsck/message.c:156
-msgid "<The journal inode>"
-msgstr ""
-
-#: e2fsck/message.c:157
-msgid "<Reserved inode 9>"
-msgstr ""
-
-#: e2fsck/message.c:158
-msgid "<Reserved inode 10>"
-msgstr ""
-
-#: e2fsck/message.c:314
-#, c-format
-msgid "regular file"
-msgstr ""
-
-#: e2fsck/message.c:316
-#, c-format
-msgid "directory"
-msgstr ""
-
-#: e2fsck/message.c:318
-#, c-format
-msgid "character device"
-msgstr ""
-
-#: e2fsck/message.c:320
-#, c-format
-msgid "block device"
-msgstr ""
-
-#: e2fsck/message.c:322
-#, c-format
-msgid "named pipe"
-msgstr ""
-
-#: e2fsck/message.c:324
-#, c-format
-msgid "symbolic link"
-msgstr ""
-
-#: e2fsck/message.c:326
-#, c-format
-msgid "socket"
-msgstr ""
-
-#: e2fsck/message.c:328
-#, c-format
-msgid "unknown file type with mode 0%o"
-msgstr ""
-
-#: e2fsck/pass1b.c:215
-msgid "multiply claimed inode map"
-msgstr ""
-
-#: e2fsck/pass1b.c:566 e2fsck/pass1b.c:703
-#, c-format
-msgid "internal error: can't find dup_blk for %u\n"
-msgstr ""
-
-#: e2fsck/pass1b.c:746
-msgid "returned from clone_file_block"
-msgstr ""
-
-#: e2fsck/pass1b.c:765
-#, c-format
-msgid "internal error: couldn't lookup EA block record for %u"
-msgstr ""
-
-#: e2fsck/pass1b.c:777
-#, c-format
-msgid "internal error: couldn't lookup EA inode record for %u"
-msgstr ""
-
-#: e2fsck/pass1.c:404 e2fsck/pass2.c:770
-msgid "reading directory block"
-msgstr ""
-
-#: e2fsck/pass1.c:521
-msgid "in-use inode map"
-msgstr ""
-
-#: e2fsck/pass1.c:530
-msgid "directory inode map"
-msgstr ""
-
-#: e2fsck/pass1.c:538
-msgid "regular file inode map"
-msgstr ""
-
-#: e2fsck/pass1.c:545
-msgid "in-use block map"
-msgstr ""
-
-#: e2fsck/pass1.c:599
-msgid "opening inode scan"
-msgstr ""
-
-#: e2fsck/pass1.c:623
-msgid "getting next inode from scan"
-msgstr ""
-
-#: e2fsck/pass1.c:1016
-msgid "Pass 1"
-msgstr ""
-
-#: e2fsck/pass1.c:1075
-#, c-format
-msgid "reading indirect blocks of inode %u"
-msgstr ""
-
-#: e2fsck/pass1.c:1117
-msgid "bad inode map"
-msgstr ""
-
-#: e2fsck/pass1.c:1139
-msgid "inode in bad block map"
-msgstr ""
-
-#: e2fsck/pass1.c:1159
-msgid "imagic inode map"
-msgstr ""
-
-#: e2fsck/pass1.c:1186
-msgid "multiply claimed block map"
-msgstr ""
-
-#: e2fsck/pass1.c:1285
-msgid "ext attr block map"
-msgstr ""
-
-#: e2fsck/pass1.c:2095
-msgid "block bitmap"
-msgstr ""
-
-#: e2fsck/pass1.c:2099
-msgid "inode bitmap"
-msgstr ""
-
-#: e2fsck/pass1.c:2103
-msgid "inode table"
-msgstr ""
-
-#: e2fsck/pass2.c:283
-msgid "Pass 2"
-msgstr ""
-
-#: e2fsck/pass2.c:793
-msgid "Can not continue."
-msgstr ""
-
-#: e2fsck/pass3.c:79
-msgid "inode done bitmap"
-msgstr ""
-
-#: e2fsck/pass3.c:90
-msgid "Peak memory"
-msgstr ""
-
-#: e2fsck/pass3.c:145
-msgid "Pass 3"
-msgstr ""
-
-#: e2fsck/pass3.c:333
-msgid "inode loop detection bitmap"
-msgstr ""
-
-#: e2fsck/pass4.c:176
-msgid "Pass 4"
-msgstr ""
-
-#: e2fsck/pass5.c:70
-msgid "Pass 5"
-msgstr ""
-
-#: e2fsck/problem.c:50
-msgid "(no prompt)"
-msgstr ""
-
-#: e2fsck/problem.c:51
-msgid "Fix"
-msgstr ""
-
-#: e2fsck/problem.c:52
-msgid "Clear"
-msgstr ""
-
-#: e2fsck/problem.c:53
-msgid "Relocate"
-msgstr ""
-
-#: e2fsck/problem.c:54
-msgid "Allocate"
-msgstr ""
-
-#: e2fsck/problem.c:55
-msgid "Expand"
-msgstr ""
-
-#: e2fsck/problem.c:56
-msgid "Connect to /lost+found"
-msgstr ""
-
-#: e2fsck/problem.c:57
-msgid "Create"
-msgstr ""
-
-#: e2fsck/problem.c:58
-msgid "Salvage"
-msgstr ""
-
-#: e2fsck/problem.c:59
-msgid "Truncate"
-msgstr ""
-
-#: e2fsck/problem.c:60
-msgid "Clear inode"
-msgstr ""
-
-#: e2fsck/problem.c:61
-msgid "Abort"
-msgstr ""
-
-#: e2fsck/problem.c:62
-msgid "Split"
-msgstr ""
-
-#: e2fsck/problem.c:63
-msgid "Continue"
-msgstr ""
-
-#: e2fsck/problem.c:64
-msgid "Clone multiply-claimed blocks"
-msgstr ""
-
-#: e2fsck/problem.c:65
-msgid "Delete file"
-msgstr ""
-
-#: e2fsck/problem.c:66
-msgid "Suppress messages"
-msgstr ""
-
-#: e2fsck/problem.c:67
-msgid "Unlink"
-msgstr ""
-
-#: e2fsck/problem.c:68
-msgid "Clear HTree index"
-msgstr ""
-
-#: e2fsck/problem.c:69
-msgid "Recreate"
-msgstr ""
-
-#: e2fsck/problem.c:78
-msgid "(NONE)"
-msgstr ""
-
-#: e2fsck/problem.c:79
-msgid "FIXED"
-msgstr ""
-
-#: e2fsck/problem.c:80
-msgid "CLEARED"
-msgstr ""
-
-#: e2fsck/problem.c:81
-msgid "RELOCATED"
-msgstr ""
-
-#: e2fsck/problem.c:82
-msgid "ALLOCATED"
-msgstr ""
-
-#: e2fsck/problem.c:83
-msgid "EXPANDED"
-msgstr ""
-
-#: e2fsck/problem.c:84
-msgid "RECONNECTED"
-msgstr ""
-
-#: e2fsck/problem.c:85
-msgid "CREATED"
-msgstr ""
-
-#: e2fsck/problem.c:86
-msgid "SALVAGED"
-msgstr ""
-
-#: e2fsck/problem.c:87
-msgid "TRUNCATED"
-msgstr ""
-
-#: e2fsck/problem.c:88
-msgid "INODE CLEARED"
-msgstr ""
-
-#: e2fsck/problem.c:89
-msgid "ABORTED"
-msgstr ""
-
-#: e2fsck/problem.c:90
-msgid "SPLIT"
-msgstr ""
-
-#: e2fsck/problem.c:91
-msgid "CONTINUING"
-msgstr ""
-
-#: e2fsck/problem.c:92
-msgid "MULTIPLY-CLAIMED BLOCKS CLONED"
-msgstr ""
-
-#: e2fsck/problem.c:93
-msgid "FILE DELETED"
-msgstr ""
-
-#: e2fsck/problem.c:94
-msgid "SUPPRESSED"
-msgstr ""
-
-#: e2fsck/problem.c:95
-msgid "UNLINKED"
-msgstr ""
-
-#: e2fsck/problem.c:96
-msgid "HTREE INDEX CLEARED"
-msgstr ""
-
-#: e2fsck/problem.c:97
-msgid "WILL RECREATE"
-msgstr ""
-
-#. @-expanded: block bitmap for group %g is not in group.  (block %b)\n
-#: e2fsck/problem.c:106
-msgid "@b @B for @g %g is not in @g.  (@b %b)\n"
-msgstr ""
-
-#. @-expanded: inode bitmap for group %g is not in group.  (block %b)\n
-#: e2fsck/problem.c:110
-msgid "@i @B for @g %g is not in @g.  (@b %b)\n"
-msgstr ""
-
-#. @-expanded: inode table for group %g is not in group.  (block %b)\n
-#. @-expanded: WARNING: SEVERE DATA LOSS POSSIBLE.\n
-#: e2fsck/problem.c:115
-msgid ""
-"@i table for @g %g is not in @g.  (@b %b)\n"
-"WARNING: SEVERE DATA LOSS POSSIBLE.\n"
-msgstr ""
-
-#. @-expanded: \n
-#. @-expanded: The superblock could not be read or does not describe a correct ext2\n
-#. @-expanded: filesystem.  If the device is valid and it really contains an ext2\n
-#. @-expanded: filesystem (and not swap or ufs or something else), then the superblock\n
-#. @-expanded: is corrupt, and you might try running e2fsck with an alternate superblock:\n
-#. @-expanded:     e2fsck -b %S <device>\n
-#. @-expanded: \n
-#: e2fsck/problem.c:121
-#, c-format
-msgid ""
-"\n"
-"The @S could not be read or does not describe a correct ext2\n"
-"@f.  If the @v is valid and it really contains an ext2\n"
-"@f (and not swap or ufs or something else), then the @S\n"
-"is corrupt, and you might try running e2fsck with an alternate @S:\n"
-"    e2fsck -b %S <@v>\n"
-"\n"
-msgstr ""
-
-#. @-expanded: The filesystem size (according to the superblock) is %b blocks\n
-#. @-expanded: The physical size of the device is %c blocks\n
-#. @-expanded: Either the superblock or the partition table is likely to be corrupt!\n
-#: e2fsck/problem.c:130
-msgid ""
-"The @f size (according to the @S) is %b @bs\n"
-"The physical size of the @v is %c @bs\n"
-"Either the @S or the partition table is likely to be corrupt!\n"
-msgstr ""
-
-#. @-expanded: superblock block_size = %b, fragsize = %c.\n
-#. @-expanded: This version of e2fsck does not support fragment sizes different\n
-#. @-expanded: from the block size.\n
-#: e2fsck/problem.c:137
-msgid ""
-"@S @b_size = %b, fragsize = %c.\n"
-"This version of e2fsck does not support fragment sizes different\n"
-"from the @b size.\n"
-msgstr ""
-
-#. @-expanded: superblock blocks_per_group = %b, should have been %c\n
-#: e2fsck/problem.c:144
-msgid "@S @bs_per_group = %b, should have been %c\n"
-msgstr ""
-
-#. @-expanded: superblock first_data_block = %b, should have been %c\n
-#: e2fsck/problem.c:149
-msgid "@S first_data_@b = %b, should have been %c\n"
-msgstr ""
-
-#. @-expanded: filesystem did not have a UUID; generating one.\n
-#. @-expanded: \n
-#: e2fsck/problem.c:154
-msgid ""
-"@f did not have a UUID; generating one.\n"
-"\n"
-msgstr ""
-
-#: e2fsck/problem.c:159
-#, c-format
-msgid ""
-"Note: if several inode or block bitmap blocks or part\n"
-"of the inode table require relocation, you may wish to try\n"
-"running e2fsck with the '-b %S' option first.  The problem\n"
-"may lie only with the primary block group descriptors, and\n"
-"the backup block group descriptors may be OK.\n"
-"\n"
-msgstr ""
-
-#. @-expanded: Corruption found in superblock.  (%s = %N).\n
-#: e2fsck/problem.c:168
-msgid "Corruption found in @S.  (%s = %N).\n"
-msgstr ""
-
-#. @-expanded: Error determining size of the physical device: %m\n
-#: e2fsck/problem.c:173
-#, c-format
-msgid "Error determining size of the physical @v: %m\n"
-msgstr ""
-
-#. @-expanded: inode count in superblock is %i, should be %j.\n
-#: e2fsck/problem.c:178
-msgid "@i count in @S is %i, @s %j.\n"
-msgstr ""
-
-#: e2fsck/problem.c:182
-msgid "The Hurd does not support the filetype feature.\n"
-msgstr ""
-
-#. @-expanded: superblock has an invalid ext3 journal (inode %i).\n
-#: e2fsck/problem.c:187
-#, c-format
-msgid "@S has an @n ext3 @j (@i %i).\n"
-msgstr ""
-
-#. @-expanded: External journal has multiple filesystem users (unsupported).\n
-#: e2fsck/problem.c:192
-msgid "External @j has multiple @f users (unsupported).\n"
-msgstr ""
-
-#. @-expanded: Can't find external journal\n
-#: e2fsck/problem.c:197
-msgid "Can't find external @j\n"
-msgstr ""
-
-#. @-expanded: External journal has bad superblock\n
-#: e2fsck/problem.c:202
-msgid "External @j has bad @S\n"
-msgstr ""
-
-#. @-expanded: External journal does not support this filesystem\n
-#: e2fsck/problem.c:207
-msgid "External @j does not support this @f\n"
-msgstr ""
-
-#. @-expanded: Ext3 journal superblock is unknown type %N (unsupported).\n
-#. @-expanded: It is likely that your copy of e2fsck is old and/or doesn't support this journal
-#. @-expanded: format.\n
-#. @-expanded: It is also possible the journal superblock is corrupt.\n
-#: e2fsck/problem.c:212
-msgid ""
-"Ext3 @j @S is unknown type %N (unsupported).\n"
-"It is likely that your copy of e2fsck is old and/or doesn't support this @j "
-"format.\n"
-"It is also possible the @j @S is corrupt.\n"
-msgstr ""
-
-#. @-expanded: Ext3 journal superblock is corrupt.\n
-#: e2fsck/problem.c:220
-msgid "Ext3 @j @S is corrupt.\n"
-msgstr ""
-
-#. @-expanded: superblock doesn't have has_journal flag, but has ext3 journal %s.\n
-#: e2fsck/problem.c:225
-#, c-format
-msgid "@S doesn't have has_@j flag, but has ext3 @j %s.\n"
-msgstr ""
-
-#. @-expanded: superblock has ext3 needs_recovery flag set, but no journal.\n
-#: e2fsck/problem.c:230
-msgid "@S has ext3 needs_recovery flag set, but no @j.\n"
-msgstr ""
-
-#. @-expanded: ext3 recovery flag is clear, but journal has data.\n
-#: e2fsck/problem.c:235
-msgid "ext3 recovery flag is clear, but @j has data.\n"
-msgstr ""
-
-#. @-expanded: Clear journal
-#: e2fsck/problem.c:240
-msgid "Clear @j"
-msgstr ""
-
-#. @-expanded: Run journal anyway
-#: e2fsck/problem.c:245
-msgid "Run @j anyway"
-msgstr ""
-
-#. @-expanded: Recovery flag not set in backup superblock, so running journal anyway.\n
-#: e2fsck/problem.c:250
-msgid "Recovery flag not set in backup @S, so running @j anyway.\n"
-msgstr ""
-
-#. @-expanded: %s orphaned inode %i (uid=%Iu, gid=%Ig, mode=%Im, size=%Is)\n
-#: e2fsck/problem.c:255
-msgid "%s @o @i %i (uid=%Iu, gid=%Ig, mode=%Im, size=%Is)\n"
-msgstr ""
-
-#. @-expanded: illegal block #%B (%b) found in orphaned inode %i.\n
-#: e2fsck/problem.c:260
-msgid "@I @b #%B (%b) found in @o @i %i.\n"
-msgstr ""
-
-#. @-expanded: Already cleared block #%B (%b) found in orphaned inode %i.\n
-#: e2fsck/problem.c:265
-msgid "Already cleared @b #%B (%b) found in @o @i %i.\n"
-msgstr ""
-
-#. @-expanded: illegal orphaned inode %i in superblock.\n
-#: e2fsck/problem.c:270
-#, c-format
-msgid "@I @o @i %i in @S.\n"
-msgstr ""
-
-#. @-expanded: illegal inode %i in orphaned inode list.\n
-#: e2fsck/problem.c:275
-#, c-format
-msgid "@I @i %i in @o @i list.\n"
-msgstr ""
-
-#. @-expanded: filesystem has feature flag(s) set, but is a revision 0 filesystem.
-#: e2fsck/problem.c:280 e2fsck/problem.c:613
-msgid "@f has feature flag(s) set, but is a revision 0 @f.  "
-msgstr ""
-
-#. @-expanded: Ext3 journal superblock has an unknown read-only feature flag set.\n
-#: e2fsck/problem.c:285
-msgid "Ext3 @j @S has an unknown read-only feature flag set.\n"
-msgstr ""
-
-#. @-expanded: Ext3 journal superblock has an unknown incompatible feature flag set.\n
-#: e2fsck/problem.c:290
-msgid "Ext3 @j @S has an unknown incompatible feature flag set.\n"
-msgstr ""
-
-#. @-expanded: journal version not supported by this e2fsck.\n
-#: e2fsck/problem.c:295
-msgid "@j version not supported by this e2fsck.\n"
-msgstr ""
-
-#. @-expanded: Moving journal from /%s to hidden inode.\n
-#. @-expanded: \n
-#: e2fsck/problem.c:300
-#, c-format
-msgid ""
-"Moving @j from /%s to hidden @i.\n"
-"\n"
-msgstr ""
-
-#. @-expanded: Error moving journal: %m\n
-#. @-expanded: \n
-#: e2fsck/problem.c:305
-#, c-format
-msgid ""
-"Error moving @j: %m\n"
-"\n"
-msgstr ""
-
-#. @-expanded: Found invalid V2 journal superblock fields (from V1 journal).\n
-#. @-expanded: Clearing fields beyond the V1 journal superblock...\n
-#. @-expanded: \n
-#: e2fsck/problem.c:310
-msgid ""
-"Found @n V2 @j @S fields (from V1 @j).\n"
-"Clearing fields beyond the V1 @j @S...\n"
-"\n"
-msgstr ""
-
-#. @-expanded: Backing up journal inode block information.\n
-#. @-expanded: \n
-#: e2fsck/problem.c:316
-msgid ""
-"Backing up @j @i @b information.\n"
-"\n"
-msgstr ""
-
-#. @-expanded: filesystem does not have resize_inode enabled, but s_reserved_gdt_blocks\n
-#. @-expanded: is %N; should be zero.
-#: e2fsck/problem.c:321
-msgid ""
-"@f does not have resize_@i enabled, but s_reserved_gdt_@bs\n"
-"is %N; @s zero.  "
-msgstr ""
-
-#. @-expanded: Resize_inode not enabled, but the resize inode is non-zero.
-#: e2fsck/problem.c:327
-msgid "Resize_@i not enabled, but the resize @i is non-zero.  "
-msgstr ""
-
-#. @-expanded: Resize inode not valid.
-#: e2fsck/problem.c:332
-msgid "Resize @i not valid.  "
-msgstr ""
-
-#. @-expanded: superblock last mount time is in the future.
-#: e2fsck/problem.c:337
-msgid "@S last mount time is in the future.  "
-msgstr ""
-
-#. @-expanded: superblock last write time is in the future.
-#: e2fsck/problem.c:342
-msgid "@S last write time is in the future.  "
-msgstr ""
-
-#. @-expanded: superblock hint for external superblock should be %X.
-#: e2fsck/problem.c:346
-#, c-format
-msgid "@S hint for external superblock @s %X.  "
-msgstr ""
-
-#. @-expanded: Adding dirhash hint to filesystem.\n
-#. @-expanded: \n
-#: e2fsck/problem.c:351
-msgid ""
-"Adding dirhash hint to @f.\n"
-"\n"
-msgstr ""
-
-#. @-expanded: Pass 1: Checking inodes, blocks, and sizes\n
-#: e2fsck/problem.c:358
-msgid "Pass 1: Checking @is, @bs, and sizes\n"
-msgstr ""
-
-#. @-expanded: root inode is not a directory.
-#: e2fsck/problem.c:362
-msgid "@r is not a @d.  "
-msgstr ""
-
-#. @-expanded: root inode has dtime set (probably due to old mke2fs).
-#: e2fsck/problem.c:367
-msgid "@r has dtime set (probably due to old mke2fs).  "
-msgstr ""
-
-#. @-expanded: Reserved inode %i (%Q) has invalid mode.
-#: e2fsck/problem.c:372
-msgid "Reserved @i %i (%Q) has @n mode.  "
-msgstr ""
-
-#. @-expanded: deleted inode %i has zero dtime.
-#: e2fsck/problem.c:377
-#, c-format
-msgid "@D @i %i has zero dtime.  "
-msgstr ""
-
-#. @-expanded: inode %i is in use, but has dtime set.
-#: e2fsck/problem.c:382
-#, c-format
-msgid "@i %i is in use, but has dtime set.  "
-msgstr ""
-
-#. @-expanded: inode %i is a zero-length directory.
-#: e2fsck/problem.c:387
-#, c-format
-msgid "@i %i is a @z @d.  "
-msgstr ""
-
-#. @-expanded: group %g's block bitmap at %b conflicts with some other fs block.\n
-#: e2fsck/problem.c:392
-msgid "@g %g's @b @B at %b @C.\n"
-msgstr ""
-
-#. @-expanded: group %g's inode bitmap at %b conflicts with some other fs block.\n
-#: e2fsck/problem.c:397
-msgid "@g %g's @i @B at %b @C.\n"
-msgstr ""
-
-#. @-expanded: group %g's inode table at %b conflicts with some other fs block.\n
-#: e2fsck/problem.c:402
-msgid "@g %g's @i table at %b @C.\n"
-msgstr ""
-
-#. @-expanded: group %g's block bitmap (%b) is bad.
-#: e2fsck/problem.c:407
-msgid "@g %g's @b @B (%b) is bad.  "
-msgstr ""
-
-#. @-expanded: group %g's inode bitmap (%b) is bad.
-#: e2fsck/problem.c:412
-msgid "@g %g's @i @B (%b) is bad.  "
-msgstr ""
-
-#. @-expanded: inode %i, i_size is %Is, should be %N.
-#: e2fsck/problem.c:417
-msgid "@i %i, i_size is %Is, @s %N.  "
-msgstr ""
-
-#. @-expanded: inode %i, i_blocks is %Ib, should be %N.
-#: e2fsck/problem.c:422
-msgid "@i %i, i_@bs is %Ib, @s %N.  "
-msgstr ""
-
-#. @-expanded: illegal block #%B (%b) in inode %i.
-#: e2fsck/problem.c:427
-msgid "@I @b #%B (%b) in @i %i.  "
-msgstr ""
-
-#. @-expanded: block #%B (%b) overlaps filesystem metadata in inode %i.
-#: e2fsck/problem.c:432
-msgid "@b #%B (%b) overlaps @f metadata in @i %i.  "
-msgstr ""
-
-#. @-expanded: inode %i has illegal block(s).
-#: e2fsck/problem.c:437
-#, c-format
-msgid "@i %i has illegal @b(s).  "
-msgstr ""
-
-#. @-expanded: Too many illegal blocks in inode %i.\n
-#: e2fsck/problem.c:442
-#, c-format
-msgid "Too many illegal @bs in @i %i.\n"
-msgstr ""
-
-#. @-expanded: illegal block #%B (%b) in bad block inode.
-#: e2fsck/problem.c:447
-msgid "@I @b #%B (%b) in bad @b @i.  "
-msgstr ""
-
-#. @-expanded: Bad block inode has illegal block(s).
-#: e2fsck/problem.c:452
-msgid "Bad @b @i has illegal @b(s).  "
-msgstr ""
-
-#. @-expanded: Duplicate or bad block in use!\n
-#: e2fsck/problem.c:457
-msgid "Duplicate or bad @b in use!\n"
-msgstr ""
-
-#. @-expanded: Bad block %b used as bad block inode indirect block.
-#: e2fsck/problem.c:462
-msgid "Bad @b %b used as bad @b @i indirect @b.  "
-msgstr ""
-
-#. @-expanded: \n
-#. @-expanded: The bad block inode has probably been corrupted.  You probably\n
-#. @-expanded: should stop now and run e2fsck -c to scan for bad blocks\n
-#. @-expanded: in the filesystem.\n
-#: e2fsck/problem.c:467
-msgid ""
-"\n"
-"The bad @b @i has probably been corrupted.  You probably\n"
-"should stop now and run e2fsck -c to scan for bad blocks\n"
-"in the @f.\n"
-msgstr ""
-
-#. @-expanded: \n
-#. @-expanded: If the block is really bad, the filesystem can not be fixed.\n
-#: e2fsck/problem.c:474
-msgid ""
-"\n"
-"If the @b is really bad, the @f can not be fixed.\n"
-msgstr ""
-
-#. @-expanded: You can remove this block from the bad block list and hope\n
-#. @-expanded: that the block is really OK.  But there are no guarantees.\n
-#. @-expanded: \n
-#: e2fsck/problem.c:479
-msgid ""
-"You can remove this @b from the bad @b list and hope\n"
-"that the @b is really OK.  But there are no guarantees.\n"
-"\n"
-msgstr ""
-
-#. @-expanded: The primary superblock (%b) is on the bad block list.\n
-#: e2fsck/problem.c:485
-msgid "The primary @S (%b) is on the bad @b list.\n"
-msgstr ""
-
-#. @-expanded: Block %b in the primary group descriptors is on the bad block list\n
-#: e2fsck/problem.c:490
-msgid "Block %b in the primary @g descriptors is on the bad @b list\n"
-msgstr ""
-
-#. @-expanded: Warning: Group %g's superblock (%b) is bad.\n
-#: e2fsck/problem.c:496
-msgid "Warning: Group %g's @S (%b) is bad.\n"
-msgstr ""
-
-#. @-expanded: Warning: Group %g's copy of the group descriptors has a bad block (%b).\n
-#: e2fsck/problem.c:501
-msgid "Warning: Group %g's copy of the @g descriptors has a bad @b (%b).\n"
-msgstr ""
-
-#. @-expanded: Programming error?  block #%b claimed for no reason in process_bad_block.\n
-#: e2fsck/problem.c:507
-msgid "Programming error?  @b #%b claimed for no reason in process_bad_@b.\n"
-msgstr ""
-
-#. @-expanded: error allocating %N contiguous block(s) in block group %g for %s: %m\n
-#: e2fsck/problem.c:513
-msgid "@A %N contiguous @b(s) in @b @g %g for %s: %m\n"
-msgstr ""
-
-#. @-expanded: error allocating block buffer for relocating %s\n
-#: e2fsck/problem.c:518
-#, c-format
-msgid "@A @b buffer for relocating %s\n"
-msgstr ""
-
-#. @-expanded: Relocating group %g's %s from %b to %c...\n
-#: e2fsck/problem.c:523
-msgid "Relocating @g %g's %s from %b to %c...\n"
-msgstr ""
-
-#. @-expanded: Relocating group %g's %s to %c...\n
-#: e2fsck/problem.c:528
-#, c-format
-msgid "Relocating @g %g's %s to %c...\n"
-msgstr ""
-
-#. @-expanded: Warning: could not read block %b of %s: %m\n
-#: e2fsck/problem.c:533
-msgid "Warning: could not read @b %b of %s: %m\n"
-msgstr ""
-
-#. @-expanded: Warning: could not write block %b for %s: %m\n
-#: e2fsck/problem.c:538
-msgid "Warning: could not write @b %b for %s: %m\n"
-msgstr ""
-
-#. @-expanded: error allocating inode bitmap (%N): %m\n
-#: e2fsck/problem.c:543 e2fsck/problem.c:1284
-msgid "@A @i @B (%N): %m\n"
-msgstr ""
-
-#. @-expanded: error allocating block bitmap (%N): %m\n
-#: e2fsck/problem.c:548
-msgid "@A @b @B (%N): %m\n"
-msgstr ""
-
-#. @-expanded: error allocating icount link information: %m\n
-#: e2fsck/problem.c:553
-#, c-format
-msgid "@A icount link information: %m\n"
-msgstr ""
-
-#. @-expanded: error allocating directory block array: %m\n
-#: e2fsck/problem.c:558
-#, c-format
-msgid "@A @d @b array: %m\n"
-msgstr ""
-
-#. @-expanded: Error while scanning inodes (%i): %m\n
-#: e2fsck/problem.c:563
-#, c-format
-msgid "Error while scanning @is (%i): %m\n"
-msgstr ""
-
-#. @-expanded: Error while iterating over blocks in inode %i: %m\n
-#: e2fsck/problem.c:568
-#, c-format
-msgid "Error while iterating over @bs in @i %i: %m\n"
-msgstr ""
-
-#. @-expanded: Error storing inode count information (inode=%i, count=%N): %m\n
-#: e2fsck/problem.c:573
-msgid "Error storing @i count information (@i=%i, count=%N): %m\n"
-msgstr ""
-
-#. @-expanded: Error storing directory block information (inode=%i, block=%b, num=%N): %m\n
-#: e2fsck/problem.c:578
-msgid "Error storing @d @b information (@i=%i, @b=%b, num=%N): %m\n"
-msgstr ""
-
-#. @-expanded: Error reading inode %i: %m\n
-#: e2fsck/problem.c:584
-#, c-format
-msgid "Error reading @i %i: %m\n"
-msgstr ""
-
-#. @-expanded: inode %i has imagic flag set.
-#: e2fsck/problem.c:592
-#, c-format
-msgid "@i %i has imagic flag set.  "
-msgstr ""
-
-#. @-expanded: Special (device/socket/fifo/symlink) file (inode %i) has immutable\n
-#. @-expanded: or append-only flag set.
-#: e2fsck/problem.c:597
-#, c-format
-msgid ""
-"Special (@v/socket/fifo/symlink) file (@i %i) has immutable\n"
-"or append-only flag set.  "
-msgstr ""
-
-#. @-expanded: inode %i has compression flag set on filesystem without compression support.
-#: e2fsck/problem.c:603
-#, c-format
-msgid "@i %i has @cion flag set on @f without @cion support.  "
-msgstr ""
-
-#. @-expanded: Special (device/socket/fifo) inode %i has non-zero size.
-#: e2fsck/problem.c:608
-#, c-format
-msgid "Special (@v/socket/fifo) @i %i has non-zero size.  "
-msgstr ""
-
-#. @-expanded: journal inode is not in use, but contains data.
-#: e2fsck/problem.c:618
-msgid "@j @i is not in use, but contains data.  "
-msgstr ""
-
-#. @-expanded: journal is not regular file.
-#: e2fsck/problem.c:623
-msgid "@j is not regular file.  "
-msgstr ""
-
-#. @-expanded: inode %i was part of the orphaned inode list.
-#: e2fsck/problem.c:628
-#, c-format
-msgid "@i %i was part of the @o @i list.  "
-msgstr ""
-
-#. @-expanded: inodes that were part of a corrupted orphan linked list found.
-#: e2fsck/problem.c:634
-msgid "@is that were part of a corrupted orphan linked list found.  "
-msgstr ""
-
-#. @-expanded: error allocating refcount structure (%N): %m\n
-#: e2fsck/problem.c:639
-msgid "@A refcount structure (%N): %m\n"
-msgstr ""
-
-#. @-expanded: Error reading extended attribute block %b for inode %i.
-#: e2fsck/problem.c:644
-msgid "Error reading @a @b %b for @i %i.  "
-msgstr ""
-
-#. @-expanded: inode %i has a bad extended attribute block %b.
-#: e2fsck/problem.c:649
-msgid "@i %i has a bad @a @b %b.  "
-msgstr ""
-
-#. @-expanded: Error reading extended attribute block %b (%m).
-#: e2fsck/problem.c:654
-msgid "Error reading @a @b %b (%m).  "
-msgstr ""
-
-#. @-expanded: extended attribute block %b has reference count %B, should be %N.
-#: e2fsck/problem.c:659
-msgid "@a @b %b has reference count %B, @s %N.  "
-msgstr ""
-
-#. @-expanded: Error writing extended attribute block %b (%m).
-#: e2fsck/problem.c:664
-msgid "Error writing @a @b %b (%m).  "
-msgstr ""
-
-#. @-expanded: extended attribute block %b has h_blocks > 1.
-#: e2fsck/problem.c:669
-msgid "@a @b %b has h_@bs > 1.  "
-msgstr ""
-
-#. @-expanded: error allocating extended attribute block %b.
-#: e2fsck/problem.c:674
-msgid "@A @a @b %b.  "
-msgstr ""
-
-#. @-expanded: extended attribute block %b is corrupt (allocation collision).
-#: e2fsck/problem.c:679
-msgid "@a @b %b is corrupt (allocation collision).  "
-msgstr ""
-
-#. @-expanded: extended attribute block %b is corrupt (invalid name).
-#: e2fsck/problem.c:684
-msgid "@a @b %b is corrupt (@n name).  "
-msgstr ""
-
-#. @-expanded: extended attribute block %b is corrupt (invalid value).
-#: e2fsck/problem.c:689
-msgid "@a @b %b is corrupt (@n value).  "
-msgstr ""
-
-#. @-expanded: inode %i is too big.
-#: e2fsck/problem.c:694
-#, c-format
-msgid "@i %i is too big.  "
-msgstr ""
-
-#. @-expanded: block #%B (%b) causes directory to be too big.
-#: e2fsck/problem.c:698
-msgid "@b #%B (%b) causes @d to be too big.  "
-msgstr ""
-
-#. @-expanded: block #%B (%b) causes file to be too big.
-#: e2fsck/problem.c:703
-msgid "@b #%B (%b) causes file to be too big.  "
-msgstr ""
-
-#. @-expanded: block #%B (%b) causes symlink to be too big.
-#: e2fsck/problem.c:708
-msgid "@b #%B (%b) causes symlink to be too big.  "
-msgstr ""
-
-#. @-expanded: inode %i has INDEX_FL flag set on filesystem without htree support.\n
-#: e2fsck/problem.c:713
-#, c-format
-msgid "@i %i has INDEX_FL flag set on @f without htree support.\n"
-msgstr ""
-
-#. @-expanded: inode %i has INDEX_FL flag set but is not a directory.\n
-#: e2fsck/problem.c:718
-#, c-format
-msgid "@i %i has INDEX_FL flag set but is not a @d.\n"
-msgstr ""
-
-#. @-expanded: HTREE directory inode %i has an invalid root node.\n
-#: e2fsck/problem.c:723
-#, c-format
-msgid "@h %i has an @n root node.\n"
-msgstr ""
-
-#. @-expanded: HTREE directory inode %i has an unsupported hash version (%N)\n
-#: e2fsck/problem.c:728
-msgid "@h %i has an unsupported hash version (%N)\n"
-msgstr ""
-
-#. @-expanded: HTREE directory inode %i uses an incompatible htree root node flag.\n
-#: e2fsck/problem.c:733
-#, c-format
-msgid "@h %i uses an incompatible htree root node flag.\n"
-msgstr ""
-
-#. @-expanded: HTREE directory inode %i has a tree depth (%N) which is too big\n
-#: e2fsck/problem.c:738
-msgid "@h %i has a tree depth (%N) which is too big\n"
-msgstr ""
-
-#. @-expanded: Bad block inode has an indirect block (%b) that conflicts with\n
-#. @-expanded: filesystem metadata.
-#: e2fsck/problem.c:743
-msgid ""
-"Bad @b @i has an indirect @b (%b) that conflicts with\n"
-"@f metadata.  "
-msgstr ""
-
-#. @-expanded: Resize inode (re)creation failed: %m.
-#: e2fsck/problem.c:749
-#, c-format
-msgid "Resize @i (re)creation failed: %m."
-msgstr ""
-
-#. @-expanded: inode %i has a extra size (%IS) which is invalid\n
-#: e2fsck/problem.c:754
-msgid "@i %i has a extra size (%IS) which is @n\n"
-msgstr ""
-
-#. @-expanded: extended attribute in inode %i has a namelen (%N) which is invalid\n
-#: e2fsck/problem.c:759
-msgid "@a in @i %i has a namelen (%N) which is @n\n"
-msgstr ""
-
-#. @-expanded: extended attribute in inode %i has a value size (%N) which is invalid\n
-#: e2fsck/problem.c:764
-msgid "@a in @i %i has a value size (%N) which is @n\n"
-msgstr ""
-
-#. @-expanded: extended attribute in inode %i has a value offset (%N) which is invalid\n
-#: e2fsck/problem.c:769
-msgid "@a in @i %i has a value offset (%N) which is @n\n"
-msgstr ""
-
-#. @-expanded: extended attribute in inode %i has a value block (%N) which is invalid (must be 0)\n
-#: e2fsck/problem.c:774
-msgid "@a in @i %i has a value @b (%N) which is @n (must be 0)\n"
-msgstr ""
-
-#. @-expanded: extended attribute in inode %i has a hash (%N) which is invalid (must be 0)\n
-#: e2fsck/problem.c:779
-msgid "@a in @i %i has a hash (%N) which is @n (must be 0)\n"
-msgstr ""
-
-#. @-expanded: inode %i is a %It but it looks like it is really a directory.\n
-#: e2fsck/problem.c:784
-msgid "@i %i is a %It but it looks like it is really a directory.\n"
-msgstr ""
-
-#. @-expanded: \n
-#. @-expanded: Running additional passes to resolve blocks claimed by more than one inode...\n
-#. @-expanded: Pass 1B: Rescanning for multiply-claimed blocks\n
-#: e2fsck/problem.c:791
-msgid ""
-"\n"
-"Running additional passes to resolve @bs claimed by more than one @i...\n"
-"Pass 1B: Rescanning for @m @bs\n"
-msgstr ""
-
-#. @-expanded: multiply-claimed block(s) in inode %i:
-#: e2fsck/problem.c:797
-#, c-format
-msgid "@m @b(s) in @i %i:"
-msgstr ""
-
-#: e2fsck/problem.c:812
-#, c-format
-msgid "Error while scanning inodes (%i): %m\n"
-msgstr ""
-
-#. @-expanded: error allocating inode bitmap (inode_dup_map): %m\n
-#: e2fsck/problem.c:817
-#, c-format
-msgid "@A @i @B (@i_dup_map): %m\n"
-msgstr ""
-
-#. @-expanded: Error while iterating over blocks in inode %i (%s): %m\n
-#: e2fsck/problem.c:822
-#, c-format
-msgid "Error while iterating over @bs in @i %i (%s): %m\n"
-msgstr ""
-
-#. @-expanded: Error adjusting refcount for extended attribute block %b (inode %i): %m\n
-#: e2fsck/problem.c:827 e2fsck/problem.c:1143
-msgid "Error adjusting refcount for @a @b %b (@i %i): %m\n"
-msgstr ""
-
-#. @-expanded: Pass 1C: Scanning directories for inodes with multiply-claimed blocks\n
-#: e2fsck/problem.c:833
-msgid "Pass 1C: Scanning directories for @is with @m @bs\n"
-msgstr ""
-
-#. @-expanded: Pass 1D: Reconciling multiply-claimed blocks\n
-#: e2fsck/problem.c:839
-msgid "Pass 1D: Reconciling @m @bs\n"
-msgstr ""
-
-#. @-expanded: File %Q (inode #%i, mod time %IM) \n
-#. @-expanded:   has %B multiply-claimed block(s), shared with %N file(s):\n
-#: e2fsck/problem.c:844
-msgid ""
-"File %Q (@i #%i, mod time %IM) \n"
-"  has %B @m @b(s), shared with %N file(s):\n"
-msgstr ""
-
-#. @-expanded: \t%Q (inode #%i, mod time %IM)\n
-#: e2fsck/problem.c:850
-msgid "\t%Q (@i #%i, mod time %IM)\n"
-msgstr ""
-
-#. @-expanded: \t<filesystem metadata>\n
-#: e2fsck/problem.c:855
-msgid "\t<@f metadata>\n"
-msgstr ""
-
-#. @-expanded: (There are %N inodes containing multiply-claimed blocks.)\n
-#. @-expanded: \n
-#: e2fsck/problem.c:860
-msgid ""
-"(There are %N @is containing @m @bs.)\n"
-"\n"
-msgstr ""
-
-#. @-expanded: multiply-claimed blocks already reassigned or cloned.\n
-#. @-expanded: \n
-#: e2fsck/problem.c:865
-msgid ""
-"@m @bs already reassigned or cloned.\n"
-"\n"
-msgstr ""
-
-#: e2fsck/problem.c:878
-#, c-format
-msgid "Couldn't clone file: %m\n"
-msgstr ""
-
-#. @-expanded: Pass 2: Checking directory structure\n
-#: e2fsck/problem.c:884
-msgid "Pass 2: Checking @d structure\n"
-msgstr ""
-
-#. @-expanded: invalid inode number for '.' in directory inode %i.\n
-#: e2fsck/problem.c:889
-#, c-format
-msgid "@n @i number for '.' in @d @i %i.\n"
-msgstr ""
-
-#. @-expanded: entry '%Dn' in %p (%i) has invalid inode #: %Di.\n
-#: e2fsck/problem.c:894
-msgid "@E has @n @i #: %Di.\n"
-msgstr ""
-
-#. @-expanded: entry '%Dn' in %p (%i) has deleted/unused inode %Di.
-#: e2fsck/problem.c:899
-msgid "@E has @D/unused @i %Di.  "
-msgstr ""
-
-#. @-expanded: entry '%Dn' in %p (%i) is a link to '.'
-#: e2fsck/problem.c:904
-msgid "@E @L to '.'  "
-msgstr ""
-
-#. @-expanded: entry '%Dn' in %p (%i) points to inode (%Di) located in a bad block.\n
-#: e2fsck/problem.c:909
-msgid "@E points to @i (%Di) located in a bad @b.\n"
-msgstr ""
-
-#. @-expanded: entry '%Dn' in %p (%i) is a link to directory %P (%Di).\n
-#: e2fsck/problem.c:914
-msgid "@E @L to @d %P (%Di).\n"
-msgstr ""
-
-#. @-expanded: entry '%Dn' in %p (%i) is a link to the root inode.\n
-#: e2fsck/problem.c:919
-msgid "@E @L to the @r.\n"
-msgstr ""
-
-#. @-expanded: entry '%Dn' in %p (%i) has illegal characters in its name.\n
-#: e2fsck/problem.c:924
-msgid "@E has illegal characters in its name.\n"
-msgstr ""
-
-#. @-expanded: Missing '.' in directory inode %i.\n
-#: e2fsck/problem.c:929
-#, c-format
-msgid "Missing '.' in @d @i %i.\n"
-msgstr ""
-
-#. @-expanded: Missing '..' in directory inode %i.\n
-#: e2fsck/problem.c:934
-#, c-format
-msgid "Missing '..' in @d @i %i.\n"
-msgstr ""
-
-#. @-expanded: First entry '%Dn' (inode=%Di) in directory inode %i (%p) should be '.'\n
-#: e2fsck/problem.c:939
-msgid "First @e '%Dn' (@i=%Di) in @d @i %i (%p) @s '.'\n"
-msgstr ""
-
-#. @-expanded: Second entry '%Dn' (inode=%Di) in directory inode %i should be '..'\n
-#: e2fsck/problem.c:944
-msgid "Second @e '%Dn' (@i=%Di) in @d @i %i @s '..'\n"
-msgstr ""
-
-#. @-expanded: i_faddr for inode %i (%Q) is %IF, should be zero.\n
-#: e2fsck/problem.c:949
-msgid "i_faddr @F %IF, @s zero.\n"
-msgstr ""
-
-#. @-expanded: i_file_acl for inode %i (%Q) is %If, should be zero.\n
-#: e2fsck/problem.c:954
-msgid "i_file_acl @F %If, @s zero.\n"
-msgstr ""
-
-#. @-expanded: i_dir_acl for inode %i (%Q) is %Id, should be zero.\n
-#: e2fsck/problem.c:959
-msgid "i_dir_acl @F %Id, @s zero.\n"
-msgstr ""
-
-#. @-expanded: i_frag for inode %i (%Q) is %N, should be zero.\n
-#: e2fsck/problem.c:964
-msgid "i_frag @F %N, @s zero.\n"
-msgstr ""
-
-#. @-expanded: i_fsize for inode %i (%Q) is %N, should be zero.\n
-#: e2fsck/problem.c:969
-msgid "i_fsize @F %N, @s zero.\n"
-msgstr ""
-
-#. @-expanded: inode %i (%Q) has invalid mode (%Im).\n
-#: e2fsck/problem.c:974
-msgid "@i %i (%Q) has @n mode (%Im).\n"
-msgstr ""
-
-#. @-expanded: directory inode %i, block %B, offset %N: directory corrupted\n
-#: e2fsck/problem.c:979
-msgid "@d @i %i, @b %B, offset %N: @d corrupted\n"
-msgstr ""
-
-#. @-expanded: directory inode %i, block %B, offset %N: filename too long\n
-#: e2fsck/problem.c:984
-msgid "@d @i %i, @b %B, offset %N: filename too long\n"
-msgstr ""
-
-#. @-expanded: directory inode %i has an unallocated block #%B.
-#: e2fsck/problem.c:989
-msgid "@d @i %i has an unallocated @b #%B.  "
-msgstr ""
-
-#. @-expanded: '.' directory entry in directory inode %i is not NULL terminated\n
-#: e2fsck/problem.c:994
-#, c-format
-msgid "'.' @d @e in @d @i %i is not NULL terminated\n"
-msgstr ""
-
-#. @-expanded: '..' directory entry in directory inode %i is not NULL terminated\n
-#: e2fsck/problem.c:999
-#, c-format
-msgid "'..' @d @e in @d @i %i is not NULL terminated\n"
-msgstr ""
-
-#. @-expanded: inode %i (%Q) is an illegal character device.\n
-#: e2fsck/problem.c:1004
-msgid "@i %i (%Q) is an @I character @v.\n"
-msgstr ""
-
-#. @-expanded: inode %i (%Q) is an illegal block device.\n
-#: e2fsck/problem.c:1009
-msgid "@i %i (%Q) is an @I @b @v.\n"
-msgstr ""
-
-#. @-expanded: entry '%Dn' in %p (%i) is duplicate '.' entry.\n
-#: e2fsck/problem.c:1014
-msgid "@E is duplicate '.' @e.\n"
-msgstr ""
-
-#. @-expanded: entry '%Dn' in %p (%i) is duplicate '..' entry.\n
-#: e2fsck/problem.c:1019
-msgid "@E is duplicate '..' @e.\n"
-msgstr ""
-
-#: e2fsck/problem.c:1024 e2fsck/problem.c:1309
-#, c-format
-msgid "Internal error: couldn't find dir_info for %i.\n"
-msgstr ""
-
-#. @-expanded: entry '%Dn' in %p (%i) has rec_len of %Dr, should be %N.\n
-#: e2fsck/problem.c:1029
-msgid "@E has rec_len of %Dr, @s %N.\n"
-msgstr ""
-
-#. @-expanded: error allocating icount structure: %m\n
-#: e2fsck/problem.c:1034
-#, c-format
-msgid "@A icount structure: %m\n"
-msgstr ""
-
-#. @-expanded: Error iterating over directory blocks: %m\n
-#: e2fsck/problem.c:1039
-#, c-format
-msgid "Error iterating over @d @bs: %m\n"
-msgstr ""
-
-#. @-expanded: Error reading directory block %b (inode %i): %m\n
-#: e2fsck/problem.c:1044
-msgid "Error reading @d @b %b (@i %i): %m\n"
-msgstr ""
-
-#. @-expanded: Error writing directory block %b (inode %i): %m\n
-#: e2fsck/problem.c:1049
-msgid "Error writing @d @b %b (@i %i): %m\n"
-msgstr ""
-
-#. @-expanded: error allocating new directory block for inode %i (%s): %m\n
-#: e2fsck/problem.c:1054
-#, c-format
-msgid "@A new @d @b for @i %i (%s): %m\n"
-msgstr ""
-
-#. @-expanded: Error deallocating inode %i: %m\n
-#: e2fsck/problem.c:1059
-#, c-format
-msgid "Error deallocating @i %i: %m\n"
-msgstr ""
-
-#. @-expanded: directory entry for '.' is big.
-#: e2fsck/problem.c:1064
-msgid "@d @e for '.' is big.  "
-msgstr ""
-
-#. @-expanded: inode %i (%Q) is an illegal FIFO.\n
-#: e2fsck/problem.c:1069
-msgid "@i %i (%Q) is an @I FIFO.\n"
-msgstr ""
-
-#. @-expanded: inode %i (%Q) is an illegal socket.\n
-#: e2fsck/problem.c:1074
-msgid "@i %i (%Q) is an @I socket.\n"
-msgstr ""
-
-#. @-expanded: Setting filetype for entry '%Dn' in %p (%i) to %N.\n
-#: e2fsck/problem.c:1079
-msgid "Setting filetype for @E to %N.\n"
-msgstr ""
-
-#. @-expanded: entry '%Dn' in %p (%i) has an incorrect filetype (was %Dt, should be %N).\n
-#: e2fsck/problem.c:1084
-msgid "@E has an incorrect filetype (was %Dt, @s %N).\n"
-msgstr ""
-
-#. @-expanded: entry '%Dn' in %p (%i) has filetype set.\n
-#: e2fsck/problem.c:1089
-msgid "@E has filetype set.\n"
-msgstr ""
-
-#. @-expanded: entry '%Dn' in %p (%i) has a zero-length name.\n
-#: e2fsck/problem.c:1094
-msgid "@E has a @z name.\n"
-msgstr ""
-
-#. @-expanded: Symlink %Q (inode #%i) is invalid.\n
-#: e2fsck/problem.c:1099
-msgid "Symlink %Q (@i #%i) is @n.\n"
-msgstr ""
-
-#. @-expanded: extended attribute block for inode %i (%Q) is invalid (%If).\n
-#: e2fsck/problem.c:1104
-msgid "@a @b @F @n (%If).\n"
-msgstr ""
-
-#. @-expanded: filesystem contains large files, but lacks LARGE_FILE flag in superblock.\n
-#: e2fsck/problem.c:1109
-msgid "@f contains large files, but lacks LARGE_FILE flag in @S.\n"
-msgstr ""
-
-#. @-expanded: problem in HTREE directory inode %d: node (%B) not referenced\n
-#: e2fsck/problem.c:1114
-msgid "@p @h %d: node (%B) not referenced\n"
-msgstr ""
-
-#. @-expanded: problem in HTREE directory inode %d: node (%B) referenced twice\n
-#: e2fsck/problem.c:1119
-msgid "@p @h %d: node (%B) referenced twice\n"
-msgstr ""
-
-#. @-expanded: problem in HTREE directory inode %d: node (%B) has bad min hash\n
-#: e2fsck/problem.c:1124
-msgid "@p @h %d: node (%B) has bad min hash\n"
-msgstr ""
-
-#. @-expanded: problem in HTREE directory inode %d: node (%B) has bad max hash\n
-#: e2fsck/problem.c:1129
-msgid "@p @h %d: node (%B) has bad max hash\n"
-msgstr ""
-
-#. @-expanded: invalid HTREE directory inode %d (%q).
-#: e2fsck/problem.c:1134
-msgid "@n @h %d (%q).  "
-msgstr ""
-
-#. @-expanded: problem in HTREE directory inode %d (%q): bad block number %b.\n
-#: e2fsck/problem.c:1138
-msgid "@p @h %d (%q): bad @b number %b.\n"
-msgstr ""
-
-#. @-expanded: problem in HTREE directory inode %d: root node is invalid\n
-#: e2fsck/problem.c:1148
-#, c-format
-msgid "@p @h %d: root node is @n\n"
-msgstr ""
-
-#. @-expanded: problem in HTREE directory inode %d: node (%B) has invalid limit (%N)\n
-#: e2fsck/problem.c:1153
-msgid "@p @h %d: node (%B) has @n limit (%N)\n"
-msgstr ""
-
-#. @-expanded: problem in HTREE directory inode %d: node (%B) has invalid count (%N)\n
-#: e2fsck/problem.c:1158
-msgid "@p @h %d: node (%B) has @n count (%N)\n"
-msgstr ""
-
-#. @-expanded: problem in HTREE directory inode %d: node (%B) has an unordered hash table\n
-#: e2fsck/problem.c:1163
-msgid "@p @h %d: node (%B) has an unordered hash table\n"
-msgstr ""
-
-#. @-expanded: problem in HTREE directory inode %d: node (%B) has invalid depth\n
-#: e2fsck/problem.c:1168
-msgid "@p @h %d: node (%B) has @n depth\n"
-msgstr ""
-
-#. @-expanded: Duplicate entry '%Dn' in %p (%i) found.
-#: e2fsck/problem.c:1173
-msgid "Duplicate @E found.  "
-msgstr ""
-
-#. @-expanded: entry '%Dn' in %p (%i) has a non-unique filename.\n
-#. @-expanded: Rename to %s
-#: e2fsck/problem.c:1178
-#, no-c-format
-msgid ""
-"@E has a non-unique filename.\n"
-"Rename to %s"
-msgstr ""
-
-#. @-expanded: Duplicate entry '%Dn' found.\n
-#. @-expanded: \tMarking %p (%i) to be rebuilt.\n
-#. @-expanded: \n
-#: e2fsck/problem.c:1183
-msgid ""
-"Duplicate @e '%Dn' found.\n"
-"\tMarking %p (%i) to be rebuilt.\n"
-"\n"
-msgstr ""
-
-#. @-expanded: i_blocks_hi for inode %i (%Q) is %N, should be zero.\n
-#: e2fsck/problem.c:1188
-msgid "i_blocks_hi @F %N, @s zero.\n"
-msgstr ""
-
-#. @-expanded: Unexpected block in HTREE directory inode %d (%q).\n
-#: e2fsck/problem.c:1193
-msgid "Unexpected @b in @h %d (%q).\n"
-msgstr ""
-
-#. @-expanded: Pass 3: Checking directory connectivity\n
-#: e2fsck/problem.c:1199
-msgid "Pass 3: Checking @d connectivity\n"
-msgstr ""
-
-#. @-expanded: root inode not allocated.
-#: e2fsck/problem.c:1204
-msgid "@r not allocated.  "
-msgstr ""
-
-#. @-expanded: No room in lost+found directory.
-#: e2fsck/problem.c:1209
-msgid "No room in @l @d.  "
-msgstr ""
-
-#. @-expanded: Unconnected directory inode %i (%p)\n
-#: e2fsck/problem.c:1214
-#, c-format
-msgid "Unconnected @d @i %i (%p)\n"
-msgstr ""
-
-#. @-expanded: /lost+found not found.
-#: e2fsck/problem.c:1219
-msgid "/@l not found.  "
-msgstr ""
-
-#. @-expanded: '..' in %Q (%i) is %P (%j), should be %q (%d).\n
-#: e2fsck/problem.c:1224
-msgid "'..' in %Q (%i) is %P (%j), @s %q (%d).\n"
-msgstr ""
-
-#. @-expanded: Bad or non-existent /lost+found.  Cannot reconnect.\n
-#: e2fsck/problem.c:1229
-msgid "Bad or non-existent /@l.  Cannot reconnect.\n"
-msgstr ""
-
-#. @-expanded: Could not expand /lost+found: %m\n
-#: e2fsck/problem.c:1234
-#, c-format
-msgid "Could not expand /@l: %m\n"
-msgstr ""
-
-#: e2fsck/problem.c:1239
-#, c-format
-msgid "Could not reconnect %i: %m\n"
-msgstr ""
-
-#. @-expanded: Error while trying to find /lost+found: %m\n
-#: e2fsck/problem.c:1244
-#, c-format
-msgid "Error while trying to find /@l: %m\n"
-msgstr ""
-
-#. @-expanded: ext2fs_new_block: %m while trying to create /lost+found directory\n
-#: e2fsck/problem.c:1249
-#, c-format
-msgid "ext2fs_new_@b: %m while trying to create /@l @d\n"
-msgstr ""
-
-#. @-expanded: ext2fs_new_inode: %m while trying to create /lost+found directory\n
-#: e2fsck/problem.c:1254
-#, c-format
-msgid "ext2fs_new_@i: %m while trying to create /@l @d\n"
-msgstr ""
-
-#. @-expanded: ext2fs_new_dir_block: %m while creating new directory block\n
-#: e2fsck/problem.c:1259
-#, c-format
-msgid "ext2fs_new_dir_@b: %m while creating new @d @b\n"
-msgstr ""
-
-#. @-expanded: ext2fs_write_dir_block: %m while writing the directory block for /lost+found\n
-#: e2fsck/problem.c:1264
-#, c-format
-msgid "ext2fs_write_dir_@b: %m while writing the @d @b for /@l\n"
-msgstr ""
-
-#. @-expanded: Error while adjusting inode count on inode %i\n
-#: e2fsck/problem.c:1269
-#, c-format
-msgid "Error while adjusting @i count on @i %i\n"
-msgstr ""
-
-#. @-expanded: Couldn't fix parent of inode %i: %m\n
-#. @-expanded: \n
-#: e2fsck/problem.c:1274
-#, c-format
-msgid ""
-"Couldn't fix parent of @i %i: %m\n"
-"\n"
-msgstr ""
-
-#. @-expanded: Couldn't fix parent of inode %i: Couldn't find parent directory entry\n
-#. @-expanded: \n
-#: e2fsck/problem.c:1279
-#, c-format
-msgid ""
-"Couldn't fix parent of @i %i: Couldn't find parent @d @e\n"
-"\n"
-msgstr ""
-
-#. @-expanded: Error creating root directory (%s): %m\n
-#: e2fsck/problem.c:1289
-#, c-format
-msgid "Error creating root @d (%s): %m\n"
-msgstr ""
-
-#. @-expanded: Error creating /lost+found directory (%s): %m\n
-#: e2fsck/problem.c:1294
-#, c-format
-msgid "Error creating /@l @d (%s): %m\n"
-msgstr ""
-
-#. @-expanded: root inode is not a directory; aborting.\n
-#: e2fsck/problem.c:1299
-msgid "@r is not a @d; aborting.\n"
-msgstr ""
-
-#. @-expanded: Cannot proceed without a root inode.\n
-#: e2fsck/problem.c:1304
-msgid "Cannot proceed without a @r.\n"
-msgstr ""
-
-#. @-expanded: /lost+found is not a directory (ino=%i)\n
-#: e2fsck/problem.c:1314
-#, c-format
-msgid "/@l is not a @d (ino=%i)\n"
-msgstr ""
-
-#: e2fsck/problem.c:1321
-msgid "Pass 3A: Optimizing directories\n"
-msgstr ""
-
-#: e2fsck/problem.c:1326
-#, c-format
-msgid "Failed to create dirs_to_hash iterator: %m"
-msgstr ""
-
-#: e2fsck/problem.c:1331
-msgid "Failed to optimize directory %q (%d): %m"
-msgstr ""
-
-#: e2fsck/problem.c:1336
-msgid "Optimizing directories: "
-msgstr ""
-
-#: e2fsck/problem.c:1353
-msgid "Pass 4: Checking reference counts\n"
-msgstr ""
-
-#. @-expanded: unattached zero-length inode %i.
-#: e2fsck/problem.c:1358
-#, c-format
-msgid "@u @z @i %i.  "
-msgstr ""
-
-#. @-expanded: unattached inode %i\n
-#: e2fsck/problem.c:1363
-#, c-format
-msgid "@u @i %i\n"
-msgstr ""
-
-#. @-expanded: inode %i ref count is %Il, should be %N.
-#: e2fsck/problem.c:1368
-msgid "@i %i ref count is %Il, @s %N.  "
-msgstr ""
-
-#. @-expanded: WARNING: PROGRAMMING BUG IN E2FSCK!\n
-#. @-expanded: \tOR SOME BONEHEAD (YOU) IS CHECKING A MOUNTED (LIVE) FILESYSTEM.\n
-#. @-expanded: inode_link_info[%i] is %N, inode.i_links_count is %Il.  They should be the same!\n
-#: e2fsck/problem.c:1372
-msgid ""
-"WARNING: PROGRAMMING BUG IN E2FSCK!\n"
-"\tOR SOME BONEHEAD (YOU) IS CHECKING A MOUNTED (LIVE) FILESYSTEM.\n"
-"@i_link_info[%i] is %N, @i.i_links_count is %Il.  They @s the same!\n"
-msgstr ""
-
-#. @-expanded: Pass 5: Checking group summary information\n
-#: e2fsck/problem.c:1382
-msgid "Pass 5: Checking @g summary information\n"
-msgstr ""
-
-#. @-expanded: Padding at end of inode bitmap is not set.
-#: e2fsck/problem.c:1387
-msgid "Padding at end of @i @B is not set. "
-msgstr ""
-
-#. @-expanded: Padding at end of block bitmap is not set.
-#: e2fsck/problem.c:1392
-msgid "Padding at end of @b @B is not set. "
-msgstr ""
-
-#. @-expanded: block bitmap differences:
-#: e2fsck/problem.c:1397
-msgid "@b @B differences: "
-msgstr ""
-
-#. @-expanded: inode bitmap differences:
-#: e2fsck/problem.c:1417
-msgid "@i @B differences: "
-msgstr ""
-
-#. @-expanded: Free inodes count wrong for group #%g (%i, counted=%j).\n
-#: e2fsck/problem.c:1437
-msgid "Free @is count wrong for @g #%g (%i, counted=%j).\n"
-msgstr ""
-
-#. @-expanded: Directories count wrong for group #%g (%i, counted=%j).\n
-#: e2fsck/problem.c:1442
-msgid "Directories count wrong for @g #%g (%i, counted=%j).\n"
-msgstr ""
-
-#. @-expanded: Free inodes count wrong (%i, counted=%j).\n
-#: e2fsck/problem.c:1447
-msgid "Free @is count wrong (%i, counted=%j).\n"
-msgstr ""
-
-#. @-expanded: Free blocks count wrong for group #%g (%b, counted=%c).\n
-#: e2fsck/problem.c:1452
-msgid "Free @bs count wrong for @g #%g (%b, counted=%c).\n"
-msgstr ""
-
-#. @-expanded: Free blocks count wrong (%b, counted=%c).\n
-#: e2fsck/problem.c:1457
-msgid "Free @bs count wrong (%b, counted=%c).\n"
-msgstr ""
-
-#. @-expanded: PROGRAMMING ERROR: filesystem (#%N) bitmap endpoints (%b, %c) don't match calculated bitmap
-#. @-expanded: endpoints (%i, %j)\n
-#: e2fsck/problem.c:1462
-msgid ""
-"PROGRAMMING ERROR: @f (#%N) @B endpoints (%b, %c) don't match calculated @B "
-"endpoints (%i, %j)\n"
-msgstr ""
-
-#: e2fsck/problem.c:1468
-msgid "Internal error: fudging end of bitmap (%N)\n"
-msgstr ""
-
-#. @-expanded: Error copying in replacement inode bitmap: %m\n
-#: e2fsck/problem.c:1473
-#, c-format
-msgid "Error copying in replacement @i @B: %m\n"
-msgstr ""
-
-#. @-expanded: Error copying in replacement block bitmap: %m\n
-#: e2fsck/problem.c:1478
-#, c-format
-msgid "Error copying in replacement @b @B: %m\n"
-msgstr ""
-
-#: e2fsck/problem.c:1503
-msgid "Recreate journal to make the filesystem ext3 again?\n"
-msgstr ""
-
-#: e2fsck/problem.c:1621
-#, c-format
-msgid "Unhandled error code (0x%x)!\n"
-msgstr ""
-
-#: e2fsck/problem.c:1715
-msgid "IGNORED"
-msgstr ""
-
-#: e2fsck/scantest.c:81
-#, c-format
-msgid "Memory used: %d, elapsed time: %6.3f/%6.3f/%6.3f\n"
-msgstr ""
-
-#: e2fsck/scantest.c:100
-#, c-format
-msgid "size of inode=%d\n"
-msgstr ""
-
-#: e2fsck/scantest.c:121
-msgid "while starting inode scan"
-msgstr ""
-
-#: e2fsck/scantest.c:132
-msgid "while doing inode scan"
-msgstr ""
-
-#: e2fsck/super.c:187
-#, c-format
-msgid "while calling ext2fs_block_iterate for inode %d"
-msgstr ""
-
-#: e2fsck/super.c:210
-#, c-format
-msgid "while calling ext2fs_adjust_ea_refcount for inode %d"
-msgstr ""
-
-#: e2fsck/super.c:268
-msgid "Truncating"
-msgstr ""
-
-#: e2fsck/super.c:269
-msgid "Clearing"
-msgstr ""
-
-#: e2fsck/swapfs.c:98
-msgid "while calling ext2fs_block_iterate"
-msgstr ""
-
-#: e2fsck/swapfs.c:104
-msgid "while calling iterator function"
-msgstr ""
-
-#: e2fsck/swapfs.c:126
-msgid "while allocating inode buffer"
-msgstr ""
-
-#: e2fsck/swapfs.c:138
-#, c-format
-msgid "while reading inode table (group %d)"
-msgstr ""
-
-#: e2fsck/swapfs.c:176
-#, c-format
-msgid "while writing inode table (group %d)"
-msgstr ""
-
-#: e2fsck/swapfs.c:226
-#, c-format
-msgid "Pass 0: Doing byte-swap of filesystem\n"
-msgstr ""
-
-#: e2fsck/swapfs.c:233
-#, c-format
-msgid ""
-"%s: the filesystem must be freshly checked using fsck\n"
-"and not mounted before trying to byte-swap it.\n"
-msgstr ""
-
-#: e2fsck/swapfs.c:268
-msgid "Byte swap"
-msgstr ""
-
-#: e2fsck/unix.c:74
-#, c-format
-msgid ""
-"Usage: %s [-panyrcdfvstDFSV] [-b superblock] [-B blocksize]\n"
-"\t\t[-I inode_buffer_blocks] [-P process_inode_size]\n"
-"\t\t[-l|-L bad_blocks_file] [-C fd] [-j external_journal]\n"
-"\t\t[-E extended-options] device\n"
-msgstr ""
-
-#: e2fsck/unix.c:80
-#, c-format
-msgid ""
-"\n"
-"Emergency help:\n"
-" -p                   Automatic repair (no questions)\n"
-" -n                   Make no changes to the filesystem\n"
-" -y                   Assume \"yes\" to all questions\n"
-" -c                   Check for bad blocks and add them to the badblock "
-"list\n"
-" -f                   Force checking even if filesystem is marked clean\n"
-msgstr ""
-
-#: e2fsck/unix.c:86
-#, c-format
-msgid ""
-" -v                   Be verbose\n"
-" -b superblock        Use alternative superblock\n"
-" -B blocksize         Force blocksize when looking for superblock\n"
-" -j external_journal  Set location of the external journal\n"
-" -l bad_blocks_file   Add to badblocks list\n"
-" -L bad_blocks_file   Set badblocks list\n"
-msgstr ""
-
-#: e2fsck/unix.c:121
-#, c-format
-msgid "%s: %u/%u files (%0d.%d%% non-contiguous), %u/%u blocks\n"
-msgstr ""
-
-#: e2fsck/unix.c:133
-#, c-format
-msgid "         # of inodes with ind/dind/tind blocks: %u/%u/%u\n"
-msgstr ""
-
-#: e2fsck/unix.c:176 misc/badblocks.c:789 misc/tune2fs.c:942 misc/util.c:151
-#: resize/main.c:237
-#, c-format
-msgid "while determining whether %s is mounted."
-msgstr ""
-
-#: e2fsck/unix.c:194
-#, c-format
-msgid "Warning!  %s is mounted.\n"
-msgstr ""
-
-#: e2fsck/unix.c:198
-#, c-format
-msgid "%s is mounted.  "
-msgstr ""
-
-#: e2fsck/unix.c:200
-msgid ""
-"Cannot continue, aborting.\n"
-"\n"
-msgstr ""
-
-#: e2fsck/unix.c:201
-#, c-format
-msgid ""
-"\n"
-"\n"
-"WARNING!!!  Running e2fsck on a mounted filesystem may cause\n"
-"SEVERE filesystem damage.\n"
-"\n"
-msgstr ""
-
-#: e2fsck/unix.c:204
-msgid "Do you really want to continue"
-msgstr ""
-
-#: e2fsck/unix.c:206
-#, c-format
-msgid "check aborted.\n"
-msgstr ""
-
-#: e2fsck/unix.c:280
-msgid " contains a file system with errors"
-msgstr ""
-
-#: e2fsck/unix.c:282
-msgid " was not cleanly unmounted"
-msgstr ""
-
-#: e2fsck/unix.c:284
-msgid " primary superblock features different from backup"
-msgstr ""
-
-#: e2fsck/unix.c:288
-#, c-format
-msgid " has been mounted %u times without being checked"
-msgstr ""
-
-#: e2fsck/unix.c:295
-#, c-format
-msgid " has gone %u days without being checked"
-msgstr ""
-
-#: e2fsck/unix.c:304
-msgid ", check forced.\n"
-msgstr ""
-
-#: e2fsck/unix.c:307
-#, c-format
-msgid "%s: clean, %u/%u files, %u/%u blocks"
-msgstr ""
-
-#: e2fsck/unix.c:324
-msgid " (check deferred; on battery)"
-msgstr ""
-
-#: e2fsck/unix.c:327
-msgid " (check after next mount)"
-msgstr ""
-
-#: e2fsck/unix.c:329
-#, c-format
-msgid " (check in %ld mounts)"
-msgstr ""
-
-#: e2fsck/unix.c:476
-#, c-format
-msgid "ERROR: Couldn't open /dev/null (%s)\n"
-msgstr ""
-
-#: e2fsck/unix.c:546
-#, c-format
-msgid "Invalid EA version.\n"
-msgstr ""
-
-#: e2fsck/unix.c:552
-#, c-format
-msgid "Unknown extended option: %s\n"
-msgstr ""
-
-#: e2fsck/unix.c:572
-#, c-format
-msgid ""
-"Syntax error in e2fsck config file (%s, line #%d)\n"
-"\t%s\n"
-msgstr ""
-
-#: e2fsck/unix.c:640
-#, c-format
-msgid "Error validating file descriptor %d: %s\n"
-msgstr ""
-
-#: e2fsck/unix.c:644
-msgid "Invalid completion information file descriptor"
-msgstr ""
-
-#: e2fsck/unix.c:659
-msgid "Only one of the options -p/-a, -n or -y may be specified."
-msgstr ""
-
-#: e2fsck/unix.c:680
-#, c-format
-msgid "The -t option is not supported on this version of e2fsck.\n"
-msgstr ""
-
-#: e2fsck/unix.c:751
-#, c-format
-msgid "Byte-swapping filesystems not compiled in this version of e2fsck\n"
-msgstr ""
-
-#: e2fsck/unix.c:774 misc/tune2fs.c:504 misc/tune2fs.c:770 misc/tune2fs.c:787
-#, c-format
-msgid "Unable to resolve '%s'"
-msgstr ""
-
-#: e2fsck/unix.c:806
-#, c-format
-msgid "Incompatible options not allowed when byte-swapping.\n"
-msgstr ""
-
-#: e2fsck/unix.c:813
-#, c-format
-msgid "The -c and the -l/-L options may not be both used at the same time.\n"
-msgstr ""
-
-#: e2fsck/unix.c:861
-#, c-format
-msgid ""
-"E2FSCK_JBD_DEBUG \"%s\" not an integer\n"
-"\n"
-msgstr ""
-
-#: e2fsck/unix.c:870
-#, c-format
-msgid ""
-"\n"
-"Invalid non-numeric argument to -%c (\"%s\")\n"
-"\n"
-msgstr ""
-
-#: e2fsck/unix.c:911
-#, c-format
-msgid "Error: ext2fs library version out of date!\n"
-msgstr ""
-
-#: e2fsck/unix.c:919
-msgid "while trying to initialize program"
-msgstr ""
-
-#: e2fsck/unix.c:933
-#, c-format
-msgid "\tUsing %s, %s\n"
-msgstr ""
-
-#: e2fsck/unix.c:945
-msgid "need terminal for interactive repairs"
-msgstr ""
-
-#: e2fsck/unix.c:989
-#, c-format
-msgid "%s: %s trying backup blocks...\n"
-msgstr ""
-
-#: e2fsck/unix.c:991
-msgid "Superblock invalid,"
-msgstr ""
-
-#: e2fsck/unix.c:992
-msgid "Group descriptors look bad..."
-msgstr ""
-
-#: e2fsck/unix.c:1019
-#, c-format
-msgid ""
-"The filesystem revision is apparently too high for this version of e2fsck.\n"
-"(Or the filesystem superblock is corrupt)\n"
-"\n"
-msgstr ""
-
-#: e2fsck/unix.c:1025
-#, c-format
-msgid "Could this be a zero-length partition?\n"
-msgstr ""
-
-#: e2fsck/unix.c:1027
-#, c-format
-msgid "You must have %s access to the filesystem or be root\n"
-msgstr ""
-
-#: e2fsck/unix.c:1032
-#, c-format
-msgid "Possibly non-existent or swap device?\n"
-msgstr ""
-
-#: e2fsck/unix.c:1034
-#, c-format
-msgid "Filesystem mounted or opened exclusively by another program?\n"
-msgstr ""
-
-#: e2fsck/unix.c:1038
-#, c-format
-msgid ""
-"Disk write-protected; use the -n option to do a read-only\n"
-"check of the device.\n"
-msgstr ""
-
-#: e2fsck/unix.c:1102
-msgid "Get a newer version of e2fsck!"
-msgstr ""
-
-#: e2fsck/unix.c:1126
-#, c-format
-msgid "while checking ext3 journal for %s"
-msgstr ""
-
-#: e2fsck/unix.c:1137
-#, c-format
-msgid ""
-"Warning: skipping journal recovery because doing a read-only filesystem "
-"check.\n"
-msgstr ""
-
-#: e2fsck/unix.c:1150
-#, c-format
-msgid "unable to set superblock flags on %s\n"
-msgstr ""
-
-#: e2fsck/unix.c:1156
-#, c-format
-msgid "while recovering ext3 journal of %s"
-msgstr ""
-
-#: e2fsck/unix.c:1180
-#, c-format
-msgid "%s has unsupported feature(s):"
-msgstr ""
-
-#: e2fsck/unix.c:1196
-msgid "Warning: compression support is experimental.\n"
-msgstr ""
-
-#: e2fsck/unix.c:1201
-#, c-format
-msgid ""
-"E2fsck not compiled with HTREE support,\n"
-"\tbut filesystem %s has HTREE directories.\n"
-msgstr ""
-
-#: e2fsck/unix.c:1250
-#, c-format
-msgid "%s: Filesystem byte order already normalized.\n"
-msgstr ""
-
-#: e2fsck/unix.c:1270
-msgid "while reading bad blocks inode"
-msgstr ""
-
-#: e2fsck/unix.c:1272
-#, c-format
-msgid "This doesn't bode well, but we'll try to go on...\n"
-msgstr ""
-
-#: e2fsck/unix.c:1298
-msgid "Couldn't determine journal size"
-msgstr ""
-
-#: e2fsck/unix.c:1301 misc/mke2fs.c:1785
-#, c-format
-msgid "Creating journal (%d blocks): "
-msgstr ""
-
-#: e2fsck/unix.c:1308 misc/mke2fs.c:1793
-msgid ""
-"\n"
-"\twhile trying to create journal"
-msgstr ""
-
-#: e2fsck/unix.c:1311
-#, c-format
-msgid " Done.\n"
-msgstr ""
-
-#: e2fsck/unix.c:1312
-#, c-format
-msgid ""
-"\n"
-"*** journal has been re-created - filesystem is now ext3 again ***\n"
-msgstr ""
-
-#: e2fsck/unix.c:1319
-#, c-format
-msgid "Restarting e2fsck from the beginning...\n"
-msgstr ""
-
-#: e2fsck/unix.c:1323
-msgid "while resetting context"
-msgstr ""
-
-#: e2fsck/unix.c:1330
-#, c-format
-msgid "%s: e2fsck canceled.\n"
-msgstr ""
-
-#: e2fsck/unix.c:1335
-msgid "aborted"
-msgstr ""
-
-#: e2fsck/unix.c:1347
-#, c-format
-msgid ""
-"\n"
-"%s: ***** FILE SYSTEM WAS MODIFIED *****\n"
-msgstr ""
-
-#: e2fsck/unix.c:1350
-#, c-format
-msgid "%s: ***** REBOOT LINUX *****\n"
-msgstr ""
-
-#: e2fsck/unix.c:1358
-#, c-format
-msgid ""
-"\n"
-"%s: ********** WARNING: Filesystem still has errors **********\n"
-"\n"
-msgstr ""
-
-#: e2fsck/util.c:131 misc/util.c:68
-msgid "yY"
-msgstr ""
-
-#: e2fsck/util.c:132
-msgid "nN"
-msgstr ""
-
-#: e2fsck/util.c:146
-msgid "<y>"
-msgstr ""
-
-#: e2fsck/util.c:148
-msgid "<n>"
-msgstr ""
-
-#: e2fsck/util.c:150
-msgid " (y/n)"
-msgstr ""
-
-#: e2fsck/util.c:165
-msgid "cancelled!\n"
-msgstr ""
-
-#: e2fsck/util.c:180
-msgid "yes\n"
-msgstr ""
-
-#: e2fsck/util.c:182
-msgid "no\n"
-msgstr ""
-
-#: e2fsck/util.c:192
-#, c-format
-msgid ""
-"%s? no\n"
-"\n"
-msgstr ""
-
-#: e2fsck/util.c:196
-#, c-format
-msgid ""
-"%s? yes\n"
-"\n"
-msgstr ""
-
-#: e2fsck/util.c:200
-msgid "yes"
-msgstr ""
-
-#: e2fsck/util.c:200
-msgid "no"
-msgstr ""
-
-#: e2fsck/util.c:214
-#, c-format
-msgid "e2fsck_read_bitmaps: illegal bitmap block(s) for %s"
-msgstr ""
-
-#: e2fsck/util.c:219
-msgid "reading inode and block bitmaps"
-msgstr ""
-
-#: e2fsck/util.c:224
-#, c-format
-msgid "while retrying to read bitmaps for %s"
-msgstr ""
-
-#: e2fsck/util.c:237
-msgid "writing block bitmaps"
-msgstr ""
-
-#: e2fsck/util.c:242
-#, c-format
-msgid "while retrying to write block bitmaps for %s"
-msgstr ""
-
-#: e2fsck/util.c:249
-msgid "writing inode bitmaps"
-msgstr ""
-
-#: e2fsck/util.c:254
-#, c-format
-msgid "while retrying to write inode bitmaps for %s"
-msgstr ""
-
-#: e2fsck/util.c:267
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s: UNEXPECTED INCONSISTENCY; RUN fsck MANUALLY.\n"
-"\t(i.e., without -a or -p options)\n"
-msgstr ""
-
-#: e2fsck/util.c:332
-#, c-format
-msgid "Memory used: %dk/%dk (%dk/%dk), "
-msgstr ""
-
-#: e2fsck/util.c:336
-#, c-format
-msgid "Memory used: %d, "
-msgstr ""
-
-#: e2fsck/util.c:342
-#, c-format
-msgid "time: %5.2f/%5.2f/%5.2f\n"
-msgstr ""
-
-#: e2fsck/util.c:347
-#, c-format
-msgid "elapsed time: %6.3f\n"
-msgstr ""
-
-#: e2fsck/util.c:361
-#, c-format
-msgid "while reading inode %ld in %s"
-msgstr ""
-
-#: e2fsck/util.c:375 e2fsck/util.c:388
-#, c-format
-msgid "while writing inode %ld in %s"
-msgstr ""
-
-#: misc/badblocks.c:61
-msgid "done                                \n"
-msgstr ""
-
-#: misc/badblocks.c:80
-#, c-format
-msgid ""
-"Usage: %s [-b block_size] [-i input_file] [-o output_file] [-svwnf]\n"
-" [-c blocks_at_once] [-p num_passes] [-t test_pattern [-t test_pattern "
-"[...]]]\n"
-" device [last_block [start_block]]\n"
-msgstr ""
-
-#: misc/badblocks.c:88
-#, c-format
-msgid ""
-"%s: The -n and -w options are mutually exclusive.\n"
-"\n"
-msgstr ""
-
-#: misc/badblocks.c:235
-msgid "Testing with random pattern: "
-msgstr ""
-
-#: misc/badblocks.c:253
-msgid "Testing with pattern 0x"
-msgstr ""
-
-#: misc/badblocks.c:278 misc/badblocks.c:307
-msgid "during seek"
-msgstr ""
-
-#: misc/badblocks.c:285
-#, c-format
-msgid "Weird value (%ld) in do_read\n"
-msgstr ""
-
-#: misc/badblocks.c:327
-msgid "during ext2fs_sync_device"
-msgstr ""
-
-#: misc/badblocks.c:343 misc/badblocks.c:581
-msgid "while beginning bad block list iteration"
-msgstr ""
-
-#: misc/badblocks.c:357 misc/badblocks.c:447 misc/badblocks.c:591
-msgid "while allocating buffers"
-msgstr ""
-
-#: misc/badblocks.c:361
-#, c-format
-msgid "Checking blocks %lu to %lu\n"
-msgstr ""
-
-#: misc/badblocks.c:365
-msgid "Checking for bad blocks in read-only mode\n"
-msgstr ""
-
-#: misc/badblocks.c:374
-msgid "Checking for bad blocks (read-only test): "
-msgstr ""
-
-#: misc/badblocks.c:454
-msgid "Checking for bad blocks in read-write mode\n"
-msgstr ""
-
-#: misc/badblocks.c:456 misc/badblocks.c:604
-#, c-format
-msgid "From block %lu to %lu\n"
-msgstr ""
-
-#: misc/badblocks.c:507
-msgid "Reading and comparing: "
-msgstr ""
-
-#: misc/badblocks.c:603
-msgid "Checking for bad blocks in non-destructive read-write mode\n"
-msgstr ""
-
-#: misc/badblocks.c:607
-msgid "Checking for bad blocks (non-destructive read-write test)\n"
-msgstr ""
-
-#: misc/badblocks.c:614
-msgid ""
-"\n"
-"Interrupt caught, cleaning up\n"
-msgstr ""
-
-#: misc/badblocks.c:684
-#, c-format
-msgid "during test data write, block %lu"
-msgstr ""
-
-#: misc/badblocks.c:794 misc/util.c:156
-#, c-format
-msgid "%s is mounted; "
-msgstr ""
-
-#: misc/badblocks.c:796
-msgid "badblocks forced anyway.  Hope /etc/mtab is incorrect.\n"
-msgstr ""
-
-#: misc/badblocks.c:801
-msgid "it's not safe to run badblocks!\n"
-msgstr ""
-
-#: misc/badblocks.c:806 misc/util.c:167
-#, c-format
-msgid "%s is apparently in use by the system; "
-msgstr ""
-
-#: misc/badblocks.c:809
-msgid "badblocks forced anyway.\n"
-msgstr ""
-
-#: misc/badblocks.c:871
-#, c-format
-msgid "bad block size - %s"
-msgstr ""
-
-#: misc/badblocks.c:928
-#, c-format
-msgid "can't allocate memory for test_pattern - %s"
-msgstr ""
-
-#: misc/badblocks.c:942
-#, c-format
-msgid "invalid test_pattern: %s\n"
-msgstr ""
-
-#: misc/badblocks.c:961
-msgid "Maximum of one test_pattern may be specified in read-only mode"
-msgstr ""
-
-#: misc/badblocks.c:967
-msgid "Random test_pattern is not allowed in read-only mode"
-msgstr ""
-
-#: misc/badblocks.c:981
-msgid ""
-"Couldn't determine device size; you must specify\n"
-"the size manually\n"
-msgstr ""
-
-#: misc/badblocks.c:987
-msgid "while trying to determine device size"
-msgstr ""
-
-#: misc/badblocks.c:996 misc/mke2fs.c:1255
-#, c-format
-msgid "invalid blocks count - %s"
-msgstr ""
-
-#: misc/badblocks.c:1009
-#, c-format
-msgid "invalid starting block - %s"
-msgstr ""
-
-#: misc/badblocks.c:1015
-#, c-format
-msgid "invalid starting block (%d): must be less than %lu"
-msgstr ""
-
-#: misc/badblocks.c:1070
-msgid "while creating in-memory bad blocks list"
-msgstr ""
-
-#: misc/badblocks.c:1085
-msgid "while adding to in-memory bad block list"
-msgstr ""
-
-#: misc/badblocks.c:1109
-#, c-format
-msgid "Pass completed, %u bad blocks found.\n"
-msgstr ""
-
-#: misc/chattr.c:84
-#, c-format
-msgid "Usage: %s [-RV] [-+=AacDdijsSu] [-v version] files...\n"
-msgstr ""
-
-#: misc/chattr.c:147
-#, c-format
-msgid "bad version - %s\n"
-msgstr ""
-
-#: misc/chattr.c:191 misc/lsattr.c:113
-#, c-format
-msgid "while trying to stat %s"
-msgstr ""
-
-#: misc/chattr.c:208 misc/chattr.c:224
-#, c-format
-msgid "Flags of %s set as "
-msgstr ""
-
-#: misc/chattr.c:217
-#, c-format
-msgid "while reading flags on %s"
-msgstr ""
-
-#: misc/chattr.c:232
-#, c-format
-msgid "while setting flags on %s"
-msgstr ""
-
-#: misc/chattr.c:237
-#, c-format
-msgid "Version of %s set as %lu\n"
-msgstr ""
-
-#: misc/chattr.c:240
-#, c-format
-msgid "while setting version on %s"
-msgstr ""
-
-#: misc/chattr.c:254
-#, c-format
-msgid "Couldn't allocate path variable in chattr_dir_proc"
-msgstr ""
-
-#: misc/chattr.c:292
-msgid "= is incompatible with - and +\n"
-msgstr ""
-
-#: misc/chattr.c:300
-msgid "Must use '-v', =, - or +\n"
-msgstr ""
-
-#: misc/dumpe2fs.c:53
-#, c-format
-msgid "Usage: %s [-bfhixV] [-ob superblock] [-oB blocksize] device\n"
-msgstr ""
-
-#: misc/dumpe2fs.c:162
-#, c-format
-msgid "Group %lu: (Blocks "
-msgstr ""
-
-#: misc/dumpe2fs.c:168
-#, c-format
-msgid "  %s superblock at "
-msgstr ""
-
-#: misc/dumpe2fs.c:169
-msgid "Primary"
-msgstr ""
-
-#: misc/dumpe2fs.c:169
-msgid "Backup"
-msgstr ""
-
-#: misc/dumpe2fs.c:173
-#, c-format
-msgid ", Group descriptors at "
-msgstr ""
-
-#: misc/dumpe2fs.c:177
-#, c-format
-msgid ""
-"\n"
-"  Reserved GDT blocks at "
-msgstr ""
-
-#: misc/dumpe2fs.c:184
-#, c-format
-msgid " Group descriptor at "
-msgstr ""
-
-#: misc/dumpe2fs.c:190
-msgid "  Block bitmap at "
-msgstr ""
-
-#: misc/dumpe2fs.c:195
-msgid ", Inode bitmap at "
-msgstr ""
-
-#: misc/dumpe2fs.c:200
-msgid ""
-"\n"
-"  Inode table at "
-msgstr ""
-
-#: misc/dumpe2fs.c:207
-#, c-format
-msgid ""
-"\n"
-"  %d free blocks, %d free inodes, %d directories\n"
-msgstr ""
-
-#: misc/dumpe2fs.c:213
-msgid "  Free blocks: "
-msgstr ""
-
-#: misc/dumpe2fs.c:221
-msgid "  Free inodes: "
-msgstr ""
-
-#: misc/dumpe2fs.c:246
-msgid "while printing bad block list"
-msgstr ""
-
-#: misc/dumpe2fs.c:252
-#, c-format
-msgid "Bad blocks: %u"
-msgstr ""
-
-#: misc/dumpe2fs.c:274 misc/tune2fs.c:261
-msgid "while reading journal inode"
-msgstr ""
-
-#: misc/dumpe2fs.c:277
-msgid "Journal size:             "
-msgstr ""
-
-#: misc/dumpe2fs.c:296 misc/tune2fs.c:183
-msgid "while reading journal superblock"
-msgstr ""
-
-#: misc/dumpe2fs.c:304
-msgid "Couldn't find journal superblock magic numbers"
-msgstr ""
-
-#: misc/dumpe2fs.c:308
-#, c-format
-msgid ""
-"\n"
-"Journal block size:       %u\n"
-"Journal length:           %u\n"
-"Journal first block:      %u\n"
-"Journal sequence:         0x%08x\n"
-"Journal start:            %u\n"
-"Journal number of users:  %u\n"
-msgstr ""
-
-#: misc/dumpe2fs.c:321
-#, c-format
-msgid "Journal users:            %s\n"
-msgstr ""
-
-#: misc/dumpe2fs.c:337 misc/mke2fs.c:768 misc/tune2fs.c:811
-#, c-format
-msgid "Couldn't allocate memory to parse options!\n"
-msgstr ""
-
-#: misc/dumpe2fs.c:363
-#, c-format
-msgid "Invalid superblock parameter: %s\n"
-msgstr ""
-
-#: misc/dumpe2fs.c:378
-#, c-format
-msgid "Invalid blocksize parameter: %s\n"
-msgstr ""
-
-#: misc/dumpe2fs.c:389
-#, c-format
-msgid ""
-"\n"
-"Bad extended option(s) specified: %s\n"
-"\n"
-"Extended options are separated by commas, and may take an argument which\n"
-"\tis set off by an equals ('=') sign.\n"
-"\n"
-"Valid extended options are:\n"
-"\tsuperblock=<superblock number>\n"
-"\tblocksize=<blocksize>\n"
-msgstr ""
-
-#: misc/dumpe2fs.c:449 misc/mke2fs.c:1199
-#, c-format
-msgid "\tUsing %s\n"
-msgstr ""
-
-#: misc/dumpe2fs.c:485 misc/e2image.c:669 misc/tune2fs.c:920 resize/main.c:298
-#, c-format
-msgid "Couldn't find valid filesystem superblock.\n"
-msgstr ""
-
-#: misc/dumpe2fs.c:496
-#, c-format
-msgid "Note: This is a byte-swapped filesystem\n"
-msgstr ""
-
-#: misc/dumpe2fs.c:515
-#, c-format
-msgid ""
-"\n"
-"%s: %s: error reading bitmaps: %s\n"
-msgstr ""
-
-#: misc/e2image.c:50
-#, c-format
-msgid "Usage: %s [-rsI] device image_file\n"
-msgstr ""
-
-#: misc/e2image.c:62
-msgid "Couldn't allocate header buffer\n"
-msgstr ""
-
-#: misc/e2image.c:81
-#, c-format
-msgid "short write (only %d bytes) for writing image header"
-msgstr ""
-
-#: misc/e2image.c:100
-msgid "while writing superblock"
-msgstr ""
-
-#: misc/e2image.c:108
-msgid "while writing inode table"
-msgstr ""
-
-#: misc/e2image.c:115
-msgid "while writing block bitmap"
-msgstr ""
-
-#: misc/e2image.c:122
-msgid "while writing inode bitmap"
-msgstr ""
-
-#: misc/e2label.c:57
-#, c-format
-msgid "e2label: cannot open %s\n"
-msgstr ""
-
-#: misc/e2label.c:62
-#, c-format
-msgid "e2label: cannot seek to superblock\n"
-msgstr ""
-
-#: misc/e2label.c:67
-#, c-format
-msgid "e2label: error reading superblock\n"
-msgstr ""
-
-#: misc/e2label.c:71
-#, c-format
-msgid "e2label: not an ext2 filesystem\n"
-msgstr ""
-
-#: misc/e2label.c:96 misc/tune2fs.c:1026
-#, c-format
-msgid "Warning: label too long, truncating.\n"
-msgstr ""
-
-#: misc/e2label.c:99
-#, c-format
-msgid "e2label: cannot seek to superblock again\n"
-msgstr ""
-
-#: misc/e2label.c:104
-#, c-format
-msgid "e2label: error writing superblock\n"
-msgstr ""
-
-#: misc/e2label.c:116 misc/tune2fs.c:496
-#, c-format
-msgid "Usage: e2label device [newlabel]\n"
-msgstr ""
-
-#: misc/fsck.c:345
-#, c-format
-msgid "WARNING: couldn't open %s: %s\n"
-msgstr ""
-
-#: misc/fsck.c:355
-#, c-format
-msgid "WARNING: bad format on line %d of %s\n"
-msgstr ""
-
-#: misc/fsck.c:370
-msgid ""
-"WARNING: Your /etc/fstab does not contain the fsck passno\n"
-"\tfield.  I will kludge around things for you, but you\n"
-"\tshould fix your /etc/fstab file as soon as you can.\n"
-"\n"
-msgstr ""
-
-#: misc/fsck.c:479
-#, c-format
-msgid "fsck: %s: not found\n"
-msgstr ""
-
-#: misc/fsck.c:595
-#, c-format
-msgid "%s: wait: No more child process?!?\n"
-msgstr ""
-
-#: misc/fsck.c:617
-#, c-format
-msgid "Warning... %s for device %s exited with signal %d.\n"
-msgstr ""
-
-#: misc/fsck.c:623
-#, c-format
-msgid "%s %s: status is %x, should never happen.\n"
-msgstr ""
-
-#: misc/fsck.c:662
-#, c-format
-msgid "Finished with %s (exit status %d)\n"
-msgstr ""
-
-#: misc/fsck.c:722
-#, c-format
-msgid "%s: Error %d while executing fsck.%s for %s\n"
-msgstr ""
-
-#: misc/fsck.c:743
-msgid ""
-"Either all or none of the filesystem types passed to -t must be prefixed\n"
-"with 'no' or '!'.\n"
-msgstr ""
-
-#: misc/fsck.c:762
-msgid "Couldn't allocate memory for filesystem types\n"
-msgstr ""
-
-#: misc/fsck.c:885
-#, c-format
-msgid ""
-"%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass "
-"number\n"
-msgstr ""
-
-#: misc/fsck.c:912
-#, c-format
-msgid "fsck: cannot check %s: fsck.%s not found\n"
-msgstr ""
-
-#: misc/fsck.c:968
-msgid "Checking all file systems.\n"
-msgstr ""
-
-#: misc/fsck.c:1059
-#, c-format
-msgid "--waiting-- (pass %d)\n"
-msgstr ""
-
-#: misc/fsck.c:1079
-msgid ""
-"Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
-msgstr ""
-
-#: misc/fsck.c:1121
-#, c-format
-msgid "%s: too many devices\n"
-msgstr ""
-
-#: misc/fsck.c:1154 misc/fsck.c:1240
-#, c-format
-msgid "%s: too many arguments\n"
-msgstr ""
-
-#: misc/lsattr.c:73
-#, c-format
-msgid "Usage: %s [-RVadlv] [files...]\n"
-msgstr ""
-
-#: misc/lsattr.c:83
-#, c-format
-msgid "While reading flags on %s"
-msgstr ""
-
-#: misc/lsattr.c:90
-#, c-format
-msgid "While reading version on %s"
-msgstr ""
-
-#: misc/mke2fs.c:97
-#, c-format
-msgid ""
-"Usage: %s [-c|-l filename] [-b block-size] [-f fragment-size]\n"
-"\t[-i bytes-per-inode] [-I inode-size] [-J journal-options]\n"
-"\t[-N number-of-inodes] [-m reserved-blocks-percentage] [-o creator-os]\n"
-"\t[-g blocks-per-group] [-L volume-label] [-M last-mounted-directory]\n"
-"\t[-O feature[,...]] [-r fs-revision] [-E extended-option[,...]]\n"
-"\t[-T fs-type] [-jnqvFSV] device [blocks-count]\n"
-msgstr ""
-
-#: misc/mke2fs.c:198
-#, c-format
-msgid "Running command: %s\n"
-msgstr ""
-
-#: misc/mke2fs.c:202
-#, c-format
-msgid "while trying to run '%s'"
-msgstr ""
-
-#: misc/mke2fs.c:209
-msgid "while processing list of bad blocks from program"
-msgstr ""
-
-#: misc/mke2fs.c:236
-#, c-format
-msgid "Block %d in primary superblock/group descriptor area bad.\n"
-msgstr ""
-
-#: misc/mke2fs.c:238
-#, c-format
-msgid "Blocks %u through %u must be good in order to build a filesystem.\n"
-msgstr ""
-
-#: misc/mke2fs.c:241
-msgid "Aborting....\n"
-msgstr ""
-
-#: misc/mke2fs.c:261
-#, c-format
-msgid ""
-"Warning: the backup superblock/group descriptors at block %u contain\n"
-"\tbad blocks.\n"
-"\n"
-msgstr ""
-
-#: misc/mke2fs.c:279
-msgid "while marking bad blocks as used"
-msgstr ""
-
-#: misc/mke2fs.c:337
-msgid "done                            \n"
-msgstr ""
-
-#: misc/mke2fs.c:372
-msgid "while allocating zeroizing buffer"
-msgstr ""
-
-#: misc/mke2fs.c:414
-msgid "Writing inode tables: "
-msgstr ""
-
-#: misc/mke2fs.c:431
-#, c-format
-msgid ""
-"\n"
-"Could not write %d blocks in inode table starting at %u: %s\n"
-msgstr ""
-
-#: misc/mke2fs.c:487
-msgid "while creating root dir"
-msgstr ""
-
-#: misc/mke2fs.c:494
-msgid "while reading root inode"
-msgstr ""
-
-#: misc/mke2fs.c:508
-msgid "while setting root inode ownership"
-msgstr ""
-
-#: misc/mke2fs.c:526
-msgid "while creating /lost+found"
-msgstr ""
-
-#: misc/mke2fs.c:533
-msgid "while looking up /lost+found"
-msgstr ""
-
-#: misc/mke2fs.c:543
-msgid "while expanding /lost+found"
-msgstr ""
-
-#: misc/mke2fs.c:559
-msgid "while setting bad block inode"
-msgstr ""
-
-#: misc/mke2fs.c:591
-#, c-format
-msgid "Out of memory erasing sectors %d-%d\n"
-msgstr ""
-
-#: misc/mke2fs.c:601
-#, c-format
-msgid "Warning: could not read block 0: %s\n"
-msgstr ""
-
-#: misc/mke2fs.c:617
-#, c-format
-msgid "Warning: could not erase sector %d: %s\n"
-msgstr ""
-
-#: misc/mke2fs.c:633
-msgid "while initializing journal superblock"
-msgstr ""
-
-#: misc/mke2fs.c:639
-msgid "Zeroing journal device: "
-msgstr ""
-
-#: misc/mke2fs.c:646
-#, c-format
-msgid "while zeroing journal device (block %u, count %d)"
-msgstr ""
-
-#: misc/mke2fs.c:657
-msgid "while writing journal superblock"
-msgstr ""
-
-#: misc/mke2fs.c:673
-#, c-format
-msgid ""
-"warning: %u blocks unused.\n"
-"\n"
-msgstr ""
-
-#: misc/mke2fs.c:678
-#, c-format
-msgid "Filesystem label=%s\n"
-msgstr ""
-
-#: misc/mke2fs.c:679
-msgid "OS type: "
-msgstr ""
-
-#: misc/mke2fs.c:684
-#, c-format
-msgid "Block size=%u (log=%u)\n"
-msgstr ""
-
-#: misc/mke2fs.c:686
-#, c-format
-msgid "Fragment size=%u (log=%u)\n"
-msgstr ""
-
-#: misc/mke2fs.c:688
-#, c-format
-msgid "%u inodes, %u blocks\n"
-msgstr ""
-
-#: misc/mke2fs.c:690
-#, c-format
-msgid "%u blocks (%2.2f%%) reserved for the super user\n"
-msgstr ""
-
-#: misc/mke2fs.c:693
-#, c-format
-msgid "First data block=%u\n"
-msgstr ""
-
-#: misc/mke2fs.c:695
-#, c-format
-msgid "Maximum filesystem blocks=%lu\n"
-msgstr ""
-
-#: misc/mke2fs.c:700
-#, c-format
-msgid "%u block groups\n"
-msgstr ""
-
-#: misc/mke2fs.c:702
-#, c-format
-msgid "%u block group\n"
-msgstr ""
-
-#: misc/mke2fs.c:703
-#, c-format
-msgid "%u blocks per group, %u fragments per group\n"
-msgstr ""
-
-#: misc/mke2fs.c:705
-#, c-format
-msgid "%u inodes per group\n"
-msgstr ""
-
-#: misc/mke2fs.c:712
-#, c-format
-msgid "Superblock backups stored on blocks: "
-msgstr ""
-
-#: misc/mke2fs.c:793
-#, c-format
-msgid "Invalid stride parameter: %s\n"
-msgstr ""
-
-#: misc/mke2fs.c:808
-#, c-format
-msgid "Invalid stripe-width parameter: %s\n"
-msgstr ""
-
-#: misc/mke2fs.c:830
-#, c-format
-msgid "Invalid resize parameter: %s\n"
-msgstr ""
-
-#: misc/mke2fs.c:837
-#, c-format
-msgid "The resize maximum must be greater than the filesystem size.\n"
-msgstr ""
-
-#: misc/mke2fs.c:861
-#, c-format
-msgid "On-line resizing not supported with revision 0 filesystems\n"
-msgstr ""
-
-#: misc/mke2fs.c:878
-#, c-format
-msgid ""
-"\n"
-"Bad option(s) specified: %s\n"
-"\n"
-"Extended options are separated by commas, and may take an argument which\n"
-"\tis set off by an equals ('=') sign.\n"
-"\n"
-"Valid extended options are:\n"
-"\tstride=<RAID per-disk data chunk in blocks>\n"
-"\tstripe-width=<RAID stride * data disks in blocks>\n"
-"\tresize=<resize maximum size in blocks>\n"
-"\n"
-"\ttest_fs\n"
-msgstr ""
-
-#: misc/mke2fs.c:893
-#, c-format
-msgid ""
-"\n"
-"Warning: RAID stripe-width %u not an even multiple of stride %u.\n"
-"\n"
-msgstr ""
-
-#: misc/mke2fs.c:920
-#, c-format
-msgid ""
-"Syntax error in mke2fs config file (%s, line #%d)\n"
-"\t%s\n"
-msgstr ""
-
-#: misc/mke2fs.c:933 misc/tune2fs.c:335
-#, c-format
-msgid "Invalid filesystem option set: %s\n"
-msgstr ""
-
-#: misc/mke2fs.c:1040
-#, c-format
-msgid "invalid block size - %s"
-msgstr ""
-
-#: misc/mke2fs.c:1044
-#, c-format
-msgid "Warning: blocksize %d not usable on most systems.\n"
-msgstr ""
-
-#: misc/mke2fs.c:1061
-#, c-format
-msgid "invalid fragment size - %s"
-msgstr ""
-
-#: misc/mke2fs.c:1067
-#, c-format
-msgid "Warning: fragments not supported.  Ignoring -f option\n"
-msgstr ""
-
-#: misc/mke2fs.c:1074
-msgid "Illegal number for blocks per group"
-msgstr ""
-
-#: misc/mke2fs.c:1079
-msgid "blocks per group must be multiple of 8"
-msgstr ""
-
-#: misc/mke2fs.c:1089
-#, c-format
-msgid "invalid inode ratio %s (min %d/max %d)"
-msgstr ""
-
-#: misc/mke2fs.c:1106
-msgid "in malloc for bad_blocks_filename"
-msgstr ""
-
-#: misc/mke2fs.c:1115
-#, c-format
-msgid "invalid reserved blocks percent - %s"
-msgstr ""
-
-#: misc/mke2fs.c:1133
-#, c-format
-msgid "bad revision level - %s"
-msgstr ""
-
-#: misc/mke2fs.c:1145
-#, c-format
-msgid "invalid inode size - %s"
-msgstr ""
-
-#: misc/mke2fs.c:1165
-#, c-format
-msgid "bad num inodes - %s"
-msgstr ""
-
-#: misc/mke2fs.c:1223 misc/mke2fs.c:1754
-#, c-format
-msgid "while trying to open journal device %s\n"
-msgstr ""
-
-#: misc/mke2fs.c:1229
-#, c-format
-msgid "Journal dev blocksize (%d) smaller than minimum blocksize %d\n"
-msgstr ""
-
-#: misc/mke2fs.c:1243
-#, c-format
-msgid "%d-byte blocks too big for system (max %d)"
-msgstr ""
-
-#: misc/mke2fs.c:1247
-#, c-format
-msgid ""
-"Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
-msgstr ""
-
-#: misc/mke2fs.c:1265
-msgid "filesystem"
-msgstr ""
-
-#: misc/mke2fs.c:1288 resize/main.c:332
-msgid "while trying to determine filesystem size"
-msgstr ""
-
-#: misc/mke2fs.c:1294
-msgid ""
-"Couldn't determine device size; you must specify\n"
-"the size of the filesystem\n"
-msgstr ""
-
-#: misc/mke2fs.c:1301
-msgid ""
-"Device size reported to be zero.  Invalid partition specified, or\n"
-"\tpartition table wasn't reread after running fdisk, due to\n"
-"\ta modified partition being busy and in use.  You may need to reboot\n"
-"\tto re-read your partition table.\n"
-msgstr ""
-
-#: misc/mke2fs.c:1319
-msgid "Filesystem larger than apparent device size."
-msgstr ""
-
-#: misc/mke2fs.c:1367
-#, c-format
-msgid "Filesystem features not supported with revision 0 filesystems\n"
-msgstr ""
-
-#: misc/mke2fs.c:1374
-#, c-format
-msgid "Sparse superblocks not supported with revision 0 filesystems\n"
-msgstr ""
-
-#: misc/mke2fs.c:1386
-#, c-format
-msgid "Journals not supported with revision 0 filesystems\n"
-msgstr ""
-
-#: misc/mke2fs.c:1404
-#, c-format
-msgid ""
-"The resize_inode and meta_bg features are not compatible.\n"
-"They can not be both enabled simultaneously.\n"
-msgstr ""
-
-#: misc/mke2fs.c:1421
-msgid "while trying to determine hardware sector size"
-msgstr ""
-
-#: misc/mke2fs.c:1473
-msgid "reserved online resize blocks not supported on non-sparse filesystem"
-msgstr ""
-
-#: misc/mke2fs.c:1482
-msgid "blocks per group count out of range"
-msgstr ""
-
-#: misc/mke2fs.c:1489
-msgid ""
-"Filesystem too large.  No more than 2**31-1 blocks\n"
-"\t (8TB using a blocksize of 4k) are currently supported."
-msgstr ""
-
-#: misc/mke2fs.c:1496
-#, c-format
-msgid ""
-"\n"
-"Warning: some 2.4 kernels do not support blocksizes greater than 4096\n"
-"\tusing ext3.  Use -b 4096 if this is an issue for you.\n"
-"\n"
-msgstr ""
-
-#: misc/mke2fs.c:1513
-#, c-format
-msgid "invalid inode size %d (min %d/max %d)"
-msgstr ""
-
-#: misc/mke2fs.c:1519
-#, c-format
-msgid "Warning: %d-byte inodes not usable on older systems\n"
-msgstr ""
-
-#: misc/mke2fs.c:1531
-#, c-format
-msgid "too many inodes (%llu), raise inode ratio?"
-msgstr ""
-
-#: misc/mke2fs.c:1536
-#, c-format
-msgid "too many inodes (%llu), specify < 2^32 inodes"
-msgstr ""
-
-#: misc/mke2fs.c:1551
-#, c-format
-msgid ""
-"inode_size (%u) * inodes_count (%u) too big for a\n"
-"\tfilesystem with %lu blocks, specify higher inode_ratio (-i)\n"
-"\tor lower inode count (-N).\n"
-msgstr ""
-
-#: misc/mke2fs.c:1600
-msgid "while setting up superblock"
-msgstr ""
-
-#: misc/mke2fs.c:1637
-#, c-format
-msgid "unknown os - %s"
-msgstr ""
-
-#: misc/mke2fs.c:1691
-msgid "while trying to allocate filesystem tables"
-msgstr ""
-
-#: misc/mke2fs.c:1722
-#, c-format
-msgid "while zeroing block %u at end of filesystem"
-msgstr ""
-
-#: misc/mke2fs.c:1736
-msgid "while reserving blocks for online resize"
-msgstr ""
-
-#: misc/mke2fs.c:1747 misc/tune2fs.c:433
-msgid "journal"
-msgstr ""
-
-#: misc/mke2fs.c:1759
-#, c-format
-msgid "Adding journal to device %s: "
-msgstr ""
-
-#: misc/mke2fs.c:1766
-#, c-format
-msgid ""
-"\n"
-"\twhile trying to add journal to device %s"
-msgstr ""
-
-#: misc/mke2fs.c:1771 misc/mke2fs.c:1797 misc/tune2fs.c:461 misc/tune2fs.c:475
-#, c-format
-msgid "done\n"
-msgstr ""
-
-#: misc/mke2fs.c:1802
-#, c-format
-msgid "Writing superblocks and filesystem accounting information: "
-msgstr ""
-
-#: misc/mke2fs.c:1807
-#, c-format
-msgid ""
-"\n"
-"Warning, had trouble writing out superblocks."
-msgstr ""
-
-#: misc/mke2fs.c:1810
-#, c-format
-msgid ""
-"done\n"
-"\n"
-msgstr ""
-
-#: misc/mklost+found.c:49
-#, c-format
-msgid "Usage: mklost+found\n"
-msgstr ""
-
-#: misc/tune2fs.c:91
-msgid "Please run e2fsck on the filesystem.\n"
-msgstr ""
-
-#: misc/tune2fs.c:98
-#, c-format
-msgid ""
-"Usage: %s [-c max_mounts_count] [-e errors_behavior] [-g group]\n"
-"\t[-i interval[d|m|w]] [-j] [-J journal_options] [-l]\n"
-"\t[-m reserved_blocks_percent] [-o [^]mount_options[,...]] \n"
-"\t[-r reserved_blocks_count] [-u user] [-C mount_count] [-L volume_label]\n"
-"\t[-M last_mounted_dir] [-O [^]feature[,...]]\n"
-"\t[-E extended-option[,...]] [-T last_check_time] [-U UUID] device\n"
-msgstr ""
-
-#: misc/tune2fs.c:171
-msgid "while trying to open external journal"
-msgstr ""
-
-#: misc/tune2fs.c:175
-#, c-format
-msgid "%s is not a journal device.\n"
-msgstr ""
-
-#: misc/tune2fs.c:190
-msgid "Journal superblock not found!\n"
-msgstr ""
-
-#: misc/tune2fs.c:202
-msgid "Filesystem's UUID not found on journal device.\n"
-msgstr ""
-
-#: misc/tune2fs.c:223
-msgid "Journal NOT removed\n"
-msgstr ""
-
-#: misc/tune2fs.c:229
-msgid "Journal removed\n"
-msgstr ""
-
-#: misc/tune2fs.c:268
-msgid "while reading bitmaps"
-msgstr ""
-
-#: misc/tune2fs.c:275
-msgid "while clearing journal inode"
-msgstr ""
-
-#: misc/tune2fs.c:286
-msgid "while writing journal inode"
-msgstr ""
-
-#: misc/tune2fs.c:301
-#, c-format
-msgid "Invalid mount option set: %s\n"
-msgstr ""
-
-#: misc/tune2fs.c:338
-#, c-format
-msgid "Clearing filesystem feature '%s' not supported.\n"
-msgstr ""
-
-#: misc/tune2fs.c:344
-#, c-format
-msgid "Setting filesystem feature '%s' not supported.\n"
-msgstr ""
-
-#: misc/tune2fs.c:353
-msgid ""
-"The has_journal flag may only be cleared when the filesystem is\n"
-"unmounted or mounted read-only.\n"
-msgstr ""
-
-#: misc/tune2fs.c:361
-msgid ""
-"The needs_recovery flag is set.  Please run e2fsck before clearing\n"
-"the has_journal flag.\n"
-msgstr ""
-
-#: misc/tune2fs.c:428
-msgid "The filesystem already has a journal.\n"
-msgstr ""
-
-#: misc/tune2fs.c:445
-#, c-format
-msgid ""
-"\n"
-"\twhile trying to open journal on %s\n"
-msgstr ""
-
-#: misc/tune2fs.c:449
-#, c-format
-msgid "Creating journal on device %s: "
-msgstr ""
-
-#: misc/tune2fs.c:457
-#, c-format
-msgid "while adding filesystem to journal on %s"
-msgstr ""
-
-#: misc/tune2fs.c:463
-msgid "Creating journal inode: "
-msgstr ""
-
-#: misc/tune2fs.c:472
-msgid ""
-"\n"
-"\twhile trying to create journal file"
-msgstr ""
-
-#: misc/tune2fs.c:539
-#, c-format
-msgid "Couldn't parse date/time specifier: %s"
-msgstr ""
-
-#: misc/tune2fs.c:564 misc/tune2fs.c:577
-#, c-format
-msgid "bad mounts count - %s"
-msgstr ""
-
-#: misc/tune2fs.c:593
-#, c-format
-msgid "bad error behavior - %s"
-msgstr ""
-
-#: misc/tune2fs.c:620
-#, c-format
-msgid "bad gid/group name - %s"
-msgstr ""
-
-#: misc/tune2fs.c:653
-#, c-format
-msgid "bad interval - %s"
-msgstr ""
-
-#: misc/tune2fs.c:681
-#, c-format
-msgid "bad reserved block ratio - %s"
-msgstr ""
-
-#: misc/tune2fs.c:696
-msgid "-o may only be specified once"
-msgstr ""
-
-#: misc/tune2fs.c:706
-msgid "-O may only be specified once"
-msgstr ""
-
-#: misc/tune2fs.c:716
-#, c-format
-msgid "bad reserved blocks count - %s"
-msgstr ""
-
-#: misc/tune2fs.c:745
-#, c-format
-msgid "bad uid/user name - %s"
-msgstr ""
-
-#: misc/tune2fs.c:843
-#, c-format
-msgid "Invalid RAID stride: %s\n"
-msgstr ""
-
-#: misc/tune2fs.c:858
-#, c-format
-msgid "Invalid RAID stripe-width: %s\n"
-msgstr ""
-
-#: misc/tune2fs.c:868
-#, c-format
-msgid ""
-"\n"
-"Bad options specified.\n"
-"\n"
-"Extended options are separated by commas, and may take an argument which\n"
-"\tis set off by an equals ('=') sign.\n"
-"\n"
-"Valid extended options are:\n"
-"\tstride=<RAID per-disk chunk size in blocks>\n"
-"\tstripe-width=<RAID stride*data disks in blocks>\n"
-"\ttest_fs\n"
-"\t^test_fs\n"
-msgstr ""
-
-#: misc/tune2fs.c:928
-#, c-format
-msgid "Filesystem %s has unsupported features enabled.\n"
-msgstr ""
-
-#: misc/tune2fs.c:952
-#, c-format
-msgid "Setting maximal mount count to %d\n"
-msgstr ""
-
-#: misc/tune2fs.c:958
-#, c-format
-msgid "Setting current mount count to %d\n"
-msgstr ""
-
-#: misc/tune2fs.c:963
-#, c-format
-msgid "Setting error behavior to %d\n"
-msgstr ""
-
-#: misc/tune2fs.c:968
-#, c-format
-msgid "Setting reserved blocks gid to %lu\n"
-msgstr ""
-
-#: misc/tune2fs.c:973
-#, c-format
-msgid "Setting interval between checks to %lu seconds\n"
-msgstr ""
-
-#: misc/tune2fs.c:979
-#, c-format
-msgid "Setting reserved blocks percentage to %g%% (%u blocks)\n"
-msgstr ""
-
-#: misc/tune2fs.c:985
-#, c-format
-msgid "reserved blocks count is too big (%lu)"
-msgstr ""
-
-#: misc/tune2fs.c:991
-#, c-format
-msgid "Setting reserved blocks count to %lu\n"
-msgstr ""
-
-#: misc/tune2fs.c:997
-msgid ""
-"\n"
-"The filesystem already has sparse superblocks.\n"
-msgstr ""
-
-#: misc/tune2fs.c:1004
-#, c-format
-msgid ""
-"\n"
-"Sparse superblock flag set.  %s"
-msgstr ""
-
-#: misc/tune2fs.c:1009
-msgid ""
-"\n"
-"Clearing the sparse superflag not supported.\n"
-msgstr ""
-
-#: misc/tune2fs.c:1016
-#, c-format
-msgid "Setting time filesystem last checked to %s\n"
-msgstr ""
-
-#: misc/tune2fs.c:1022
-#, c-format
-msgid "Setting reserved blocks uid to %lu\n"
-msgstr ""
-
-#: misc/tune2fs.c:1057
-msgid "Invalid UUID format\n"
-msgstr ""
-
-#: misc/tune2fs.c:1068
-#, c-format
-msgid "Setting stride size to %d\n"
-msgstr ""
-
-#: misc/tune2fs.c:1073
-#, c-format
-msgid "Setting stripe width to %d\n"
-msgstr ""
-
-#: misc/util.c:72
-msgid "Proceed anyway? (y,n) "
-msgstr ""
-
-#: misc/util.c:93
-#, c-format
-msgid "Could not stat %s --- %s\n"
-msgstr ""
-
-#: misc/util.c:96
-msgid ""
-"\n"
-"The device apparently does not exist; did you specify it correctly?\n"
-msgstr ""
-
-#: misc/util.c:107
-#, c-format
-msgid "%s is not a block special device.\n"
-msgstr ""
-
-#: misc/util.c:136
-#, c-format
-msgid "%s is entire device, not just one partition!\n"
-msgstr ""
-
-#: misc/util.c:158
-msgid "mke2fs forced anyway.  Hope /etc/mtab is incorrect.\n"
-msgstr ""
-
-#: misc/util.c:163
-#, c-format
-msgid "will not make a %s here!\n"
-msgstr ""
-
-#: misc/util.c:170
-msgid "mke2fs forced anyway.\n"
-msgstr ""
-
-#: misc/util.c:186
-msgid "Couldn't allocate memory to parse journal options!\n"
-msgstr ""
-
-#: misc/util.c:228
-msgid ""
-"\n"
-"Bad journal options specified.\n"
-"\n"
-"Journal options are separated by commas, and may take an argument which\n"
-"\tis set off by an equals ('=') sign.\n"
-"\n"
-"Valid journal options are:\n"
-"\tsize=<journal size in megabytes>\n"
-"\tdevice=<journal device>\n"
-"\n"
-"The journal size must be between 1024 and 102400 filesystem blocks.\n"
-"\n"
-msgstr ""
-
-#: misc/util.c:258
-msgid ""
-"\n"
-"Filesystem too small for a journal\n"
-msgstr ""
-
-#: misc/util.c:265
-#, c-format
-msgid ""
-"\n"
-"The requested journal size is %d blocks; it must be\n"
-"between 1024 and 10240000 blocks.  Aborting.\n"
-msgstr ""
-
-#: misc/util.c:273
-msgid ""
-"\n"
-"Journal size too big for filesystem.\n"
-msgstr ""
-
-#: misc/util.c:283
-#, c-format
-msgid ""
-"This filesystem will be automatically checked every %d mounts or\n"
-"%g days, whichever comes first.  Use tune2fs -c or -i to override.\n"
-msgstr ""
-
-#: misc/uuidgen.c:31
-#, c-format
-msgid "Usage: %s [-r] [-t]\n"
-msgstr ""
-
-#: resize/extent.c:196
-msgid "# Extent dump:\n"
-msgstr ""
-
-#: resize/extent.c:197
-#, c-format
-msgid "#\tNum=%d, Size=%d, Cursor=%d, Sorted=%d\n"
-msgstr ""
-
-#: resize/extent.c:200
-#, c-format
-msgid "#\t\t %u -> %u (%d)\n"
-msgstr ""
-
-#: resize/main.c:39
-#, c-format
-msgid ""
-"Usage: %s [-d debug_flags] [-f] [-F] [-p] device [new_size]\n"
-"\n"
-msgstr ""
-
-#: resize/main.c:61
-msgid "Extending the inode table"
-msgstr ""
-
-#: resize/main.c:64
-msgid "Relocating blocks"
-msgstr ""
-
-#: resize/main.c:67
-msgid "Scanning inode table"
-msgstr ""
-
-#: resize/main.c:70
-msgid "Updating inode references"
-msgstr ""
-
-#: resize/main.c:73
-msgid "Moving inode table"
-msgstr ""
-
-#: resize/main.c:76
-msgid "Unknown pass?!?"
-msgstr ""
-
-#: resize/main.c:79
-#, c-format
-msgid "Begin pass %d (max = %lu)\n"
-msgstr ""
-
-#: resize/main.c:253
-#, c-format
-msgid "while opening %s"
-msgstr ""
-
-#: resize/main.c:265
-#, c-format
-msgid "while getting stat information for %s"
-msgstr ""
-
-#: resize/main.c:339
-#, c-format
-msgid "bad filesystem size - %s"
-msgstr ""
-
-#: resize/main.c:353
-msgid "Invalid stride length"
-msgstr ""
-
-#: resize/main.c:377
-#, c-format
-msgid ""
-"The containing partition (or device) is only %u (%dk) blocks.\n"
-"You requested a new size of %u blocks.\n"
-"\n"
-msgstr ""
-
-#: resize/main.c:384
-#, c-format
-msgid ""
-"The filesystem is already %u blocks long.  Nothing to do!\n"
-"\n"
-msgstr ""
-
-#: resize/main.c:395
-#, c-format
-msgid ""
-"Please run 'e2fsck -f %s' first.\n"
-"\n"
-msgstr ""
-
-#: resize/main.c:406
-#, c-format
-msgid "while trying to resize %s"
-msgstr ""
-
-#: resize/main.c:411
-#, c-format
-msgid ""
-"The filesystem on %s is now %u blocks long.\n"
-"\n"
-msgstr ""
-
-#: resize/resize2fs.c:234
-#, c-format
-msgid "inodes (%llu) must be less than %u"
-msgstr ""
-
-#: resize/resize2fs.c:643
-msgid "reserved blocks"
-msgstr ""
-
-#: resize/resize2fs.c:648
-msgid "blocks to be moved"
-msgstr ""
-
-#: resize/resize2fs.c:653
-msgid "meta-data blocks"
-msgstr ""
-
-#: resize/resize2fs.c:1546
-#, c-format
-msgid "Should never happen: resize inode corrupt!\n"
-msgstr ""
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/ecryptfs-utils.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/ecryptfs-utils.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/ecryptfs-utils.po	2014-02-24 08:24:42.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/ecryptfs-utils.po	2014-03-24 09:42:49.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ecryptfs-utils\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-02-17 18:06+0000\n"
+"POT-Creation-Date: 2014-01-28 14:03+0000\n"
 "PO-Revision-Date: 2013-09-17 08:41+0000\n"
 "Last-Translator: liz <zyizhi@zju.edu.cn>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:56+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:27+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. Name
 #: ../src/desktop/ecryptfs-record-passphrase:1
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/eject.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/eject.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/eject.po	2014-02-24 08:24:26.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/eject.po	2014-03-24 09:42:33.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 10:48+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 10:53+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: ../eject.c:156
 #, c-format
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/elfutils.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/elfutils.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/elfutils.po	2014-02-24 08:24:41.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/elfutils.po	2014-03-24 09:42:48.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:45+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:10+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: lib/xmalloc.c:54 lib/xmalloc.c:68 lib/xmalloc.c:82 src/readelf.c:3017
 #: src/readelf.c:3365 src/readelf.c:7901 src/unstrip.c:2090 src/unstrip.c:2298
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/example-content.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/example-content.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/example-content.po	2014-02-24 08:24:39.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/example-content.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-# Simplified Chinese translation for example-content
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the example-content package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: example-content\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-01-30 12:22+0000\n"
-"PO-Revision-Date: 2009-05-02 08:29+0000\n"
-"Last-Translator: Aron Xu <Unknown>\n"
-"Language-Team: Simplified Chinese <zh_CN@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-12 13:08+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
-
-#: ../data/examples.desktop.in.h:1
-msgid "Examples"
-msgstr "示例"
-
-#: ../data/examples.desktop.in.h:2
-msgid "Example content for Ubuntu"
-msgstr "Ubuntu 示例内容"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/exiv2.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/exiv2.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/exiv2.po	2014-02-24 08:24:38.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/exiv2.po	2014-03-24 09:42:45.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:26+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:46+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "X-Poedit-Bookmarks: 2532,-1,-1,-1,-1,-1,-1,-1,-1,-1\n"
 
 #: src/actions.cpp:253 src/actions.cpp:486 src/actions.cpp:698
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/fetchmail.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/fetchmail.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/fetchmail.po	2014-02-24 08:24:26.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/fetchmail.po	2014-03-24 09:42:34.000000000 +0000
@@ -16,8 +16,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-02-20 10:57+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 11:02+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: checkalias.c:179
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/findutils.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/findutils.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/findutils.po	2014-02-24 08:24:27.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/findutils.po	2014-03-24 09:42:34.000000000 +0000
@@ -16,8 +16,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-02-20 10:58+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 11:04+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: gnulib/lib/argmatch.c:133
 #, c-format
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/flex.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/flex.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/flex.po	2014-02-24 08:24:27.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/flex.po	2014-03-24 09:42:34.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 10:58+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 11:04+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: dfa.c:61
 #, c-format
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/fluid.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/fluid.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/fluid.po	2014-02-24 08:24:36.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/fluid.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,1736 +0,0 @@
-# Chinese (China) translation for fltk1.1
-# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
-# This file is distributed under the same license as the fltk1.1 package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: fltk1.1\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-10-20 06:40+0000\n"
-"PO-Revision-Date: 2009-08-03 14:02+0000\n"
-"Last-Translator: Tao Wei <weitao1979@gmail.com>\n"
-"Language-Team: Chinese (China) <zh_CN@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-12 12:36+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
-
-#: fluid.cxx:1573
-msgid "&File"
-msgstr "文件(&F)"
-
-#: fluid.cxx:1574
-msgid "&New..."
-msgstr "新建(&N)..."
-
-#: fluid.cxx:1575
-msgid "&Open..."
-msgstr "打开(&O)..."
-
-#: fluid.cxx:1576
-msgid "&Insert..."
-msgstr "插入(&I)..."
-
-#: fluid.cxx:1578
-msgid "&Save"
-msgstr "保存(&S)"
-
-#: fluid.cxx:1579
-msgid "Save &As..."
-msgstr "另存为(&A)..."
-
-#: fluid.cxx:1580
-msgid "Sa&ve A Copy..."
-msgstr "保存一个副本(&V)..."
-
-#: fluid.cxx:1581
-msgid "Save &Template..."
-msgstr "保存为模版(&T)..."
-
-#: fluid.cxx:1582
-msgid "&Revert..."
-msgstr "恢复(&R)..."
-
-#: fluid.cxx:1583
-msgid "&Print..."
-msgstr "打印(&P)..."
-
-#: fluid.cxx:1584
-msgid "Write &Code..."
-msgstr "写代码(&C)..."
-
-#: fluid.cxx:1585
-msgid "&Write Strings..."
-msgstr "写字符串(&W)..."
-
-#: fluid.cxx:1597
-msgid "&Quit"
-msgstr "退出(&Q)"
-
-#: fluid.cxx:1599
-msgid "&Edit"
-msgstr "编辑(&E)"
-
-#: fluid.cxx:1600
-msgid "&Undo"
-msgstr "撤销(&U)"
-
-#: fluid.cxx:1601
-msgid "&Redo"
-msgstr "重做(&R)"
-
-#: fluid.cxx:1602
-msgid "C&ut"
-msgstr "剪切(&U)"
-
-#: fluid.cxx:1603
-msgid "&Copy"
-msgstr "复制(&C)"
-
-#: fluid.cxx:1604
-msgid "&Paste"
-msgstr "粘贴(&P)"
-
-#: fluid.cxx:1605
-msgid "Dup&licate"
-msgstr "复制为副本(&l)"
-
-#: fluid.cxx:1606
-msgid "&Delete"
-msgstr "删除(&D)"
-
-#: fluid.cxx:1607
-msgid "Select &All"
-msgstr "选择全部(&A)"
-
-#: fluid.cxx:1608
-msgid "Select &None"
-msgstr "全部不选(&N)"
-
-#: fluid.cxx:1609
-msgid "Pr&operties..."
-msgstr "属性(&o)..."
-
-#: fluid.cxx:1610
-msgid "&Sort"
-msgstr "排序(&S)"
-
-#: fluid.cxx:1611
-msgid "&Earlier"
-msgstr "之前(&E)"
-
-#: fluid.cxx:1612
-msgid "&Later"
-msgstr "稍后(&L)"
-
-#: fluid.cxx:1613
-msgid "&Group"
-msgstr "组合(&G)"
-
-#: fluid.cxx:1614
-msgid "Ung&roup"
-msgstr "取消组合(&r)"
-
-#: fluid.cxx:1615
-msgid "Hide O&verlays"
-msgstr "隐藏覆盖(&O)"
-
-#: fluid.cxx:1617
-msgid "Show Widget &Bin..."
-msgstr "显示 Widget Bin (&B)"
-
-#: fluid.cxx:1619
-msgid "Show Source Code..."
-msgstr "显示源代码..."
-
-#: fluid.cxx:1620
-msgid "Pro&ject Settings..."
-msgstr "项目设置 (&j)..."
-
-#: fluid.cxx:1621
-msgid "GU&I Settings..."
-msgstr "GUI 设置 (&I)..."
-
-#: fluid.cxx:1623
-msgid "&New"
-msgstr "新建(&W)"
-
-#: fluid.cxx:1624
-msgid "&Layout"
-msgstr "布局(&L)"
-
-#: fluid.cxx:1625
-msgid "&Align"
-msgstr "对齐(&A)"
-
-#: fluid.cxx:1626
-msgid "&Left"
-msgstr "左对齐(&L)"
-
-#: fluid.cxx:1627
-msgid "&Center"
-msgstr "居中(&C)"
-
-#: fluid.cxx:1628
-msgid "&Right"
-msgstr "右对齐(&R)"
-
-#: fluid.cxx:1629
-msgid "&Top"
-msgstr "置顶(&T)"
-
-#: fluid.cxx:1630
-msgid "&Middle"
-msgstr "中央(&M)"
-
-#: fluid.cxx:1631
-msgid "&Bottom"
-msgstr "置底(&B)"
-
-#: fluid.cxx:1633
-msgid "&Space Evenly"
-msgstr "平均分配空间(&S)"
-
-#: fluid.cxx:1634
-msgid "&Across"
-msgstr "聚焦(&A)"
-
-#: fluid.cxx:1635
-msgid "&Down"
-msgstr "下(&D)"
-
-#: fluid.cxx:1637
-msgid "&Make Same Size"
-msgstr "使同等大小(&M)"
-
-#: fluid.cxx:1638
-msgid "&Width"
-msgstr "宽度(&W)"
-
-#: fluid.cxx:1639
-msgid "&Height"
-msgstr "高度(&H)"
-
-#: fluid.cxx:1640
-msgid "&Both"
-msgstr "两者(&B)"
-
-#: fluid.cxx:1642
-msgid "&Center In Group"
-msgstr "在组中居中(&C)"
-
-#: fluid.cxx:1643
-msgid "&Horizontal"
-msgstr "水平对齐(&H)"
-
-#: fluid.cxx:1644
-msgid "&Vertical"
-msgstr "垂直对齐(&V)"
-
-#: fluid.cxx:1646
-msgid "Set &Widget Size"
-msgstr "设置 Widget 大小(&W)"
-
-#: fluid.cxx:1647
-msgid "&Tiny"
-msgstr "极小(&T)"
-
-#: fluid.cxx:1648
-msgid "&Small"
-msgstr "小(&S)"
-
-#: fluid.cxx:1649
-msgid "&Normal"
-msgstr "普通(&N)"
-
-#: fluid.cxx:1650
-msgid "&Medium"
-msgstr "中等(&M)"
-
-#: fluid.cxx:1651
-msgid "&Large"
-msgstr "大(&L)"
-
-#: fluid.cxx:1652
-msgid "&Huge"
-msgstr "巨大(&H)"
-
-#: fluid.cxx:1654
-msgid "&Grid and Size Settings..."
-msgstr "网格和大小设置(&G)..."
-
-#: fluid.cxx:1656
-msgid "&Shell"
-msgstr "&Shell"
-
-#: fluid.cxx:1657
-msgid "Execute &Command..."
-msgstr "执行命令行(&C)..."
-
-#: fluid.cxx:1658
-msgid "Execute &Again..."
-msgstr "重新执行(&A)..."
-
-#: fluid.cxx:1660
-msgid "&Help"
-msgstr "帮助(&H)"
-
-#: fluid.cxx:1661
-msgid "&About FLUID..."
-msgstr "关于 FLUID(&A)..."
-
-#: fluid.cxx:1662
-msgid "&On FLUID..."
-msgstr "&On FLUID..."
-
-#: fluid.cxx:1663
-msgid "&Manual..."
-msgstr "手册(&M)..."
-
-#: fluid.cxx:1764
-msgid "Double-click to view or change an item."
-msgstr "双击查看或改变一个对象"
-
-#: fluid.cxx:2178
-#, c-format
-msgid ""
-"usage: %s <switches> name.fl\n"
-" -c : write .cxx and .h and exit\n"
-" -cs : write .cxx and .h and strings and exit\n"
-" -o <name> : .cxx output filename, or extension if <name> starts with '.'\n"
-" -h <name> : .h output filename, or extension if <name> starts with '.'\n"
-"%s\n"
-msgstr ""
-"用途: %s <switches> 命名.fl\n"
-" -c : 写 .cxx 和 .h 并且退出\n"
-" -cs : 写 .cxx 和 .h 以及 strings 并且退出\n"
-" -o <name> : .cxx 输出文件, 或者若<name> \".\"开始以默认扩展名输出\n"
-" -h <name> : .h 输出文件, 或者若<name> \".\"开始以默认扩展名输出\n"
-"%s\n"
-
-#: about_panel.cxx:276
-msgid "About FLUID"
-msgstr "关于 FLUID"
-
-#: about_panel.cxx:283
-msgid ""
-"FLTK User\n"
-"Interface Designer\n"
-"Version 1.1.9"
-msgstr ""
-"FLTK 用户\n"
-"界面设计师\n"
-"版本 1.1.9"
-
-#: about_panel.cxx:290
-msgid ""
-"Copyright 1998-2008 by\n"
-"Bill Spitzak and others"
-msgstr ""
-"Copyright 1998-2008\n"
-"Bill Spitzak及其它合作者"
-
-#: about_panel.cxx:293
-msgid "View License..."
-msgstr "查看授权..."
-
-#: about_panel.cxx:297 widget_panel.cxx:771 function_panel.cxx:964
-#: alignment_panel.cxx:67 alignment_panel.cxx:271 alignment_panel.cxx:378
-#: alignment_panel.cxx:433
-msgid "Close"
-msgstr "关闭"
-
-#: widget_panel.cxx:47 function_panel.cxx:45 function_panel.cxx:335
-msgid "private"
-msgstr "私人"
-
-#: widget_panel.cxx:48 function_panel.cxx:46 function_panel.cxx:271
-#: function_panel.cxx:336 function_panel.cxx:416
-msgid "public"
-msgstr "公开的"
-
-#: widget_panel.cxx:49 function_panel.cxx:47 function_panel.cxx:337
-msgid "protected"
-msgstr "被保护"
-
-#: widget_panel.cxx:54 function_panel.cxx:54
-msgid "local"
-msgstr "本地"
-
-#: widget_panel.cxx:55 function_panel.cxx:55
-msgid "global"
-msgstr "全局"
-
-#: widget_panel.cxx:76
-msgid "GUI"
-msgstr "GUI（图形界面）"
-
-#: widget_panel.cxx:81
-msgid "Label:"
-msgstr "标签："
-
-#: widget_panel.cxx:87
-msgid "The label text for the widget."
-msgstr "widget 的标签"
-
-#: widget_panel.cxx:96
-msgid "The label style for the widget."
-msgstr "widget 的外观"
-
-#: widget_panel.cxx:107
-msgid "Image:"
-msgstr "图像："
-
-#: widget_panel.cxx:113
-msgid "The active image for the widget."
-msgstr "widget 当前图象。"
-
-#: widget_panel.cxx:120 widget_panel.cxx:140
-msgid "Browse..."
-msgstr "浏览..."
-
-#: widget_panel.cxx:121
-msgid "Click to choose the active image."
-msgstr "单击选择图象。"
-
-#: widget_panel.cxx:127
-msgid "Inactive:"
-msgstr "停用："
-
-#: widget_panel.cxx:133
-msgid "The inactive image for the widget."
-msgstr "widget 的停用图象。"
-
-#: widget_panel.cxx:141
-msgid "Click to choose the inactive image."
-msgstr "单击选择停用图象。"
-
-#: widget_panel.cxx:147
-msgid "Alignment:"
-msgstr "对齐方式："
-
-#: widget_panel.cxx:152
-msgid "Clip"
-msgstr "裁剪"
-
-#: widget_panel.cxx:153
-msgid "Clip the label to the inside of the widget."
-msgstr "在 widget 中裁减标签"
-
-#: widget_panel.cxx:160
-msgid "Wrap"
-msgstr "换行"
-
-#: widget_panel.cxx:161
-msgid "Wrap the label text."
-msgstr "标签文字换行"
-
-#: widget_panel.cxx:167
-msgid "Text/Image"
-msgstr "文字/图象"
-
-#: widget_panel.cxx:168
-msgid "Show the label text over the image."
-msgstr "标签文字浮于图片之上"
-
-#: widget_panel.cxx:174
-msgid "@-1<-"
-msgstr "@-1<-"
-
-#: widget_panel.cxx:175
-msgid "Left-align the label."
-msgstr "左对齐标签"
-
-#: widget_panel.cxx:182
-msgid "@-1->"
-msgstr "@-1->"
-
-#: widget_panel.cxx:183
-msgid "Right-align the label."
-msgstr "右对齐标签"
-
-#: widget_panel.cxx:190
-msgid "@-18"
-msgstr "@-18"
-
-#: widget_panel.cxx:191
-msgid "Top-align the label."
-msgstr "顶对齐标签"
-
-#: widget_panel.cxx:198
-msgid "@-12"
-msgstr "@-12"
-
-#: widget_panel.cxx:199
-msgid "Bottom-align the label."
-msgstr "底对齐标签"
-
-#: widget_panel.cxx:206
-msgid "@-3square"
-msgstr "@-3square"
-
-#: widget_panel.cxx:207
-msgid "Show the label inside the widget."
-msgstr "在 widget 中显示标签"
-
-#: widget_panel.cxx:220
-msgid "Position:"
-msgstr "位置："
-
-#: widget_panel.cxx:225
-msgid "X:"
-msgstr "水平位置（X轴）："
-
-#: widget_panel.cxx:226
-msgid "The X position of the widget."
-msgstr "widget 的水平位置（X轴）。"
-
-#: widget_panel.cxx:234
-msgid "Y:"
-msgstr "垂直位置（Y轴）："
-
-#: widget_panel.cxx:235
-msgid "The Y position of the widget."
-msgstr "widget 的垂直位置（Y轴）。"
-
-#: widget_panel.cxx:243
-msgid "Width:"
-msgstr "宽度:"
-
-#: widget_panel.cxx:244
-msgid "The width of the widget."
-msgstr "widget 的宽度。"
-
-#: widget_panel.cxx:252
-msgid "Height:"
-msgstr "高度:"
-
-#: widget_panel.cxx:253
-msgid "The height of the widget."
-msgstr "widget 的高度。"
-
-#: widget_panel.cxx:261
-msgid "Relative"
-msgstr "相对性"
-
-#: widget_panel.cxx:262
-msgid ""
-"If set, widgets inside a widget class of type Fl_Group are repositioned "
-"relative to the origin at construction time"
-msgstr "如果设置，在 widget 类里所有类型为 Fl_Group 的 widget 将重置至相对于结构线的原始位置"
-
-#: widget_panel.cxx:272
-msgid "Values:"
-msgstr "值："
-
-#: widget_panel.cxx:277
-msgid "Size:"
-msgstr "尺寸:"
-
-#: widget_panel.cxx:278 widget_panel.cxx:326
-msgid "The size of the slider."
-msgstr "滑块的尺寸。"
-
-#: widget_panel.cxx:285
-msgid "Minimum:"
-msgstr "最小值："
-
-#: widget_panel.cxx:286 widget_panel.cxx:335
-msgid "The minimum value of the widget."
-msgstr "widget 的最小值："
-
-#: widget_panel.cxx:292
-msgid "Maximum:"
-msgstr "最大值："
-
-#: widget_panel.cxx:293 widget_panel.cxx:348
-msgid "The maximum value of the widget."
-msgstr "widget 的最大值。"
-
-#: widget_panel.cxx:300
-msgid "Step:"
-msgstr "步进："
-
-#: widget_panel.cxx:301 widget_panel.cxx:357
-msgid "The resolution of the widget value."
-msgstr "widget 值的方案。"
-
-#: widget_panel.cxx:307
-msgid "Value:"
-msgstr "值："
-
-#: widget_panel.cxx:308
-msgid "The current widget value."
-msgstr "widget 的当前值。"
-
-#: widget_panel.cxx:319
-msgid "Size Range:"
-msgstr "尺寸范围："
-
-#: widget_panel.cxx:325
-msgid "Minimum Size:"
-msgstr "最小尺寸："
-
-#: widget_panel.cxx:343 widget_panel.cxx:365
-msgid "set"
-msgstr "设置"
-
-#: widget_panel.cxx:347
-msgid "Maximum Size:"
-msgstr "最大尺寸："
-
-#: widget_panel.cxx:374
-msgid "Shortcut:"
-msgstr "快捷键："
-
-#: widget_panel.cxx:375
-msgid "The shortcut key for the widget."
-msgstr "该 widget 的快捷键。"
-
-#: widget_panel.cxx:387
-msgid "X Class:"
-msgstr "X 类："
-
-#: widget_panel.cxx:392
-msgid ":"
-msgstr "："
-
-#: widget_panel.cxx:393
-msgid "The X resource class."
-msgstr "X 资源类。"
-
-#: widget_panel.cxx:400
-msgid "Border"
-msgstr "边框"
-
-#: widget_panel.cxx:401
-msgid "Add a border around the window."
-msgstr "为 window 周围添加边框。"
-
-#: widget_panel.cxx:406
-msgid "Modal"
-msgstr "模式"
-
-#: widget_panel.cxx:407
-msgid "Make the window modal."
-msgstr "设置 window 模式"
-
-#: widget_panel.cxx:412
-msgid "Nonmodal"
-msgstr "无模式的"
-
-#: widget_panel.cxx:413
-msgid "Make the window non-modal."
-msgstr "设置 window 无模式模式"
-
-#: widget_panel.cxx:421
-msgid "Attributes:"
-msgstr "属性："
-
-#: widget_panel.cxx:426
-msgid "Visible"
-msgstr "可见性"
-
-#: widget_panel.cxx:427
-msgid "Show the widget."
-msgstr "显示 widget。"
-
-#: widget_panel.cxx:432
-msgid "Active"
-msgstr "激活状态"
-
-#: widget_panel.cxx:433
-msgid "Activate the widget."
-msgstr "激活 widget"
-
-#: widget_panel.cxx:438
-msgid "Resizable"
-msgstr "可改大小"
-
-#: widget_panel.cxx:439
-msgid "Make the widget resizable."
-msgstr "使该 widget 可改大小"
-
-#: widget_panel.cxx:445
-msgid "Hotspot"
-msgstr "Hotspot"
-
-#: widget_panel.cxx:446
-msgid "Center the window under this widget."
-msgstr "居中在该 widget 下的窗体"
-
-#: widget_panel.cxx:458
-msgid "Tooltip:"
-msgstr "工具提示："
-
-#: widget_panel.cxx:459
-msgid "The tooltip text for the widget."
-msgstr "该 widget 的提示工具"
-
-#: widget_panel.cxx:472
-msgid "Style"
-msgstr "样式"
-
-#: widget_panel.cxx:477
-msgid "Label Font:"
-msgstr "标签字体："
-
-#: widget_panel.cxx:483
-msgid "The style of the label text."
-msgstr "标签文字样式。"
-
-#: widget_panel.cxx:494
-msgid "The size of the label text."
-msgstr "标签文字尺寸。"
-
-#: widget_panel.cxx:502
-msgid "Label Color"
-msgstr "标签颜色"
-
-#: widget_panel.cxx:503
-msgid "The color of the label text."
-msgstr "标签文字颜色。"
-
-#: widget_panel.cxx:509
-msgid "Box:"
-msgstr "Box:"
-
-#: widget_panel.cxx:515
-msgid "The \"up\" box of the widget."
-msgstr "该 widget 的 \"up\" box"
-
-#: widget_panel.cxx:525
-msgid "Color"
-msgstr "颜色："
-
-#: widget_panel.cxx:526
-msgid "The background color of the widget."
-msgstr "该 widget 的背景色"
-
-#: widget_panel.cxx:532
-msgid "Down Box:"
-msgstr "Down Box："
-
-#: widget_panel.cxx:538
-msgid "The \"down\" box of the widget."
-msgstr "该 widget 的 \"down\" box"
-
-#: widget_panel.cxx:548
-msgid "Select Color"
-msgstr "选中颜色"
-
-#: widget_panel.cxx:549
-msgid "The selection color of the widget."
-msgstr "该 widget 的选中颜色"
-
-#: widget_panel.cxx:555
-msgid "Text Font:"
-msgstr "文字字体："
-
-#: widget_panel.cxx:561
-msgid "The value text style."
-msgstr "文字样式。"
-
-#: widget_panel.cxx:572
-msgid "The value text size."
-msgstr "文字大小值。"
-
-#: widget_panel.cxx:580
-msgid "Text Color"
-msgstr "文字颜色"
-
-#: widget_panel.cxx:581
-msgid "The value text color."
-msgstr "文字颜色值"
-
-#: widget_panel.cxx:593
-msgid "C++"
-msgstr "C++"
-
-#: widget_panel.cxx:597
-msgid "Class:"
-msgstr "类："
-
-#: widget_panel.cxx:603
-msgid "The widget subclass."
-msgstr "该 widget 的子类"
-
-#: widget_panel.cxx:612
-msgid "The widget subtype."
-msgstr "该 widget 的子类型"
-
-#: widget_panel.cxx:621 function_panel.cxx:427
-msgid "Name:"
-msgstr "姓名："
-
-#: widget_panel.cxx:627
-msgid "The name of the widget."
-msgstr "该 widget 的名称"
-
-#: widget_panel.cxx:635 function_panel.cxx:73
-msgid "Change member access attribute."
-msgstr "更改成员接入属性"
-
-#: widget_panel.cxx:644 function_panel.cxx:81 function_panel.cxx:264
-msgid "Change widget accessibility."
-msgstr "更改widget接入性"
-
-#: widget_panel.cxx:654
-msgid "Extra Code:"
-msgstr "额外的代码："
-
-#: widget_panel.cxx:655 widget_panel.cxx:663 widget_panel.cxx:670
-#: widget_panel.cxx:677
-msgid "Extra initialization code for the widget."
-msgstr "该 widget 的额外初始化代码。"
-
-#: widget_panel.cxx:683
-msgid "Callback:"
-msgstr "回滚："
-
-#: widget_panel.cxx:684
-msgid ""
-"The callback function or code for the widget. Use the variable name 'o' to "
-"access the Widget pointer and 'v' to access the user value."
-msgstr "该 widget 的回滚函数或代码。使用变量名 'o' 访问 Widget 指针，使用变量名 'v' 访问用户值"
-
-#: widget_panel.cxx:700
-msgid "User Data:"
-msgstr "用户数据："
-
-#: widget_panel.cxx:706
-msgid "The user data to pass into the callback code."
-msgstr "用户数据插入回滚代码。"
-
-#: widget_panel.cxx:714
-msgid "When:"
-msgstr "何时："
-
-#: widget_panel.cxx:715
-msgid "When to call the callback function."
-msgstr "何时调用回滚函数。"
-
-#: widget_panel.cxx:727
-msgid "Type:"
-msgstr "类别:"
-
-#: widget_panel.cxx:733
-msgid "The type of the user data."
-msgstr "用户数据的类型"
-
-#: widget_panel.cxx:741
-msgid "No Change"
-msgstr "没有改变"
-
-#: widget_panel.cxx:742
-msgid "Call the callback even if the value has not changed."
-msgstr "如果值没有发生改变则调用回滚事件。"
-
-#: widget_panel.cxx:760
-msgid "Hide &Overlays"
-msgstr "隐藏占位 (&O)"
-
-#: widget_panel.cxx:761
-msgid "Hide the widget overlay box."
-msgstr "隐藏 widget 的占位框"
-
-#: widget_panel.cxx:766
-msgid "Revert"
-msgstr "复原"
-
-#: widget_panel.cxx:775 function_panel.cxx:122 function_panel.cxx:171
-#: function_panel.cxx:223 function_panel.cxx:304 function_panel.cxx:384
-#: function_panel.cxx:451 function_panel.cxx:507 alignment_panel.cxx:365
-#: print_panel.cxx:442 print_panel.cxx:503 template_panel.cxx:181
-msgid "Cancel"
-msgstr "取消"
-
-#: widget_panel.cxx:780
-msgid "Live &Mode"
-msgstr "Live 模式 (&M)"
-
-#: widget_panel.cxx:781
-msgid ""
-"Create a live duplicate of the selected widgets to test resizing and menu "
-"behavior."
-msgstr "创建一个与选中widget完全相同的实例以测试调整尺寸和菜单行为。"
-
-#: function_panel.cxx:70
-msgid "Function/Method Properties"
-msgstr "函数/模式属性"
-
-#: function_panel.cxx:88
-msgid "C declaration"
-msgstr "C 声明"
-
-#: function_panel.cxx:89
-msgid "Declare with a C interface instead of C++."
-msgstr "使用 C 接口声明替换 C++"
-
-#: function_panel.cxx:97
-msgid "Name(args): (blank for main())"
-msgstr "Name(args)：（main() 空白）"
-
-#: function_panel.cxx:98
-msgid "The name of the function or method."
-msgstr "函数或模式的名称"
-
-#: function_panel.cxx:107
-msgid "Return Type: (blank to return outermost widget)"
-msgstr "Return 类型：（对于外层 widget 返回空白值）"
-
-#: function_panel.cxx:108
-msgid "The return type of the function or method."
-msgstr "函数或模式的Return类型"
-
-#: function_panel.cxx:117 function_panel.cxx:167 function_panel.cxx:219
-#: function_panel.cxx:300 function_panel.cxx:380 function_panel.cxx:447
-#: function_panel.cxx:503
-msgid "OK"
-msgstr "确定"
-
-#: function_panel.cxx:118
-msgid "Apply the changes."
-msgstr "应用改变。"
-
-#: function_panel.cxx:123
-msgid "Cancel the changes."
-msgstr "取消改变。"
-
-#: function_panel.cxx:148
-msgid "Code Properties"
-msgstr "代码属性"
-
-#: function_panel.cxx:199
-msgid "Code Block Properties"
-msgstr "代码块属性"
-
-#: function_panel.cxx:201
-msgid "Conditional code block"
-msgstr "条件代码块"
-
-#: function_panel.cxx:202
-msgid "#ifdef or similar conditional code block."
-msgstr "#ifdef或类似的条件代码块"
-
-#: function_panel.cxx:209
-msgid "\"{...child code...}\" is inserted here"
-msgstr "在这里插入 \"{...child code...}\""
-
-#: function_panel.cxx:210
-msgid "#endif or similar conditional code block."
-msgstr "#endif或类似的条件代码块"
-
-#: function_panel.cxx:244
-msgid "in source code only"
-msgstr "只有源代码"
-
-#: function_panel.cxx:245
-msgid "in header and source"
-msgstr "在头文件和源文件"
-
-#: function_panel.cxx:260
-msgid "Declaration Block Properties"
-msgstr "声明块属性"
-
-#: function_panel.cxx:272
-msgid "Make the declaration publicly accessible."
-msgstr "使声明公共化"
-
-#: function_panel.cxx:283
-msgid "#ifdef or similar conditional declaration block."
-msgstr "#ifdef或类似的条件声明块"
-
-#: function_panel.cxx:291
-msgid "\"\\n...child code...\\n\" is inserted here"
-msgstr "在这里插入 \"\\n...child code...\\n\""
-
-#: function_panel.cxx:292
-msgid "#endif or similar declaration code block."
-msgstr "#endif或类似的条件声明块"
-
-#: function_panel.cxx:325
-msgid "in source file only"
-msgstr "只有源文件"
-
-#: function_panel.cxx:326
-msgid "in header file only"
-msgstr "只有头文件"
-
-#: function_panel.cxx:327
-msgid "\"static\" in source file"
-msgstr "原文件中的\"static\""
-
-#: function_panel.cxx:328
-msgid "in source and \"extern\" in header"
-msgstr "原文件中和头文件中的\"extern\""
-
-#: function_panel.cxx:348
-msgid "Declaration Properties"
-msgstr "声明属性"
-
-#: function_panel.cxx:368
-msgid ""
-"Can be any declaration, like \"int x;\", an external symbol like \"extern "
-"int foo();\", a #directive like \"#include <foo.h>\", a comment like "
-"\"//foo\" or \"/*foo*/\", or typedef like \"typedef char byte;\" or \"using "
-"std::list;\"."
-msgstr ""
-"可以是些声明如\"int x;\"，扩展对象如\"extern int foo();\"，#宏如\"#include "
-"<foo.h>\"，注释如\"//foo\" or \"/*foo*/\"，或者typedef如\"typedef char "
-"byte;\"、\"using std::list;\"。"
-
-#: function_panel.cxx:371
-msgid "Declaration text."
-msgstr "声明文本。"
-
-#: function_panel.cxx:412
-msgid "Class Properties"
-msgstr "类属性"
-
-#: function_panel.cxx:417
-msgid "Make the class publicly accessible."
-msgstr "是类公共化"
-
-#: function_panel.cxx:428
-msgid "Name of class."
-msgstr "类名"
-
-#: function_panel.cxx:437
-msgid "Subclass of (text between : and {)"
-msgstr "子类（在:和{间）"
-
-#: function_panel.cxx:438
-msgid "Name of subclass."
-msgstr "子类名"
-
-#: function_panel.cxx:484
-msgid "Comment Properties"
-msgstr "注释属性"
-
-#: function_panel.cxx:519
-msgid "In Source"
-msgstr "在代码中"
-
-#: function_panel.cxx:520
-msgid "Put the comment into the source (.cxx) file."
-msgstr "将注释至于代码文件（.cxx）中"
-
-#: function_panel.cxx:524
-msgid "In Header"
-msgstr "在Header中"
-
-#: function_panel.cxx:525
-msgid "Put the comment into the header (.h) file."
-msgstr "将注释置与头文件(.h)中"
-
-#: function_panel.cxx:529
-msgid "Predefined"
-msgstr "预定义的"
-
-#: function_panel.cxx:533
-msgid "Import..."
-msgstr "导入..."
-
-#: function_panel.cxx:565
-msgid "Widget Bin"
-msgstr "Widget Bin"
-
-#: function_panel.cxx:569
-msgid "Function"
-msgstr "函数"
-
-#: function_panel.cxx:575 factory.cxx:957
-msgid "Class"
-msgstr "类"
-
-#: function_panel.cxx:581 factory.cxx:959
-msgid "Comment"
-msgstr "注释"
-
-#: function_panel.cxx:587 factory.cxx:951 factory.cxx:953
-msgid "Code"
-msgstr "代码"
-
-#: function_panel.cxx:593 factory.cxx:954
-msgid "Code Block"
-msgstr "代码块"
-
-#: function_panel.cxx:599 factory.cxx:958
-msgid "Widget Class"
-msgstr "Widget类"
-
-#: function_panel.cxx:605 factory.cxx:955
-msgid "Declaration"
-msgstr "声明"
-
-#: function_panel.cxx:611 factory.cxx:956
-msgid "Declaration Block"
-msgstr "声明块"
-
-#: function_panel.cxx:620
-msgid "Window"
-msgstr "窗体"
-
-#: function_panel.cxx:626 factory.cxx:961
-msgid "Group"
-msgstr "组"
-
-#: function_panel.cxx:632
-msgid "Pack"
-msgstr "包"
-
-#: function_panel.cxx:638
-msgid "Tabs"
-msgstr "Tabs"
-
-#: function_panel.cxx:644
-msgid "Scroll"
-msgstr "卷"
-
-#: function_panel.cxx:650
-msgid "Tile"
-msgstr "片"
-
-#: function_panel.cxx:656
-msgid "Wizard"
-msgstr "难"
-
-#: function_panel.cxx:665
-msgid "Button"
-msgstr "按键"
-
-#: function_panel.cxx:671
-msgid "Return Button"
-msgstr "返回按钮"
-
-#: function_panel.cxx:677
-msgid "Light Button"
-msgstr "光照按钮"
-
-#: function_panel.cxx:683
-msgid "Repeat Button"
-msgstr "重复按钮"
-
-#: function_panel.cxx:689
-msgid "Check Button"
-msgstr "检查按钮"
-
-#: function_panel.cxx:695
-msgid "Round Button"
-msgstr "圈按钮"
-
-#: function_panel.cxx:704
-msgid "Slider"
-msgstr "Slider"
-
-#: function_panel.cxx:710
-msgid "Scroll Bar"
-msgstr "滚动条"
-
-#: function_panel.cxx:716
-msgid "Value Slider"
-msgstr "计算Slider"
-
-#: function_panel.cxx:722
-msgid "Value Output"
-msgstr "计算输出"
-
-#: function_panel.cxx:728
-msgid "Adjuster"
-msgstr "校正器"
-
-#: function_panel.cxx:734
-msgid "Counter"
-msgstr "计数"
-
-#: function_panel.cxx:740
-msgid "Dial"
-msgstr "拨号"
-
-#: function_panel.cxx:746
-msgid "Roller"
-msgstr "滚筒"
-
-#: function_panel.cxx:752
-msgid "Spinner"
-msgstr "旋转器"
-
-#: function_panel.cxx:758
-msgid "Value Input"
-msgstr "数值输入"
-
-#: function_panel.cxx:767
-msgid "Input"
-msgstr "输入"
-
-#: function_panel.cxx:773 alignment_panel.cxx:75
-msgid "Output"
-msgstr "输出"
-
-#: function_panel.cxx:779
-msgid "Text Edit"
-msgstr "文本编辑"
-
-#: function_panel.cxx:785
-msgid "Text Display"
-msgstr "文本显示"
-
-#: function_panel.cxx:791
-msgid "File Input"
-msgstr "文件输入"
-
-#: function_panel.cxx:800
-msgid "Menu Bar"
-msgstr "菜单栏"
-
-#: function_panel.cxx:806
-msgid "Input Choice"
-msgstr "输入选项"
-
-#: function_panel.cxx:812
-msgid "Menu Button"
-msgstr "菜单按钮"
-
-#: function_panel.cxx:818
-msgid "Menu Item"
-msgstr "菜单项"
-
-#: function_panel.cxx:824
-msgid "Choice"
-msgstr "选择"
-
-#: function_panel.cxx:830
-msgid "Sub Menu"
-msgstr "子菜单"
-
-#: function_panel.cxx:839
-msgid "Browser"
-msgstr "浏览器"
-
-#: function_panel.cxx:845
-msgid "Check Browser"
-msgstr "检查浏览器"
-
-#: function_panel.cxx:851
-msgid "File Browser"
-msgstr "文件浏览器"
-
-#: function_panel.cxx:860
-msgid "Box"
-msgstr "边框"
-
-#: function_panel.cxx:866
-msgid "Clock"
-msgstr "时钟"
-
-#: function_panel.cxx:872
-msgid "Help Browser"
-msgstr "帮助浏览器"
-
-#: function_panel.cxx:878
-msgid "Progress"
-msgstr "进度"
-
-#: function_panel.cxx:904
-msgid "Code View"
-msgstr "代码浏览"
-
-#: function_panel.cxx:911
-msgid "Source"
-msgstr "来源"
-
-#: function_panel.cxx:931
-msgid "Header"
-msgstr "表头"
-
-#: function_panel.cxx:953
-msgid "Refresh"
-msgstr "刷新"
-
-#: function_panel.cxx:957
-msgid "Auto-Refresh"
-msgstr "自动刷新"
-
-#: function_panel.cxx:961
-msgid "Auto-Position"
-msgstr "自动定位"
-
-#: alignment_panel.cxx:51 alignment_panel.cxx:183
-msgid "None"
-msgstr "无"
-
-#: alignment_panel.cxx:52
-msgid "GNU gettext"
-msgstr "GNU gettext"
-
-#: alignment_panel.cxx:53
-msgid "POSIX catgets"
-msgstr "POSIX catgets"
-
-#: alignment_panel.cxx:66
-msgid "Project Settings"
-msgstr "项目选项"
-
-#: alignment_panel.cxx:68 alignment_panel.cxx:272 alignment_panel.cxx:434
-msgid "Close this dialog."
-msgstr "关闭对话框"
-
-#: alignment_panel.cxx:77
-msgid "Use \"name.ext\" to set name or just \".ext\" to set extension."
-msgstr "用\"name.ext\"设置名称或仅用\".ext\"设置插件"
-
-#: alignment_panel.cxx:81
-msgid "Header File:"
-msgstr "头文件:"
-
-#: alignment_panel.cxx:82
-msgid "The name of the generated header file."
-msgstr "所生成的头文件名."
-
-#: alignment_panel.cxx:91
-msgid "Code File:"
-msgstr "代码文件"
-
-#: alignment_panel.cxx:92
-msgid "The name of the generated code file."
-msgstr "说生成的代码文件名."
-
-#: alignment_panel.cxx:101
-msgid "Include Header from Code"
-msgstr "代码文件包含头文件"
-
-#: alignment_panel.cxx:102
-msgid "Include the header file from the code file."
-msgstr "从代码文件中添加头文件。"
-
-#: alignment_panel.cxx:107
-msgid "Generate menu shortcuts using FL_COMMAND"
-msgstr "使用FL_COMMAND生成菜单快捷方式"
-
-#: alignment_panel.cxx:108
-msgid "Replace FL_CTRL with FL_COMMAND when generating menu shortcut code."
-msgstr "当生成菜单快捷方式代码时使用FL_COMMAND替代FL_CTRL"
-
-#: alignment_panel.cxx:115
-msgid "Internationalization"
-msgstr "国际化"
-
-#: alignment_panel.cxx:118
-msgid "Use:"
-msgstr "使用："
-
-#: alignment_panel.cxx:119
-msgid "Type of internationalization to use."
-msgstr "要使用的国际化形式。"
-
-#: alignment_panel.cxx:128
-msgid "#include:"
-msgstr "#include:"
-
-#: alignment_panel.cxx:129
-msgid "The include file for internationalization."
-msgstr "为国际化而添加文件。"
-
-#: alignment_panel.cxx:137
-msgid "File:"
-msgstr "文件："
-
-#: alignment_panel.cxx:138
-msgid "The name of the message catalog."
-msgstr "信息目录名"
-
-#: alignment_panel.cxx:146
-msgid "Set:"
-msgstr "集合："
-
-#: alignment_panel.cxx:147
-msgid "The message set number."
-msgstr "消息序号。"
-
-#: alignment_panel.cxx:156
-msgid "Function:"
-msgstr "函数:"
-
-#: alignment_panel.cxx:157
-msgid "The function to call to internationalize the labels and tooltips."
-msgstr "调用该函数重置标签和提示"
-
-#: alignment_panel.cxx:182
-msgid "Default"
-msgstr "默认"
-
-#: alignment_panel.cxx:184
-msgid "Plastic"
-msgstr "Plastic"
-
-#: alignment_panel.cxx:185
-msgid "GTK+"
-msgstr "GTK+"
-
-#: alignment_panel.cxx:226
-msgid "GUI Settings"
-msgstr "GUI设置"
-
-#: alignment_panel.cxx:227
-msgid "Scheme:"
-msgstr "方案:"
-
-#: alignment_panel.cxx:237
-msgid ""
-"Options:\n"
-"\n"
-"\n"
-"\n"
-"\n"
-msgstr ""
-"选项:\n"
-"\n"
-"\n"
-"\n"
-"\n"
-
-#: alignment_panel.cxx:240
-msgid "Show Tooltips"
-msgstr "显示提示"
-
-#: alignment_panel.cxx:248
-msgid "Show Completion Dialogs"
-msgstr "显示完成对话框"
-
-#: alignment_panel.cxx:255
-msgid "Open Previous File on Startup"
-msgstr "启动时打开预览文件"
-
-#: alignment_panel.cxx:262
-msgid "Remember Window Positions"
-msgstr "记住窗口位置"
-
-#: alignment_panel.cxx:275
-msgid "# Recent Files:"
-msgstr "# Recent Files:"
-
-#: alignment_panel.cxx:332
-msgid "Shell Command"
-msgstr "外壳命令"
-
-#: alignment_panel.cxx:333
-msgid "Command:"
-msgstr "命令："
-
-#: alignment_panel.cxx:341
-msgid "Write Code"
-msgstr "写代码"
-
-#: alignment_panel.cxx:348
-msgid "Write Messages"
-msgstr "写信息"
-
-#: alignment_panel.cxx:355
-msgid "Save .FL File"
-msgstr "保存 .FL 文件"
-
-#: alignment_panel.cxx:362
-msgid "Run Command"
-msgstr "运行命令"
-
-#: alignment_panel.cxx:370
-msgid "Shell Command Output"
-msgstr "外壳命令输出"
-
-#: alignment_panel.cxx:403
-msgid "Layout Settings"
-msgstr "布局设置"
-
-#: alignment_panel.cxx:404
-msgid "x"
-msgstr "x"
-
-#: alignment_panel.cxx:405
-msgid "Horizontal grid spacing."
-msgstr "水平网格间距。"
-
-#: alignment_panel.cxx:412
-msgid "pixels"
-msgstr "像素"
-
-#: alignment_panel.cxx:413
-msgid "Vertical grid spacing."
-msgstr "垂直网格间距。"
-
-#: alignment_panel.cxx:420
-msgid "pixel snap"
-msgstr "像素单元"
-
-#: alignment_panel.cxx:421
-msgid "Snap to grid within this many pixels."
-msgstr "在这个数量的像素范围内捕捉到栅格。"
-
-#: alignment_panel.cxx:428
-msgid "Show Guides"
-msgstr "显示向导"
-
-#: alignment_panel.cxx:429
-msgid "Show distance and alignment guides in overlay"
-msgstr "重叠时显示距离和对齐引导"
-
-#: alignment_panel.cxx:437
-msgid "Grid:"
-msgstr "网格："
-
-#: alignment_panel.cxx:441
-msgid "Widget Size:"
-msgstr "Widget 大小："
-
-#: alignment_panel.cxx:451
-msgid "tiny"
-msgstr "微小"
-
-#: alignment_panel.cxx:460
-msgid "small"
-msgstr "小"
-
-#: alignment_panel.cxx:469
-msgid "normal"
-msgstr "普通"
-
-#: alignment_panel.cxx:477
-msgid "medium"
-msgstr "中"
-
-#: alignment_panel.cxx:486
-msgid "large"
-msgstr "大"
-
-#: alignment_panel.cxx:495
-msgid "huge"
-msgstr "巨大"
-
-#: factory.cxx:94 factory.cxx:353 factory.cxx:427 factory.cxx:751
-msgid "Normal"
-msgstr "正常"
-
-#: factory.cxx:95
-msgid "Toggle"
-msgstr "切换"
-
-#: factory.cxx:96
-msgid "Radio"
-msgstr "广播"
-
-#: factory.cxx:207
-msgid "No Select"
-msgstr "没有选择"
-
-#: factory.cxx:208
-msgid "Select"
-msgstr "选择"
-
-#: factory.cxx:209
-msgid "Hold"
-msgstr "挂起"
-
-#: factory.cxx:210
-msgid "Multi"
-msgstr "多"
-
-#: factory.cxx:354
-msgid "Simple"
-msgstr "简洁"
-
-#: factory.cxx:428 factory.cxx:752
-msgid "Multiline"
-msgstr "多行"
-
-#: factory.cxx:429
-msgid "Secret"
-msgstr "秘密"
-
-#: factory.cxx:430
-msgid "Int"
-msgstr "Int"
-
-#: factory.cxx:431
-msgid "Float"
-msgstr "浮点"
-
-#: factory.cxx:673
-msgid "Dot"
-msgstr "点"
-
-#: factory.cxx:674
-msgid "Line"
-msgstr "行"
-
-#: factory.cxx:675
-msgid "Fill"
-msgstr "填充"
-
-#: factory.cxx:693 factory.cxx:712 factory.cxx:732
-msgid "Vertical"
-msgstr "垂直"
-
-#: factory.cxx:694 factory.cxx:713 factory.cxx:733
-msgid "Horizontal"
-msgstr "水平"
-
-#: factory.cxx:714
-msgid "Vert Fill"
-msgstr "垂直填充"
-
-#: factory.cxx:715
-msgid "Horz Fill"
-msgstr "水平填充"
-
-#: factory.cxx:716
-msgid "Vert Knob"
-msgstr "垂直 Knob"
-
-#: factory.cxx:717
-msgid "Horz Knob"
-msgstr "水平 Knob"
-
-#: factory.cxx:952
-msgid "Function/Method"
-msgstr "功能／方法"
-
-#: factory.cxx:970
-msgid "Buttons"
-msgstr "按钮"
-
-#: factory.cxx:978
-msgid "Valuators"
-msgstr "评价者"
-
-#: factory.cxx:990
-msgid "Text"
-msgstr "文本"
-
-#: factory.cxx:997
-msgid "Menus"
-msgstr "菜单"
-
-#: factory.cxx:1005
-msgid "Browsers"
-msgstr "浏览器"
-
-#: factory.cxx:1010
-msgid "Other"
-msgstr "其它"
-
-#: print_panel.cxx:122
-msgid "Letter"
-msgstr "信纸"
-
-#: print_panel.cxx:123
-msgid "A4"
-msgstr "A4"
-
-#: print_panel.cxx:250 print_panel.cxx:439
-msgid "Print"
-msgstr "打印"
-
-#: print_panel.cxx:253
-msgid "Printer:"
-msgstr "打印机："
-
-#: print_panel.cxx:259
-msgid "Properties..."
-msgstr "属性..."
-
-#: print_panel.cxx:262
-msgid "printer/job status"
-msgstr "打印机／任务 状态"
-
-#: print_panel.cxx:265
-msgid "Print Range"
-msgstr "打印范围"
-
-#: print_panel.cxx:269
-msgid "All"
-msgstr "全部"
-
-#: print_panel.cxx:275
-msgid "Pages"
-msgstr "页"
-
-#: print_panel.cxx:280
-msgid "Selection"
-msgstr "选择"
-
-#: print_panel.cxx:285
-msgid "From:"
-msgstr "来自："
-
-#: print_panel.cxx:290
-msgid "To:"
-msgstr "到："
-
-#: print_panel.cxx:297
-msgid "Copies"
-msgstr "副本"
-
-#: print_panel.cxx:301
-msgid "# Copies:"
-msgstr "# 副本："
-
-#: print_panel.cxx:305
-msgid "Collate"
-msgstr "整理"
-
-#: print_panel.cxx:313 print_panel.cxx:320 print_panel.cxx:327
-#: print_panel.cxx:393 print_panel.cxx:411 print_panel.cxx:429
-msgid "1"
-msgstr "1"
-
-#: print_panel.cxx:334 print_panel.cxx:341 print_panel.cxx:348
-#: print_panel.cxx:387 print_panel.cxx:405 print_panel.cxx:423
-msgid "2"
-msgstr "2"
-
-#: print_panel.cxx:355 print_panel.cxx:362 print_panel.cxx:369
-#: print_panel.cxx:381 print_panel.cxx:399 print_panel.cxx:417
-msgid "3"
-msgstr "3"
-
-#: print_panel.cxx:454
-msgid "Printer Properties"
-msgstr "打印机属性"
-
-#: print_panel.cxx:457
-msgid "Page Size:"
-msgstr "页面大小："
-
-#: print_panel.cxx:462
-msgid "Output Mode:"
-msgstr "输出模式："
-
-#: print_panel.cxx:500 template_panel.cxx:184
-msgid "Save"
-msgstr "保存"
-
-#: print_panel.cxx:506
-msgid "Use"
-msgstr "使用"
-
-#: template_panel.cxx:148
-msgid "New/Save Template"
-msgstr "新建／保存 模板"
-
-#: template_panel.cxx:151
-msgid "Available Templates:"
-msgstr "可用的模板："
-
-#: template_panel.cxx:163
-msgid "Template Name:"
-msgstr "模板名称:"
-
-#: template_panel.cxx:169
-msgid "Instance Name:"
-msgstr "实例名称："
-
-#: template_panel.cxx:175
-msgid "Delete Template"
-msgstr "删除模板"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/FontForge.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/FontForge.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/FontForge.po	2014-02-24 08:24:27.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/FontForge.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,35923 +0,0 @@
-# Chinese translations for fontforge package
-# fontforge 软件包的简体中文翻译.
-# Copyright (C) 2006 THE fontforge'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the fontforge package.
-# Lee Chenhwa <leechenhwa@163.com>, 2006,2007,2008
-# 李振华 <leechenhwa@163.com>, 2007.
-#
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: fontforge 20080115\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-28 15:35+0000\n"
-"PO-Revision-Date: 2009-10-27 22:53+0000\n"
-"Last-Translator: Qianqian Fang <fangqq@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"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2013-12-12 11:13+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
-
-#
-#: alignment.c:297 anchorsaway.c:1274 combinations.c:1115 cvhints.c:483
-#: cvhints.c:786 displayfonts.c:1132 displayfonts.c:1633
-msgid "_Size:"
-msgstr "大小(_S):"
-
-#
-#: alignment.c:343
-msgid "Space Regions"
-msgstr "间隔区域"
-
-#
-#: alignment.c:354
-msgid "Coordinate along which to space"
-msgstr "间隔座标"
-
-#
-#: alignment.c:362 anchorsaway.c:1322 cvgetinfo.c:1233 cvpalettes.c:397
-#: cvpalettes.c:611 nonlineartransui.c:341 nonlineartransui.c:579
-#: transform.c:358
-msgid "_X"
-msgstr "_X"
-
-#
-#: alignment.c:372 anchorsaway.c:1370 cvgetinfo.c:1236 cvpalettes.c:398
-#: cvpalettes.c:619 nonlineartransui.c:377 nonlineartransui.c:580
-#: transform.c:377
-msgid "_Y"
-msgstr "_Y"
-
-#
-#: alignment.c:393
-msgid "_Maximum distance between points in a region"
-msgstr "域内最大点距(_M)"
-
-#
-#: alignment.c:419 anchorsaway.c:1421 autowidth2dlg.c:281 basedlg.c:342
-#: basedlg.c:852 bdfinfo.c:862 bitmapdlg.c:524 charinfo.c:340 charinfo.c:1147
-#: charinfo.c:2385 charinfo.c:5163 charinfo.c:5444 charview.c:8053
-#: combinations.c:1181 contextchain.c:2114 cvexportdlg.c:154 cvgetinfo.c:587
-#: cvgetinfo.c:700 cvgetinfo.c:1621 cvgetinfo.c:3205 cvgetinfo.c:3635
-#: cvgridfit.c:356 cvhints.c:566 cvhints.c:807 cvimportdlg.c:351
-#: cvpalettes.c:538 cvpointer.c:1549 cvstroke.c:1092 cvstroke.c:1792
-#: cvstroke.c:2341 cvstroke.c:3304 cvundoes.c:2014 cvundoes.c:2819
-#: deltaui.c:337 deltaui.c:1045 displayfonts.c:482 effectsui.c:275
-#: effectsui.c:483 fontinfo.c:2567 fontinfo.c:3987 fontinfo.c:4017
-#: fontinfo.c:4996 fontinfo.c:6761 fontinfo.c:10523 fontview.c:1034
-#: fontview.c:1844 fontview.c:2106 fontview.c:3070 fontview.c:7869
-#: fvfontsdlg.c:220 fvfontsdlg.c:399 fvimportbdf.c:1885 fvmetricsdlg.c:210
-#: gotodlg.c:244 groupsdlg.c:1314 groupsdlg.c:1549 histograms.c:966
-#: justifydlg.c:251 justifydlg.c:458 justifydlg.c:774 justifydlg.c:970
-#: kernclass.c:2526 kernclass.c:2901 layer2layer.c:292 lookupui.c:850
-#: lookupui.c:1137 lookupui.c:1906 lookupui.c:2281 lookupui.c:4562
-#: lookupui.c:5444 lookupui.c:5879 lookupui.c:6256 macencui.c:507
-#: macencui.c:857 macencui.c:1203 math.c:796 math.c:1181 math.c:1997
-#: metricsview.c:2888 mmdlg.c:684 mmdlg.c:748 mmdlg.c:1042 mmdlg.c:2540
-#: nonlineartransui.c:136 nonlineartransui.c:537 openfontdlg.c:365
-#: openfontdlg.c:688 prefs.c:1503 prefs.c:2311 problems.c:2626 problems.c:4120
-#: problems.c:5423 savefontdlg.c:871 savefontdlg.c:1057 scriptingdlg.c:313
-#: scstylesui.c:271 scstylesui.c:1716 scstylesui.c:2204 scstylesui.c:2814
-#: scstylesui.c:2985 showatt.c:2839 showatt.c:3326 simplifydlg.c:418
-#: statemachine.c:752 statemachine.c:1462 tilepath.c:1210 tilepath.c:1880
-#: transform.c:730 ttfinstrsui.c:764 ttfinstrsui.c:1462 ttfinstrsui.c:1601
-#: ttfinstrsui.c:1917 ../gdraw/gaskdlg.c:1196 ../gdraw/gaskdlg.c:1233
-#: ../gdraw/gaskdlg.c:1270 ../gdraw/gaskdlg.c:1326 ../gdraw/gaskdlg.c:1587
-#: ../gdraw/gaskdlg.c:1646 ../gdraw/gcolor.c:673 ../gdraw/gfiledlg.c:123
-#: ../gdraw/gmatrixedit.c:1206 ../gdraw/gresedit.c:2249
-msgid "_OK"
-msgstr "确定(_O)"
-
-#
-#: alignment.c:430 anchorsaway.c:1432 autowidth2dlg.c:290 basedlg.c:350
-#: basedlg.c:860 bdfinfo.c:873 bitmapdlg.c:536 charinfo.c:351 charinfo.c:935
-#: charinfo.c:945 charinfo.c:1147 charinfo.c:1357 charinfo.c:2394
-#: charinfo.c:5174 charinfo.c:5455 charview.c:8064 charview.c:8305
-#: combinations.c:1192 contextchain.c:2144 cvexportdlg.c:166 cvexportdlg.c:307
-#: cvexportdlg.c:554 cvgetinfo.c:277 cvgetinfo.c:598 cvgetinfo.c:1633
-#: cvgetinfo.c:3217 cvgetinfo.c:3647 cvgetinfo.c:3735 cvgetinfo.c:3810
-#: cvgridfit.c:368 cvhints.c:575 cvhints.c:819 cvimportdlg.c:714
-#: cvpalettes.c:549 cvpointer.c:1559 cvstroke.c:1111 cvstroke.c:1800
-#: cvstroke.c:2349 cvstroke.c:3315 cvundoes.c:2820 deltaui.c:347
-#: displayfonts.c:493 displayfonts.c:2182 effectsui.c:286 effectsui.c:494
-#: encodingui.c:151 fontinfo.c:2567 fontinfo.c:3987 fontinfo.c:4017
-#: fontinfo.c:4242 fontinfo.c:5006 fontinfo.c:6104 fontinfo.c:6340
-#: fontinfo.c:6761 fontinfo.c:6801 fontinfo.c:6803 fontinfo.c:10534
-#: fontview.c:506 fontview.c:1035 fontview.c:1852 fontview.c:2114
-#: fontview.c:3080 fontview.c:3665 fontview.c:4701 fontview.c:4796
-#: fontview.c:7877 fontviewbase.c:991 fontviewbase.c:1630 fvfontsdlg.c:60
-#: fvfontsdlg.c:231 fvfontsdlg.c:410 fvimportbdf.c:1886 fvmetricsdlg.c:219
-#: gotodlg.c:253 groupsdlg.c:1324 groupsdlg.c:1559 histograms.c:975
-#: justifydlg.c:262 justifydlg.c:469 justifydlg.c:785 justifydlg.c:981
-#: kernclass.c:2538 kernclass.c:2912 layer2layer.c:301 lookupui.c:862
-#: lookupui.c:1148 lookupui.c:1917 lookupui.c:2119 lookupui.c:2292
-#: lookupui.c:3724 lookupui.c:4572 lookupui.c:5452 lookupui.c:5550
-#: lookupui.c:5887 lookupui.c:6264 macencui.c:518 macencui.c:868
-#: macencui.c:1214 math.c:804 math.c:1189 metricsview.c:2045
-#: metricsview.c:2467 metricsview.c:2896 mmdlg.c:694 mmdlg.c:758 mmdlg.c:1052
-#: mmdlg.c:2574 nonlineartransui.c:147 nonlineartransui.c:548
-#: openfontdlg.c:376 openfontdlg.c:725 parsettf.c:5503 prefs.c:1513
-#: prefs.c:2323 problems.c:4132 savefont.c:755 savefontdlg.c:882
-#: savefontdlg.c:1069 savefontdlg.c:1436 savefontdlg.c:1627 savefontdlg.c:2329
-#: scriptingdlg.c:325 scstylesui.c:282 scstylesui.c:1737 scstylesui.c:2215
-#: scstylesui.c:2822 scstylesui.c:2996 searchview.c:842 showatt.c:3336
-#: simplifydlg.c:430 splinechar.c:1014 statemachine.c:762 statemachine.c:1473
-#: tilepath.c:1218 tilepath.c:1888 transform.c:751 ttfinstrsui.c:774
-#: ttfinstrsui.c:1473 ttfinstrsui.c:1602 ttfinstrsui.c:1928
-#: ../gdraw/gaskdlg.c:1197 ../gdraw/gaskdlg.c:1234 ../gdraw/gaskdlg.c:1588
-#: ../gdraw/gaskdlg.c:1647 ../gdraw/gcolor.c:682 ../gdraw/gfilechooser.c:919
-#: ../gdraw/gfiledlg.c:153 ../gdraw/gmatrixedit.c:1219
-#: ../gdraw/gresedit.c:2265 ../gdraw/gsavefiledlg.c:287
-msgid "_Cancel"
-msgstr "取消(_C)"
-
-#
-#: alignment.c:674
-msgid "Not enough lines"
-msgstr "线不足"
-
-#
-#: alignment.c:677
-msgid "Can't Parallel"
-msgstr "不能平行"
-
-#
-#: alignment.c:677
-msgid "These two lines share a common endpoint, I can't make them parallel"
-msgstr "两线共点，不能平行"
-
-#
-#: anchorsaway.c:181
-msgid "Exits"
-msgstr "退出"
-
-#
-#: anchorsaway.c:181
-msgid "Bases"
-msgstr "基本"
-
-#
-#: anchorsaway.c:188
-msgid "Entries"
-msgstr "入口"
-
-#
-#: anchorsaway.c:188
-msgid "Marks"
-msgstr "标记"
-
-#
-#: anchorsaway.c:195
-msgid "Add Exit Anchor..."
-msgstr "增加已有锚点"
-
-#
-#: anchorsaway.c:195
-msgid "Add Base Anchor..."
-msgstr "增加基础锚点"
-
-#
-#: anchorsaway.c:199
-msgid "Add Entry Anchor..."
-msgstr "增加入口锚点"
-
-#
-#: anchorsaway.c:199
-msgid "Add Mark Anchor..."
-msgstr "增加标记锚点"
-
-#: anchorsaway.c:210
-#, c-format
-msgid "Anchor Control for class %.100s in glyph %.100s as %.20s"
-msgstr ""
-
-#
-#: anchorsaway.c:212
-msgid "mark"
-msgstr "标记"
-
-#
-#: anchorsaway.c:213
-msgid "cursive entry"
-msgstr "草写起点"
-
-#
-#: anchorsaway.c:214
-msgid "cursive exit"
-msgstr "草写终点"
-
-#
-#: anchorsaway.c:215
-msgid "base"
-msgstr "基本"
-
-#: anchorsaway.c:216
-msgid "Anchor Control"
-msgstr "锚点控制"
-
-#
-#: anchorsaway.c:757
-msgid "Detaching Anchor Point"
-msgstr "分离锚点"
-
-#: anchorsaway.c:757
-#, c-format
-msgid ""
-"This anchor was attached to point %d, but that's not a point I can move. I'm "
-"detaching the anchor from the point."
-msgstr ""
-
-#
-#: anchorsaway.c:851 charview.c:7901
-msgid "Out of Range"
-msgstr "超出范围"
-
-#
-#: anchorsaway.c:851
-msgid "Corrections must be between -128 and 127 (and should be smaller)"
-msgstr "修正值必须在－128与127之间（其绝对值应小些）"
-
-#
-#: anchorsaway.c:1019
-msgid "Provide a glyph name"
-msgstr "给出字形名称"
-
-#: anchorsaway.c:1019
-msgid ""
-"Please identify a glyph by name, and FontForge will add an anchor to that "
-"glyph."
-msgstr ""
-
-#
-#: anchorsaway.c:1026
-msgid "Non-existant glyph"
-msgstr "不存在字形"
-
-#
-#: anchorsaway.c:1026
-#, c-format
-msgid "The glyph, %.80s, is not in the font"
-msgstr "字形%.80s未能在此字体文件中找到"
-
-#
-#: anchorsaway.c:1043
-msgid "Duplicate Anchor Class"
-msgstr "复制锚点类属"
-
-#: anchorsaway.c:1043
-#, c-format
-msgid "The glyph, %.80s, already contains an anchor in this class, %.80s."
-msgstr ""
-
-#
-#: anchorsaway.c:1239 lookupui.c:2319
-msgid "Anchor Control..."
-msgstr "锚点控制…"
-
-#: anchorsaway.c:1295
-msgid ""
-"The size at which the current glyph is rasterized.\n"
-"For small pixelsize you may want to use the magnification\n"
-"factor below to get a clearer view."
-msgstr ""
-
-#: anchorsaway.c:1298
-msgid ""
-"The size at which the current glyph is rasterized.\n"
-"For small pixelsize you may want to use the magnification\n"
-"factor below to get a clearer view.\n"
-"\n"
-"The pulldown list contains the pixelsizes at which there\n"
-"are device table corrections."
-msgstr ""
-
-#
-#. GT: Short for: Magnification
-#. GT: Short for "Magnification"
-#: anchorsaway.c:1304 lookupui.c:4529
-msgid "Mag:"
-msgstr "放大:"
-
-#: anchorsaway.c:1318
-msgid ""
-"The glyph is rasterized at the size above, but it\n"
-"may be difficult to see the alignment errors\n"
-"that can happen at small pixelsizes. This allows\n"
-"you to expand each pixel to show potential problems\n"
-"better."
-msgstr ""
-
-#: anchorsaway.c:1341
-msgid "The X coordinate of the anchor point in this glyph"
-msgstr "符号中锚点的 X 坐标"
-
-#
-#. GT: Short for Correction
-#: anchorsaway.c:1347 anchorsaway.c:1395
-msgid "Cor:"
-msgstr "修正:"
-
-#
-#: anchorsaway.c:1352 anchorsaway.c:1400
-msgid ""
-"Correction in pixels to the horizontal positioning of this anchor point\n"
-"when rasterizing at the given pixelsize.\n"
-"(Lives in a Device Table)"
-msgstr ""
-"以指定像素大小显示时距此锚点水平位置的修正值（像素）。\n"
-"(在设备表中)"
-
-#: anchorsaway.c:1365
-msgid ""
-"This is the number of pixels by which the anchor\n"
-"should be moved horizontally when the glyph is\n"
-"rasterized at the above size.  This information\n"
-"is part of the device table for this anchor.\n"
-"Device tables are particularly important at small\n"
-"pixelsizes where rounding errors will have a\n"
-"proportionally greater effect."
-msgstr ""
-
-#: anchorsaway.c:1389
-msgid "The Y coordinate of the anchor point in this glyph"
-msgstr "符号中锚点的 Y 坐标"
-
-#: anchorsaway.c:1413
-msgid ""
-"This is the number of pixels by which the anchor\n"
-"should be moved vertically when the glyph is\n"
-"rasterized at the above size.  This information\n"
-"is part of the device table for this anchor.\n"
-"Device tables are particularly important at small\n"
-"pixelsizes where rounding errors will have a\n"
-"proportionally greater effect."
-msgstr ""
-
-#
-#: autotrace.c:533 autotrace.c:534 autotrace.c:737 autotrace.c:738
-msgid "Additional arguments for autotrace program:"
-msgstr "autotrace 附加参数:"
-
-#
-#: autotrace.c:550 autotrace.c:586 autotrace.c:761
-msgid "Can't find autotrace"
-msgstr "未找到autotrace"
-
-#
-#: autotrace.c:550 autotrace.c:586 autotrace.c:761
-msgid ""
-"Can't find autotrace program (set AUTOTRACE environment variable) or "
-"download from:\n"
-"  http://sf.net/projects/autotrace/"
-msgstr ""
-"未找到程序 autotrace (设置 AUTOTRACE 环境变量) 或从此处下载:\n"
-"  http://sf.net/projects/autotrace/"
-
-#
-#: autotrace.c:563 autotrace.c:809
-msgid "Autotracing..."
-msgstr "自动循迹…"
-
-#
-#: autotrace.c:583
-msgid "Nothing to trace"
-msgstr "无所循迹"
-
-#
-#: autotrace.c:758
-msgid "Can't find mf"
-msgstr "未找到mf (metafont)"
-
-#
-#: autotrace.c:758
-msgid ""
-"Can't find mf program -- metafont (set MF environment variable) or download "
-"from:\n"
-"  http://www.tug.org/\n"
-"  http://www.ctan.org/\n"
-"It's part of the TeX distribution"
-msgstr ""
-"未找到程序 mf -- metafont (设置 MF 环境变量) 或从此处下载:\n"
-"  http://www.tug.org/\n"
-"  http://www.ctan.org/\n"
-"它是 TeX 的一部分"
-
-#
-#: autotrace.c:772
-msgid "Can't create temporary directory"
-msgstr "不能生成临时目录"
-
-#
-#: autotrace.c:804 autotrace.c:824 autotrace.c:827 autotrace.c:829
-msgid "Can't run mf"
-msgstr "不能运行mf"
-
-#
-#: autotrace.c:804 autotrace.c:824
-msgid "Could not read (or perhaps find) mf output file"
-msgstr "未能读（或未找到）mf输出文件"
-
-#
-#: autotrace.c:827
-msgid "MetaFont exited with an error"
-msgstr "MetaFont错误退出"
-
-#: autowidth.c:232 autowidth.c:239
-#, c-format
-msgid "AutoWidth failure on %s\n"
-msgstr "自动宽度失败在 %s\n"
-
-#
-#: autowidth.c:1219 encoding.c:601 fvimportbdf.c:2047 palmfonts.c:394
-#: winfonts.c:938
-msgid "Couldn't open file"
-msgstr "未能打开文件"
-
-#
-#: autowidth.c:1219 encoding.c:601 fvimportbdf.c:2047 palmfonts.c:394
-#, c-format
-msgid "Couldn't open file %.200s"
-msgstr "未能打开文件%.200s"
-
-#
-#: autowidth.c:1242
-msgid "No Kern Pairs"
-msgstr "无压缩对"
-
-#
-#: autowidth.c:1242
-#, c-format
-msgid "No kerning pairs found in %.200s"
-msgstr "%.200s中未发现压缩对"
-
-#: autowidth2.c:495 autowidth2.c:567 autowidth2.c:642 autowidth2.c:759
-#: autowidth2.c:899
-msgid "Glyph too big"
-msgstr ""
-
-#: autowidth2.c:495 autowidth2.c:567 autowidth2.c:642 autowidth2.c:759
-#: autowidth2.c:899
-#, c-format
-msgid ""
-"%s has a bounding box which is too big for this algorithm to work. Ignored."
-msgstr ""
-
-#: autowidth2dlg.c:60 kernclass.c:232 kernclass.c:280 kernclass.c:1169
-#: lookupui.c:2897 lookupui.c:3502 lookupui.c:3690 lookupui.c:5120
-msgid "Separation"
-msgstr ""
-
-#: autowidth2dlg.c:61
-msgid "Min Bearing"
-msgstr ""
-
-#: autowidth2dlg.c:62
-msgid "Max Bearing"
-msgstr ""
-
-#
-#: autowidth2dlg.c:63 charinfo.c:1437 cvpointer.c:1360 cvstroke.c:1978
-#: cvstroke.c:2094 math.c:134 tilepath.c:1547 tilepath.c:1588 tilepath.c:1625
-msgid "Height"
-msgstr "高度"
-
-#: autowidth2dlg.c:64
-msgid "Loop Count"
-msgstr ""
-
-#
-#: autowidth2dlg.c:136
-msgid "Auto Width"
-msgstr "自动宽度"
-
-#: autowidth2dlg.c:149
-msgid ""
-"FontForge will attempt to adjust the left and right\n"
-"sidebearings of the selected glyphs so that the average\n"
-"separation between glyphs in a script will be the\n"
-"specified amount. You may also specify a minimum and\n"
-"maximum value for each glyph's sidebearings."
-msgstr ""
-
-#: autowidth2dlg.c:161
-msgid "_Separation:"
-msgstr ""
-
-#: autowidth2dlg.c:188
-msgid "_Min:"
-msgstr ""
-
-#: autowidth2dlg.c:213
-msgid "Ma_x:"
-msgstr ""
-
-#
-#: autowidth2dlg.c:237 cvpointer.c:1527
-msgid "_Height:"
-msgstr "高度(_H)："
-
-#: autowidth2dlg.c:256
-msgid "_Loops:"
-msgstr ""
-
-#
-#: basedlg.c:71 fontinfo.c:1226 fontinfo.c:1231 fontinfo.c:1236
-#: justifydlg.c:51 showatt.c:1132 showatt.c:1279
-msgid "Language"
-msgstr "语言"
-
-#: basedlg.c:72 basedlg.c:78 basedlg.c:154 charinfo.c:4977 cvgetinfo.c:510
-msgid "Min"
-msgstr "最小"
-
-#: basedlg.c:73 basedlg.c:79 basedlg.c:155 charinfo.c:4994 cvgetinfo.c:517
-msgid "Max"
-msgstr "最大"
-
-#
-#: basedlg.c:77 lookupui.c:691 macencui.c:1109
-msgid "Feature"
-msgstr "特征"
-
-#: basedlg.c:154
-msgid "Min (descent)"
-msgstr "最小值（下降）"
-
-#: basedlg.c:155
-msgid "Max (ascent)"
-msgstr "最大值（上升）"
-
-#: basedlg.c:300
-#, c-format
-msgid "Vertical Extents for %c%c%c%c"
-msgstr ""
-
-#: basedlg.c:300
-#, c-format
-msgid "Horizontal Extents for %c%c%c%c"
-msgstr ""
-
-#: basedlg.c:318
-msgid ""
-"Set the minimum and maximum values by which\n"
-"the glyphs in this script extend below and\n"
-"above the baseline. This may vary by language"
-msgstr ""
-
-#: basedlg.c:323
-msgid ""
-"Set the minimum and maximum values by which\n"
-"the glyphs in this script extend below and\n"
-"above the baseline when modified by a feature."
-msgstr ""
-
-#: basedlg.c:375
-msgid "Set Feature Extents"
-msgstr "设置功能扩展"
-
-#
-#. GT: English uses "script" to mean a general writing system (latin, greek, kanji)
-#. GT: and the cursive handwriting style. Here we mean the general writing system.
-#. GT: See the long comment at "Property|New"
-#. GT: The msgstr should contain a translation of "Script", ignore "writing system|"
-#. GT: English uses "script" to mean a general writing style (latin, greek, kanji)
-#. GT: and the cursive handwriting style. Here we mean the general writing system.
-#. GT: See the long comment at "Property|New"
-#. GT: The msgstr should contain a translation of "Script", ignore "writing system|"
-#. GT: English uses "script" to me a general writing style (latin, greek, kanji)
-#. GT: and the cursive handwriting style. Here we mean the general writing system.
-#: basedlg.c:412 justifydlg.c:62 lookupui.c:686 showatt.c:1868 showatt.c:1906
-msgid "writing system|Script"
-msgstr "文字"
-
-#: basedlg.c:413
-msgid "Default Baseline"
-msgstr "默认底线"
-
-#: basedlg.c:616
-msgid "Bad default baseline"
-msgstr "糟糕的默认基线"
-
-#: basedlg.c:616
-#, c-format
-msgid ""
-"Script '%c%c%c%c' claims baseline '%c%c%c%c' as its default, but that "
-"baseline is not currently active."
-msgstr ""
-
-#: basedlg.c:722
-msgid "Vertical Baselines"
-msgstr "垂直基准"
-
-#: basedlg.c:722
-msgid "Horizontal Baselines"
-msgstr "水平基准"
-
-#: basedlg.c:740
-msgid ""
-"From the list below, select the baselines for which you\n"
-"will provide data."
-msgstr ""
-
-#: basedlg.c:748
-msgid "hang"
-msgstr ""
-
-#: basedlg.c:753
-msgid "Indic (& Tibetan) hanging baseline"
-msgstr ""
-
-#: basedlg.c:759
-msgid "icfb"
-msgstr "icfb"
-
-#: basedlg.c:764
-msgid "Ideographic character face bottom edge baseline"
-msgstr ""
-
-#: basedlg.c:770
-msgid "icft"
-msgstr "icft"
-
-#: basedlg.c:775
-msgid "Ideographic character face top edge baseline"
-msgstr ""
-
-#: basedlg.c:781
-msgid "ideo"
-msgstr ""
-
-#: basedlg.c:786
-msgid "Ideographic em-box bottom edge baseline"
-msgstr ""
-
-#: basedlg.c:792
-msgid "idtp"
-msgstr "idtp"
-
-#: basedlg.c:797
-msgid "Ideographic em-box top edge baseline"
-msgstr ""
-
-#: basedlg.c:803
-msgid "math"
-msgstr "数学"
-
-#: basedlg.c:808
-msgid "Mathematical centerline"
-msgstr "数学中心线"
-
-#: basedlg.c:814
-msgid "romn"
-msgstr "romn"
-
-#: basedlg.c:819
-msgid "Baseline used for Latin, Greek, Cyrillic text."
-msgstr "基线适用于拉丁文字，希腊文，斯拉夫语文字。"
-
-#: basedlg.c:832
-msgid ""
-"If any of the above baselines are active then you should\n"
-"specify which one is the default baseline for each script\n"
-"in the font, and specify how to position glyphs in this\n"
-"script relative to all active baselines"
-msgstr ""
-
-#: basedlg.c:885
-msgid "Set Extents"
-msgstr "设定拓展"
-
-#
-#: bdfinfo.c:170
-msgid "Not ASCII"
-msgstr "非ASCII码"
-
-#
-#: bdfinfo.c:170
-msgid "All characters in the value must be in ASCII"
-msgstr "取值字符均应为ASCII码"
-
-#
-#: bdfinfo.c:177 bitmapview.c:1939 cvstroke.c:2519 deltaui.c:67 deltaui.c:98
-#: deltaui.c:101 deltaui.c:104 fontview.c:1141 fontview.c:1995 fontview.c:3218
-#: fontview.c:3733 fontview.c:4666 fvimportbdf.c:1875 kernclass.c:368
-#: macencui.c:724 macencui.c:1024 prefs.c:1375 prefs.c:1381 scstylesui.c:2291
-#: ttfinstrsui.c:1040 ttfinstrsui.c:1083 ../gdraw/gresedit.c:752
-#: ../gdraw/gresedit.c:783 ../gdraw/gresedit.c:795 ../gdraw/gresedit.c:875
-#: ../gdraw/gresedit.c:901 ../gdraw/gresedit.c:915
-msgid "Bad Number"
-msgstr "不合适的数"
-
-#
-#: bdfinfo.c:177
-msgid "Must be a number"
-msgstr "必须是数"
-
-#
-#. GT: I am told that the use of "|" to provide contextual information in a
-#. GT: gettext string is non-standard. However it is documented in section
-#. GT: 10.2.6 of http://www.gnu.org/software/gettext/manual/html_mono/gettext.html
-#. GT:
-#. GT: Anyway here the word "Property" is used to provide context for "New..." and
-#. GT: the translator should only translate "New...". This is necessary because in
-#. GT: French (or any language where adjectives agree in gender/number with their
-#. GT: nouns) there are several different forms of "New" and the one chose depends
-#. GT: on the noun in question.
-#. GT: A french translation might be either msgstr "Nouveau..." or msgstr "Nouvelle..."
-#. GT:
-#. GT: I expect there are more cases where one english word needs to be translated
-#. GT: by several different words in different languages (in Japanese a different
-#. GT: word is used for the latin script and the latin language) and that you, as
-#. GT: a translator may need to ask me to disambiguate more strings. Please do so:
-#. GT:      <pfaedit@users.sourceforge.net>
-#: bdfinfo.c:536
-msgid "Property|New..."
-msgstr "新建…"
-
-#
-#: bdfinfo.c:587 statemachine.c:213
-msgid "No Change"
-msgstr "未改变"
-
-#
-#: bdfinfo.c:760
-#, c-format
-msgid "Strike Information for %.90s"
-msgstr "Strike 信息： %.90s"
-
-#
-#: bdfinfo.c:809 cvstroke.c:2785 cvstroke.c:2833 cvstroke.c:2981
-#: cvstroke.c:3029 fontinfo.c:3044 ../gdraw/gmatrixedit.c:2053
-msgid "Delete"
-msgstr "删除"
-
-#
-#: bdfinfo.c:818
-msgid "Default All"
-msgstr "默认全部"
-
-#
-#: bdfinfo.c:827
-msgid "Default This"
-msgstr "默认此"
-
-#
-#: bitmapcontrol.c:148
-msgid "Scaling Bitmaps"
-msgstr "缩放位图"
-
-#
-#: bitmapcontrol.c:222 savefont.c:341 savefont.c:348 winfonts.c:858
-msgid "Missing Bitmap"
-msgstr "缺位图"
-
-#
-#: bitmapcontrol.c:222
-#, c-format
-msgid "Attempt to regenerate a pixel size that has not been created (%d@%d)"
-msgstr "试图再生尚未创建的像素尺寸 (%d@%d)"
-
-#
-#: bitmapdlg.c:43
-msgid "All Glyphs"
-msgstr "所有字形"
-
-#
-#: bitmapdlg.c:44
-msgid "Selected Glyphs"
-msgstr "选中的字形"
-
-#
-#: bitmapdlg.c:45
-msgid "Current Glyph"
-msgstr "当前字形"
-
-#
-#: bitmapdlg.c:101 bitmapdlg.c:467
-msgid "Pixel Sizes:"
-msgstr "像素大小："
-
-#
-#: bitmapdlg.c:219 bitmapdlg.c:413
-msgid "Point sizes on a 75 dpi screen"
-msgstr "75dpi屏幕上点的大小"
-
-#
-#: bitmapdlg.c:220
-msgid "Point sizes on a 96 dpi screen"
-msgstr "96dpi屏幕上点的大小"
-
-#
-#: bitmapdlg.c:221
-msgid "Point sizes on a 72 dpi screen"
-msgstr "72dpi屏幕上点的大小"
-
-#
-#: bitmapdlg.c:223
-msgid "Point sizes on a 120 dpi screen"
-msgstr "120dpi屏幕上点的大小"
-
-#
-#: bitmapdlg.c:224 bitmapdlg.c:439
-msgid "Point sizes on a 100 dpi screen"
-msgstr "100dpi屏幕上点的大小"
-
-#
-#: bitmapdlg.c:301
-msgid "Bitmap Strikes Available"
-msgstr "可用位图部件"
-
-#
-#: bitmapdlg.c:302
-msgid "Regenerate Bitmap Glyphs"
-msgstr "再生位图字形"
-
-#
-#: bitmapdlg.c:303
-msgid "Remove Bitmap Glyphs"
-msgstr "移除位图字形"
-
-#
-#: bitmapdlg.c:316
-msgid "The list of current pixel bitmap sizes"
-msgstr "当前位图尺寸列表"
-
-#
-#: bitmapdlg.c:324
-msgid " Removing a size will delete it."
-msgstr " 移除尺寸即为删除该尺寸。"
-
-#
-#: bitmapdlg.c:333
-msgid " Adding a size will create it by scaling."
-msgstr " 增加尺寸即为按比例创建之。"
-
-#
-#: bitmapdlg.c:335
-msgid " Adding a size will create it."
-msgstr " 增加尺寸即为创建之。"
-
-#
-#: bitmapdlg.c:345
-msgid "Specify bitmap sizes to be regenerated"
-msgstr "指定位图尺寸以便再生"
-
-#
-#: bitmapdlg.c:347
-msgid "Specify bitmap sizes to be removed"
-msgstr "指定位图尺寸以便移除"
-
-#
-#. GT: X is a coordinate
-#: bitmapdlg.c:375 cvgetinfo.c:3381 cvpointer.c:1346
-msgid "X"
-msgstr "X"
-
-#
-#: bitmapdlg.c:385
-msgid "Win"
-msgstr "Win"
-
-#
-#: bitmapdlg.c:395 fontinfo.c:10484 prefs.c:2287
-msgid "Mac"
-msgstr "Mac"
-
-#
-#: bitmapdlg.c:492 kernclass.c:2365
-msgid "Use FreeType"
-msgstr "采用FreeType"
-
-#: bitmapdlg.c:509
-msgid "Create Rasterized Strikes (Not empty ones)"
-msgstr ""
-
-#
-#. GT: This is the title for a window showing a bitmap character
-#. GT: It will look something like:
-#. GT:  exclam at 33 size 12 from Arial
-#. GT: $1 is the name of the glyph
-#. GT: $2 is the glyph's encoding
-#. GT: $3 is the pixel size of the bitmap font
-#. GT: $4 is the font name
-#: bitmapview.c:175
-#, c-format
-msgid "%1$.80s at %2$d size %3$d from %4$.80s"
-msgstr "%1$.80s , %2$d ,大小 %3$d ; %4$.80s"
-
-#
-#: bitmapview.c:1759 fvmetricsdlg.c:127
-msgid "Set Width..."
-msgstr "设置宽度…"
-
-#
-#: bitmapview.c:1762
-msgid "Set Vertical Width..."
-msgstr "设置垂直宽度…"
-
-#
-#: bitmapview.c:1933 cvstroke.c:2044
-msgid "Skew"
-msgstr "倾斜"
-
-#
-#: bitmapview.c:1933
-msgid "Skew Ratio"
-msgstr "斜率"
-
-#
-#: bitmapview.c:2072 charview.c:9306 fontview.c:5403 metricsview.c:3033
-msgid "New O_utline Window"
-msgstr "新字形窗口(_u)"
-
-#
-#: bitmapview.c:2073 charview.c:9307 fontview.c:5404 metricsview.c:3034
-msgid "New _Bitmap Window"
-msgstr "新位图窗口(_B)"
-
-#
-#: bitmapview.c:2074 charview.c:9308 fontview.c:5405 metricsview.c:3035
-msgid "New _Metrics Window"
-msgstr "新尺寸窗口(_M)"
-
-#
-#: bitmapview.c:2076 charview.c:9310 fontview.c:5407 metricsview.c:3037
-#: uiutil.c:781
-msgid "Warnings"
-msgstr "警告"
-
-#
-#: bitmapview.c:2097
-msgid "Flip Horizontally"
-msgstr "水平翻转"
-
-#
-#: bitmapview.c:2097
-msgid "Flip Vertically"
-msgstr "垂直翻转"
-
-#
-#. GT: "CW" means Clockwise
-#: bitmapview.c:2099
-msgid "Rotate 90° CW"
-msgstr "顺时针转九十度"
-
-#
-#. GT: "CW" means Counter-Clockwise
-#: bitmapview.c:2101
-msgid "Rotate 90° CCW"
-msgstr "逆时针转九十度"
-
-#
-#: bitmapview.c:2102
-msgid "Rotate 180°"
-msgstr "转一百八十度"
-
-#
-#: bitmapview.c:2103 transform.c:101
-msgid "Skew..."
-msgstr "倾斜…"
-
-#
-#: bitmapview.c:2105 bitmapview.c:2107 charview.c:9340 charview.c:9342
-#: fontview.c:4296 fontview.c:4303 metricsview.c:3070 metricsview.c:3072
-#: openfontdlg.c:700
-msgid "Font|_New"
-msgstr "新建(_N)"
-
-#
-#: bitmapview.c:2108 charview.c:9343 fontview.c:4307 metricsview.c:3073
-msgid "_Open"
-msgstr "打开(_O)"
-
-#
-#: bitmapview.c:2109 charview.c:9344 fontview.c:4309 metricsview.c:3074
-msgid "Recen_t"
-msgstr "最近的(_T)"
-
-#
-#: bitmapview.c:2110 charview.c:9345 fontview.c:4310 metricsview.c:3075
-msgid "_Close"
-msgstr "关闭(_C)"
-
-#
-#: bitmapview.c:2112 charview.c:9348 cvexportdlg.c:535 fontview.c:504
-#: fontview.c:4312 metricsview.c:3077 savefontdlg.c:1501 savefontdlg.c:2306
-#: ../gdraw/gsavefiledlg.c:240
-msgid "_Save"
-msgstr "保存(_S)"
-
-#
-#: bitmapview.c:2113 charview.c:9349 fontview.c:4313 metricsview.c:3078
-msgid "S_ave as..."
-msgstr "另存为(_A)…"
-
-#
-#: bitmapview.c:2114 charview.c:9350 fontview.c:4315 metricsview.c:3079
-msgid "_Generate Fonts..."
-msgstr "生成字体(_G)…"
-
-#
-#: bitmapview.c:2115 charview.c:9351 fontview.c:4316 metricsview.c:3080
-msgid "Generate Mac _Family..."
-msgstr "生成Mac族(_F)…"
-
-#: bitmapview.c:2116 charview.c:9352 fontview.c:4317 metricsview.c:3081
-msgid "Generate TTC..."
-msgstr ""
-
-#
-#: bitmapview.c:2117
-msgid "Expor_t..."
-msgstr "导出(_T)…"
-
-#
-#: bitmapview.c:2119 charview.c:9355 fontinfo.c:6856 fontview.c:4319
-#: sftextfield.c:972
-msgid "_Import..."
-msgstr "导入(_I)…"
-
-#
-#: bitmapview.c:2120 charview.c:9356 fontview.c:4321
-msgid "_Revert File"
-msgstr "恢复文件(_R)"
-
-#
-#: bitmapview.c:2122 charview.c:9365 fontview.c:4338 metricsview.c:3087
-msgid "Pr_eferences..."
-msgstr "选项(_E)…"
-
-#: bitmapview.c:2123 charview.c:9366 fontview.c:4339 metricsview.c:3088
-msgid "_X Resource Editor..."
-msgstr "_X 坐标编辑器..."
-
-#
-#: bitmapview.c:2125 charview.c:9368 fontview.c:4341 metricsview.c:3090
-msgid "_Quit"
-msgstr "退出(_Q)"
-
-#
-#: bitmapview.c:2130 charview.c:9397 fontview.c:4394 metricsview.c:3095
-#: sftextfield.c:965 ../gdraw/gtextfield.c:1294
-msgid "_Undo"
-msgstr "撤销(_U)"
-
-#
-#: bitmapview.c:2131 charview.c:9398 fontview.c:4395 metricsview.c:3096
-msgid "_Redo"
-msgstr "重做(_R)"
-
-#
-#: bitmapview.c:2133 charview.c:9400 fontview.c:4397 fontview.c:5447
-#: metricsview.c:3098 sftextfield.c:967 uiutil.c:651
-#: ../gdraw/gtextfield.c:1295
-msgid "Cu_t"
-msgstr "剪切(_T)"
-
-#
-#: bitmapview.c:2134 charview.c:9401 fontview.c:4398 fontview.c:5448
-#: metricsview.c:3099 sftextfield.c:968 uiutil.c:652
-#: ../gdraw/gtextfield.c:1296
-msgid "_Copy"
-msgstr "复制(_C)"
-
-#
-#: bitmapview.c:2135 charview.c:9402 fontview.c:4399 fontview.c:5449
-#: metricsview.c:3100
-msgid "C_opy Reference"
-msgstr "复制参照(_O)"
-
-#
-#: bitmapview.c:2136 charview.c:9407 fontview.c:4405 fontview.c:5451
-#: metricsview.c:3105 sftextfield.c:969 uiutil.c:653
-#: ../gdraw/gtextfield.c:1297
-msgid "_Paste"
-msgstr "粘贴(_P)"
-
-#
-#: bitmapview.c:2137 charview.c:9408 combinations.c:897 fontview.c:4411
-#: fontview.c:5452 metricsview.c:3106 uiutil.c:654
-msgid "C_lear"
-msgstr "清除(_L)"
-
-#
-#: bitmapview.c:2139 charview.c:9373 fontview.c:4369 metricsview.c:3109
-#: ../gdraw/gaskdlg.c:1476
-msgid "Select _All"
-msgstr "选择全部(_A)"
-
-#
-#: bitmapview.c:2141 charview.c:9421 fontview.c:4426
-msgid "Remo_ve Undoes"
-msgstr "清除修改历史"
-
-#
-#: bitmapview.c:2143 charview.c:9419 fontview.c:4422 fontview.c:5454
-#: metricsview.c:3112
-msgid "U_nlink Reference"
-msgstr "断开参照(_N)"
-
-#
-#: bitmapview.c:2148
-msgid "Flip _Horizontally"
-msgstr "水平翻转(_T)"
-
-#
-#: bitmapview.c:2149
-msgid "Flip _Vertically"
-msgstr "垂直翻转(_F)"
-
-#
-#: bitmapview.c:2150
-msgid "_Rotate 90° CW"
-msgstr "顺时针转九十度(_R)"
-
-#
-#: bitmapview.c:2151
-msgid "Rotate _90° CCW"
-msgstr "逆时针转九十度(_9)"
-
-#
-#: bitmapview.c:2152
-msgid "Rotate _180°"
-msgstr "转一百八十度(_1)"
-
-#
-#: bitmapview.c:2153
-msgid "_Skew..."
-msgstr "倾斜(_S)..."
-
-#
-#: bitmapview.c:2158 charview.c:9609 fontview.c:4529 metricsview.c:3167
-msgid "_Font Info..."
-msgstr "字体信息(_F)…"
-
-#
-#: bitmapview.c:2159 fontview.c:5456 metricsview.c:3168
-msgid "Glyph _Info..."
-msgstr "字形信息(_I)…"
-
-#
-#: bitmapview.c:2160
-msgid "BDF Info..."
-msgstr "BDF信息…"
-
-#
-#: bitmapview.c:2162 fontview.c:4534 metricsview.c:3172
-msgid "Bitm_ap Strikes Available..."
-msgstr "可用位图部件(_A)…"
-
-#
-#: bitmapview.c:2163 charview.c:9616 fontview.c:4535 metricsview.c:3173
-msgid "Regenerate _Bitmap Glyphs..."
-msgstr "再生位图字形(_B)…"
-
-#
-#: bitmapview.c:2164
-msgid "Remove This Glyph"
-msgstr "移除字形(_Y)"
-
-#
-#: bitmapview.c:2166 charview.c:9620 fontview.c:4539
-msgid "_Transformations"
-msgstr "变换(_T)"
-
-#
-#: bitmapview.c:2171 charview.c:9737 charview.c:10040 charview.c:10058
-#: fontview.c:5478
-msgid "_Tools"
-msgstr "工具(_T)"
-
-#
-#: bitmapview.c:2172 charview.c:9738 fontview.c:5028 metricsview.c:3318
-msgid "_Layers"
-msgstr "层(_L)"
-
-#
-#: bitmapview.c:2173
-msgid "_Shades"
-msgstr "渲染(_S)"
-
-#
-#: bitmapview.c:2175 charview.c:9740
-msgid "_Docked Palettes"
-msgstr "停靠的工具栏(_D)"
-
-#
-#: bitmapview.c:2180 charview.c:9865
-msgid "_Fit"
-msgstr "适合(_F)"
-
-#
-#: bitmapview.c:2181 charview.c:9866 metricsview.c:3306
-msgid "Z_oom out"
-msgstr "缩小(_O)"
-
-#
-#: bitmapview.c:2182 charview.c:9867 metricsview.c:3307
-msgid "Zoom _in"
-msgstr "放大(_I)"
-
-#
-#: bitmapview.c:2184 charview.c:9873 fontview.c:5022 metricsview.c:3312
-msgid "_Next Glyph"
-msgstr "下一字形(_N)"
-
-#
-#: bitmapview.c:2185 charview.c:9874 fontview.c:5023 metricsview.c:3313
-msgid "_Prev Glyph"
-msgstr "上一字形(_P)"
-
-#
-#: bitmapview.c:2186 charview.c:9875 fontview.c:5024 metricsview.c:3314
-msgid "Next _Defined Glyph"
-msgstr "下一定义的字形(_D)"
-
-#
-#: bitmapview.c:2187 charview.c:9876 fontview.c:5025 metricsview.c:3315
-msgid "Prev Defined Gl_yph"
-msgstr "上一定义的字形(_Y)"
-
-#
-#: bitmapview.c:2188 charview.c:9878 fontview.c:5026
-msgid "_Goto"
-msgstr "转到(_G)"
-
-#
-#: bitmapview.c:2189 charview.c:9879 metricsview.c:3316
-msgid "Find In Font _View"
-msgstr "在字体视窗中查找(_V)"
-
-#
-#: bitmapview.c:2191
-msgid "_Bigger Pixel Size"
-msgstr "增大像素大小(_B)"
-
-#
-#: bitmapview.c:2192
-msgid "_Smaller Pixel Size"
-msgstr "减小像素大小(_S)"
-
-#
-#: bitmapview.c:2194
-msgid "_Palettes"
-msgstr "工具栏(_P)"
-
-#
-#: bitmapview.c:2199 charview.c:9723 cvpalettes.c:3168 fontview.c:5217
-#: fontview.c:5468
-msgid "Set _Width..."
-msgstr "设置宽度(_W)…"
-
-#
-#: bitmapview.c:2200
-msgid "Set _Vertical Width..."
-msgstr "设置垂直宽度(_V)…"
-
-#
-#: bitmapview.c:2205 charview.c:10035 charview.c:10053 fontview.c:5474
-#: metricsview.c:3604
-msgid "_File"
-msgstr "文件(_F)"
-
-#
-#: bitmapview.c:2206 charview.c:10036 charview.c:10054 fontview.c:5475
-#: metricsview.c:3605 ttfinstrsui.c:783
-msgid "_Edit"
-msgstr "编辑(_E)"
-
-#
-#: bitmapview.c:2207 charview.c:10038 charview.c:10056 fontview.c:5476
-#: metricsview.c:3606
-msgid "E_lement"
-msgstr "基础(_L)"
-
-#
-#: bitmapview.c:2208 charview.c:9977 charview.c:10043 charview.c:10061
-#: fontview.c:5482 metricsview.c:3607
-msgid "_View"
-msgstr "查看(_V)"
-
-#
-#: bitmapview.c:2209 charview.c:10044 charview.c:10062 fontview.c:5483
-#: metricsview.c:3608
-msgid "_Metrics"
-msgstr "尺寸(_M)"
-
-#
-#: bitmapview.c:2210 charview.c:10047 charview.c:10063 fontview.c:5487
-#: metricsview.c:3609
-msgid "_Window"
-msgstr "窗口(_W)"
-
-#
-#: bitmapview.c:2211 charview.c:10048 charview.c:10064 fontview.c:5438
-#: fontview.c:5488 metricsview.c:3610
-msgid "_Help"
-msgstr "帮助(_H)"
-
-#
-#: bitmapview.c:2323
-msgid "Recalculate Bitmaps"
-msgstr "再算位图"
-
-#
-#: charinfo.c:147 fontinfo.c:9994
-msgid "Automatic"
-msgstr "自动"
-
-#
-#: charinfo.c:148
-msgid "No Class"
-msgstr "无类属"
-
-#
-#: charinfo.c:149 cvgetinfo.c:1456
-msgid "Base Glyph"
-msgstr "基本字形"
-
-#
-#: charinfo.c:150 cvgetinfo.c:1467
-msgid "Base Lig"
-msgstr "基础连字符"
-
-#
-#: charinfo.c:151 charview.c:1692 cvgetinfo.c:1445 showatt.c:1416
-msgid "Mark"
-msgstr "标记"
-
-#
-#: charinfo.c:152 showatt.c:1417
-msgid "Component"
-msgstr "组成"
-
-#: charinfo.c:159 fontview.c:4356 fontview.c:4496 groupsdlg.c:44
-msgid "Color|Choose..."
-msgstr "颜色| 选择..."
-
-#
-#: charinfo.c:160 fontview.c:4357 fontview.c:4497 groupsdlg.c:45
-msgid "Color|Default"
-msgstr "默认"
-
-#
-#: charinfo.c:172
-msgid "New Positioning"
-msgstr "新位置"
-
-#
-#: charinfo.c:172
-msgid "New Pair Position"
-msgstr "新对位置"
-
-#
-#: charinfo.c:173
-msgid "New Substitution Variant"
-msgstr "新替换变量"
-
-#
-#: charinfo.c:174
-msgid "New Alternate List"
-msgstr "新替代列表"
-
-#
-#: charinfo.c:174
-msgid "New Multiple List"
-msgstr "新多重替代列表"
-
-#
-#: charinfo.c:174
-msgid "New Ligature"
-msgstr "新连写"
-
-#
-#: charinfo.c:304
-msgid "New Counter Mask"
-msgstr "新计数蒙版"
-
-#
-#: charinfo.c:304
-msgid "Edit Counter Mask"
-msgstr "编辑计数蒙版"
-
-#
-#: charinfo.c:320
-msgid "Select hints between which counters are formed"
-msgstr "选择消隐"
-
-#
-#: charinfo.c:507 charinfo.c:4355
-msgid "Unicode _Value:"
-msgstr "统一码值(_V)："
-
-#
-#: charinfo.c:532 charinfo.c:934 charinfo.c:944 charinfo.c:1357
-#: charview.c:2808 contextchain.c:661 contextchain.c:983 cvgetinfo.c:979
-#: cvpalettes.c:1365 cvpointer.c:1159 cvundoes.c:2022 cvundoes.c:2243
-#: cvundoes.c:3559 fontviewbase.c:103 fontviewbase.c:1404 fvfontsdlg.c:60
-#: fvmetricsdlg.c:59 lookupui.c:3723 metricsview.c:2044 mmdlg.c:1976
-#: parsettfbmf.c:483 prefs.c:1390 problems.c:2734 savefont.c:754
-#: savefontdlg.c:1336 savefontdlg.c:1435 splinechar.c:1005 splinechar.c:1014
-#: splinefont.c:1238 tottf.c:1466 tottf.c:6209
-msgid "_Yes"
-msgstr "是(_Y)"
-
-#
-#: charinfo.c:532 charview.c:2809 charview.c:8304 contextchain.c:661
-#: contextchain.c:983 cvgetinfo.c:979 cvpalettes.c:1365 cvpointer.c:1160
-#: cvundoes.c:2025 cvundoes.c:2243 cvundoes.c:3562 fontviewbase.c:107
-#: fontviewbase.c:1405 fvfontsdlg.c:60 fvmetricsdlg.c:60 metricsview.c:2466
-#: mmdlg.c:1976 parsettfbmf.c:484 prefs.c:1391 problems.c:2735
-#: savefontdlg.c:1337 splinechar.c:1005 splinefont.c:1238 tottf.c:1469
-#: tottf.c:6209
-msgid "_No"
-msgstr "否(_N)"
-
-#
-#: charinfo.c:537 charinfo.c:540 charinfo.c:543 charinfo.c:558 charinfo.c:561
-#: fontinfo.c:2286
-msgid "Bad Name"
-msgstr "不良名称"
-
-#
-#: charinfo.c:537
-msgid "Glyph names are limitted to 31 characters"
-msgstr "字形名称最长31个字符"
-
-#
-#: charinfo.c:543
-msgid "A glyph name may not start with a digit nor a full stop (period)"
-msgstr "字形名称不能以数字或句号点开头"
-
-#
-#: charinfo.c:558
-#, c-format
-msgid ""
-"A glyph name must be ASCII, without spaces and may not contain the "
-"characters \"([{<>}])/%%\", and should contain only alphanumerics, periods "
-"and underscores"
-msgstr ""
-"字形名称应为ASCII编码,应无空格并\n"
-"不要包括如\"([{<>}])/%%\"这些字符。\n"
-"只能用字母、句点或下划线。"
-
-#
-#: charinfo.c:561
-msgid ""
-"A glyph name should contain only alphanumerics, periods and underscores\n"
-"Do you want to use this name in spite of that?"
-msgstr ""
-"字符名称只能用字母、句点或下划线。\n"
-"你想用其他字符么？"
-
-#
-#: charinfo.c:878
-msgid "Duplicate Ligature"
-msgstr "复制连写组合"
-
-#: charinfo.c:878
-#, c-format
-msgid ""
-"There are two ligature entries with the same components (%.80s) in the same "
-"lookup subtable (%.30s)"
-msgstr ""
-
-#
-#: charinfo.c:891
-msgid "Duplicate Kern data"
-msgstr "复制缩合信息"
-
-#: charinfo.c:891
-#, c-format
-msgid ""
-"There are two kerning entries for the same glyph (%.80s) in the same lookup "
-"subtable (%.30s)"
-msgstr ""
-
-#
-#: charinfo.c:909 charinfo.c:1485 lookupui.c:3769
-msgid "Bad Device Table Adjustment"
-msgstr "不良设备表调整"
-
-#: charinfo.c:909 lookupui.c:3769
-#, c-format
-msgid "A device table adjustment specified for %.80s is invalid"
-msgstr ""
-
-#
-#: charinfo.c:925 lookupui.c:3713
-msgid "Missing glyph name"
-msgstr "缺字形名称"
-
-#: charinfo.c:925
-#, c-format
-msgid "You must specify a glyph name for subtable %s"
-msgstr "你必须为子表%s指定一个符号名"
-
-#
-#: charinfo.c:937 cvundoes.c:2799 cvundoes.c:2938 kernclass.c:1875
-#: kernclass.c:1940 lookupui.c:3701 lookupui.c:3726
-msgid "Missing glyph"
-msgstr "缺字形"
-
-#: charinfo.c:937
-#, c-format
-msgid ""
-"In lookup subtable %.30s you refer to a glyph named %.80s, which is not in "
-"the font yet. Was this intentional?"
-msgstr ""
-
-#
-#: charinfo.c:947
-msgid "Substitution generates itself"
-msgstr "替代自身"
-
-#: charinfo.c:947
-#, c-format
-msgid ""
-"In lookup subtable %.30s you replace a glyph with itself. Was this "
-"intentional?"
-msgstr ""
-
-#
-#: charinfo.c:1136
-msgid "Unicode out of range"
-msgstr "统一码超出范围"
-
-#: charinfo.c:1136
-msgid "Bad unicode value for an alternate unicode / variation selector"
-msgstr ""
-
-#
-#: charinfo.c:1148
-msgid "Unexpected Variation Selector"
-msgstr "未预期的变差选择"
-
-#: charinfo.c:1149
-#, c-format
-msgid ""
-"Variation selectors are normally between\n"
-"   U+180B and U+180D\n"
-"   U+FE00 and U+FE0F\n"
-"   U+E0100 and U+E01EF\n"
-"did you really intend to use U+%04X?"
-msgstr ""
-
-#
-#: charinfo.c:1359 charinfo.c:1374 charinfo.c:1386 splinechar.c:1006
-#: splinechar.c:1015
-msgid "Multiple"
-msgstr "多重"
-
-#: charinfo.c:1359
-msgid ""
-"There is already a glyph with this name and encoding,\n"
-"both must be unique within a font,\n"
-"do you want to swap them?"
-msgstr ""
-
-#: charinfo.c:1374
-msgid ""
-"There is already a glyph with this encoding,\n"
-"which must be unique within a font,\n"
-"do you want to swap the encodings of the two?"
-msgstr ""
-
-#: charinfo.c:1386
-msgid ""
-"There is already a glyph with this name,\n"
-"which must be unique within a font,\n"
-"do you want to swap the names of the two?"
-msgstr ""
-
-#
-#: charinfo.c:1438
-msgid "Depth"
-msgstr "深度"
-
-#
-#: charinfo.c:1439 lookups.c:41 math.c:70 math.c:157
-msgid "Italic Correction"
-msgstr "斜体修正值"
-
-#: charinfo.c:1440
-msgid "Top Accent Horizontal Pos"
-msgstr "上重音符号水平位置"
-
-#
-#: charinfo.c:1443
-msgid "Horizontal Extension Italic Correction"
-msgstr "水平间距倾斜修正"
-
-#
-#: charinfo.c:1444
-msgid "Vertical Extension Italic Correction"
-msgstr "垂直间距倾斜修正"
-
-#: charinfo.c:1452
-msgid "Tile Margin"
-msgstr ""
-
-#: charinfo.c:1454
-msgid "Tile Min X"
-msgstr ""
-
-#: charinfo.c:1455
-msgid "Tile Min Y"
-msgstr ""
-
-#: charinfo.c:1456
-msgid "Tile Max X"
-msgstr ""
-
-#: charinfo.c:1457
-msgid "Tile Max Y"
-msgstr ""
-
-#
-#: charinfo.c:1466
-msgid "Ligature Caret Count"
-msgstr "连写位计数"
-
-#: charinfo.c:1470
-msgid "Bad Lig. Caret Count"
-msgstr "不良连写位计数"
-
-#: charinfo.c:1470
-msgid "Unreasonable ligature caret count"
-msgstr "不良连写位计数"
-
-#: charinfo.c:1485
-msgid "A device table adjustment specified for the MATH table is invalid"
-msgstr ""
-
-#
-#: charinfo.c:2180
-msgid "Only a single character allowed"
-msgstr "只许单一字符"
-
-#
-#: charinfo.c:2219
-msgid "Pixel Size"
-msgstr "像素大小"
-
-#
-#: charinfo.c:2220
-msgid "Correction"
-msgstr "修正值"
-
-#
-#: charinfo.c:2282
-msgid "Bad correction"
-msgstr "不良修正值"
-
-#: charinfo.c:2282
-#, c-format
-msgid ""
-"The correction on line %d is too big.  It must be between -128 and 127"
-msgstr ""
-
-#
-#: charinfo.c:2286
-msgid "Bad pixel size"
-msgstr "不良像素"
-
-#: charinfo.c:2286
-#, c-format
-msgid "The pixel size on line %d is out of bounds."
-msgstr ""
-
-#
-#: charinfo.c:2359
-msgid "Device Table Adjustments"
-msgstr "设备表调整"
-
-#: charinfo.c:2375
-msgid ""
-"At small pixel sizes (screen font sizes)\n"
-"the rounding errors that occur may be\n"
-"extremely ugly. A device table allows\n"
-"you to specify adjustments to the rounded\n"
-"Every pixel size my have its own adjustment."
-msgstr ""
-
-#
-#: charinfo.c:2421
-msgid "PixelSize|New"
-msgstr "新建"
-
-#
-#: charinfo.c:2447 charinfo.c:2452 charinfo.c:2457 charinfo.c:2462
-#: charinfo.c:2468 charinfo.c:2484 charinfo.c:2506 charinfo.c:2514
-msgid "Subtable"
-msgstr "替代表"
-
-#
-#: charinfo.c:2448 lookupui.c:2546
-msgid "Replacement Glyph Name"
-msgstr "替换字形名称"
-
-#
-#: charinfo.c:2453 lookupui.c:2551
-msgid "Source Glyph Names"
-msgstr "源字形名称"
-
-#
-#: charinfo.c:2458 charinfo.c:2463 lookupui.c:2556
-msgid "Replacement Glyph Names"
-msgstr "替换字形名称"
-
-#
-#: charinfo.c:2469 charinfo.c:2507 lookupui.c:2574 lookupui.c:2624
-msgid "∆x"
-msgstr "∆x"
-
-#
-#. GT: "Adjust" here means Device Table based pixel adjustments, an OpenType
-#. GT: concept which allows small corrections for small pixel sizes where
-#. GT: rounding errors (in kerning for example) may smush too glyphs together
-#. GT: or space them too far apart. Generally not a problem for big pixelsizes
-#: charinfo.c:2474 charinfo.c:2476 charinfo.c:2478 charinfo.c:2480
-#: charinfo.c:2487 charinfo.c:2489 charinfo.c:2491 charinfo.c:2493
-#: charinfo.c:2495 charinfo.c:2497 charinfo.c:2499 charinfo.c:2501
-#: lookupui.c:2579 lookupui.c:2581 lookupui.c:2583 lookupui.c:2585
-#: lookupui.c:2592 lookupui.c:2594 lookupui.c:2596 lookupui.c:2598
-#: lookupui.c:2600 lookupui.c:2602 lookupui.c:2604 lookupui.c:2606 math.c:72
-#: math.c:81 math.c:97
-msgid "Adjust"
-msgstr "调整"
-
-#
-#: charinfo.c:2475 charinfo.c:2508 lookupui.c:2580 lookupui.c:2625
-msgid "∆y"
-msgstr "∆y"
-
-#
-#: charinfo.c:2477 charinfo.c:2509 lookupui.c:2582 lookupui.c:2626
-msgid "∆x_adv"
-msgstr "∆x_adv"
-
-#
-#: charinfo.c:2479 charinfo.c:2510 lookupui.c:2584 lookupui.c:2627
-msgid "∆y_adv"
-msgstr "∆y_adv"
-
-#
-#: charinfo.c:2485 charinfo.c:2515 lookupui.c:2590 lookupui.c:2632
-msgid "Second Glyph Name"
-msgstr "次字形名称"
-
-#
-#: charinfo.c:2486 charinfo.c:2516 lookupui.c:2591 lookupui.c:2633
-msgid "∆x #1"
-msgstr "∆x #1"
-
-#
-#: charinfo.c:2488 charinfo.c:2517 lookupui.c:2593 lookupui.c:2634
-msgid "∆y #1"
-msgstr "∆y #1"
-
-#
-#: charinfo.c:2490 charinfo.c:2518 lookupui.c:2595 lookupui.c:2635
-msgid "∆x_adv #1"
-msgstr "∆x_adv #1"
-
-#
-#: charinfo.c:2492 charinfo.c:2519 lookupui.c:2597 lookupui.c:2636
-msgid "∆y_adv #1"
-msgstr "∆y_adv #1"
-
-#
-#: charinfo.c:2494 charinfo.c:2520 lookupui.c:2599 lookupui.c:2637
-msgid "∆x #2"
-msgstr "∆x #2"
-
-#
-#: charinfo.c:2496 charinfo.c:2521 lookupui.c:2601 lookupui.c:2638
-msgid "∆y #2"
-msgstr "∆y #2"
-
-#
-#: charinfo.c:2498 charinfo.c:2522 lookupui.c:2603 lookupui.c:2639
-msgid "∆x_adv #2"
-msgstr "∆x_adv #2"
-
-#
-#: charinfo.c:2500 charinfo.c:2523 lookupui.c:2605 lookupui.c:2640
-msgid "∆y_adv #2"
-msgstr "∆y_adv #2"
-
-#
-#: charinfo.c:3573 math.c:58
-msgid "false"
-msgstr "假"
-
-#
-#: charinfo.c:3574 math.c:59
-msgid "true"
-msgstr "真"
-
-#
-#: charinfo.c:3578 charview.c:3113 math.c:63 math.c:69 math.c:78 math.c:87
-#: math.c:93 math.c:104 math.c:122
-msgid "Glyph"
-msgstr "字形"
-
-#
-#: charinfo.c:3579 math.c:123
-msgid "Extender"
-msgstr "扩展"
-
-#
-#. GT: "Len" is an abreviation for "Length"
-#: charinfo.c:3581 math.c:125
-msgid "StartLen"
-msgstr "起始长度"
-
-#
-#: charinfo.c:3582 math.c:126
-msgid "EndLen"
-msgstr "终止长度"
-
-#
-#: charinfo.c:3583 math.c:127
-msgid "FullLen"
-msgstr "全长"
-
-#
-#: charinfo.c:3702 charinfo.c:5028 deltaui.c:404 groupsdlg.c:1260
-#: parsettf.c:4472
-msgid "Unicode"
-msgstr "统一码"
-
-#: charinfo.c:3703
-msgid "Variation Selector (or 0)"
-msgstr "变形选择(或 0)"
-
-#: charinfo.c:3900 cvstroke.c:2596 fontview.c:1963 fontview.c:2379
-#: groupsdlg.c:1006 ../gdraw/gbuttons.c:199
-msgid "Pick a color"
-msgstr "选取颜色"
-
-#
-#: charinfo.c:3935
-#, c-format
-msgid "Glyph Info for %.40s"
-msgstr "字形信息：%.40s"
-
-#
-#: charinfo.c:3936
-msgid "Glyph Info..."
-msgstr "字形信息…"
-
-#
-#: charinfo.c:4044
-msgid "No components"
-msgstr "无组成"
-
-#
-#: charinfo.c:4045 charinfo.c:4613
-msgid "Accented glyph composed of:"
-msgstr "重音字形合成自："
-
-#
-#: charinfo.c:4046
-msgid "Glyph composed of:"
-msgstr "字形合成自："
-
-#
-#: charinfo.c:4322
-msgid "Glyph Info"
-msgstr "字形信息"
-
-#: charinfo.c:4337
-msgid "Glyph _Name:"
-msgstr "字形名称(_N):"
-
-#
-#: charinfo.c:4373
-msgid "Unicode C_har:"
-msgstr "统一码字符(_C):"
-
-#
-#: charinfo.c:4393
-msgid "Set From N_ame"
-msgstr "按名称(_A)"
-
-#
-#: charinfo.c:4404
-msgid "Set From Val_ue"
-msgstr "按值(_U)"
-
-#: charinfo.c:4419
-msgid "Alternate Unicode Encodings / Variation Selectors"
-msgstr "替代统一码 /变形选择"
-
-#: charinfo.c:4423
-msgid ""
-"Some glyphs may be used for more than one\n"
-"unicode code point -- I don't recommend\n"
-"doing this, better to use a reference --\n"
-"but it is possible.\n"
-"The latin \"A\", the greek \"Alpha\" and the\n"
-"cyrillic \"A\" look very much the same.\n"
-"\n"
-"On the other hand certain Mongolian and CJK\n"
-"characters have multiple glyphs depending\n"
-"on a unicode Variation Selector.\n"
-"\n"
-"In the first case use a variation selector\n"
-"of 0, in the second use the appropriate\n"
-"codepoint."
-msgstr ""
-
-#
-#: charinfo.c:4447
-msgid "OT _Glyph Class:"
-msgstr "OT字形类(_G)"
-
-#: charinfo.c:4462
-msgid "Mark for Unlink, Remove Overlap Before Save"
-msgstr "标记未连接的，保存前移除重叠者"
-
-#: charinfo.c:4467
-msgid ""
-"A few glyphs, like Aring, Ccedilla, Eogonek\n"
-"are composed of two overlapping references.\n"
-"Often it is desireable to retain the references\n"
-"(so that changes made to the base glyph are\n"
-"reflected in the composed glyph), but that\n"
-"means you are stuck with overlapping contours.\n"
-"This flag means that just before saving the\n"
-"font, fontforge will unlink the references,\n"
-"and run remove overlap on them, then just\n"
-"after saving it will undo the operation\n"
-"thereby retaining the references."
-msgstr ""
-
-#
-#: charinfo.c:4482 charinfo.c:5033 fontinfo.c:10453 ttfinstrsui.c:1366
-msgid "Comment"
-msgstr "说明"
-
-#
-#: charinfo.c:4498 cvstroke.c:2677 cvstroke.c:2872
-msgid "Color:"
-msgstr "颜色"
-
-#
-#: charinfo.c:4537 lookupui.c:4267
-msgid "_Hide Unused Columns"
-msgstr "隐藏不用的列(_H)"
-
-#: charinfo.c:4543
-msgid ""
-"Don't display columns of 0s.\n"
-"The OpenType lookup allows for up to 8 kinds\n"
-"of data, but almost all kerning lookups will use just one.\n"
-"Omitting the others makes the behavior clearer."
-msgstr ""
-
-#
-#: charinfo.c:4565
-msgid "CounterHint|_New..."
-msgstr "新建(_N)…"
-
-#
-#: charinfo.c:4577 cvgetinfo.c:1564 encoding.c:1175 encoding.c:1610
-#: encodingui.c:162 groupsdlg.c:1202 kernclass.c:3162 macencui.c:663
-#: macencui.c:1181 macencui.c:1375 mmdlg.c:2971 prefs.c:1930
-msgid "_Delete"
-msgstr "删除"
-
-#
-#: charinfo.c:4589 kernclass.c:3174 macencui.c:674 macencui.c:1192
-#: macencui.c:1387 mmdlg.c:2982 prefs.c:1942
-msgid "_Edit..."
-msgstr "编辑(_E)…"
-
-#
-#: charinfo.c:4637 cvstroke.c:2233 metricsview.c:644 tilepath.c:1811
-msgid "Height:"
-msgstr "高:"
-
-#: charinfo.c:4642
-msgid ""
-"The height and depth fields are the metrics fields used\n"
-"by TeX, they are corrected for optical distortion.\n"
-"So 'x' and 'o' probably have the same height."
-msgstr ""
-
-#
-#: charinfo.c:4654 charinfo.c:4681 charinfo.c:4708 charinfo.c:4746
-msgid "Guess"
-msgstr "猜测"
-
-#
-#: charinfo.c:4664
-msgid "Depth:"
-msgstr "深:"
-
-#
-#: charinfo.c:4691
-msgid "Italic Correction:"
-msgstr "斜体修正值："
-
-#: charinfo.c:4697
-msgid ""
-"The Italic correction field is used by both TeX and the MS 'MATH'\n"
-"table. It is used when joining slanted text (italic) to upright.\n"
-"It is the amount of extra white space needed so the slanted text\n"
-"will not run into the upright text."
-msgstr ""
-
-#: charinfo.c:4722
-msgid ""
-"A device table for italic correction.\n"
-"Expects a comma separated list of <pixelsize>\":\"<adjustment>\n"
-"As \"9:-1,12:1,13:1\""
-msgstr ""
-
-#
-#: charinfo.c:4728
-msgid "Top Accent Pos:"
-msgstr "上升部位置:"
-
-#: charinfo.c:4735
-msgid ""
-"In the MS 'MATH' table this value specifies where (horizontally)\n"
-"an accent should be placed above the glyph. Vertical placement\n"
-"is handled by other means"
-msgstr ""
-
-#: charinfo.c:4760
-msgid ""
-"A device table for horizontal accent positioning.\n"
-"Expects a comma separated list of <pixelsize>\":\"<adjustment>\n"
-"As \"9:-1,12:1,13:1\""
-msgstr ""
-
-#: charinfo.c:4766 math.c:64
-msgid "Is Extended Shape"
-msgstr "扩展形"
-
-#: charinfo.c:4773
-msgid ""
-"Is this an extended shape (like a tall parenthesis)?\n"
-"Extended shapes need special attention for vertical\n"
-"superscript placement."
-msgstr ""
-
-#
-#: charinfo.c:4777 math.c:1925
-msgid "Math Kerning"
-msgstr "数学压缩"
-
-#: charinfo.c:4783
-msgid ""
-"Brings up a dialog which gives fine control over\n"
-"horizontal positioning of subscripts and superscripts\n"
-"depending on their vertical positioning."
-msgstr ""
-
-#: charinfo.c:4804
-msgid "Default Ligature Caret Count"
-msgstr ""
-
-#: charinfo.c:4810 charinfo.c:4822 charinfo.c:4829
-msgid ""
-"Ligature caret locations are used by a text editor\n"
-"when it needs to draw a text edit caret inside a\n"
-"ligature. This means there should be a caret between\n"
-"each ligature component so if there are n components\n"
-"there should be n-1 caret locations.\n"
-"  You may adjust the caret locations themselves in the\n"
-"outline glyph view (drag them from to origin to the\n"
-"appropriate place)."
-msgstr ""
-
-#: charinfo.c:4816
-msgid "Ligature Caret Count:"
-msgstr "连写位计数："
-
-#
-#: charinfo.c:4845
-msgid "Variant Glyphs:"
-msgstr "变化字形："
-
-#: charinfo.c:4851
-msgid ""
-"A list of the names of pre defined glyphs which represent\n"
-"bigger versions of the current glyph."
-msgstr ""
-
-#: charinfo.c:4860
-msgid "Glyph Extension Components"
-msgstr "字形扩展部件"
-
-#: charinfo.c:4865
-msgid ""
-"A really big version of this glyph may be made up of the\n"
-"following component glyphs. They will be stacked either\n"
-"horizontally or vertically. Glyphs marked as Extenders may\n"
-"be removed or repeated (to make shorter or longer versions).\n"
-"The StartLength is the length of the flat section at the\n"
-"start of the glyph which may be overlapped with the previous\n"
-"glyph, while the EndLength is the similar region at the end\n"
-"of the glyph. The FullLength is the full length of the glyph."
-msgstr ""
-
-#
-#. GT: "Cor" is an abbreviation for correction
-#: charinfo.c:4870
-msgid "Italic Cor:"
-msgstr "斜体修正："
-
-#: charinfo.c:4875
-msgid ""
-"The italic correction of the composed glyph. Should be independent of glyph "
-"size"
-msgstr ""
-
-#: charinfo.c:4918
-msgid ""
-"If this glyph is used as a pattern to tile\n"
-"some other glyph then it is useful to specify\n"
-"the amount of whitespace surrounding the tile.\n"
-"Either specify a margin to extend the bounding\n"
-"box of the contents, or specify the bounds\n"
-"explicitly."
-msgstr ""
-
-#: charinfo.c:4931
-msgid "Tile Margin:"
-msgstr ""
-
-#: charinfo.c:4952
-msgid "Tile Bounding Box:"
-msgstr ""
-
-#
-#. GT: X is a coordinate, the leading spaces help to align it
-#: charinfo.c:4963 fontinfo.c:8732
-msgid "  X"
-msgstr "  X"
-
-#: charinfo.c:4970
-msgid "  Y"
-msgstr ""
-
-#
-#: charinfo.c:5038 fontinfo.c:8890
-msgid "Pos"
-msgstr "位置"
-
-#
-#: charinfo.c:5040
-msgid "Positionings"
-msgstr "定位"
-
-#
-#: charinfo.c:5046
-msgid "Pair"
-msgstr "对"
-
-#
-#: charinfo.c:5048
-msgid "Pairwise Pos"
-msgstr "配对位置"
-
-#
-#: charinfo.c:5054
-msgid "Subs"
-msgstr "替代"
-
-#
-#: charinfo.c:5056
-msgid "Substitutions"
-msgstr "替代"
-
-#
-#: charinfo.c:5061
-msgid "Alt Subs"
-msgstr "交换替代"
-
-#
-#: charinfo.c:5065
-msgid "Mult Subs"
-msgstr "多重替代"
-
-#
-#: charinfo.c:5070 showatt.c:1415
-msgid "Ligature"
-msgstr "连体"
-
-#
-#: charinfo.c:5072 combinations.c:116 showatt.c:655
-msgid "Ligatures"
-msgstr "连体"
-
-#
-#: charinfo.c:5077
-msgid "Components"
-msgstr "组成"
-
-#
-#: charinfo.c:5083
-msgid "Lig. Carets"
-msgstr "连写位"
-
-#
-#: charinfo.c:5088 scstylesui.c:2674
-msgid "Counters"
-msgstr "计数"
-
-#
-#: charinfo.c:5092
-msgid "ΤεΧ & Math"
-msgstr "ΤεΧ 及数学符号"
-
-#
-#. GT: "Vert." is an abbreviation for Vertical
-#: charinfo.c:5098 math.c:160
-msgid "Vert. Variants"
-msgstr "垂直变形"
-
-#
-#. GT: "Horiz." is an abbreviation for Horizontal
-#: charinfo.c:5104
-msgid "Horiz. Variants"
-msgstr "水平变形"
-
-#: charinfo.c:5111
-msgid "Tile Size"
-msgstr ""
-
-#
-#: charinfo.c:5134 contextchain.c:2124 cvgetinfo.c:1582 cvgetinfo.c:3154
-#: cvgetinfo.c:3570 cvhints.c:534 mmdlg.c:2552
-msgid "< _Prev"
-msgstr "<前(_P)"
-
-#
-#: charinfo.c:5146 contextchain.c:2134 cvgetinfo.c:1595 cvgetinfo.c:3166
-#: cvgetinfo.c:3581 cvhints.c:545 mmdlg.c:2563
-msgid "_Next >"
-msgstr "后(_N)>"
-
-#
-#: charinfo.c:5289
-msgid "Select By ATT..."
-msgstr "按ATT选择…"
-
-#
-#: charinfo.c:5289
-msgid "No glyphs matched"
-msgstr "无匹配字形"
-
-#
-#: charinfo.c:5366 cvundoes.c:2866
-msgid "No Lookups"
-msgstr "无查找"
-
-#
-#: charinfo.c:5366
-msgid "No applicable lookup subtables"
-msgstr "无可用查找子表"
-
-#
-#: charinfo.c:5383
-msgid "Select By Lookup Subtable"
-msgstr "按子表搜索选择"
-
-#
-#: charinfo.c:5395
-msgid "Select Glyphs in lookup subtable"
-msgstr "在查找替代表中选择字形"
-
-#
-#: charinfo.c:5411 fontview.c:1809 fontview.c:2071
-msgid "Select Results"
-msgstr "选择结果"
-
-#
-#: charinfo.c:5416
-msgid ""
-"Set the selection of the font view to the glyphs\n"
-"found by this search"
-msgstr ""
-"在字体视图中定位到\n"
-"搜到的字形"
-
-#
-#: charinfo.c:5421 fontview.c:1817 fontview.c:2079
-msgid "Merge Results"
-msgstr "混成结果"
-
-#
-#: charinfo.c:5426
-msgid ""
-"Expand the selection of the font view to include\n"
-"all the glyphs found by this search"
-msgstr ""
-"扩展字体视图中的选择以包含\n"
-"此次搜索到的所有字形"
-
-#
-#: charinfo.c:5431 fontview.c:1825 fontview.c:2087
-msgid "Restrict Selection"
-msgstr "限制选择"
-
-#
-#: charinfo.c:5436
-msgid ""
-"Only search the selected glyphs, and unselect\n"
-"any characters which do not match this search"
-msgstr ""
-"仅搜索选中的字形，不选择\n"
-"与搜索不符的字符"
-
-#: charview.c:162
-msgid "Point Color"
-msgstr ""
-
-#: charview.c:162
-msgid "The color of an on-curve point"
-msgstr ""
-
-#: charview.c:163
-msgid "First Point Color"
-msgstr ""
-
-#: charview.c:163
-msgid "The color of the point which is the start of a contour"
-msgstr ""
-
-#: charview.c:164
-msgid "Selected Point Color"
-msgstr ""
-
-#: charview.c:164
-msgid "The color of a selected point"
-msgstr ""
-
-#: charview.c:165
-msgid "Selected Point Width"
-msgstr ""
-
-#: charview.c:165
-msgid "The width of the line used to draw selected points"
-msgstr ""
-
-#: charview.c:166
-msgid "Extrema Point Color"
-msgstr ""
-
-#: charview.c:166
-msgid "The color used to draw points at extrema (if that mode is active)"
-msgstr ""
-
-#: charview.c:167
-msgid "Point of Inflection Color"
-msgstr ""
-
-#: charview.c:167
-msgid "The color used to draw points of inflection (if that mode is active)"
-msgstr ""
-
-#: charview.c:168
-msgid "Almost H/V Color"
-msgstr ""
-
-#: charview.c:168
-msgid ""
-"The color used to draw markers for splines which are almost, but not quite "
-"horizontal or vertical at their end-points"
-msgstr ""
-
-#: charview.c:169
-msgid "Next CP Color"
-msgstr ""
-
-#: charview.c:169
-msgid ""
-"The color used to draw the \"next\" control point of an on-curve point"
-msgstr ""
-
-#: charview.c:170
-msgid "Prev CP Color"
-msgstr ""
-
-#: charview.c:170
-msgid ""
-"The color used to draw the \"previous\" control point of an on-curve point"
-msgstr ""
-
-#: charview.c:171
-msgid "Selected CP Color"
-msgstr ""
-
-#: charview.c:171
-msgid "The color used to draw a selected control point of an on-curve point"
-msgstr ""
-
-#: charview.c:172
-msgid "Coordinate Line Color"
-msgstr ""
-
-#: charview.c:173
-msgid "Italic Coord. Color"
-msgstr ""
-
-#: charview.c:174
-msgid "Metrics Label Color"
-msgstr ""
-
-#: charview.c:175
-msgid "Hint Label Color"
-msgstr ""
-
-#: charview.c:176
-msgid "Blue Values Color"
-msgstr ""
-
-#: charview.c:176
-msgid ""
-"The color used to mark blue zones in the blue values entry of the private "
-"dictionary"
-msgstr ""
-
-#: charview.c:177
-msgid "Family Blue Color"
-msgstr ""
-
-#: charview.c:177
-msgid ""
-"The color used to mark blue zones in the family blues entry of the private "
-"dictionary"
-msgstr ""
-
-#: charview.c:178
-msgid "Diagonal Hint Color"
-msgstr ""
-
-#: charview.c:178
-msgid "The color used to draw diagonal hints"
-msgstr ""
-
-#: charview.c:179
-msgid "Horiz. Hint Color"
-msgstr ""
-
-#: charview.c:179
-msgid "The color used to draw horizontal hints"
-msgstr ""
-
-#: charview.c:180
-msgid "Vert. Hint Color"
-msgstr ""
-
-#: charview.c:180
-msgid "The color used to draw vertical hints"
-msgstr ""
-
-#: charview.c:181
-msgid "HFlex Hint Color"
-msgstr ""
-
-#: charview.c:182
-msgid "VFlex Hint Color"
-msgstr ""
-
-#: charview.c:183
-msgid "Conflict Hint Color"
-msgstr ""
-
-#: charview.c:183
-msgid "The color used to draw a hint which conflicts with another"
-msgstr ""
-
-#: charview.c:184
-msgid "HHint Active Color"
-msgstr ""
-
-#: charview.c:184
-msgid ""
-"The color used to draw the active horizontal hint which the Review Hints "
-"dialog is examining"
-msgstr ""
-
-#: charview.c:185
-msgid "VHint Active Color"
-msgstr ""
-
-#: charview.c:185
-msgid ""
-"The color used to draw the active vertical hint which the Review Hints "
-"dialog is examining"
-msgstr ""
-
-#: charview.c:190
-msgid "Width Color"
-msgstr ""
-
-#: charview.c:190
-msgid "The color of the line marking the advance width"
-msgstr ""
-
-#: charview.c:191
-msgid "Selected Width Color"
-msgstr ""
-
-#: charview.c:191
-msgid "The color of the line marking the advance width when it is selected"
-msgstr ""
-
-#: charview.c:192
-msgid "Grid Fit Width Color"
-msgstr ""
-
-#: charview.c:192
-msgid "The color of the line marking the grid-fit advance width"
-msgstr ""
-
-#: charview.c:193
-msgid "Ligature Caret Color"
-msgstr ""
-
-#: charview.c:193
-msgid "The color of the line(s) marking ligature carets"
-msgstr ""
-
-#: charview.c:194
-msgid "Anchor Color"
-msgstr ""
-
-#: charview.c:194
-msgid "The color of anchor stars"
-msgstr ""
-
-#: charview.c:195
-msgid "Anchored Line Color"
-msgstr ""
-
-#: charview.c:195
-msgid ""
-"The color of another glyph drawn in the current view to show where it would "
-"be placed by an anchor lookup"
-msgstr ""
-
-#: charview.c:196
-msgid "Template Color"
-msgstr ""
-
-#: charview.c:197
-msgid "Old Outline Color"
-msgstr ""
-
-#: charview.c:198
-msgid "Original Color"
-msgstr ""
-
-#: charview.c:199
-msgid "Guide Layer Color"
-msgstr ""
-
-#: charview.c:200
-msgid "Grid Fit Color"
-msgstr ""
-
-#: charview.c:200
-msgid "The color of grid-fit outlines"
-msgstr ""
-
-#: charview.c:201
-msgid "Inactive Layer Color"
-msgstr ""
-
-#: charview.c:201
-msgid "The color of outlines in inactive layers"
-msgstr ""
-
-#: charview.c:202
-msgid "Active Layer Color"
-msgstr ""
-
-#: charview.c:202
-msgid "The color of outlines in the active layer"
-msgstr ""
-
-#: charview.c:203
-msgid "Clip Path Color"
-msgstr ""
-
-#: charview.c:203
-msgid "The color of the clip path"
-msgstr ""
-
-#: charview.c:204
-msgid "Background Image Color"
-msgstr ""
-
-#: charview.c:204
-msgid ""
-"The color used to draw bitmap (single bit) images which do not specify a clut"
-msgstr ""
-
-#: charview.c:205
-msgid "Fill Color"
-msgstr ""
-
-#: charview.c:205
-msgid "The color used to fill the outline if that mode is active"
-msgstr ""
-
-#: charview.c:206
-msgid "Trace Color"
-msgstr ""
-
-#: charview.c:207
-msgid "Raster Color"
-msgstr ""
-
-#: charview.c:207
-msgid "The color of grid-fit (and other) raster blocks"
-msgstr ""
-
-#: charview.c:208
-msgid "Raster New Color"
-msgstr ""
-
-#: charview.c:208
-msgid ""
-"The color of raster blocks which have just been turned on (in the debugger "
-"when an instruction moves a point)"
-msgstr ""
-
-#: charview.c:209
-msgid "Raster Old Color"
-msgstr ""
-
-#: charview.c:209
-msgid ""
-"The color of raster blocks which have just been turned off (in the debugger "
-"when an instruction moves a point)"
-msgstr ""
-
-#: charview.c:210
-msgid "Raster Grid Color"
-msgstr ""
-
-#: charview.c:211
-msgid "Raster Dark Color"
-msgstr ""
-
-#: charview.c:211
-msgid ""
-"When debugging in grey-scale this is the color of a raster block which is "
-"fully covered."
-msgstr ""
-
-#: charview.c:212
-msgid "Delta Grid Color"
-msgstr ""
-
-#: charview.c:212
-msgid "Indicates a notable grid pixel when suggesting deltas."
-msgstr ""
-
-#: charview.c:213
-msgid "Ruler Big Tick Color"
-msgstr ""
-
-#: charview.c:213
-msgid "The color used to draw the large tick marks in rulers."
-msgstr ""
-
-#
-#: charview.c:1692 showatt.c:1414
-msgid "Base"
-msgstr "基本"
-
-#
-#: charview.c:1698
-msgid "Entry"
-msgstr "入口"
-
-#
-#: charview.c:1698
-msgid "Exit"
-msgstr "退出"
-
-#. GT: Italic Correction
-#: charview.c:2359
-msgid "ItalicCor."
-msgstr ""
-
-#: charview.c:2367
-msgid "Lig.Caret"
-msgstr ""
-
-#: charview.c:2373
-msgid "TopAccent"
-msgstr ""
-
-#
-#. GT: This is the title for a window showing an outline character
-#. GT: It will look something like:
-#. GT:  exclam at 33 from Arial
-#. GT: $1 is the name of the glyph
-#. GT: $2 is the glyph's encoding
-#. GT: $3 is the font name
-#: charview.c:2742
-#, c-format
-msgid "%1$.80s at %2$d from %3$.90s"
-msgstr "%1$.80s , %2$d : %3$.90s"
-
-#: charview.c:2811 tottf.c:1472
-msgid "Bad Point Numbering"
-msgstr ""
-
-#: charview.c:2811 tottf.c:1472
-#, c-format
-msgid ""
-"The points in %s are not numbered properly. This means that any instructions "
-"will probably move the wrong points and do the wrong thing.\n"
-"Would you like me to remove the instructions?"
-msgstr ""
-
-#: charview.c:2907 charview.c:2909 charview.c:10242 charview.c:10244
-#: cvpalettes.c:1005 cvpalettes.c:1007
-msgid "You may not use spiros"
-msgstr ""
-
-#: charview.c:2907 charview.c:10242
-msgid ""
-"This glyph should display spiro points, but unfortunately this version of "
-"fontforge was not linked with the spiro library, so only normal bezier "
-"points will be displayed."
-msgstr ""
-
-#: charview.c:2909 charview.c:10244
-msgid ""
-"This glyph should display spiro points, but unfortunately FontForge was "
-"unable to load libspiro, spiros are not available for use, and normal bezier "
-"points will be displayed instead."
-msgstr ""
-
-#
-#. GT: Guide layer, make it short
-#: charview.c:3104 cvpalettes.c:1332
-msgid "Guide"
-msgstr "引导层"
-
-#
-#. GT: Background, make it short
-#: charview.c:3106 cvpalettes.c:1332 cvstroke.c:606 cvstroke.c:1539
-#: diffstubs.c:638 math.c:1880 searchview.c:618 splinefont.c:1951
-#: splineutil2.c:4069 tilepath.c:1021
-msgid "Back"
-msgstr "背景"
-
-#
-#. GT: Foreground, make it short
-#: charview.c:3108 cvstroke.c:608 cvstroke.c:1541 diffstubs.c:640 math.c:1882
-#: searchview.c:620 splineutil2.c:4071 tilepath.c:1023
-msgid "Fore"
-msgstr "前景"
-
-#
-#: charview.c:3112
-msgid "'fpgm'"
-msgstr "'fpgm'"
-
-#
-#: charview.c:3113
-msgid "'prep'"
-msgstr "'prep'"
-
-#: charview.c:4319
-msgid "Not Guides"
-msgstr ""
-
-#: charview.c:4319
-msgid "References may not be dragged into the guidelines layer"
-msgstr ""
-
-#
-#: charview.c:4833 charview.c:7849
-msgid "Name this contour"
-msgstr "命名此轮廓"
-
-#: charview.c:4834
-msgid "You may attach a text label to this guideline if you wish to"
-msgstr ""
-
-#
-#: charview.c:5311 fontviewbase.c:1758
-msgid "Old sfd file"
-msgstr "旧SFD文件"
-
-#: charview.c:5311 fontviewbase.c:1758
-msgid ""
-"This font comes from an old format sfd file. Not all aspects of it can be "
-"reverted successfully."
-msgstr ""
-
-#
-#: charview.c:5315 fontviewbase.c:1770
-msgid "Can't Find Glyph"
-msgstr "未找到字形"
-
-#
-#: charview.c:5315 fontviewbase.c:1770
-#, c-format
-msgid "The glyph, %.80s, can't be found in the sfd file"
-msgstr "字形%.80s未能在此sfd文件中找到"
-
-#: charview.c:5566
-msgid "Define \"Almost Horizontal\""
-msgstr ""
-
-#: charview.c:5567
-msgid ""
-"A line is \"almost\" horizontal (or vertical)\n"
-"if the coordinates are within this many em-units"
-msgstr ""
-
-#: charview.c:5573
-msgid "Bad number"
-msgstr ""
-
-#: charview.c:7204
-msgid "No Intersections"
-msgstr ""
-
-#
-#: charview.c:7850
-msgid "Please name this contour"
-msgstr "请为此轮廓命名"
-
-#
-#: charview.c:7901
-#, c-format
-msgid "The spline does not reach %g"
-msgstr "样条线不到 %g"
-
-#
-#: charview.c:8004
-msgid "Insert a point on the given spline at either..."
-msgstr "在样条线上插入一点"
-
-#
-#: charview.c:8014 cvgetinfo.c:1379 cvgetinfo.c:3462 cvgridfit.c:302
-#: cvpointer.c:1442
-msgid "_X:"
-msgstr "_X:"
-
-#
-#: charview.c:8025 cvgetinfo.c:1398 cvgetinfo.c:3479 cvpointer.c:1455
-msgid "_Y:"
-msgstr "_Y:"
-
-#
-#: charview.c:8224 cvgetinfo.c:1046
-msgid "Make a new anchor class"
-msgstr "生成新的锚类属"
-
-#
-#: charview.c:8224 cvgetinfo.c:1046
-msgid ""
-"I cannot find an unused anchor class\n"
-"to assign a new point to. If you\n"
-"wish a new anchor point you must\n"
-"define a new anchor class with\n"
-"Element->Font Info"
-msgstr ""
-"未找到未用的锚类属以分配新点。\n"
-"若需要新锚点，你可定义一新的\n"
-"锚类属。\n"
-"菜单操作：\n"
-"基础->字体信息"
-
-#
-#: charview.c:8303 metricsview.c:2043 metricsview.c:2465
-msgid "_Unlink"
-msgstr "断开链接(_U)"
-
-#
-#: charview.c:8307 fontviewbase.c:993 metricsview.c:2469
-msgid "Flipped Reference"
-msgstr "翻转参照"
-
-#: charview.c:8307 fontviewbase.c:993 metricsview.c:2469
-#, c-format
-msgid ""
-"%.50s contains a flipped reference. This cannot be corrected as is. Would "
-"you like me to unlink it and then correct it?"
-msgstr ""
-
-#: charview.c:8640 fontviewbase.c:1254 fontviewbase.c:1256
-msgid "Things could be better..."
-msgstr "情形应该会好些..."
-
-#: charview.c:8640
-#, c-format
-msgid ""
-"Glyph, %s, has no hints. FontForge will not produce many instructions."
-msgstr ""
-
-#
-#: charview.c:8919
-msgid "Deselect Width"
-msgstr "不选宽度"
-
-#
-#: charview.c:8919 cvpointer.c:1359 cvstroke.c:1950 cvstroke.c:2093
-#: displayfonts.c:620 displayfonts.c:1214 tilepath.c:1541 tilepath.c:1555
-#: tilepath.c:1587 tilepath.c:1624 ../gdraw/ggadgets.c:109
-msgid "Width"
-msgstr "宽度"
-
-#
-#: charview.c:8928
-msgid "Deselect VWidth"
-msgstr "不选垂直宽度"
-
-#
-#: charview.c:8928
-msgid "VWidth"
-msgstr "垂直宽度"
-
-#: charview.c:9346
-msgid "C_lose Tab"
-msgstr ""
-
-#: charview.c:9353
-msgid "E_xport..."
-msgstr ""
-
-#
-#: charview.c:9357 fontview.c:4323
-msgid "Revert Gl_yph"
-msgstr "恢复字形(_Y)"
-
-#
-#: charview.c:9359 fontview.c:4325 metricsview.c:3085
-msgid "_Print..."
-msgstr "打印(_P)…"
-
-#
-#: charview.c:9362 fontview.c:4328 fontview.c:4330
-msgid "E_xecute Script..."
-msgstr "执行脚本(_x)…"
-
-#
-#: charview.c:9374 fontview.c:4370
-msgid "_Invert Selection"
-msgstr "反选(_I)"
-
-#
-#: charview.c:9375 fontview.c:4371 metricsview.c:3110
-msgid "_Deselect All"
-msgstr "不选全部(_D)"
-
-#
-#: charview.c:9377
-msgid "_First Point"
-msgstr "第一点(_F)"
-
-#
-#: charview.c:9378
-msgid "First P_oint, Next Contour"
-msgstr "第一点，下一曲线(_O)"
-
-#
-#: charview.c:9379
-msgid "_Next Point"
-msgstr "下一点(_N)"
-
-#
-#: charview.c:9380
-msgid "_Prev Point"
-msgstr "上一点(_P)"
-
-#
-#: charview.c:9381
-msgid "Ne_xt Control Point"
-msgstr "下一控制点(_X)"
-
-#
-#: charview.c:9382
-msgid "P_rev Control Point"
-msgstr "上一控制点(_R)"
-
-#
-#: charview.c:9383
-msgid "Points on Selected _Contours"
-msgstr "曲线上的全部点(_C)"
-
-#
-#: charview.c:9384
-msgid "Point A_t"
-msgstr "点位于(_T)"
-
-#
-#: charview.c:9386
-msgid "Select All _Points & Refs"
-msgstr "选择全部点及参照(_P)"
-
-#
-#: charview.c:9387
-msgid "Select Open Contours"
-msgstr "选择已打开的轮廓"
-
-#
-#: charview.c:9388
-msgid "Select Anc_hors"
-msgstr "选择锚点(_H)"
-
-#
-#: charview.c:9389 cvstroke.c:2491
-msgid "_Width"
-msgstr "宽度(_W)"
-
-#
-#: charview.c:9390
-msgid "_VWidth"
-msgstr "垂直宽度(_V)"
-
-#
-#: charview.c:9392
-msgid "Select Points Affected by HM"
-msgstr "选择受HM影响的点"
-
-#: charview.c:9403
-msgid "Copy Loo_kup Data"
-msgstr "复制查找数据(_K)"
-
-#
-#: charview.c:9404 fontview.c:4401 fontview.c:5450 metricsview.c:3101
-msgid "Copy _Width"
-msgstr "复制宽度(_W)"
-
-#
-#: charview.c:9405 fontview.c:4403 metricsview.c:3103
-msgid "Co_py LBearing"
-msgstr "复制左边位(_p)"
-
-#
-#: charview.c:9406 fontview.c:4404 metricsview.c:3104
-msgid "Copy RBearin_g"
-msgstr "复制右边位(_g)"
-
-#
-#: charview.c:9409 fontview.c:4412
-msgid "Clear _Background"
-msgstr "清除背景(_B)"
-
-#
-#: charview.c:9410
-msgid "points|_Merge"
-msgstr "混成(_M)"
-
-#
-#: charview.c:9412 fontview.c:4415 metricsview.c:3107
-msgid "_Join"
-msgstr "连接(_J)"
-
-#
-#: charview.c:9413 fontview.c:4413 fontview.c:5453
-msgid "Copy _Fg To Bg"
-msgstr "复制前景到背景(_F)"
-
-#: charview.c:9414
-msgid "Cop_y Layer To Layer..."
-msgstr ""
-
-#
-#: charview.c:9415
-msgid "Copy Gri_d Fit"
-msgstr "复制网格填充(_d)"
-
-#
-#: charview.c:9417 fontview.c:4417
-msgid "_Select"
-msgstr "选择(_S)"
-
-#
-#: charview.c:9429 cvpalettes.c:231
-msgid "_Curve"
-msgstr "曲线(_C)"
-
-#
-#: charview.c:9430 cvpalettes.c:232
-msgid "_HVCurve"
-msgstr "水平垂直曲线(_H)"
-
-#
-#: charview.c:9431 charview.c:9460 cvpalettes.c:233 cvpalettes.c:262
-#: cvpalettes.c:627
-msgid "C_orner"
-msgstr "角(_O)"
-
-#
-#: charview.c:9432 cvpalettes.c:234 simplifydlg.c:84
-msgid "_Tangent"
-msgstr "相切(_T)"
-
-#
-#. GT: Make this (selected) point the first point in the glyph
-#: charview.c:9435 charview.c:9465
-msgid "_Make First"
-msgstr "设为第一点(_M)"
-
-#
-#: charview.c:9437
-msgid "Can Be _Interpolated"
-msgstr "可插值(_I)"
-
-#: charview.c:9438
-msgid "Can't _Be Interpolated"
-msgstr ""
-
-#: charview.c:9439
-msgid "Center Bet_ween Control Points"
-msgstr ""
-
-#
-#: charview.c:9441 charview.c:9467
-msgid "_Add Anchor"
-msgstr "增加锚点(_A)"
-
-#: charview.c:9443
-msgid "Acceptable _Extrema"
-msgstr "可接受的极值(_E)"
-
-#
-#: charview.c:9445
-msgid "Make _Line"
-msgstr "画线(_L)"
-
-#: charview.c:9446
-msgid "Ma_ke Arc"
-msgstr ""
-
-#: charview.c:9447
-msgid "Inse_rt Point On Spline At..."
-msgstr ""
-
-#
-#: charview.c:9448 charview.c:9469
-msgid "_Name Contour"
-msgstr "命名轮廓(_N)"
-
-#: charview.c:9450
-msgid "Make Clip _Path"
-msgstr ""
-
-#: charview.c:9453 charview.c:9471
-msgid "Tool_s"
-msgstr ""
-
-#
-#: charview.c:9458
-msgid "G4 _Curve"
-msgstr "G4曲线(_C)"
-
-#
-#: charview.c:9459
-msgid "_G2 Curve"
-msgstr "G2曲线(_G)"
-
-#
-#: charview.c:9461
-msgid "_Left Constraint"
-msgstr "左约束(_L)"
-
-#
-#: charview.c:9462
-msgid "_Right Constraint"
-msgstr "右约束(_R)"
-
-#
-#. GT: Align these points to their average position
-#: charview.c:9477
-msgid "_Average Points"
-msgstr "平均点(_A)"
-
-#
-#: charview.c:9478
-msgid "_Space Points"
-msgstr "空点(_S)"
-
-#
-#: charview.c:9479
-msgid "Space _Regions..."
-msgstr "空白区域(_R)…"
-
-#
-#: charview.c:9481
-msgid "Make _Parallel..."
-msgstr "使平行(_P)…"
-
-#
-#: charview.c:9486 charview.c:9627 fontview.c:4431 fontview.c:4546
-#: metricsview.c:3117 metricsview.c:3180
-msgid "_Simplify"
-msgstr "简化(_S)"
-
-#
-#: charview.c:9487 fontview.c:4432 metricsview.c:3118
-msgid "Simplify More..."
-msgstr "简化更多…"
-
-#
-#: charview.c:9488 fontview.c:4433 metricsview.c:3119
-msgid "Clea_nup Glyph"
-msgstr "清理字形(_N)"
-
-#
-#: charview.c:9489 fontview.c:4434
-msgid "Canonical Start _Point"
-msgstr "正则起点(_P)"
-
-#
-#: charview.c:9490 fontview.c:4435
-msgid "Canonical _Contours"
-msgstr "正则轮廓(_C)"
-
-#
-#: charview.c:9518 cvpalettes.c:1441 encoding.c:644
-msgid "_First"
-msgstr "首先(_F)"
-
-#
-#: charview.c:9519 cvpalettes.c:1441
-msgid "_Earlier"
-msgstr "早先(_E)"
-
-#
-#: charview.c:9520 cvpalettes.c:1441
-msgid "L_ater"
-msgstr "后来(_A)"
-
-#
-#: charview.c:9521 cvpalettes.c:1441
-msgid "_Last"
-msgstr "最后(_L)"
-
-#
-#: charview.c:9560 fontview.c:4440 metricsview.c:3124 metricsview.c:3179
-msgid "_Remove Overlap"
-msgstr "合并重叠(_R)"
-
-#
-#: charview.c:9561 fontview.c:4441 metricsview.c:3125
-msgid "_Intersect"
-msgstr "交叠(_I)"
-
-#
-#: charview.c:9562
-msgid "_Exclude"
-msgstr "去除(_E)"
-
-#
-#: charview.c:9563 fontview.c:4442 metricsview.c:3126
-msgid "_Find Intersections"
-msgstr "寻找交叠(_F)"
-
-#
-#: charview.c:9568 fontview.c:4447
-msgid "Change _Weight..."
-msgstr "更改粗细(_W)..."
-
-#: charview.c:9569 fontview.c:4448
-msgid "_Italic..."
-msgstr ""
-
-#: charview.c:9570 fontview.c:4449
-msgid "Obli_que..."
-msgstr ""
-
-#: charview.c:9571 fontview.c:4450
-msgid "_Condense/Extend..."
-msgstr "压缩/扩展(_C)..."
-
-#: charview.c:9572 fontview.c:4451
-msgid "Change _X-Height..."
-msgstr ""
-
-#: charview.c:9573 fontview.c:4452
-msgid "Change _Glyph..."
-msgstr ""
-
-#: charview.c:9575 fontview.c:4457
-msgid "In_line..."
-msgstr ""
-
-#: charview.c:9576 fontview.c:4458
-msgid "_Outline..."
-msgstr ""
-
-#: charview.c:9577 fontview.c:4459
-msgid "S_hadow..."
-msgstr ""
-
-#: charview.c:9578 fontview.c:4460
-msgid "_Wireframe..."
-msgstr ""
-
-#
-#: charview.c:9583 fontview.c:4465 metricsview.c:3139
-msgid "_Build Accented Glyph"
-msgstr "生成首饰字形(_B)"
-
-#
-#: charview.c:9584 fontview.c:4466 metricsview.c:3140
-msgid "Build _Composite Glyph"
-msgstr "生成组合字形(_C)"
-
-#
-#: charview.c:9589 fontview.c:4476
-msgid "_References..."
-msgstr "参照(_R)…"
-
-#
-#: charview.c:9590 fontview.c:4477
-msgid "_Substitutions..."
-msgstr "替换(_S)…"
-
-#
-#: charview.c:9595 fontview.c:4482 fontview.c:5457 metricsview.c:3175
-msgid "_Transform..."
-msgstr "变换(_T)…"
-
-#
-#: charview.c:9596 fontview.c:4483
-msgid "_Point of View Projection..."
-msgstr "投影视点(_P)…"
-
-#
-#: charview.c:9597 fontview.c:4484
-msgid "_Non Linear Transform..."
-msgstr "非线性变换(_N)…"
-
-#
-#: charview.c:9602 fontview.c:4489 fontview.c:5462 metricsview.c:3182
-msgid "To _Int"
-msgstr "到整点(_I)"
-
-#
-#: charview.c:9603 fontview.c:4490
-msgid "To _Hundredths"
-msgstr "到百分点(_H)"
-
-#
-#: charview.c:9604 fontview.c:4491
-msgid "_Cluster"
-msgstr "簇(_C)"
-
-#: charview.c:9610 fontview.c:4530
-msgid "_Glyph Info..."
-msgstr ""
-
-#
-#: charview.c:9611
-msgid "Get _Info..."
-msgstr "查看信息(_I)…"
-
-#
-#: charview.c:9612 metricsview.c:3169
-msgid "S_how Dependent"
-msgstr "显示依赖(_H)"
-
-#: charview.c:9613
-msgid "Find Proble_ms..."
-msgstr ""
-
-#
-#: charview.c:9615
-msgid "Bitm_ap strikes Available..."
-msgstr "可用位图部件(_A)…"
-
-#
-#: charview.c:9617 fontview.c:4536
-msgid "Remove Bitmap Glyphs..."
-msgstr "移除位图字形…"
-
-#: charview.c:9619
-msgid "St_yles"
-msgstr ""
-
-#
-#: charview.c:9621 fontview.c:4540 fontview.c:5458
-msgid "_Expand Stroke..."
-msgstr "扩展重音符(_E)…"
-
-#
-#: charview.c:9623 fontview.c:4542 metricsview.c:3177
-msgid "Tile _Path..."
-msgstr "铺垫路径(_P)…"
-
-#: charview.c:9624 fontview.c:4543
-msgid "Tile Pattern..."
-msgstr ""
-
-#
-#: charview.c:9626 fontview.c:4545
-msgid "O_verlap"
-msgstr "重叠(_V)"
-
-#
-#: charview.c:9628 fontview.c:4547 metricsview.c:3181
-msgid "Add E_xtrema"
-msgstr "增加极点(_X)"
-
-#
-#: charview.c:9629 fontview.c:4549 metricsview.c:3184
-msgid "Autot_race"
-msgstr "自动循迹(_R)"
-
-#
-#: charview.c:9631
-msgid "A_lign"
-msgstr "对齐(_L)"
-
-#
-#: charview.c:9632 fontview.c:4548
-msgid "Roun_d"
-msgstr "取整(_D)"
-
-#: charview.c:9633
-msgid "_Order"
-msgstr ""
-
-#: charview.c:9635
-msgid "Check Self-Intersection"
-msgstr ""
-
-#: charview.c:9636
-msgid "Glyph Self-Intersects"
-msgstr ""
-
-#: charview.c:9637
-msgid "Cloc_kwise"
-msgstr ""
-
-#
-#: charview.c:9638
-msgid "Cou_nter Clockwise"
-msgstr "逆时针(_N)"
-
-#
-#: charview.c:9639 cvimportdlg.c:315 fontview.c:4551 fontview.c:5463
-#: metricsview.c:3186
-msgid "_Correct Direction"
-msgstr "正确方向(_C)"
-
-#: charview.c:9640
-msgid "Reverse Direction"
-msgstr ""
-
-#: charview.c:9642
-msgid "Insert Text Outlines..."
-msgstr ""
-
-#
-#: charview.c:9644 fontview.c:4553 metricsview.c:3188
-msgid "B_uild"
-msgstr "生成(_U)"
-
-#: charview.c:9646 fontview.c:4558
-msgid "Compare Layers..."
-msgstr ""
-
-#
-#: charview.c:9651 fontview.c:5192 fontview.c:5465
-msgid "Auto_Hint"
-msgstr "自动消隐(_H)"
-
-#
-#: charview.c:9652 fontview.c:5193
-msgid "Hint _Substitution Pts"
-msgstr "消隐替换点(_S)"
-
-#
-#: charview.c:9653 fontview.c:5194
-msgid "Auto _Counter Hint"
-msgstr "自动计数消隐(_C)"
-
-#
-#: charview.c:9654 fontview.c:5195
-msgid "_Don't AutoHint"
-msgstr "不自动消隐(_D)"
-
-#
-#: charview.c:9656 fontview.c:5197
-msgid "Auto_Instr"
-msgstr "自动指令(_I)"
-
-#
-#: charview.c:9657 fontview.c:5198
-msgid "_Edit Instructions..."
-msgstr "编辑指令(_E)…"
-
-#
-#: charview.c:9658
-msgid "_Debug..."
-msgstr "调试(_D)…"
-
-#: charview.c:9659 fontview.c:5204
-msgid "S_uggest Deltas..."
-msgstr ""
-
-#
-#: charview.c:9661
-msgid "_Clear HStem"
-msgstr "清除水平项(_C)"
-
-#
-#: charview.c:9662
-msgid "Clear _VStem"
-msgstr "清除垂直项(_V)"
-
-#
-#: charview.c:9663
-msgid "Clear DStem"
-msgstr "清除DStem"
-
-#
-#: charview.c:9664 fontview.c:5208
-msgid "Clear Instructions"
-msgstr "清除指令"
-
-#
-#: charview.c:9666
-msgid "_Add HHint"
-msgstr "增加水平消隐(_A)"
-
-#
-#: charview.c:9667
-msgid "Add VHi_nt"
-msgstr "增加垂直消隐(_N)"
-
-#
-#: charview.c:9668
-msgid "Add DHint"
-msgstr "增加对角消隐"
-
-#
-#: charview.c:9669
-msgid "Crea_te HHint..."
-msgstr "创建水平消隐(_T)…"
-
-#
-#: charview.c:9670
-msgid "Cr_eate VHint..."
-msgstr "创建垂直消隐(_T)…"
-
-#
-#: charview.c:9672
-msgid "_Review Hints..."
-msgstr "查看消隐(_R)…"
-
-#
-#. GT: In the next few lines the "%s" is the name of an anchor class, and the
-#. GT: rest of the string identifies the type of the anchor
-#: charview.c:9700
-#, c-format
-msgid "%s at ligature pos %d"
-msgstr "%s 于连写组合位 %d"
-
-#
-#: charview.c:9703
-#, c-format
-msgid "%s exit"
-msgstr "%s 退出"
-
-#
-#: charview.c:9704
-#, c-format
-msgid "%s entry"
-msgstr "%s 入口"
-
-#
-#: charview.c:9705
-#, c-format
-msgid "%s mark"
-msgstr "%s 标记"
-
-#
-#: charview.c:9706
-#, c-format
-msgid "%s base"
-msgstr "%s 基础"
-
-#
-#: charview.c:9721 fontview.c:5215 fontview.c:5467 metricsview.c:3370
-msgid "_Center in Width"
-msgstr "宽度中心(_C)"
-
-#
-#: charview.c:9722 fontview.c:5216 metricsview.c:3371
-msgid "_Thirds in Width"
-msgstr "宽度三分之一(_T)"
-
-#
-#: charview.c:9724 fontview.c:5218
-msgid "Set _LBearing..."
-msgstr "设置左边位(_L)…"
-
-#
-#: charview.c:9725 fontview.c:5219
-msgid "Set _RBearing..."
-msgstr "设置右边位(_R)…"
-
-#: charview.c:9726 fontview.c:5220
-msgid "Set Both Bearings..."
-msgstr ""
-
-#
-#: charview.c:9728 fontview.c:5222 fontview.c:5469
-msgid "Set _Vertical Advance..."
-msgstr "设置垂直间距(_V)…"
-
-#
-#: charview.c:9730
-msgid "Remove Kern _Pairs"
-msgstr "移除压缩对(_P)"
-
-#
-#: charview.c:9731
-msgid "Remove VKern Pairs"
-msgstr "移除垂直压缩对"
-
-#
-#: charview.c:9732 fontview.c:5227 metricsview.c:3378
-msgid "Kern Pair Closeup..."
-msgstr "压缩对详览…"
-
-#
-#: charview.c:9745
-msgid "_Detach"
-msgstr "分离(_D)"
-
-#
-#: charview.c:9804 fontview.c:4579 metricsview.c:3209
-msgid "_Kern Pairs"
-msgstr "压缩对(_K)"
-
-#
-#: charview.c:9805 fontview.c:4580 metricsview.c:3210
-msgid "_Anchored Pairs"
-msgstr "锚点对(_A)"
-
-#
-#: charview.c:9806
-msgid "_Anchor Control..."
-msgstr "锚点控制(_A)…"
-
-#
-#: charview.c:9807
-msgid "Anchor _Glyph at Point"
-msgstr "字形锚点(_G)"
-
-#
-#: charview.c:9808 fontview.c:4581 metricsview.c:3211
-msgid "_Ligatures"
-msgstr "连写组合字(_L)"
-
-#
-#: charview.c:9813
-msgid "PointNumbers|_None"
-msgstr "无(_N)"
-
-#
-#: charview.c:9814 openfontdlg.c:125 savefontdlg.c:164
-msgid "TrueType"
-msgstr "TrueType"
-
-#
-#: charview.c:9815 savefontdlg.c:564
-msgid "PostScript®"
-msgstr "PostScript®"
-
-#
-#: charview.c:9816 cvexportdlg.c:245 cvimportdlg.c:413 cvimportdlg.c:434
-#: openfontdlg.c:136
-msgid "SVG"
-msgstr "SVG"
-
-#: charview.c:9821
-msgid "Show _Grid Fit..."
-msgstr ""
-
-#: charview.c:9822 metricsview.c:3329
-msgid "_Bigger Point Size"
-msgstr ""
-
-#: charview.c:9823 metricsview.c:3330
-msgid "_Smaller Point Size"
-msgstr ""
-
-#
-#: charview.c:9824 fontview.c:5048 metricsview.c:3323
-msgid "_Anti Alias"
-msgstr "抗锯齿(_A)"
-
-#: charview.c:9825
-msgid "_Off"
-msgstr ""
-
-#: charview.c:9830
-msgid "_Points"
-msgstr ""
-
-#: charview.c:9831
-msgid "_Control Point Info"
-msgstr ""
-
-#: charview.c:9832
-msgid "_Extrema"
-msgstr ""
-
-#: charview.c:9833
-msgid "Points of _Inflection"
-msgstr ""
-
-#: charview.c:9834
-msgid "Almost Horizontal/Vertical Lines"
-msgstr ""
-
-#: charview.c:9835
-msgid "Almost Horizontal/Vertical Curves"
-msgstr ""
-
-#: charview.c:9836
-msgid "(Define \"Almost\")"
-msgstr ""
-
-#: charview.c:9837
-msgid "_Side Bearings"
-msgstr ""
-
-#: charview.c:9838
-msgid "Reference Names"
-msgstr ""
-
-#: charview.c:9839
-msgid "_Fill"
-msgstr ""
-
-#: charview.c:9841
-msgid "Pale_ttes"
-msgstr ""
-
-#: charview.c:9842
-msgid "_Glyph Tabs"
-msgstr ""
-
-#: charview.c:9843
-msgid "_Rulers"
-msgstr ""
-
-#: charview.c:9845
-msgid "_Horizontal Hints"
-msgstr ""
-
-#: charview.c:9846
-msgid "_Vertical Hints"
-msgstr ""
-
-#: charview.c:9847
-msgid "_Diagonal Hints"
-msgstr ""
-
-#. GT: You might not want to translate this, it's a keyword in PostScript font files
-#: charview.c:9849
-msgid "_BlueValues"
-msgstr ""
-
-#. GT: You might not want to translate this, it's a keyword in PostScript font files
-#: charview.c:9851
-msgid "FamilyBl_ues"
-msgstr ""
-
-#: charview.c:9853
-msgid "_Anchors"
-msgstr ""
-
-#: charview.c:9855
-msgid "Debug Raster Cha_nges"
-msgstr ""
-
-#: charview.c:9857
-msgid "Hori_zontal Metric Lines"
-msgstr ""
-
-#: charview.c:9858
-msgid "Vertical _Metric Lines"
-msgstr ""
-
-#: charview.c:9860
-msgid "Snap Outlines to Pi_xel Grid"
-msgstr ""
-
-#
-#: charview.c:9870
-msgid "_Display Compositions..."
-msgstr "显示组成(_D)…"
-
-#
-#: charview.c:9877
-msgid "Form_er Glyph"
-msgstr "上一字形(_E)"
-
-#: charview.c:9881
-msgid "N_umber Points"
-msgstr ""
-
-#: charview.c:9882
-msgid "Grid Fi_t"
-msgstr ""
-
-#: charview.c:9883
-msgid "Sho_w"
-msgstr ""
-
-#
-#: charview.c:9885 fontview.c:5032 metricsview.c:3320
-msgid "Com_binations"
-msgstr "组合(_B)"
-
-#
-#: charview.c:9906
-msgid "SubFonts|_All"
-msgstr "全部(_A)"
-
-#
-#: charview.c:9907
-msgid "SubFonts|_None"
-msgstr "无(_N)"
-
-#
-#: charview.c:9970 mm.c:671 mm.c:673 mm.c:984 mm.c:987 mm.c:998 mm.c:1006
-#: mm.c:1011 mm.c:1019 mm.c:1027 mm.c:1041 mm.c:1044 mm.c:1054 mm.c:1064
-#: mm.c:1072 mm.c:1079 mm.c:1086 mm.c:1093 mm.c:1100 mm.c:1107 mm.c:1116
-#: mm.c:1126 mm.c:1133 mm.c:1143 mm.c:1159 mm.c:1172 mm.c:1179 mmdlg.c:934
-#: mmdlg.c:1777 mmdlg.c:2135 mmdlg.c:2147 mmdlg.c:2159 mmdlg.c:2162
-#: mmdlg.c:2367 mmdlg.c:2370 splineutil.c:2623 splineutil.c:2672
-#: splineutil.c:2674
-msgid "Bad Multiple Master Font"
-msgstr "不良字体集"
-
-#
-#. GT: Here (and following) MM means "MultiMaster"
-#: charview.c:9975
-msgid "MM _Reblend"
-msgstr "字体集再混成(_R)"
-
-#
-#: charview.c:10037 charview.c:10055
-msgid "_Point"
-msgstr "点(_P)"
-
-#
-#: charview.c:10042 charview.c:10060 fontview.c:5480
-msgid "H_ints"
-msgstr "消隐(_I)"
-
-#
-#. GT: Here (and following) MM means "MultiMaster"
-#: charview.c:10046 fontview.c:5486
-msgid "MM"
-msgstr "字体集"
-
-#: charview.c:10759
-msgid "Outline View 2"
-msgstr ""
-
-#: charview.c:10760
-msgid "This window displays a single outline glyph (more data)"
-msgstr ""
-
-#: charview.c:10771
-msgid "Outline View"
-msgstr ""
-
-#: charview.c:10772
-msgid "This window displays a single outline glyph"
-msgstr ""
-
-#
-#: combinations.c:46 kernclass.c:2256
-msgid "First Char"
-msgstr "第一个字符"
-
-#
-#: combinations.c:47 kernclass.c:2256
-msgid "Second Char"
-msgstr "第二个字符"
-
-#
-#: combinations.c:48
-msgid "Kern Size"
-msgstr "压缩大小"
-
-#
-#: combinations.c:116
-msgid "Select a ligature to view"
-msgstr "选看连体"
-
-#
-#: combinations.c:898 kernclass.c:3293
-msgid "Kern Pair Closeup"
-msgstr "压缩对关闭"
-
-#
-#: combinations.c:903
-msgid "Anchor Control for Base"
-msgstr "锚点控制：基点"
-
-#
-#: combinations.c:904
-msgid "Anchor Control for Mark"
-msgstr "锚点控制：标记"
-
-#
-#: combinations.c:1104
-msgid "Kern Pairs"
-msgstr "压缩对"
-
-#
-#: combinations.c:1104
-msgid "Anchored Pairs"
-msgstr "锚点对"
-
-#
-#: combinations.c:1133 fontinfo.c:9396
-msgid "Sort By:"
-msgstr "排序："
-
-#
-#: contextchain.c:629
-msgid "Bad Class"
-msgstr "坏类属"
-
-#: contextchain.c:629
-#, c-format
-msgid "%.*s is not a valid class name (or number)"
-msgstr ""
-
-#
-#: contextchain.c:672 contextchain.c:722 contextchain.c:1053
-msgid "No Sequence/Lookups"
-msgstr "无排序/查找"
-
-#: contextchain.c:674 contextchain.c:724 contextchain.c:1055
-msgid ""
-"There are no entries in the Sequence/Lookup List, was this intentional?"
-msgstr ""
-
-#
-#: contextchain.c:702 contextchain.c:735 contextchain.c:1075
-msgid "Bad Sequence/Lookup List"
-msgstr "不良顺序、查找列表"
-
-#: contextchain.c:702 contextchain.c:1076
-#, c-format
-msgid ""
-"Sequence number out of bounds, must be less than %d (number of classes in "
-"list above)"
-msgstr ""
-
-#: contextchain.c:735
-#, c-format
-msgid ""
-"Sequence number out of bounds, must be less than %d (number of glyphs, "
-"classes or coverage tables)"
-msgstr ""
-
-#
-#. GT: The string "{Everything Else}" is used in the context of a list
-#. GT: of classes (a set of kerning classes) where class 0 designates the
-#. GT: default class containing all glyphs not specified in the other classes
-#: contextchain.c:765 contextchain.c:2817 contextchain.c:2994 fontview.c:7927
-#: kernclass.c:185 kernclass.c:1393 kernclass.c:1405 kernclass.c:2275
-#: metricsview.c:1027 metricsview.c:1028 statemachine.c:1342
-msgid "{Everything Else}"
-msgstr "{其他}"
-
-#
-#: contextchain.c:989 contextchain.c:1002 contextchain.c:1087
-msgid "Missing rules"
-msgstr "缺规则"
-
-#
-#: contextchain.c:989 contextchain.c:1002 contextchain.c:1087
-msgid " There must be at least one contextual rule"
-msgstr " 至少要一项相关规则"
-
-#
-#: contextchain.c:1034 contextchain.c:1039 contextchain.c:1167
-#: contextchain.c:1178 contextchain.c:1184
-msgid "Bad Coverage Table"
-msgstr "不当范围表"
-
-#: contextchain.c:1034 contextchain.c:1167
-msgid "There must be at least one match coverage table"
-msgstr ""
-
-#: contextchain.c:1039
-msgid ""
-"In a Reverse Chaining Substitution there must be exactly one coverage table "
-"to match"
-msgstr ""
-
-#
-#: contextchain.c:1045 contextchain.c:1188
-msgid "Replacement mismatch"
-msgstr "替换不匹配"
-
-#: contextchain.c:1045 contextchain.c:1188
-msgid ""
-"In a Reverse Chaining Substitution there must be exactly as many "
-"replacements as there are glyph names in the match coverage table"
-msgstr ""
-
-#: contextchain.c:1131
-msgid "Bad rule"
-msgstr ""
-
-#
-#: contextchain.c:1138 contextchain.c:1226 splineoverlap.c:2456
-#: transform.c:251
-msgid "Warning"
-msgstr "警告"
-
-#: contextchain.c:1140
-#, c-format
-msgid ""
-"%s\n"
-"Proceed anyway?"
-msgstr ""
-
-#: contextchain.c:1178 contextchain.c:1184
-msgid ""
-"In a Reverse Chaining Substitution there must be exactly one coverage table "
-"with replacements"
-msgstr ""
-
-#: contextchain.c:1206 contextchain.c:1211 contextchain.c:1218
-msgid "Bad Sections"
-msgstr ""
-
-#: contextchain.c:1206 contextchain.c:1211 contextchain.c:1218
-msgid ""
-"The sections specified do not make sense. All lookups must lie in the middle "
-"section."
-msgstr ""
-
-#: contextchain.c:1228
-msgid ""
-"This rule activates no lookups.\n"
-"Proceed anyway?"
-msgstr ""
-
-#: contextchain.c:1849 contextchain.c:1857 contextchain.c:1865
-msgid "Bad class name"
-msgstr ""
-
-#: contextchain.c:1849
-msgid "No spaces allowed in class names."
-msgstr ""
-
-#: contextchain.c:1857
-msgid ""
-"If a class name is a number, it must be the index of the class in the array "
-"of classes_simple."
-msgstr ""
-
-#: contextchain.c:1865
-#, c-format
-msgid "The class name, %s, is already in use."
-msgstr ""
-
-#: contextchain.c:1924
-msgid "Section|Continue"
-msgstr ""
-
-#: contextchain.c:1925
-msgid "Section|Start"
-msgstr ""
-
-#: contextchain.c:1928 contextchain.c:1933
-msgid "Class|Name"
-msgstr ""
-
-#: contextchain.c:1929 contextchain.c:1934 fontinfo.c:1284
-msgid "Glyphs in the class"
-msgstr ""
-
-#: contextchain.c:1937 contextchain.c:1950 contextchain.c:1956
-msgid "Glyphs in the coverage tables"
-msgstr ""
-
-#: contextchain.c:1940 contextchain.c:1951
-msgid "Apply lookup"
-msgstr ""
-
-#: contextchain.c:1941
-msgid "at position"
-msgstr ""
-
-#: contextchain.c:1944 contextchain.c:1960
-msgid "Matching rules based on a list of glyphs"
-msgstr ""
-
-#: contextchain.c:1947 contextchain.c:1963
-msgid "Matching rules based on a list of classes"
-msgstr ""
-
-#: contextchain.c:1952
-msgid "Section"
-msgstr ""
-
-#: contextchain.c:1957
-msgid "Replacement glyphs"
-msgstr ""
-
-#
-#: contextchain.c:1999
-msgid "Edit Contextual Position"
-msgstr "编辑上下文位置"
-
-#
-#: contextchain.c:1999 statemachine.c:1326
-msgid "Edit Contextual Substitution"
-msgstr "编辑上下文替换"
-
-#
-#: contextchain.c:2000
-msgid "Edit Chaining Position"
-msgstr "编辑链位置"
-
-#
-#: contextchain.c:2000
-msgid "Edit Chaining Substitution"
-msgstr "编辑链替换"
-
-#
-#: contextchain.c:2001
-msgid "Edit Reverse Chaining Substitution"
-msgstr "编辑逆向链替换"
-
-#
-#: contextchain.c:2003
-msgid "New Contextual Position"
-msgstr "新建上下文位置"
-
-#
-#: contextchain.c:2003 statemachine.c:1327
-msgid "New Contextual Substitution"
-msgstr "新建上下文替换"
-
-#
-#: contextchain.c:2004
-msgid "New Chaining Position"
-msgstr "新建链位置"
-
-#
-#: contextchain.c:2004
-msgid "New Chaining Substitution"
-msgstr "新建链替换"
-
-#
-#: contextchain.c:2005
-msgid "New Reverse Chaining Substitution"
-msgstr "新建逆向链替换"
-
-#: contextchain.c:2042 contextchain.c:2045 contextchain.c:2376
-msgid "Add Lookup"
-msgstr ""
-
-#: contextchain.c:2048
-msgid "Remove Lookup"
-msgstr ""
-
-#: contextchain.c:2201
-msgid ""
-"OpenType Contextual or Chaining subtables may be in one\n"
-" of three formats. The context may be specified either\n"
-" as a string of specific glyphs, a string of glyph classes\n"
-" or a string of coverage tables\n"
-"In the first format you must specify a string of glyph-names\n"
-" In the second format you must specify a string of class names\n"
-" In the third format you must specify a string each element\n"
-"  of which may contain several glyph-names\n"
-"For chaining subtables you may also specify backtrack and\n"
-" lookahead lists."
-msgstr ""
-
-#
-#: contextchain.c:2217
-msgid "By Glyphs"
-msgstr "按字形"
-
-#
-#: contextchain.c:2226
-msgid "By Classes"
-msgstr "按类属"
-
-#
-#: contextchain.c:2235
-msgid "By Coverage"
-msgstr "按范围"
-
-#: contextchain.c:2249
-msgid ""
-"This dialog has two formats. A simpler one which\n"
-" hides some of the complexities of these rules,\n"
-" or a more complex form which gives you full control."
-msgstr ""
-
-#: contextchain.c:2260
-msgid "Dialog Type:"
-msgstr ""
-
-#
-#: contextchain.c:2268 problems.c:2264
-msgid "Simple"
-msgstr "简单"
-
-#: contextchain.c:2277
-msgid "Complex"
-msgstr ""
-
-#: contextchain.c:2368
-msgid "New Section"
-msgstr ""
-
-#: contextchain.c:2402 contextchain.c:2577
-msgid "Set From Selection"
-msgstr ""
-
-#: contextchain.c:2405 contextchain.c:2580
-msgid "Set this glyph list from a selection."
-msgstr ""
-
-#: contextchain.c:2419 contextchain.c:2524 contextchain.c:3121
-msgid "An ordered list of lookups and positions"
-msgstr ""
-
-#
-#: contextchain.c:2448 contextchain.c:3157 layer2layer.c:98 layer2layer.c:123
-msgid "Match"
-msgstr "匹配"
-
-#
-#: contextchain.c:2453 contextchain.c:3158
-msgid "Backtrack"
-msgstr "回溯"
-
-#
-#: contextchain.c:2458 contextchain.c:3159
-msgid "Lookahead"
-msgstr "前向"
-
-#
-#: contextchain.c:2463
-msgid "A list of glyphs:"
-msgstr "字形列表："
-
-#
-#: contextchain.c:2570
-msgid "Replacements"
-msgstr "替换"
-
-#
-#: contextchain.c:2623
-msgid "A coverage table:"
-msgstr "范围表："
-
-#: contextchain.c:2705
-msgid "A list of coverage tables:"
-msgstr ""
-
-#
-#: contextchain.c:2787 contextchain.c:2961
-msgid "Same as Match Classes"
-msgstr "同匹配类属"
-
-#. GT: This is the default class name for the class containing any glyphs_simple
-#. GT: which aren't specified in other classes_simple. The class name may NOT
-#. GT: contain spaces. Use an underscore or something similar instead
-#: contextchain.c:2816 contextchain.c:2993
-msgid "Glyphs|All_Others"
-msgstr ""
-
-#
-#: contextchain.c:2856 contextchain.c:3031
-msgid "Match Classes"
-msgstr "匹配类属"
-
-#
-#: contextchain.c:2857 contextchain.c:3032
-msgid "Back Classes"
-msgstr "向后类属"
-
-#
-#: contextchain.c:2858 contextchain.c:3033
-msgid "Ahead Classes"
-msgstr "向前类属"
-
-#: contextchain.c:3084
-msgid "List of class names"
-msgstr ""
-
-#
-#: contextchain.c:3096
-msgid "Classes"
-msgstr "类属"
-
-#
-#: cvdebug.c:280 cvdebug.c:309
-msgid "<empty>"
-msgstr "空"
-
-#
-#: cvdebug.c:286
-#, c-format
-msgid "%3d: <uninitialized>"
-msgstr "%3d: <未初始化>"
-
-#
-#: cvdebug.c:447
-msgid "<none>"
-msgstr "<无>"
-
-#
-#: cvdebug.c:818
-msgid "No Watch Points"
-msgstr "无观察点"
-
-#: cvdebug.c:818
-msgid "Watch Points not supported in glyphs with references"
-msgstr ""
-
-#
-#: cvdebug.c:899
-msgid "Registers"
-msgstr "寄存器"
-
-#
-#: cvdebug.c:900
-msgid "Stack"
-msgstr "堆栈"
-
-#
-#: cvdebug.c:901 ttfinstrsui.c:1684
-msgid "Storage"
-msgstr "存储器"
-
-#
-#: cvdebug.c:902 problems.c:4006
-msgid "Points"
-msgstr "点"
-
-#
-#: cvdebug.c:903 cvdebug.c:1931
-msgid "Cvt"
-msgstr "Cvt"
-
-#
-#: cvdebug.c:904
-msgid "Raster"
-msgstr "矢量"
-
-#
-#: cvdebug.c:905
-msgid "Gloss"
-msgstr "光线"
-
-#
-#: cvdebug.c:1704
-msgid "Current Raster (TrueType)"
-msgstr "当前矢量 (TrueType)"
-
-#
-#: cvdebug.c:1721
-msgid "Registers (TrueType)"
-msgstr "寄存器(TrueType)"
-
-#
-#: cvdebug.c:1747
-msgid "Stack (TrueType)"
-msgstr "堆栈(TrueType)"
-
-#
-#: cvdebug.c:1773
-msgid "Storage (TrueType)"
-msgstr "存储器(TrueType)"
-
-#
-#: cvdebug.c:1816
-msgid "Points (TrueType)"
-msgstr "点(TrueType)"
-
-#
-#: cvdebug.c:1827
-msgid "Twilight"
-msgstr "微光"
-
-#
-#: cvdebug.c:1835 fontinfo.c:443 fontinfo.c:571 fontinfo.c:720
-msgid "Normal"
-msgstr "正常"
-
-#
-#: cvdebug.c:1843
-msgid "Current"
-msgstr "当前"
-
-#
-#: cvdebug.c:1851
-msgid "Points|Original"
-msgstr "原始"
-
-#
-#: cvdebug.c:1859
-msgid "Grid"
-msgstr "网格"
-
-#
-#: cvdebug.c:1870
-msgid "Raw"
-msgstr "Raw"
-
-#
-#: cvdebug.c:1880
-msgid "Em Units"
-msgstr "M全字单位"
-
-#
-#: cvdebug.c:1892
-msgid "Transformed"
-msgstr "已变换"
-
-#
-#: cvdebug.c:2081 cvgridfit.c:75 savefontdlg.c:1374
-msgid "Instructions out of date"
-msgstr "指示过期"
-
-#: cvdebug.c:2082 cvgridfit.c:76
-msgid ""
-"The points have been changed. This may mean that the truetype instructions "
-"now refer to the wrong points and they may cause unexpected results."
-msgstr ""
-
-#
-#: cvdebug.c:2128
-msgid "Step into"
-msgstr "进入"
-
-#
-#: cvdebug.c:2137
-msgid "Step over (Next)"
-msgstr "跳出（下一步）"
-
-#
-#: cvdebug.c:2146
-msgid "Step out of current function"
-msgstr "跳出当前函数"
-
-#
-#: cvdebug.c:2155
-msgid "Continue"
-msgstr "继续"
-
-#: cvdebug.c:2164
-msgid ""
-"Watch all selected points\n"
-"(stop when a point moves)"
-msgstr ""
-
-#
-#: cvdebug.c:2173
-msgid "Window"
-msgstr "窗口"
-
-#
-#: cvdebug.c:2182
-msgid "Exit Debugger"
-msgstr "退出调试器"
-
-#
-#: cvdgloss.c:1225
-msgid "Instruction Gloss (TrueType)"
-msgstr "指令统计 (TrueType)"
-
-#
-#: cvexport.c:719 cvexportdlg.c:287 fontview.c:681 savefont.c:657
-#: savefont.c:857 showatt.c:2334
-msgid "Save Failed"
-msgstr "保存失败"
-
-#
-#: cvexportdlg.c:55 cvexportdlg.c:116 fvimportbdf.c:1868
-msgid "Pixel size:"
-msgstr "像素大小："
-
-#
-#: cvexportdlg.c:56 cvexportdlg.c:133
-msgid "Bits/Pixel:"
-msgstr "位／点："
-
-#
-#: cvexportdlg.c:60
-msgid "The only valid values for bits/pixel are 1, 2, 4 or 8"
-msgstr "点/像素的有效值为 1, 2, 4 或 8"
-
-#
-#: cvexportdlg.c:105 cvexportdlg.c:207
-msgid "Pixel size?"
-msgstr "像素大小？"
-
-#
-#: cvexportdlg.c:235 cvexportdlg.c:250
-msgid "X Bitmap"
-msgstr "X位图"
-
-#
-#: cvexportdlg.c:236 cvexportdlg.c:251
-msgid "BMP"
-msgstr "BMP"
-
-#
-#: cvexportdlg.c:238 cvexportdlg.c:253
-msgid "png"
-msgstr "png"
-
-#
-#: cvexportdlg.c:243 cvimportdlg.c:410 cvimportdlg.c:430
-msgid "EPS"
-msgstr "EPS"
-
-#
-#: cvexportdlg.c:244 cvimportdlg.c:417
-msgid "XFig"
-msgstr "XFig"
-
-#
-#: cvexportdlg.c:246 cvimportdlg.c:414 cvimportdlg.c:436
-msgid "Glif"
-msgstr "Glif"
-
-#
-#: cvexportdlg.c:247
-msgid "PDF"
-msgstr "PDF"
-
-#: cvexportdlg.c:248
-msgid "Raph's plate"
-msgstr "Raph 面"
-
-#
-#: cvexportdlg.c:306 fontview.c:4795 savefontdlg.c:1626
-msgid "_Replace"
-msgstr "替换(_R)"
-
-#
-#: cvexportdlg.c:309 savefontdlg.c:1629 ../gdraw/gsavefiledlg.c:75
-msgid "File Exists"
-msgstr "文件存在"
-
-#
-#: cvexportdlg.c:309 savefontdlg.c:1629 ../gdraw/gsavefiledlg.c:75
-#, c-format
-msgid "File, %s, exists. Replace it?"
-msgstr "已有文件%s。替换它？"
-
-#
-#: cvexportdlg.c:390 savefontdlg.c:1744 ../gdraw/gsavefiledlg.c:137
-msgid "Couldn't create directory"
-msgstr "未能创建目录"
-
-#
-#: cvexportdlg.c:390 savefontdlg.c:1744
-#, c-format
-msgid "Couldn't create directory: %s"
-msgstr "未能创建目录：%s"
-
-#
-#: cvexportdlg.c:403
-msgid "Create directory"
-msgstr "创建目录"
-
-#
-#: cvexportdlg.c:403 savefontdlg.c:1755 ../gdraw/gsavefiledlg.c:153
-msgid "Directory name?"
-msgstr "目录名?"
-
-#
-#: cvexportdlg.c:519
-msgid "Export"
-msgstr "导出"
-
-#: cvexportdlg.c:544 cvimportdlg.c:703 openfontdlg.c:713 savefontdlg.c:2318
-#: ../gdraw/gfiledlg.c:138 ../gdraw/gsavefiledlg.c:255
-msgid "_Filter"
-msgstr "过滤器(_F)"
-
-#
-#: cvexportdlg.c:570 savefontdlg.c:2340 ../gdraw/gsavefiledlg.c:270
-msgid "Directory|_New"
-msgstr "新建(_N)..."
-
-#
-#: cvexportdlg.c:581 cvimportdlg.c:725
-msgid "Format:"
-msgstr "格式："
-
-#
-#: cvgetinfo.c:178
-msgid "Transformation Matrix"
-msgstr "变换矩阵"
-
-#
-#: cvgetinfo.c:185 cvstroke.c:2516 kernclass.c:745
-msgid "Value out of range"
-msgstr "值溢出"
-
-#
-#: cvgetinfo.c:198 cvgetinfo.c:439 cvgetinfo.c:2715 cvgetinfo.c:2974
-#: cvhints.c:467 cvhints.c:767
-msgid "_Base:"
-msgstr "基点"
-
-#
-#: cvgetinfo.c:202 cvgetinfo.c:463
-msgid "Ref:"
-msgstr "参照："
-
-#
-#: cvgetinfo.c:206 cvgetinfo.c:210 cvgetinfo.c:213
-msgid "Bad Point Match"
-msgstr "不良点匹配"
-
-#
-#: cvgetinfo.c:206
-msgid "Both points must be specified, or neither"
-msgstr "两点须都指定或都不指定"
-
-#
-#: cvgetinfo.c:210
-msgid "Couldn't find base point"
-msgstr "未能找到基点"
-
-#
-#: cvgetinfo.c:213
-msgid "Couldn't find point in reference"
-msgstr "参照中未找到点"
-
-#
-#: cvgetinfo.c:275
-msgid "C_hange"
-msgstr "更改(_H)"
-
-#
-#: cvgetinfo.c:276
-msgid "_Retain"
-msgstr "保留(_R)"
-
-#
-#: cvgetinfo.c:279
-msgid "Transformation Matrix Changed"
-msgstr "变换矩阵已改变"
-
-#
-#: cvgetinfo.c:279
-msgid ""
-"You have changed the transformation matrix, do you wish to use the new "
-"version?"
-msgstr "你改变了变换矩阵，要用最近的么？"
-
-#
-#: cvgetinfo.c:336
-msgid "Reference Info"
-msgstr "参照信息"
-
-#
-#: cvgetinfo.c:349
-#, c-format
-msgid "Reference to character %1$.20s at %2$d"
-msgstr "参照字符 %1$.20s 于 %2$d"
-
-#
-#: cvgetinfo.c:373
-msgid "Transformed by:"
-msgstr "变换："
-
-#: cvgetinfo.c:378
-msgid ""
-"The transformation matrix specifies how the points in\n"
-"the source glyph should be transformed before\n"
-"they are drawn in the current glyph.\n"
-" x(new) = tm[1,1]*x + tm[2,1]*y + tm[3,1]\n"
-" y(new) = tm[1,2]*x + tm[2,2]*y + tm[3,2]"
-msgstr ""
-
-#
-#: cvgetinfo.c:407
-msgid "_Use My Metrics"
-msgstr "使用自定义尺寸(_U)"
-
-#: cvgetinfo.c:414
-msgid ""
-"Only relevant in a truetype font, this flag indicates that the width\n"
-"of the composite glyph should be the same as the width of this reference."
-msgstr ""
-
-#
-#: cvgetinfo.c:418
-msgid "_Round To Grid"
-msgstr "圆整到网格(_R)"
-
-#: cvgetinfo.c:425
-msgid ""
-"Only relevant in a truetype font, this flag indicates that if the reference\n"
-"is translated, then the translation should be rounded during grid fitting."
-msgstr ""
-
-#
-#: cvgetinfo.c:429
-msgid "TrueType Point _Matching:"
-msgstr "TrueType点匹配(_M):"
-
-#: cvgetinfo.c:435 cvgetinfo.c:445 cvgetinfo.c:468
-msgid ""
-"Only relevant in a truetype font, this flag indicates that this\n"
-"reference should not be translated normally, but rather its position\n"
-"should be determined by moving the reference so that the indicated\n"
-"point in the reference falls on top of the indicated point in the base\n"
-"character."
-msgstr ""
-
-#: cvgetinfo.c:500
-msgid "Bounding Box:"
-msgstr ""
-
-#: cvgetinfo.c:527 cvstroke.c:2288 tilepath.c:1843
-msgid "X:"
-msgstr ""
-
-#: cvgetinfo.c:534 cvstroke.c:2301 tilepath.c:1859
-msgid "Y:"
-msgstr ""
-
-#
-#: cvgetinfo.c:567 cvgetinfo.c:3734 metricsview.c:3277
-msgid "_Show"
-msgstr "显示(_S)"
-
-#
-#: cvgetinfo.c:658
-msgid "Image Info"
-msgstr "图像信息"
-
-#
-#: cvgetinfo.c:668
-#, c-format
-msgid "Image at:      (%.0f,%.0f)"
-msgstr "图像位于:      (%.0f,%.0f)"
-
-#
-#: cvgetinfo.c:678
-#, c-format
-msgid "Scaled by:    (%.2f,%.2f)"
-msgstr "缩放:    (%.2f,%.2f)"
-
-#
-#: cvgetinfo.c:687
-#, c-format
-msgid "Image Size:  %d x %d  pixels"
-msgstr "Image Size:  %d x %d  pixels"
-
-#
-#: cvgetinfo.c:980
-msgid "Last Anchor Point"
-msgstr "上一锚点"
-
-#: cvgetinfo.c:980
-msgid ""
-"You are deleting the last anchor point in this character.\n"
-"Doing so will cause this dialog to close, is that what you want?"
-msgstr ""
-
-#
-#: cvgetinfo.c:1097
-msgid "Out Of Order"
-msgstr "失序"
-
-#: cvgetinfo.c:1097
-#, c-format
-msgid ""
-"Marks within a ligature should be ordered with the direction of writing.\n"
-"This one and %d are out of order."
-msgstr ""
-
-#
-#: cvgetinfo.c:1112 cvgetinfo.c:1528
-msgid "Lig Index:"
-msgstr "连字索引："
-
-#
-#: cvgetinfo.c:1122
-msgid "Index in use"
-msgstr "索引正使用"
-
-#
-#: cvgetinfo.c:1122
-msgid "This ligature index is already in use"
-msgstr "此连字索引正被使用"
-
-#
-#: cvgetinfo.c:1130
-msgid "Too Big"
-msgstr "太大"
-
-#
-#: cvgetinfo.c:1130
-msgid "This index is much larger than the closest neighbor"
-msgstr "此索引相比邻近值过大"
-
-#
-#: cvgetinfo.c:1197
-msgid "Class already used"
-msgstr "类属已使用"
-
-#: cvgetinfo.c:1197
-msgid ""
-"This anchor class already is associated with a point in this character"
-msgstr ""
-
-#
-#: cvgetinfo.c:1353
-msgid "Anchor Point Info"
-msgstr "锚点信息"
-
-#
-#: cvgetinfo.c:1422
-msgid "Matching TTF Point:"
-msgstr "匹配TTF点："
-
-#
-#: cvgetinfo.c:1478
-msgid "Base Mark"
-msgstr "基础标记"
-
-#
-#. GT: Cursive Entry. This defines a point on the glyph that should be matched
-#. GT: with the "Cursive Exit" point of the preceding glyph.
-#. GT: This is a special way of joining letters which was developed for Urdu
-#. GT: fonts. Essentially every glyph has an entry point and an exit point.
-#. GT: When written the glyphs in sequence are aligned so that the exit point
-#. GT: of each glyph matches the entry point of the following. It means you
-#. GT: get a join such as might be expected for script. Urdu is odd because
-#. GT: letters within a word crawl diagonally up the page, but with each word
-#. GT: the writing point starts at the baseline.
-#: cvgetinfo.c:1498
-msgid "CursEntry"
-msgstr "字形入点"
-
-#
-#. GT: Cursive Exit. This defines a point on the glyph that should be matched
-#. GT: with the "Cursive Entry" point of the following glyph. This allows
-#. GT: scripts such as Urdu to work
-#: cvgetinfo.c:1512
-msgid "CursExit"
-msgstr "字形出点"
-
-#
-#: cvgetinfo.c:1551
-msgid "AnchorPoint|_New"
-msgstr "新建(_N)"
-
-#
-#: cvgetinfo.c:1978 cvgetinfo.c:1983 cvruler.c:451
-#, c-format
-msgid "Curvature: %g"
-msgstr "曲率: %g"
-
-#
-#: cvgetinfo.c:1980 cvgetinfo.c:1985
-msgid "Curvature: ?"
-msgstr "曲率:"
-
-#
-#: cvgetinfo.c:2195
-msgid "Base X"
-msgstr "基线X"
-
-#
-#: cvgetinfo.c:2197
-msgid "Base Y"
-msgstr "基线Y"
-
-#
-#: cvgetinfo.c:2235 cvgetinfo.c:2388
-msgid "Next CP X"
-msgstr "下一控制点X"
-
-#
-#: cvgetinfo.c:2243 cvgetinfo.c:2389
-msgid "Next CP Y"
-msgstr "下一控制点Y"
-
-#
-#: cvgetinfo.c:2252 cvgetinfo.c:2359
-msgid "Next CP Dist"
-msgstr "下一控制点距离"
-
-#
-#: cvgetinfo.c:2253
-msgid "Next CP Angle"
-msgstr "下一控制点角度"
-
-#
-#: cvgetinfo.c:2282 cvgetinfo.c:2329
-msgid "Prev CP Dist"
-msgstr "上一控制点距离"
-
-#
-#: cvgetinfo.c:2312 cvgetinfo.c:2419
-msgid "Prev CP X"
-msgstr "上一控制点X"
-
-#
-#: cvgetinfo.c:2320 cvgetinfo.c:2420
-msgid "Prev CP Y"
-msgstr "上一控制点Y"
-
-#
-#: cvgetinfo.c:2330
-msgid "Prev CP Angle"
-msgstr "上一控制点角度"
-
-#
-#: cvgetinfo.c:2558
-msgid "Overlapped Hints"
-msgstr "重叠消隐"
-
-#: cvgetinfo.c:2558
-#, c-format
-msgid ""
-"The hint you have just selected overlaps with <%.2f,%.2f>. You should "
-"deselect one of the two."
-msgstr ""
-
-#
-#: cvgetinfo.c:2644
-msgid "Point Info"
-msgstr "点的信息"
-
-#
-#: cvgetinfo.c:2673
-msgid "_Normal"
-msgstr "正常(_N)"
-
-#
-#: cvgetinfo.c:2685
-msgid "_Interpolated"
-msgstr "插值(_I)"
-
-#
-#: cvgetinfo.c:2702
-msgid "N_ever Interpolate"
-msgstr "从不插值(_E)"
-
-#
-#: cvgetinfo.c:2748 cvgetinfo.c:2992
-msgid "Prev CP:"
-msgstr "上一控制点："
-
-#
-#: cvgetinfo.c:2766 cvgetinfo.c:2873
-msgid "ControlPoint|Default"
-msgstr "默认"
-
-#
-#: cvgetinfo.c:2777 cvgetinfo.c:2884 displayfonts.c:621 fontinfo.c:8775
-#: fontinfo.c:8836
-msgid "Offset"
-msgstr "偏移"
-
-#
-#: cvgetinfo.c:2802 cvgetinfo.c:2909
-msgid "Dist"
-msgstr "距离"
-
-#
-#: cvgetinfo.c:2827 cvgetinfo.c:2934 nonlineartransui.c:470
-#: nonlineartransui.c:502 prefs.c:2214 transform.c:497 transform.c:506
-msgid "°"
-msgstr "°"
-
-#
-#: cvgetinfo.c:2836 cvgetinfo.c:2943
-msgid "Curvature: -0.00000000"
-msgstr "曲率: -0.00000000"
-
-#
-#: cvgetinfo.c:2856 cvgetinfo.c:3018
-msgid "Next CP:"
-msgstr "下一控制点："
-
-#
-#: cvgetinfo.c:2958
-msgid ""
-"This is the difference of the curvature between\n"
-"the next and previous splines. Contours often\n"
-"look nicer as this number approaches 0."
-msgstr ""
-"此为下一样条线与上一样条线曲率的差值。\n"
-"当此值接近 0 时，轮廓看起来会好些。\n"
-"..."
-
-#
-#: cvgetinfo.c:3051 cvgetinfo.c:3501 lookupui.c:1720
-msgid "Type:"
-msgstr "类型："
-
-#
-#: cvgetinfo.c:3128
-msgid "Location"
-msgstr "位置"
-
-#
-#: cvgetinfo.c:3132
-msgid "Hint Mask"
-msgstr "消隐蒙版"
-
-#
-#: cvgetinfo.c:3136
-msgid "Active Hints"
-msgstr "启用消隐"
-
-#
-#: cvgetinfo.c:3178 cvgetinfo.c:3598
-msgid "Prev On Contour"
-msgstr "轮廓上上一个"
-
-#
-#: cvgetinfo.c:3188 cvgetinfo.c:3608
-msgid "Next On Contour"
-msgstr "轮廓上下一个"
-
-#
-#. GT: Y is a coordinate
-#. GT: Y is a coordinate, the leading spaces help to align it
-#: cvgetinfo.c:3382 cvpointer.c:1348 fontinfo.c:8741
-msgid "Y"
-msgstr "Y"
-
-#
-#: cvgetinfo.c:3438
-msgid "Spiro Point Info"
-msgstr "Spiro点信息"
-
-#
-#: cvgetinfo.c:3752
-msgid "Dependents"
-msgstr "依赖"
-
-#
-#: cvgetinfo.c:3809
-msgid "Show"
-msgstr "显示"
-
-#
-#: cvgetinfo.c:3830
-#, c-format
-msgid "Subtable %.60s in glyph %.60s"
-msgstr "子表 %.60s 于字形 %.60s"
-
-#
-#: cvgetinfo.c:3850
-msgid "Dependent Substitutions"
-msgstr "依赖替代"
-
-#
-#: cvgridfit.c:59
-msgid "Freetype rasterization failed.\n"
-msgstr "Freetype矢量化失败。\n"
-
-#: cvgridfit.c:113
-msgid "Pointsize Y"
-msgstr ""
-
-#: cvgridfit.c:117
-msgid "Pointsize X"
-msgstr ""
-
-#: cvgridfit.c:118 deltaui.c:63 displayfonts.c:624 displayfonts.c:1263
-#: metricsview.c:2774
-msgid "DPI"
-msgstr ""
-
-#
-#: cvgridfit.c:216
-msgid "Grid Fit Parameters"
-msgstr "网格填充参数"
-
-#
-#: cvgridfit.c:228
-msgid "Debug _fpgm/prep"
-msgstr "调试 _fpgm/prep"
-
-#: cvgridfit.c:240
-msgid "Scale X/Y the same"
-msgstr ""
-
-#
-#: cvgridfit.c:253
-msgid "_DPI:"
-msgstr "_DPI:"
-
-#: cvgridfit.c:277
-msgid "_Pointsize Y:"
-msgstr ""
-
-#
-#: cvgridfit.c:328 deltaui.c:285
-msgid "_Mono"
-msgstr "_Mono"
-
-#
-#: cvgridfit.c:338 deltaui.c:294
-msgid "_Anti-Aliased"
-msgstr "抗锯齿"
-
-#
-#: cvhints.c:218 cvhints.c:679 layer2layer.c:222
-msgid "Base:"
-msgstr "基："
-
-#
-#: cvhints.c:219 cvhints.c:680 lookupui.c:4508
-msgid "Size:"
-msgstr "大小:"
-
-#
-#: cvhints.c:416
-msgid "Review Hints"
-msgstr "查看消隐"
-
-#
-#: cvhints.c:429 fontview.c:5185
-msgid "_HStem"
-msgstr "水平项(_H)"
-
-#
-#: cvhints.c:439 fontview.c:5186
-msgid "_VStem"
-msgstr "垂直项(_V)"
-
-#
-#: cvhints.c:457
-msgid "_Move Points"
-msgstr "移动点"
-
-#: cvhints.c:463
-msgid ""
-"When the hint's position is changed\n"
-"adjust the postion of any points\n"
-"which lie on that hint"
-msgstr ""
-
-#
-#: cvhints.c:509
-msgid "Cr_eate"
-msgstr "产生"
-
-#
-#: cvhints.c:519
-msgid "Re_move"
-msgstr "移除"
-
-#: cvhints.c:539
-msgid "Previous Hint."
-msgstr ""
-
-#: cvhints.c:550
-msgid "Next Hint."
-msgstr ""
-
-#: cvhints.c:555
-msgid "Regenerate Hint Substitution Points"
-msgstr ""
-
-#: cvhints.c:561
-msgid ""
-"If you have made any changes to the hints,\n"
-"then in addition to changing the glyph's hints\n"
-"refigure it's hint masks and substitution points."
-msgstr ""
-
-#
-#: cvhints.c:756
-msgid "Create Hint"
-msgstr "创建消隐"
-
-#
-#: cvhints.c:828 cvhints.c:879
-msgid "Create Horizontal Stem Hint"
-msgstr "创建水平消隐"
-
-#
-#: cvhints.c:880
-msgid "Create Vertical Stem Hint"
-msgstr "创建垂直消隐"
-
-#
-#: cvimages.c:121 cvimages.c:172 cvimages.c:325 cvimages.c:355
-msgid "Too Complex or Bad"
-msgstr "太复杂或已坏"
-
-#: cvimages.c:121 cvimages.c:172
-msgid ""
-"I'm sorry this file is too complex for me to understand (or is erroneous, or "
-"is empty)"
-msgstr ""
-
-#
-#: cvimages.c:216 cvimages.c:224 cvimages.c:229 cvimages.c:252
-msgid "Not a plate file"
-msgstr "非结构化文件"
-
-#: cvimages.c:216
-msgid ""
-"This does not seem to be a plate file\n"
-"First line wrong"
-msgstr ""
-"这个看起来不是结构化文件\n"
-"第一行有误"
-
-#: cvimages.c:224
-msgid ""
-"This does not seem to be a plate file\n"
-"Expected left paren"
-msgstr ""
-
-#: cvimages.c:229
-msgid ""
-"This does not seem to be a plate file\n"
-"Expected one of 'voc[]z'"
-msgstr ""
-
-#: cvimages.c:252
-msgid ""
-"This does not seem to be a plate file\n"
-"Expected two real numbers"
-msgstr ""
-
-#
-#: cvimages.c:325 cvimages.c:355
-msgid ""
-"I'm sorry this file is too complex for me to understand (or is erroneous)"
-msgstr "抱歉，此文件太复杂，我不能理解。 (它可能有点问题)"
-
-#
-#: cvimages.c:846
-msgid "Can't find the file"
-msgstr "未找到文件"
-
-#
-#: cvimages.c:850
-msgid "Bad xfig file"
-msgstr "不良 xfig 文件"
-
-#
-#: cvimages.c:979 cvimages.c:1090 cvimages.c:1095 cvimportdlg.c:83
-#: cvimportdlg.c:106
-msgid "Bad image file"
-msgstr "不良图形文件"
-
-#
-#: cvimages.c:979 cvimages.c:1090 cvimportdlg.c:83 cvimportdlg.c:106
-#, c-format
-msgid "Bad image file: %.100s"
-msgstr "不良图形文件: %.100s"
-
-#
-#: cvimages.c:1013 groupsdlg.c:1492 groupsdlg.c:1495
-msgid "Nothing Selected"
-msgstr "未选择"
-
-#
-#: cvimages.c:1013
-msgid "You must select a glyph before you can import an image into it"
-msgstr "应选择一个字形以便为其载入图形"
-
-#
-#: cvimages.c:1015
-msgid "More Images Than Selected Glyphs"
-msgstr "图形数量多于选择的字形数"
-
-#
-#: cvimages.c:1034 cvimages.c:1042
-msgid "Bad Template"
-msgstr "不良模板"
-
-#
-#: cvimages.c:1034
-msgid "Bad template, no extension"
-msgstr "不良模板，无扩展名"
-
-#
-#: cvimages.c:1042
-msgid "Bad template, unrecognized format"
-msgstr "不良模板，不认识的格式"
-
-#
-#: cvimages.c:1053 cvimages.c:1122
-msgid "Nothing Loaded"
-msgstr "未载入"
-
-#
-#: cvimages.c:1074
-msgid "Unicode value not in font"
-msgstr "字体中无统一码值"
-
-#
-#: cvimages.c:1074
-#, c-format
-msgid "Unicode value (%x) not in font, ignored"
-msgstr "字体中无统一码值 (%x)，忽略之"
-
-#
-#: cvimages.c:1082
-msgid "Encoding value not in font"
-msgstr "字体中无编码值"
-
-#
-#: cvimages.c:1082
-#, c-format
-msgid "Encoding value (%x) not in font, ignored"
-msgstr "字体中无编码值 (%x)，忽略之"
-
-#
-#: cvimages.c:1095
-#, c-format
-msgid "Bad image file, not a bitmap: %.100s"
-msgstr "不良图形文件，不是位图： %.100s"
-
-#
-#: cvimportdlg.c:287
-msgid "PS Interpretion"
-msgstr "PS解译"
-
-#. GT: The following strings should be concatenated together, the result
-#. GT: translated, and then broken into lines by hand. I'm sure it would
-#. GT: be better to specify this all as one string, but my widgets won't support
-#. GT: that
-#: cvimportdlg.c:303
-msgid ""
-"FontForge has some bugs in its remove overlap\n"
-"function which may cause you problems, so\n"
-"I give you the option of turning it off.\n"
-"Leave it on if possible though, it is useful."
-msgstr ""
-
-#
-#: cvimportdlg.c:326 cvstroke.c:1080 scstylesui.c:2189
-msgid "Cleanup Self Intersect"
-msgstr "清除自交叠"
-
-#: cvimportdlg.c:332 cvstroke.c:1086 scstylesui.c:259 scstylesui.c:2195
-msgid ""
-"When FontForge detects that an expanded stroke will self-intersect,\n"
-"then setting this option will cause it to try to make things nice\n"
-"by removing the intersections"
-msgstr ""
-
-#
-#: cvimportdlg.c:338
-msgid "Handle Erasers"
-msgstr "把柄清除"
-
-#: cvimportdlg.c:344
-msgid ""
-"Certain programs use pens with white ink as erasers\n"
-"If you select (blacken) this checkbox, FontForge will\n"
-"attempt to simulate that."
-msgstr ""
-
-#
-#: cvimportdlg.c:409 cvimportdlg.c:428 ../gdraw/ggadgets.c:107
-#: ../gdraw/gradio.c:73 ../gdraw/gradio.c:91 ../gdraw/gradio.c:134
-#: ../gdraw/gradio.c:152
-msgid "Image"
-msgstr "图形"
-
-#: cvimportdlg.c:411 cvimportdlg.c:432
-msgid "PDF page graphics"
-msgstr ""
-
-#: cvimportdlg.c:416
-msgid "Raph's plate files"
-msgstr "Raph 文件"
-
-#
-#: cvimportdlg.c:421 savefontdlg.c:184
-msgid "BDF"
-msgstr "BDF"
-
-#
-#: cvimportdlg.c:422
-msgid "TTF"
-msgstr "TTF"
-
-#
-#: cvimportdlg.c:423 openfontdlg.c:123
-msgid "ΤεΧ Bitmap Fonts"
-msgstr "ΤεΧ 位图字体"
-
-#
-#: cvimportdlg.c:424
-msgid "PCF (pmf)"
-msgstr "PCF (pmf)"
-
-#
-#: cvimportdlg.c:425
-msgid "Mac Bitmap"
-msgstr "Mac 位图"
-
-#
-#: cvimportdlg.c:426 savefontdlg.c:196
-msgid "Win FON"
-msgstr "Win FON"
-
-#
-#: cvimportdlg.c:427
-msgid "palm"
-msgstr "palm"
-
-#
-#: cvimportdlg.c:429
-msgid "Image Template"
-msgstr "图形模板"
-
-#
-#: cvimportdlg.c:431
-msgid "EPS Template"
-msgstr "EPS模板"
-
-#
-#: cvimportdlg.c:435
-msgid "SVG Template"
-msgstr "SVG模板"
-
-#
-#: cvimportdlg.c:437
-msgid "Glif Template"
-msgstr "Glif模板"
-
-#
-#: cvimportdlg.c:462
-msgid "Only One Font"
-msgstr "仅一字体"
-
-#
-#: cvimportdlg.c:462
-msgid "Only one font may be imported into the background"
-msgstr "仅一字体可导入为背景"
-
-#
-#: cvimportdlg.c:671
-msgid "Import"
-msgstr "导入"
-
-#
-#: cvimportdlg.c:693 fontinfo.c:6331 fontinfo.c:10204
-#: ../gdraw/gtextfield.c:1300
-msgid "_Import"
-msgstr "导入(_I)"
-
-#
-#: cvimportdlg.c:759
-msgid "As Background"
-msgstr "作为背景"
-
-#
-#: cvpalettes.c:214 cvpalettes.c:2867
-msgid "Pointer"
-msgstr "指针"
-
-#
-#: cvpalettes.c:214 cvpalettes.c:2867
-msgid "Magnify (Minify with alt)"
-msgstr "放大(按Alt缩小)"
-
-#
-#: cvpalettes.c:215
-msgid "Draw a freehand curve"
-msgstr "手绘曲线"
-
-#
-#: cvpalettes.c:215
-msgid "Scroll by hand"
-msgstr "手动滚动"
-
-#
-#: cvpalettes.c:216
-msgid "Add a curve point"
-msgstr "增加曲线点"
-
-#
-#: cvpalettes.c:216
-msgid "Add a curve point always either horizontal or vertical"
-msgstr "增加控制点，水平或垂直"
-
-#
-#: cvpalettes.c:217
-msgid "Add a corner point"
-msgstr "增加拐点"
-
-#
-#: cvpalettes.c:217
-msgid "Add a tangent point"
-msgstr "增加切点"
-
-#
-#: cvpalettes.c:218
-msgid "Add a point, then drag out its control points"
-msgstr "增加一点，然后拖动其控制点"
-
-#: cvpalettes.c:218
-msgid "Change whether spiro is active or not"
-msgstr ""
-
-#
-#: cvpalettes.c:219
-msgid "Cut splines in two"
-msgstr "分样条线为二段"
-
-#
-#: cvpalettes.c:219
-msgid "Measure distance, angle between points"
-msgstr "测量两点间距离及角度"
-
-#
-#: cvpalettes.c:220
-msgid "Scale the selection"
-msgstr "缩放选中"
-
-#
-#: cvpalettes.c:220
-msgid "Flip the selection"
-msgstr "翻转选中"
-
-#
-#: cvpalettes.c:221
-msgid "Rotate the selection"
-msgstr "旋转选中"
-
-#
-#: cvpalettes.c:221
-msgid "Skew the selection"
-msgstr "倾斜选中"
-
-#
-#: cvpalettes.c:222
-msgid "Rotate the selection in 3D and project back to plain"
-msgstr "旋转选中对象于三维空间并投影到二维"
-
-#
-#: cvpalettes.c:222
-msgid "Perform a perspective transformation on the selection"
-msgstr "对选中对象作透视变换"
-
-#
-#: cvpalettes.c:223 cvpalettes.c:224
-msgid "Rectangle or Ellipse"
-msgstr "矩形或椭圆"
-
-#
-#: cvpalettes.c:223 cvpalettes.c:224
-msgid "Polygon or Star"
-msgstr "多边形或星形"
-
-#: cvpalettes.c:226 cvpalettes.c:255
-msgid "_Pointer"
-msgstr ""
-
-#: cvpalettes.c:227 cvpalettes.c:256
-msgid "_Magnify"
-msgstr ""
-
-#: cvpalettes.c:228 cvpalettes.c:257
-msgid "_Freehand"
-msgstr ""
-
-#: cvpalettes.c:229 cvpalettes.c:258
-msgid "_Scroll"
-msgstr ""
-
-#: cvpalettes.c:235
-msgid "P_en"
-msgstr ""
-
-#: cvpalettes.c:237
-msgid "_Activate Spiro"
-msgstr ""
-
-#: cvpalettes.c:239 cvpalettes.c:268
-msgid "_Knife"
-msgstr ""
-
-#: cvpalettes.c:240 cvpalettes.c:269
-msgid "_Ruler"
-msgstr ""
-
-#: cvpalettes.c:242 cvpalettes.c:271
-msgid "Sca_le"
-msgstr ""
-
-#: cvpalettes.c:243 cvpalettes.c:272
-msgid "Flip"
-msgstr ""
-
-#: cvpalettes.c:244 cvpalettes.c:273 cvpalettes.c:275 cvstroke.c:2045
-msgid "Rotate"
-msgstr ""
-
-#: cvpalettes.c:245 cvpalettes.c:274
-msgid "Ske_w"
-msgstr ""
-
-#: cvpalettes.c:246 cvpalettes.c:276
-msgid "_3D Rotate"
-msgstr ""
-
-#: cvpalettes.c:247 cvpalettes.c:277
-msgid "Perspecti_ve"
-msgstr ""
-
-#: cvpalettes.c:249 cvpalettes.c:279
-msgid "Rectan_gle"
-msgstr ""
-
-#: cvpalettes.c:250 cvpalettes.c:280
-msgid "Pol_ygon"
-msgstr ""
-
-#
-#: cvpalettes.c:251 cvpalettes.c:281 cvpalettes.c:716 cvpalettes.c:722
-#: cvpalettes.c:3142
-msgid "Ellipse"
-msgstr "椭圆"
-
-#
-#: cvpalettes.c:252 cvpalettes.c:282 cvpalettes.c:730
-msgid "Star"
-msgstr "星形"
-
-#: cvpalettes.c:260
-msgid "G_4"
-msgstr ""
-
-#: cvpalettes.c:261
-msgid "G_2"
-msgstr ""
-
-#: cvpalettes.c:263
-msgid "Lef_t"
-msgstr ""
-
-#: cvpalettes.c:264
-msgid "Rig_ht"
-msgstr ""
-
-#: cvpalettes.c:266
-msgid "De_activate Spiro"
-msgstr ""
-
-#
-#. GT: Foreground, make it short
-#: cvpalettes.c:286 cvpalettes.c:1995 cvpalettes.c:2176
-msgid "F_ore"
-msgstr "前景(_O)"
-
-#
-#. GT: Background, make it short
-#: cvpalettes.c:288 cvpalettes.c:1997 cvpalettes.c:2165
-msgid "_Back"
-msgstr "背景(_B)"
-
-#
-#. GT: Guide layer, make it short
-#: cvpalettes.c:290 cvpalettes.c:1999 cvpalettes.c:2153 cvpalettes.c:2698
-msgid "_Guide"
-msgstr "引导(_G)"
-
-#
-#: cvpalettes.c:388
-msgid "Size of Points"
-msgstr "点的大小"
-
-#
-#: cvpalettes.c:399 cvpalettes.c:400 cvpalettes.c:437 cvpalettes.c:656
-msgid "Radius:   "
-msgstr "半径:   "
-
-#
-#: cvpalettes.c:401 cvpalettes.c:684
-msgid "Angle:"
-msgstr "角度："
-
-#
-#: cvpalettes.c:435
-msgid "Corner"
-msgstr "角"
-
-#
-#: cvpalettes.c:435 cvpalettes.c:627 tilepath.c:1139
-msgid "C_enter"
-msgstr "中心(_E)"
-
-#
-#: cvpalettes.c:437 cvpalettes.c:656
-msgid "Diameter:"
-msgstr "直径："
-
-#
-#: cvpalettes.c:495
-msgid "Shape Type"
-msgstr "形状"
-
-#
-#: cvpalettes.c:558
-msgid "Regular"
-msgstr "规则"
-
-#
-#: cvpalettes.c:565
-msgid "Points:"
-msgstr "点:"
-
-#
-#: cvpalettes.c:588
-msgid "Bounding Box"
-msgstr "边框"
-
-#
-#: cvpalettes.c:595
-msgid "Center Out"
-msgstr "中心 Out"
-
-#
-#: cvpalettes.c:716 cvpalettes.c:722 cvpalettes.c:3131
-msgid "Rectangle"
-msgstr "矩形"
-
-#
-#: cvpalettes.c:717 cvpalettes.c:723
-msgid "Round Rectangle Radius"
-msgstr "圆整矩形半径"
-
-#
-#: cvpalettes.c:730
-msgid "Polygon"
-msgstr "多边形"
-
-#
-#: cvpalettes.c:731
-msgid "Number of star points/Polygon vertices"
-msgstr "星形点数/多边形顶点数"
-
-#: cvpalettes.c:1005
-msgid ""
-"This version of fontforge was not linked with the spiro library, so you may "
-"not use them."
-msgstr ""
-
-#: cvpalettes.c:1007
-msgid ""
-"FontForge was unable to load libspiro, spiros are not available for use."
-msgstr ""
-
-#
-#: cvpalettes.c:1075 cvpalettes.c:2281
-msgid "Add a g2 curve point"
-msgstr "增加 g2 控制点"
-
-#: cvpalettes.c:1077
-msgid "Add a prev constraint point (sometimes like a tangent)"
-msgstr "增加前一约束点（有点像切点）"
-
-#: cvpalettes.c:1079
-msgid "Add a next constraint point (sometimes like a tangent)"
-msgstr "增加后一约束点（有点像切点）"
-
-#
-#: cvpalettes.c:1192 cvpalettes.c:3085
-msgid "Tools"
-msgstr "工具"
-
-#
-#: cvpalettes.c:1385
-msgid "Cannot Be Undone"
-msgstr "不能取消"
-
-#
-#: cvpalettes.c:1385
-msgid "This operation cannot be undone, do it anyway?"
-msgstr "此操作不能取消，是否继续？"
-
-#
-#: cvpalettes.c:1440
-msgid "Layer Info..."
-msgstr "层信息..."
-
-#
-#: cvpalettes.c:1440
-msgid "New Layer..."
-msgstr "新建层…"
-
-#
-#: cvpalettes.c:1440
-msgid "Del Layer"
-msgstr "删除层"
-
-#
-#: cvpalettes.c:1600 cvpalettes.c:2093 cvpalettes.c:2626 fontinfo.c:10407
-msgid "Layers"
-msgstr "层"
-
-#
-#. GT: Abbreviation for "Visible"
-#: cvpalettes.c:1637 cvpalettes.c:2108 cvpalettes.c:2653
-msgid "V"
-msgstr "V"
-
-#
-#: cvpalettes.c:1642 cvpalettes.c:1656 cvpalettes.c:1663 cvpalettes.c:1670
-#: cvpalettes.c:1768 cvpalettes.c:2113 cvpalettes.c:2136 cvpalettes.c:2142
-#: cvpalettes.c:2148 cvpalettes.c:2658 cvpalettes.c:2666 cvpalettes.c:2673
-#: cvpalettes.c:2684 cvpalettes.c:2695
-msgid "Is Layer Visible?"
-msgstr "层可见？"
-
-#
-#: cvpalettes.c:1645 cvpalettes.c:2125 cvstroke.c:2648
-msgid "Layer"
-msgstr "层"
-
-#
-#: cvpalettes.c:1650 cvpalettes.c:1783 cvpalettes.c:2122 cvpalettes.c:2130
-#: cvpalettes.c:2160 cvpalettes.c:2172 cvpalettes.c:2183
-msgid "Is Layer Editable?"
-msgstr "层可修改？"
-
-#
-#. GT: Abbreviation for "Editable"
-#: cvpalettes.c:2117
-msgid "E"
-msgstr "E"
-
-#
-#: cvpalettes.c:2274
-msgid "Get Info..."
-msgstr "获取信息…"
-
-#
-#: cvpalettes.c:2274
-msgid "Open Reference"
-msgstr "打开参照"
-
-#
-#: cvpalettes.c:2274
-msgid "Add Anchor"
-msgstr "增加锚点"
-
-#
-#: cvpalettes.c:2283
-msgid "Add a left \"tangent\" point"
-msgstr "增加左\"相切\"点"
-
-#
-#: cvpalettes.c:2285
-msgid "Add a right \"tangent\" point"
-msgstr "增加右\"相切\"点"
-
-#: cvpalettes.c:2328
-msgid "Make Clip Path"
-msgstr ""
-
-#
-#: cvpalettes.c:2676
-msgid "Bitmap"
-msgstr "位图"
-
-#
-#: cvpalettes.c:2687 effectsui.c:217
-msgid "Outline"
-msgstr "轮廓"
-
-#
-#: cvpalettes.c:2851
-msgid "Shades"
-msgstr "着色"
-
-#
-#: cvpalettes.c:2868
-msgid "Set/Clear Pixels"
-msgstr "设置/清除像素"
-
-#
-#: cvpalettes.c:2868
-msgid "Draw a Line"
-msgstr "画线"
-
-#
-#: cvpalettes.c:2869
-msgid "Shift Entire Bitmap"
-msgstr "移动整幅位图"
-
-#
-#: cvpalettes.c:2869
-msgid "Scroll Bitmap"
-msgstr "滚动位图"
-
-#
-#: cvpalettes.c:2991
-msgid ""
-"Set/Clear Pixels\n"
-"(Eyedropper with alt)"
-msgstr ""
-"设置/清除像素\n"
-"(Eyedropper with alt)"
-
-#
-#: cvpalettes.c:3137
-msgid "Filled Rectangle"
-msgstr "填充矩形"
-
-#
-#: cvpalettes.c:3147
-msgid "Filled Ellipse"
-msgstr "填充椭圆"
-
-#
-#: cvpointer.c:1165 cvpointer.c:1174 fvmetricsdlg.c:62
-msgid "Negative Width"
-msgstr "负值宽度"
-
-#: cvpointer.c:1165 cvpointer.c:1174
-msgid ""
-"Negative character widths are not allowed in TrueType.\n"
-"Do you really want a negative width?"
-msgstr ""
-
-#
-#: cvpointer.c:1354
-msgid "Search Radius"
-msgstr "搜索半径"
-
-#
-#: cvpointer.c:1431
-msgid "Select Point(s) at..."
-msgstr "选择点…"
-
-#
-#: cvpointer.c:1468 showatt.c:3158
-msgid "_Exact"
-msgstr "精确(_E)"
-
-#
-#: cvpointer.c:1477
-msgid "_Around"
-msgstr "大概(_A)"
-
-#
-#: cvpointer.c:1486
-msgid "W_ithin Rectangle"
-msgstr "矩形内(_I)"
-
-#
-#: cvpointer.c:1495
-msgid "_Radius:"
-msgstr "半径(_R)："
-
-#
-#: cvpointer.c:1503 fontinfo.c:192
-msgid "3"
-msgstr "3"
-
-#
-#: cvpointer.c:1513
-msgid "_Width:"
-msgstr "宽度(_W)："
-
-#
-#: cvruler.c:36
-#, c-format
-msgid "%s No Slope"
-msgstr "%s没有范围"
-
-#
-#: cvruler.c:48
-msgid "No Curvature"
-msgstr "无曲率"
-
-#
-#: cvruler.c:52
-#, c-format
-msgid " Curvature: %g"
-msgstr " 曲率: %g"
-
-#
-#: cvruler.c:54
-#, c-format
-msgid " Curvature: %g  Radius: %g"
-msgstr " 曲率: %g  半径: %g"
-
-#: cvruler.c:113
-#, c-format
-msgid "Normal Distance: %.2f Along Spline: %.2f"
-msgstr ""
-
-#: cvruler.c:126
-#, c-format
-msgid "Near (%f,%f) @t=%g"
-msgstr ""
-
-#
-#: cvruler.c:131 cvruler.c:136
-#, c-format
-msgid "Near (%f,%f)"
-msgstr "接近 (%f,%f)"
-
-#: cvruler.c:166
-#, c-format
-msgid "Spline Length=%.1f"
-msgstr ""
-
-#: cvruler.c:168
-#, c-format
-msgid "Spline Length=%g"
-msgstr ""
-
-#
-#: cvruler.c:177
-msgid "No Next Control Point"
-msgstr "无下一控制点"
-
-#
-#: cvruler.c:179
-#, c-format
-msgid "Next CP: (%f,%f)"
-msgstr "下一控制点: (%f,%f)"
-
-#
-#: cvruler.c:192
-msgid " Next"
-msgstr " 后"
-
-#
-#: cvruler.c:195 cvruler.c:217
-msgid "No Previous Control Point"
-msgstr "无上一控制点"
-
-#
-#: cvruler.c:197 cvruler.c:219
-#, c-format
-msgid "Prev CP: (%f,%f)"
-msgstr "上一控制点: (%f,%f)"
-
-#
-#: cvruler.c:210 cvruler.c:229
-msgid " Prev"
-msgstr " 前"
-
-#
-#: cvruler.c:400
-msgid "No curvature info"
-msgstr "无曲率信息"
-
-#
-#: cvruler.c:402
-#, c-format
-msgid "∆Curvature: %g"
-msgstr "曲率： %g"
-
-#
-#: cvruler.c:419
-msgid " Next CP"
-msgstr " 下一控制点"
-
-#
-#: cvruler.c:421
-msgid " Prev CP"
-msgstr " 上一控制点"
-
-#
-#: cvruler.c:432
-msgid "No Slope"
-msgstr "没有范围"
-
-#
-#: cvstroke.c:144 cvstroke.c:145 cvstroke.c:350 cvstroke.c:351 cvstroke.c:1028
-msgid "_Pressure:"
-msgstr "压力(_P):"
-
-#
-#: cvstroke.c:147 cvstroke.c:253 cvstroke.c:3048 fontinfo.c:4034
-msgid "Stroke _Width:"
-msgstr "笔画宽度(_W):"
-
-#: cvstroke.c:153
-msgid "No References"
-msgstr ""
-
-#: cvstroke.c:153
-msgid "No references allowed in a pen."
-msgstr ""
-
-#: cvstroke.c:156
-msgid "Nothing specified"
-msgstr ""
-
-#: cvstroke.c:156
-msgid "Please draw a convex polygon in the drawing area."
-msgstr ""
-
-#: cvstroke.c:177
-msgid "The selected contour is open, but it must be a convex polygon."
-msgstr ""
-
-#: cvstroke.c:186
-msgid ""
-"The selected spline has curved edges, but it must be a convex polygon (with "
-"straight edges)."
-msgstr ""
-
-#: cvstroke.c:198
-msgid "There are too many vertices on this polygon."
-msgstr ""
-
-#: cvstroke.c:205
-msgid "This is a line; it must enclose some area."
-msgstr ""
-
-#: cvstroke.c:208
-msgid "There aren't enough vertices to be a polygon."
-msgstr ""
-
-#: cvstroke.c:213
-msgid ""
-"There are at least 3 colinear vertices. Please remove (Edit->Merge) the "
-"selected point."
-msgstr ""
-
-#: cvstroke.c:215
-msgid ""
-"The selected vertex makes this a concave polygon. Please remove (Edit-"
-">Merge) it."
-msgstr ""
-
-#: cvstroke.c:240
-msgid "Not a convex polygon"
-msgstr ""
-
-#
-#: cvstroke.c:255 cvstroke.c:867
-msgid "Pen _Angle:"
-msgstr "画笔角度(_A):"
-
-#
-#: cvstroke.c:264
-msgid "Minor A_xis:"
-msgstr "次轴线(_X):"
-
-#
-#: cvstroke.c:270 histograms.c:376 nonlineartrans.c:405 nonlineartrans.c:412
-#: nonlineartrans.c:443
-msgid "Bad Value"
-msgstr "不良值"
-
-#
-#: cvstroke.c:270
-msgid "Removing both the internal and the external contours makes no sense"
-msgstr "将内外轮廓去除毫无意义"
-
-#: cvstroke.c:653
-msgid ""
-"Press in this square with a wacom pressure sensitive tool\n"
-"to set the pressure end-point"
-msgstr ""
-
-#
-#: cvstroke.c:734
-msgid "Expand Stroke"
-msgstr "扩展笔画"
-
-#
-#. GT: This does not mean the program, but freehand drawing
-#: cvstroke.c:736
-msgid "Freehand"
-msgstr "手绘"
-
-#: cvstroke.c:763
-msgid "Pen Type:"
-msgstr ""
-
-#: cvstroke.c:771
-msgid ""
-"_Circular\n"
-"(Elliptical)"
-msgstr ""
-
-#: cvstroke.c:782
-msgid ""
-"Ca_lligraphic\n"
-"(Rectangular)"
-msgstr ""
-
-#: cvstroke.c:793
-msgid "_Polygon"
-msgstr ""
-
-#
-#: cvstroke.c:805
-msgid "_Don't Expand"
-msgstr "不扩展(_D)"
-
-#: cvstroke.c:823
-msgid "Main Stroke _Width:"
-msgstr ""
-
-#: cvstroke.c:843
-msgid "Minor Stroke _Height:"
-msgstr ""
-
-#: cvstroke.c:861
-msgid ""
-"A calligraphic pen or an eliptical pen has two widths\n"
-"(which may be the same, giving a circular or square pen,\n"
-"or different giving an eliptical or rectangular pen)."
-msgstr ""
-
-#
-#. GT: Butt is a PostScript concept which refers to a way of ending strokes
-#. GT: In the following image the line drawn with "=" is the original, and
-#. GT: the others are the results. The "Round" style is hard to draw with
-#. GT: ASCII glyphs. If this is unclear I suggest you look at the Expand Stroke
-#. GT: dialog which has little pictures
-#. GT:
-#. GT: -----------------+    -----------------+    ----------------+--+
-#. GT:                  |                      \                      |
-#. GT: =================+    ================== )  =================  |
-#. GT:                  |                      /                      |
-#. GT: -----------------+    -----------------+    ----------------+--+
-#. GT:       Butt                 Round                Square
-#: cvstroke.c:905 cvstroke.c:3168
-msgid "_Butt"
-msgstr "平头(_B)"
-
-#
-#: cvstroke.c:915 cvstroke.c:3180
-msgid "_Round"
-msgstr "圆头(_R)"
-
-#
-#: cvstroke.c:925 cvstroke.c:3192
-msgid "S_quare"
-msgstr "方头(_Q)"
-
-#
-#: cvstroke.c:936 cvstroke.c:3160
-msgid "Line Cap"
-msgstr "线宽"
-
-#
-#: cvstroke.c:949 cvstroke.c:3235
-msgid "_Miter"
-msgstr "斜接(_M)"
-
-#
-#: cvstroke.c:959 cvstroke.c:3247
-msgid "Ro_und"
-msgstr "圆头(_U)"
-
-#
-#: cvstroke.c:969 cvstroke.c:3259
-msgid "Be_vel"
-msgstr "伞形(&V)"
-
-#
-#: cvstroke.c:979 cvstroke.c:3227
-msgid "Line Join"
-msgstr "线连接"
-
-#
-#: cvstroke.c:1061
-msgid "Remove Internal Contour"
-msgstr "移除内部轮廓"
-
-#
-#: cvstroke.c:1070
-msgid "Remove External Contour"
-msgstr "移除外部轮廓"
-
-#: cvstroke.c:1101 transform.c:740
-msgid "_Apply"
-msgstr ""
-
-#: cvstroke.c:1389 cvstroke.c:1394 cvstroke.c:1398 cvstroke.c:1402
-#: cvstroke.c:1418 cvstroke.c:1429 cvstroke.c:1437
-msgid "Bad Gradient"
-msgstr ""
-
-#: cvstroke.c:1389
-msgid "There must be at least 2 gradient stops"
-msgstr ""
-
-#: cvstroke.c:1394
-msgid "Bad offset on line %d, must be between 0% and 100%."
-msgstr ""
-
-#: cvstroke.c:1398
-#, c-format
-msgid "Bad color on line %d, must be between 000000 and ffffff."
-msgstr ""
-
-#: cvstroke.c:1402
-#, c-format
-msgid "Bad opacity on line %d, must be between 0.0 and 1.0."
-msgstr ""
-
-#: cvstroke.c:1418 cvstroke.c:1437
-msgid "You must draw a line"
-msgstr ""
-
-#: cvstroke.c:1429
-msgid "You must draw a line, with at most one additional point"
-msgstr ""
-
-#: cvstroke.c:1586
-msgid "Offset %"
-msgstr ""
-
-#: cvstroke.c:1587 ../gdraw/gbuttons.c:1065
-msgid "Color"
-msgstr ""
-
-#: cvstroke.c:1588
-msgid "Opacity"
-msgstr ""
-
-#: cvstroke.c:1663
-msgid "Gradient"
-msgstr ""
-
-#: cvstroke.c:1679
-msgid ""
-"  A linear gradient is represented by a line drawn\n"
-"from its start point to its end point.\n"
-"  A radial gradient is represented by a line drawn\n"
-"from its center whose length is the ultimate radius.\n"
-"If there is a single additional point, that point\n"
-"represents the gradient's focus, if omitted the focus\n"
-"is the same as the radius."
-msgstr ""
-
-#: cvstroke.c:1693
-msgid "Linear"
-msgstr ""
-
-#: cvstroke.c:1698
-msgid ""
-"The gradient will be a linear gradient,\n"
-"With the color change happening along\n"
-"the line drawn in the view"
-msgstr ""
-
-#: cvstroke.c:1706
-msgid "Radial"
-msgstr ""
-
-#: cvstroke.c:1711
-msgid ""
-"The gradient will be a radial gradient,\n"
-"With the color change happening in circles\n"
-"starting at the focus (if specified) and\n"
-"extending outward until it reaches the\n"
-"specified radius."
-msgstr ""
-
-#: cvstroke.c:1733
-msgid "_Pad"
-msgstr ""
-
-#: cvstroke.c:1737
-msgid ""
-"Beyond the endpoints, the gradient takes on the color at the end-points\n"
-"This does not work for PostScript linear gradients"
-msgstr ""
-
-#: cvstroke.c:1744
-msgid "Repeat"
-msgstr ""
-
-#: cvstroke.c:1748
-msgid ""
-"Beyond the endpoints the gradient repeats itself\n"
-"This does not work for PostScript gradients."
-msgstr ""
-
-#: cvstroke.c:1755
-msgid "Reflect"
-msgstr ""
-
-#: cvstroke.c:1759
-msgid ""
-"Beyond the endpoint the gradient repeats itself, but reflected.\n"
-"This does not work for PostScript gradients"
-msgstr ""
-
-#: cvstroke.c:1772
-msgid ""
-"Specify the color (& opacity) at stop points\n"
-"along the line drawn above. The offset is a\n"
-"percentage of the distance from the start to\n"
-"the end of the line. The color is a 6 (hex)\n"
-"digit number expressing an RGB color."
-msgstr ""
-
-#: cvstroke.c:2046
-msgid "Translation in X"
-msgstr ""
-
-#: cvstroke.c:2047
-msgid "Translation in Y"
-msgstr ""
-
-#: cvstroke.c:2079
-msgid "Bad Transformation matrix"
-msgstr ""
-
-#: cvstroke.c:2087
-msgid "No Glyph"
-msgstr ""
-
-#: cvstroke.c:2087
-#, c-format
-msgid "This font does not contain a glyph named \"%.40s\""
-msgstr ""
-
-#: cvstroke.c:2176 tilepath.c:1761
-msgid "Tile Pattern"
-msgstr ""
-
-#: cvstroke.c:2188
-msgid ""
-"The pattern itself should be drawn in another glyph\n"
-"of the current font. Specify a glyph name:"
-msgstr ""
-
-#: cvstroke.c:2208
-msgid "Aspect Ratio same as Tile Glyph"
-msgstr ""
-
-#
-#: cvstroke.c:2217 metricsview.c:644 tilepath.c:1791
-msgid "Width:"
-msgstr "宽度："
-
-#: cvstroke.c:2254
-msgid "Rotate:"
-msgstr ""
-
-#: cvstroke.c:2267
-msgid "Skew:"
-msgstr ""
-
-#: cvstroke.c:2280
-msgid "Translate By"
-msgstr ""
-
-#: cvstroke.c:2319
-msgid "Transform:"
-msgstr ""
-
-#
-#: cvstroke.c:2452
-msgid "Bad Color"
-msgstr "不良颜色"
-
-#
-#: cvstroke.c:2478 cvstroke.c:2487 cvstroke.c:2720 cvstroke.c:2915
-#: ../gdraw/gcolor.c:179
-msgid "Opacity:"
-msgstr "透明："
-
-#
-#: cvstroke.c:2503
-msgid "Bad Transformation Matrix"
-msgstr "不良变换矩阵"
-
-#
-#: cvstroke.c:2516 cvstroke.c:2519 cvstroke.c:2522
-msgid "Bad dash list"
-msgstr "不良横线列表"
-
-#
-#: cvstroke.c:2522
-#, c-format
-msgid "Too many dashes (at most %d allowed)"
-msgstr "过多划线 (最多允许 %d)"
-
-#
-#: cvstroke.c:2666
-msgid "Fi_ll"
-msgstr "填充(_L)"
-
-#
-#: cvstroke.c:2700 cvstroke.c:2743 cvstroke.c:2895 cvstroke.c:2939
-#: cvstroke.c:3074 cvstroke.c:3117 cvstroke.c:3204 cvstroke.c:3271
-msgid "Inherited"
-msgstr "继承"
-
-#: cvstroke.c:2756 cvstroke.c:2952
-msgid "Gradient:"
-msgstr ""
-
-#
-#: cvstroke.c:2765 cvstroke.c:2813 cvstroke.c:2961 cvstroke.c:3009
-#: scstylesui.c:170
-msgid "Add"
-msgstr "添加"
-
-#: cvstroke.c:2775 cvstroke.c:2823 cvstroke.c:2971 cvstroke.c:3019
-msgid "Edit"
-msgstr ""
-
-#: cvstroke.c:2804 cvstroke.c:3000
-msgid "Pattern:"
-msgstr ""
-
-#
-#: cvstroke.c:2860
-msgid "Stroke"
-msgstr "笔画"
-
-#
-#: cvstroke.c:3087
-msgid "Dashes"
-msgstr "短划线"
-
-#: cvstroke.c:3093 cvstroke.c:3128
-msgid ""
-"This specifies the dash pattern for a line.\n"
-"Leave this field blank for a solid line.\n"
-"Otherwise specify a list of up to 8 integers\n"
-"(between 0 and 255) which give the dash pattern\n"
-"in em-units. So \"10 10\" will draw the first\n"
-"10 units of a line, leave the next 10 blank,\n"
-"draw the next 10, and so on."
-msgstr ""
-
-#
-#: cvstroke.c:3134
-msgid "_Transform Pen:"
-msgstr "变形笔（_T）:"
-
-#
-#: cvundoes.c:2014
-msgid "Don't Warn Again"
-msgstr "不再警告"
-
-#
-#: cvundoes.c:2015 cvundoes.c:2028 fontviewbase.c:109 metricsview.c:2047
-#: searchview.c:523
-msgid "Bad Reference"
-msgstr "不良参照"
-
-#: cvundoes.c:2015
-#, c-format
-msgid ""
-"You are attempting to paste a reference to %1$s into %2$s.\n"
-"But %1$s does not exist in this font, nor can I find the original character "
-"referred to.\n"
-"It will not be copied."
-msgstr ""
-
-#
-#: cvundoes.c:2023 cvundoes.c:2244 cvundoes.c:3560 fontviewbase.c:104
-#: parsettf.c:5675 sfd.c:7641 tottf.c:1467
-msgid "Yes to _All"
-msgstr "全是(_A)"
-
-#
-#: cvundoes.c:2024 cvundoes.c:2245 cvundoes.c:3561 fontviewbase.c:106
-#: parsettf.c:5676 tottf.c:1468
-msgid "No _to All"
-msgstr "全否(_T)"
-
-#: cvundoes.c:2028
-#, c-format
-msgid ""
-"You are attempting to paste a reference to %1$s into %2$s.\n"
-"But %1$s does not exist in this font.\n"
-"Would you like to copy the original splines (or delete the reference)?"
-msgstr ""
-
-#
-#: cvundoes.c:2195
-msgid "Anchor Lost"
-msgstr "锚点丢失"
-
-#: cvundoes.c:2195
-msgid ""
-"At least one anchor point was lost when pasting from one font to another "
-"because no matching anchor class could be found in the new font."
-msgstr ""
-
-#
-#: cvundoes.c:2217
-msgid "Duplicate Anchor"
-msgstr "复制锚点"
-
-#: cvundoes.c:2217
-#, c-format
-msgid "There is already an anchor point named %1$.40s in %2$.40s."
-msgstr ""
-
-#
-#: cvundoes.c:2247
-msgid "Different Fonts"
-msgstr "不同字体"
-
-#: cvundoes.c:2247
-msgid ""
-"You are attempting to paste glyph instructions from one font to another. "
-"Generally this will not work unless the 'prep', 'fpgm' and 'cvt ' tables are "
-"the same.\n"
-"Do you want to continue anyway?"
-msgstr ""
-
-#: cvundoes.c:2452
-msgid "Please don't do that"
-msgstr "请勿如此操作"
-
-#: cvundoes.c:2452
-msgid "You may not paste a reference into this window"
-msgstr "不要粘贴参照到此窗口"
-
-#
-#: cvundoes.c:2460 cvundoes.c:3331 searchview.c:261
-msgid "Self-referential glyph"
-msgstr "自参照字形"
-
-#
-#: cvundoes.c:2460 cvundoes.c:3331 searchview.c:261
-msgid "Attempt to make a glyph that refers to itself"
-msgstr "企图创建参照自身的字形"
-
-#
-#: cvundoes.c:2491 cvundoes.c:3142 cvundoes.c:3692 cvundoes.c:3787
-msgid "No Vertical Metrics"
-msgstr "无垂直尺寸"
-
-#: cvundoes.c:2491 cvundoes.c:3142 cvundoes.c:3692 cvundoes.c:3787
-msgid ""
-"This font does not have vertical metrics enabled.\n"
-"Use Element->Font Info to enable them."
-msgstr ""
-
-#
-#: cvundoes.c:2799 cvundoes.c:2938
-msgid "Could not find original glyph"
-msgstr "未能找到原始字形"
-
-#
-#. GT: I'm not happy with this phrase. Suggestions for improvements are welcome
-#. GT:  Here I am generating a list of lookup names representing data that can
-#. GT:  be copied from one glyph to another. For a kerning (pairwise) lookup
-#. GT:  the first entry in the list (marked by the lookup name by itself) will
-#. GT:  mean all data where the current glyph is the first glyph in a kerning
-#. GT:  pair. But we can also (separatedly) copy data where the current glyph
-#. GT:  is the second glyph in the kerning pair, and that's what this line
-#. GT:  refers to. The "%s" will be filled in with the lookup name
-#: cvundoes.c:2851
-#, c-format
-msgid "Second glyph of %s"
-msgstr "%s的次字形"
-
-#
-#: cvundoes.c:2866
-msgid "No lookups to copy"
-msgstr "没有要复制的查找"
-
-#
-#: cvundoes.c:2884 justifydlg.c:46
-msgid "Lookups"
-msgstr "查找"
-
-#: cvundoes.c:2885
-msgid "Choose which lookups to copy"
-msgstr "选择要的查找"
-
-#
-#: cvundoes.c:3055
-msgid "Self-referential character"
-msgstr "自参照字符"
-
-#
-#: cvundoes.c:3055
-msgid "Attempt to make a character that refers to itself"
-msgstr "企图创建参照自身的字符"
-
-#
-#: cvundoes.c:3413 cvundoes.c:3441
-msgid "No selection\n"
-msgstr "无选中\n"
-
-#
-#: cvundoes.c:3564
-msgid "Bitmap Paste"
-msgstr "位图粘贴"
-
-#
-#: cvundoes.c:3657
-msgid "Pasting..."
-msgstr "粘贴…"
-
-#: deltaui.c:62
-msgid "Proximity"
-msgstr ""
-
-#: deltaui.c:67
-msgid "The \"Proximity\" field must be more than 0 and less than a half."
-msgstr ""
-
-#: deltaui.c:71
-msgid "Unreasonable DPI"
-msgstr ""
-
-#: deltaui.c:71
-msgid "The \"DPI\" field must be more than 10 and less than 5000."
-msgstr ""
-
-#: deltaui.c:98
-msgid "An entry in the \"Sizes\" field is not a number."
-msgstr ""
-
-#: deltaui.c:101
-msgid "An entry in the \"Sizes\" field is unreasonable."
-msgstr ""
-
-#: deltaui.c:104
-msgid "An range in the \"Sizes\" field is incorrectly ordered."
-msgstr ""
-
-#: deltaui.c:107
-msgid "FreeType unavailable"
-msgstr ""
-
-#: deltaui.c:107
-msgid "FreeType unavailable."
-msgstr ""
-
-#: deltaui.c:110
-msgid "Unexpected error"
-msgstr ""
-
-#: deltaui.c:125
-msgid "Nothing found"
-msgstr ""
-
-#: deltaui.c:125
-msgid "Nothng found."
-msgstr ""
-
-#: deltaui.c:179 deltaui.c:183
-msgid "No FreeType"
-msgstr ""
-
-#: deltaui.c:179
-msgid "You must install the freetype library before using this command."
-msgstr ""
-
-#: deltaui.c:183
-msgid ""
-"Your version of the freetype library does not contain the bytecode "
-"interpreter."
-msgstr ""
-
-#: deltaui.c:200
-msgid "No Instructions"
-msgstr ""
-
-#: deltaui.c:200
-msgid ""
-"This glyph has no instructions. Adding instructions (a DELTA) may change its "
-"rasterization significantly."
-msgstr ""
-
-#: deltaui.c:210
-msgid "Not quadratic"
-msgstr ""
-
-#: deltaui.c:210
-msgid "This must be a truetype layer."
-msgstr ""
-
-#: deltaui.c:224
-msgid "DELTA suggestions"
-msgstr ""
-
-#: deltaui.c:238
-msgid ""
-"When a curve passes very close to the center of a\n"
-"pixel you might want to check that the curve is on\n"
-"the intended side of that pixel.\n"
-"If it's on the wrong side, consider using a DELTA\n"
-"instruction to adjust the closest point at the\n"
-"current pixelsize."
-msgstr ""
-
-#: deltaui.c:252
-msgid "Rasterize at sizes:"
-msgstr ""
-
-#: deltaui.c:268 displayfonts.c:1833 metricsview.c:2871
-msgid "DPI:"
-msgstr ""
-
-#: deltaui.c:302
-msgid "Proximity:"
-msgstr ""
-
-#: deltaui.c:319
-msgid "pixels"
-msgstr ""
-
-#: deltaui.c:327
-msgid "This may take a while. Please be patient..."
-msgstr ""
-
-#: deltaui.c:398
-msgid "Glyph, Size, Point"
-msgstr ""
-
-#: deltaui.c:399
-msgid "Glyph, Point, Size"
-msgstr ""
-
-#: deltaui.c:400
-msgid "Size, Glyph, Point"
-msgstr ""
-
-#: deltaui.c:405
-msgid "Sort|Alphabetic"
-msgstr ""
-
-#: deltaui.c:406
-msgid "Glyph Order"
-msgstr ""
-
-#: deltaui.c:633 deltaui.c:645 deltaui.c:789 deltaui.c:801
-#, c-format
-msgid "Size: %d (%d)"
-msgstr ""
-
-#: deltaui.c:667 deltaui.c:679
-#, c-format
-msgid "Point: %d (%d)"
-msgstr ""
-
-#: deltaui.c:850
-#, c-format
-msgid "\"%.40s\" size=%d point=%d (%d,%d) distance=%g"
-msgstr ""
-
-#: deltaui.c:978
-msgid "Potential spots for Delta instructions"
-msgstr ""
-
-#: deltaui.c:1005
-msgid "Sort:"
-msgstr ""
-
-#: deltaui.c:1019
-msgid "Glyph:"
-msgstr ""
-
-#
-#: diffstubs.c:1278 lookups.c:1516
-msgid "State Machine"
-msgstr "状态机"
-
-#
-#: diffstubs.c:1280 fontinfo.c:6513 lookups.c:1520
-msgid "LookupType|Unknown"
-msgstr "未知"
-
-#
-#. GT: This string is used to generate a name for each OpenType lookup.
-#. GT: The %s will be filled with the user friendly name of the feature used to invoke the lookup
-#. GT: The second %s (if present) is the script
-#. GT: While the %d is the index into the lookup list and is used to disambiguate it
-#. GT: In case that is needed
-#: diffstubs.c:1330 lookups.c:1581
-#, c-format
-msgid "%s in %s lookup %d"
-msgstr "%s (%s中) 查找 %d"
-
-#
-#: diffstubs.c:1334 lookups.c:1585
-#, c-format
-msgid "%s lookup %d"
-msgstr "%s 查找 %d"
-
-#
-#. GT: This string is used to generate a name for an OpenType lookup subtable.
-#. GT:  %s is the lookup name
-#: diffstubs.c:1351 lookups.c:1602 parsettfatt.c:5943
-#, c-format
-msgid "%s subtable"
-msgstr "%s替代表"
-
-#
-#. GT: This string is used to generate a name for an OpenType lookup subtable.
-#. GT:  %s is the lookup name, %d is the index of the subtable in the lookup
-#: diffstubs.c:1355 lookups.c:1606
-#, c-format
-msgid "%s per glyph data %d"
-msgstr "%s 每个字形数据 %d"
-
-#
-#: diffstubs.c:1357 lookups.c:1608
-#, c-format
-msgid "%s kerning class %d"
-msgstr "%s 压缩类属 %d"
-
-#
-#: diffstubs.c:1359 lookups.c:1610
-#, c-format
-msgid "%s contextual %d"
-msgstr "%s 关联 %d"
-
-#
-#: diffstubs.c:1361 lookups.c:1612
-#, c-format
-msgid "%s anchor %d"
-msgstr "%s 锚点 %d"
-
-#
-#: displayfonts.c:104 displayfonts.c:428
-msgid "_Copies:"
-msgstr "份数(_C)："
-
-#
-#: displayfonts.c:110
-msgid "No Command Specified"
-msgstr "未指定命令"
-
-#
-#: displayfonts.c:285
-msgid "Page Setup"
-msgstr "页面设置"
-
-#
-#: displayfonts.c:336
-msgid "To _File"
-msgstr "到文件(_F)"
-
-#
-#: displayfonts.c:348
-msgid "To P_DF File"
-msgstr "到PDF文件(_D)"
-
-#
-#: displayfonts.c:360 savefontdlg.c:1031 savefontdlg.c:1112
-msgid "_Other"
-msgstr "其他(_O)"
-
-#: displayfonts.c:369
-msgid ""
-"Any other command with all its arguments.\n"
-"The command must expect to deal with a postscript\n"
-"file which it will find by reading its standard input."
-msgstr ""
-
-#
-#: displayfonts.c:391
-msgid "Page_Size:"
-msgstr "页面："
-
-#
-#: displayfonts.c:452
-msgid "_Printer:"
-msgstr "打印机(_P)："
-
-#
-#: displayfonts.c:625 fontinfo.c:8750 fontinfo.c:8811 fontinfo.c:8872
-#: fontinfo.c:10449 tilepath.c:1719
-msgid "Size"
-msgstr "大小"
-
-#
-#: displayfonts.c:664 displayfonts.c:1962
-msgid "_Pointsize:"
-msgstr "点尺寸："
-
-#
-#: displayfonts.c:668
-msgid "Invalid point size"
-msgstr "无效的点尺寸"
-
-#
-#: displayfonts.c:679
-msgid "Print To File..."
-msgstr "打印到文件…"
-
-#
-#: displayfonts.c:687 print.c:1764 print.c:2961 print.c:2966 print.c:3099
-msgid "Print Failed"
-msgstr "打印失败"
-
-#
-#: displayfonts.c:687 print.c:3099
-#, c-format
-msgid "Failed to open file %s for output"
-msgstr "未能打开文件 %s 作输出"
-
-#
-#: displayfonts.c:695 print.c:1485 print.c:3106
-msgid "Failed to open temporary output file"
-msgstr "未能打开临时输出文件"
-
-#
-#: displayfonts.c:891
-msgid "Bad Font"
-msgstr "不良字体"
-
-#
-#: displayfonts.c:1167
-msgid "Bad Size"
-msgstr "不良尺寸"
-
-#: displayfonts.c:1167
-#, c-format
-msgid "Requested bitmap size not available in font. Font supports %s"
-msgstr ""
-
-#: displayfonts.c:1484
-#, c-format
-msgid "Text Width:%4d"
-msgstr ""
-
-#
-#: displayfonts.c:1601 displayfonts.c:1990
-msgid "Print"
-msgstr "打印"
-
-#: displayfonts.c:1601
-msgid "Insert Text Outlines"
-msgstr ""
-
-#: displayfonts.c:1621
-msgid ""
-"Select some text, then use this list to change the\n"
-"font in which those characters are displayed."
-msgstr ""
-
-#: displayfonts.c:1640
-msgid ""
-"Select some text, this specifies the point\n"
-"size of those characters"
-msgstr ""
-
-#: displayfonts.c:1642
-msgid ""
-"Select some text, this specifies the vertical\n"
-"size of those characters in em-units"
-msgstr ""
-
-#: displayfonts.c:1659
-msgid ""
-"Select some text, this specifies the pixel\n"
-"size of those characters"
-msgstr ""
-
-#
-#: displayfonts.c:1663
-msgid "_AA"
-msgstr "抗锯齿(_A)"
-
-#: displayfonts.c:1673
-msgid ""
-"Select some text, this controls whether those characters will be\n"
-"AntiAlias (greymap) characters, or bitmap characters"
-msgstr ""
-
-#: displayfonts.c:1691 displayfonts.c:1703 displayfonts.c:1716
-#: displayfonts.c:1729 displayfonts.c:1743 displayfonts.c:1756
-msgid ""
-"Specifies file format used to pass the font to freetype\n"
-"  pfb -- is the standard postscript type1\n"
-"  ttf -- is truetype\n"
-"  otf -- is opentype\n"
-"  nohints -- freetype rasterizes without hints\n"
-"  bitmap -- not passed to freetype for rendering\n"
-"    bitmap fonts must already be generated\n"
-"  FontForge -- uses FontForge's own rasterizer, not\n"
-"    freetype's. Only as last resort"
-msgstr ""
-
-#
-#: displayfonts.c:1722
-msgid "nohints"
-msgstr "无消隐"
-
-#: displayfonts.c:1777
-msgid ""
-"Select some text, then use this list to specify\n"
-"the current script & language."
-msgstr ""
-
-#: displayfonts.c:1793
-msgid ""
-"Select some text, then use this list to specify\n"
-"active features."
-msgstr ""
-
-#
-#: displayfonts.c:1803 ../gdraw/gmenu.c:84 ../gdraw/gmenu.c:85
-msgid "Menu"
-msgstr "菜单"
-
-#: displayfonts.c:1837 displayfonts.c:1849
-msgid "Specifies screen dots per inch"
-msgstr "指定屏幕点距 (dpi)"
-
-#: displayfonts.c:1857
-msgid ""
-"FontForge does not update this window when a change is made to the font.\n"
-"If a font has changed press the button to force an update"
-msgstr ""
-
-#
-#: displayfonts.c:1858
-msgid "_Refresh"
-msgstr "刷新 (_R)"
-
-#: displayfonts.c:1866
-msgid "Text Width:    0"
-msgstr ""
-
-#: displayfonts.c:1873
-msgid "Wrap Pos:"
-msgstr ""
-
-#: displayfonts.c:1877 displayfonts.c:1886
-msgid "The text will wrap to a new line after this many em-units"
-msgstr ""
-
-#
-#: displayfonts.c:1906
-msgid "Display"
-msgstr "显示"
-
-#
-#: displayfonts.c:1910
-msgid "_Full Font Display"
-msgstr "全字体显示(_F)"
-
-#: displayfonts.c:1918
-msgid ""
-"Displays all the glyphs in the font on a rectangular grid at the given point "
-"size"
-msgstr ""
-
-#
-#: displayfonts.c:1927
-msgid "Full Pa_ge Glyph"
-msgstr "全页字形(_G)"
-
-#
-#: displayfonts.c:1927
-msgid "Full Pa_ge Glyphs"
-msgstr "全页字形(_G)"
-
-#: displayfonts.c:1934
-msgid ""
-"Displays all the selected characters, each on its own page, at an extremely "
-"large point size"
-msgstr ""
-
-#
-#: displayfonts.c:1938
-msgid "_Multi Size Glyph"
-msgstr "多尺寸字形(_M)"
-
-#
-#: displayfonts.c:1938
-msgid "_Multi Size Glyphs"
-msgstr "多尺寸字形(_M)"
-
-#: displayfonts.c:1945
-msgid ""
-"Displays all the selected characters, at several different point sizes"
-msgstr ""
-
-#
-#: displayfonts.c:2002
-msgid "S_etup"
-msgstr "设置(_E)"
-
-#
-#: displayfonts.c:2016
-msgid "_Print"
-msgstr "打印(_P)"
-
-#
-#: displayfonts.c:2027 kernclass.c:3196 math.c:2005
-msgid "_Done"
-msgstr "完成"
-
-#: displayfonts.c:2055
-msgid "Bind to Path"
-msgstr ""
-
-#: displayfonts.c:2069
-#, c-format
-msgid "Path Length: %g"
-msgstr ""
-
-#: displayfonts.c:2084
-msgid "Scale so text width matches path length"
-msgstr ""
-
-#: displayfonts.c:2093
-msgid "Rotate each glyph as a unit"
-msgstr ""
-
-#: displayfonts.c:2102
-msgid "Align:"
-msgstr ""
-
-#: displayfonts.c:2110
-msgid "At Start"
-msgstr ""
-
-#: displayfonts.c:2119
-msgid "Centered"
-msgstr ""
-
-#: displayfonts.c:2128
-msgid "At End"
-msgstr ""
-
-#: displayfonts.c:2143
-msgid "Offset text from path by:"
-msgstr ""
-
-#: displayfonts.c:2171
-msgid "_Insert"
-msgstr ""
-
-#
-#: dumpbdf.c:434 dumppfa.c:2813 winfonts.c:659
-#, c-format
-msgid "Can't open %s\n"
-msgstr "不能打开 %s\n"
-
-#
-#: dumpbdf.c:448
-#, c-format
-msgid "Failed to write %s\n"
-msgstr "不能写入 %s\n"
-
-#
-#: dumppfa.c:1537 fontviewbase.c:1075 tottf.c:2066
-msgid "Auto Hinting Font..."
-msgstr "自动消隐字体…"
-
-#: dumppfa.c:1573 dumppfa.c:2521
-msgid "Converting PostScript"
-msgstr ""
-
-#
-#: dumppfa.c:1577 dumppfa.c:2525 savefont.c:805
-msgid "Saving PostScript Font"
-msgstr "保存PostScript字体"
-
-#
-#: effects.c:45
-msgid "Outlining glyphs"
-msgstr "空心字形"
-
-#
-#: effects.c:80
-msgid "Inlining glyphs"
-msgstr "Inlining glyphs"
-
-#
-#: effects.c:786
-msgid "Shadowing glyphs"
-msgstr "阴影字形"
-
-#
-#: effectsui.c:147 effectsui.c:367
-msgid "Outline Width"
-msgstr "轮廓宽度"
-
-#
-#: effectsui.c:149 effectsui.c:250
-msgid "_Gap:"
-msgstr "间隔(_G)："
-
-#
-#: effectsui.c:217
-msgid "Inline"
-msgstr "内线"
-
-#
-#: effectsui.c:229 effectsui.c:422
-msgid "Outline Width:"
-msgstr "轮廓线宽："
-
-#
-#: effectsui.c:368 effectsui.c:440
-msgid "Shadow Length:"
-msgstr "阴影长度："
-
-#
-#: effectsui.c:369 effectsui.c:458
-msgid "Light Angle:"
-msgstr "光线角度："
-
-#
-#: effectsui.c:410
-msgid "Shadow"
-msgstr "阴影"
-
-#
-#: encoding.c:616 encoding.c:624
-msgid "Bad encoding file format"
-msgstr "不良编码文件格式"
-
-#: encoding.c:624
-msgid ""
-"This file contains an unnamed encoding, which cannot be named in a script"
-msgstr ""
-
-#
-#: encoding.c:628 encodingui.c:194
-msgid "Please name this encoding"
-msgstr "请为此编码命名"
-
-#: encoding.c:633 encoding.c:643
-#, c-format
-msgid "Please name the %s encoding in this file"
-msgstr ""
-
-#
-#: encoding.c:634 tilepath.c:770
-msgid "First"
-msgstr "首先"
-
-#
-#: encoding.c:635 encoding.c:644
-msgid "Second"
-msgstr "其次"
-
-#
-#: encoding.c:636 encoding.c:644
-msgid "Third"
-msgstr "其三"
-
-#: encoding.c:638 encoding.c:647
-#, c-format
-msgid "Please name the %dth encoding in this file"
-msgstr ""
-
-#
-#: encoding.c:693
-msgid "couldn't write encodings file\n"
-msgstr "不能写入编码文件\n"
-
-#
-#: encoding.c:965
-msgid "Missing cidmap file"
-msgstr "缺失cidmap文件"
-
-#
-#: encoding.c:965
-#, c-format
-msgid "Couldn't open cidmap file: %s"
-msgstr "未能打开cidmap文件： %s"
-
-#
-#: encoding.c:967
-msgid "Bad cidmap file"
-msgstr "不良cidmap文件"
-
-#: encoding.c:967 encoding.c:968
-#, c-format
-msgid ""
-"%s is not a cidmap file, please download\n"
-"http://fontforge.sourceforge.net/cidmaps.tgz"
-msgstr ""
-
-#
-#: encoding.c:1048
-msgid "_Use It"
-msgstr "采用(_U)"
-
-#
-#: encoding.c:1048
-msgid "_Search"
-msgstr "搜索(_S)"
-
-#
-#: encoding.c:1049 encoding.c:1094
-msgid "Use CID Map"
-msgstr "使用字符标识映射"
-
-#: encoding.c:1049
-#, c-format
-msgid ""
-"This font is based on the charset %1$.20s-%2$.20s-%3$d, but the best I've "
-"been able to find is %1$.20s-%2$.20s-%4$d.\n"
-"Shall I use that or let you search?"
-msgstr ""
-
-#
-#: encoding.c:1071
-msgid "_Browse"
-msgstr "浏览(_B)"
-
-#
-#: encoding.c:1071
-msgid "_Give Up"
-msgstr "放弃(_G)"
-
-#
-#: encoding.c:1072
-msgid "No cidmap file..."
-msgstr "无cidmap文件..."
-
-#: encoding.c:1072
-#, c-format
-msgid ""
-"FontForge was unable to find a cidmap file for this font. It is not "
-"essential to have one, but some things will work better if you do. If you "
-"have not done so you might want to download the cidmaps from:\n"
-"   http://FontForge.sourceforge.net/cidmaps.tgz\n"
-"and then gunzip and untar them and move them to:\n"
-"  %.80s\n"
-"\n"
-"Would you like to search your local disk for an appropriate file?"
-msgstr ""
-
-#
-#: encoding.c:1081 encodingui.c:384 encodingui.c:389
-msgid "Find a cidmap file..."
-msgstr "查找cidmap文件..."
-
-#
-#: encoding.c:1094
-msgid "Are you sure you don't want to use the cidmap I found?"
-msgstr "确定不用我找到的cidmap文件？"
-
-#
-#: encoding.c:1175 encoding.c:1611
-msgid "_Add"
-msgstr "增加(_A)"
-
-#
-#: encoding.c:1176 encoding.c:1613
-msgid "Extraneous glyphs"
-msgstr "其他字形"
-
-#: encoding.c:1176 encoding.c:1613
-msgid ""
-"The current encoding contains glyphs which I cannot map to CIDs.\n"
-"Should I delete them or add them to the end (where they may conflict with "
-"future ros definitions)?"
-msgstr ""
-
-#
-#: encoding.c:1471
-msgid "Not a CID-keyed font"
-msgstr "不是有字符标识的字体"
-
-#
-#: encoding.c:1485 savefontdlg.c:1438
-msgid "Encoding Too Large"
-msgstr "编码太大"
-
-#
-#: encoding.c:1525
-msgid "MultipleEncodingIgnored"
-msgstr "多重编码忽略"
-
-#: encoding.c:1526
-#, c-format
-msgid ""
-"The glyph at CID %d is mapped to more than %d encodings. Only the first %d "
-"are handled."
-msgstr ""
-
-#
-#: encodingui.c:134
-msgid "Remove Encoding"
-msgstr "移除编码"
-
-#
-#: encodingui.c:228
-msgid "Load Encoding"
-msgstr "载入编码"
-
-#
-#: encodingui.c:381 mmdlg.c:1685
-msgid "Browse..."
-msgstr "浏览…"
-
-#
-#: encodingui.c:384
-msgid "Please select a CID ordering"
-msgstr "请选择字符标识顺序"
-
-#
-#: encodingui.c:446 parsettf.c:4476
-msgid "Custom"
-msgstr "用户"
-
-#
-#: encodingui.c:447
-msgid "Encoding|Glyph Order"
-msgstr "字形顺序"
-
-#
-#: encodingui.c:449
-msgid "ISO 8859-1  (Latin1)"
-msgstr "ISO 8859-1  (Latin1)"
-
-#
-#: encodingui.c:450
-msgid "ISO 8859-15  (Latin0)"
-msgstr "ISO 8859-15  (Latin0)"
-
-#
-#: encodingui.c:451
-msgid "ISO 8859-2  (Latin2)"
-msgstr "ISO 8859-2  (Latin2)"
-
-#
-#: encodingui.c:452
-msgid "ISO 8859-3  (Latin3)"
-msgstr "ISO 8859-3  (Latin3)"
-
-#
-#: encodingui.c:453
-msgid "ISO 8859-4  (Latin4)"
-msgstr "ISO 8859-4  (Latin4)"
-
-#
-#: encodingui.c:454
-msgid "ISO 8859-9  (Latin5)"
-msgstr "ISO 8859-9  (Latin5)"
-
-#
-#: encodingui.c:455
-msgid "ISO 8859-10  (Latin6)"
-msgstr "ISO 8859-10  (Latin6)"
-
-#
-#: encodingui.c:456
-msgid "ISO 8859-13  (Latin7)"
-msgstr "ISO 8859-13  (Latin7)"
-
-#
-#: encodingui.c:457
-msgid "ISO 8859-14  (Latin8)"
-msgstr "ISO 8859-14  (Latin8)"
-
-#
-#: encodingui.c:459
-msgid "ISO 8859-5 (Cyrillic)"
-msgstr "ISO 8859-5 (Cyrillic)"
-
-#
-#: encodingui.c:460
-msgid "KOI8-R (Cyrillic)"
-msgstr "KOI8-R (Cyrillic)"
-
-#
-#: encodingui.c:461
-msgid "ISO 8859-6 (Arabic)"
-msgstr "ISO 8859-6 (Arabic)"
-
-#
-#: encodingui.c:462
-msgid "ISO 8859-7 (Greek)"
-msgstr "ISO 8859-7 (Greek)"
-
-#
-#: encodingui.c:463
-msgid "ISO 8859-8 (Hebrew)"
-msgstr "ISO 8859-8 (Hebrew)"
-
-#
-#: encodingui.c:464
-msgid "ISO 8859-11 (Thai)"
-msgstr "ISO 8859-11 (Thai)"
-
-#
-#: encodingui.c:466
-msgid "Macintosh Latin"
-msgstr "Macintosh Latin"
-
-#
-#: encodingui.c:467
-msgid "Windows Latin (\"ANSI\")"
-msgstr "Windows Latin (\"ANSI\")"
-
-#
-#: encodingui.c:468
-msgid "Adobe Standard"
-msgstr "Adobe标准"
-
-#
-#: encodingui.c:469
-msgid "Symbol"
-msgstr "符号"
-
-#
-#: encodingui.c:470
-msgid "ΤεΧ Base (8r)"
-msgstr "ΤεΧ Base (8r)"
-
-#
-#: encodingui.c:472
-msgid "ISO 10646-1 (Unicode, BMP)"
-msgstr "ISO 10646-1(统一码, 基础页)"
-
-#
-#: encodingui.c:473
-msgid "ISO 10646-1 (Unicode, Full)"
-msgstr "ISO 10646-1(统一码, 全部)"
-
-#
-#: encodingui.c:476
-msgid "SJIS (Kanji)"
-msgstr "SJIS (Kanji)"
-
-#
-#: encodingui.c:477
-msgid "JIS 208 (Kanji)"
-msgstr "JIS 208 (Kanji)"
-
-#
-#: encodingui.c:478
-msgid "JIS 212 (Kanji)"
-msgstr "JIS 212 (Kanji)"
-
-#
-#: encodingui.c:479
-msgid "Wansung (Korean)"
-msgstr "Wansung (Korean)"
-
-#
-#: encodingui.c:480
-msgid "KSC 5601-1987 (Korean)"
-msgstr "KSC 5601-1987 (Korean)"
-
-#
-#: encodingui.c:481
-msgid "Johab (Korean)"
-msgstr "Johab (Korean)"
-
-#
-#: encodingui.c:482
-msgid "GB 2312 (Simp. Chinese)"
-msgstr "GB 2312(简体中文)"
-
-#
-#: encodingui.c:483
-msgid "EUC GB 2312 (Chinese)"
-msgstr "EUC GB 2312 (中文)"
-
-#
-#: encodingui.c:485
-msgid "EUC-GB12345"
-msgstr "EUC-GB12345"
-
-#
-#: encodingui.c:487
-msgid "Big5 (Trad. Chinese)"
-msgstr "Big5 (繁体中文)"
-
-#
-#: encodingui.c:488
-msgid "Big5 HKSCS (Trad. Chinese)"
-msgstr "Big5 HKSCS (繁体中文)"
-
-#
-#: encodingui.c:615 tottf.c:4366 tottf.c:4372 tottf.c:4378 tottf.c:4384
-#: tottf.c:4390 tottf.c:4421 tottf.c:4429
-msgid "Bad Encoding"
-msgstr "不良编码"
-
-#: featurefile.c:2456
-#, c-format
-msgid "Unparseable include on line %d of %s"
-msgstr "有不能解析的头文件处于行 %d (%s中)"
-
-#: featurefile.c:2473
-#, c-format
-msgid "Include filename too long on line %d of %s"
-msgstr ""
-
-#: featurefile.c:2481
-#, c-format
-msgid "End of file in include on line %d of %s"
-msgstr "处于行 %d (%s中)：头文件处为文件末尾"
-
-#: featurefile.c:2483
-#, c-format
-msgid "Missing close parenthesis in include on line %d of %s"
-msgstr ""
-
-#: featurefile.c:2489
-#, c-format
-msgid "No filename specified in include on line %d of %s"
-msgstr ""
-
-#: featurefile.c:2495
-#, c-format
-msgid "Includes nested too deeply on line %d of %s"
-msgstr ""
-
-#
-#: featurefile.c:2510
-#, c-format
-msgid "Could not open include file (%s) on line %d of %s"
-msgstr "未能打开头文件(%s)于行 %d (%s中)"
-
-#: featurefile.c:2588
-#, c-format
-msgid "Number too long on line %d of %s"
-msgstr "行 %d (%s中)处数字太长"
-
-#: featurefile.c:2591
-#, c-format
-msgid "Missing number on line %d of %s"
-msgstr "行 %d (%s中)处缺数字"
-
-#: featurefile.c:2620
-#, c-format
-msgid "Name, %s%s, too long on line %d of %s"
-msgstr ""
-
-#: featurefile.c:2626
-#, c-format
-msgid "Missing name on line %d of %s"
-msgstr "线行 %d (%s中)处缺名称"
-
-#: featurefile.c:2669
-#, c-format
-msgid "Unexpected character (0x%02X) on line %d of %s"
-msgstr "有未预期的字符(0x%02X) 在第%d行(%s)"
-
-#: featurefile.c:2733 featurefile.c:2753
-#, c-format
-msgid "Expected '%s' on line %d of %s"
-msgstr "需要'%s' 于行 %d (%s中)"
-
-#: featurefile.c:2746
-#, c-format
-msgid "Expected '%c' on line %d of %s"
-msgstr "需要'%c' 于行 %d (%s中)"
-
-#: featurefile.c:2756
-#, c-format
-msgid "Expected unknown token (internal error) on line %d of %s"
-msgstr ""
-
-#: featurefile.c:2799
-#, c-format
-msgid "Expected ';' at statement end on line %d of %s"
-msgstr ""
-
-#: featurefile.c:2849
-#, c-format
-msgid "Use of undefined glyph class, %s, on line %d of %s"
-msgstr ""
-
-#: featurefile.c:2861
-#, c-format
-msgid "Use of undefined mark class, %s, on line %d of %s"
-msgstr ""
-
-#: featurefile.c:2910
-#, c-format
-msgid "Reference to a CID in a non-CID-keyed font on line %d of %s"
-msgstr ""
-
-#: featurefile.c:2952
-#, c-format
-msgid "Reference to a glyph name in a CID-keyed font on line %d of %s"
-msgstr ""
-
-#: featurefile.c:3017
-#, c-format
-msgid "Expected '[' in glyph class definition on line %d of %s"
-msgstr ""
-
-#: featurefile.c:3045
-#, c-format
-msgid "Invalid CID range in glyph class on line %d of %s"
-msgstr ""
-
-#: featurefile.c:3081
-#, c-format
-msgid "Invalid glyph name range in glyph class on line %d of %s"
-msgstr ""
-
-#: featurefile.c:3113
-#, c-format
-msgid "Unexpected token in glyph class range on line %d of %s"
-msgstr ""
-
-#: featurefile.c:3122
-#, c-format
-msgid ""
-"Expected glyph name, cid, or class in glyph class definition on line %d of %s"
-msgstr ""
-
-#: featurefile.c:3220
-#, c-format
-msgid "Expected ';' in lookupflags on line %d of %s"
-msgstr "期望有';'  查找标记于行%d (%s)"
-
-#: featurefile.c:3228
-#, c-format
-msgid "Unexpected token in lookupflags on line %d of %s"
-msgstr ""
-
-#: featurefile.c:3232
-#, c-format
-msgid "No flags specified in lookupflags on line %d of %s"
-msgstr ""
-
-#: featurefile.c:3250
-#, c-format
-msgid "Expected '=' in glyph class definition on line %d of %s"
-msgstr ""
-
-#: featurefile.c:3272 featurefile.c:3281
-#, c-format
-msgid "Expected tag in languagesystem on line %d of %s"
-msgstr ""
-
-#: featurefile.c:3368
-#, c-format
-msgid "Expected integer in device table on line %d of %s"
-msgstr ""
-
-#: featurefile.c:3377
-#, c-format
-msgid "Pixel size too big in device table on line %d of %s"
-msgstr ""
-
-#: featurefile.c:3392
-#, c-format
-msgid "Expected comma in device table on line %d of %s"
-msgstr ""
-
-#: featurefile.c:3418
-#, c-format
-msgid "Expected integer in caret on line %d of %s"
-msgstr ""
-
-#: featurefile.c:3424
-#, c-format
-msgid "Expected '>' in caret on line %d of %s"
-msgstr "期望有'>'  于行%d (%s)"
-
-#: featurefile.c:3447
-#, c-format
-msgid "\"%s\" is not the name of a known named anchor on line %d of %s."
-msgstr ""
-
-#: featurefile.c:3487
-#, c-format
-msgid "Expected integer in anchor on line %d of %s"
-msgstr ""
-
-#: featurefile.c:3491
-#, c-format
-msgid "Expected 'anchor' keyword in anchor on line %d of %s"
-msgstr ""
-
-#: featurefile.c:3501
-#, c-format
-msgid "Expected '>' in anchor on line %d of %s"
-msgstr "期望有'>'  于行%d (%s)"
-
-#: featurefile.c:3513
-#, c-format
-msgid "Expected name in anchor definition on line %d of %s"
-msgstr ""
-
-#: featurefile.c:3522
-#, c-format
-msgid "Attempt to redefine anchor definition of \"%s\" on line %d of %s"
-msgstr ""
-
-#
-#: featurefile.c:3545
-msgid "Refers to Font"
-msgstr "参照到字体"
-
-#: featurefile.c:3545
-#, c-format
-msgid ""
-"Reference to a lookup which is not in the feature file but which is in the "
-"font, %.50s"
-msgstr ""
-
-#: featurefile.c:3577
-#, c-format
-msgid ""
-"\"%s\" is not the name of a known named value record on line %d of %s."
-msgstr ""
-
-#: featurefile.c:3622 featurefile.c:3738
-#, c-format
-msgid "Unexpected token in value record on line %d of %s"
-msgstr ""
-
-#: featurefile.c:3635
-#, c-format
-msgid "Expected name in value record definition on line %d of %s"
-msgstr ""
-
-#: featurefile.c:3644
-#, c-format
-msgid ""
-"Attempt to redefine value record definition of \"%s\" on line %d of %s"
-msgstr ""
-
-#: featurefile.c:3664 featurefile.c:4906
-#, c-format
-msgid ""
-"This file uses both the v1.6 and the v1.8 formats for mark classes on line "
-"%d of %s"
-msgstr ""
-
-#: featurefile.c:3671
-#, c-format
-msgid "Expected anchor in mark class definition on line %d of %s"
-msgstr ""
-
-#: featurefile.c:3681
-#, c-format
-msgid "Expected class name in mark class definition on line %d of %s"
-msgstr ""
-
-#: featurefile.c:3715 featurefile.c:4083
-#, c-format
-msgid "Lookups may only be specified after marked glyphs on line %d of %s"
-msgstr ""
-
-#: featurefile.c:3719 featurefile.c:4087
-#, c-format
-msgid "Lookups must be defined before being used on line %d of %s"
-msgstr ""
-
-#: featurefile.c:3734
-#, c-format
-msgid "Expected '>' in value record on line %d of %s"
-msgstr ""
-
-#: featurefile.c:3771 featurefile.c:3895
-#, c-format
-msgid "Expected glyph or glyphclass (after cursive) on line %d of %s"
-msgstr ""
-
-#: featurefile.c:3787
-#, c-format
-msgid "Expected two anchors (after cursive) on line %d of %s"
-msgstr ""
-
-#: featurefile.c:3910
-#, c-format
-msgid "Expected an anchor (after base/mark) on line %d of %s"
-msgstr ""
-
-#: featurefile.c:3959
-#, c-format
-msgid "Expected glyph or glyphclass (after ligature) on line %d of %s"
-msgstr ""
-
-#: featurefile.c:3973
-#, c-format
-msgid "Expected an anchor (after ligature) on line %d of %s"
-msgstr ""
-
-#: featurefile.c:4428
-#, c-format
-msgid "Internal state messed up on line %d of %s"
-msgstr ""
-
-#: featurefile.c:4461
-#, c-format
-msgid ""
-"When a single substitution is specified by glyph classes, those classes must "
-"be of the same length on line %d of %s"
-msgstr ""
-
-#: featurefile.c:4485
-#, c-format
-msgid ""
-"When a single substitution's replacement is specified by a glyph class, the "
-"thing being replaced must also be a class on line %d of %s"
-msgstr ""
-
-#: featurefile.c:4663
-#, c-format
-msgid "Lookup information attached to unmarked glyph on line %d of %s"
-msgstr ""
-
-#: featurefile.c:4684 featurefile.c:4878
-#, c-format
-msgid "Unparseable contextual sequence on line %d of %s"
-msgstr ""
-
-#: featurefile.c:4711
-#, c-format
-msgid ""
-"The ignore keyword must be followed by either position or substitute on line "
-"%d of %s"
-msgstr ""
-
-#: featurefile.c:4771
-#, c-format
-msgid "Empty subsitute on line %d of %s"
-msgstr "空替代于行%d (%s)"
-
-#: featurefile.c:4774
-#, c-format
-msgid ""
-"Reverse subsitute must have exactly one marked glyph and no lookups on line "
-"%d of %s"
-msgstr ""
-
-#: featurefile.c:4797
-#, c-format
-msgid "No substitution specified on line %d of %s"
-msgstr "无指定替代于行 %d （%s）"
-
-#: featurefile.c:4800
-#, c-format
-msgid "No marked glyphs allowed in replacement on line %d of %s"
-msgstr ""
-
-#: featurefile.c:4834
-#, c-format
-msgid "Unparseable glyph sequence in substitution on line %d of %s"
-msgstr ""
-
-#: featurefile.c:4840
-#, c-format
-msgid "Expected 'by' or 'from' keywords in substitution on line %d of %s"
-msgstr ""
-
-#: featurefile.c:4851
-#, c-format
-msgid "Expected 'by' keyword in substitution on line %d of %s"
-msgstr ""
-
-#: featurefile.c:4862
-#, c-format
-msgid "Expected a single glyph name in reverse substitution on line %d of %s"
-msgstr ""
-
-#: featurefile.c:4917
-#, c-format
-msgid "Expected glyph name or class in mark statement on line %d of %s"
-msgstr ""
-
-#: featurefile.c:5000
-#, c-format
-msgid "Empty position on line %d of %s"
-msgstr "空位于行%d (%s)"
-
-#: featurefile.c:5006
-#, c-format
-msgid "Invalid cursive position on line %d of %s"
-msgstr "无效位置于行%d （ %s）"
-
-#: featurefile.c:5019
-#, c-format
-msgid ""
-"A mark glyph (or class of marks) must be specified here on line %d of %s"
-msgstr ""
-
-#: featurefile.c:5029
-#, c-format
-msgid ""
-"Mark to base anchor statements may only have one anchor on line %d of %s"
-msgstr ""
-
-#: featurefile.c:5085
-#, c-format
-msgid "Unparseable glyph sequence in position on line %d of %s"
-msgstr ""
-
-#: featurefile.c:5220
-#, c-format
-msgid "Expected name in lookup on line %d of %s"
-msgstr "期望名称于行%d (%s)"
-
-#: featurefile.c:5237 featurefile.c:5594
-#, c-format
-msgid "Expected '{' in feature definition on line %d of %s"
-msgstr ""
-
-#: featurefile.c:5255
-#, c-format
-msgid "Unexpected end of file in lookup definition on line %d of %s"
-msgstr ""
-
-#: featurefile.c:5259
-#, c-format
-msgid "Unexpected token, %s, in lookup definition on line %d of %s"
-msgstr ""
-
-#: featurefile.c:5261
-msgid " Perhaps you meant to use the keyword 'sub' rather than 'subs'?"
-msgstr ""
-
-#: featurefile.c:5292
-#, c-format
-msgid ""
-"Mark classes must either be exactly the same or contain no common glyphs\n"
-" But the class on line %d of %s contains a match."
-msgstr ""
-
-#: featurefile.c:5304
-#, c-format
-msgid "Expected %s in lookup definition on line %d of %s"
-msgstr ""
-
-#: featurefile.c:5342
-#, c-format
-msgid "All entries in a lookup must have the same type on line %d of %s"
-msgstr ""
-
-#: featurefile.c:5349
-#, c-format
-msgid ""
-"This lookup has no effect, I can't figure out its type on line %d of %s"
-msgstr ""
-
-#: featurefile.c:5355
-#, c-format
-msgid ""
-"Mark glyphs may not be specified with this type of lookup on line %d of %s"
-msgstr ""
-
-#: featurefile.c:5385
-#, c-format
-msgid "Invalid platform for string on line %d of %s"
-msgstr "字符串无效平台于行%d (%s)"
-
-#: featurefile.c:5402 featurefile.c:5805
-#, c-format
-msgid "Expected string on line %d of %s"
-msgstr "期望字符串于行%d (%s)"
-
-#: featurefile.c:5461
-#, c-format
-msgid "End of file found in string on line %d of %s"
-msgstr ""
-
-#: featurefile.c:5557 featurefile.c:5752
-#, c-format
-msgid "Expected closing curly brace on line %d of %s"
-msgstr ""
-
-#: featurefile.c:5570
-#, c-format
-msgid "Expected tag in feature on line %d of %s"
-msgstr ""
-
-#: featurefile.c:5605
-#, c-format
-msgid "Unexpected end of file in feature definition on line %d of %s"
-msgstr ""
-
-#: featurefile.c:5620
-#, c-format
-msgid ""
-"Features inside of other features are only permitted for 'aalt' features on "
-"line %d of %s"
-msgstr ""
-
-#: featurefile.c:5625 featurefile.c:5636
-#, c-format
-msgid "Expected tag on line %d of %s"
-msgstr "期望标签于行%d (%s)"
-
-#: featurefile.c:5652
-#, c-format
-msgid "Expected ';' on line %d of %s"
-msgstr "期望';'于行%d (%s)"
-
-#: featurefile.c:5680
-#, c-format
-msgid "Unexpected token, %s, in feature definition on line %d of %s"
-msgstr ""
-
-#: featurefile.c:5690
-#, c-format
-msgid "Expected '%c%c%c%c' in lookup definition on line %d of %s"
-msgstr ""
-
-#: featurefile.c:5772
-#, c-format
-msgid "Unknown field %s on line %d of %s"
-msgstr "未知域%s于行%d (%s)"
-
-#: featurefile.c:5814
-#, c-format
-msgid "Expected integer on line %d of %s"
-msgstr "期望整数于行%d (%s)"
-
-#: featurefile.c:5847 featurefile.c:5933
-#, c-format
-msgid "Expected semicolon on line %d of %s"
-msgstr "期望分号于行%d (%s)"
-
-#: featurefile.c:5860
-#, c-format
-msgid "Expected '}' on line %d of %s"
-msgstr "期望'}'于行%d (%s)"
-
-#: featurefile.c:5891 featurefile.c:5915
-#, c-format
-msgid "Expected name or class on line %d of %s"
-msgstr "期望名称或类属于行%d (%s)"
-
-#: featurefile.c:5956
-#, c-format
-msgid "Expected comma or semicolon on line %d of %s"
-msgstr ""
-
-#: featurefile.c:5958
-#, c-format
-msgid "Expected class on line %d of %s"
-msgstr ""
-
-#: featurefile.c:5961
-#, c-format
-msgid "Expected Attach or LigatureCaret or GlyphClassDef on line %d of %s"
-msgstr ""
-
-#: featurefile.c:5967
-#, c-format
-msgid "Unexpected token in GDEF on line %d of %s"
-msgstr ""
-
-#: featurefile.c:6005
-#, c-format
-msgid ""
-"Expected either \"HorizAxis\" or \"VertAxis\" in BASE table on line %d of %s"
-msgstr ""
-
-#: featurefile.c:6031
-#, c-format
-msgid "Expected baseline tag in BASE table on line %d of %s"
-msgstr ""
-
-#: featurefile.c:6039
-#, c-format
-msgid ""
-"Expected an integer specifying baseline positions in BASE table on line %d "
-"of %s"
-msgstr ""
-
-#: featurefile.c:6066
-#, c-format
-msgid "Expected comma or semicolon in BASE table on line %d of %s"
-msgstr ""
-
-#: featurefile.c:6072
-#, c-format
-msgid "Unexpected token, %s, in BASE table on line %d of %s"
-msgstr ""
-
-#: featurefile.c:6078
-#, c-format
-msgid "Expected semicolon in BASE table on line %d of %s"
-msgstr ""
-
-#: featurefile.c:6105
-#, c-format
-msgid "Expected tag in table on line %d of %s"
-msgstr ""
-
-#: featurefile.c:6151
-#, c-format
-msgid "Expected matching tag in table on line %d of %s"
-msgstr ""
-
-#: featurefile.c:6296
-#, c-format
-msgid "FontForge does not support anonymous tables on line %d of %s"
-msgstr ""
-
-#: featurefile.c:6302
-#, c-format
-msgid "Unexpected token, %s, on line %d of %s"
-msgstr "未预期的标识,%s,于行%d (%s)"
-
-#: featurefile.c:7025
-#, c-format
-msgid "No lookup named %s"
-msgstr ""
-
-#: featurefile.c:7058
-msgid "Mismatch lookup types inside a parsed lookup"
-msgstr ""
-
-#: featurefile.c:7061
-msgid "Could not figure out a lookup type"
-msgstr ""
-
-#: featurefile.c:7071
-msgid "Mark anchors provided when nothing can use them"
-msgstr ""
-
-#
-#: featurefile.c:7486 parsettfatt.c:785
-#, c-format
-msgid "Anchor-%d"
-msgstr "锚点-%d"
-
-#
-#: featurefile.c:7580 fontinfo.c:6722
-msgid "Cannot open file"
-msgstr "无法打开文件"
-
-#
-#: featurefile.c:7580
-#, c-format
-msgid "Cannot open feature file %.120s"
-msgstr "无法打开指定的文件：%.120s"
-
-#
-#. GT: See the long comment at "Property|New"
-#. GT: The msgstr should contain a translation of "None", ignore "Interpretation|"
-#. GT: In french this could be "Aucun" or "Aucune" depending on the gender
-#. GT:  of "Interpretation"
-#: fontinfo.c:60
-msgid "Interpretation|None"
-msgstr "无"
-
-#
-#: fontinfo.c:63 fontinfo.c:856 lookupui.c:434 macenc.c:2247 macencui.c:88
-msgid "Japanese"
-msgstr "日语"
-
-#
-#: fontinfo.c:64 macenc.c:2255 macencui.c:96
-msgid "Traditional Chinese"
-msgstr "繁体中文"
-
-#
-#: fontinfo.c:65 macenc.c:2271 macencui.c:112
-msgid "Simplified Chinese"
-msgstr "简体中文"
-
-#
-#: fontinfo.c:66 fontinfo.c:864 lookupui.c:467 macenc.c:2259 macencui.c:100
-msgid "Korean"
-msgstr "朝鲜语"
-
-#
-#: fontinfo.c:70
-msgid "MacStyles|Bold"
-msgstr "粗体"
-
-#
-#: fontinfo.c:71
-msgid "MacStyles|Italic"
-msgstr "斜体"
-
-#
-#: fontinfo.c:72
-msgid "MacStyles|Condense"
-msgstr "压缩"
-
-#
-#: fontinfo.c:73
-msgid "MacStyles|Expand"
-msgstr "加宽"
-
-#
-#: fontinfo.c:74
-msgid "MacStyles|Underline"
-msgstr "下划线"
-
-#
-#: fontinfo.c:75
-msgid "MacStyles|Outline"
-msgstr "轮廓"
-
-#
-#: fontinfo.c:76
-msgid "MacStyles|Shadow"
-msgstr "阴影"
-
-#
-#: fontinfo.c:79
-msgid "Ultra-Condensed (50%)"
-msgstr "压缩至50%"
-
-#
-#: fontinfo.c:80
-msgid "Extra-Condensed (62.5%)"
-msgstr "压缩至62.5%"
-
-#
-#: fontinfo.c:81
-msgid "Condensed (75%)"
-msgstr "压缩至75%"
-
-#
-#: fontinfo.c:82
-msgid "Semi-Condensed (87.5%)"
-msgstr "压缩至87.5%"
-
-#
-#: fontinfo.c:83
-msgid "Medium (100%)"
-msgstr "正常(100%)"
-
-#
-#: fontinfo.c:84
-msgid "Semi-Expanded (112.5%)"
-msgstr "加宽至112.5%"
-
-#
-#: fontinfo.c:85
-msgid "Expanded (125%)"
-msgstr "加宽至125%"
-
-#
-#: fontinfo.c:86
-msgid "Extra-Expanded (150%)"
-msgstr "加宽至150%"
-
-#
-#: fontinfo.c:87
-msgid "Ultra-Expanded (200%)"
-msgstr "加宽至200%"
-
-#
-#: fontinfo.c:90
-msgid "100 Thin"
-msgstr "100 细"
-
-#
-#: fontinfo.c:91
-msgid "200 Extra-Light"
-msgstr "200 极淡"
-
-#
-#: fontinfo.c:92
-msgid "300 Light"
-msgstr "300 淡"
-
-#
-#: fontinfo.c:93
-msgid "400 Book"
-msgstr "400 书"
-
-#
-#: fontinfo.c:94
-msgid "500 Medium"
-msgstr "500 正常"
-
-#
-#: fontinfo.c:95
-msgid "600 Demi-Bold"
-msgstr "600 略粗"
-
-#
-#: fontinfo.c:96
-msgid "700 Bold"
-msgstr "700 粗"
-
-#
-#: fontinfo.c:97
-msgid "800 Heavy"
-msgstr "800 粗"
-
-#
-#: fontinfo.c:98
-msgid "900 Black"
-msgstr "900 黑"
-
-#
-#: fontinfo.c:101
-msgid "Never Embed/No Editing"
-msgstr "从不嵌入，不编辑"
-
-#
-#: fontinfo.c:102
-msgid "Printable Document"
-msgstr "可打印文档"
-
-#
-#: fontinfo.c:103
-msgid "Editable Document"
-msgstr "可编辑文档"
-
-#
-#: fontinfo.c:104
-msgid "Installable Font"
-msgstr "可安装字体"
-
-#
-#: fontinfo.c:107
-msgid "Serif"
-msgstr "衬线体"
-
-#
-#: fontinfo.c:108 fontinfo.c:156
-msgid "Sans-Serif"
-msgstr "无衬线体"
-
-#
-#: fontinfo.c:109
-msgid "Monospace"
-msgstr "等宽体"
-
-#
-#. GT: See the long comment at "Property|New"
-#. GT: The msgstr should contain a translation of "Script", ignore "cursive|"
-#. GT: English uses "script" to me a general writing style (latin, greek, kanji)
-#. GT: and the cursive handwriting style. Here we mean cursive handwriting.
-#: fontinfo.c:114
-msgid "cursive|Script"
-msgstr "手写体"
-
-#
-#: fontinfo.c:115
-msgid "Decorative"
-msgstr "修饰"
-
-#
-#: fontinfo.c:118
-msgid "No Classification"
-msgstr "无分类"
-
-#
-#: fontinfo.c:119
-msgid "Old Style Serifs"
-msgstr "旧体衬线(OSS)"
-
-#
-#: fontinfo.c:120
-msgid "OSS Rounded Legibility"
-msgstr "OSS 圆体"
-
-#
-#: fontinfo.c:121
-msgid "OSS Geralde"
-msgstr "OSS Geralde"
-
-#
-#: fontinfo.c:122
-msgid "OSS Venetian"
-msgstr "OSS 威尼斯体"
-
-#
-#: fontinfo.c:123
-msgid "OSS Modified Venetian"
-msgstr "OSS 威尼斯变体"
-
-#
-#: fontinfo.c:124
-msgid "OSS Dutch Modern"
-msgstr "OSS 现代荷兰语"
-
-#
-#: fontinfo.c:125
-msgid "OSS Dutch Trad"
-msgstr "OSS 传统荷兰语"
-
-#
-#: fontinfo.c:126
-msgid "OSS Contemporary"
-msgstr "OSS 当代"
-
-#
-#: fontinfo.c:127
-msgid "OSS Calligraphic"
-msgstr "OSS 书法体"
-
-#
-#: fontinfo.c:128
-msgid "OSS Miscellaneous"
-msgstr "OSS 其他"
-
-#
-#: fontinfo.c:129
-msgid "Transitional Serifs"
-msgstr "过渡衬线体(TS)"
-
-#
-#: fontinfo.c:130
-msgid "TS Direct Line"
-msgstr "TS直线体"
-
-#
-#: fontinfo.c:131
-msgid "TS Script"
-msgstr "TS手写体"
-
-#
-#: fontinfo.c:132
-msgid "TS Miscellaneous"
-msgstr "TS其他"
-
-#
-#: fontinfo.c:133
-msgid "Modern Serifs"
-msgstr "现代衬线体(MS)"
-
-#
-#: fontinfo.c:134
-msgid "MS Italian"
-msgstr "MS意大利体"
-
-#
-#: fontinfo.c:135
-msgid "MS Script"
-msgstr "MS手写体"
-
-#
-#: fontinfo.c:136
-msgid "MS Miscellaneous"
-msgstr "MS其他"
-
-#
-#: fontinfo.c:137
-msgid "Clarendon Serifs"
-msgstr "粗长衬线体(CS)"
-
-#
-#: fontinfo.c:138
-msgid "CS Clarendon"
-msgstr "CS粗长体"
-
-#
-#: fontinfo.c:139
-msgid "CS Modern"
-msgstr "CS现代体"
-
-#
-#: fontinfo.c:140
-msgid "CS Traditional"
-msgstr "CS传统体"
-
-#
-#: fontinfo.c:141
-msgid "CS Newspaper"
-msgstr "CS报刊体"
-
-#
-#: fontinfo.c:142
-msgid "CS Stub Serif"
-msgstr "CS Stub Serif"
-
-#
-#: fontinfo.c:143
-msgid "CS Monotone"
-msgstr "CS 等宽体"
-
-#
-#: fontinfo.c:144
-msgid "CS Typewriter"
-msgstr "CS打字体"
-
-#
-#: fontinfo.c:145
-msgid "CS Miscellaneous"
-msgstr "CS其他"
-
-#
-# Fuzzy
-#: fontinfo.c:146
-msgid "Slab Serifs"
-msgstr "Slab衬线体(SS)"
-
-#
-# Fuzzy
-#: fontinfo.c:147
-msgid "Slab Serifs|SS Monotone"
-msgstr "Slab衬线体(SS等宽体)"
-
-#
-# Fuzzy
-#: fontinfo.c:148
-msgid "Slab Serifs|SS Humanist"
-msgstr "Slab衬线体(SS手写体)"
-
-#
-# Fuzzy
-#: fontinfo.c:149
-msgid "Slab Serifs|SS Geometric"
-msgstr "Slab衬线体(SS几何体)"
-
-#
-# Fuzzy
-#: fontinfo.c:150
-msgid "Slab Serifs|SS Swiss"
-msgstr "Slab衬线体(SS瑞士体)"
-
-#
-# Fuzzy
-#: fontinfo.c:151
-msgid "Slab Serifs|SS Typewriter"
-msgstr "Slab衬线体(SS打字体）"
-
-#
-#: fontinfo.c:152
-msgid "Slab Serifs|SS Miscellaneous"
-msgstr "Slab衬线体(SS其他）"
-
-#
-#: fontinfo.c:153
-msgid "Freeform Serifs"
-msgstr "自由形衬线体(FS)"
-
-#
-#: fontinfo.c:154
-msgid "FS Modern"
-msgstr "FS现代"
-
-#
-#: fontinfo.c:155
-msgid "FS Miscellaneous"
-msgstr "FS其他"
-
-#: fontinfo.c:157
-msgid "Sans-Serif|SS IBM NeoGrotesque Gothic"
-msgstr ""
-
-#
-#: fontinfo.c:158
-msgid "Sans-Serif|SS Humanist"
-msgstr "无衬线体(SS手写体)"
-
-#: fontinfo.c:159
-msgid "Sans-Serif|SS Low-x Round Geometric"
-msgstr ""
-
-#: fontinfo.c:160
-msgid "Sans-Serif|SS High-x Round Geometric"
-msgstr ""
-
-#: fontinfo.c:161
-msgid "Sans-Serif|SS NeoGrotesque Gothic"
-msgstr ""
-
-#: fontinfo.c:162
-msgid "Sans-Serif|SS Modified Grotesque Gothic"
-msgstr ""
-
-#: fontinfo.c:163
-msgid "Sans-Serif|SS Typewriter Gothic"
-msgstr ""
-
-#
-#: fontinfo.c:164
-msgid "Sans-Serif|SS Matrix"
-msgstr "SS矩阵"
-
-#
-#: fontinfo.c:165
-msgid "Sans-Serif|SS Miscellaneous"
-msgstr "SS其他"
-
-#
-#: fontinfo.c:166
-msgid "Ornamentals"
-msgstr "装饰体(O)"
-
-#
-#: fontinfo.c:167
-msgid "O Engraver"
-msgstr "O Engraver"
-
-#
-#: fontinfo.c:168
-msgid "O Black Letter"
-msgstr "O 黑体"
-
-#
-#: fontinfo.c:169
-msgid "O Decorative"
-msgstr "O修饰体"
-
-#
-#: fontinfo.c:170
-msgid "O Three Dimensional"
-msgstr "O三维"
-
-#
-#: fontinfo.c:171
-msgid "O Miscellaneous"
-msgstr "O 其他"
-
-#
-#: fontinfo.c:172
-msgid "Scripts"
-msgstr "手写体(S)"
-
-#: fontinfo.c:173
-msgid "S Uncial"
-msgstr ""
-
-#
-#: fontinfo.c:174
-msgid "S Brush Joined"
-msgstr "S 笔迹相连"
-
-#
-#: fontinfo.c:175
-msgid "S Formal Joined"
-msgstr "S Formal Joined"
-
-#
-#: fontinfo.c:176
-msgid "S Monotone Joined"
-msgstr "S Monotone Joined"
-
-#
-#: fontinfo.c:177
-msgid "S Calligraphic"
-msgstr "S 书法体"
-
-#
-#: fontinfo.c:178
-msgid "S Brush Unjoined"
-msgstr "S 笔画分离"
-
-#
-#: fontinfo.c:179
-msgid "S Formal Unjoined"
-msgstr "S 形体分离"
-
-#
-#: fontinfo.c:180
-msgid "S Monotone Unjoined"
-msgstr "S 等宽分离"
-
-#
-#: fontinfo.c:181
-msgid "S Miscellaneous"
-msgstr "S 其他"
-
-#
-#: fontinfo.c:182
-msgid "Symbolic"
-msgstr "符号(Sy)"
-
-#
-#: fontinfo.c:183
-msgid "Sy Mixed Serif"
-msgstr "Sy混合衬线体"
-
-#
-#: fontinfo.c:184
-msgid "Sy Old Style Serif"
-msgstr "Sy旧式衬线体"
-
-#: fontinfo.c:185
-msgid "Sy Neo-grotesque Sans Serif"
-msgstr ""
-
-#
-#: fontinfo.c:186
-msgid "Sy Miscellaneous"
-msgstr "Sy其他"
-
-#
-#: fontinfo.c:189
-msgid "OS2Version|Automatic"
-msgstr "自动"
-
-#
-#: fontinfo.c:190 fontinfo.c:197
-msgid "1"
-msgstr "1"
-
-#
-#: fontinfo.c:191
-msgid "2"
-msgstr "2"
-
-#
-#: fontinfo.c:193
-msgid "4"
-msgstr "4"
-
-#
-#: fontinfo.c:196
-msgid "0"
-msgstr "0"
-
-#
-#: fontinfo.c:200
-msgid "PanoseFamily|Any"
-msgstr "任何"
-
-#
-#: fontinfo.c:201
-msgid "PanoseFamily|No Fit"
-msgstr "不填充"
-
-#: fontinfo.c:202
-msgid "Latin: Text & Display"
-msgstr ""
-
-#. GT: See the long comment at "Property|New"
-#. GT: The msgstr should contain a translation of "Script", ignore "cursive|"
-#. GT: English uses "script" to me a general writing style (latin, greek, kanji)
-#. GT: and the cursive handwriting style. Here we mean cursive handwriting.
-#: fontinfo.c:207
-msgid "cursive|Latin: Handwritten"
-msgstr ""
-
-#: fontinfo.c:208
-msgid "Latin: Decorative"
-msgstr ""
-
-#: fontinfo.c:209
-msgid "Latin: Pictorial/Symbol"
-msgstr ""
-
-#
-#: fontinfo.c:240
-msgid "PanoseSerifs|Any"
-msgstr "任何"
-
-#
-#: fontinfo.c:241
-msgid "PanoseSerifs|No Fit"
-msgstr "不填充"
-
-#
-#: fontinfo.c:242 fontinfo.c:604
-msgid "Cove"
-msgstr "凹形"
-
-#
-#: fontinfo.c:243 fontinfo.c:605
-msgid "Obtuse Cove"
-msgstr "钝凹形"
-
-#
-#: fontinfo.c:244 fontinfo.c:606
-msgid "Square Cove"
-msgstr "矩形凹形"
-
-#
-#: fontinfo.c:245 fontinfo.c:607
-msgid "Obtuse Square Cove"
-msgstr "钝矩形凹形"
-
-#
-#: fontinfo.c:246 fontinfo.c:608
-msgid "PanoseSerivfs|Square"
-msgstr "矩形"
-
-#
-#: fontinfo.c:247 fontinfo.c:609
-msgid "PanoseSerifs|Thin"
-msgstr "窄"
-
-#
-#: fontinfo.c:248
-msgid "Bone"
-msgstr "骨"
-
-#
-#: fontinfo.c:249 fontinfo.c:611
-msgid "Exaggerated"
-msgstr "过大"
-
-#
-#: fontinfo.c:250 fontinfo.c:612
-msgid "Triangle"
-msgstr "三角形"
-
-#
-#: fontinfo.c:251 fontinfo.c:613
-msgid "Normal Sans"
-msgstr "正常无衬线体"
-
-#
-#: fontinfo.c:252 fontinfo.c:614
-msgid "Obtuse Sans"
-msgstr "Obtuse无衬线体"
-
-#: fontinfo.c:253 fontinfo.c:615
-msgid "Perpendicular Sans"
-msgstr ""
-
-#
-#: fontinfo.c:254 fontinfo.c:616
-msgid "Flared"
-msgstr "闪光的"
-
-#
-#: fontinfo.c:255 fontinfo.c:617
-msgid "PanoseSerivfs|Rounded"
-msgstr "圆角"
-
-#
-#: fontinfo.c:258
-msgid "PanoseWeight|Any"
-msgstr "任何"
-
-#
-#: fontinfo.c:259
-msgid "PanoseWeight|No Fit"
-msgstr "不填充"
-
-#
-#: fontinfo.c:260
-msgid "Very Light"
-msgstr "略细"
-
-#
-#: fontinfo.c:261
-msgid "Light"
-msgstr "细"
-
-#
-#: fontinfo.c:262
-msgid "PanoseWeight|Thin"
-msgstr "细"
-
-#
-#: fontinfo.c:263
-msgid "Book"
-msgstr "书体"
-
-#
-#: fontinfo.c:264 fontinfo.c:463 fontinfo.c:590
-msgid "Medium"
-msgstr "一般"
-
-#
-#: fontinfo.c:265
-msgid "Demi"
-msgstr "略粗"
-
-#
-#: fontinfo.c:266
-msgid "Bold"
-msgstr "粗体"
-
-#
-#: fontinfo.c:267
-msgid "Heavy"
-msgstr "粗"
-
-#
-#: fontinfo.c:268
-msgid "Black"
-msgstr "粗"
-
-#
-#: fontinfo.c:269
-msgid "Nord"
-msgstr "诺尔省"
-
-#
-#: fontinfo.c:276
-msgid "PanoseProportion|Any"
-msgstr "任何"
-
-#
-#: fontinfo.c:277
-msgid "PanoseProportion|No Fit"
-msgstr "不填充"
-
-#
-#: fontinfo.c:278
-msgid "Old Style"
-msgstr "旧体"
-
-#
-#: fontinfo.c:279
-msgid "Modern"
-msgstr "现代"
-
-#
-#: fontinfo.c:280
-msgid "Even Width"
-msgstr "均匀宽度"
-
-#
-#: fontinfo.c:281 fontinfo.c:444
-msgid "Expanded"
-msgstr "加宽"
-
-#
-#: fontinfo.c:282 fontinfo.c:442 fontinfo.c:570
-msgid "Condensed"
-msgstr "压缩"
-
-#
-#: fontinfo.c:283 fontinfo.c:445
-msgid "Very Expanded"
-msgstr "非常宽"
-
-#
-#: fontinfo.c:284 fontinfo.c:441 fontinfo.c:569
-msgid "Very Condensed"
-msgstr "非常窄"
-
-#
-#: fontinfo.c:285 fontinfo.c:424
-msgid "Monospaced"
-msgstr "单一间距"
-
-#
-#: fontinfo.c:294 fontinfo.c:457 fontinfo.c:584
-msgid "PanoseContrast|Any"
-msgstr "任何"
-
-#
-#: fontinfo.c:295 fontinfo.c:458 fontinfo.c:585
-msgid "PanoseContrast|No Fit"
-msgstr "不填充"
-
-#
-#: fontinfo.c:296 fontinfo.c:459 fontinfo.c:586
-msgid "PanoseContrast|None"
-msgstr "无"
-
-#
-#: fontinfo.c:297
-msgid "PanoseContrast|Very Low"
-msgstr "非常低"
-
-#
-#: fontinfo.c:298
-msgid "PanoseContrast|Low"
-msgstr "低"
-
-#
-#: fontinfo.c:299
-msgid "PanoseContrast|Medium Low"
-msgstr "中低"
-
-#
-#: fontinfo.c:300
-msgid "PanoseContrast|Medium"
-msgstr "中等"
-
-#
-#: fontinfo.c:301
-msgid "PanoseContrast|Medium High"
-msgstr "中高"
-
-#
-#: fontinfo.c:302
-msgid "PanoseContrast|High"
-msgstr "高"
-
-#
-#: fontinfo.c:303
-msgid "PanoseContrast|Very High"
-msgstr "非常高"
-
-#
-#: fontinfo.c:312
-msgid "PanoseStrokeVariation|Any"
-msgstr "任何"
-
-#
-#: fontinfo.c:313
-msgid "PanoseStrokeVariation|No Fit"
-msgstr "不填充"
-
-#
-#: fontinfo.c:314
-msgid "Gradual/Diagonal"
-msgstr "对角"
-
-#
-#: fontinfo.c:315
-msgid "Gradual/Transitional"
-msgstr "交叉"
-
-#
-#: fontinfo.c:316
-msgid "Gradual/Vertical"
-msgstr "垂直"
-
-#
-#: fontinfo.c:317
-msgid "Gradual/Horizontal"
-msgstr "水平"
-
-#
-#: fontinfo.c:318
-msgid "Rapid/Vertical"
-msgstr "垂直"
-
-#
-#: fontinfo.c:319
-msgid "Rapid/Horizontal"
-msgstr "水平"
-
-#
-#: fontinfo.c:320
-msgid "Instant/Vertical"
-msgstr "垂直"
-
-#
-#: fontinfo.c:330
-msgid "PanoseArmStyle|Any"
-msgstr "任何"
-
-#
-#: fontinfo.c:331
-msgid "PanoseArmStyle|No Fit"
-msgstr "不填充"
-
-#
-#: fontinfo.c:332
-msgid "Straight Arms/Horizontal"
-msgstr "水平"
-
-#
-#: fontinfo.c:333
-msgid "Straight Arms/Wedge"
-msgstr "Wedge"
-
-#
-#: fontinfo.c:334
-msgid "Straight Arms/Vertical"
-msgstr "垂直"
-
-#: fontinfo.c:335
-msgid "Straight Arms/Single Serif"
-msgstr ""
-
-#: fontinfo.c:336
-msgid "Straight Arms/Double Serif"
-msgstr ""
-
-#: fontinfo.c:337
-msgid "Non-Straight Arms/Horizontal"
-msgstr ""
-
-#: fontinfo.c:338
-msgid "Non-Straight Arms/Wedge"
-msgstr ""
-
-#: fontinfo.c:339
-msgid "Non-Straight Arms/Vertical"
-msgstr ""
-
-#: fontinfo.c:340
-msgid "Non-Straight Arms/Single Serif"
-msgstr ""
-
-#
-#: fontinfo.c:341
-msgid "Non-Straight Arms/Double Serif"
-msgstr "非直笔/双衬线"
-
-#
-#: fontinfo.c:348
-msgid "PanoseLetterform|Any"
-msgstr "任何"
-
-#
-#: fontinfo.c:349
-msgid "PanoseLetterform|No Fit"
-msgstr "不填充"
-
-#
-#: fontinfo.c:350
-msgid "Normal/Contact"
-msgstr "连接"
-
-#
-#: fontinfo.c:351
-msgid "Normal/Weighted"
-msgstr "加粗"
-
-#
-#: fontinfo.c:352
-msgid "Normal/Boxed"
-msgstr "外框"
-
-#
-#: fontinfo.c:353
-msgid "Normal/Flattened"
-msgstr "平整"
-
-#
-#: fontinfo.c:354
-msgid "Normal/Rounded"
-msgstr "圆角"
-
-#
-#: fontinfo.c:355
-msgid "Normal/Off-Center"
-msgstr "离心"
-
-#
-#: fontinfo.c:356
-msgid "Normal/Square"
-msgstr "方框"
-
-#
-#: fontinfo.c:357
-msgid "Oblique/Contact"
-msgstr "连接"
-
-#
-#: fontinfo.c:358
-msgid "Oblique/Weighted"
-msgstr "加粗"
-
-#
-#: fontinfo.c:359
-msgid "Oblique/Boxed"
-msgstr "外框"
-
-#: fontinfo.c:360
-msgid "Oblique/Flattened"
-msgstr ""
-
-#
-#: fontinfo.c:361
-msgid "Oblique/Rounded"
-msgstr "圆角"
-
-#
-#: fontinfo.c:362
-msgid "Oblique/Off-Center"
-msgstr "离心"
-
-#
-#: fontinfo.c:363
-msgid "Oblique/Square"
-msgstr "方框"
-
-#
-#: fontinfo.c:366
-msgid "PanoseMidline|Any"
-msgstr "任何"
-
-#
-#: fontinfo.c:367
-msgid "PanoseMidline|No Fit"
-msgstr "不填充"
-
-#
-#: fontinfo.c:368
-msgid "PanoseMidline|Standard/Trimmed"
-msgstr "修整"
-
-#
-#: fontinfo.c:369
-msgid "PanoseMidline|Standard/Pointed"
-msgstr "点"
-
-#
-#: fontinfo.c:370
-msgid "PanoseMidline|Standard/Serifed"
-msgstr "衬线"
-
-#
-#: fontinfo.c:371
-msgid "PanoseMidline|High/Trimmed"
-msgstr "修整"
-
-#
-#: fontinfo.c:372
-msgid "PanoseMidline|High/Pointed"
-msgstr "点"
-
-#
-#: fontinfo.c:373
-msgid "PanoseMidline|High/Serifed"
-msgstr "衬线"
-
-#
-#: fontinfo.c:374
-msgid "PanoseMidline|Constant/Trimmed"
-msgstr "修整"
-
-#
-#: fontinfo.c:375
-msgid "PanoseMidline|Constant/Pointed"
-msgstr "点"
-
-#
-#: fontinfo.c:376
-msgid "PanoseMidline|Constant/Serifed"
-msgstr "衬线"
-
-#
-#: fontinfo.c:377
-msgid "PanoseMidline|Low/Trimmed"
-msgstr "修整"
-
-#
-#: fontinfo.c:378
-msgid "PanoseMidline|Low/Pointed"
-msgstr "点"
-
-#
-#: fontinfo.c:379
-msgid "PanoseMidline|Low/Serifed"
-msgstr "衬线"
-
-#
-#: fontinfo.c:384
-msgid "PanoseXHeight|Any"
-msgstr "任何"
-
-#
-#: fontinfo.c:385
-msgid "PanoseXHeight|No Fit"
-msgstr "不填充"
-
-#
-#: fontinfo.c:386
-msgid "PanoseXHeight|Constant/Small"
-msgstr "小"
-
-#
-#: fontinfo.c:387
-msgid "PanoseXHeight|Constant/Standard"
-msgstr "标准"
-
-#
-#: fontinfo.c:388
-msgid "PanoseXHeight|Constant/Large"
-msgstr "大"
-
-#
-#: fontinfo.c:389
-msgid "PanoseXHeight|Ducking/Small"
-msgstr "小"
-
-#
-#: fontinfo.c:390
-msgid "PanoseXHeight|Ducking/Standard"
-msgstr "标准"
-
-#
-#: fontinfo.c:391
-msgid "PanoseXHeight|Ducking/Large"
-msgstr "大"
-
-#: fontinfo.c:403
-msgid "PanoseTool|Any"
-msgstr ""
-
-#: fontinfo.c:404
-msgid "PanoseTool|No Fit"
-msgstr ""
-
-#: fontinfo.c:405
-msgid "Flat Nib"
-msgstr ""
-
-#: fontinfo.c:406
-msgid "Pressure Point"
-msgstr ""
-
-#: fontinfo.c:407
-msgid "Engraved"
-msgstr ""
-
-#: fontinfo.c:408
-msgid "Ball (Round Cap)"
-msgstr ""
-
-#: fontinfo.c:409
-msgid "Brush"
-msgstr ""
-
-#: fontinfo.c:410
-msgid "Rough"
-msgstr ""
-
-#: fontinfo.c:411
-msgid "Felt Pen/Brush Tip"
-msgstr ""
-
-#: fontinfo.c:412
-msgid "Wild Brush - Drips a lot"
-msgstr ""
-
-#: fontinfo.c:421
-msgid "PanoseSpacing|Any"
-msgstr ""
-
-#: fontinfo.c:422
-msgid "PanoseSpacing|No Fit"
-msgstr ""
-
-#: fontinfo.c:423
-msgid "Proportional Spaced"
-msgstr ""
-
-#: fontinfo.c:439
-msgid "PanoseAspectRatio|Any"
-msgstr ""
-
-#: fontinfo.c:440
-msgid "PanoseAspectRatio|No Fit"
-msgstr ""
-
-#: fontinfo.c:460 fontinfo.c:587
-msgid "Very Low"
-msgstr ""
-
-#: fontinfo.c:461 fontinfo.c:588
-msgid "Low"
-msgstr ""
-
-#: fontinfo.c:462 fontinfo.c:589
-msgid "Medium Low"
-msgstr ""
-
-#: fontinfo.c:464 fontinfo.c:591
-msgid "Medium High"
-msgstr ""
-
-#: fontinfo.c:465 fontinfo.c:592
-msgid "High"
-msgstr ""
-
-#: fontinfo.c:466 fontinfo.c:593
-msgid "Very High"
-msgstr ""
-
-#: fontinfo.c:475 fontinfo.c:658
-msgid "PanoseTopology|Any"
-msgstr ""
-
-#: fontinfo.c:476 fontinfo.c:659
-msgid "PanoseTopology|No Fit"
-msgstr ""
-
-#: fontinfo.c:477
-msgid "Roman Disconnected"
-msgstr ""
-
-#: fontinfo.c:478
-msgid "Roman Trailing"
-msgstr ""
-
-#: fontinfo.c:479
-msgid "Roman Connected"
-msgstr ""
-
-#: fontinfo.c:480
-msgid "Cursive Disconnected"
-msgstr ""
-
-#: fontinfo.c:481
-msgid "Cursive Trailing"
-msgstr ""
-
-#: fontinfo.c:482
-msgid "Cursive Connected"
-msgstr ""
-
-#: fontinfo.c:483
-msgid "Blackletter Disconnected"
-msgstr ""
-
-#: fontinfo.c:484
-msgid "Blackletter Trailing"
-msgstr ""
-
-#: fontinfo.c:485
-msgid "Blackletter Connected"
-msgstr ""
-
-#: fontinfo.c:493
-msgid "PanoseForm|Any"
-msgstr ""
-
-#: fontinfo.c:494
-msgid "PanoseForm|No Fit"
-msgstr ""
-
-#: fontinfo.c:495
-msgid "Upright/No Wrapping"
-msgstr ""
-
-#: fontinfo.c:496
-msgid "Upright/Some Wrapping"
-msgstr ""
-
-#: fontinfo.c:497
-msgid "Upright/More Wrapping"
-msgstr ""
-
-#: fontinfo.c:498
-msgid "Upright/Extreme Wrapping"
-msgstr ""
-
-#: fontinfo.c:499
-msgid "Oblique/No Wrapping"
-msgstr ""
-
-#: fontinfo.c:500
-msgid "Oblique/Some Wrapping"
-msgstr ""
-
-#: fontinfo.c:501
-msgid "Oblique/More Wrapping"
-msgstr ""
-
-#: fontinfo.c:502
-msgid "Oblique/Extreme Wrapping"
-msgstr ""
-
-#: fontinfo.c:503
-msgid "Exaggerated/No Wrapping"
-msgstr ""
-
-#: fontinfo.c:504
-msgid "Exaggerated/Some Wrapping"
-msgstr ""
-
-#: fontinfo.c:505
-msgid "Exaggerated/More Wrapping"
-msgstr ""
-
-#: fontinfo.c:506
-msgid "Exaggerated/Extreme Wrapping"
-msgstr ""
-
-#: fontinfo.c:511
-msgid "PanoseFinials|Any"
-msgstr ""
-
-#: fontinfo.c:512
-msgid "PanoseFinials|No Fit"
-msgstr ""
-
-#: fontinfo.c:513
-msgid "None/No loops"
-msgstr ""
-
-#: fontinfo.c:514
-msgid "None/Closed loops"
-msgstr ""
-
-#: fontinfo.c:515
-msgid "None/Open loops"
-msgstr ""
-
-#: fontinfo.c:516
-msgid "Sharp/No loops"
-msgstr ""
-
-#: fontinfo.c:517
-msgid "Sharp/Closed loops"
-msgstr ""
-
-#: fontinfo.c:518
-msgid "Sharp/Open loops"
-msgstr ""
-
-#: fontinfo.c:519
-msgid "Tapered/No loops"
-msgstr ""
-
-#: fontinfo.c:520
-msgid "Tapered/Closed loops"
-msgstr ""
-
-#: fontinfo.c:521
-msgid "Tapered/Open loops"
-msgstr ""
-
-#: fontinfo.c:522
-msgid "Round/No loops"
-msgstr ""
-
-#: fontinfo.c:523
-msgid "Round/Closed loops"
-msgstr ""
-
-#: fontinfo.c:524
-msgid "Round/Open loops"
-msgstr ""
-
-#: fontinfo.c:529
-msgid "PanoseXAscent|Any"
-msgstr ""
-
-#: fontinfo.c:530
-msgid "PanoseXAscent|No Fit"
-msgstr ""
-
-#: fontinfo.c:531
-msgid "PanoseXAscent|Very Low"
-msgstr ""
-
-#: fontinfo.c:532
-msgid "PanoseXAscent|Low"
-msgstr ""
-
-#: fontinfo.c:533
-msgid "PanoseXAscent|Medium"
-msgstr ""
-
-#: fontinfo.c:534
-msgid "PanoseXAscent|High"
-msgstr ""
-
-#: fontinfo.c:535
-msgid "PanoseXAscent|Very High"
-msgstr ""
-
-#: fontinfo.c:548
-msgid "PanoseClass|Any"
-msgstr ""
-
-#: fontinfo.c:549
-msgid "PanoseClass|No Fit"
-msgstr ""
-
-#: fontinfo.c:550
-msgid "Derivative"
-msgstr ""
-
-#: fontinfo.c:551
-msgid "Non-standard Topology"
-msgstr ""
-
-#: fontinfo.c:552
-msgid "Non-standard Elements"
-msgstr ""
-
-#: fontinfo.c:553
-msgid "Non-standard Aspect"
-msgstr ""
-
-#: fontinfo.c:554
-msgid "Initials"
-msgstr ""
-
-#: fontinfo.c:555
-msgid "Cartoon"
-msgstr ""
-
-#: fontinfo.c:556
-msgid "Picture Stems"
-msgstr ""
-
-#: fontinfo.c:557
-msgid "Ornamented"
-msgstr ""
-
-#: fontinfo.c:558
-msgid "Text and Background"
-msgstr ""
-
-#: fontinfo.c:559
-msgid "Collage"
-msgstr ""
-
-#: fontinfo.c:560
-msgid "Montage"
-msgstr ""
-
-#: fontinfo.c:566 fontinfo.c:713
-msgid "PanoseAspect|Any"
-msgstr ""
-
-#: fontinfo.c:567 fontinfo.c:714
-msgid "PanoseAspect|No Fit"
-msgstr ""
-
-#: fontinfo.c:568
-msgid "Super Condensed"
-msgstr ""
-
-#: fontinfo.c:572
-msgid "Extended"
-msgstr ""
-
-#: fontinfo.c:573
-msgid "Very Extended"
-msgstr ""
-
-#: fontinfo.c:574
-msgid "Super Extended"
-msgstr ""
-
-#: fontinfo.c:594
-msgid "Horizontal Low"
-msgstr ""
-
-#: fontinfo.c:595
-msgid "Horizontal Medium"
-msgstr ""
-
-#: fontinfo.c:596
-msgid "Horizontal High"
-msgstr ""
-
-#: fontinfo.c:597
-msgid "Broken"
-msgstr ""
-
-#: fontinfo.c:602
-msgid "PanoseSerifVariant|Any"
-msgstr ""
-
-#: fontinfo.c:603
-msgid "PanoseSerifVariant|No Fit"
-msgstr ""
-
-#: fontinfo.c:610
-msgid "Oval"
-msgstr ""
-
-#: fontinfo.c:619
-msgid "PanoseSerivfs|Script"
-msgstr ""
-
-#: fontinfo.c:622
-msgid "PanoseTreatment|Any"
-msgstr ""
-
-#: fontinfo.c:623
-msgid "PanoseTreatment|No Fit"
-msgstr ""
-
-#: fontinfo.c:624
-msgid "Solid Fill"
-msgstr ""
-
-#: fontinfo.c:625
-msgid "No Fill"
-msgstr ""
-
-#: fontinfo.c:626
-msgid "Patterned Fill"
-msgstr ""
-
-#: fontinfo.c:627
-msgid "Complex Fill"
-msgstr ""
-
-#: fontinfo.c:628
-msgid "Shaped Fill"
-msgstr ""
-
-#: fontinfo.c:629
-msgid "Drawn/Distressed"
-msgstr ""
-
-#: fontinfo.c:640
-msgid "PanoseLining|Any"
-msgstr ""
-
-#: fontinfo.c:641
-msgid "PanoseLining|No Fit"
-msgstr ""
-
-#: fontinfo.c:642
-msgid "PanoseLining|None"
-msgstr ""
-
-#: fontinfo.c:643
-msgid "PanoseLining|Inline"
-msgstr ""
-
-#: fontinfo.c:644
-msgid "PanoseLining|Outline"
-msgstr ""
-
-#: fontinfo.c:645
-msgid "PanoseLining|Engraved (Multiple Lines)"
-msgstr ""
-
-#: fontinfo.c:646
-msgid "PanoseLining|Shadow"
-msgstr ""
-
-#: fontinfo.c:647
-msgid "PanoseLining|Relief"
-msgstr ""
-
-#: fontinfo.c:648
-msgid "PanoseLining|Backdrop"
-msgstr ""
-
-#: fontinfo.c:660
-msgid "Standard"
-msgstr ""
-
-#: fontinfo.c:661
-msgid "Square"
-msgstr ""
-
-#: fontinfo.c:662
-msgid "Multiple Segment"
-msgstr ""
-
-#: fontinfo.c:663
-msgid "Deco (E,M,S) Waco midline"
-msgstr ""
-
-#: fontinfo.c:664
-msgid "Uneven Weighting"
-msgstr ""
-
-#: fontinfo.c:665
-msgid "Diverse Arms"
-msgstr ""
-
-#: fontinfo.c:666
-msgid "Diverse Forms"
-msgstr ""
-
-#: fontinfo.c:667
-msgid "Lombardic Forms"
-msgstr ""
-
-#: fontinfo.c:668
-msgid "Upper Case in Lower Case"
-msgstr ""
-
-#: fontinfo.c:669
-msgid "Implied Topology"
-msgstr ""
-
-#: fontinfo.c:670
-msgid "Horseshoe E and A"
-msgstr ""
-
-#: fontinfo.c:671
-msgid "Cursive"
-msgstr ""
-
-#: fontinfo.c:672
-msgid "Blackletter"
-msgstr ""
-
-#: fontinfo.c:673
-msgid "Swash Variance"
-msgstr ""
-
-#: fontinfo.c:676
-msgid "PanoseCharRange|Any"
-msgstr ""
-
-#: fontinfo.c:677
-msgid "PanoseCharRange|No Fit"
-msgstr ""
-
-#: fontinfo.c:678
-msgid "Extended Collection"
-msgstr ""
-
-#: fontinfo.c:679
-msgid "Litterals"
-msgstr ""
-
-#: fontinfo.c:680
-msgid "No Lower Case"
-msgstr ""
-
-#: fontinfo.c:681 scstylesui.c:1095
-msgid "Small Caps"
-msgstr ""
-
-#: fontinfo.c:695
-msgid "PanoseKind|Any"
-msgstr ""
-
-#: fontinfo.c:696
-msgid "PanoseKind|No Fit"
-msgstr ""
-
-#: fontinfo.c:697
-msgid "Montages"
-msgstr ""
-
-#: fontinfo.c:698
-msgid "Pictures"
-msgstr ""
-
-#: fontinfo.c:699
-msgid "Shapes"
-msgstr ""
-
-#: fontinfo.c:700
-msgid "Scientific"
-msgstr ""
-
-#: fontinfo.c:701
-msgid "Music"
-msgstr ""
-
-#: fontinfo.c:702
-msgid "Expert"
-msgstr ""
-
-#: fontinfo.c:703
-msgid "Patterns"
-msgstr ""
-
-#: fontinfo.c:704
-msgid "Borders"
-msgstr ""
-
-#: fontinfo.c:705
-msgid "Icons"
-msgstr ""
-
-#: fontinfo.c:706
-msgid "Logos"
-msgstr ""
-
-#: fontinfo.c:707
-msgid "Industry specific"
-msgstr ""
-
-#: fontinfo.c:715
-msgid "No Width"
-msgstr ""
-
-#: fontinfo.c:716
-msgid "Exceptionally Wide"
-msgstr ""
-
-#: fontinfo.c:717
-msgid "Super Wide"
-msgstr ""
-
-#: fontinfo.c:718
-msgid "Very Wide"
-msgstr ""
-
-#: fontinfo.c:719
-msgid "Wide"
-msgstr ""
-
-#: fontinfo.c:721
-msgid "Narrow"
-msgstr ""
-
-#: fontinfo.c:722
-msgid "Very Narrow"
-msgstr ""
-
-#: fontinfo.c:732 fontinfo.c:733 fontinfo.c:739
-msgid "Class2"
-msgstr ""
-
-#: fontinfo.c:732 fontinfo.c:733 fontinfo.c:739
-msgid "Class3"
-msgstr ""
-
-#: fontinfo.c:732 fontinfo.c:733 fontinfo.c:739
-msgid "Class4"
-msgstr ""
-
-#: fontinfo.c:732 fontinfo.c:733 fontinfo.c:739
-msgid "Class5"
-msgstr ""
-
-#: fontinfo.c:732 fontinfo.c:733 fontinfo.c:739
-msgid "Class6"
-msgstr ""
-
-#: fontinfo.c:732 fontinfo.c:733 fontinfo.c:739
-msgid "Class7"
-msgstr ""
-
-#: fontinfo.c:732 fontinfo.c:733 fontinfo.c:739
-msgid "Class8"
-msgstr ""
-
-#: fontinfo.c:732 fontinfo.c:733 fontinfo.c:739
-msgid "Class9"
-msgstr ""
-
-#: fontinfo.c:732 fontinfo.c:733 fontinfo.c:739
-msgid "Class10"
-msgstr ""
-
-#
-#: fontinfo.c:734 fontinfo.c:8979
-msgid "_Serifs"
-msgstr "衬线(_S)"
-
-#
-#: fontinfo.c:734 fontinfo.c:735 fontinfo.c:736 fontinfo.c:738 fontinfo.c:8997
-msgid "Panose|_Weight"
-msgstr "粗细(_W)"
-
-#
-#: fontinfo.c:734 fontinfo.c:9015
-msgid "_Proportion"
-msgstr "比例(_P)"
-
-#
-#: fontinfo.c:734 fontinfo.c:735 fontinfo.c:9033
-msgid "_Contrast"
-msgstr "对比(_C)"
-
-#
-#: fontinfo.c:734 fontinfo.c:9051
-msgid "Stroke _Variation"
-msgstr "笔画变化(_V)："
-
-#
-#: fontinfo.c:734 fontinfo.c:9069
-msgid "_Arm Style"
-msgstr "Arm样式(_A)"
-
-#
-#: fontinfo.c:734 fontinfo.c:9087
-msgid "_Letterform"
-msgstr "字母形式(_L)"
-
-#
-#: fontinfo.c:734 fontinfo.c:9105
-msgid "_Midline"
-msgstr "中线(_M)"
-
-#
-#: fontinfo.c:734 fontinfo.c:9123
-msgid "_X-Height"
-msgstr "_X高度"
-
-#: fontinfo.c:735
-msgid "_Tool"
-msgstr ""
-
-#: fontinfo.c:735 fontinfo.c:738
-msgid "_Spacing"
-msgstr ""
-
-#: fontinfo.c:735 fontinfo.c:738
-msgid "_Aspect Ratio"
-msgstr ""
-
-#: fontinfo.c:735 fontinfo.c:736
-msgid "_Topology"
-msgstr ""
-
-#: fontinfo.c:735
-msgid "F_orm"
-msgstr ""
-
-#: fontinfo.c:735
-msgid "F_inials"
-msgstr ""
-
-#: fontinfo.c:735
-msgid "_X-Ascent"
-msgstr ""
-
-#: fontinfo.c:736
-msgid "_Class"
-msgstr ""
-
-#: fontinfo.c:736
-msgid "_Aspect"
-msgstr ""
-
-#: fontinfo.c:736
-msgid "C_ontrast"
-msgstr ""
-
-#: fontinfo.c:736
-msgid "_Serif Variant"
-msgstr ""
-
-#: fontinfo.c:736
-msgid "T_reatment"
-msgstr ""
-
-#: fontinfo.c:736
-msgid "_Lining"
-msgstr ""
-
-#: fontinfo.c:736
-msgid "Char. _Range"
-msgstr ""
-
-#: fontinfo.c:738
-msgid "_Kind"
-msgstr ""
-
-#: fontinfo.c:738
-msgid "AR: Char 94"
-msgstr ""
-
-#: fontinfo.c:738
-msgid "AR: Char 119"
-msgstr ""
-
-#: fontinfo.c:738
-msgid "AR: Char 157"
-msgstr ""
-
-#: fontinfo.c:738
-msgid "AR: Char 163"
-msgstr ""
-
-#: fontinfo.c:738
-msgid "AR: Char 211"
-msgstr ""
-
-#
-#: fontinfo.c:745 lookupui.c:286 macenc.c:2346 macencui.c:187
-msgid "Afrikaans"
-msgstr "Afrikaans"
-
-#
-#: fontinfo.c:746 lookupui.c:614 macenc.c:2274 macencui.c:115
-msgid "Albanian"
-msgstr "阿尔巴尼亚语"
-
-#
-#. GT: See the long comment at "Property|New"
-#. GT: The msgstr should contain a translation of "Malayalam", ignore "Lang|"
-#. GT: See the long comment at "Property|New"
-#. GT: The msgstr should contain a translation of "Amharic", ignore "Lang|"
-#: fontinfo.c:749 lookupui.c:294 macenc.c:2323 macencui.c:164
-msgid "Lang|Amharic"
-msgstr "Lang|Amharic"
-
-#
-#: fontinfo.c:750
-msgid "Arabic (Saudi Arabia)"
-msgstr "阿拉伯语(沙特阿拉伯)"
-
-#
-#: fontinfo.c:751
-msgid "Arabic (Iraq)"
-msgstr "阿拉伯语(伊拉克)"
-
-#
-#: fontinfo.c:752
-msgid "Arabic (Egypt)"
-msgstr "阿拉伯语(埃及)"
-
-#
-#: fontinfo.c:753
-msgid "Arabic (Libya)"
-msgstr "阿拉伯语(利比亚)"
-
-#
-#: fontinfo.c:754
-msgid "Arabic (Algeria)"
-msgstr "阿拉伯语(阿尔及利亚)"
-
-#
-#: fontinfo.c:755
-msgid "Arabic (Morocco)"
-msgstr "阿拉伯语(摩洛哥)"
-
-#
-#: fontinfo.c:756
-msgid "Arabic (Tunisia)"
-msgstr "阿拉伯语(突尼斯)"
-
-#
-#: fontinfo.c:757
-msgid "Arabic (Oman)"
-msgstr "阿拉伯语(阿曼)"
-
-#
-#: fontinfo.c:758
-msgid "Arabic (Yemen)"
-msgstr "阿拉伯语(也门)"
-
-#
-#: fontinfo.c:759
-msgid "Arabic (Syria)"
-msgstr "阿拉伯语(叙利亚)"
-
-#
-#: fontinfo.c:760
-msgid "Arabic (Jordan)"
-msgstr "阿拉伯语(约旦)"
-
-#
-#: fontinfo.c:761
-msgid "Arabic (Lebanon)"
-msgstr "阿拉伯语(黎巴嫩)"
-
-#
-#: fontinfo.c:762
-msgid "Arabic (Kuwait)"
-msgstr "阿拉伯语(科威特）"
-
-#
-#: fontinfo.c:763
-msgid "Arabic (U.A.E.)"
-msgstr "阿拉伯语(阿联酋)"
-
-#
-#: fontinfo.c:764
-msgid "Arabic (Bahrain)"
-msgstr "阿拉伯语(巴林)"
-
-#
-#: fontinfo.c:765
-msgid "Arabic (Qatar)"
-msgstr "阿拉伯语(卡塔尔)"
-
-#
-#: fontinfo.c:766 lookupui.c:418 macenc.c:2289 macencui.c:130
-msgid "Lang|Armenian"
-msgstr "Lang|Armenian"
-
-#
-#: fontinfo.c:767 lookupui.c:298 macenc.c:2306 macencui.c:147
-msgid "Assamese"
-msgstr "阿萨姆语"
-
-#
-#: fontinfo.c:768
-msgid "Azeri (Latin)"
-msgstr "Azeri (Latin)"
-
-#
-#: fontinfo.c:769
-msgid "Azeri (Cyrillic)"
-msgstr "Azeri (Cyrillic)"
-
-#
-#: fontinfo.c:770 lookupui.c:373 macenc.c:2334 macencui.c:175
-msgid "Basque"
-msgstr "巴斯克语"
-
-#
-#: fontinfo.c:771 macenc.c:2284 macencui.c:125
-msgid "Byelorussian"
-msgstr "白俄罗斯语"
-
-#
-#: fontinfo.c:772 lookupui.c:313 macenc.c:2305 macencui.c:146
-msgid "Lang|Bengali"
-msgstr "Lang|Bengali"
-
-#
-#: fontinfo.c:773
-msgid "Bengali Bangladesh"
-msgstr "孟加拉塔卡"
-
-#
-#: fontinfo.c:774 lookupui.c:314 macenc.c:2282 macencui.c:123
-msgid "Bulgarian"
-msgstr "保加利亚语"
-
-#
-#: fontinfo.c:775 lookupui.c:329 macenc.c:2315 macencui.c:156
-msgid "Burmese"
-msgstr "缅甸语"
-
-#
-#: fontinfo.c:776 lookupui.c:332 macenc.c:2335 macencui.c:176
-msgid "Catalan"
-msgstr "加泰罗尼亚语"
-
-#
-#: fontinfo.c:777
-msgid "Cambodian"
-msgstr "柬埔寨语"
-
-#
-#: fontinfo.c:778 lookupui.c:340
-msgid "Lang|Cherokee"
-msgstr "Lang|Cherokee"
-
-#
-#: fontinfo.c:779
-msgid "Chinese (Taiwan)"
-msgstr "中文（台湾）"
-
-#
-#: fontinfo.c:780
-msgid "Chinese (PRC)"
-msgstr "中文（中国大陆）"
-
-#
-#: fontinfo.c:781
-msgid "Chinese (Hong Kong)"
-msgstr "中文（香港）"
-
-#
-#: fontinfo.c:782
-msgid "Chinese (Singapore)"
-msgstr "中文（新加坡）"
-
-#
-#: fontinfo.c:783
-msgid "Chinese (Macau)"
-msgstr "中文（澳门）"
-
-#
-#: fontinfo.c:784 lookupui.c:416 macenc.c:2254 macencui.c:95
-msgid "Croatian"
-msgstr "克罗地亚语"
-
-#
-#: fontinfo.c:785
-msgid "Croatian Bosnia/Herzegovina"
-msgstr "克罗地亚语，波斯尼亚和黑塞哥维那"
-
-#
-#: fontinfo.c:786 langfreq.c:1815 lookupui.c:349 macenc.c:2276 macencui.c:117
-msgid "Czech"
-msgstr "捷克语"
-
-#
-#: fontinfo.c:787 lookupui.c:350 macenc.c:2243 macencui.c:84
-msgid "Danish"
-msgstr "丹麦语"
-
-#
-#: fontinfo.c:788
-msgid "Divehi"
-msgstr "迪维希语"
-
-#
-#: fontinfo.c:789 langfreq.c:1816 lookupui.c:556 macenc.c:2240 macencui.c:81
-msgid "Dutch"
-msgstr "荷兰语"
-
-#
-#: fontinfo.c:790
-msgid "Flemish (Belgian Dutch)"
-msgstr "Flemish (巴尔干荷兰语)"
-
-#
-#: fontinfo.c:791 lookupui.c:366
-msgid "Edo"
-msgstr "Edo"
-
-#
-#: fontinfo.c:792
-msgid "English (British)"
-msgstr "英语(英国)"
-
-#
-#: fontinfo.c:793
-msgid "English (US)"
-msgstr "英语(美国)"
-
-#
-#: fontinfo.c:794
-msgid "English (Canada)"
-msgstr "英语(加拿大)"
-
-#
-#: fontinfo.c:795
-msgid "English (Australian)"
-msgstr "英语(澳大利亚)"
-
-#
-#: fontinfo.c:796
-msgid "English (New Zealand)"
-msgstr "英语(新西兰)"
-
-#
-#: fontinfo.c:797
-msgid "English (Irish)"
-msgstr "英语(爱尔兰)"
-
-#
-#: fontinfo.c:798
-msgid "English (South Africa)"
-msgstr "英语(南非)"
-
-#
-#: fontinfo.c:799
-msgid "English (Jamaica)"
-msgstr "英语(牙买加)"
-
-#
-#: fontinfo.c:800
-msgid "English (Caribbean)"
-msgstr "英语(加勒比)"
-
-#
-#: fontinfo.c:801
-msgid "English (Belize)"
-msgstr "英语(伯利兹)"
-
-#
-#: fontinfo.c:802
-msgid "English (Trinidad)"
-msgstr "English (Trinidad)"
-
-#
-#: fontinfo.c:803
-msgid "English (Zimbabwe)"
-msgstr "英语(津巴布韦)"
-
-#
-#: fontinfo.c:804
-msgid "English (Philippines)"
-msgstr "英语(菲律宾)"
-
-#
-#: fontinfo.c:805
-msgid "English (Indonesia)"
-msgstr "英语(印度尼西亚)"
-
-#
-#: fontinfo.c:806
-msgid "English (Hong Kong)"
-msgstr "英语（香港）"
-
-#
-#: fontinfo.c:807
-msgid "English (India)"
-msgstr "英语 (印度)"
-
-#
-#: fontinfo.c:808
-msgid "English (Malaysia)"
-msgstr "英语(马来西亚)"
-
-#
-#: fontinfo.c:809 lookupui.c:372 macenc.c:2263 macencui.c:104
-msgid "Estonian"
-msgstr "爱沙尼亚语"
-
-#
-#: fontinfo.c:810
-msgid "Faeroese"
-msgstr "法罗语"
-
-#
-#: fontinfo.c:811 lookupui.c:378
-msgid "Lang|Farsi"
-msgstr "波斯语"
-
-#
-#: fontinfo.c:812
-msgid "Filipino"
-msgstr "菲律宾语"
-
-#
-#: fontinfo.c:813 lookupui.c:379 macenc.c:2249 macencui.c:90
-msgid "Finnish"
-msgstr "芬兰语"
-
-#
-#: fontinfo.c:814
-msgid "French French"
-msgstr "法国法语"
-
-#
-#: fontinfo.c:815
-msgid "French Belgium"
-msgstr "法语(比利时)"
-
-#
-#: fontinfo.c:816
-msgid "French Canadian"
-msgstr "法语加拿大"
-
-#
-#: fontinfo.c:817
-msgid "French Swiss"
-msgstr "瑞士法语"
-
-#
-#: fontinfo.c:818
-msgid "French Luxembourg"
-msgstr "法语(卢森堡公国)"
-
-#
-#: fontinfo.c:819
-msgid "French Monaco"
-msgstr "法语(摩纳哥)"
-
-#
-#: fontinfo.c:820
-msgid "French West Indies"
-msgstr "法语(西 Indies）"
-
-#
-#: fontinfo.c:821
-msgid "French Réunion"
-msgstr "法语Réunion"
-
-#
-#: fontinfo.c:822
-msgid "French D.R. Congo"
-msgstr "法语（刚果共和国）"
-
-#
-#: fontinfo.c:823
-msgid "French Senegal"
-msgstr "法语(塞内加尔共和国)"
-
-#
-#: fontinfo.c:824
-msgid "French Camaroon"
-msgstr "法语(Camaroon)"
-
-#
-#: fontinfo.c:825
-msgid "French Côte d'Ivoire"
-msgstr "法语(科特迪瓦)"
-
-#
-#: fontinfo.c:826
-msgid "French Mali"
-msgstr "法语(马里共和国)"
-
-#
-#: fontinfo.c:827
-msgid "French Morocco"
-msgstr "法语(摩洛哥)"
-
-#
-#: fontinfo.c:828
-msgid "French Haiti"
-msgstr "法语(海地共和国)"
-
-#
-#: fontinfo.c:829
-msgid "French North Africa"
-msgstr "法语(北非)"
-
-#
-#: fontinfo.c:830 lookupui.c:386
-msgid "Frisian"
-msgstr "弗里斯兰语"
-
-#
-#: fontinfo.c:831
-msgid "Fulfulde"
-msgstr "Fulfulde"
-
-#
-#: fontinfo.c:832
-msgid "Gaelic (Scottish)"
-msgstr "盖尔语(苏格兰)"
-
-#
-#: fontinfo.c:833
-msgid "Gaelic (Irish)"
-msgstr "盖尔语(爱尔兰)"
-
-#
-#: fontinfo.c:834 lookupui.c:393 macenc.c:2345 macencui.c:186
-msgid "Galician"
-msgstr "加利西亚语"
-
-#
-#: fontinfo.c:835 lookupui.c:442 macenc.c:2290 macencui.c:131
-msgid "Lang|Georgian"
-msgstr "Lang|Georgian"
-
-#
-#: fontinfo.c:836
-msgid "German German"
-msgstr "德语(德国)"
-
-#
-#: fontinfo.c:837
-msgid "German Swiss"
-msgstr "德语(瑞士)"
-
-#
-#: fontinfo.c:838
-msgid "German Austrian"
-msgstr "德语 (奥地利)"
-
-#
-#: fontinfo.c:839
-msgid "German Luxembourg"
-msgstr "德语(卢森堡公国)"
-
-#
-#: fontinfo.c:840
-msgid "German Liechtenstein"
-msgstr "德语(列支敦士登公国)"
-
-#
-#: fontinfo.c:841 langfreq.c:1820 lookupui.c:368 macenc.c:2250 macencui.c:91
-msgid "Lang|Greek"
-msgstr "希腊语"
-
-#
-#: fontinfo.c:842 lookupui.c:402 macenc.c:2338 macencui.c:179
-msgid "Guarani"
-msgstr "瓜拉尼语"
-
-#
-#: fontinfo.c:843 lookupui.c:403 macenc.c:2307 macencui.c:148
-msgid "Lang|Gujarati"
-msgstr "Lang|Gujarati"
-
-#
-#: fontinfo.c:844 lookupui.c:407
-msgid "Hausa"
-msgstr "豪萨语"
-
-#
-#: fontinfo.c:845
-msgid "Hawaiian"
-msgstr "夏威夷语"
-
-#
-#: fontinfo.c:846 langfreq.c:1821 lookupui.c:431 macenc.c:2246 macencui.c:87
-msgid "Lang|Hebrew"
-msgstr "希伯来语"
-
-#
-#: fontinfo.c:847 langfreq.c:1822 lookupui.c:411 macenc.c:2257 macencui.c:98
-msgid "Hindi"
-msgstr "印地语"
-
-#
-#: fontinfo.c:848 langfreq.c:1823 lookupui.c:417 macenc.c:2262 macencui.c:103
-msgid "Hungarian"
-msgstr "匈牙利语"
-
-#
-#: fontinfo.c:849
-msgid "Ibibio"
-msgstr "Ibibio"
-
-#
-#: fontinfo.c:850 lookupui.c:428 macenc.c:2251 macencui.c:92
-msgid "Icelandic"
-msgstr "冰岛语"
-
-#
-#: fontinfo.c:851 lookupui.c:419
-msgid "Igbo"
-msgstr "Igbo"
-
-#
-#: fontinfo.c:852 lookupui.c:422 macenc.c:2319 macencui.c:160
-msgid "Indonesian"
-msgstr "印度尼西亚语"
-
-#
-#: fontinfo.c:853 lookupui.c:424 macenc.c:2348 macencui.c:189
-msgid "Inuktitut"
-msgstr "因纽特语"
-
-#
-#: fontinfo.c:854 langfreq.c:1824 lookupui.c:430 macenc.c:2239 macencui.c:80
-msgid "Italian"
-msgstr "意大利语"
-
-#
-#: fontinfo.c:855
-msgid "Italian Swiss"
-msgstr "意大利语(瑞士)"
-
-#
-#: fontinfo.c:857 lookupui.c:440 macenc.c:2311 macencui.c:152
-msgid "Lang|Kannada"
-msgstr "Lang|Kannada"
-
-#
-#: fontinfo.c:858 lookupui.c:461
-msgid "Kanuri"
-msgstr "Kanuri"
-
-#
-#: fontinfo.c:859
-msgid "Kashmiri (India)"
-msgstr "Kashmiri (India)"
-
-#
-#: fontinfo.c:860 lookupui.c:443 macenc.c:2286 macencui.c:127
-msgid "Kazakh"
-msgstr "哈萨克语"
-
-#
-#: fontinfo.c:861 lookupui.c:448 macenc.c:2316 macencui.c:157
-msgid "Lang|Khmer"
-msgstr "Lang|Khmer"
-
-#
-#: fontinfo.c:862 lookupui.c:453 macenc.c:2292 macencui.c:133
-msgid "Kirghiz"
-msgstr "吉尔吉斯语"
-
-#
-#: fontinfo.c:863 lookupui.c:464
-msgid "Konkani"
-msgstr "Konkani"
-
-#
-#: fontinfo.c:865
-msgid "Korean (Johab)"
-msgstr "Korean (Johab)"
-
-#
-#: fontinfo.c:866 fontinfo.c:1049 unicoderange.c:77
-msgid "Lao"
-msgstr "老挝语"
-
-#
-#: fontinfo.c:867 lookupui.c:508 macenc.c:2264 macencui.c:105
-msgid "Latvian"
-msgstr "拉脱维亚语"
-
-#
-#: fontinfo.c:868 lookupui.c:491 macenc.c:2336 macencui.c:177
-msgid "Lang|Latin"
-msgstr "Lang|拉丁语"
-
-#
-#: fontinfo.c:869 langfreq.c:1827 lookupui.c:502 macenc.c:2260 macencui.c:101
-msgid "Lithuanian"
-msgstr "立陶宛语"
-
-#
-#: fontinfo.c:870
-msgid "Lithuanian (Classic)"
-msgstr "立陶宛语 (古典)"
-
-#
-#: fontinfo.c:871 lookupui.c:522 macenc.c:2281 macencui.c:122
-msgid "Macedonian"
-msgstr "马其顿语"
-
-#
-#: fontinfo.c:872 lookupui.c:527
-msgid "Malay"
-msgstr "马来语"
-
-#
-#: fontinfo.c:873
-msgid "Malay (Brunei)"
-msgstr "马来语(文莱)"
-
-#
-#: fontinfo.c:874 macenc.c:2310 macencui.c:151
-msgid "Lang|Malayalam"
-msgstr "马来语"
-
-#
-#: fontinfo.c:875 lookupui.c:540 macenc.c:2252 macencui.c:93
-msgid "Maltese"
-msgstr "马耳他语"
-
-#
-#: fontinfo.c:876 lookupui.c:530
-msgid "Manipuri"
-msgstr "Manipuri"
-
-#
-#: fontinfo.c:877 lookupui.c:538
-msgid "Maori"
-msgstr "毛利语"
-
-#
-#: fontinfo.c:878 lookupui.c:513 macenc.c:2304 macencui.c:145
-msgid "Marathi"
-msgstr "马拉地语"
-
-#
-#: fontinfo.c:879
-msgid "Mongolian (Cyrillic)"
-msgstr "蒙古语 (斯拉夫文)"
-
-#
-#: fontinfo.c:880 macenc.c:2295 macencui.c:136
-msgid "Mongolian (Mongolian)"
-msgstr "蒙古语(蒙古文)"
-
-#
-#: fontinfo.c:881 lookupui.c:548 macenc.c:2302 macencui.c:143
-msgid "Nepali"
-msgstr "尼泊尔语"
-
-#
-#: fontinfo.c:882
-msgid "Nepali (India)"
-msgstr "尼泊尔语 (印度)"
-
-#
-#: fontinfo.c:883
-msgid "Norwegian (Bokmal)"
-msgstr "挪威语(Bokmal)"
-
-#
-#: fontinfo.c:884
-msgid "Norwegian (Nynorsk)"
-msgstr "挪威尼诺斯克语"
-
-#
-#: fontinfo.c:885 lookupui.c:566 macenc.c:2309 macencui.c:150
-msgid "Lang|Oriya"
-msgstr "Lang|Oriya"
-
-#
-#: fontinfo.c:886 lookupui.c:567
-msgid "Oromo"
-msgstr "奥罗莫语"
-
-#
-#: fontinfo.c:887
-msgid "Papiamentu"
-msgstr "Papiamentu"
-
-#
-#: fontinfo.c:888 lookupui.c:573 macenc.c:2297 macencui.c:138
-msgid "Pashto"
-msgstr "Pashto"
-
-#
-#: fontinfo.c:889 langfreq.c:1828 lookupui.c:577 macenc.c:2261 macencui.c:102
-msgid "Polish"
-msgstr "波兰语"
-
-#
-#: fontinfo.c:890
-msgid "Portugese (Portugal)"
-msgstr "葡萄牙语(葡萄牙)"
-
-#
-#: fontinfo.c:891
-msgid "Portuguese (Brasil)"
-msgstr "葡萄牙语(巴西)"
-
-#
-#: fontinfo.c:892
-msgid "Punjabi (India)"
-msgstr "Punjabi (印度)"
-
-#
-#: fontinfo.c:893
-msgid "Punjabi (Pakistan)"
-msgstr "Punjabi (巴基斯坦)"
-
-#
-#: fontinfo.c:894
-msgid "Quecha (Bolivia)"
-msgstr "Quecha (玻利维亚)"
-
-#
-#: fontinfo.c:895
-msgid "Quecha (Ecuador)"
-msgstr "Quecha (厄瓜多尔)"
-
-#
-#: fontinfo.c:896
-msgid "Quecha (Peru)"
-msgstr "Quecha (秘鲁)"
-
-#
-#: fontinfo.c:897 lookupui.c:585
-msgid "Rhaeto-Romanic"
-msgstr "Rhaeto-Romanic"
-
-#
-#: fontinfo.c:898 lookupui.c:586 macenc.c:2275 macencui.c:116
-msgid "Romanian"
-msgstr "罗马尼亚语"
-
-#
-#: fontinfo.c:899
-msgid "Romanian (Moldova)"
-msgstr "罗马尼亚语(摩尔多瓦)"
-
-#
-#: fontinfo.c:900 langfreq.c:1829 lookupui.c:590 macenc.c:2270 macencui.c:111
-msgid "Russian"
-msgstr "俄语"
-
-#
-#: fontinfo.c:901
-msgid "Russian (Moldova)"
-msgstr "俄语(摩尔多瓦)"
-
-#
-#: fontinfo.c:902 macenc.c:2265 macencui.c:106
-msgid "Sami (Lappish)"
-msgstr "Sami (Lappish)"
-
-#
-#: fontinfo.c:903 langfreq.c:1831 lookupui.c:592 macenc.c:2303 macencui.c:144
-msgid "Sanskrit"
-msgstr "梵语"
-
-#
-#: fontinfo.c:904
-msgid "Sepedi"
-msgstr "Sepedi"
-
-#
-#: fontinfo.c:905
-msgid "Serbian (Cyrillic)"
-msgstr "塞尔维亚语(西里尔语)"
-
-#
-#: fontinfo.c:906
-msgid "Serbian (Latin)"
-msgstr "塞尔维亚语(拉丁语)"
-
-#
-#: fontinfo.c:907
-msgid "Sindhi India"
-msgstr "Sindhi India"
-
-#
-#: fontinfo.c:908
-msgid "Sindhi Pakistan"
-msgstr "Sindhi Pakistan"
-
-#
-#: fontinfo.c:909 lookupui.c:610 macenc.c:2314 macencui.c:155
-msgid "Lang|Sinhalese"
-msgstr "Lang|Sinhalese"
-
-#
-#: fontinfo.c:910 lookupui.c:603 macenc.c:2277 macencui.c:118
-msgid "Slovak"
-msgstr "斯洛伐克"
-
-#
-#: fontinfo.c:911 lookupui.c:605 macenc.c:2278 macencui.c:119
-msgid "Slovenian"
-msgstr "斯洛文尼亚语"
-
-#
-#: fontinfo.c:912
-msgid "Sorbian"
-msgstr "索布语"
-
-#
-#: fontinfo.c:913
-msgid "Spanish (Traditional)"
-msgstr "西班牙语(传统)"
-
-#
-#: fontinfo.c:914
-msgid "Spanish Mexico"
-msgstr "西班牙语(墨西哥)"
-
-#
-#: fontinfo.c:915
-msgid "Spanish (Modern)"
-msgstr "西班牙语(现代)"
-
-#
-#: fontinfo.c:916
-msgid "Spanish (Guatemala)"
-msgstr "西班牙语(危地马拉)"
-
-#
-#: fontinfo.c:917
-msgid "Spanish (Costa Rica)"
-msgstr "西班牙语(哥斯达尼加)"
-
-#
-#: fontinfo.c:918
-msgid "Spanish (Panama)"
-msgstr "西班牙语(巴拿马)"
-
-#
-#: fontinfo.c:919
-msgid "Spanish (Dominican Republic)"
-msgstr "西班牙语(多米尼加)"
-
-#
-#: fontinfo.c:920
-msgid "Spanish (Venezuela)"
-msgstr "西班牙语(委内瑞拉)"
-
-#
-#: fontinfo.c:921
-msgid "Spanish (Colombia)"
-msgstr "西班牙语(哥伦比亚)"
-
-#
-#: fontinfo.c:922
-msgid "Spanish (Peru)"
-msgstr "西班牙语(秘鲁)"
-
-#
-#: fontinfo.c:923
-msgid "Spanish (Argentina)"
-msgstr "西班牙语(阿根廷)"
-
-#
-#: fontinfo.c:924
-msgid "Spanish (Ecuador)"
-msgstr "西班牙语(厄瓜多尔)"
-
-#
-#: fontinfo.c:925
-msgid "Spanish (Chile)"
-msgstr "西班牙语(智利)"
-
-#
-#: fontinfo.c:926
-msgid "Spanish (Uruguay)"
-msgstr "西班牙语(乌拉圭)"
-
-#
-#: fontinfo.c:927
-msgid "Spanish (Paraguay)"
-msgstr "西班牙语(巴拉圭)"
-
-#
-#: fontinfo.c:928
-msgid "Spanish (Bolivia)"
-msgstr "西班牙语(玻利维亚)"
-
-#
-#: fontinfo.c:929
-msgid "Spanish (El Salvador)"
-msgstr "西班牙语(萨尔瓦多)"
-
-#
-#: fontinfo.c:930
-msgid "Spanish (Honduras)"
-msgstr "西班牙语(洪都拉斯)"
-
-#
-#: fontinfo.c:931
-msgid "Spanish (Nicaragua)"
-msgstr "西班牙语(尼加拉瓜)"
-
-#
-#: fontinfo.c:932
-msgid "Spanish (Puerto Rico)"
-msgstr "西班牙语(波多黎各)"
-
-#
-#: fontinfo.c:933
-msgid "Spanish (United States)"
-msgstr "西班牙语(美国)"
-
-#
-#: fontinfo.c:934
-msgid "Spanish (Latin America)"
-msgstr "西班牙语(拉丁美洲)"
-
-#
-#: fontinfo.c:935 lookupui.c:626
-msgid "Sutu"
-msgstr "Sutu"
-
-#
-#: fontinfo.c:936
-msgid "Swahili (Kenyan)"
-msgstr "斯瓦希里语(肯亚)"
-
-#
-#: fontinfo.c:937
-msgid "Swedish (Sweden)"
-msgstr "瑞典语(瑞典)"
-
-#
-#: fontinfo.c:938
-msgid "Swedish (Finland)"
-msgstr "瑞典语(芬兰)"
-
-#
-#: fontinfo.c:939 lookupui.c:627
-msgid "Lang|Syriac"
-msgstr "Lang|Syriac"
-
-#
-#: fontinfo.c:940 macenc.c:2320 macencui.c:161
-msgid "Lang|Tagalog"
-msgstr "Tagalog"
-
-#
-#: fontinfo.c:941
-msgid "Tajik"
-msgstr "塔吉克语"
-
-#
-#: fontinfo.c:942
-msgid "Tamazight (Arabic)"
-msgstr "Tamazight (Arabic)"
-
-#
-#: fontinfo.c:943
-msgid "Tamazight (Latin)"
-msgstr "Tamazight (拉丁字母)"
-
-#
-#: fontinfo.c:944 lookupui.c:630 macenc.c:2312 macencui.c:153
-msgid "Lang|Tamil"
-msgstr "Lang|Tamil"
-
-#
-#: fontinfo.c:945
-msgid "Tatar (Tatarstan)"
-msgstr "Tatar (Tatarstan)"
-
-#
-#: fontinfo.c:946 lookupui.c:633 macenc.c:2313 macencui.c:154
-msgid "Lang|Telugu"
-msgstr "Lang|Telugu"
-
-#
-#: fontinfo.c:947 lookupui.c:637 macenc.c:2258 macencui.c:99
-msgid "Lang|Thai"
-msgstr "Lang|Thai"
-
-#
-#: fontinfo.c:948
-msgid "Tibetan (PRC)"
-msgstr "藏文（中国）"
-
-#
-#: fontinfo.c:949
-msgid "Tibetan Bhutan"
-msgstr "藏语(不丹)"
-
-#
-#: fontinfo.c:950
-msgid "Tigrinya Ethiopia"
-msgstr "Tigtinya(埃塞俄比亚)"
-
-#: fontinfo.c:951
-msgid "Tigrinyan Eritrea"
-msgstr ""
-
-#
-#: fontinfo.c:952 lookupui.c:647
-msgid "Tsonga"
-msgstr "聪加语"
-
-#
-#: fontinfo.c:953 lookupui.c:642
-msgid "Tswana"
-msgstr "茨瓦纳语"
-
-#
-#: fontinfo.c:954 langfreq.c:1833 lookupui.c:646 macenc.c:2253 macencui.c:94
-msgid "Turkish"
-msgstr "土耳其语"
-
-#
-#: fontinfo.c:955 lookupui.c:640 macenc.c:2294 macencui.c:135
-msgid "Turkmen"
-msgstr "土库曼语"
-
-#
-#: fontinfo.c:956 macenc.c:2341 macencui.c:182
-msgid "Lang|Uighur"
-msgstr "维吾尔语"
-
-#
-#: fontinfo.c:957 lookupui.c:653 macenc.c:2283 macencui.c:124
-msgid "Ukrainian"
-msgstr "乌克兰语"
-
-#
-#: fontinfo.c:958
-msgid "Urdu (Pakistan)"
-msgstr "乌尔都语(巴基斯坦)"
-
-#
-#: fontinfo.c:959
-msgid "Urdu (India)"
-msgstr "乌尔都语(印度)"
-
-#
-#: fontinfo.c:960
-msgid "Uzbek (Latin)"
-msgstr "乌孜别克语 (拉丁)"
-
-#
-#: fontinfo.c:961
-msgid "Uzbek (Cyrillic)"
-msgstr "乌孜别克语 (斯拉夫)"
-
-#
-#: fontinfo.c:962 lookupui.c:658
-msgid "Venda"
-msgstr "Venda"
-
-#
-#: fontinfo.c:963 lookupui.c:659 macenc.c:2318 macencui.c:159
-msgid "Vietnamese"
-msgstr "越南语"
-
-#
-#: fontinfo.c:964 langfreq.c:1834 lookupui.c:663 macenc.c:2333 macencui.c:174
-msgid "Welsh"
-msgstr "威尔士语"
-
-#
-#: fontinfo.c:965 lookupui.c:666
-msgid "Xhosa"
-msgstr "科萨语"
-
-#
-#: fontinfo.c:966
-msgid "Lang|Yi"
-msgstr "彝文"
-
-#
-#: fontinfo.c:967 lookupui.c:433 macenc.c:2279 macencui.c:120
-msgid "Yiddish"
-msgstr "意第绪语"
-
-#
-#: fontinfo.c:968 lookupui.c:668
-msgid "Yoruba"
-msgstr "约鲁巴语"
-
-#
-#: fontinfo.c:969 lookupui.c:677
-msgid "Zulu"
-msgstr "祖鲁语"
-
-#
-#: fontinfo.c:975
-msgid "Styles (SubFamily)"
-msgstr "样式(子族)"
-
-#
-#: fontinfo.c:976
-msgid "Copyright"
-msgstr "版权"
-
-#
-#: fontinfo.c:977
-msgid "Family"
-msgstr "族"
-
-#
-#: fontinfo.c:978
-msgid "Fullname"
-msgstr "全称"
-
-#
-#: fontinfo.c:979 fontinfo.c:4044
-msgid "UniqueID"
-msgstr "惟一标识(ID)"
-
-#
-#: fontinfo.c:980
-msgid "Version"
-msgstr "版本"
-
-#
-#: fontinfo.c:982
-msgid "Trademark"
-msgstr "商标"
-
-#
-#: fontinfo.c:983
-msgid "Manufacturer"
-msgstr "制造者"
-
-#
-#: fontinfo.c:984 oflib.c:706 oflib.c:1935
-msgid "Designer"
-msgstr "设计者"
-
-#
-#: fontinfo.c:985
-msgid "Descriptor"
-msgstr "说明"
-
-#
-#: fontinfo.c:986
-msgid "Vendor URL"
-msgstr "供应者URL"
-
-#
-#: fontinfo.c:987
-msgid "Designer URL"
-msgstr "设计者 URL"
-
-#
-#: fontinfo.c:988 oflib.c:709
-msgid "License"
-msgstr "许可"
-
-#
-#: fontinfo.c:989
-msgid "License URL"
-msgstr "许可URL"
-
-#
-#: fontinfo.c:991
-msgid "Preferred Family"
-msgstr "首选族"
-
-#
-#: fontinfo.c:992
-msgid "Preferred Styles"
-msgstr "首选样式"
-
-#
-#: fontinfo.c:993
-msgid "Compatible Full"
-msgstr "完全兼容"
-
-#
-#: fontinfo.c:994
-msgid "Sample Text"
-msgstr "样本"
-
-#
-#: fontinfo.c:995
-msgid "CID findfont Name"
-msgstr "字符标识名称"
-
-#
-#: fontinfo.c:996
-msgid "WWS Family"
-msgstr "WWS 族"
-
-#: fontinfo.c:997
-msgid "WWS Subfamily"
-msgstr "WWS 子族"
-
-#
-#: fontinfo.c:1024 unicoderange.c:43
-msgid "Basic Latin"
-msgstr "基本拉丁文"
-
-#
-#: fontinfo.c:1025 unicoderange.c:46
-msgid "Latin-1 Supplement"
-msgstr "拉丁-1增补"
-
-#
-#: fontinfo.c:1026 unicoderange.c:47
-msgid "Latin Extended-A"
-msgstr "拉丁文扩展 A"
-
-#
-#: fontinfo.c:1027 unicoderange.c:48
-msgid "Latin Extended-B"
-msgstr "拉丁文扩展 B"
-
-#
-#: fontinfo.c:1028 unicoderange.c:49
-msgid "IPA Extensions"
-msgstr "IPA 国际音标扩展"
-
-#
-#: fontinfo.c:1029 unicoderange.c:50
-msgid "Spacing Modifier Letters"
-msgstr "空格调整字母"
-
-#
-#: fontinfo.c:1030 unicoderange.c:51
-msgid "Combining Diacritical Marks"
-msgstr "组合变音标记"
-
-#
-#: fontinfo.c:1031 unicoderange.c:53
-msgid "Greek and Coptic"
-msgstr "希腊及埃及古文"
-
-#
-#: fontinfo.c:1032 unicoderange.c:150
-msgid "Coptic"
-msgstr "科普特文"
-
-#: fontinfo.c:1033
-msgid "Cyrillic & Supplement"
-msgstr ""
-
-#
-#: fontinfo.c:1034 unicoderange.c:56
-msgid "Armenian"
-msgstr "亚美尼亚语"
-
-#
-#: fontinfo.c:1035 unicoderange.c:57
-msgid "Hebrew"
-msgstr "希伯来语"
-
-#: fontinfo.c:1036 unicoderange.c:180
-msgid "Vai"
-msgstr ""
-
-#
-#: fontinfo.c:1037 unicoderange.c:58
-msgid "Arabic"
-msgstr "阿拉伯语"
-
-#
-#: fontinfo.c:1038 lookups.c:1379 lookupui.c:237 lookupui.c:555
-#: unicoderange.c:62
-msgid "N'Ko"
-msgstr "N'Ko"
-
-#
-#: fontinfo.c:1039 lookups.c:1330 lookupui.c:191
-msgid "Devanagari"
-msgstr "天城文(梵文)"
-
-#
-#: fontinfo.c:1040 unicoderange.c:67
-msgid "Bengali"
-msgstr "孟加拉语"
-
-#
-#: fontinfo.c:1041 lookups.c:1346 lookupui.c:207 unicoderange.c:68
-msgid "Gurmukhi"
-msgstr "古尔木其文"
-
-#
-#: fontinfo.c:1042 unicoderange.c:69
-msgid "Gujarati"
-msgstr "印度古吉拉特语"
-
-#
-#: fontinfo.c:1043 unicoderange.c:70
-msgid "Oriya"
-msgstr "奥里雅语"
-
-#
-#: fontinfo.c:1044 unicoderange.c:71
-msgid "Tamil"
-msgstr "泰米尔语"
-
-#
-#: fontinfo.c:1045 unicoderange.c:72
-msgid "Telugu"
-msgstr "泰卢固语"
-
-#
-#: fontinfo.c:1046 unicoderange.c:73
-msgid "Kannada"
-msgstr "卡纳达语"
-
-#
-#: fontinfo.c:1047 unicoderange.c:74
-msgid "Malayalam"
-msgstr "马拉雅拉姆语"
-
-#
-#: fontinfo.c:1048 unicoderange.c:76
-msgid "Thai"
-msgstr "泰国语"
-
-#
-#: fontinfo.c:1050 unicoderange.c:80
-msgid "Georgian"
-msgstr "格鲁吉亚语"
-
-#
-#: fontinfo.c:1051 unicoderange.c:103
-msgid "Balinese"
-msgstr "巴里语"
-
-#
-#: fontinfo.c:1052 lookups.c:1348 lookupui.c:209
-msgid "Hangul Jamo"
-msgstr "韩文 Jamo"
-
-#
-#: fontinfo.c:1053 unicoderange.c:111
-msgid "Latin Extended Additional"
-msgstr "拉丁文扩展附加"
-
-#
-#: fontinfo.c:1054 unicoderange.c:112
-msgid "Greek Extended"
-msgstr "希腊扩展"
-
-#
-#: fontinfo.c:1055 unicoderange.c:114
-msgid "General Punctuation"
-msgstr "常用标点符号"
-
-#
-#: fontinfo.c:1056
-msgid "Subscripts and Superscripts"
-msgstr "上下标"
-
-#
-#: fontinfo.c:1057 unicoderange.c:116
-msgid "Currency Symbols"
-msgstr "货币符号"
-
-#: fontinfo.c:1058
-msgid "Combining Diacritical Marks for Symbols"
-msgstr "符号组合变音标记"
-
-#
-#: fontinfo.c:1059 unicoderange.c:118
-msgid "Letterlike Symbols"
-msgstr "字母符号"
-
-#
-#: fontinfo.c:1060
-msgid "Numeric Forms"
-msgstr "数字形"
-
-#
-#: fontinfo.c:1061
-msgid "Arrows (& Supplements A&B)"
-msgstr "箭头 (& 增补 A&B)"
-
-#: fontinfo.c:1062
-msgid "Mathematical Operators (Suppl. & Misc.)"
-msgstr ""
-
-#
-#: fontinfo.c:1063
-msgid "Miscellaneous Technical"
-msgstr "其它技术符号"
-
-#
-#: fontinfo.c:1064 unicoderange.c:124
-msgid "Control Pictures"
-msgstr "控制图片"
-
-#: fontinfo.c:1065
-msgid "Optical Character Recognition"
-msgstr "光学符号识别"
-
-#
-#: fontinfo.c:1066 unicoderange.c:126
-msgid "Enclosed Alphanumerics"
-msgstr "带圈的字母数字"
-
-#
-#: fontinfo.c:1067 unicoderange.c:127
-msgid "Box Drawing"
-msgstr "方块图形"
-
-#
-#: fontinfo.c:1068 unicoderange.c:128
-msgid "Block Elements"
-msgstr "方块元素"
-
-#
-#: fontinfo.c:1069 unicoderange.c:129
-msgid "Geometric Shapes"
-msgstr "几何形状"
-
-#
-#: fontinfo.c:1070 unicoderange.c:130
-msgid "Miscellaneous Symbols"
-msgstr "其他符号"
-
-#
-#: fontinfo.c:1071 unicoderange.c:132
-msgid "Dingbats"
-msgstr "Dingbats 英文字符"
-
-#
-#: fontinfo.c:1072 unicoderange.c:161
-msgid "CJK Symbols and Punctuation"
-msgstr "中日韩符号与标点"
-
-#
-#: fontinfo.c:1073 langfreq.c:1825 unicoderange.c:162
-msgid "Hiragana"
-msgstr "日文平假名"
-
-#
-#: fontinfo.c:1074
-msgid "Katakana & Phonetic Extensions"
-msgstr "片假名语音扩展"
-
-#
-#: fontinfo.c:1075
-msgid "Bopomofo & Extended"
-msgstr "注音字母扩展"
-
-#
-#: fontinfo.c:1076 unicoderange.c:165
-msgid "Hangul Compatibility Jamo"
-msgstr "韩文兼容 Jamo"
-
-#
-#: fontinfo.c:1077 unicoderange.c:187
-msgid "Phags-pa"
-msgstr "八思巴文"
-
-#
-#: fontinfo.c:1078 unicoderange.c:170
-msgid "Enclosed CJK Letters and Months"
-msgstr "带圈的中日韩字符和月时"
-
-#
-#: fontinfo.c:1079 unicoderange.c:172
-msgid "CJK Compatibility"
-msgstr "中日韩兼容字符"
-
-#
-#: fontinfo.c:1080 unicoderange.c:199
-msgid "Hangul Syllables"
-msgstr "韩文音节"
-
-#: fontinfo.c:1081
-msgid "Non-Basic Multilingual Plane"
-msgstr "非基础多语言平面"
-
-#
-#: fontinfo.c:1082 unicoderange.c:254
-msgid "Phoenician"
-msgstr "腓尼基语"
-
-#
-#: fontinfo.c:1083 unicoderange.c:175
-msgid "CJK Unified Ideographs"
-msgstr "中日韩统一表意字符"
-
-#
-#: fontinfo.c:1085 unicoderange.c:205
-msgid "Private Use Area"
-msgstr "私用空间"
-
-#
-#: fontinfo.c:1086 unicoderange.c:211
-msgid "CJK Compatibility Ideographs"
-msgstr "中日韩兼容表意字符"
-
-#
-#: fontinfo.c:1087 unicoderange.c:212
-msgid "Alphabetic Presentation Forms"
-msgstr "字母表现形式"
-
-#
-#: fontinfo.c:1088
-msgid "Arabic Presentation Forms-A"
-msgstr "阿拉伯表现形式 A"
-
-#
-#: fontinfo.c:1089 unicoderange.c:219
-msgid "Combining Half Marks"
-msgstr "组合半角标记"
-
-#
-#: fontinfo.c:1090 unicoderange.c:220
-msgid "CJK Compatibility Forms"
-msgstr "中日韩兼容形式"
-
-#
-#: fontinfo.c:1091 unicoderange.c:221
-msgid "Small Form Variants"
-msgstr "小样式变调"
-
-#
-#: fontinfo.c:1092
-msgid "Arabic Presentation Forms-B"
-msgstr "阿拉伯表现形式B"
-
-#
-#: fontinfo.c:1093
-msgid "Halfwidth and Fullwidth Forms"
-msgstr "半角及全角形式"
-
-#
-#: fontinfo.c:1094 unicoderange.c:228
-msgid "Specials"
-msgstr "特殊"
-
-#
-#: fontinfo.c:1095 unicoderange.c:78
-msgid "Tibetan"
-msgstr "藏文（中国）"
-
-#
-#: fontinfo.c:1096 unicoderange.c:59
-msgid "Syriac"
-msgstr "叙利亚文"
-
-#
-#: fontinfo.c:1097 lookups.c:1412 lookupui.c:266 unicoderange.c:61
-msgid "Thaana"
-msgstr "塔安那文"
-
-#
-#: fontinfo.c:1098 unicoderange.c:75
-msgid "Sinhala"
-msgstr "僧伽罗语"
-
-#
-#: fontinfo.c:1099 unicoderange.c:79
-msgid "Myanmar"
-msgstr "缅甸文"
-
-#
-#: fontinfo.c:1100 unicoderange.c:84
-msgid "Ethiopic"
-msgstr "埃塞尔比亚文"
-
-#
-#: fontinfo.c:1101 lookups.c:1319 unicoderange.c:86
-msgid "Cherokee"
-msgstr "切罗基文"
-
-#
-#: fontinfo.c:1102 unicoderange.c:87
-msgid "Unified Canadian Aboriginal Syllabics"
-msgstr "统一加拿大原住民音节表"
-
-#
-#: fontinfo.c:1103 lookups.c:1380 lookupui.c:238 unicoderange.c:88
-msgid "Ogham"
-msgstr "欧甘语"
-
-#
-#: fontinfo.c:1104 lookups.c:1395 lookupui.c:251 unicoderange.c:89
-msgid "Runic"
-msgstr "Runic"
-
-#
-#: fontinfo.c:1105 unicoderange.c:94
-msgid "Khmer"
-msgstr "高棉语"
-
-#
-#: fontinfo.c:1106 unicoderange.c:95
-msgid "Mongolian"
-msgstr "蒙古语"
-
-#
-#: fontinfo.c:1107 unicoderange.c:138
-msgid "Braille Patterns"
-msgstr "盲文模式"
-
-#
-#: fontinfo.c:1108
-msgid "Yi Syllables/Radicals"
-msgstr "彝文偏旁部首"
-
-#: fontinfo.c:1109
-msgid "Tagalog/Hanunno/Buhid/Tagbanwa"
-msgstr ""
-
-#
-#: fontinfo.c:1110 unicoderange.c:244
-msgid "Old Italic"
-msgstr "古意大利式"
-
-#
-#: fontinfo.c:1111 lookups.c:1342 lookupui.c:203 unicoderange.c:245
-msgid "Gothic"
-msgstr "哥特式"
-
-#
-#: fontinfo.c:1112 unicoderange.c:248
-msgid "Deseret"
-msgstr "Deseret"
-
-#: fontinfo.c:1113
-msgid "Musical Symbols, Byzantine & Western"
-msgstr ""
-
-#
-#: fontinfo.c:1114 lookups.c:1374 lookupui.c:233 unicoderange.c:285
-msgid "Mathematical Alphanumeric Symbols"
-msgstr "数学字母数字符号"
-
-#: fontinfo.c:1115
-msgid "Private Use (planes 15&16)"
-msgstr "私人应用 (平面 15与16)"
-
-#
-#: fontinfo.c:1116 unicoderange.c:217
-msgid "Variation Selectors"
-msgstr "变调选择器"
-
-#
-#: fontinfo.c:1117
-msgid "Tags"
-msgstr "标记"
-
-#
-#: fontinfo.c:1118 unicoderange.c:97
-msgid "Limbu"
-msgstr "林布语"
-
-#
-#: fontinfo.c:1119 lookups.c:1405 lookupui.c:259 unicoderange.c:98
-msgid "Tai Le"
-msgstr "傣仂文"
-
-#: fontinfo.c:1120 lookups.c:1378 unicoderange.c:99
-msgid "New Tai Lue"
-msgstr ""
-
-#
-#: fontinfo.c:1121 unicoderange.c:101
-msgid "Buginese"
-msgstr "布吉语"
-
-#
-#: fontinfo.c:1122 lookups.c:1341 lookupui.c:202 unicoderange.c:148
-msgid "Glagolitic"
-msgstr "格拉哥里语"
-
-#
-#: fontinfo.c:1123 unicoderange.c:152
-msgid "Tifinagh"
-msgstr "提非纳文"
-
-#
-#: fontinfo.c:1124 unicoderange.c:174
-msgid "Yijing Hexagram Symbols"
-msgstr "易经卦符"
-
-#
-#: fontinfo.c:1125 unicoderange.c:185
-msgid "Syloti Nagri"
-msgstr "Syloti Nagri"
-
-#: fontinfo.c:1126
-msgid "Linear B Syllabary/Ideograms, Agean Num."
-msgstr ""
-
-#
-#: fontinfo.c:1127 unicoderange.c:238
-msgid "Ancient Greek Numbers"
-msgstr "古希腊数字"
-
-#
-#: fontinfo.c:1128 unicoderange.c:246
-msgid "Ugaritic"
-msgstr "乌加里特文"
-
-#
-#: fontinfo.c:1129 unicoderange.c:247
-msgid "Old Persian"
-msgstr "古波斯文"
-
-#
-#: fontinfo.c:1130 lookups.c:1397 lookupui.c:252 unicoderange.c:249
-msgid "Shavian"
-msgstr "Shavian"
-
-#
-#: fontinfo.c:1131 lookups.c:1387 lookupui.c:244 unicoderange.c:250
-msgid "Osmanya"
-msgstr "Osmanya"
-
-#: fontinfo.c:1132 unicoderange.c:252
-msgid "Cypriot Syllabary"
-msgstr ""
-
-#: fontinfo.c:1133
-msgid "Kharoshthi"
-msgstr ""
-
-#
-#: fontinfo.c:1134 unicoderange.c:283
-msgid "Tai Xuan Jing Symbols"
-msgstr "太玄经符号"
-
-#: fontinfo.c:1135
-msgid "Cuneiform Numbers & Punctuation"
-msgstr ""
-
-#: fontinfo.c:1136
-msgid "Counting Rod Numerals"
-msgstr ""
-
-#: fontinfo.c:1137
-msgid "Sudanese"
-msgstr ""
-
-#
-#: fontinfo.c:1138 unicoderange.c:106
-msgid "Lepcha"
-msgstr "Lepcha"
-
-#: fontinfo.c:1139 lookups.c:1381 unicoderange.c:107
-msgid "Ol Chiki"
-msgstr ""
-
-#: fontinfo.c:1140 lookups.c:1396 unicoderange.c:188
-msgid "Saurashtra"
-msgstr ""
-
-#: fontinfo.c:1141 lookups.c:1355 unicoderange.c:190
-msgid "Kayah Li"
-msgstr ""
-
-#: fontinfo.c:1142 lookups.c:1393 unicoderange.c:191
-msgid "Rejang"
-msgstr ""
-
-#: fontinfo.c:1143 unicoderange.c:194
-msgid "Cham"
-msgstr ""
-
-#: fontinfo.c:1144 unicoderange.c:239
-msgid "Ancient Symbols"
-msgstr ""
-
-#: fontinfo.c:1145 unicoderange.c:240
-msgid "Phaistos Disc"
-msgstr ""
-
-#: fontinfo.c:1146
-msgid "Carian/Lycian/Lydian"
-msgstr ""
-
-#: fontinfo.c:1147
-msgid "Mahjong & Domino Tiles"
-msgstr ""
-
-#
-#: fontinfo.c:1148
-msgid "Unassigned Bit 123"
-msgstr "未分配位 123"
-
-#
-#: fontinfo.c:1149
-msgid "Unassigned Bit 124"
-msgstr "未分配位 124"
-
-#
-#: fontinfo.c:1150
-msgid "Unassigned Bit 125"
-msgstr "未分配位 125"
-
-#
-#: fontinfo.c:1151
-msgid "Unassigned Bit 126"
-msgstr "未分配位 126"
-
-#
-#: fontinfo.c:1152
-msgid "Unassigned Bit 127"
-msgstr "未分配位 127"
-
-#: fontinfo.c:1156
-msgid "1252, Latin-1"
-msgstr "WIndows-1252, 拉丁语-1"
-
-#: fontinfo.c:1157
-msgid "1250, Latin-2 (Eastern Europe)"
-msgstr "1250, 拉丁文-2 (东欧)"
-
-#
-#: fontinfo.c:1158
-msgid "1251, Cyrillic"
-msgstr "Windows-1251 斯拉夫语"
-
-#: fontinfo.c:1159
-msgid "1253, Greek"
-msgstr "Windows-1253 希腊语"
-
-#
-#: fontinfo.c:1160
-msgid "1254, Turkish"
-msgstr "Windows-1254 土耳其语"
-
-#: fontinfo.c:1161
-msgid "1255, Hebrew"
-msgstr "Windows-1255 希伯来语"
-
-#: fontinfo.c:1162
-msgid "1256, Arabic"
-msgstr "Windows-1256 阿拉伯语"
-
-#: fontinfo.c:1163
-msgid "1257, Windows Baltic"
-msgstr "Windows-1257 波罗的语"
-
-#
-#: fontinfo.c:1164
-msgid "1258, Vietnamese"
-msgstr "Windows-1258, 越南语"
-
-#: fontinfo.c:1165
-msgid "Reserved Bit 9"
-msgstr "保留位 9"
-
-#: fontinfo.c:1166
-msgid "Reserved Bit 10"
-msgstr "保留位 10"
-
-#: fontinfo.c:1167
-msgid "Reserved Bit 11"
-msgstr "保留位 11"
-
-#: fontinfo.c:1168
-msgid "Reserved Bit 12"
-msgstr "保留位 12"
-
-#: fontinfo.c:1169
-msgid "Reserved Bit 13"
-msgstr "保留位 13"
-
-#: fontinfo.c:1170
-msgid "Reserved Bit 14"
-msgstr "保留位 14"
-
-#: fontinfo.c:1171
-msgid "Reserved Bit 15"
-msgstr "保留位 15"
-
-#: fontinfo.c:1172
-msgid "874, Thai"
-msgstr "Windows 泰国语 (CP 874)"
-
-#: fontinfo.c:1173
-msgid "932, JIS/Japan"
-msgstr "932, JIS/日本"
-
-#
-#: fontinfo.c:1174
-msgid "936, Simplified Chinese"
-msgstr "简体中文(Windows-936)"
-
-#: fontinfo.c:1175
-msgid "949, Korean Wansung"
-msgstr "Windows 韩语 (CP 949)"
-
-#
-#: fontinfo.c:1176
-msgid "950, Traditional Chinese"
-msgstr "Windows 繁体中文 (CP 950)"
-
-#: fontinfo.c:1177
-msgid "1361, Korean Johab"
-msgstr "1361, 韩文 Johab"
-
-#: fontinfo.c:1178
-msgid "Reserved Bit 22"
-msgstr "保留位 22"
-
-#: fontinfo.c:1179
-msgid "Reserved Bit 23"
-msgstr "保留位 23"
-
-#: fontinfo.c:1180
-msgid "Reserved Bit 24"
-msgstr "保留位 24"
-
-#: fontinfo.c:1181
-msgid "Reserved Bit 25"
-msgstr "保留位 25"
-
-#: fontinfo.c:1182
-msgid "Reserved Bit 26"
-msgstr "保留位 26"
-
-#: fontinfo.c:1183
-msgid "Reserved Bit 27"
-msgstr "保留位 27"
-
-#: fontinfo.c:1184
-msgid "Reserved Bit 28"
-msgstr "保留位 28"
-
-#
-#: fontinfo.c:1185
-msgid "Mac Roman"
-msgstr "Mac Roman"
-
-#
-#: fontinfo.c:1186
-msgid "OEM Charset"
-msgstr "OEM 字符集"
-
-#
-#: fontinfo.c:1187
-msgid "Symbol Charset"
-msgstr "符号字符集"
-
-#: fontinfo.c:1188
-msgid "Reserved Bit 32"
-msgstr "保留位 32"
-
-#: fontinfo.c:1189
-msgid "Reserved Bit 33"
-msgstr "保留位 33"
-
-#: fontinfo.c:1190
-msgid "Reserved Bit 34"
-msgstr "保留位 34"
-
-#: fontinfo.c:1191
-msgid "Reserved Bit 35"
-msgstr "保留位 35"
-
-#: fontinfo.c:1192
-msgid "Reserved Bit 36"
-msgstr "保留位 36"
-
-#: fontinfo.c:1193
-msgid "Reserved Bit 37"
-msgstr "保留位 1037"
-
-#: fontinfo.c:1194
-msgid "Reserved Bit 38"
-msgstr "保留位 3"
-
-#: fontinfo.c:1195
-msgid "Reserved Bit 39"
-msgstr "保留位 39"
-
-#: fontinfo.c:1196
-msgid "Reserved Bit 40"
-msgstr "保留位 40"
-
-#: fontinfo.c:1197
-msgid "Reserved Bit 41"
-msgstr "保留位 41"
-
-#: fontinfo.c:1198
-msgid "Reserved Bit 42"
-msgstr "保留位 42"
-
-#: fontinfo.c:1199
-msgid "Reserved Bit 43"
-msgstr "保留位 43"
-
-#: fontinfo.c:1200
-msgid "Reserved Bit 44"
-msgstr "保留位 44"
-
-#: fontinfo.c:1201
-msgid "Reserved Bit 45"
-msgstr "保留位 45"
-
-#: fontinfo.c:1202
-msgid "Reserved Bit 46"
-msgstr "保留位 46"
-
-#: fontinfo.c:1203
-msgid "Reserved Bit 47"
-msgstr "保留位 47"
-
-#: fontinfo.c:1204
-msgid "869, IBM Greek"
-msgstr "869, IBM Greek希腊语"
-
-#: fontinfo.c:1205
-msgid "866, MS-DOS Russian"
-msgstr "866, MS-DOS 俄语"
-
-#: fontinfo.c:1206
-msgid "865, MS_DOS Nordic"
-msgstr "865, MS_DOS Nordic"
-
-#
-#: fontinfo.c:1207
-msgid "864, Arabic"
-msgstr "864, 阿拉伯语"
-
-#: fontinfo.c:1208
-msgid "863, MS-DOS Canadian French"
-msgstr "863, MS-DOS 加拿大法语"
-
-#: fontinfo.c:1209
-msgid "862, Hebrew"
-msgstr "862，希伯来语"
-
-#
-#: fontinfo.c:1210
-msgid "861, MS-DOS Icelandic"
-msgstr "861, MS-DOS 冰岛语"
-
-#
-#: fontinfo.c:1211
-msgid "860, MS-DOS Portuguese"
-msgstr "860, MS-DOS Portuguese葡萄牙语"
-
-#
-#: fontinfo.c:1212
-msgid "857, IBM Turkish"
-msgstr "857, IBM 土耳其语"
-
-#: fontinfo.c:1213
-msgid "855, IBM Cyrillic; primarily Russian"
-msgstr "855, IBM 西里尔文字; 主要为俄语"
-
-#
-#: fontinfo.c:1214
-msgid "852, Latin 2"
-msgstr "852, 拉丁文 2"
-
-#: fontinfo.c:1215
-msgid "775, MS-DOS Baltic"
-msgstr "775, MS-DOS Baltic"
-
-#: fontinfo.c:1216
-msgid "737, Greek; former 437 G"
-msgstr "737, 希腊文; 原 437 G"
-
-#: fontinfo.c:1217
-msgid "708, Arabic ASMO 708"
-msgstr "708, Arabic ASMO 708"
-
-#: fontinfo.c:1218
-msgid "850, WE/Latin 1"
-msgstr "850, WE/拉丁文 1"
-
-#: fontinfo.c:1219
-msgid "437, US"
-msgstr "437, 美国"
-
-#
-#: fontinfo.c:1227
-msgid "String ID"
-msgstr "字符串ID"
-
-#
-#: fontinfo.c:1228
-msgid "String"
-msgstr "字符串"
-
-#: fontinfo.c:1232
-msgid "Feature Tags"
-msgstr ""
-
-#: fontinfo.c:1233
-msgid "Friendly Name"
-msgstr ""
-
-#
-#: fontinfo.c:1237 groupsdlg.c:1252 oflib.c:707 oflib.c:1945 openfontdlg.c:276
-msgid "Name"
-msgstr "名称"
-
-#
-#: fontinfo.c:1240
-msgid "No Grid Fit"
-msgstr "无网格填充"
-
-#
-#: fontinfo.c:1241
-msgid "Grid Fit"
-msgstr "网格填充"
-
-#
-#: fontinfo.c:1244
-msgid "No Anti-Alias"
-msgstr "不抗锯齿"
-
-#
-#: fontinfo.c:1245
-msgid "Anti-Alias"
-msgstr "抗锯齿"
-
-#
-#: fontinfo.c:1248
-msgid "No Symmetric-Smooth"
-msgstr "无对称-平滑"
-
-#
-#: fontinfo.c:1249
-msgid "Symmetric-Smoothing"
-msgstr "对称平滑"
-
-#
-#: fontinfo.c:1252
-msgid "No Grid Fit w/ Sym-Smooth"
-msgstr "无网格填充(平滑)"
-
-#
-#: fontinfo.c:1253
-msgid "Grid Fit w/ Sym-Smooth"
-msgstr "网格填充(对称平滑)"
-
-#: fontinfo.c:1256
-msgid "Gasp|For Pixels Per EM <= Value"
-msgstr ""
-
-#
-#: fontinfo.c:1257
-msgid "Gasp|Grid Fit"
-msgstr "网格填充"
-
-#
-#: fontinfo.c:1258
-msgid "Gasp|Anti-Alias"
-msgstr "抗锯齿"
-
-#
-#: fontinfo.c:1259
-msgid "Gasp|Symmetric Smoothing"
-msgstr "对称平滑"
-
-#
-#: fontinfo.c:1260
-msgid "Gasp|Grid Fit w/ Sym Smooth"
-msgstr "网格填充(平滑)"
-
-#: fontinfo.c:1263
-msgid "Cubic"
-msgstr ""
-
-#: fontinfo.c:1264 fontinfo.c:8151
-msgid "Quadratic"
-msgstr ""
-
-#: fontinfo.c:1267 fontview.c:4997 metricsview.c:3252
-msgid "Layer|Foreground"
-msgstr ""
-
-#: fontinfo.c:1268
-msgid "Layer|Background"
-msgstr ""
-
-#: fontinfo.c:1272
-msgid "Layer Name"
-msgstr ""
-
-#: fontinfo.c:1273
-msgid "Curve Type"
-msgstr ""
-
-#: fontinfo.c:1274
-msgid "Type"
-msgstr ""
-
-#: fontinfo.c:1275
-msgid "Orig layer"
-msgstr ""
-
-#: fontinfo.c:1279
-msgid "Set Name"
-msgstr ""
-
-#: fontinfo.c:1280
-msgid "Glyphs in the set"
-msgstr ""
-
-#: fontinfo.c:1283
-msgid "Class Name"
-msgstr ""
-
-#
-#: fontinfo.c:1721 fontinfo.c:1737 parsettf.c:4478 python.c:17246
-#: python.c:17261
-msgid "Unknown"
-msgstr "未知"
-
-#: fontinfo.c:1813
-msgid "Key"
-msgstr ""
-
-#
-#: fontinfo.c:1814 nonlineartransui.c:210 nonlineartransui.c:217
-#: ttfinstrsui.c:1365
-msgid "Value"
-msgstr "值"
-
-#
-#. GT: The words "true" and "false" should be left untranslated. We are restricted
-#. GT: here by what PostScript understands, and it only understands the English
-#. GT: words. You may, of course, change it to something like ("true" (vrai) ou "false" (faux))
-#: fontinfo.c:1891 fontinfo.c:1959 fontinfo.c:1962 fontinfo.c:1966
-#: fontinfo.c:1977
-msgid "Bad type"
-msgstr "不良类型"
-
-#: fontinfo.c:1891
-#, c-format
-msgid ""
-"Expected array of numbers.\n"
-"Failed to parse \"%.*s\" as a number."
-msgstr ""
-
-#: fontinfo.c:1959
-msgid ""
-"Expected boolean value.\n"
-"(\"true\" or \"false\")"
-msgstr ""
-
-#: fontinfo.c:1962
-msgid ""
-"Expected PostScript code.\n"
-"Which usually begins with a \"{\" and ends with a \"}\"."
-msgstr ""
-
-#: fontinfo.c:1966 fontinfo.c:1977
-msgid "Expected number."
-msgstr ""
-
-#: fontinfo.c:2281
-msgid "No Name"
-msgstr ""
-
-#: fontinfo.c:2281
-msgid "Please specify a name for this mark class or set"
-msgstr ""
-
-#: fontinfo.c:2286
-msgid "Mark class/set names should not contain spaces."
-msgstr ""
-
-#
-#: fontinfo.c:2292 groupsdlg.c:727 groupsdlg.c:734
-msgid "Duplicate Name"
-msgstr "复制名称"
-
-#: fontinfo.c:2292
-#, c-format
-msgid "This name was previously used to identify mark class/set #%d."
-msgstr ""
-
-#: fontinfo.c:2327
-msgid "Mark Class was in use"
-msgstr ""
-
-#: fontinfo.c:2327
-#, c-format
-msgid "This mark class (%s) was used in lookup %s"
-msgstr ""
-
-#: fontinfo.c:2337
-msgid "Mark Set was in use"
-msgstr ""
-
-#: fontinfo.c:2337
-#, c-format
-msgid "This mark set (%s) was used in lookup %s"
-msgstr ""
-
-#
-#: fontinfo.c:2541
-msgid "Bad Family Name"
-msgstr "不良字族名"
-
-#: fontinfo.c:2541
-msgid "Bad Family Name, must begin with an alphabetic character."
-msgstr ""
-
-#
-#: fontinfo.c:2570 fontinfo.c:2592 fontinfo.c:2595 fontinfo.c:2610
-#: fontinfo.c:2618 parsettf.c:1428 parsettf.c:1439 parsettf.c:1450
-#: savefontdlg.c:1411
-msgid "Bad Font Name"
-msgstr "不良字体名"
-
-#: fontinfo.c:2570
-#, c-format
-msgid ""
-"A PostScript name should be ASCII\n"
-"and must not contain (){}[]<>%%/ or space\n"
-"and must be shorter than 63 characters"
-msgstr ""
-
-#
-#: fontinfo.c:2575 mmdlg.c:1777
-msgid "A Font Family name is required"
-msgstr "需要字体集名称"
-
-#
-#: fontinfo.c:2584 fontinfo.c:2588 fontinfo.c:2601
-msgid "Bad Font Family Name"
-msgstr "不良字体集名称"
-
-#: fontinfo.c:2584 fontinfo.c:2610 parsettf.c:1428
-msgid "A PostScript name may not be a number"
-msgstr ""
-
-#: fontinfo.c:2588
-msgid ""
-"Some versions of Windows will refuse to install postscript fonts if the "
-"familyname is longer than 31 characters. Do you want to continue anyway?"
-msgstr ""
-
-#: fontinfo.c:2592 savefontdlg.c:1411
-msgid ""
-"Some versions of Windows will refuse to install postscript fonts if the "
-"fontname is longer than 31 characters. Do you want to continue anyway?"
-msgstr ""
-
-#: fontinfo.c:2595
-msgid ""
-"Adobe's fontname spec (5088.FontNames.pdf) says that fontnames should not be "
-"longer than 29 characters. Do you want to continue anyway?"
-msgstr ""
-
-#: fontinfo.c:2601 fontinfo.c:2618
-#, c-format
-msgid ""
-"A PostScript name should be ASCII\n"
-"and must not contain (){}[]<>%%/ or space"
-msgstr ""
-
-#
-#: fontinfo.c:2644
-#, c-format
-msgid "Version %.20s"
-msgstr "版本 %.20s"
-
-#
-#: fontinfo.c:3033
-msgid "Detach from PostScript Names"
-msgstr "与 PostScript 名称分离"
-
-#
-#: fontinfo.c:3036
-msgid "Same as PostScript Names"
-msgstr "与 PostScript 名称相同"
-
-#
-#: fontinfo.c:3043
-msgid "Multi-line edit"
-msgstr "多行编辑"
-
-#
-#: fontinfo.c:3062
-#, c-format
-msgid "%1$.30s string for %2$.30s"
-msgstr "%1$.30s 字符串向 %2$.30s"
-
-#
-#: fontinfo.c:3226
-msgid "Please read the OFL"
-msgstr "请阅读 OFL"
-
-#: fontinfo.c:3227
-msgid ""
-"You should read the OFL and its FAQ \n"
-"at http://scripts.sil.org/OFL.\n"
-"If you are not very familiar with English,\n"
-"please check if there is a translation of the \n"
-"FAQ or an unofficial translation of the license \n"
-"in your mother tongue or preferred language. \n"
-"\n"
-"Please fill in the copyright notice in the license\n"
-"header along with any Reserved Font Name(s).\n"
-"If you are branching from an existing font make sure\n"
-"you have the right to do so and remember to add your\n"
-"additional notice with any Reserved Font Name(s)."
-msgstr ""
-
-#
-#: fontinfo.c:3521
-msgid "Slant:"
-msgstr "斜度:"
-
-#
-#: fontinfo.c:3521
-msgid "Space:"
-msgstr "间距:"
-
-#
-#: fontinfo.c:3521
-msgid "Stretch:"
-msgstr "拉伸:"
-
-#
-#: fontinfo.c:3522
-msgid "Shrink:"
-msgstr "收缩："
-
-#
-#: fontinfo.c:3522
-msgid "XHeight:"
-msgstr "X高度:"
-
-#
-#: fontinfo.c:3522
-msgid "Quad:"
-msgstr "四方数量:"
-
-#
-#. GT: Extra Space, see below for a full comment
-#. GT: Extra Space
-#: fontinfo.c:3524 fontinfo.c:5050 fontinfo.c:5086
-msgid "Extra Sp:"
-msgstr "空位:"
-
-#: fontinfo.c:3525
-msgid "In an italic font the horizontal change per unit vertical change"
-msgstr ""
-
-#: fontinfo.c:3526
-msgid "The amount of space between words when using this font"
-msgstr ""
-
-#: fontinfo.c:3527
-msgid "The amount of strechable space between words when using this font"
-msgstr ""
-
-#: fontinfo.c:3528
-msgid "The amount the space between words may shrink when using this font"
-msgstr ""
-
-#: fontinfo.c:3529
-msgid "The height of the lower case letters with flat tops"
-msgstr ""
-
-#
-#: fontinfo.c:3530
-msgid "The width of one em"
-msgstr "M全字宽度"
-
-#: fontinfo.c:3531
-msgid ""
-"Either:\n"
-"The amount of extra space to be added after a sentence\n"
-"Or the space to be used within math formulae"
-msgstr ""
-
-#: fontinfo.c:3686
-msgid "Name table too big for windows"
-msgstr ""
-
-#: fontinfo.c:3687
-msgid ""
-"Windows has decided that fonts with 'name' tables\n"
-"bigger than 5K are insecure and will refuse to load\n"
-"them. Don't ask me why they believe this.\n"
-"This font will have a 'name' table bigger than that."
-msgstr ""
-
-#: fontinfo.c:3714
-msgid "Duplicate StyleSet Name"
-msgstr ""
-
-#: fontinfo.c:3714
-#, c-format
-msgid ""
-"The feature '%c%c%c%c' is named twice in language %s\n"
-"%.80s\n"
-"%.80s"
-msgstr ""
-
-#
-#: fontinfo.c:3828 fontinfo.c:3836
-msgid "Bad hex number"
-msgstr "无效的十六进制数"
-
-#
-#: fontinfo.c:3828 fontinfo.c:3836
-#, c-format
-msgid "Bad hex number in %s"
-msgstr "无效的十六进制数在%s中"
-
-#
-#: fontinfo.c:3964
-msgid "Bad Grid Fitting table"
-msgstr "不良网格填充表"
-
-#: fontinfo.c:3964
-msgid "The 'gasp' (Grid Fit) table must end with a pixel entry of 65535"
-msgstr ""
-
-#: fontinfo.c:3973
-msgid "Bad Copyright"
-msgstr ""
-
-#: fontinfo.c:3973
-msgid ""
-"Copyright text (in the Names pane) must be entirely ASCII. So, use (c) "
-"instead of ©."
-msgstr ""
-
-#: fontinfo.c:3974
-msgid "Bad Human Fontname"
-msgstr ""
-
-#: fontinfo.c:3974
-msgid ""
-"The human-readable fontname text (in the Names pane) must be entirely ASCII."
-msgstr ""
-
-#: fontinfo.c:3975
-msgid "Bad Weight"
-msgstr ""
-
-#: fontinfo.c:3975
-msgid "The weight text (in the Names pane) must be entirely ASCII."
-msgstr ""
-
-#: fontinfo.c:3976
-msgid "Bad Version"
-msgstr ""
-
-#: fontinfo.c:3976
-msgid "The version text (in the Names pane) must be entirely ASCII."
-msgstr ""
-
-#: fontinfo.c:3989
-msgid "Deleting a layer cannot be UNDONE!"
-msgstr ""
-
-#: fontinfo.c:3990
-msgid ""
-"You are about to delete a layer.\n"
-"This will lose all contours in that layer.\n"
-"If this is the last quadratic layer it will\n"
-"lose all truetype instructions.\n"
-"\n"
-"Deleting a layer cannot be undone.\n"
-"\n"
-"Is this really your intent?"
-msgstr ""
-
-#: fontinfo.c:3998
-msgid "Removing instructions cannot be UNDONE!"
-msgstr ""
-
-#: fontinfo.c:3999
-msgid ""
-"You are about to change the last quadratic\n"
-"layer to cubic. When this happens FontForge\n"
-"will remove all truetype instructions.\n"
-"\n"
-"This cannot be undone.\n"
-"\n"
-"Is this really your intent?"
-msgstr ""
-
-#: fontinfo.c:4008 splinefont.c:1946
-msgid "Too many layers"
-msgstr ""
-
-#: fontinfo.c:4008
-#, c-format
-msgid "FontForge supports at most %d layers"
-msgstr ""
-
-#
-#: fontinfo.c:4018
-msgid "Too many Unique Font IDs"
-msgstr "过多相同的字体编号"
-
-#: fontinfo.c:4018
-msgid ""
-"You should only specify the TrueType Unique Font Identification string in "
-"one language. This font has more. Do you want to continue anyway?"
-msgstr ""
-
-#
-#: fontinfo.c:4029 fontinfo.c:7823
-msgid "_Italic Angle:"
-msgstr "倾斜角(_I)："
-
-#
-#: fontinfo.c:4039 fontinfo.c:7858
-msgid "Underline _Position:"
-msgstr "下划线位置(_P)："
-
-#
-#: fontinfo.c:4040 fontinfo.c:7875
-msgid "Underline|_Height:"
-msgstr "高度(_H)："
-
-#
-#: fontinfo.c:4041
-msgid "_Em Size:"
-msgstr "M全字尺寸(_E)："
-
-#
-#: fontinfo.c:4042 fontinfo.c:7755
-msgid "_Ascent:"
-msgstr "上高(_A)："
-
-#
-#: fontinfo.c:4043 fontinfo.c:7773
-msgid "_Descent:"
-msgstr "下深(_D)："
-
-#
-#: fontinfo.c:4045 fontinfo.c:9835
-msgid "De_sign Size:"
-msgstr "设计尺寸："
-
-#
-#: fontinfo.c:4046 fontinfo.c:6838 fontinfo.c:10101
-msgid "_Bottom"
-msgstr "底(_B)"
-
-#
-#: fontinfo.c:4047 fontinfo.c:6835 fontinfo.c:10068
-msgid "_Top"
-msgstr "顶(_T)"
-
-#
-#: fontinfo.c:4048 fontinfo.c:9913
-msgid "Style _ID:"
-msgstr "样式ID:"
-
-#: fontinfo.c:4052 fontinfo.c:4055 fontinfo.c:4058 fontinfo.c:4061
-#: fontinfo.c:4064 fontinfo.c:4067 fontinfo.c:4070 fontinfo.c:4073
-msgid "Bad Design Size Info"
-msgstr ""
-
-#: fontinfo.c:4052
-msgid ""
-"If the design size is 0, then all other fields on that pane must be zero (or "
-"unspecified) too."
-msgstr ""
-
-#: fontinfo.c:4055
-msgid ""
-"If you specify a style id for the design size, then you must specify a style "
-"name"
-msgstr ""
-
-#: fontinfo.c:4058
-msgid ""
-"If you specify a style name for the design size, then you must specify a "
-"style id"
-msgstr ""
-
-#: fontinfo.c:4061
-msgid "If you specify a design size, it must be positive"
-msgstr ""
-
-#: fontinfo.c:4064
-msgid ""
-"In the design size range, the bottom field must be less than the design size."
-msgstr ""
-
-#: fontinfo.c:4067
-msgid ""
-"In the design size range, the bottom top must be more than the design size."
-msgstr ""
-
-#: fontinfo.c:4070
-msgid ""
-"If you specify a style id for the design size, then you must specify a size "
-"range"
-msgstr ""
-
-#: fontinfo.c:4073
-msgid ""
-"If you specify a design size range, then you are supposed to specify a style "
-"id and style name too. FontForge will allow you to leave those fields blank, "
-"but other applications may not."
-msgstr ""
-
-#: fontinfo.c:4078
-msgid "sfnt Revision:"
-msgstr ""
-
-#: fontinfo.c:4080
-msgid "Woff Major Version:"
-msgstr ""
-
-#: fontinfo.c:4083
-msgid "Woff Minor Version:"
-msgstr ""
-
-#: fontinfo.c:4091
-msgid "MS Code Pages"
-msgstr "微软编码页"
-
-#
-#: fontinfo.c:4093 fontinfo.c:10498
-msgid "Unicode Ranges"
-msgstr "统一码范围"
-
-#
-#: fontinfo.c:4098
-msgid "_Version"
-msgstr "版本"
-
-#
-#: fontinfo.c:4108 fontinfo.c:8366
-msgid "Weight, Width, Slope Only"
-msgstr "仅粗细，宽度，斜度"
-
-#
-#: fontinfo.c:4126 fontinfo.c:8245
-msgid "_Weight Class"
-msgstr "粗细类属(_W)"
-
-#
-#: fontinfo.c:4127 fontinfo.c:8653
-msgid "HHead _Line Gap:"
-msgstr "HHead 线距(_L):"
-
-#
-#: fontinfo.c:4128 fontinfo.c:8566
-msgid "Typo Line _Gap:"
-msgstr "Typo 线距(_G):"
-
-#
-#: fontinfo.c:4130 fontinfo.c:8674
-msgid "VHead _Column Spacing:"
-msgstr "VHead 列宽(_C):"
-
-#
-#: fontinfo.c:4133 fontinfo.c:8422
-msgid "Win _Ascent Offset:"
-msgstr "Win 重音偏移量(_A):"
-
-#
-#: fontinfo.c:4133 fontinfo.c:4503
-msgid "Win Ascent:"
-msgstr "Win 上高:"
-
-#
-#: fontinfo.c:4134 fontinfo.c:8455
-msgid "Win _Descent Offset:"
-msgstr "Win 下深偏移量(_D):"
-
-#
-#: fontinfo.c:4134 fontinfo.c:4508
-msgid "Win Descent:"
-msgstr "Win 下深:"
-
-#
-#: fontinfo.c:4137 fontinfo.c:8500
-msgid "_Typo Ascent Offset:"
-msgstr "字形上高偏移(_T):"
-
-#
-#: fontinfo.c:4137 fontinfo.c:4512
-msgid "Typo Ascent:"
-msgstr "字形上高:"
-
-#
-#: fontinfo.c:4138 fontinfo.c:8533
-msgid "T_ypo Descent Offset:"
-msgstr "字形下深偏移量(_Y):"
-
-#
-#: fontinfo.c:4138 fontinfo.c:4517
-msgid "Typo Descent:"
-msgstr "字形下深:"
-
-#
-#: fontinfo.c:4141 fontinfo.c:8587
-msgid "_HHead Ascent Offset:"
-msgstr "_HHead 上高偏移量:"
-
-#
-#: fontinfo.c:4141 fontinfo.c:4521
-msgid "HHead Ascent:"
-msgstr "HHead 上高:"
-
-#
-#: fontinfo.c:4142 fontinfo.c:8620
-msgid "HHead De_scent Offset:"
-msgstr "HHead 下深偏移(_S):"
-
-#
-#: fontinfo.c:4142 fontinfo.c:4526
-msgid "HHead Descent:"
-msgstr "HHead 下深:"
-
-#
-#: fontinfo.c:4148 fontinfo.c:8723 lookups.c:175 scstylesui.c:370
-msgid "Subscript"
-msgstr "下标"
-
-#
-#: fontinfo.c:4150 fontinfo.c:8801 lookups.c:176 scstylesui.c:368
-msgid "Superscript"
-msgstr "上标"
-
-#
-#: fontinfo.c:4152 fontinfo.c:8862
-msgid "Strikeout"
-msgstr "删除线"
-
-#
-#: fontinfo.c:4158 fontinfo.c:4160
-msgid "Bad IBM Family"
-msgstr "不良IBM字族名"
-
-#
-#: fontinfo.c:4158
-msgid "Tag must be 4 characters long"
-msgstr "标签至少要有4个字符长"
-
-#
-#: fontinfo.c:4160
-msgid "A tag must be 4 ASCII characters"
-msgstr "特征标签应为4个ASCII字符"
-
-#
-#: fontinfo.c:4175
-msgid "Bad Ascent/Descent"
-msgstr "不良上高/下深"
-
-#: fontinfo.c:4175
-msgid "Ascent and Descent must be positive and their sum less than 16384"
-msgstr ""
-
-#
-#: fontinfo.c:4186
-msgid "Bad Style"
-msgstr "不良样式"
-
-#: fontinfo.c:4186
-msgid "A style may not have both condense and extend set (it makes no sense)"
-msgstr ""
-
-#
-#: fontinfo.c:4200 fontview.c:4854 openfontdlg.c:438 prefs.c:1723
-#: savefontdlg.c:1345
-msgid "Namelist contains non-ASCII names"
-msgstr "名称列表中包含非 ASCII 字符"
-
-#: fontinfo.c:4200
-msgid ""
-"Glyph names should be limited to characters in the ASCII character set,\n"
-"but there are names in this namelist which use characters outside\n"
-"that range."
-msgstr ""
-
-#
-#: fontinfo.c:4240 math.c:366 math.c:650
-msgid "Change"
-msgstr "更改"
-
-#
-#: fontinfo.c:4241 scstylesui.c:2161
-msgid "Retain"
-msgstr "保留"
-
-#
-#: fontinfo.c:4244
-msgid "Change UniqueID?"
-msgstr "更改UniqueID？"
-
-#: fontinfo.c:4244
-msgid ""
-"You have changed this font's name without changing the UniqueID (or XUID).\n"
-"This is probably not a good idea, would you like me to\n"
-"generate a random new value?"
-msgstr ""
-
-#
-#: fontinfo.c:4503
-msgid "Win Ascent Offset:"
-msgstr "Win 上高偏移量:"
-
-#
-#: fontinfo.c:4508
-msgid "Win Descent Offset:"
-msgstr "Win 下深偏移量:"
-
-#
-#: fontinfo.c:4512
-msgid "Typo Ascent Offset:"
-msgstr "字形上高偏移量:"
-
-#
-#: fontinfo.c:4517
-msgid "Typo Descent Offset:"
-msgstr "字形下降偏移量:"
-
-#
-#: fontinfo.c:4521
-msgid "HHead Ascent Offset:"
-msgstr "HHead 上高偏移量:"
-
-#
-#: fontinfo.c:4526
-msgid "HHead Descent Offset:"
-msgstr "HHead 下深偏移量:"
-
-#
-#. GT: TeX parameters for math fonts. "Num" means numerator, "Denom"
-#. GT: means denominator, "Sup" means superscript, "Sub" means subscript
-#: fontinfo.c:4856
-msgid "Num1:"
-msgstr "分子1:"
-
-#
-#: fontinfo.c:4857
-msgid "Num2:"
-msgstr "分子2:"
-
-#
-#: fontinfo.c:4857
-msgid "Num3:"
-msgstr "分子3:"
-
-#
-#: fontinfo.c:4857
-msgid "Denom1:"
-msgstr "分母1:"
-
-#
-#: fontinfo.c:4858
-msgid "Denom2:"
-msgstr "分母2:"
-
-#
-#: fontinfo.c:4858
-msgid "Sup1:"
-msgstr "上标1:"
-
-#
-#: fontinfo.c:4858
-msgid "Sup2:"
-msgstr "上标2:"
-
-#
-#: fontinfo.c:4858
-msgid "Sup3:"
-msgstr "上标3:"
-
-#
-#: fontinfo.c:4858
-msgid "Sub1:"
-msgstr "下标1:"
-
-#
-#: fontinfo.c:4858
-msgid "Sub2:"
-msgstr "下标2:"
-
-#: fontinfo.c:4859
-msgid "SupDrop:"
-msgstr ""
-
-#: fontinfo.c:4859
-msgid "SubDrop:"
-msgstr ""
-
-#
-#: fontinfo.c:4859
-msgid "Delim1:"
-msgstr "分母1:"
-
-#
-#: fontinfo.c:4859
-msgid "Delim2:"
-msgstr "分母2:"
-
-#
-#: fontinfo.c:4859
-msgid "Axis Ht:"
-msgstr "轴高:"
-
-#: fontinfo.c:4861
-msgid "Amount to raise baseline for numerators in display styles"
-msgstr ""
-
-#: fontinfo.c:4862
-msgid "Amount to raise baseline for numerators in non-display styles"
-msgstr ""
-
-#: fontinfo.c:4863
-msgid "Amount to raise baseline for numerators in non-display atop styles"
-msgstr ""
-
-#: fontinfo.c:4864
-msgid "Amount to lower baseline for denominators in display styles"
-msgstr ""
-
-#: fontinfo.c:4865
-msgid "Amount to lower baseline for denominators in non-display styles"
-msgstr ""
-
-#: fontinfo.c:4866
-msgid "Amount to raise baseline for superscripts in display styles"
-msgstr ""
-
-#: fontinfo.c:4867
-msgid "Amount to raise baseline for superscripts in non-display styles"
-msgstr ""
-
-#: fontinfo.c:4868
-msgid "Amount to raise baseline for superscripts in modified styles"
-msgstr ""
-
-#: fontinfo.c:4869
-msgid "Amount to lower baseline for subscripts in display styles"
-msgstr ""
-
-#: fontinfo.c:4870
-msgid "Amount to lower baseline for subscripts in non-display styles"
-msgstr ""
-
-#: fontinfo.c:4871
-msgid "Amount above top of large box to place baseline of superscripts"
-msgstr ""
-
-#: fontinfo.c:4872
-msgid "Amount below bottom of large box to place baseline of subscripts"
-msgstr ""
-
-#: fontinfo.c:4873
-msgid "Size of comb delimiters in display styles"
-msgstr ""
-
-#: fontinfo.c:4874
-msgid "Size of comb delimiters in non-display styles"
-msgstr ""
-
-#
-#: fontinfo.c:4875
-msgid "Height of fraction bar above base line"
-msgstr "基线上分数线高度"
-
-#
-#. GT: Default Rule Thickness. A rule being a typographic term for a straight
-#. GT: black line on a printed page.
-#: fontinfo.c:4879
-msgid "Def Rule Thick:"
-msgstr "定义规格厚度:"
-
-#
-#. GT: I don't really understand these "Big Op Space" things. They have
-#. GT: something to do with TeX and are roughly defined a few strings down
-#: fontinfo.c:4882
-msgid "Big Op Space1:"
-msgstr "大Op间距1:"
-
-#
-#: fontinfo.c:4883
-msgid "Big Op Space2:"
-msgstr "大Op间距2:"
-
-#
-#: fontinfo.c:4884
-msgid "Big Op Space3:"
-msgstr "大Op间距3:"
-
-#
-#: fontinfo.c:4885
-msgid "Big Op Space4:"
-msgstr "大Op间距4:"
-
-#
-#: fontinfo.c:4886
-msgid "Big Op Space5:"
-msgstr "大Op间距5:"
-
-#: fontinfo.c:4887
-msgid "Default thickness of over and overline bars"
-msgstr ""
-
-#: fontinfo.c:4888
-msgid "The minimum glue space above a large displayed operator"
-msgstr ""
-
-#: fontinfo.c:4889
-msgid "The minimum glue space below a large displayed operator"
-msgstr ""
-
-#: fontinfo.c:4890
-msgid ""
-"The minimum distance between a limit's baseline and a large displayed\n"
-"operator when the limit is above the operator"
-msgstr ""
-
-#: fontinfo.c:4891
-msgid ""
-"The minimum distance between a limit's baseline and a large displayed\n"
-"operator when the limit is below the operator"
-msgstr ""
-
-#: fontinfo.c:4892
-msgid "The extra glue place above and below displayed limits"
-msgstr ""
-
-#
-#. GT: More Parameters
-#: fontinfo.c:4959 fontinfo.c:9797
-msgid "More Params"
-msgstr "更多参数"
-
-#
-#: fontinfo.c:5053
-msgid "Math Sp:"
-msgstr "数学Sp:"
-
-#
-#
-#: fontinfo.c:6103
-msgid "Do it"
-msgstr "执行"
-
-#
-#: fontinfo.c:6106
-msgid "Cannot be Undone"
-msgstr "不能取消"
-
-#
-#: fontinfo.c:6106
-msgid ""
-"The Merge operation cannot be reverted.\n"
-"Do it anyway?"
-msgstr ""
-"此混成操作不能取消，\n"
-"是否继续？"
-
-#
-#: fontinfo.c:6315
-msgid "Select lookups from other fonts"
-msgstr "从其他字体选择查找"
-
-#
-#: fontinfo.c:6364
-msgid "Import Lookup"
-msgstr "导入查找"
-
-#
-#: fontinfo.c:6503
-msgid "Kerning State Machine"
-msgstr "压缩状态机"
-
-#
-#: fontinfo.c:6505
-msgid "Indic State Machine"
-msgstr "Indic 状态机"
-
-#
-#: fontinfo.c:6507 fontinfo.c:6509
-msgid "Contextual State Machine"
-msgstr "上下文状态机"
-
-#
-#: fontinfo.c:6518
-msgid "(kerning class)\n"
-msgstr "(压缩类属)\n"
-
-#
-#: fontinfo.c:6523
-msgid "Not attached to a feature"
-msgstr "未附加到特征"
-
-#
-#: fontinfo.c:6578
-#, c-format
-msgid " Used in %s\n"
-msgstr " 用于 %s\n"
-
-#: fontinfo.c:6710
-msgid "No data"
-msgstr ""
-
-#: fontinfo.c:6710
-msgid "This lookup contains no data"
-msgstr ""
-
-#
-#: fontinfo.c:6715
-msgid "Feature file?"
-msgstr "特征文件?"
-
-#
-#: fontinfo.c:6722
-#, c-format
-msgid "Cannot open %s"
-msgstr "无法打开 %s"
-
-#
-#: fontinfo.c:6731
-msgid "Output error"
-msgstr "输出错误"
-
-#: fontinfo.c:6731
-#, c-format
-msgid "An error occurred writing %s"
-msgstr "写入%s发生了错误"
-
-#: fontinfo.c:6762
-msgid "Lookups will be removed"
-msgstr "查找将被删除"
-
-#: fontinfo.c:6762
-msgid "Feature tags will be removed"
-msgstr "特征标签将被删除"
-
-#: fontinfo.c:6765
-msgid ""
-"Warning: There are already some 'aalt' lookups in\n"
-"the font. If you proceed with this command those\n"
-"lookups will be removed and new lookups will be\n"
-"generated. The old information will be LOST.\n"
-" Is that what you want?"
-msgstr ""
-
-#: fontinfo.c:6771
-msgid ""
-"Warning: There are already some 'aalt' lookups in\n"
-"the font but there are other feature tags associated\n"
-"with these lookups. If you proceed with this command\n"
-"the 'aalt' tag will be removed from those lookups,\n"
-"and new lookups will be generate which will NOT be\n"
-"associated with the other feature tag(s).\n"
-" Is that what you want?"
-msgstr ""
-
-#: fontinfo.c:6778
-msgid ""
-"Warning: There are already some 'aalt' lookups in\n"
-"the font, some have no other feature tags associated\n"
-"with them and these will be removed, others have other\n"
-"tags associated and these will remain while the 'aalt'\n"
-"tag will be removed from the lookup -- a new lookup\n"
-"will be generated which is not associated with any\n"
-"other feature tags.\n"
-" Is that what you want?"
-msgstr ""
-
-#
-#: fontinfo.c:6801 fontinfo.c:6803
-msgid "_Apply to All"
-msgstr "应用到全部(_A)"
-
-#
-#: fontinfo.c:6803
-msgid "_Apply to Selection"
-msgstr "应用到选择(_A)"
-
-#: fontinfo.c:6805
-msgid "Apply to:"
-msgstr "应用到："
-
-#: fontinfo.c:6805
-msgid "Apply change to which lookups?"
-msgstr "要更改哪个查找？"
-
-#
-#: fontinfo.c:6836 fontinfo.c:10079
-msgid "_Up"
-msgstr "上(_U)"
-
-#
-#: fontinfo.c:6837 fontinfo.c:10090
-msgid "_Down"
-msgstr "下(_D)"
-
-#
-#: fontinfo.c:6839 fontinfo.c:10112
-msgid "_Sort"
-msgstr "排序(_S)"
-
-#
-#: fontinfo.c:6841 fontinfo.c:10127
-msgid "Add _Lookup"
-msgstr "添加查找(_L)"
-
-#
-#: fontinfo.c:6842 fontinfo.c:10138
-msgid "Add Sub_table"
-msgstr "添加子表(_T)"
-
-#
-#: fontinfo.c:6843 fontinfo.c:10149
-msgid "Edit _Metadata"
-msgstr "编辑元数据(_M)"
-
-#
-#: fontinfo.c:6844 fontinfo.c:10160
-msgid "_Edit Data"
-msgstr "编辑数据(_E)"
-
-#
-#: fontinfo.c:6845 fontinfo.c:10171
-msgid "De_lete"
-msgstr "删除(_L)"
-
-#
-#: fontinfo.c:6846 fontinfo.c:10182
-msgid "_Merge"
-msgstr "混成(_M)"
-
-#: fontinfo.c:6847
-msgid "Sa_ve Lookup..."
-msgstr ""
-
-#: fontinfo.c:6849
-msgid "Add Language to Script..."
-msgstr ""
-
-#: fontinfo.c:6850
-msgid "Remove Language from Script..."
-msgstr ""
-
-#: fontinfo.c:6852
-msgid "_Add 'aalt' features"
-msgstr "添加 'aalt' 特征(_A)"
-
-#
-#: fontinfo.c:6853
-msgid "Add 'D_FLT' script"
-msgstr "添加 'D_FLT' 脚本"
-
-#
-#: fontinfo.c:6855
-msgid "_Revert All"
-msgstr "返转所有修改(_R)"
-
-#: fontinfo.c:6857
-msgid "S_ave Feature File..."
-msgstr ""
-
-#
-#: fontinfo.c:7451
-#, c-format
-msgid "Font Information for %.90s"
-msgstr "字体信息：%.90s"
-
-#
-#: fontinfo.c:7472
-msgid "Fo_ntname:"
-msgstr "字体名(_N)："
-
-#
-#: fontinfo.c:7489 mmdlg.c:2665
-msgid "_Family Name:"
-msgstr "字族名(_F)："
-
-#
-#: fontinfo.c:7509
-msgid "Name For Human_s:"
-msgstr "昵称(_s)："
-
-#
-#: fontinfo.c:7527
-msgid "_Weight"
-msgstr "粗细(_W)"
-
-#
-#: fontinfo.c:7544
-msgid "_Version:"
-msgstr "版本(_V)："
-
-#: fontinfo.c:7563
-msgid "sfnt _Revision:"
-msgstr ""
-
-#: fontinfo.c:7568 fontinfo.c:7579
-msgid ""
-"If you leave this field blank FontForge will use a default based on\n"
-"either the version string above, or one in the 'name' table."
-msgstr ""
-
-#
-#: fontinfo.c:7582
-msgid "_Base Filename:"
-msgstr "文件名(_B):"
-
-#: fontinfo.c:7586
-msgid ""
-"Use this as the default base for the filename\n"
-"when generating a font."
-msgstr ""
-
-#
-#. GT: The space in front of "Same" makes things line up better
-#: fontinfo.c:7591
-msgid " Same as Fontname"
-msgstr " 与字体名相同"
-
-#
-#: fontinfo.c:7616
-msgid "Copy_right:"
-msgstr "版权(_r)："
-
-#: fontinfo.c:7634
-msgid ""
-"This must be ASCII, so you may not use the copyright symbol (use (c) "
-"instead)."
-msgstr ""
-
-#
-#: fontinfo.c:7672
-msgid "(Adobe now considers XUID/UniqueID unnecessary)"
-msgstr "(Adobe 如今认为 XUID/UniqueID 不必要)"
-
-#: fontinfo.c:7679
-msgid "Use XUID"
-msgstr ""
-
-#
-#: fontinfo.c:7691
-msgid "_XUID:"
-msgstr "_XUID:"
-
-#: fontinfo.c:7707
-msgid "Use UniqueID"
-msgstr ""
-
-#
-#: fontinfo.c:7717
-msgid "_UniqueID:"
-msgstr "_UniqueID:"
-
-#
-#: fontinfo.c:7791
-msgid " _Em Size:"
-msgstr " M全字大小(_E)："
-
-#
-#: fontinfo.c:7810
-msgid "_Scale Outlines"
-msgstr "缩放轮廓(_S)"
-
-#
-#: fontinfo.c:7845 fontinfo.c:8222 savefontdlg.c:1018
-msgid "_Guess"
-msgstr "估计(_G)"
-
-#
-#: fontinfo.c:7891
-msgid "Has _Vertical Metrics"
-msgstr "有垂直尺寸(_V)"
-
-#
-#: fontinfo.c:7905
-msgid "Interpretation:"
-msgstr "翻译："
-
-#
-#: fontinfo.c:7928
-msgid "Name List:"
-msgstr "名称列表:"
-
-#: fontinfo.c:8009
-msgid "Font Type:"
-msgstr ""
-
-#
-#: fontinfo.c:8019
-msgid "_Outline Font"
-msgstr "轮廓字体(_O)"
-
-#: fontinfo.c:8030
-msgid "_Type3 Multi Layered Font"
-msgstr ""
-
-#: fontinfo.c:8040
-msgid ""
-"Allow editing of multiple colors and shades, fills and strokes.\n"
-"Multi layered fonts can only be output as type3 or svg fonts."
-msgstr ""
-
-#
-#: fontinfo.c:8044 fontinfo.c:8056
-msgid "_Stroked Font"
-msgstr "单线字体(_S)"
-
-#
-#: fontinfo.c:8052 fontinfo.c:8063
-msgid ""
-"Glyphs will be composed of stroked lines rather than filled outlines.\n"
-"All glyphs are stroked at the following width"
-msgstr ""
-"字形将由线组成而非可填充的轮廓。\n"
-"所有字形的线宽为"
-
-#: fontinfo.c:8068
-msgid "  Stroke _Width:"
-msgstr ""
-
-#: fontinfo.c:8091
-msgid "All layers _cubic"
-msgstr ""
-
-#: fontinfo.c:8102
-msgid ""
-"Use cubic (that is postscript) splines to hold the outlines of all\n"
-"layers of this font. Cubic splines are generally easier to edit\n"
-"than quadratic (and you may still generate a truetype font from them)."
-msgstr ""
-
-#: fontinfo.c:8106
-msgid "All layers _quadratic"
-msgstr ""
-
-#: fontinfo.c:8117
-msgid ""
-"Use quadratic (that is truetype) splines to hold the outlines of all\n"
-"layers of this font rather than cubic (postscript) splines."
-msgstr ""
-
-#: fontinfo.c:8120
-msgid "_Mixed"
-msgstr ""
-
-#: fontinfo.c:8131
-msgid ""
-"The order of each layer of the font can be controlled\n"
-"individually. This might be useful if you wished to\n"
-"retain both quadratic and cubic versions of a font."
-msgstr ""
-
-#: fontinfo.c:8143
-msgid "Guidelines:"
-msgstr ""
-
-#: fontinfo.c:8162
-msgid "Use quadratic splines for the guidelines layer of the font"
-msgstr ""
-
-#: fontinfo.c:8171
-msgid ""
-"\n"
-"Layers:"
-msgstr ""
-
-#: fontinfo.c:8206
-msgid ""
-"The PostScript 'Private' dictionary gives you control over\n"
-"several font-wide versions of hinting.\n"
-"The 'Private' dictionary only applies to PostScript fonts."
-msgstr ""
-
-#: fontinfo.c:8231
-msgid "_Histogram"
-msgstr ""
-
-#
-#: fontinfo.c:8237
-msgid "Histogram Dialog"
-msgstr "直方图"
-
-#
-#: fontinfo.c:8259
-msgid "Width _Class"
-msgstr "宽度类属(_C)"
-
-#
-#: fontinfo.c:8273
-msgid "P_FM Family"
-msgstr "PFM字族"
-
-#
-#: fontinfo.c:8287
-msgid "_Embeddable"
-msgstr "可嵌入(_E)"
-
-#: fontinfo.c:8292
-msgid ""
-"Can this font be embedded in a downloadable (pdf)\n"
-"document, and if so, what behaviors are permitted on\n"
-"both the document and the font."
-msgstr ""
-
-#
-#: fontinfo.c:8316
-msgid "No Subsetting"
-msgstr "无子集"
-
-#: fontinfo.c:8322
-msgid ""
-"If set then the entire font must be\n"
-"embedded in a document when any character is.\n"
-"Otherwise the document creator need\n"
-"only include the characters it uses."
-msgstr ""
-
-#
-#: fontinfo.c:8327
-msgid "Only Embed Bitmaps"
-msgstr "仅嵌入位图"
-
-#: fontinfo.c:8333
-msgid ""
-"Only Bitmaps may be embedded.\n"
-"Outline descriptions may not be\n"
-"(if font file contains no bitmaps\n"
-"then nothing may be embedded)."
-msgstr ""
-
-#
-#: fontinfo.c:8338
-msgid "Vendor ID:"
-msgstr "供应者标识："
-
-#
-#: fontinfo.c:8352
-msgid "_IBM Family:"
-msgstr "_IBM 字族:"
-
-#: fontinfo.c:8371
-msgid ""
-"MS needs to know whether a font family's members differ\n"
-"only in weight, width and slope (and not in other variables\n"
-"like optical size)."
-msgstr ""
-
-#
-#: fontinfo.c:8376
-msgid "_OS/2 Version"
-msgstr "OS/2版本(_O)"
-
-#: fontinfo.c:8380
-msgid ""
-"The 'OS/2' table has changed slightly over the years.\n"
-"Generally fields have been added, but occasionally their\n"
-"meanings have been redefined."
-msgstr ""
-
-#: fontinfo.c:8427
-msgid ""
-"Anything outside the OS/2 WinAscent &\n"
-"WinDescent fields will be clipped by windows.\n"
-"This includes marks, etc. that have been repositioned by GPOS.\n"
-"(The descent field is usually positive.)\n"
-"If the \"[] Is Offset\" checkbox is clear then\n"
-"any number you enter will be the value used in OS/2.\n"
-"If set then any number you enter will be added to the\n"
-"font's bounds. You should leave this\n"
-"field 0 and check \"[*] Is Offset\" in most cases.\n"
-"\n"
-"Note: WinDescent is a POSITIVE number for\n"
-"things below the baseline"
-msgstr ""
-
-#
-#: fontinfo.c:8442 fontinfo.c:8475 fontinfo.c:8520 fontinfo.c:8553
-#: fontinfo.c:8607 fontinfo.c:8640
-msgid "Is Offset"
-msgstr "是偏移"
-
-#
-#: fontinfo.c:8488
-msgid "Really use Typo metrics"
-msgstr "应用 Typo 尺寸"
-
-#: fontinfo.c:8494
-msgid ""
-"The specification already says that the typo metrics should be\n"
-"used to determine line spacing. But so many\n"
-"programs fail to follow the spec. that MS decided an additional\n"
-"bit was needed to remind them to do so."
-msgstr ""
-
-#: fontinfo.c:8505
-msgid ""
-"The typo ascent&descent fields are>supposed<\n"
-"to specify the line spacing on windows.\n"
-"In fact usually the win ascent/descent fields do.\n"
-"(The descent field is usually negative.)\n"
-"If the \"[] Is Offset\" checkbox is clear then\n"
-"any number you enter will be the value used in OS/2.\n"
-"If set then any number you enter will be added to the\n"
-"Em-size. You should leave this\n"
-"field 0 and check \"[*] Is Offset\" in most cases.\n"
-"\n"
-"NOTE: Typo Descent is a NEGATIVE number for\n"
-"things below the baseline"
-msgstr ""
-
-#: fontinfo.c:8571
-msgid "Sets the TypoLinegap field in the OS/2 table, used on MS Windows"
-msgstr ""
-
-#: fontinfo.c:8592
-msgid ""
-"This specifies the line spacing on the mac.\n"
-"(The descent field is usually negative.)\n"
-"If the \"[] Is Offset\" checkbox is clear then\n"
-"any number you enter will be the value used in hhea.\n"
-"If set then any number you enter will be added to the\n"
-"font's bounds. You should leave this\n"
-"field 0 and check \"[*] Is Offset\" in most cases.\n"
-"\n"
-"NOTE: hhea Descent is a NEGATIVE value for things\n"
-"below the baseline"
-msgstr ""
-
-#: fontinfo.c:8658
-msgid "Sets the linegap field in the hhea table, used on the mac"
-msgstr ""
-
-#: fontinfo.c:8679
-msgid ""
-"Sets the linegap field in the vhea table.\n"
-"This is the horizontal spacing between rows\n"
-"of vertically set text."
-msgstr ""
-
-#
-#: fontinfo.c:8710
-msgid "SubscriptSuperUse|Default"
-msgstr "默认"
-
-#
-#: fontinfo.c:8938
-msgid "PanoseUse|Default"
-msgstr "缺省"
-
-#: fontinfo.c:8949
-msgid "http://panose.com/"
-msgstr ""
-
-#
-#: fontinfo.c:8960
-msgid "Panose|_Family"
-msgstr "族(_F)"
-
-#
-#: fontinfo.c:9154
-msgid "Unicode Ranges:"
-msgstr "统一码范围:"
-
-#
-#: fontinfo.c:9161 fontinfo.c:9215
-msgid "Default"
-msgstr "默认"
-
-#: fontinfo.c:9208
-msgid "MS Code Pages:"
-msgstr "微软编码页:"
-
-#
-#: fontinfo.c:9277
-msgid "Misc."
-msgstr "其他"
-
-#
-#: fontinfo.c:9281
-msgid "Metrics"
-msgstr "尺寸"
-
-#
-#: fontinfo.c:9285
-msgid "Sub/Super"
-msgstr "上标/下标"
-
-#
-#: fontinfo.c:9289
-msgid "Panose"
-msgstr "Panose"
-
-#
-#: fontinfo.c:9293
-msgid "Charsets"
-msgstr "字符集"
-
-#
-#: fontinfo.c:9316
-msgid "Gasp|_Version"
-msgstr "版本(_V)"
-
-#: fontinfo.c:9338
-msgid "Optimized For ClearType"
-msgstr "为ClearType优化"
-
-#: fontinfo.c:9346
-msgid ""
-"Actually a bit in the 'head' table.\n"
-"If unset then certain East Asian fonts will not be hinted"
-msgstr ""
-
-#: fontinfo.c:9362
-msgid ""
-"The 'gasp' table gives you control over when grid-fitting and\n"
-"anti-aliased rasterizing are done.\n"
-"The table consists of an (ordered) list of pixel sizes each with\n"
-"a set of flags. Those flags apply to all pixel sizes bigger than\n"
-"the previous table entry but less than or equal to the current.\n"
-"The list must be terminated with a pixel size of 65535.\n"
-"Version 1 of the table contains two additional flags that\n"
-"apply to MS's ClearType rasterizer.\n"
-"\n"
-"The 'gasp' table only applies to truetype fonts."
-msgstr ""
-
-#
-#: fontinfo.c:9381
-msgid "Gasp|_Default"
-msgstr "默认(_D)"
-
-#
-#: fontinfo.c:9405
-msgid "_Language"
-msgstr "语言(_L)"
-
-#
-#: fontinfo.c:9416
-msgid "_String Type"
-msgstr "字串类型(_T)"
-
-#
-#: fontinfo.c:9426
-msgid "SortingScheme|Default"
-msgstr "默认"
-
-#: fontinfo.c:9439
-msgid ""
-"To create a new name, left click on the <New> button, and select a locale.\n"
-"To change the locale, left click on it.\n"
-"To change the string type, left click on it.\n"
-"To change the text, left click in it and then type.\n"
-"To delete a name, right click on the name & select Delete from the menu.\n"
-"To associate or disassocate a truetype name to its postscript equivalent\n"
-"right click and select the appropriate menu item."
-msgstr ""
-
-#. GT: when translating this please leave the "SIL Open Font License" in
-#. GT: English (possibly translating it in parentheses). I believe there
-#. GT: are legal reasons for this.
-#. GT: So "Añadir SIL Open Font License (licencia de fuentes libres)"
-#: fontinfo.c:9454
-msgid "Add SIL "
-msgstr "添加SIL "
-
-#
-#: fontinfo.c:9462
-msgid ""
-"The SIL Open Font License (OFL) is designed for free/libre/open font "
-"projects.\n"
-"Most other FLOSS licenses are designed for conventional software and are "
-"problematic for fonts.\n"
-"The OFL is a community-approved license and is well-suited for releasing "
-"fonts to be freely \n"
-"used, studied, copied, modified, embedded, merged and distributed while "
-"maintaining artistic integrity.\n"
-"You are encouraged you to use it if you can.\n"
-"\n"
-"For more details about the OFL - and the corresponding FAQ - see "
-"http://scripts.sil.org/OFL \n"
-"\n"
-"Simply press this button to add the OFL metadata to your font.\n"
-"\n"
-msgstr ""
-"SIL开放字体许可(SIL Open Font License, OFL)为免费/自由/开放的字体项目而设计。\n"
-"多数其他FLOSS许可为软件项目而设定，对于字体项目却是个问题。\n"
-"OFL是由社区提出的，很适合发布免费使用的字体以为自由的研究、复制、修改、嵌入、混成及分发，同时保存其完整性。\n"
-"\n"
-"如果你能用到它，我们鼓励你使用它。\n"
-"\n"
-"若需OFL更详细的信息及相关的常见问题集(FAQ)，敬请惠顾其网站 http://scripts.sil.org/OFL \n"
-"\n"
-"单击此按钮可添加OFL元数据到你的字体中。\n"
-"\n"
-
-#: fontinfo.c:9475
-msgid "OFL website"
-msgstr "OFL 网站"
-
-#: fontinfo.c:9481
-msgid ""
-"\n"
-"Click here to go to http://scripts.sil.org/OFL \n"
-"to get all the details about the Open Font License \n"
-"and to read the corresponding FAQ. \n"
-"\n"
-msgstr ""
-
-#: fontinfo.c:9509
-msgid ""
-"The OpenType Style Set features ('ss01'-'ss20') may\n"
-"be assigned human readable names here."
-msgstr ""
-
-#: fontinfo.c:9521
-msgid ""
-"To create a new name, left click on the <New> button, and select a locale "
-"(language).\n"
-"To change the locale, left click on it.\n"
-"To change the feature, left click on it.\n"
-"To change the text, left click in it and then type.\n"
-msgstr ""
-
-#: fontinfo.c:9538
-msgid "The font comment can contain whatever you feel it should"
-msgstr ""
-
-#: fontinfo.c:9564
-msgid ""
-"The FONTLOG contains some description of the \n"
-" font project, a detailed changelog, and a list of contributors"
-msgstr ""
-
-#: fontinfo.c:9588
-msgid ""
-"These are not Anchor Classes. For them see the \"Lookups\" pane.\n"
-"(Mark Classes can control when lookups are active, they do NOT\n"
-" position glyphs.)"
-msgstr ""
-
-#: fontinfo.c:9632
-msgid ""
-"These are not Anchor Classes. For them see the \"Lookups\" pane.\n"
-"(Mark Sets, like Mark Classes can control when lookups are active,\n"
-" they do NOT position glyphs.)"
-msgstr ""
-
-#: fontinfo.c:9671
-msgid "Version, Major:"
-msgstr ""
-
-#: fontinfo.c:9688 fontinfo.c:9702
-msgid ""
-"If you leave this field blank FontForge will use a default based on\n"
-"either the version string, or one in the 'name' table."
-msgstr ""
-
-#: fontinfo.c:9691
-msgid "Minor:"
-msgstr ""
-
-#: fontinfo.c:9711
-msgid "Metadata (xml):"
-msgstr ""
-
-#
-#: fontinfo.c:9748
-msgid "ΤεΧ General"
-msgstr "ΤεΧ一般"
-
-#
-#: fontinfo.c:9757
-msgid "ΤεΧ Math Symbol"
-msgstr "ΤεΧ 数学符号"
-
-#
-#: fontinfo.c:9766
-msgid "ΤεΧ Math Extension"
-msgstr "ΤεΧ 数学扩展"
-
-#
-#: fontinfo.c:9841 fontinfo.c:9859
-msgid "The size (in points) for which this face was designed"
-msgstr "此面以点为尺寸"
-
-#
-#: fontinfo.c:9854
-msgid "Size|Points"
-msgstr "点"
-
-#
-#: fontinfo.c:9862
-msgid "Design Range"
-msgstr "设计区域"
-
-#: fontinfo.c:9867 fontinfo.c:9881 fontinfo.c:9900
-msgid ""
-"The range of sizes (in points) to which this face applies.\n"
-"Lower bound is exclusive, upper bound is inclusive."
-msgstr ""
-
-#
-#: fontinfo.c:9875
-msgid "_Bottom:"
-msgstr "底(_B)："
-
-#
-#: fontinfo.c:9894
-msgid "_Top:"
-msgstr "顶(_T)："
-
-#: fontinfo.c:9919
-msgid ""
-"This is an identifying number shared by all members of\n"
-"this font family with the same style (I.e. 10pt Bold and\n"
-"24pt Bold would have the same id, but 10pt Italic would not"
-msgstr ""
-
-#
-#: fontinfo.c:9932
-msgid "Style Name:"
-msgstr "样式名称:"
-
-#: fontinfo.c:9937
-msgid ""
-"This provides a set of names used to identify the\n"
-"style of this font. Names may be translated into multiple\n"
-"languages (English is required, others are optional)\n"
-"All fonts with the same Style ID should share this name."
-msgstr ""
-
-#: fontinfo.c:9945
-msgid ""
-"To create a new name, left click on the <New> button, and select a locale "
-"(language).\n"
-"To change the locale, left click on it.\n"
-"To change the text, left click in it and then type.\n"
-msgstr ""
-
-#
-#: fontinfo.c:9987
-msgid "Mac Style Set:"
-msgstr "Mac样式集:"
-
-#
-#: fontinfo.c:10015
-msgid "FOND Name:"
-msgstr "FOND名称:"
-
-#: fontinfo.c:10067
-msgid ""
-"Moves the currently selected lookup to be first in the lookup ordering\n"
-"or moves the currently selected subtable to be first in its lookup."
-msgstr ""
-
-#: fontinfo.c:10078
-msgid ""
-"Moves the currently selected lookup before the previous lookup\n"
-"or moves the currently selected subtable before the previous subtable."
-msgstr ""
-
-#: fontinfo.c:10089
-msgid ""
-"Moves the currently selected lookup after the next lookup\n"
-"or moves the currently selected subtable after the next subtable."
-msgstr ""
-
-#: fontinfo.c:10100
-msgid ""
-"Moves the currently selected lookup to the end of the lookup chain\n"
-"or moves the currently selected subtable to be the last subtable in the "
-"lookup"
-msgstr ""
-
-#: fontinfo.c:10111
-msgid "Sorts the lookups in a default ordering based on feature tags"
-msgstr ""
-
-#: fontinfo.c:10126
-msgid ""
-"Adds a new lookup after the selected lookup\n"
-"or at the start of the lookup list if nothing is selected."
-msgstr ""
-
-#: fontinfo.c:10137
-msgid ""
-"Adds a new lookup subtable after the selected subtable\n"
-"or at the start of the lookup if nothing is selected."
-msgstr ""
-
-#
-#: fontinfo.c:10148
-msgid "Edits a lookup or lookup subtable."
-msgstr "编辑查找或子表。"
-
-#
-#: fontinfo.c:10159
-msgid "Edits the transformations in a lookup subtable."
-msgstr "编辑查找替代表中的变换"
-
-#: fontinfo.c:10170
-msgid ""
-"Deletes any selected lookups and their subtables, or deletes any selected "
-"subtables.\n"
-"This will also delete any transformations associated with those subtables."
-msgstr ""
-
-#: fontinfo.c:10181
-msgid ""
-"Merges two selected (and compatible) lookups into one,\n"
-"or merges two selected subtables of a lookup into one"
-msgstr ""
-
-#: fontinfo.c:10192
-msgid ""
-"Reverts the lookup list to its original condition.\n"
-"But any changes to subtable data will remain."
-msgstr ""
-
-#
-#: fontinfo.c:10193 fontviewbase.c:1629
-msgid "_Revert"
-msgstr "恢复(_R)"
-
-#: fontinfo.c:10203
-msgid "Imports a lookup (and all its subtables) from another font."
-msgstr ""
-
-#
-#: fontinfo.c:10288
-msgid "Creation Date:"
-msgstr "创建日期："
-
-#
-#: fontinfo.c:10307
-msgid "Modification Date:"
-msgstr "修改日期："
-
-#: fontinfo.c:10342
-msgid ""
-"This pane is informative only and shows the characters\n"
-"actually in the font. If you wish to set the OS/2 Unicode\n"
-"Range field, change the pane to"
-msgstr ""
-
-#: fontinfo.c:10351
-msgid "OS/2 -> Charsets"
-msgstr ""
-
-#
-#: fontinfo.c:10365
-msgid "Include Empty Blocks"
-msgstr "包括空白区"
-
-#
-#: fontinfo.c:10381
-msgid ""
-"Click on a range to select characters in that range.\n"
-"Double click on a range to see characters that should be\n"
-"in the range but aren't."
-msgstr ""
-"点击一个范围以选择范围内全部字符。\n"
-"双击一个范围以查看应在却不在此范\n"
-"围内的字符。"
-
-#: fontinfo.c:10398
-msgid "PS Names"
-msgstr ""
-
-#
-#: fontinfo.c:10403
-msgid "General"
-msgstr "一般"
-
-#
-#: fontinfo.c:10411
-msgid "PS UID"
-msgstr "PS UID"
-
-#
-#: fontinfo.c:10416
-msgid "PS Private"
-msgstr "PS专属"
-
-#
-#: fontinfo.c:10421
-msgid "OS/2"
-msgstr "OS/2"
-
-#
-#: fontinfo.c:10428
-msgid "TTF Names"
-msgstr "TTF名称"
-
-#: fontinfo.c:10433
-msgid "StyleSet Names"
-msgstr ""
-
-#
-#: fontinfo.c:10438
-msgid "Grid Fitting"
-msgstr "网格填充"
-
-#
-#: fontinfo.c:10444
-msgid "ΤεΧ"
-msgstr "ΤεΧ"
-
-#: fontinfo.c:10457
-msgid "FONTLOG"
-msgstr ""
-
-#
-#: fontinfo.c:10462
-msgid "Mark Classes"
-msgstr "标记类属"
-
-#: fontinfo.c:10467
-msgid "Mark Sets"
-msgstr ""
-
-#
-#: fontinfo.c:10473
-msgid "OpenType|Lookups"
-msgstr "查找"
-
-#: fontinfo.c:10480
-msgid "WOFF"
-msgstr ""
-
-#
-#: fontinfo.c:10488
-msgid "Mac Features"
-msgstr "Mac特征"
-
-#
-#: fontinfo.c:10493
-msgid "Dates"
-msgstr "日期"
-
-#
-#: fontinfo.c:10569
-msgid "TrueTypeName|New"
-msgstr "新建"
-
-#
-#: fontinfo.c:10571
-msgid "gaspTableEntry|New"
-msgstr "新建"
-
-#: fontinfo.c:10583
-msgid "PSPrivateDictKey|New"
-msgstr ""
-
-#
-#: fontview.c:505
-msgid "_Don't Save"
-msgstr "不保存(_D)"
-
-#
-#: fontview.c:508 fontviewbase.c:1632
-msgid "Font changed"
-msgstr "字体改变"
-
-#
-#: fontview.c:508
-#, c-format
-msgid ""
-"Font %1$.40s in file %2$.40s has been changed.\n"
-"Do you want to save it?"
-msgstr ""
-"字体 %1$.40s (文件 %2$.40s) 已改变。\n"
-"要保存么？"
-
-#
-#: fontview.c:615
-msgid "Save as _Directory"
-msgstr "保存为文件夹(_D)"
-
-#
-#: fontview.c:623
-msgid "Save as..."
-msgstr "保存为…"
-
-#
-#: fontview.c:932 oflib.c:2069 prefs.c:496
-msgid "Open Font"
-msgstr "打开字体"
-
-#
-#: fontview.c:947
-msgid "Merge Feature Info"
-msgstr "混成特征信息"
-
-#
-#: fontview.c:956
-msgid "Load of Kerning Metrics Failed"
-msgstr "载入压缩尺寸失败"
-
-#
-#: fontview.c:956
-#, c-format
-msgid "Failed to load kern data from %s"
-msgstr "从%s载入压缩数据失败"
-
-#
-#: fontview.c:1037
-msgid "Many Windows"
-msgstr "许多窗口"
-
-#: fontview.c:1037
-msgid ""
-"This involves opening more than 10 windows.\n"
-"Is that really what you want?"
-msgstr ""
-
-#: fontview.c:1136
-msgid "Extremum bound..."
-msgstr ""
-
-#: fontview.c:1136
-msgid ""
-"Adobe says that \"big\" splines should not have extrema.\n"
-"But they don't define what big means.\n"
-"If the distance between the spline's end-points is bigger than this value, "
-"then the spline is \"big\" to fontforge."
-msgstr ""
-
-#
-#: fontview.c:1765
-msgid "Select by Script"
-msgstr "按文字选择"
-
-#: fontview.c:1780
-msgid "All glyphs"
-msgstr ""
-
-#: fontview.c:1784
-msgid "Set the selection of the font view to all glyphs in the script."
-msgstr ""
-
-#: fontview.c:1790
-msgid "Only upper case"
-msgstr ""
-
-#: fontview.c:1794
-msgid ""
-"Set the selection of the font view to any upper case glyphs in the script."
-msgstr ""
-
-#: fontview.c:1799
-msgid "Only lower case"
-msgstr ""
-
-#: fontview.c:1803
-msgid ""
-"Set the selection of the font view to any lower case glyphs in the script."
-msgstr ""
-
-#: fontview.c:1813 fontview.c:2075
-msgid ""
-"Set the selection of the font view to the glyphs\n"
-"which match"
-msgstr ""
-
-#: fontview.c:1821 fontview.c:2083
-msgid ""
-"Expand the selection of the font view to include\n"
-"all the glyphs which match"
-msgstr ""
-
-#: fontview.c:1829 fontview.c:2091
-msgid "Remove matching glyphs from the selection."
-msgstr ""
-
-#: fontview.c:1833 fontview.c:2095
-msgid "Logical And with Selection"
-msgstr ""
-
-#: fontview.c:1837 fontview.c:2099
-msgid "Remove glyphs which do not match from the selection."
-msgstr ""
-
-#
-#: fontview.c:1889
-msgid "No Script"
-msgstr "无脚本"
-
-#: fontview.c:1889
-msgid "Please specify a script"
-msgstr "请指定文字"
-
-#
-#: fontview.c:1892
-msgid "Bad Script"
-msgstr "不当文字"
-
-#: fontview.c:1892
-msgid "Scripts are 4 letter tags"
-msgstr "文字标签为4个字符。"
-
-#: fontview.c:2040
-msgid "Select by Name"
-msgstr ""
-
-#: fontview.c:2049
-msgid ""
-"Enter either a wildcard pattern (to match glyph names)\n"
-" or a unicode encoding like \"U+0065\"."
-msgstr ""
-
-#: fontview.c:2054
-msgid ""
-"Unix style wildcarding is accepted:\n"
-"Most characters match themselves\n"
-"A \"?\" will match any single character\n"
-"A \"*\" will match an arbitrary number of characters (including none)\n"
-"An \"[abd]\" set of characters within square brackets will match any "
-"(single) character\n"
-"A \"{scmp,c2sc}\" set of strings within curly brackets will match any "
-"string\n"
-"So \"a.*\" would match \"a.\" or \"a.sc\" or \"a.swash\"\n"
-"While \"a.{scmp,c2sc}\" would match \"a.scmp\" or \"a.c2sc\"\n"
-"And \"a.[abd]\" would match \"a.a\" or \"a.b\" or \"a.d\""
-msgstr ""
-
-#
-#: fontview.c:2883 lookupui.c:4796 metricsview.c:380
-msgid "New Lookup Subtable..."
-msgstr "新查找替代表"
-
-#
-#: fontview.c:2889
-msgid "Display Substitution..."
-msgstr "显示替换…"
-
-#
-#: fontview.c:2890
-msgid "Pick a substitution to display in the window."
-msgstr "选取替代字形显示到窗口中"
-
-#
-#: fontview.c:3027
-msgid "Show H. Metrics"
-msgstr "显示水平尺寸"
-
-#
-#: fontview.c:3027
-msgid "Show V. Metrics"
-msgstr "显示垂直尺寸"
-
-#
-#: fontview.c:3036
-msgid "Baseline"
-msgstr "基线"
-
-#
-#: fontview.c:3044
-msgid "Origin"
-msgstr "原点"
-
-#
-#: fontview.c:3052
-msgid "Advance Width as a Line"
-msgstr "前导宽度作为线"
-
-#: fontview.c:3058
-msgid ""
-"Display the advance width as a line\n"
-"perpendicular to the advance direction"
-msgstr ""
-
-#
-#: fontview.c:3061
-msgid "Advance Width as a Bar"
-msgstr "前导宽度作为条"
-
-#: fontview.c:3067
-msgid ""
-"Display the advance width as a bar under the glyph\n"
-"showing the extent of the advance"
-msgstr ""
-
-#
-#: fontview.c:3213
-msgid "Bitmap Magnification..."
-msgstr "位图缩放…"
-
-#
-#: fontview.c:3213
-msgid "Please specify a bitmap magnification factor."
-msgstr "请指定位图尺度系数"
-
-#
-#: fontview.c:3468 fontview.c:3489
-msgid "Compact"
-msgstr "压缩"
-
-#
-#: fontview.c:3563 fontview.c:3586
-msgid "Find an adobe CMap file..."
-msgstr "查找adobe CMap文件..."
-
-#
-#: fontview.c:3618
-msgid "Please close font"
-msgstr "请关闭字体"
-
-#
-#: fontview.c:3618
-#, c-format
-msgid "Please close %s before inserting it into a CID font"
-msgstr "请先关闭 %s 以便将其插入 CID 字体中"
-
-#
-#: fontview.c:3665 fontview.c:4700 lookupui.c:2119 ../gdraw/gfilechooser.c:918
-msgid "_Remove"
-msgstr "移除(_R)"
-
-#
-#: fontview.c:3666 fontview.c:5244
-msgid "_Remove Font"
-msgstr "移除字体(_R)"
-
-#: fontview.c:3666
-#, c-format
-msgid ""
-"Are you sure you wish to remove sub-font %1$.40s from the CID font %2$.40s"
-msgstr ""
-
-#
-#: fontview.c:3726
-msgid "Change Supplement..."
-msgstr "改变附件…"
-
-#
-#: fontview.c:3726
-#, c-format
-msgid "Please specify a new supplement for %.20s-%.20s"
-msgstr "请为%.20s-%.20s指定一个新附件"
-
-#
-#: fontview.c:4211
-msgid "_New Composition..."
-msgstr "新组成(_N)…"
-
-#
-#: fontview.c:4212
-msgid "_Modify Composition..."
-msgstr "修改组成(_M)…"
-
-#
-#: fontview.c:4214
-msgid "_Build Syllables"
-msgstr "生成音节(_B)"
-
-#: fontview.c:4298
-msgid "Open Font Library..."
-msgstr ""
-
-#
-#: fontview.c:4305
-msgid "_Hangul"
-msgstr "_Hangul"
-
-#: fontview.c:4308
-msgid "Browse web"
-msgstr ""
-
-#
-#: fontview.c:4314
-msgid "Save A_ll"
-msgstr "全部保存(_L)"
-
-#
-#: fontview.c:4320 metricsview.c:3083
-msgid "_Merge Feature Info..."
-msgstr "混成特征信息(_M)..."
-
-#
-#: fontview.c:4322
-msgid "Revert To _Backup"
-msgstr "从备份恢复字形(_B)"
-
-#
-#: fontview.c:4333 prefs.c:2268
-msgid "Script Menu"
-msgstr "脚本目录"
-
-#
-#: fontview.c:4346
-msgid "_All Fonts"
-msgstr "所有字体(_A)"
-
-#
-#: fontview.c:4347
-msgid "_Displayed Font"
-msgstr "已显示字体(_D)"
-
-#
-#: fontview.c:4349
-msgid "Glyph _Metadata"
-msgstr "字形元数据(_M)"
-
-#
-#: fontview.c:4351
-msgid "_TrueType Instructions"
-msgstr "_TrueType指令"
-
-#
-#: fontview.c:4373
-msgid "Select by _Color"
-msgstr "按颜色选择(_S)"
-
-#
-#: fontview.c:4374
-msgid "Select by _Wildcard..."
-msgstr "按通配符选择(_W)…"
-
-#
-#: fontview.c:4375
-msgid "Select by _Script..."
-msgstr "按文字选择(_S)…"
-
-#
-#: fontview.c:4377
-msgid "_Glyphs Worth Outputting"
-msgstr "值得输出的字形(_G)"
-
-#: fontview.c:4378
-msgid "Glyphs with only _References"
-msgstr ""
-
-#: fontview.c:4379
-msgid "Glyphs with only S_plines"
-msgstr ""
-
-#: fontview.c:4380
-msgid "Glyphs with both"
-msgstr ""
-
-#: fontview.c:4381
-msgid "W_hitespace Glyphs"
-msgstr ""
-
-#
-#: fontview.c:4382
-msgid "_Changed Glyphs"
-msgstr "已改变字形(_C)"
-
-#
-#: fontview.c:4383
-msgid "_Hinting Needed"
-msgstr "需要消隐(_H)"
-
-#
-#: fontview.c:4384
-msgid "Autohinta_ble"
-msgstr "自动消隐表(_B)"
-
-#: fontview.c:4386
-msgid "Hold [Shift] key to merge"
-msgstr ""
-
-#: fontview.c:4387
-msgid "Hold [Control] key to restrict"
-msgstr ""
-
-#
-#: fontview.c:4389
-msgid "Selec_t By Lookup Subtable..."
-msgstr "按查找表选择(_T)…"
-
-#: fontview.c:4400
-msgid "Copy _Lookup Data"
-msgstr "复制查找数据(_L)"
-
-#
-#: fontview.c:4402 metricsview.c:3102
-msgid "Copy _VWidth"
-msgstr "编辑垂直宽度(_V)"
-
-#
-#: fontview.c:4406
-msgid "Paste Into"
-msgstr "粘贴到"
-
-#
-#: fontview.c:4408
-msgid "Paste After"
-msgstr "粘贴到后面"
-
-#
-#: fontview.c:4410
-msgid "Sa_me Glyph As"
-msgstr "相同字形(_M)"
-
-#: fontview.c:4414
-msgid "Copy Layer To Layer"
-msgstr ""
-
-#
-#: fontview.c:4418
-msgid "F_ind / Replace..."
-msgstr "查找(_I) / 替换…"
-
-#
-#: fontview.c:4419 search.c:1261
-msgid "Replace with Reference"
-msgstr "替换参照"
-
-#: fontview.c:4420
-msgid "Correct References"
-msgstr ""
-
-#
-#: fontview.c:4424
-msgid "Copy _From"
-msgstr "复制自(_F)"
-
-#: fontview.c:4454
-msgid "Add _Small Capitals..."
-msgstr ""
-
-#: fontview.c:4455
-msgid "Add Subscripts/Superscripts..."
-msgstr ""
-
-#
-#: fontview.c:4467
-msgid "Buil_d Duplicate Glyph"
-msgstr "生成复制字形(_D)"
-
-#
-#: fontview.c:4509
-msgid "_MATH Info..."
-msgstr "数学信息(_M)…"
-
-#
-#: fontview.c:4510
-msgid "_BDF Info..."
-msgstr "BDF信息(_B)…"
-
-#: fontview.c:4511
-msgid "_Horizontal Baselines..."
-msgstr ""
-
-#: fontview.c:4512
-msgid "_Vertical Baselines..."
-msgstr ""
-
-#: fontview.c:4513
-msgid "_Justification..."
-msgstr ""
-
-#
-#: fontview.c:4514
-msgid "Show _Dependent"
-msgstr "显示依赖(_D)"
-
-#
-#: fontview.c:4515
-msgid "Mass Glyph _Rename..."
-msgstr "批量字形重命名(_R)..."
-
-#: fontview.c:4516
-msgid "Set _Color"
-msgstr ""
-
-#
-#: fontview.c:4521 metricsview.c:3170
-msgid "Find Pr_oblems..."
-msgstr "查找问题(_O)…"
-
-#
-#: fontview.c:4522
-msgid "_Validate..."
-msgstr "验证(_V)..."
-
-#: fontview.c:4524
-msgid "Set E_xtremum Bound..."
-msgstr ""
-
-#
-#: fontview.c:4531
-msgid "Other Info"
-msgstr "其它信息"
-
-#: fontview.c:4532
-msgid "_Validation"
-msgstr ""
-
-#: fontview.c:4538
-msgid "St_yle"
-msgstr ""
-
-#
-#: fontview.c:4555
-msgid "_Merge Fonts..."
-msgstr "混成字体(_M)…"
-
-#
-#: fontview.c:4556
-msgid "Interpo_late Fonts..."
-msgstr "插入字体(_L)…"
-
-#
-#: fontview.c:4557
-msgid "Compare Fonts..."
-msgstr "比较字体…"
-
-#
-#: fontview.c:4563 lookupui.c:1430 lookupui.c:1450 metricsview.c:3193
-#: windowmenu.c:247
-msgid "All"
-msgstr "全部"
-
-#
-#: fontview.c:4624
-msgid "_Glyph Image"
-msgstr "字形(_G)"
-
-#
-#: fontview.c:4625
-msgid "_Name"
-msgstr "名称(_N)"
-
-#
-#: fontview.c:4626 lookupui.c:4220
-msgid "_Unicode"
-msgstr "统一码(_U)"
-
-#
-#: fontview.c:4627
-msgid "_Encoding Hex"
-msgstr "16进制编码(_H)"
-
-#
-#: fontview.c:4660
-msgid "Add Encoding Slots..."
-msgstr "增加编码位…"
-
-#
-#: fontview.c:4660
-msgid "How many CID slots do you wish to add?"
-msgstr "你想增加多少CID位？"
-
-#
-#: fontview.c:4660
-msgid "How many unencoded glyph slots do you wish to add?"
-msgstr "你想增加多少未编码的字形位？"
-
-#
-#: fontview.c:4704
-msgid "Detach & Remove Glyphs"
-msgstr "分离及移除字形"
-
-#
-#: fontview.c:4704
-msgid ""
-"Are you sure you wish to remove these glyphs? This operation cannot be "
-"undone."
-msgstr ""
-"你果真要删除这些字形么？\n"
-"此操作是不可恢复的。"
-
-#
-#: fontview.c:4726
-msgid "Add Encoding Name..."
-msgstr "增加编码…"
-
-#: fontview.c:4726
-msgid ""
-"Please provide the name of an encoding in the iconv database which you want "
-"in the menu."
-msgstr ""
-
-#
-#: fontview.c:4731
-msgid "Invalid Encoding"
-msgstr "无效编码"
-
-#
-#: fontview.c:4756
-msgid "Make Namelist"
-msgstr "生成名录"
-
-#
-#: fontview.c:4764
-msgid "Namelist creation failed"
-msgstr "名录创建失败"
-
-#
-#: fontview.c:4764 fontview.c:4827
-#, c-format
-msgid "Could not write %s"
-msgstr "未能写入 %s"
-
-#
-#: fontview.c:4777
-msgid "Load Namelist"
-msgstr "载入名录"
-
-#
-#: fontview.c:4798 problems.c:2385 searchview.c:822 ../gdraw/gsavefiledlg.c:72
-msgid "Replace"
-msgstr "替换"
-
-#
-#: fontview.c:4798
-msgid "A name list with this name already exists. Replace it?"
-msgstr "同名列表存在。替换之?"
-
-#
-#: fontview.c:4808 fontview.c:4879
-msgid "No such file"
-msgstr "无此文件"
-
-#
-#: fontview.c:4808 fontview.c:4879
-#, c-format
-msgid "Could not read %s"
-msgstr "不能读 %s"
-
-#
-#: fontview.c:4813
-msgid "Bad namelist file"
-msgstr "不良名录文件"
-
-#
-#: fontview.c:4813
-#, c-format
-msgid "Could not parse %s"
-msgstr "不能处理 %s"
-
-#
-#: fontview.c:4820 fontview.c:4822
-msgid "Non-ASCII glyphnames"
-msgstr "非ASCII码字形名"
-
-#: fontview.c:4820
-#, c-format
-msgid "This namelist contains at least one non-ASCII glyph name, namely: %s"
-msgstr ""
-
-#: fontview.c:4822
-msgid ""
-"This namelist is based on a namelist which contains non-ASCII glyph names"
-msgstr ""
-
-#
-#: fontview.c:4827
-msgid "Create failed"
-msgstr "创建失败"
-
-#
-#: fontview.c:4846
-msgid "Rename by NameList"
-msgstr "按名录重命名"
-
-#: fontview.c:4846
-msgid ""
-"Rename the glyphs in this font to the names found in the selected namelist"
-msgstr ""
-
-#: fontview.c:4854 openfontdlg.c:438 prefs.c:1723 savefontdlg.c:1345
-msgid ""
-"Glyph names should be limited to characters in the ASCII character set, but "
-"there are names in this namelist which use characters outside that range."
-msgstr ""
-
-#
-#: fontview.c:4866
-msgid "Load glyph names"
-msgstr "载入字形名称"
-
-#
-#: fontview.c:4923
-msgid "_Reencode"
-msgstr "重新编码(_R)"
-
-#
-#: fontview.c:4924
-msgid "_Compact"
-msgstr "压缩(_C)"
-
-#
-#: fontview.c:4925
-msgid "_Force Encoding"
-msgstr "强制编码(_F)"
-
-#
-#: fontview.c:4927
-msgid "_Add Encoding Slots..."
-msgstr "增加编码位(_A)…"
-
-#
-#: fontview.c:4928
-msgid "Remove _Unused Slots"
-msgstr "移除未用位(_U)"
-
-#
-#: fontview.c:4929
-msgid "_Detach Glyphs"
-msgstr "分离字形(_D)"
-
-#
-#: fontview.c:4930
-msgid "Detach & Remo_ve Glyphs..."
-msgstr "分离及移除字形(_V)…"
-
-#
-#: fontview.c:4932
-msgid "Add E_ncoding Name..."
-msgstr "增加编码名(_N)…"
-
-#
-#: fontview.c:4933
-msgid "_Load Encoding..."
-msgstr "载入编码(_L)…"
-
-#
-#: fontview.c:4934
-msgid "Ma_ke From Font..."
-msgstr "生成自字体(_K)…"
-
-#
-#: fontview.c:4935
-msgid "Remove En_coding..."
-msgstr "移除编码(_C)…"
-
-#
-#: fontview.c:4937
-msgid "Display By _Groups..."
-msgstr "按组显示(_G)…"
-
-#
-#: fontview.c:4938
-msgid "D_efine Groups..."
-msgstr "定义组(_E)…"
-
-#
-#: fontview.c:4940
-msgid "_Save Namelist of Font..."
-msgstr "保存字体列表(_S)…"
-
-#
-#: fontview.c:4941
-msgid "L_oad Namelist..."
-msgstr "载入列表(_O)…"
-
-#
-#: fontview.c:4942
-msgid "Rename Gl_yphs..."
-msgstr "重命名字形(_Y)…"
-
-#
-#: fontview.c:4943
-msgid "Cre_ate Named Glyphs..."
-msgstr "创建命名字形(_A)…"
-
-#
-#: fontview.c:5030
-msgid "_Show ATT"
-msgstr "显示ATT(_S)"
-
-#
-#: fontview.c:5031
-msgid "Display S_ubstitutions..."
-msgstr "显示替换(_u)…"
-
-#: fontview.c:5034
-msgid "Label Gl_yph By"
-msgstr ""
-
-#
-#: fontview.c:5036
-msgid "S_how H. Metrics..."
-msgstr "显示水平尺寸(_h)…"
-
-#
-#: fontview.c:5037
-msgid "Show _V. Metrics..."
-msgstr "显示垂直尺寸(_V)…"
-
-#
-#: fontview.c:5039
-msgid "32x8 cell window"
-msgstr "32x8单元窗口"
-
-#: fontview.c:5040
-msgid "_16x4 cell window"
-msgstr ""
-
-#
-#: fontview.c:5041
-msgid "_8x2  cell window"
-msgstr "_8x2单元窗口"
-
-#
-#: fontview.c:5043
-msgid "_24 pixel outline"
-msgstr "_24点轮廓"
-
-#
-#: fontview.c:5044
-msgid "_36 pixel outline"
-msgstr "_36点轮廓"
-
-#
-#: fontview.c:5045
-msgid "_48 pixel outline"
-msgstr "_48点轮廓"
-
-#
-#: fontview.c:5046
-msgid "_72 pixel outline"
-msgstr "_72点轮廓"
-
-#
-#: fontview.c:5047
-msgid "_96 pixel outline"
-msgstr "_96点轮廓"
-
-#
-#: fontview.c:5049
-msgid "_Fit to em"
-msgstr "充填em"
-
-#
-#: fontview.c:5051 fontview.c:5073
-msgid "Bitmap _Magnification..."
-msgstr "位图缩放(_M)..."
-
-#
-#: fontview.c:5086 metricsview.c:3574 parsettfbmf.c:615
-#, c-format
-msgid "%d pixel bitmap"
-msgstr "%d像素位图"
-
-#
-#: fontview.c:5088 metricsview.c:3576
-#, c-format
-msgid "%d@%d pixel bitmap"
-msgstr "%d@%d像素位图"
-
-#
-#: fontview.c:5187
-msgid "BlueValues"
-msgstr "蓝值"
-
-#
-#: fontview.c:5199
-msgid "Edit 'fpgm'..."
-msgstr "编辑'fpgm'..."
-
-#
-#: fontview.c:5200
-msgid "Edit 'prep'..."
-msgstr "编辑'prep'..."
-
-#
-#: fontview.c:5201
-msgid "Edit 'maxp'..."
-msgstr "编辑'maxp'..."
-
-#
-#: fontview.c:5202
-msgid "Edit 'cvt '..."
-msgstr "编辑'cvt '..."
-
-#: fontview.c:5203
-msgid "Remove Instr Tables"
-msgstr ""
-
-#
-#: fontview.c:5206
-msgid "_Clear Hints"
-msgstr "清除消隐(_C)"
-
-#
-#: fontview.c:5210
-msgid "Histograms"
-msgstr "直方图"
-
-#
-#: fontview.c:5224
-msgid "_Auto Width..."
-msgstr "自动宽度(_A)…"
-
-#
-#: fontview.c:5225 metricsview.c:3375
-msgid "Ker_n By Classes..."
-msgstr "按类属压缩(_N)…"
-
-#
-#: fontview.c:5226
-msgid "Remove All Kern _Pairs"
-msgstr "移除所有压缩对(_P)"
-
-#
-#: fontview.c:5229 metricsview.c:3376
-msgid "VKern By Classes..."
-msgstr "按类属垂直压缩…"
-
-#
-#: fontview.c:5230 metricsview.c:3377
-msgid "VKern From HKern"
-msgstr "按水平压缩垂直压缩"
-
-#
-#: fontview.c:5231
-msgid "Remove All VKern Pairs"
-msgstr "移除所有垂直压缩对"
-
-#
-#: fontview.c:5236
-msgid "_Convert to CID"
-msgstr "转换到CID(_C)"
-
-#
-#: fontview.c:5237
-msgid "Convert By C_Map"
-msgstr "由CMap转换(_M)"
-
-#
-#: fontview.c:5239
-msgid "_Flatten"
-msgstr "平整(_F)"
-
-#
-#: fontview.c:5240
-msgid "Fl_attenByCMap"
-msgstr "由CMap平整(_A)"
-
-#
-#: fontview.c:5242
-msgid "Insert F_ont..."
-msgstr "插入字体(_O)…"
-
-#
-#: fontview.c:5243
-msgid "Insert _Blank"
-msgstr "插入空白(_B)"
-
-#
-#: fontview.c:5246
-msgid "_Change Supplement..."
-msgstr "改变附件(_C)…"
-
-#
-#: fontview.c:5247
-msgid "C_ID Font Info..."
-msgstr "CID字体信息(_I)…"
-
-#
-#. GT: Here (and following) MM means "MultiMaster"
-#: fontview.c:5340
-msgid "_Create MM..."
-msgstr "创建字体集(_C)…"
-
-#
-#: fontview.c:5341
-msgid "MM _Validity Check"
-msgstr "字体集校核(_V)"
-
-#
-#: fontview.c:5342
-msgid "MM _Info..."
-msgstr "字体集信息(_I)…"
-
-#
-#: fontview.c:5343
-msgid "_Blend to New Font..."
-msgstr "混合到新字体(_B)…"
-
-#
-#: fontview.c:5344
-msgid "MM Change Default _Weights..."
-msgstr "字体集默认粗细(_W)…"
-
-#
-#: fontview.c:5439
-msgid "_Overview"
-msgstr "概览(_O)"
-
-#
-#: fontview.c:5440
-msgid "_Index"
-msgstr "索引(_I)"
-
-#
-#: fontview.c:5441
-msgid "_About..."
-msgstr "关于(_A)…"
-
-#
-#: fontview.c:5442
-msgid "_License..."
-msgstr "许可(_L)…"
-
-#
-#: fontview.c:5481
-msgid "E_ncoding"
-msgstr "编码(_N)"
-
-#
-#: fontview.c:5484
-msgid "_CID"
-msgstr "字符标识(_C)"
-
-#: fontview.c:7260
-msgid "Selected BG Color"
-msgstr ""
-
-#: fontview.c:7260
-msgid "Color used to draw the background of selected glyphs"
-msgstr ""
-
-#: fontview.c:7261
-msgid "Selected FG Color"
-msgstr ""
-
-#: fontview.c:7261
-msgid "Color used to draw the foreground of selected glyphs"
-msgstr ""
-
-#: fontview.c:7262
-msgid "Changed Color"
-msgstr ""
-
-#: fontview.c:7262
-msgid "Color used to mark a changed glyph"
-msgstr ""
-
-#: fontview.c:7263
-msgid "Font Size"
-msgstr ""
-
-#: fontview.c:7263
-msgid ""
-"Size (in points) of the font used to display information and glyph labels in "
-"the fontview."
-msgstr ""
-
-#: fontview.c:7264
-msgid "Font Family"
-msgstr ""
-
-#: fontview.c:7264
-msgid ""
-"A comma separated list of font family names used to display small example "
-"images of glyphs over the user designed glyphs"
-msgstr ""
-
-#: fontview.c:7265
-msgid "Serif Family"
-msgstr ""
-
-#: fontview.c:7265
-msgid ""
-"A comma separated list of font family names used to display small example "
-"images of glyphs over the user designed glyphs\n"
-"for characters in the unicode math region which are specified to be in a "
-"serif font"
-msgstr ""
-
-#: fontview.c:7266
-msgid "Script Family"
-msgstr ""
-
-#: fontview.c:7266
-msgid ""
-"A comma separated list of font family names used to display small example "
-"images of glyphs over the user designed glyphs\n"
-"for characters in the unicode math region which are specified to be in a "
-"script font"
-msgstr ""
-
-#: fontview.c:7267
-msgid "Fraktur Family"
-msgstr ""
-
-#: fontview.c:7267
-msgid ""
-"A comma separated list of font family names used to display small example "
-"images of glyphs over the user designed glyphs\n"
-"for characters in the unicode math region which are specified to be in a "
-"fractur font"
-msgstr ""
-
-#: fontview.c:7268
-msgid "Double Struck Family"
-msgstr ""
-
-#: fontview.c:7268
-msgid ""
-"A comma separated list of font family names used to display small example "
-"images of glyphs over the user designed glyphs\n"
-"for characters in the unicode math region which are specified to be in a "
-"double struck font"
-msgstr ""
-
-#: fontview.c:7269
-msgid "Sans-Serif Family"
-msgstr ""
-
-#: fontview.c:7269
-msgid ""
-"A comma separated list of font family names used to display small example "
-"images of glyphs over the user designed glyphs\n"
-"for characters in the unicode math region which are specified to be in a "
-"sans-serif font"
-msgstr ""
-
-#: fontview.c:7270
-msgid "Monospace Family"
-msgstr ""
-
-#: fontview.c:7270
-msgid ""
-"A comma separated list of font family names used to display small example "
-"images of glyphs over the user designed glyphs\n"
-"for characters in the unicode math region which are specified to be in a "
-"monospace font"
-msgstr ""
-
-#: fontview.c:7552 ../gdraw/ggadgets.c:85 ../gdraw/gprogress.c:191
-msgid "Color|Background"
-msgstr ""
-
-#: fontview.c:7552
-msgid "Background color for the drawing area of all views"
-msgstr ""
-
-#: fontview.c:7561
-msgid "View"
-msgstr ""
-
-#: fontview.c:7562
-msgid ""
-"This is an abstract class which defines common features of the\n"
-"FontView, CharView, BitmapView and MetricsView"
-msgstr ""
-
-#: fontview.c:7574
-msgid "FontView"
-msgstr ""
-
-#: fontview.c:7575
-msgid "This is the main fontforge window displaying a font"
-msgstr ""
-
-#: fontview.c:7845
-msgid "Glyph Set by Selection"
-msgstr ""
-
-#: fontview.c:7861
-msgid ""
-"Select glyphs in the font view above.\n"
-"The selected glyphs become your glyph class."
-msgstr ""
-
-#
-#: fontviewbase.c:105
-msgid "_Unlink All"
-msgstr "全不连接(_U)"
-
-#: fontviewbase.c:109 metricsview.c:2047
-#, c-format
-msgid ""
-"You are attempting to clear %.30s which is referred to by\n"
-"another character. Are you sure you want to clear it?"
-msgstr ""
-
-#
-#: fontviewbase.c:363 fontviewbase.c:364
-msgid "Building duplicate encodings"
-msgstr "生成重复编码"
-
-#
-#: fontviewbase.c:759
-msgid "Transforming..."
-msgstr "变换…"
-
-#
-#: fontviewbase.c:844
-msgid "Removing overlaps..."
-msgstr "移除重叠…"
-
-#
-#: fontviewbase.c:879
-msgid "Adding points at Extrema..."
-msgstr "在极值处增加点..."
-
-#
-#: fontviewbase.c:926 fontviewbase.c:947
-msgid "Rounding to integer..."
-msgstr "圆整…"
-
-#
-#: fontviewbase.c:968
-msgid "Correcting Direction..."
-msgstr "修正方向..."
-
-#
-#: fontviewbase.c:989
-msgid "Unlink All"
-msgstr "全不连接"
-
-#
-#: fontviewbase.c:990
-msgid "Unlink"
-msgstr "不连接"
-
-#
-#: fontviewbase.c:1033
-msgid "Simplifying..."
-msgstr "简化…"
-
-#
-#: fontviewbase.c:1099
-msgid "Finding Substitution Points..."
-msgstr "寻找替换点…"
-
-#
-#: fontviewbase.c:1119
-msgid "Finding Counter Masks..."
-msgstr "寻找计数标记…"
-
-#: fontviewbase.c:1254
-msgid ""
-"You will get better instructions if you fill in the Private dictionary, "
-"Element->Font Info->Private, for the font"
-msgstr ""
-
-#: fontviewbase.c:1256
-msgid ""
-"The selected glyphs have no hints. FontForge will not produce many "
-"instructions."
-msgstr ""
-
-#
-#: fontviewbase.c:1266
-msgid "Auto Instructing Font..."
-msgstr "自动处理字体…"
-
-#
-#: fontviewbase.c:1387 fontviewbase.c:1388
-msgid "Building accented glyphs"
-msgstr "生成带重音字形"
-
-#
-#: fontviewbase.c:1407
-msgid "Replace Å"
-msgstr "替换Å"
-
-#: fontviewbase.c:1407
-msgid ""
-"Are you sure you want to replace Å?\n"
-"The ring will not join to the A."
-msgstr ""
-"确认要替换Å吗？\n"
-"上面的圆圈将被拿掉。"
-
-#
-#: fontviewbase.c:1632
-#, c-format
-msgid ""
-"Font %1$.40s in file %2$.40s has been changed.\n"
-"Reverting the file will lose those changes.\n"
-"Is that what you want?"
-msgstr ""
-"字体 %1$.40s (文件 %2$.40s) 已改变。\n"
-"恢复文件将丢失这些更改。\n"
-"要继续么？"
-
-#
-#: fontviewbase.c:1764
-msgid "Glyph Name Changed"
-msgstr "字形名改变"
-
-#: fontviewbase.c:1764
-#, c-format
-msgid ""
-"The name of glyph %.40s has changed. This is what I use to find the glyph in "
-"the file, so I cannot revert this glyph.\n"
-"(You will not be warned for subsequent glyphs.)"
-msgstr ""
-
-#
-#: freetype.c:831
-msgid "No ByteCode Interpreter"
-msgstr "无字节码解释"
-
-#: freetype.c:831
-msgid ""
-"These results are those of the freetype autohinter. They do not reflect the "
-"truetype instructions."
-msgstr ""
-
-#
-#: freetypeui.c:253
-msgid "Hit Watch Point"
-msgstr "点击观察点"
-
-#: freetypeui.c:253
-#, c-format
-msgid "Point %d was moved by the previous instruction"
-msgstr ""
-
-#
-#: freetypeui.c:257
-msgid "Watched Store Change"
-msgstr "观察的堆有变化"
-
-#: freetypeui.c:257
-#, c-format
-msgid ""
-"Storage %d was changed from %d (%.2f) to %d (%.2f) by the previous "
-"instruction"
-msgstr ""
-
-#
-#: freetypeui.c:262
-msgid "Read of Uninitialized Store"
-msgstr "读未初始化的堆"
-
-#: freetypeui.c:262
-#, c-format
-msgid ""
-"Storage %d has not been initialized, yet the previous instruction read it"
-msgstr ""
-
-#
-#: freetypeui.c:267
-msgid "Watched Cvt Change"
-msgstr "观察的Cvt有变化"
-
-#: freetypeui.c:267
-#, c-format
-msgid ""
-"Cvt %d was changed from %d (%.2f) to %d (%.2f) by the previous instruction"
-msgstr ""
-
-#
-#: freetypeui.c:494
-msgid "Too Many Breakpoints"
-msgstr "过多断点"
-
-#
-#. GT: the string "dotlessi" is the official postscript name for the glyph
-#. GT: containing an "i" without a dot on top of it. The name "dotlessi"
-#. GT: should be left untranslated, though you may wish to explain what it
-#. GT: means
-#: fvcomposite.c:1703
-msgid "Missing Glyph..."
-msgstr "缺字形…"
-
-#: fvcomposite.c:1703
-msgid ""
-"Your font is missing the dotlessi glyph,\n"
-"please add it and remake your accented glyphs"
-msgstr ""
-
-#. GT: Adobe decided that a dotless j glyph was needed, assigned a code
-#. GT: point to it in the private use area, and named it "dotlessj". Then
-#. GT: years later the Unicode people decided one was needed and assigned
-#. GT: it U+0237, so that's now the official code point and it is named
-#. GT: "uni0237". The name "dotlessj" is deprecated but still present in
-#. GT: many fonts. Neither "dotlessj" nor "uni0237" should be translated
-#. GT: because they are standard PostScript glyph names.
-#. GT: Again you may wish to explain that these refer to a "j" without a dot
-#: fvcomposite.c:1712
-msgid ""
-"Your font is missing the uni0237 glyph,\n"
-"and the deprecated dotlessj glyph,\n"
-"please add the former and remake your accented glyphs"
-msgstr ""
-
-#
-#: fvfonts.c:1204 fvfonts.c:1212 fvfontsdlg.c:55
-msgid "Merging Problem"
-msgstr "混成问题"
-
-#
-#: fvfonts.c:1204 fvfontsdlg.c:55
-msgid "Merging a font with itself achieves nothing"
-msgstr "字体与其自身混成将一无所得"
-
-#: fvfonts.c:1212
-msgid ""
-"When merging two CID keyed fonts, they must have the same Registry and "
-"Ordering, and the font being merged into (the mergee) must have a supplement "
-"which is at least as recent as the other's. Furthermore the mergee must have "
-"at least as many subfonts as the merger."
-msgstr ""
-
-#: fvfonts.c:1262
-#, c-format
-msgid "In character %s, could not find reference to %s\n"
-msgstr ""
-
-#: fvfonts.c:1325
-#, c-format
-msgid "In character %s, there are too few points on a path in the base\n"
-msgstr ""
-
-#: fvfonts.c:1336
-#, c-format
-msgid "In character %s, there are too many points on a path in the base\n"
-msgstr ""
-
-#: fvfonts.c:1432
-#, c-format
-msgid "Different settings on whether to stroke in layer %d of %s\n"
-msgstr ""
-
-#
-#: fvfonts.c:1595 fvfonts.c:1598 fvfonts.c:1603
-msgid "Interpolating Problem"
-msgstr "字体插入的问题"
-
-#
-#: fvfonts.c:1595
-msgid "Interpolating a font with itself achieves nothing"
-msgstr "插入字体到自身无所得"
-
-#
-#: fvfonts.c:1598
-msgid ""
-"Interpolating between fonts with different spline orders (i.e. between "
-"postscript and truetype)"
-msgstr "在不同样条曲线顺序的字体间插入(如，在postscript与truetype之间)"
-
-#
-#: fvfonts.c:1603
-msgid ""
-"Interpolating between fonts with different editing types (ie. between type3 "
-"and type1)"
-msgstr "不同类型字体间插入 (如. 在 type3 与 type1之间)"
-
-#
-#: fvfontsdlg.c:61 problems.c:2266
-msgid "Kerning"
-msgstr "压缩"
-
-#: fvfontsdlg.c:62
-msgid ""
-"Do you want to retain kerning information from the selected font\n"
-"when one of the glyphs being kerned will come from the base font?"
-msgstr ""
-
-#
-#: fvfontsdlg.c:93 savefontdlg.c:1110
-msgid "Other ..."
-msgstr "其他…"
-
-#
-#: fvfontsdlg.c:180
-msgid "Merge Fonts"
-msgstr "混成字体"
-
-#
-#: fvfontsdlg.c:190
-#, c-format
-msgid "Font to merge into %.20s"
-msgstr "字体混成到%.20s"
-
-#
-#: fvfontsdlg.c:208
-msgid "Preserve cross-font kerning"
-msgstr "保留交叉字体压缩"
-
-#
-#: fvfontsdlg.c:300
-msgid "Amount"
-msgstr "总量"
-
-#
-#: fvfontsdlg.c:336
-msgid "Interpolate Fonts"
-msgstr "插入字体"
-
-#
-#: fvfontsdlg.c:345
-#, c-format
-msgid "Interpolating between %.20s and:"
-msgstr "插入从%.20s到:"
-
-#
-#. GT: The dialog looks like:
-#. GT:   Interpolating between <fontname> and:
-#. GT: <list of possible fonts>
-#. GT:   by  <50>%
-#. GT: So "by" means how much to interpolate.
-#: fvfontsdlg.c:384
-msgid "by"
-msgstr "由"
-
-#
-#: fvimportbdf.c:318
-#, c-format
-msgid "Bad bounding box for %s.\n"
-msgstr "不良边框: %s.\n"
-
-#: fvimportbdf.c:455
-#, c-format
-msgid "Various specifications of PIXEL_SIZE do not match in %s"
-msgstr ""
-
-#: fvimportbdf.c:478
-#, c-format
-msgid "Pixel size does not match sum of Font ascent+descent in %s"
-msgstr ""
-
-#: fvimportbdf.c:483
-#, c-format
-msgid "Guessing pixel size based on font ascent in %s"
-msgstr ""
-
-#: fvimportbdf.c:487
-#, c-format
-msgid "Guessing pixel size based on font descent in %s"
-msgstr ""
-
-#: fvimportbdf.c:674
-#, c-format
-msgid ""
-"FontForge does not support this bit depth %d (must be 1,2,4,8,16,32)\n"
-msgstr ""
-
-#
-#: fvimportbdf.c:978
-msgid "Unexpected EOF in gf\n"
-msgstr "gf中异常的EOF\n"
-
-#
-#: fvimportbdf.c:981
-#, c-format
-msgid "Uninterpreted code in gf: %d\n"
-msgstr "gf中未解释的代码: %d\n"
-
-#: fvimportbdf.c:1096
-#, c-format
-msgid "Duplicate repeat row count in char %d of pk file\n"
-msgstr ""
-
-#
-#: fvimportbdf.c:1868
-msgid "What is the pixel size of the font in this file?"
-msgstr "此文件中字体的像素尺寸是多少?"
-
-#
-#: fvimportbdf.c:1889
-msgid "Duplicate pixelsize"
-msgstr "复制像素尺寸"
-
-#: fvimportbdf.c:1890
-#, c-format
-msgid ""
-"The font database already contains a bitmap\n"
-"font with this pixelsize (%d)\n"
-"Do you want to overwrite it?"
-msgstr ""
-
-#
-#: fvimportbdf.c:2054
-msgid "Not a pk file"
-msgstr "非pk文件"
-
-#
-#: fvimportbdf.c:2054
-#, c-format
-msgid "Not a (metafont) pk file %.200s"
-msgstr "非 (元字体) pk 文件 %.200s"
-
-#
-#: fvimportbdf.c:2061
-msgid "Not a gf file"
-msgstr "非gf 文件"
-
-#
-#: fvimportbdf.c:2061
-#, c-format
-msgid "Not a (metafont) gf file %.200s"
-msgstr "非 (元字体)  gf文件 %.200s"
-
-#
-#: fvimportbdf.c:2067 fvimportbdf.c:2073 fvimportbdf.c:2161
-msgid "Not a pcf file"
-msgstr "非pcf 文件"
-
-#
-#: fvimportbdf.c:2067 fvimportbdf.c:2073 fvimportbdf.c:2161
-#, c-format
-msgid "Not an X11 pcf file %.200s"
-msgstr "非 X11 pcf 文件 %.200s"
-
-#
-#: fvimportbdf.c:2079
-msgid "Not a bdf file"
-msgstr "非 bdf 文件"
-
-#
-#: fvimportbdf.c:2079
-#, c-format
-msgid "Not a bdf file %.200s"
-msgstr "非 bdf 文件 %.200s"
-
-#
-#: fvimportbdf.c:2218 splinefont.c:995
-msgid "Decompress Failed!"
-msgstr "解压缩失败！"
-
-#
-#: fvimportbdf.c:2308 fvimportbdf.c:2318 fvimportbdf.c:2396
-#, c-format
-msgid "Loading font from %.100s"
-msgstr "从 %.100s 调入字体"
-
-#
-#: fvimportbdf.c:2309 fvimportbdf.c:2397 splinefont.c:1017
-msgid "Loading..."
-msgstr "正在载入"
-
-#
-#: fvimportbdf.c:2309 fvimportbdf.c:2397 splinefont.c:1017
-msgid "Reading Glyphs"
-msgstr "正在读取字形"
-
-#
-#: fvimportbdf.c:2340
-msgid "No Bitmap Font"
-msgstr "无位图字体"
-
-#
-#: fvimportbdf.c:2340
-#, c-format
-msgid "Could not find a bitmap font in %s"
-msgstr "未能从 %s 中找到位图字体"
-
-#
-#: fvmetricsdlg.c:44
-msgid "Set Width To:"
-msgstr "设定宽度为："
-
-#
-#: fvmetricsdlg.c:44
-msgid "Set LBearing To:"
-msgstr "设置左边位为："
-
-#
-#: fvmetricsdlg.c:44
-msgid "Set RBearing To:"
-msgstr "设置右边位为："
-
-#: fvmetricsdlg.c:44
-msgid "Set Bearings To:"
-msgstr ""
-
-#
-#: fvmetricsdlg.c:44
-msgid "Set Vert. Advance To:"
-msgstr "设置垂直前导为："
-
-#
-#: fvmetricsdlg.c:45
-msgid "Increment Width By:"
-msgstr "宽度增幅："
-
-#
-#: fvmetricsdlg.c:45
-msgid "Increment LBearing By:"
-msgstr "左边位增幅："
-
-#
-#: fvmetricsdlg.c:45
-msgid "Increment RBearing By:"
-msgstr "右边位增幅："
-
-#: fvmetricsdlg.c:45
-msgid "Increment Bearings By:"
-msgstr ""
-
-#
-#: fvmetricsdlg.c:45
-msgid "Increment V. Adv. By:"
-msgstr "垂直前导增幅："
-
-#
-#: fvmetricsdlg.c:46
-msgid "Scale Width By:"
-msgstr "宽度缩放："
-
-#
-#: fvmetricsdlg.c:46
-msgid "Scale LBearing By:"
-msgstr "左边位缩放："
-
-#
-#: fvmetricsdlg.c:46
-msgid "Scale RBearing By:"
-msgstr "右边位缩放："
-
-#: fvmetricsdlg.c:46
-msgid "Scale Bearings By:"
-msgstr ""
-
-#
-#: fvmetricsdlg.c:46
-msgid "Scale VAdvance By:"
-msgstr "垂直前导缩放："
-
-#: fvmetricsdlg.c:47
-msgid "Left Side Bearing does not change."
-msgstr ""
-
-#: fvmetricsdlg.c:47
-msgid "Advance Width does not change."
-msgstr ""
-
-#: fvmetricsdlg.c:47
-msgid "ThisSpaceIntentionallyLeftBlank-PleaseDoNotTranslate-LeaveThisOut|"
-msgstr ""
-
-#: fvmetricsdlg.c:47
-msgid "Top Bearing does not change."
-msgstr ""
-
-#: fvmetricsdlg.c:62
-msgid ""
-"Negative glyph widths are not allowed in TrueType\n"
-"Do you really want a negative width?"
-msgstr ""
-
-#
-#: fvmetricsdlg.c:127
-msgid "Set LBearing..."
-msgstr "设置左边位..."
-
-#
-#: fvmetricsdlg.c:127
-msgid "Set RBearing..."
-msgstr "设置右边位..."
-
-#: fvmetricsdlg.c:127
-msgid "Set Both Side Bearings..."
-msgstr ""
-
-#
-#: fvmetricsdlg.c:127
-msgid "Set Vertical Advance..."
-msgstr "设置垂直前导..."
-
-#
-#: glyphcomp.c:947 glyphcomp.c:1209 glyphcomp.c:1224 glyphcomp.c:1238
-msgid "Outline Glyphs\n"
-msgstr "轮廓字形\n"
-
-#
-#: glyphcomp.c:952 glyphcomp.c:1240
-msgid "Glyph Differences\n"
-msgstr "字形差异\n"
-
-#
-#. GT: FontForge needs to recoginze the quotes used here(“”). If you change them
-#. GT: (in the translated strings) let me know. It currently also recognizes
-#. GT: guillemets and a couple of other quotes as well.
-#. GT:   pfaedit@users.sourceforge.net
-#: glyphcomp.c:963 glyphcomp.c:2007
-#, c-format
-msgid "Glyph “%s” differs\n"
-msgstr "字形 “%s” 不同\n"
-
-#: glyphcomp.c:1028
-#, c-format
-msgid ""
-"Glyph “%s” refers to %s with a different truetype point matching scheme\n"
-msgstr ""
-
-#: glyphcomp.c:1040 glyphcomp.c:1055
-#, c-format
-msgid "Glyph “%s” contains a reference to %s in %s\n"
-msgstr ""
-
-#: glyphcomp.c:1045
-#, c-format
-msgid "Glyph “%s” refers to %s with a different transformation matrix\n"
-msgstr ""
-
-#: glyphcomp.c:1096
-#, c-format
-msgid "Glyph “%s” has a different number of layers\n"
-msgstr ""
-
-#: glyphcomp.c:1105
-#, c-format
-msgid "Glyph “%s” has a different fill in layer %d\n"
-msgstr ""
-
-#: glyphcomp.c:1108
-#, c-format
-msgid "Glyph “%s” has a different stroke in layer %d\n"
-msgstr ""
-
-#: glyphcomp.c:1127
-#, c-format
-msgid ""
-"Glyph “%s” contains a reference which has different truetype point match "
-"specifications\n"
-msgstr ""
-
-#: glyphcomp.c:1130
-#, c-format
-msgid ""
-"Glyph “%s” does not have splines which match exactly, but they are close\n"
-msgstr ""
-
-#: glyphcomp.c:1133
-#, c-format
-msgid "A match was found after unlinking references in glyph “%s”\n"
-msgstr ""
-
-#: glyphcomp.c:1143
-#, c-format
-msgid "Different number of contours in glyph “%s”\n"
-msgstr ""
-
-#: glyphcomp.c:1145
-#, c-format
-msgid "Open/Closed contour mismatch in glyph “%s”\n"
-msgstr ""
-
-#: glyphcomp.c:1147
-#, c-format
-msgid "Spline mismatch in glyph “%s”\n"
-msgstr ""
-
-#: glyphcomp.c:1155
-#, c-format
-msgid "Glyph “%s” has advance width %d in %s but %d in %s\n"
-msgstr ""
-
-#: glyphcomp.c:1158
-#, c-format
-msgid "Glyph “%s” has vertical advance width %d in %s but %d in %s\n"
-msgstr ""
-
-#
-#: glyphcomp.c:1164
-#, c-format
-msgid "Hint masks differ in glyph “%s” at (%g,%g)\n"
-msgstr "消隐蒙板不同于字形 “%s” 中的 (%g,%g)\n"
-
-#
-#: glyphcomp.c:1167
-#, c-format
-msgid "Hints differ in glyph “%s”\n"
-msgstr "消隐不同于 “%s”\n"
-
-#: glyphcomp.c:1170 glyphcomp.c:1173
-#, c-format
-msgid "Glyph “%s” in %s has no truetype instructions\n"
-msgstr ""
-
-#: glyphcomp.c:1177
-#, c-format
-msgid "Glyph “%s” has different truetype instructions\n"
-msgstr ""
-
-#
-#: glyphcomp.c:1212 glyphcomp.c:1227
-#, c-format
-msgid "Glyphs in %s but not in %s\n"
-msgstr "字形在 %s 中但不在 %s中\n"
-
-#
-#: glyphcomp.c:1216 glyphcomp.c:1231
-#, c-format
-msgid "Glyph “%s” missing from %s\n"
-msgstr "字形“%s” 不在 %s 中\n"
-
-#: glyphcomp.c:1242
-msgid ""
-"ppem is different in the two fonts, cowardly refusing to compare glyphs\n"
-msgstr ""
-
-#
-#: glyphcomp.c:1277 glyphcomp.c:1300 glyphcomp.c:1330 glyphcomp.c:1382
-#: glyphcomp.c:1401
-msgid "Bitmap Strikes\n"
-msgstr "位图部件\n"
-
-#
-#: glyphcomp.c:1280 glyphcomp.c:1303 glyphcomp.c:1333
-#, c-format
-msgid "Strike %d@%d\n"
-msgstr "删除线 %d@%d\n"
-
-#
-#: glyphcomp.c:1285 glyphcomp.c:1308
-#, c-format
-msgid "Glyphs in %s but not in %s at %d@%d\n"
-msgstr "字形在 %s 中但不在 %s中(位于%d@%d)\n"
-
-#: glyphcomp.c:1290 glyphcomp.c:1313
-#, c-format
-msgid "Glyph “%s” missing from %s at %d@%d\n"
-msgstr ""
-
-#
-#: glyphcomp.c:1338
-#, c-format
-msgid "Glyphs Differences at %d@%d\n"
-msgstr "字形差异 %d@%d\n"
-
-#
-#: glyphcomp.c:1344
-#, c-format
-msgid "Glyph “%s” differs at %d@%d\n"
-msgstr "字形 “%s” 不同于 %d@%d\n"
-
-#: glyphcomp.c:1350
-#, c-format
-msgid "Glyph “%s” has advance width %d in %s but %d in %s at %d@%d\n"
-msgstr ""
-
-#: glyphcomp.c:1356
-#, c-format
-msgid ""
-"Glyph “%s” has vertical advance width %d in %s but %d in %s at %d@%d\n"
-msgstr ""
-
-#: glyphcomp.c:1362
-#, c-format
-msgid "Glyph “%s” has a different bitmap at %d@%d\n"
-msgstr ""
-
-#
-#: glyphcomp.c:1385 glyphcomp.c:1404
-#, c-format
-msgid "Strikes in %s but not in %s\n"
-msgstr "删除线在 %s中但不在 %s中\n"
-
-#
-#: glyphcomp.c:1389 glyphcomp.c:1408
-#, c-format
-msgid "Strike %d@%d missing from %s\n"
-msgstr "删除线 %d@%d 不在 %s中\n"
-
-#
-#: glyphcomp.c:1430
-#, c-format
-msgid "The %s differs. In %s it is ("
-msgstr "%s 不同。 它在%s 中为 ("
-
-#
-#: glyphcomp.c:1437
-#, c-format
-msgid ") while in %s it is ("
-msgstr ") 但在 %s为 ("
-
-#
-#: glyphcomp.c:1467
-#, c-format
-msgid "The %s is missing in %s. Whilst in %s it is ("
-msgstr "%s 不在 %s中。 %s中为 ("
-
-#
-#: glyphcomp.c:1485
-msgid "font name"
-msgstr "字体名称"
-
-#
-#: glyphcomp.c:1486
-msgid "family name"
-msgstr "字族名称"
-
-#
-#: glyphcomp.c:1487
-msgid "full name"
-msgstr "全称"
-
-#
-#: glyphcomp.c:1488
-msgid "weight"
-msgstr "粗细"
-
-#
-#: glyphcomp.c:1489
-msgid "copyright notice"
-msgstr "版权说明"
-
-#
-#: glyphcomp.c:1490
-msgid "version"
-msgstr "版本"
-
-#
-#: glyphcomp.c:1984 glyphcomp.c:2186 glyphcomp.c:2203 glyphcomp.c:2221
-#: glyphcomp.c:2238
-msgid "Glyph Positioning\n"
-msgstr "字形位置\n"
-
-#
-#: glyphcomp.c:1984 glyphcomp.c:2186 glyphcomp.c:2203 glyphcomp.c:2221
-#: glyphcomp.c:2238
-msgid "Glyph Substitution\n"
-msgstr "字形替代\n"
-
-#
-#: glyphcomp.c:1987
-msgid "Lookup Differences\n"
-msgstr "查找差异\n"
-
-#
-#: glyphcomp.c:1991
-#, c-format
-msgid "Lookup subtable %s (matched with %s)\n"
-msgstr "查找子表 %s (匹配%s)\n"
-
-#: glyphcomp.c:1993
-msgid "<Nothing>"
-msgstr ""
-
-#: glyphcomp.c:2024
-#, c-format
-msgid "“%s” in %s did not contain an anchor point (%g,%g) class %s\n"
-msgstr ""
-
-#: glyphcomp.c:2030
-#, c-format
-msgid ""
-"“%s” in %s contains an anchor point (%g,%g) class %s which differs from its "
-"counterpart by point matching\n"
-msgstr ""
-
-#: glyphcomp.c:2037
-#, c-format
-msgid ""
-"“%s” in %s did not contain a positioning lookup ∆x=%d ∆y=%d ∆x_adv=%d "
-"∆y_adv=%d\n"
-msgstr ""
-
-#: glyphcomp.c:2040
-#, c-format
-msgid ""
-"“%s” in %s did not contain a pairwise positioning lookup ∆x=%d ∆y=%d "
-"∆x_adv=%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n"
-msgstr ""
-
-#: glyphcomp.c:2046
-#, c-format
-msgid "“%s” in %s did not contain a substitution lookup to %s\n"
-msgstr ""
-
-#: glyphcomp.c:2080
-#, c-format
-msgid "The kerning class subtable %s in %s fails to match %s in %s\n"
-msgstr ""
-
-#: glyphcomp.c:2087
-#, c-format
-msgid "The context/chaining subtable %s in %s fails to match %s in %s\n"
-msgstr ""
-
-#: glyphcomp.c:2094
-#, c-format
-msgid ""
-"I can't figure out how to compare the subtable, %s, in %s to %s in %s\n"
-msgstr ""
-
-#: glyphcomp.c:2156
-#, c-format
-msgid "Kerning between “%s” and %s is %d in %s and %d in %s\n"
-msgstr ""
-
-#: glyphcomp.c:2160 glyphcomp.c:2166
-#, c-format
-msgid "No kerning between “%s” and %s in %s whilst it is %d in %s\n"
-msgstr ""
-
-#
-#: glyphcomp.c:2189 glyphcomp.c:2224
-#, c-format
-msgid "Lookups in %s but not in %s\n"
-msgstr "查找于 %s 而非 %s\n"
-
-#
-#: glyphcomp.c:2193 glyphcomp.c:2228
-#, c-format
-msgid "Lookup %s is not in %s\n"
-msgstr "查找%s不在 %s\n"
-
-#
-#: glyphcomp.c:2206 glyphcomp.c:2241
-#, c-format
-msgid "Lookups subtables in %s but not in %s\n"
-msgstr "查找子表于 %s b而非 %s\n"
-
-#
-#: glyphcomp.c:2210 glyphcomp.c:2245
-#, c-format
-msgid "Lookup subtable %s is not in %s\n"
-msgstr "查找子表 %s 不在 %s\n"
-
-#
-#: gotodlg.c:104 gotodlg.c:201
-msgid "Goto"
-msgstr "转到"
-
-#
-#: gotodlg.c:104
-#, c-format
-msgid "Could not find the glyph: %.70s"
-msgstr "未能找到字形：%.70s"
-
-#
-#: gotodlg.c:213
-msgid "Enter the name of a glyph in the font"
-msgstr "输入字形名称"
-
-#: gotodlg.c:231
-msgid "Merge into selection"
-msgstr ""
-
-#: groups.c:249
-#, c-format
-msgid ""
-"Unparsed characters found after end of groups file (last line parsed was "
-"%d).\n"
-msgstr ""
-
-#: groupsdlg.c:43
-msgid "Select by Color"
-msgstr ""
-
-#
-#: groupsdlg.c:698
-msgid "Glyph names must be valid postscript names"
-msgstr "字形名应为有效的postscript名"
-
-#
-#: groupsdlg.c:722
-msgid "Bad Range"
-msgstr "不良区域"
-
-#: groupsdlg.c:722
-#, c-format
-msgid "Bad Range, start (%1$04X) is greater than end (%2$04X)"
-msgstr ""
-
-#: groupsdlg.c:727
-#, c-format
-msgid "The code point U+%1$04X occurs in groups %2$.30s and %3$.30s"
-msgstr ""
-
-#: groupsdlg.c:734
-#, c-format
-msgid "The glyph name \"%1$.30s\" occurs in groups %2$.30s and %3$.30s"
-msgstr ""
-
-#
-#: groupsdlg.c:1048
-msgid "UntitledGroup"
-msgstr "未命名组"
-
-#
-#: groupsdlg.c:1163 groupsdlg.c:1522
-msgid "Groups"
-msgstr "组"
-
-#
-#: groupsdlg.c:1174
-msgid "Define Groups"
-msgstr "定义组"
-
-#
-#: groupsdlg.c:1192
-msgid "New Sub-Group"
-msgstr "新建替代组"
-
-#
-#: groupsdlg.c:1218
-msgid "Group Name:"
-msgstr "组名:"
-
-#
-#: groupsdlg.c:1231
-msgid "Glyphs:"
-msgstr "字形："
-
-#
-#: groupsdlg.c:1245
-msgid "Identify by"
-msgstr "标识"
-
-#: groupsdlg.c:1248 groupsdlg.c:1256 groupsdlg.c:1264
-msgid ""
-"Glyphs may be either identified by name or by unicode code point.\n"
-"Generally you control this by what you type in.\n"
-"Typing \"A\" would identify a glyph by name.\n"
-"Typing \"U+0041\" identifies a glyph by code point.\n"
-"When loading glyphs from the selection you must specify which format is "
-"desired."
-msgstr ""
-
-#
-#: groupsdlg.c:1267
-msgid "Set From Font"
-msgstr "按字体"
-
-#
-#: groupsdlg.c:1271
-msgid "Set this glyph list to be the glyphs selected in the fontview"
-msgstr "设置此字形列表为字体查看窗口中选择的字符"
-
-#
-#: groupsdlg.c:1276
-msgid "Select In Font"
-msgstr "于字体中选择"
-
-#: groupsdlg.c:1280
-msgid "Set the fontview's selection to be the glyphs named here"
-msgstr ""
-
-#
-#: groupsdlg.c:1286
-msgid "No Glyph Duplicates"
-msgstr "无重复字形"
-
-#: groupsdlg.c:1290
-msgid ""
-"Glyph names (or unicode code points) may occur at most once in this group "
-"and any of its sub-groups"
-msgstr ""
-
-#
-#: groupsdlg.c:1454
-msgid "Group"
-msgid_plural "Groups"
-msgstr[0] "组"
-
-#
-#: groupsdlg.c:1459
-msgid "No Groups"
-msgstr "无组"
-
-#: groupsdlg.c:1495
-msgid ""
-"None of the glyphs in the current font match any names or code points in the "
-"selected groups"
-msgstr ""
-
-#
-#: groupsdlg.c:1532
-msgid "Display By Groups"
-msgstr "按组显示"
-
-#
-#: groupsdlg.c:1569
-msgid "Compacted"
-msgstr "已压缩"
-
-#
-#: histograms.c:281
-#, c-format
-msgid ""
-"Position: %d\n"
-"Count: %d\n"
-msgstr ""
-"位置: %d\n"
-"计数: %d\n"
-
-#
-#: histograms.c:286
-#, c-format
-msgid ""
-"Width: %d\n"
-"Count: %d\n"
-"Percentage of Max: %d%%\n"
-msgstr ""
-"宽度: %d\n"
-"计数: %d\n"
-"最大百分比: %d%%\n"
-
-#
-#: histograms.c:292
-#, c-format
-msgid ""
-"Position: %d-%d (%d)\n"
-"Count: %d (%d)\n"
-msgstr ""
-"位置: %d-%d (%d)\n"
-"计数: %d (%d)\n"
-
-#
-#: histograms.c:297
-#, c-format
-msgid ""
-"Width: %d-%d (%d)\n"
-"Count: %d (%d)\n"
-"Percentage of Max: %d%%\n"
-msgstr ""
-"宽度: %d-%d (%d)\n"
-"计数: %d (%d)\n"
-"最大百分比: %d%%\n"
-
-#: histograms.c:376
-msgid "The smaller number must be selected first in a pair of bluevalues"
-msgstr ""
-
-#
-#: histograms.c:733
-msgid "Tiny Selection"
-msgstr "细微选择"
-
-#: histograms.c:733
-msgid ""
-"There are so few glyphs selected that it seems unlikely to me that you will "
-"get a representative sample of this aspect of your font. If you deselect "
-"everything the command will apply to all glyphs in the font"
-msgstr ""
-
-#
-#: histograms.c:782
-msgid "HStem"
-msgstr "水平项"
-
-#
-#: histograms.c:783
-msgid "VStem"
-msgstr "垂直项"
-
-#
-#: histograms.c:784
-msgid "Blues"
-msgstr "蓝值"
-
-#
-#: histograms.c:850
-msgid "Sum Around:"
-msgstr "求和:"
-
-#
-#: histograms.c:868
-msgid "Bar Width:"
-msgstr "条宽："
-
-#
-#: histograms.c:887
-msgid "BlueValues come in pairs. Select another."
-msgstr "蓝值成对出现。选择另一个。"
-
-#: http.c:379
-msgid "Awaiting response"
-msgstr "正在等待回应"
-
-#: http.c:563
-msgid "File vanished"
-msgstr ""
-
-#: http.c:563
-#, c-format
-msgid "The %s file we just created can no longer be opened."
-msgstr ""
-
-#: http.c:582
-#, c-format
-msgid "Transmitting %s..."
-msgstr ""
-
-#
-#: http.c:588 http.c:654 http.c:706 http.c:743 http.c:865 http.c:1069
-#: http.c:1232 http.c:1373 http.c:1385
-msgid "Could not connect to host"
-msgstr "无法连接主机"
-
-#
-#: http.c:588 http.c:654 http.c:706 http.c:743 http.c:865 http.c:1069
-#: http.c:1232 http.c:1373 http.c:1385
-#, c-format
-msgid "Could not connect to \"%s\"."
-msgstr "无法连接到 \"%s\""
-
-#: http.c:606 http.c:672 http.c:886 http.c:893
-msgid "Error from openfontlibrary"
-msgstr "从 openfontlibrary出错"
-
-#: http.c:606 http.c:672 http.c:886
-#, c-format
-msgid "Server error code=%d"
-msgstr "服务器错误码 %d"
-
-#
-#: http.c:610 http.c:676 http.c:891
-msgid "Unexpected server return"
-msgstr "未预期的服务器响应"
-
-#: http.c:610 http.c:676 http.c:891
-#, c-format
-msgid "Unexpected server return code=%d"
-msgstr "未预期的服务器响应代码为 %d"
-
-#: http.c:648
-msgid "Transmitting Meta Data..."
-msgstr ""
-
-#
-#: http.c:693
-msgid "Font Upload..."
-msgstr "字体上传..."
-
-#: http.c:693
-msgid "Uploading to Open Font Library"
-msgstr "上传到开放字体库(OFL)"
-
-#: http.c:694
-msgid "Looking for openfontlibrary.org"
-msgstr "查找 openfontlibrary.org"
-
-#
-#: http.c:700 http.c:1057 http.c:1220 http.c:1366
-msgid "Could not find host"
-msgstr "找不到主机"
-
-#: http.c:700 http.c:1057 http.c:1220 http.c:1366
-#, c-format
-msgid ""
-"Could not find \"%s\"\n"
-"Are you connected to the internet?"
-msgstr ""
-
-#
-#: http.c:734
-msgid "Login failed"
-msgstr "登录失败"
-
-#
-#: http.c:734
-msgid "Could not log in."
-msgstr "不能登录。"
-
-#
-#: http.c:757
-msgid "Could not read state"
-msgstr "无法读取状态"
-
-#
-#: http.c:757
-msgid "Could not read state."
-msgstr "无法读取状态。"
-
-#
-#: http.c:780 http.c:793
-msgid "Font file vanished"
-msgstr "字体文件消失"
-
-#: http.c:780 http.c:793
-msgid "The font file we just created can no longer be opened."
-msgstr ""
-
-#: http.c:805
-msgid "Image file vanished"
-msgstr ""
-
-#: http.c:805
-msgid "The preview image we just created can no longer be opened."
-msgstr ""
-
-#: http.c:893
-msgid "Failed to find an upload id."
-msgstr ""
-
-#: http.c:906
-msgid "Preview file vanished"
-msgstr ""
-
-#: http.c:906
-msgid "The preview file we just created can no longer be opened."
-msgstr ""
-
-#: http.c:1006 ../gdraw/gfilechooser.c:431
-msgid "Password?"
-msgstr ""
-
-#: http.c:1006 ../gdraw/gfilechooser.c:431
-#, c-format
-msgid "Enter password for %s@%s"
-msgstr ""
-
-#: http.c:1025 http.c:1188 http.c:1347
-#, c-format
-msgid "Downloading from %s"
-msgstr ""
-
-#: http.c:1030 http.c:1193 http.c:1353 http.c:1500 http.c:1510
-msgid "Could not parse URL"
-msgstr ""
-
-#: http.c:1030 http.c:1193
-msgid "Got something else when expecting an http URL"
-msgstr ""
-
-#: http.c:1044 http.c:1207 http.c:1358
-msgid "Font Download..."
-msgstr ""
-
-#: http.c:1045 http.c:1208 http.c:1359
-msgid "Resolving host"
-msgstr ""
-
-#: http.c:1083 http.c:1421
-msgid "Requesting font..."
-msgstr ""
-
-#: http.c:1094 http.c:1250
-msgid "Could not send request"
-msgstr ""
-
-#: http.c:1094 http.c:1250
-#, c-format
-msgid "Could not send request to \"%s\"."
-msgstr ""
-
-#: http.c:1105 http.c:1450
-msgid "Downloading font..."
-msgstr ""
-
-#: http.c:1163 http.c:1167 http.c:1325 http.c:1328 http.c:1444 http.c:1463
-msgid "Could not download data"
-msgstr ""
-
-#: http.c:1163 http.c:1325
-msgid "Could not download data."
-msgstr ""
-
-#: http.c:1167 http.c:1328
-#, c-format
-msgid "HTTP return code: %d."
-msgstr ""
-
-#: http.c:1240
-msgid "Requesting file..."
-msgstr ""
-
-#: http.c:1259
-msgid "Downloading file..."
-msgstr ""
-
-#: http.c:1350
-#, c-format
-msgid "Uploading to %s"
-msgstr ""
-
-#: http.c:1353
-msgid "Got something else when expecting an ftp URL"
-msgstr ""
-
-#: http.c:1382
-msgid "Logging in..."
-msgstr ""
-
-#: http.c:1409
-msgid "Bad Username/Password\n"
-msgstr ""
-
-#: http.c:1423
-msgid "Transmitting font..."
-msgstr ""
-
-#: http.c:1436
-msgid "FTP passive Data Connect failed\n"
-msgstr ""
-
-#: http.c:1444 http.c:1463
-msgid "Could not find file."
-msgstr ""
-
-#: http.c:1469
-msgid "Uploading font..."
-msgstr ""
-
-#: http.c:1483
-msgid "Could not transmit data"
-msgstr ""
-
-#: http.c:1483
-msgid "Could not transmit data."
-msgstr ""
-
-#: http.c:1500
-msgid "FontForge only handles ftp and http URLs at the moment"
-msgstr ""
-
-#: http.c:1510
-msgid "FontForge can only upload to ftp URLs at the moment"
-msgstr ""
-
-#: ikarus.c:461
-#, c-format
-msgid ""
-"This character (gid=%d) has a following part (%d). I'm not sure what that "
-"means, please send me (gww@silcom.com) a copy of this font so I can test "
-"with it.\n"
-msgstr ""
-
-#: ikarus.c:623
-#, c-format
-msgid ""
-"This is probably a valid URW font, but it is in a format (%c%c) which "
-"FontForge\n"
-"does not support. FontForge only supports 'IK' format fonts.\n"
-msgstr ""
-
-#: ikarus.c:625
-msgid ""
-"This looks like an ikarus format which I have seen examples of, but for "
-"which\n"
-"I have no documentation. FontForge does not support it yet.\n"
-msgstr ""
-
-#: ikarus.c:633
-#, c-format
-msgid "Unexpected size for name section of URW font (expected 55, got %d)\n"
-msgstr ""
-
-#: ikarus.c:642
-#, c-format
-msgid ""
-"Unexpected size for font info section of URW font (expected 12, got %d)\n"
-msgstr ""
-
-#: justifydlg.c:41
-msgid "Glyph Names"
-msgstr ""
-
-#: justifydlg.c:52
-msgid "Extend Lookups On"
-msgstr ""
-
-#: justifydlg.c:53
-msgid "Extend Lookups Off"
-msgstr ""
-
-#: justifydlg.c:54
-msgid "Extend Max Lookups"
-msgstr ""
-
-#: justifydlg.c:55
-msgid "Shrink Lookups On"
-msgstr ""
-
-#: justifydlg.c:56
-msgid "Shrink Lookups Off"
-msgstr ""
-
-#: justifydlg.c:57
-msgid "Shrink Max Lookups"
-msgstr ""
-
-#: justifydlg.c:63
-msgid "Extenders"
-msgstr ""
-
-#: justifydlg.c:64
-msgid "Language info"
-msgstr ""
-
-#: justifydlg.c:65
-msgid "Hidden"
-msgstr ""
-
-#: justifydlg.c:228
-msgid "Extender Glyphs (kashidas, etc.)"
-msgstr ""
-
-#: justifydlg.c:244
-msgid "A list of glyph names"
-msgstr ""
-
-#: justifydlg.c:291
-msgid "GlyphName|New"
-msgstr ""
-
-#: justifydlg.c:430
-msgid "Lookups turned ON to extend a line"
-msgstr ""
-
-#: justifydlg.c:431
-msgid "Lookups turned OFF to extend a line"
-msgstr ""
-
-#: justifydlg.c:432
-msgid "Lookups which specify the maximum size by which a glyph may grow"
-msgstr ""
-
-#: justifydlg.c:433
-msgid "Lookups turned ON to shrink a line"
-msgstr ""
-
-#: justifydlg.c:434
-msgid "Lookups turned OFF to shrink a line"
-msgstr ""
-
-#: justifydlg.c:435
-msgid "Lookups which specify the maximum size by which a glyph may shrink"
-msgstr ""
-
-#: justifydlg.c:451
-msgid "A list of lookup names"
-msgstr ""
-
-#: justifydlg.c:495
-msgid "LookupName|New"
-msgstr ""
-
-#
-#: justifydlg.c:586 justifydlg.c:602 statemachine.c:381 statemachine.c:394
-msgid "Unknown lookup"
-msgstr "未知查找"
-
-#: justifydlg.c:586 justifydlg.c:602
-#, c-format
-msgid "Unknown lookup name: %60.60s"
-msgstr ""
-
-#: justifydlg.c:747
-msgid "Justified Languages"
-msgstr ""
-
-#: justifydlg.c:764
-msgid ""
-"A list of languages and the lookups turned on and off\n"
-"for each to accomplish justification.  A language may\n"
-"appear more than once, in which case second (or third,\n"
-"etc.) will be tried if the first fails."
-msgstr ""
-
-#: justifydlg.c:814
-msgid "Language|New"
-msgstr ""
-
-#: justifydlg.c:947
-msgid "Justified Scripts"
-msgstr ""
-
-#: justifydlg.c:963
-msgid "A list of scripts with special justification needs"
-msgstr ""
-
-#: justifydlg.c:1010
-msgid "Script|New"
-msgstr ""
-
-#: kernclass.c:233 kernclass.c:281 kernclass.c:1170 lookupui.c:3503
-#: lookupui.c:3691 lookupui.c:5121
-msgid "Min Kern"
-msgstr ""
-
-#
-#: kernclass.c:813
-msgid "No lookup selected"
-msgstr "未选中查找。"
-
-#
-#: kernclass.c:813
-msgid "You must select a lookup subtable to contain this kerning pair"
-msgstr "应选择一个包括此压缩对的查找表"
-
-#
-#: kernclass.c:1064
-msgid "Class 0"
-msgstr "类属 0"
-
-#: kernclass.c:1064
-msgid ""
-"The kerning values for class 0 (\"Everything Else\") should always be 0"
-msgstr ""
-
-#: kernclass.c:1342
-msgid "AutoKern Row"
-msgstr ""
-
-#: kernclass.c:1343
-msgid "AutoKern Column"
-msgstr ""
-
-#: kernclass.c:1344
-msgid "AutoKern All"
-msgstr ""
-
-#: kernclass.c:1347
-msgid "Clear"
-msgstr ""
-
-#
-#: kernclass.c:1348 problems.c:4051
-msgid "Clear All"
-msgstr "清除全部"
-
-#: kernclass.c:1350 kernclass.c:2469
-msgid "Clear Device Table"
-msgstr ""
-
-#: kernclass.c:1351
-msgid "Clear All Device Tables"
-msgstr ""
-
-#: kernclass.c:1390
-#, c-format
-msgid "First Class %d\n"
-msgstr ""
-
-#: kernclass.c:1402
-#, c-format
-msgid "Second Class %d\n"
-msgstr ""
-
-#. GT: Short form of {Everything Else}, might use universal? U+2200
-#: kernclass.c:1439
-msgid "{All}"
-msgstr ""
-
-#: kernclass.c:1875 kernclass.c:1940
-#, c-format
-msgid "The font does not contain a glyph named %s."
-msgstr ""
-
-#: kernclass.c:1997
-msgid "_From this class"
-msgstr ""
-
-#: kernclass.c:1997
-msgid "From the _other class"
-msgstr ""
-
-#: kernclass.c:2021
-msgid "Glyph in two classes"
-msgstr ""
-
-#: kernclass.c:2022
-#, c-format
-msgid ""
-"The glyph named %s also occurs in the class on row %d which begins with "
-"%.20s...\n"
-"You must remove it from one of them."
-msgstr ""
-
-#: kernclass.c:2241 statemachine.c:1322
-msgid "Glyphs in the classes"
-msgstr ""
-
-#. GT: Select the class containing the glyph named in the following text field
-#: kernclass.c:2292
-msgid "Select Class Containing:"
-msgstr ""
-
-#
-#: kernclass.c:2298 kernclass.c:2305
-msgid "Select the class containing the named glyph"
-msgstr "选择命名字形的类属"
-
-#
-#: kernclass.c:2385
-msgid "Display Size:"
-msgstr "显示尺寸:"
-
-#
-#: kernclass.c:2408
-msgid "Magnification:"
-msgstr "放大:"
-
-#
-#: kernclass.c:2424
-msgid "Kern Offset:"
-msgstr "压缩偏移:"
-
-#: kernclass.c:2441
-msgid ""
-"Device Table Correction:\n"
-"  (at display size)"
-msgstr ""
-
-#: kernclass.c:2459 kernclass.c:2480
-msgid "Revert Kerning"
-msgstr ""
-
-#: kernclass.c:2463
-msgid ""
-"Resets the kerning offset and device table corrections to what they were "
-"originally"
-msgstr ""
-
-#: kernclass.c:2473
-msgid "Clear all device table corrections associated with this combination"
-msgstr ""
-
-#: kernclass.c:2484
-msgid "Resets the kerning offset to what it was originally"
-msgstr ""
-
-#
-#: kernclass.c:2509
-msgid "Lookup subtable:"
-msgstr "查找替代表:"
-
-#
-#. GT: The %s is the name of the lookup subtable containing this kerning class
-#: kernclass.c:2661
-#, c-format
-msgid "Kerning by Classes: %s"
-msgstr "按类属压缩: %s"
-
-#
-#: kernclass.c:2695
-#, c-format
-msgid "Lookup Subtable: %s"
-msgstr "查找替代表: %s"
-
-#: kernclass.c:2706
-msgid "Show Kerning"
-msgstr ""
-
-#: kernclass.c:2721 lookupui.c:4401 lookupui.c:5329
-msgid "_Default Separation:"
-msgstr ""
-
-#: kernclass.c:2728 lookupui.c:4408 lookupui.c:5336
-msgid ""
-"Add entries to the lookup trying to make the optical\n"
-"separation between all pairs of glyphs equal to this\n"
-"value."
-msgstr ""
-
-#: kernclass.c:2746 lookupui.c:4426 lookupui.c:5354
-msgid "_Min Kern:"
-msgstr ""
-
-#: kernclass.c:2753 lookupui.c:4433 lookupui.c:5361
-msgid ""
-"Any computed kerning change whose absolute value is less\n"
-"that this will be ignored.\n"
-msgstr ""
-
-#: kernclass.c:2770 lookupui.c:4450 lookupui.c:5378
-msgid "_Touching"
-msgstr ""
-
-#: kernclass.c:2779 lookupui.c:4459 lookupui.c:5387
-msgid ""
-"Normally kerning is based on achieving a constant (optical)\n"
-"separation between glyphs, but occasionally it is desireable\n"
-"to have a kerning table where the kerning is based on the\n"
-"closest approach between two glyphs (So if the desired separ-\n"
-"ation is 0 then the glyphs will actually be touching."
-msgstr ""
-
-#: kernclass.c:2796 lookupui.c:4475 lookupui.c:5403
-msgid "Only kern glyphs closer"
-msgstr ""
-
-#: kernclass.c:2804 lookupui.c:4483 lookupui.c:5411
-msgid ""
-"When doing autokerning, only move glyphs closer together,\n"
-"so the kerning offset will be negative."
-msgstr ""
-
-#: kernclass.c:2810 lookupui.c:4489 lookupui.c:5417
-msgid "Autokern new entries"
-msgstr ""
-
-#: kernclass.c:2818
-msgid ""
-"When adding a new class provide default kerning values\n"
-"Between it and every class with which it interacts."
-msgstr ""
-
-#
-#: kernclass.c:3131
-msgid "VKern By Classes"
-msgstr "按类属垂直压缩"
-
-#
-#: kernclass.c:3131
-msgid "Kern By Classes"
-msgstr "按类属压缩"
-
-#
-#: kernclass.c:3151
-msgid "KernClass|_New Lookup..."
-msgstr "新建查找(_N)..."
-
-#
-#: langfreq.c:1817 lookupui.c:369 macenc.c:2236 macencui.c:77
-msgid "English"
-msgstr "英语"
-
-#
-#: langfreq.c:1818 macenc.c:2237 macencui.c:78
-msgid "French"
-msgstr "法语"
-
-#
-#: langfreq.c:1819 macenc.c:2238 macencui.c:79
-msgid "German"
-msgstr "德语"
-
-#
-#: langfreq.c:1826 unicoderange.c:163
-msgid "Katakana"
-msgstr "日文片假名"
-
-#
-#: langfreq.c:1830 lookupui.c:371 macenc.c:2242 macencui.c:83
-msgid "Spanish"
-msgstr "西班牙语"
-
-#
-#: langfreq.c:1832 lookupui.c:622 macenc.c:2241 macencui.c:82
-msgid "Swedish"
-msgstr "瑞典语"
-
-#: layer2layer.c:98 layer2layer.c:123
-msgid "No significant differences found"
-msgstr ""
-
-#: layer2layer.c:100 layer2layer.c:125
-msgid "Differ"
-msgstr ""
-
-#: layer2layer.c:100 layer2layer.c:125
-msgid "The layers do not match"
-msgstr ""
-
-#: layer2layer.c:150
-msgid "Error Bound"
-msgstr ""
-
-#: layer2layer.c:203
-msgid "Copy Layers"
-msgstr ""
-
-#: layer2layer.c:203
-msgid "Compare Layers"
-msgstr ""
-
-#: layer2layer.c:215
-msgid "Copy one layer to another"
-msgstr ""
-
-#: layer2layer.c:215
-msgid "Compare two layers"
-msgstr ""
-
-#: layer2layer.c:222
-msgid "From:"
-msgstr ""
-
-#: layer2layer.c:235
-msgid "To:"
-msgstr ""
-
-#: layer2layer.c:235
-msgid "Other:"
-msgstr ""
-
-#: layer2layer.c:254
-msgid "Clear destination layer before copy"
-msgstr ""
-
-#: layer2layer.c:262
-msgid "Allow errors of:"
-msgstr ""
-
-#
-#: layer2layer.c:278 scstylesui.c:1946
-msgid "em units"
-msgstr "M全字单位"
-
-#: libstamp.c:99
-msgid "Library may be too old"
-msgstr ""
-
-#: libstamp.c:99
-msgid ""
-"The library is older than the executable expects.\n"
-"   This might be ok.\n"
-"Or it may crash on you.\n"
-"You have been warned."
-msgstr ""
-
-#
-#: lookups.c:42
-msgid "TeX Glyphlist"
-msgstr "TeX字形表"
-
-#
-#: lookups.c:43
-msgid "TeX Extension List"
-msgstr "TeX扩展表"
-
-#
-#: lookups.c:46
-msgid "Access All Alternates"
-msgstr "访问所有替代"
-
-#
-#: lookups.c:47
-msgid "Above Base Forms"
-msgstr "基本形之上"
-
-#
-#: lookups.c:48
-msgid "Above Base Mark"
-msgstr "基本标记之上"
-
-#
-#: lookups.c:49
-msgid "Above Base Substitutions"
-msgstr "基本替代之上"
-
-#
-#: lookups.c:50
-msgid "Vertical Fractions"
-msgstr "垂直比例"
-
-#
-#: lookups.c:51
-msgid "Akhand"
-msgstr "Akhand"
-
-#
-#: lookups.c:52
-msgid "Ancient Ligatures"
-msgstr "古典连写组合"
-
-#
-#: lookups.c:53
-msgid "Below Base Forms"
-msgstr "低于基本形"
-
-#
-#: lookups.c:54
-msgid "Below Base Mark"
-msgstr "基本标记之下"
-
-#
-#: lookups.c:55
-msgid "Below Base Substitutions"
-msgstr "基本替代之下"
-
-#
-#: lookups.c:56
-msgid "Capitals to Petite Capitals"
-msgstr "大写到袖珍大写"
-
-#
-#: lookups.c:57
-msgid "Capitals to Small Capitals"
-msgstr "大写到小大写"
-
-#
-#: lookups.c:58
-msgid "Contextual Alternates"
-msgstr "上下文替代"
-
-#
-#: lookups.c:59
-msgid "Case-Sensitive Forms"
-msgstr "大小写区分形"
-
-#
-#: lookups.c:60
-msgid "Glyph Composition/Decomposition"
-msgstr "字形组合或分组"
-
-#: lookups.c:61
-msgid "Conjunct Form After Ro"
-msgstr ""
-
-#: lookups.c:62
-msgid "Conjunct Forms"
-msgstr ""
-
-#
-#: lookups.c:63
-msgid "Contextual Ligatures"
-msgstr "上下文组合"
-
-#: lookups.c:64
-msgid "Centered CJK Punctuation"
-msgstr ""
-
-#
-#: lookups.c:65
-msgid "Capital Spacing"
-msgstr "大写间隔"
-
-#
-#: lookups.c:66
-msgid "Contextual Swash"
-msgstr "上下文泼溅"
-
-#
-#: lookups.c:67
-msgid "Cursive Attachment"
-msgstr "草写附件"
-
-#: lookups.c:68
-msgid "Character Variants 00"
-msgstr ""
-
-#: lookups.c:69
-msgid "Character Variants 01"
-msgstr ""
-
-#: lookups.c:70
-msgid "Character Variants 02"
-msgstr ""
-
-#: lookups.c:71
-msgid "Character Variants 03"
-msgstr ""
-
-#: lookups.c:72
-msgid "Character Variants 04"
-msgstr ""
-
-#: lookups.c:73
-msgid "Character Variants 05"
-msgstr ""
-
-#: lookups.c:74
-msgid "Character Variants 06"
-msgstr ""
-
-#: lookups.c:75
-msgid "Character Variants 07"
-msgstr ""
-
-#: lookups.c:76
-msgid "Character Variants 08"
-msgstr ""
-
-#: lookups.c:77
-msgid "Character Variants 09"
-msgstr ""
-
-#: lookups.c:78
-msgid "Character Variants 10"
-msgstr ""
-
-#: lookups.c:79
-msgid "Character Variants 99"
-msgstr ""
-
-#: lookups.c:80
-msgid "Drop Caps"
-msgstr ""
-
-#
-#: lookups.c:81
-msgid "Distance"
-msgstr "间距"
-
-#
-#: lookups.c:82
-msgid "Discretionary Ligatures"
-msgstr "按需组合"
-
-#
-#: lookups.c:83 scstylesui.c:371
-msgid "Denominators"
-msgstr "分母"
-
-#: lookups.c:84
-msgid "Dipthongs (Obsolete)"
-msgstr ""
-
-#: lookups.c:85
-msgid "Dotless Forms"
-msgstr ""
-
-#
-#: lookups.c:86
-msgid "Expert Forms"
-msgstr "专业形"
-
-#
-#: lookups.c:87
-msgid "Final Glyph On Line"
-msgstr "线上最终字形"
-
-#
-#: lookups.c:88
-msgid "Terminal Forms #2"
-msgstr "终端形 #2"
-
-#
-#: lookups.c:89
-msgid "Terminal Forms #3"
-msgstr "终端形 #3"
-
-#
-#: lookups.c:90
-msgid "Terminal Forms"
-msgstr "终端形"
-
-#: lookups.c:91
-msgid "Flattened Accents over Capitals"
-msgstr ""
-
-#
-#: lookups.c:92
-msgid "Diagonal Fractions"
-msgstr "对角比例"
-
-#
-#: lookups.c:93
-msgid "Full Widths"
-msgstr "全宽"
-
-#
-#: lookups.c:94
-msgid "Half Forms"
-msgstr "半形"
-
-#
-#: lookups.c:95
-msgid "Halant Forms"
-msgstr "Halant Forms"
-
-#
-#: lookups.c:96
-msgid "Alternative Half Widths"
-msgstr "替代半宽"
-
-#
-#: lookups.c:97
-msgid "Historical Forms"
-msgstr "历史形"
-
-#
-#: lookups.c:98
-msgid "Horizontal Kana Alternatives"
-msgstr "水平假名替代"
-
-#
-#: lookups.c:99
-msgid "Historic Ligatures"
-msgstr "历史组合"
-
-#
-#: lookups.c:100
-msgid "Hanja to Hangul"
-msgstr "汉字到谚文"
-
-#: lookups.c:101
-msgid "Hojo (JIS X 0212-1990) Kanji Forms"
-msgstr ""
-
-#
-#: lookups.c:102
-msgid "Half Widths"
-msgstr "半宽"
-
-#
-#: lookups.c:103
-msgid "Initial Forms"
-msgstr "本形"
-
-#
-#: lookups.c:104
-msgid "Isolated Forms"
-msgstr "分立形"
-
-#
-#: lookups.c:105
-msgid "Italics"
-msgstr "斜体"
-
-#
-#: lookups.c:106
-msgid "Justification Alternatives"
-msgstr "对齐替代"
-
-#: lookups.c:107
-msgid "Japanese Forms (Obsolete)"
-msgstr ""
-
-#: lookups.c:108
-msgid "JIS2004 Forms"
-msgstr ""
-
-#
-#: lookups.c:109
-msgid "JIS78 Forms"
-msgstr "JIS78 Forms"
-
-#
-#: lookups.c:110
-msgid "JIS83 Forms"
-msgstr "JIS83 Forms"
-
-#
-#: lookups.c:111
-msgid "JIS90 Forms"
-msgstr "JIS90 Forms"
-
-#
-#: lookups.c:112
-msgid "Horizontal Kerning"
-msgstr "水平压缩"
-
-#
-#: lookups.c:113
-msgid "Left Bounds"
-msgstr "左边界"
-
-#
-#: lookups.c:114
-msgid "Standard Ligatures"
-msgstr "标准组合"
-
-#
-#: lookups.c:115
-msgid "Leading Jamo Forms"
-msgstr "Leading Jamo Forms"
-
-#
-#: lookups.c:116
-msgid "Lining Figures"
-msgstr "线状图形"
-
-#
-#: lookups.c:117
-msgid "Localized Forms"
-msgstr "本地形式"
-
-#
-#: lookups.c:118
-msgid "Mark Positioning"
-msgstr "标记定位"
-
-#
-#: lookups.c:119
-msgid "Medial Forms 2"
-msgstr "中等形 2"
-
-#
-#: lookups.c:120
-msgid "Medial Forms"
-msgstr "中等形"
-
-#
-#: lookups.c:121
-msgid "Mathematical Greek"
-msgstr "数学希腊字"
-
-#
-#: lookups.c:122
-msgid "Mark to Mark"
-msgstr "标记到标记"
-
-#
-#: lookups.c:123
-msgid "Mark Positioning via Substitution"
-msgstr "由替代标记定位"
-
-#
-#: lookups.c:124
-msgid "Alternate Annotation Forms"
-msgstr "替代注释形式"
-
-#: lookups.c:125
-msgid "NLC Kanji Forms"
-msgstr ""
-
-#
-#: lookups.c:126
-msgid "Nukta Forms"
-msgstr "Nukta Forms"
-
-#
-#: lookups.c:127 scstylesui.c:372
-msgid "Numerators"
-msgstr "运算符"
-
-#
-#: lookups.c:128
-msgid "Oldstyle Figures"
-msgstr "旧体外形"
-
-#
-#: lookups.c:129
-msgid "Optical Bounds"
-msgstr "可见边界"
-
-#
-#: lookups.c:130
-msgid "Ordinals"
-msgstr "序数"
-
-#
-#: lookups.c:131
-msgid "Ornaments"
-msgstr "装饰"
-
-#
-#: lookups.c:132
-msgid "Proportional Alternate Metrics"
-msgstr "比例替代尺寸"
-
-#
-#: lookups.c:133
-msgid "Lowercase to Petite Capitals"
-msgstr "小写到袖珍大写"
-
-#: lookups.c:134
-msgid "Proportional Kana"
-msgstr ""
-
-#
-#: lookups.c:135
-msgid "Proportional Numbers"
-msgstr "比例数字"
-
-#
-#: lookups.c:136
-msgid "Pre Base Forms"
-msgstr "上一基本形"
-
-#
-#: lookups.c:137
-msgid "Pre Base Substitutions"
-msgstr "上一基本替代"
-
-#
-#: lookups.c:138
-msgid "Post Base Forms"
-msgstr "下一基本形"
-
-#
-#: lookups.c:139
-msgid "Post Base Substitutions"
-msgstr "下一基本替代"
-
-#
-#: lookups.c:140
-msgid "Proportional Width"
-msgstr "比例宽度"
-
-#
-#: lookups.c:141
-msgid "Quarter Widths"
-msgstr "四分之一宽"
-
-#
-#: lookups.c:142
-msgid "Randomize"
-msgstr "随机"
-
-#: lookups.c:143
-msgid "Rakar Forms"
-msgstr ""
-
-#
-#: lookups.c:144
-msgid "Required Ligatures"
-msgstr "必要组合"
-
-#
-#: lookups.c:145
-msgid "Reph Form"
-msgstr "Reph 形"
-
-#
-#: lookups.c:146
-msgid "Right Bounds"
-msgstr "右边界"
-
-#
-#: lookups.c:147
-msgid "Right to Left Alternates"
-msgstr "右到左替代"
-
-#: lookups.c:148
-msgid "Right to Left mirrored forms"
-msgstr ""
-
-#
-#: lookups.c:149
-msgid "Ruby Notational Forms"
-msgstr "Ruby计数形式"
-
-#
-#: lookups.c:150
-msgid "Stylistic Alternatives"
-msgstr "样式替代"
-
-#
-#: lookups.c:151 scstylesui.c:369
-msgid "Scientific Inferiors"
-msgstr "科学下标"
-
-#
-#: lookups.c:152
-msgid "Lowercase to Small Capitals"
-msgstr "小写到小大写"
-
-#
-#: lookups.c:153
-msgid "Simplified Forms"
-msgstr "简化形式"
-
-#
-#: lookups.c:154
-msgid "Style Set 1"
-msgstr "样式集1"
-
-#
-#: lookups.c:155
-msgid "Style Set 2"
-msgstr "样式集2"
-
-#
-#: lookups.c:156
-msgid "Style Set 3"
-msgstr "样式集3"
-
-#
-#: lookups.c:157
-msgid "Style Set 4"
-msgstr "样式集4"
-
-#
-#: lookups.c:158
-msgid "Style Set 5"
-msgstr "样式集5"
-
-#
-#: lookups.c:159
-msgid "Style Set 6"
-msgstr "样式集6"
-
-#
-#: lookups.c:160
-msgid "Style Set 7"
-msgstr "样式集7"
-
-#
-#: lookups.c:161
-msgid "Style Set 8"
-msgstr "样式集8"
-
-#
-#: lookups.c:162
-msgid "Style Set 9"
-msgstr "样式集9"
-
-#
-#: lookups.c:163
-msgid "Style Set 10"
-msgstr "样式集10"
-
-#
-#: lookups.c:164
-msgid "Style Set 11"
-msgstr "样式集11"
-
-#
-#: lookups.c:165
-msgid "Style Set 12"
-msgstr "样式集12"
-
-#
-#: lookups.c:166
-msgid "Style Set 13"
-msgstr "样式集13"
-
-#
-#: lookups.c:167
-msgid "Style Set 14"
-msgstr "样式集14"
-
-#
-#: lookups.c:168
-msgid "Style Set 15"
-msgstr "样式集15"
-
-#
-#: lookups.c:169
-msgid "Style Set 16"
-msgstr "样式集16"
-
-#
-#: lookups.c:170
-msgid "Style Set 17"
-msgstr "样式集17"
-
-#
-#: lookups.c:171
-msgid "Style Set 18"
-msgstr "样式集18"
-
-#
-#: lookups.c:172
-msgid "Style Set 19"
-msgstr "样式集19"
-
-#
-#: lookups.c:173
-msgid "Style Set 20"
-msgstr "样式集20"
-
-#
-#: lookups.c:174
-msgid "Script Style"
-msgstr "手书文字样式:"
-
-#
-#: lookups.c:177
-msgid "Swash"
-msgstr "填充"
-
-#
-#: lookups.c:178
-msgid "Titling"
-msgstr "叠加"
-
-#
-#: lookups.c:179
-msgid "Trailing Jamo Forms"
-msgstr "Trailing Jamo Forms"
-
-#
-#: lookups.c:180
-msgid "Traditional Name Forms"
-msgstr "传统名称形式"
-
-#
-#: lookups.c:181
-msgid "Tabular Numbers"
-msgstr "表格数字"
-
-#
-#: lookups.c:182
-msgid "Traditional Forms"
-msgstr "传统形式"
-
-#
-#: lookups.c:183
-msgid "Third Widths"
-msgstr "三分之一宽"
-
-#
-#: lookups.c:184
-msgid "Unicase"
-msgstr "一致大小写"
-
-#
-#: lookups.c:185
-msgid "Alternate Vertical Metrics"
-msgstr "替代垂直尺寸"
-
-#
-#: lookups.c:186
-msgid "Vattu Variants"
-msgstr "Vattu 变形"
-
-#
-#: lookups.c:187
-msgid "Vertical Alternates (obs)"
-msgstr "垂直替补(绝对)"
-
-#
-#: lookups.c:188
-msgid "Alternate Vertical Half Metrics"
-msgstr "替代垂直半尺寸"
-
-#
-#: lookups.c:189
-msgid "Vowel Jamo Forms"
-msgstr "Vowel Jamo Forms"
-
-#
-#: lookups.c:190
-msgid "Vertical Kana Alternates"
-msgstr "垂直假名替代"
-
-#
-#: lookups.c:191
-msgid "Vertical Kerning"
-msgstr "垂直压缩"
-
-#
-#: lookups.c:192
-msgid "Proportional Alternate Vertical Metrics"
-msgstr "比例替代垂直尺寸"
-
-#
-#: lookups.c:193
-msgid "Vertical Rotation & Alternates"
-msgstr "垂直旋转及替补"
-
-#
-#: lookups.c:194
-msgid "Slashed Zero"
-msgstr "带中线的零"
-
-#
-#: lookups.c:196
-msgid "Required feature"
-msgstr "需要特征"
-
-#
-#: lookups.c:1285
-msgid "Undefined substitution"
-msgstr "未定义替换"
-
-#
-#: lookups.c:1285 lookupui.c:133
-msgid "Single Substitution"
-msgstr "单一替代"
-
-#
-#: lookups.c:1285 lookupui.c:134
-msgid "Multiple Substitution"
-msgstr "多重替代"
-
-#
-#: lookups.c:1286 lookupui.c:135
-msgid "Alternate Substitution"
-msgstr "交换替代"
-
-#
-#: lookups.c:1286 lookupui.c:136
-msgid "Ligature Substitution"
-msgstr "连字替换"
-
-#
-#: lookups.c:1286 lookupui.c:137 showatt.c:578 showatt.c:654
-msgid "Contextual Substitution"
-msgstr "关联替代"
-
-#
-#: lookups.c:1287 lookupui.c:138
-msgid "Contextual Chaining Substitution"
-msgstr "关联链替换"
-
-#
-#: lookups.c:1287 lookups.c:1293
-msgid "Extension"
-msgstr "扩展"
-
-#
-#: lookups.c:1288
-msgid "Reverse Contextual Chaining Substitution"
-msgstr "逆向关联链替换"
-
-#
-#: lookups.c:1289
-msgid "Undefined positioning"
-msgstr "未定义位置"
-
-#
-#: lookups.c:1289
-msgid "Single Positioning"
-msgstr "简单定位"
-
-#
-#: lookups.c:1289
-msgid "Pairwise Positioning (kerning)"
-msgstr "配对定位(压缩)"
-
-#
-#: lookups.c:1290
-msgid "Cursive attachment"
-msgstr "草写附件"
-
-#
-#: lookups.c:1290
-msgid "Mark to base attachment"
-msgstr "标记基础附件"
-
-#
-#: lookups.c:1291
-msgid "Mark to Ligature attachment"
-msgstr "标记连写附件"
-
-#
-#: lookups.c:1291
-msgid "Mark to Mark attachment"
-msgstr "标记标记附件"
-
-#
-#: lookups.c:1292 showatt.c:578
-msgid "Contextual Positioning"
-msgstr "关联定位"
-
-#
-#: lookups.c:1292
-msgid "Contextual Chaining Positioning"
-msgstr "关联链定位"
-
-#
-#. GT: See the long comment at "Property|New"
-#. GT: The msgstr should contain a translation of "Arabic", ignore "Script|"
-#: lookups.c:1302 lookupui.c:165 parsettf.c:4430
-msgid "Script|Arabic"
-msgstr "阿拉伯文"
-
-#
-#: lookups.c:1303 lookupui.c:166
-msgid "Script|Aramaic"
-msgstr "Aramaic"
-
-#
-#: lookups.c:1304 lookupui.c:167
-msgid "Script|Armenian"
-msgstr "Armenian"
-
-#
-#: lookups.c:1305 lookupui.c:168
-msgid "Script|Avestan"
-msgstr "Avestan"
-
-#
-#: lookups.c:1306 lookupui.c:169
-msgid "Script|Balinese"
-msgstr "Balinese"
-
-#
-#: lookups.c:1307 lookupui.c:170
-msgid "Script|Batak"
-msgstr "Batak"
-
-#
-#: lookups.c:1308 lookupui.c:171
-msgid "Script|Bengali"
-msgstr "Bengali"
-
-#
-#: lookups.c:1309 lookupui.c:172
-msgid "Script|Bengali2"
-msgstr "Bengali2"
-
-#
-#: lookups.c:1310 lookupui.c:173
-msgid "Bliss Symbolics"
-msgstr "Bliss符号"
-
-#
-#: lookups.c:1311 lookupui.c:174 unicoderange.c:164
-msgid "Bopomofo"
-msgstr "注音字母"
-
-#
-#: lookups.c:1312 lookupui.c:175
-msgid "Brāhmī"
-msgstr "Brāhmī"
-
-#
-#: lookups.c:1313 lookupui.c:176
-msgid "Braille"
-msgstr "Braille"
-
-#
-#: lookups.c:1314 lookupui.c:177
-msgid "Script|Buginese"
-msgstr "Buginese"
-
-#
-#: lookups.c:1315 lookupui.c:178
-msgid "Script|Buhid"
-msgstr "Buhid"
-
-#
-#: lookups.c:1316 lookupui.c:179
-msgid "Byzantine Music"
-msgstr "拜占庭乐符"
-
-#
-#: lookups.c:1317 lookupui.c:180
-msgid "Canadian Syllabics"
-msgstr "加拿大音节"
-
-#: lookups.c:1318 unicoderange.c:242
-msgid "Carian"
-msgstr ""
-
-#
-#: lookups.c:1320 lookupui.c:181
-msgid "Script|Cham"
-msgstr "Cham"
-
-#
-#: lookups.c:1321 lookupui.c:182
-msgid "Script|Cherokee"
-msgstr "切洛基文"
-
-#
-#: lookups.c:1322 lookupui.c:183
-msgid "Cirth"
-msgstr "色斯文"
-
-#
-#: lookups.c:1323 lookupui.c:184
-msgid "CJK Ideographic"
-msgstr "中日韩表意字符"
-
-#
-#: lookups.c:1324 lookupui.c:185
-msgid "Script|Coptic"
-msgstr "Coptic"
-
-#
-#: lookups.c:1325 lookupui.c:186
-msgid "Cypro-Minoan"
-msgstr "塞浦路斯－克里特语"
-
-#
-#: lookups.c:1326 lookupui.c:187
-msgid "Cypriot syllabary"
-msgstr "塞浦路斯音节"
-
-#
-#: lookups.c:1327 lookupui.c:188 unicoderange.c:54
-msgid "Cyrillic"
-msgstr "西里尔语"
-
-#
-#: lookups.c:1328 lookupui.c:189
-msgid "Script|Default"
-msgstr "默认"
-
-#
-#: lookups.c:1329 lookupui.c:190
-msgid "Deseret (Mormon)"
-msgstr "Deseret (Mormon)"
-
-#
-#: lookups.c:1331 lookupui.c:192
-msgid "Devanagari2"
-msgstr "Devanagari2"
-
-#
-#. GT: Someone asked if FontForge actually was prepared generate hieroglyph output
-#. GT: because of this string. No. But OpenType and Unicode have placeholders for
-#. GT: dealing with these scripts against the day someone wants to use them. So
-#. GT: FontForge must be prepared to deal with those placeholders if nothing else.
-#. { N_("Egyptian hieroglyphs"), CHR('e','g','y','p') },
-#. GT: Someone asked if FontForge actually was prepared generate hieroglyph output
-#. GT: because of this string. No. But OpenType and Unicode have placeholders for
-#. GT: dealing with these scripts against the day someone wants to use them. So
-#. GT: FontForge must be prepared to deal with those placeholders if nothing else.
-#. { (unichar_t *) N_("Egyptian hieroglyphs"), NULL, 0, 0, (void *) CHR('e','g','y','p'), NULL, false, false, false, false, false, false, true },
-#: lookups.c:1339 lookupui.c:200
-msgid "Script|Ethiopic"
-msgstr "埃塞俄比亚文"
-
-#
-#: lookups.c:1340 lookupui.c:201
-msgid "Script|Georgian"
-msgstr "Georgian"
-
-#
-#: lookups.c:1343 lookupui.c:204 parsettf.c:4430
-msgid "Script|Greek"
-msgstr "希腊"
-
-#
-#: lookups.c:1344 lookupui.c:205 parsettf.c:4434
-msgid "Script|Gujarati"
-msgstr "古吉拉特文"
-
-#
-#: lookups.c:1345 lookupui.c:206
-msgid "Script|Gujarati2"
-msgstr "Gujarati2"
-
-#
-#: lookups.c:1347 lookupui.c:208
-msgid "Gurmukhi2"
-msgstr "Gurmukhi2"
-
-#
-#: lookups.c:1349 lookupui.c:210
-msgid "Hangul"
-msgstr "韩文"
-
-#
-#: lookups.c:1350 lookupui.c:211
-msgid "Script|Hanunóo"
-msgstr "Hanunóo"
-
-#
-#: lookups.c:1351 lookupui.c:212 parsettf.c:4430
-msgid "Script|Hebrew"
-msgstr "希伯来语"
-
-#
-#: lookups.c:1354 lookupui.c:215
-msgid "Script|Javanese"
-msgstr "Script|Javanese"
-
-#
-#: lookups.c:1356 lookupui.c:217
-msgid "Hiragana & Katakana"
-msgstr "平假名与片假名"
-
-#
-#: lookups.c:1357 lookupui.c:218
-msgid "Kharoṣṭhī"
-msgstr "Kharoṣṭhī"
-
-#
-#: lookups.c:1358 lookupui.c:219
-msgid "Script|Kannada"
-msgstr "Script|Kannada"
-
-#
-#: lookups.c:1359 lookupui.c:220
-msgid "Script|Kannada2"
-msgstr "Script|Kannada2"
-
-#
-#: lookups.c:1360 lookupui.c:221
-msgid "Script|Khmer"
-msgstr "Script|Khmer"
-
-#
-#: lookups.c:1361 lookupui.c:222
-msgid "Script|Kharosthi"
-msgstr "Script|Kharosthi"
-
-#
-#: lookups.c:1362 lookupui.c:223
-msgid "Script|Lao"
-msgstr "老挝文"
-
-#
-#: lookups.c:1363 lookupui.c:224
-msgid "Script|Latin"
-msgstr "拉丁文"
-
-#
-#: lookups.c:1364 lookupui.c:225
-msgid "Lepcha (Róng)"
-msgstr "Lepcha (Róng)"
-
-#
-#: lookups.c:1365 lookupui.c:226
-msgid "Script|Limbu"
-msgstr "Script|Limbu"
-
-#
-#: lookups.c:1366 lookupui.c:227
-msgid "Linear A"
-msgstr "Linear A"
-
-#
-#: lookups.c:1367 lookupui.c:228
-msgid "Linear B"
-msgstr "Linear B"
-
-#: lookups.c:1368 unicoderange.c:241
-msgid "Lycian"
-msgstr ""
-
-#: lookups.c:1369 unicoderange.c:255
-msgid "Lydian"
-msgstr ""
-
-#
-#: lookups.c:1370 lookupui.c:229
-msgid "Script|Mandaean"
-msgstr "Script|Mandaean"
-
-#
-#: lookups.c:1372 lookupui.c:231
-msgid "Script|Malayālam"
-msgstr "Script|Malayālam"
-
-#
-#: lookups.c:1373 lookupui.c:232
-msgid "Script|Malayālam2"
-msgstr "Script|Malayālam2"
-
-#
-#: lookups.c:1375 lookupui.c:234
-msgid "Script|Mongolian"
-msgstr "蒙古文"
-
-#
-#: lookups.c:1376 lookupui.c:235
-msgid "Musical"
-msgstr "乐符"
-
-#
-#: lookups.c:1377 lookupui.c:236
-msgid "Script|Myanmar"
-msgstr "Script|Myanmar"
-
-#
-#: lookups.c:1382 lookupui.c:239
-msgid "Old Italic (Etruscan, Oscan, etc.)"
-msgstr "老意大利文 (Etruscan, Oscan 等)"
-
-#
-#: lookups.c:1383 lookupui.c:240
-msgid "Script|Old Permic"
-msgstr "Script|Old Permic"
-
-#
-#: lookups.c:1384 lookupui.c:241
-msgid "Old Persian cuneiform"
-msgstr "Old Persian cuneiform"
-
-#
-#: lookups.c:1385 lookupui.c:242
-msgid "Script|Oriya"
-msgstr "Script|Oriya"
-
-#
-#: lookups.c:1386 lookupui.c:243
-msgid "Script|Oriya2"
-msgstr "Script|Oriya2"
-
-#
-#: lookups.c:1388 lookupui.c:245
-msgid "Script|Pahlavi"
-msgstr "Script|Pahlavi"
-
-#
-#: lookups.c:1389 lookupui.c:246
-msgid "Script|Phags-pa"
-msgstr "Script|Phags-pa"
-
-#
-#: lookups.c:1390 lookupui.c:247
-msgid "Script|Phoenician"
-msgstr "Script|Phoenician"
-
-#
-#: lookups.c:1391 lookupui.c:248
-msgid "Phaistos"
-msgstr "Phaistos"
-
-#
-#: lookups.c:1392 lookupui.c:249
-msgid "Pollard Phonetic"
-msgstr "Pollard Phonetic"
-
-#
-#: lookups.c:1394 lookupui.c:250
-msgid "Rongorongo"
-msgstr "Rongorongo"
-
-#
-#: lookups.c:1398 lookupui.c:253
-msgid "Script|Sinhala"
-msgstr "Script|Sinhala"
-
-#
-#: lookups.c:1399 lookupui.c:254
-msgid "Script|Sumero-Akkadian Cuneiform"
-msgstr "Script|Sumero-Akkadian Cuneiform"
-
-#: lookups.c:1400
-msgid "Script|Sundanese"
-msgstr ""
-
-#
-#: lookups.c:1401 lookupui.c:255
-msgid "Script|Syloti Nagri"
-msgstr "Script|Syloti Nagri"
-
-#
-#: lookups.c:1402 lookupui.c:256
-msgid "Script|Syriac"
-msgstr "Script|Syriac"
-
-#
-#: lookups.c:1403 lookupui.c:257
-msgid "Script|Tagalog"
-msgstr "Script|Tagalog"
-
-#
-#: lookups.c:1404 lookupui.c:258
-msgid "Script|Tagbanwa"
-msgstr "Script|Tagbanwa"
-
-#
-#: lookups.c:1406 lookupui.c:260
-msgid "Tai Lu"
-msgstr "Tai Lu"
-
-#
-#: lookups.c:1407 lookupui.c:261
-msgid "Script|Tamil"
-msgstr "Script|Tamil"
-
-#
-#: lookups.c:1408 lookupui.c:262
-msgid "Script|Tamil2"
-msgstr "Script|Tamil2"
-
-#
-#: lookups.c:1409 lookupui.c:263
-msgid "Script|Telugu"
-msgstr "Script|Telugu"
-
-#
-#: lookups.c:1410 lookupui.c:264
-msgid "Script|Telugu2"
-msgstr "Script|Telugu2"
-
-#
-#: lookups.c:1411 lookupui.c:265
-msgid "Tengwar"
-msgstr "Tengwar"
-
-#
-#: lookups.c:1413 lookupui.c:267 parsettf.c:4436
-msgid "Script|Thai"
-msgstr "Script|Thai"
-
-#
-#: lookups.c:1414 lookupui.c:268
-msgid "Script|Tibetan"
-msgstr "藏文"
-
-#
-#: lookups.c:1415 lookupui.c:269
-msgid "Tifinagh (Berber)"
-msgstr "Tifinagh (Berber)"
-
-#
-#: lookups.c:1416 lookupui.c:270
-msgid "Script|Ugaritic"
-msgstr "Script|Ugaritic"
-
-#
-#: lookups.c:1417 lookupui.c:271
-msgid "Script|Vai"
-msgstr "Script|Vai"
-
-#
-#: lookups.c:1419 lookupui.c:273
-msgid "Cuneiform, Ugaritic"
-msgstr "Cuneiform, Ugaritic"
-
-#
-#: lookups.c:1420 lookupui.c:274
-msgid "Script|Yi"
-msgstr "Script|彝文字符"
-
-#
-#: lookups.c:1465
-msgid "Required Feature"
-msgstr "需要的特征"
-
-#: lookups.c:1872
-#, c-format
-msgid ""
-"The glyph, %s, contains a %s from %s and one from %s.\n"
-"The one from %s will be removed.\n"
-msgstr ""
-
-#
-#: lookups.c:1874
-msgid "positioning"
-msgstr "定位"
-
-#
-#: lookups.c:1874 problems.c:2259
-msgid "substitution"
-msgstr "替代"
-
-#: lookups.c:1899
-#, c-format
-msgid ""
-"The glyph, %s, contains the same %s from %s and from %s.\n"
-"The one from %s will be removed.\n"
-msgstr ""
-
-#
-#: lookups.c:1901 problems.c:2260
-msgid "ligature"
-msgstr "连字"
-
-#
-#: lookups.c:1901
-msgid "kern pair"
-msgstr "压缩对"
-
-#: lookups.c:1927
-#, c-format
-msgid ""
-"The glyph, %s, contains the same kern pair from %s and from %s.\n"
-"The one from %s will be removed.\n"
-msgstr ""
-
-#
-#: lookups.c:4384
-msgid "_Horizontal"
-msgstr "水平(_H)"
-
-#
-#: lookups.c:4384 metricsview.c:3325
-msgid "_Vertical"
-msgstr "垂直(_V)"
-
-#
-#: lookups.c:4385
-msgid "Kerning direction"
-msgstr "压缩方向"
-
-#
-#: lookups.c:4385
-msgid "Is this horizontal or vertical kerning data?"
-msgstr "此为水平抑或垂直压缩信息？"
-
-#: lookups.c:4723
-#, c-format
-msgid ""
-"Separation marks only meaningful in contextual chaining lookups, starting "
-"at: %.20s..."
-msgstr ""
-
-#: lookups.c:4729
-#, c-format
-msgid "Too many separation marks, starting at: %.20s..."
-msgstr ""
-
-#: lookups.c:4735
-#, c-format
-msgid ""
-"A coverage table was found in a glyph or class based contextual lookup, "
-"starting at: %.20s..."
-msgstr ""
-
-#: lookups.c:4739
-#, c-format
-msgid "Unterminated coverage table, starting at: %.20s..."
-msgstr ""
-
-#: lookups.c:4745
-#, c-format
-msgid "Replacements must follow the coverage table to which they apply: %s"
-msgstr ""
-
-#: lookups.c:4765
-#, c-format
-msgid ""
-"There must be as many replacement glyphs as there are match glyphs: %s => %s"
-msgstr ""
-
-#: lookups.c:4777
-#, c-format
-msgid ""
-"No replacement lists may be specified in this contextual lookup, use a "
-"nested lookup instead, starting at: %.20s..."
-msgstr ""
-
-#: lookups.c:4779
-#, c-format
-msgid ""
-"Only one replacement list may be specified in a reverse contextual chaining "
-"lookup, starting at: %.20s..."
-msgstr ""
-
-#: lookups.c:4785
-#, c-format
-msgid ""
-"No lookups may be specified in a reverse contextual lookup (use a "
-"replacement list instead), starting at: %.20s..."
-msgstr ""
-
-#: lookups.c:4790
-#, c-format
-msgid ""
-"A lookup invocation must be started by the sequence '@<' and ended with '>', "
-"starting at: %.20s..."
-msgstr ""
-
-#: lookups.c:4795
-#, c-format
-msgid "Unterminated lookup invocation, starting at: %.20s..."
-msgstr ""
-
-#: lookups.c:4799
-#, c-format
-msgid "Unknown lookup: %s"
-msgstr ""
-
-#: lookups.c:4803
-#, c-format
-msgid "GSUB lookup refered to in this GPOS contextual lookup: %s"
-msgstr ""
-
-#: lookups.c:4804
-#, c-format
-msgid "GPOS lookup refered to in this GSUB contextual lookup: %s"
-msgstr ""
-
-#: lookups.c:4809
-#, c-format
-msgid ""
-"Lookups must follow the glyph, class or coverage table to which they apply: "
-"%s"
-msgstr ""
-
-#: lookups.c:4838
-msgid "Empty rule"
-msgstr ""
-
-#: lookups.c:4844
-msgid ""
-"A reverse contextual chaining lookup must have a set of replacement glyphs "
-"somewhere"
-msgstr ""
-
-#: lookups.c:4849
-msgid "This contextual rule applies no lookups."
-msgstr ""
-
-#: lookups.c:4861
-msgid ""
-"A reverse contextual chaining lookup can only match one coverage table "
-"directly"
-msgstr ""
-
-#: lookups.c:4876 lookups.c:4980
-#, c-format
-msgid "There is no glyph named \"%s\" in the font."
-msgstr ""
-
-#: lookups.c:4953
-#, c-format
-msgid "%s is not a class name for the backtracking classes."
-msgstr ""
-
-#: lookups.c:4955
-#, c-format
-msgid "%s is not a class name for the matching classes."
-msgstr ""
-
-#: lookups.c:4957
-#, c-format
-msgid "%s is not a class name for the forward classes."
-msgstr ""
-
-#: lookups.c:5010
-msgid "Bad FPST format"
-msgstr ""
-
-#
-#: lookupui.c:132 lookupui.c:146
-msgid "Lookup Type|Unspecified"
-msgstr "未指定"
-
-#
-#: lookupui.c:139
-msgid "Reverse Chaining Substitution"
-msgstr "逆向链替换"
-
-#
-#: lookupui.c:141
-msgid "Mac Indic State Machine"
-msgstr "Mac Indic 状态机"
-
-#
-#: lookupui.c:142
-msgid "Mac Contextual State Machine"
-msgstr "Mac关联状态机"
-
-#
-#: lookupui.c:143
-msgid "Mac Insertion State Machine"
-msgstr "Mac插入状态机"
-
-#
-#: lookupui.c:147
-msgid "Single Position"
-msgstr "简单位置"
-
-#
-#: lookupui.c:148
-msgid "Pair Position (kerning)"
-msgstr "压缩对位置"
-
-#
-#: lookupui.c:149
-msgid "Cursive Position"
-msgstr "草写位置"
-
-#
-#: lookupui.c:150
-msgid "Mark to Base Position"
-msgstr "标记基础位置"
-
-#
-#: lookupui.c:151
-msgid "Mark to Ligature Position"
-msgstr "标记连字位置"
-
-#
-#: lookupui.c:152
-msgid "Mark to Mark Position"
-msgstr "标记标记位置"
-
-#
-#: lookupui.c:153
-msgid "Contextual Position"
-msgstr "上下文关联位置"
-
-#
-#: lookupui.c:154
-msgid "Contextual Chaining Position"
-msgstr "关联链位置"
-
-#
-#: lookupui.c:156
-msgid "Mac Kerning State Machine"
-msgstr "Mac压缩状态机"
-
-#
-#: lookupui.c:283
-msgid "Abaza"
-msgstr "Abaza"
-
-#
-#: lookupui.c:284
-msgid "Abkhazian"
-msgstr "Abkhazian"
-
-#
-#: lookupui.c:285
-msgid "Adyghe"
-msgstr "Adyghe"
-
-#
-#: lookupui.c:287
-msgid "Afar"
-msgstr "Afar"
-
-#
-#: lookupui.c:288
-msgid "Agaw"
-msgstr "Agaw"
-
-#: lookupui.c:289
-msgid "Alsatian"
-msgstr ""
-
-#
-#: lookupui.c:290
-msgid "Altai"
-msgstr "Altai"
-
-#: lookupui.c:291
-msgid "Americanist IPA"
-msgstr ""
-
-#
-#: lookupui.c:295 macenc.c:2248 macencui.c:89
-msgid "Lang|Arabic"
-msgstr "阿拉伯语"
-
-#
-#: lookupui.c:296
-msgid "Aari"
-msgstr "Aari"
-
-#
-#: lookupui.c:297
-msgid "Arakanese"
-msgstr "Arakanese"
-
-#
-#: lookupui.c:299
-msgid "Athapaskan"
-msgstr "Athapaskan"
-
-#
-#: lookupui.c:300
-msgid "Lang|Avar"
-msgstr "Lang|Avar"
-
-#
-#: lookupui.c:301
-msgid "Awadhi"
-msgstr "Awadhi"
-
-#
-#: lookupui.c:302 macenc.c:2339 macencui.c:180
-msgid "Aymara"
-msgstr "Aymara"
-
-#
-#: lookupui.c:303
-msgid "Azeri"
-msgstr "Azeri"
-
-#
-#: lookupui.c:304
-msgid "Badaga"
-msgstr "Badaga"
-
-#
-#: lookupui.c:305
-msgid "Baghelkhandi"
-msgstr "Baghelkhandi"
-
-#
-#: lookupui.c:306
-msgid "Balkar"
-msgstr "Balkar"
-
-#
-#: lookupui.c:307
-msgid "Baule"
-msgstr "Baule"
-
-#
-#: lookupui.c:308
-msgid "Lang|Berber"
-msgstr "Lang|Berber"
-
-#
-#: lookupui.c:309
-msgid "Bench"
-msgstr "Bench"
-
-#
-#: lookupui.c:310
-msgid "Bible Cree"
-msgstr "Bible Cree"
-
-#
-#: lookupui.c:311
-msgid "Belarussian"
-msgstr "Belarussian"
-
-#
-#: lookupui.c:312
-msgid "Bemba"
-msgstr "Bemba"
-
-#
-#: lookupui.c:315
-msgid "Bhili"
-msgstr "Bhili"
-
-#
-#: lookupui.c:316
-msgid "Bhojpuri"
-msgstr "Bhojpuri"
-
-#
-#: lookupui.c:317
-msgid "Bikol"
-msgstr "Bikol"
-
-#
-#: lookupui.c:318
-msgid "Bilen"
-msgstr "Bilen"
-
-#
-#: lookupui.c:319
-msgid "Blackfoot"
-msgstr "Blackfoot"
-
-#
-#: lookupui.c:320
-msgid "Balochi"
-msgstr "Balochi"
-
-#
-#: lookupui.c:321
-msgid "Balante"
-msgstr "Balante"
-
-#
-#: lookupui.c:322
-msgid "Balti"
-msgstr "Balti"
-
-#
-#: lookupui.c:323
-msgid "Bambara"
-msgstr "Bambara"
-
-#
-#: lookupui.c:324
-msgid "Bamileke"
-msgstr "Bamileke"
-
-#: lookupui.c:325
-msgid "Bosnian"
-msgstr ""
-
-#
-#: lookupui.c:326 macenc.c:2347 macencui.c:188
-msgid "Breton"
-msgstr "Breton"
-
-#
-#: lookupui.c:327
-msgid "Brahui"
-msgstr "Brahui"
-
-#
-#: lookupui.c:328
-msgid "Braj Bhasha"
-msgstr "Braj Bhasha"
-
-#
-#: lookupui.c:330
-msgid "Bashkir"
-msgstr "Bashkir"
-
-#
-#: lookupui.c:331
-msgid "Beti"
-msgstr "Beti"
-
-#
-#: lookupui.c:333
-msgid "Cebuano"
-msgstr "Cebuano"
-
-#
-#: lookupui.c:334
-msgid "Chechen"
-msgstr "Chechen"
-
-#
-#: lookupui.c:335
-msgid "Chaha Gurage"
-msgstr "Chaha Gurage"
-
-#
-#: lookupui.c:336
-msgid "Chattisgarhi"
-msgstr "Chattisgarhi"
-
-#
-#: lookupui.c:337
-msgid "Chichewa"
-msgstr "Chichewa"
-
-#
-#: lookupui.c:338
-msgid "Chukchi"
-msgstr "Chukchi"
-
-#
-#: lookupui.c:339
-msgid "Chipewyan"
-msgstr "Chipewyan"
-
-#
-#: lookupui.c:341
-msgid "Chuvash"
-msgstr "Chuvash"
-
-#
-#: lookupui.c:342
-msgid "Comorian"
-msgstr "Comorian"
-
-#
-#: lookupui.c:343
-msgid "Lang|Coptic"
-msgstr "Lang|Coptic"
-
-#: lookupui.c:344
-msgid "Corsican"
-msgstr ""
-
-#
-#: lookupui.c:345
-msgid "Cree"
-msgstr "Cree"
-
-#
-#: lookupui.c:346
-msgid "Carrier"
-msgstr "Carrier"
-
-#
-#: lookupui.c:347
-msgid "Crimean Tatar"
-msgstr "Crimean Tatar"
-
-#
-#: lookupui.c:348
-msgid "Church Slavonic"
-msgstr "Church Slavonic"
-
-#
-#: lookupui.c:351
-msgid "Dargwa"
-msgstr "Dargwa"
-
-#
-#: lookupui.c:352
-msgid "Lang|Default"
-msgstr "默认"
-
-#
-#: lookupui.c:353
-msgid "Woods Cree"
-msgstr "Woods Cree"
-
-#
-#: lookupui.c:354
-msgid "German (Standard)"
-msgstr "德语 (标准)"
-
-#
-#: lookupui.c:355
-msgid "Dogri"
-msgstr "Dogri"
-
-#: lookupui.c:356
-msgid "Dhivehi (Obsolete)"
-msgstr ""
-
-#
-#: lookupui.c:357
-msgid "Dhivehi"
-msgstr "Dhivehi"
-
-#
-#: lookupui.c:358
-msgid "Djerma"
-msgstr "Djerma"
-
-#
-#: lookupui.c:359
-msgid "Dangme"
-msgstr "Dangme"
-
-#
-#: lookupui.c:360
-msgid "Dinka"
-msgstr "Dinka"
-
-#: lookupui.c:361
-msgid "Dari"
-msgstr ""
-
-#
-#: lookupui.c:362
-msgid "Dungan"
-msgstr "Dungan"
-
-#
-#: lookupui.c:363 macenc.c:2342 macencui.c:183
-msgid "Dzongkha"
-msgstr "Dzongkha"
-
-#
-#: lookupui.c:364
-msgid "Ebira"
-msgstr "Ebira"
-
-#
-#: lookupui.c:365
-msgid "Eastern Cree"
-msgstr "Eastern Cree"
-
-#
-#: lookupui.c:367
-msgid "Efik"
-msgstr "Efik"
-
-#
-#: lookupui.c:370
-msgid "Erzya"
-msgstr "Erzya"
-
-#
-#: lookupui.c:374
-msgid "Evenki"
-msgstr "Evenki"
-
-#
-#: lookupui.c:375
-msgid "Even"
-msgstr "Even"
-
-#
-#: lookupui.c:376
-msgid "Ewe"
-msgstr "Ewe"
-
-#
-#: lookupui.c:377
-msgid "French Antillean"
-msgstr "法语(Antillean)"
-
-#
-#: lookupui.c:380
-msgid "Fijian"
-msgstr "Fijian"
-
-#
-#: lookupui.c:381 macenc.c:2272 macencui.c:113
-msgid "Flemish"
-msgstr "Flemish"
-
-#
-#: lookupui.c:382
-msgid "Forest Nenets"
-msgstr "Forest Nenets"
-
-#
-#: lookupui.c:383
-msgid "Fon"
-msgstr "Fon"
-
-#
-#: lookupui.c:384
-msgid "Faroese"
-msgstr "Faroese"
-
-#
-#: lookupui.c:385
-msgid "French (Standard)"
-msgstr "法语(标准)"
-
-#
-#: lookupui.c:387
-msgid "Friulian"
-msgstr "Friulian"
-
-#
-#: lookupui.c:388
-msgid "Futa"
-msgstr "Futa"
-
-#
-#: lookupui.c:389
-msgid "Fulani"
-msgstr "Fulani"
-
-#
-#: lookupui.c:390
-msgid "Ga"
-msgstr "Ga"
-
-#
-#: lookupui.c:391
-msgid "Gaelic"
-msgstr "Gaelic"
-
-#
-#: lookupui.c:392
-msgid "Gagauz"
-msgstr "Gagauz"
-
-#
-#: lookupui.c:394
-msgid "Garshuni"
-msgstr "Garshuni"
-
-#
-#: lookupui.c:395
-msgid "Garhwali"
-msgstr "Garhwali"
-
-#
-#: lookupui.c:396
-msgid "Lang|Ge'ez"
-msgstr "Lang|Ge'ez"
-
-#
-#: lookupui.c:397
-msgid "Gilyak"
-msgstr "Gilyak"
-
-#
-#: lookupui.c:398
-msgid "Gumuz"
-msgstr "Gumuz"
-
-#
-#: lookupui.c:399
-msgid "Gondi"
-msgstr "Gondi"
-
-#
-#: lookupui.c:400 macenc.c:2354 macencui.c:195
-msgid "Greenlandic"
-msgstr "Greenlandic"
-
-#
-#: lookupui.c:401
-msgid "Garo"
-msgstr "Garo"
-
-#
-#: lookupui.c:404
-msgid "Haitian"
-msgstr "Haitian"
-
-#
-#: lookupui.c:405
-msgid "Halam"
-msgstr "Halam"
-
-#
-#: lookupui.c:406
-msgid "Harauti"
-msgstr "Harauti"
-
-#
-#: lookupui.c:408
-msgid "Hawaiin"
-msgstr "Hawaiin"
-
-#
-#: lookupui.c:409
-msgid "Hammer-Banna"
-msgstr "Hammer-Banna"
-
-#
-#: lookupui.c:410
-msgid "Hiligaynon"
-msgstr "Hiligaynon"
-
-#
-#: lookupui.c:412
-msgid "High Mari"
-msgstr "High Mari"
-
-#
-#: lookupui.c:413
-msgid "Hindko"
-msgstr "Hindko"
-
-#
-#: lookupui.c:414
-msgid "Ho"
-msgstr "Ho"
-
-#
-#: lookupui.c:415
-msgid "Harari"
-msgstr "Harari"
-
-#
-#: lookupui.c:420
-msgid "Ijo"
-msgstr "Ijo"
-
-#
-#: lookupui.c:421
-msgid "Ilokano"
-msgstr "Ilokano"
-
-#
-#: lookupui.c:423
-msgid "Ingush"
-msgstr "Ingush"
-
-#: lookupui.c:425
-msgid "IPA usage"
-msgstr ""
-
-#
-#: lookupui.c:426
-msgid "Irish"
-msgstr "爱尔兰语"
-
-#
-#: lookupui.c:427
-msgid "Irish Traditional"
-msgstr "传统爱尔兰语"
-
-#
-#: lookupui.c:429
-msgid "Inari Sami"
-msgstr "Inari Sami"
-
-#
-#: lookupui.c:432
-msgid "Lang|Javanese"
-msgstr "Lang|Javanese"
-
-#
-#: lookupui.c:435
-msgid "Judezmo"
-msgstr "Judezmo"
-
-#
-#: lookupui.c:436
-msgid "Jula"
-msgstr "Jula"
-
-#
-#: lookupui.c:437
-msgid "Kabardian"
-msgstr "Kabardian"
-
-#
-#: lookupui.c:438
-msgid "Kachchi"
-msgstr "Kachchi"
-
-#
-#: lookupui.c:439
-msgid "Kalenjin"
-msgstr "Kalenjin"
-
-#
-#: lookupui.c:441
-msgid "Karachay"
-msgstr "Karachay"
-
-#
-#: lookupui.c:444
-msgid "Kebena"
-msgstr "Kebena"
-
-#
-#: lookupui.c:445
-msgid "Khutsuri Georgian"
-msgstr "Khutsuri Georgian"
-
-#
-#: lookupui.c:446
-msgid "Khakass"
-msgstr "Khakass"
-
-#
-#: lookupui.c:447
-msgid "Khanty-Kazim"
-msgstr "Khanty-Kazim"
-
-#
-#: lookupui.c:449
-msgid "Khanty-Shurishkar"
-msgstr "Khanty-Shurishkar"
-
-#
-#: lookupui.c:450
-msgid "Khanty-Vakhi"
-msgstr "Khanty-Vakhi"
-
-#
-#: lookupui.c:451
-msgid "Khowar"
-msgstr "Khowar"
-
-#
-#: lookupui.c:452
-msgid "Kikuyu"
-msgstr "Kikuyu"
-
-#
-#: lookupui.c:454
-msgid "Kisii"
-msgstr "Kisii"
-
-#
-#: lookupui.c:455
-msgid "Kokni"
-msgstr "Kokni"
-
-#
-#: lookupui.c:456
-msgid "Kalmyk"
-msgstr "Kalmyk"
-
-#
-#: lookupui.c:457
-msgid "Kamba"
-msgstr "Kamba"
-
-#
-#: lookupui.c:458
-msgid "Kumaoni"
-msgstr "Kumaoni"
-
-#
-#: lookupui.c:459
-msgid "Komo"
-msgstr "Komo"
-
-#
-#: lookupui.c:460
-msgid "Komso"
-msgstr "Komso"
-
-#
-#: lookupui.c:462
-msgid "Kodagu"
-msgstr "Kodagu"
-
-#: lookupui.c:463
-msgid "Korean Old Hangul"
-msgstr ""
-
-#
-#: lookupui.c:465
-msgid "Kikongo"
-msgstr "Kikongo"
-
-#
-#: lookupui.c:466
-msgid "Komi-Permyak"
-msgstr "Komi-Permyak"
-
-#
-#: lookupui.c:468
-msgid "Komi-Zyrian"
-msgstr "Komi-Zyrian"
-
-#
-#: lookupui.c:469
-msgid "Kpelle"
-msgstr "Kpelle"
-
-#
-#: lookupui.c:470
-msgid "Krio"
-msgstr "Krio"
-
-#
-#: lookupui.c:471
-msgid "Karakalpak"
-msgstr "Karakalpak"
-
-#
-#: lookupui.c:472
-msgid "Karelian"
-msgstr "Karelian"
-
-#
-#: lookupui.c:473
-msgid "Karaim"
-msgstr "Karaim"
-
-#
-#: lookupui.c:474
-msgid "Karen"
-msgstr "Karen"
-
-#
-#: lookupui.c:475
-msgid "Koorete"
-msgstr "Koorete"
-
-#
-#: lookupui.c:476 macenc.c:2299 macencui.c:140
-msgid "Kashmiri"
-msgstr "Kashmiri"
-
-#
-#: lookupui.c:477
-msgid "Khasi"
-msgstr "Khasi"
-
-#
-#: lookupui.c:478
-msgid "Kildin Sami"
-msgstr "Kildin Sami"
-
-#
-#: lookupui.c:479
-msgid "Kui"
-msgstr "Kui"
-
-#
-#: lookupui.c:480
-msgid "Kulvi"
-msgstr "Kulvi"
-
-#
-#: lookupui.c:481
-msgid "Kumyk"
-msgstr "Kumyk"
-
-#
-#: lookupui.c:482 macenc.c:2298 macencui.c:139
-msgid "Kurdish"
-msgstr "Kurdish"
-
-#
-#: lookupui.c:483
-msgid "Kurukh"
-msgstr "Kurukh"
-
-#
-#: lookupui.c:484
-msgid "Kuy"
-msgstr "Kuy"
-
-#
-#: lookupui.c:485
-msgid "Koryak"
-msgstr "Koryak"
-
-#
-#: lookupui.c:486
-msgid "Ladin"
-msgstr "Ladin"
-
-#
-#: lookupui.c:487
-msgid "Lahuli"
-msgstr "Lahuli"
-
-#
-#: lookupui.c:488
-msgid "Lak"
-msgstr "Lak"
-
-#
-#: lookupui.c:489
-msgid "Lambani"
-msgstr "Lambani"
-
-#
-#: lookupui.c:490 macenc.c:2317 macencui.c:158
-msgid "Lang|Lao"
-msgstr "老挝语"
-
-#
-#: lookupui.c:492
-msgid "Laz"
-msgstr "Laz"
-
-#
-#: lookupui.c:493
-msgid "L-Cree"
-msgstr "L-Cree"
-
-#
-#: lookupui.c:494
-msgid "Ladakhi"
-msgstr "Ladakhi"
-
-#
-#: lookupui.c:495
-msgid "Lezgi"
-msgstr "Lezgi"
-
-#
-#: lookupui.c:496
-msgid "Lingala"
-msgstr "Lingala"
-
-#
-#: lookupui.c:497
-msgid "Low Mari"
-msgstr "Low Mari"
-
-#
-#: lookupui.c:498
-msgid "Lang|Limbu"
-msgstr "Lang|Limbu"
-
-#
-#: lookupui.c:499
-msgid "Lomwe"
-msgstr "Lomwe"
-
-#
-#: lookupui.c:500
-msgid "Lower Sorbian"
-msgstr "Lower Sorbian"
-
-#
-#: lookupui.c:501
-msgid "Lule Sami"
-msgstr "Lule Sami"
-
-#: lookupui.c:503
-msgid "Luxembourgish"
-msgstr ""
-
-#
-#: lookupui.c:504
-msgid "Luba"
-msgstr "Luba"
-
-#
-#: lookupui.c:505
-msgid "Luganda"
-msgstr "Luganda"
-
-#
-#: lookupui.c:506
-msgid "Luhya"
-msgstr "Luhya"
-
-#
-#: lookupui.c:507
-msgid "Luo"
-msgstr "Luo"
-
-#
-#: lookupui.c:509
-msgid "Majang"
-msgstr "Majang"
-
-#
-#: lookupui.c:510
-msgid "Makua"
-msgstr "Makua"
-
-#
-#: lookupui.c:511
-msgid "Malayalam Traditional"
-msgstr "马来语Trad."
-
-#
-#: lookupui.c:512
-msgid "Mansi"
-msgstr "Mansi"
-
-#: lookupui.c:514
-msgid "Mapudungun"
-msgstr ""
-
-#
-#: lookupui.c:515
-msgid "Marwari"
-msgstr "马尔瓦利语"
-
-#
-#: lookupui.c:516
-msgid "Mbundu"
-msgstr "Mbundu"
-
-#
-#: lookupui.c:517
-msgid "Lang|Manchu"
-msgstr "Lang|Manchu"
-
-#
-#: lookupui.c:518
-msgid "Moose Cree"
-msgstr "Moose Cree"
-
-#
-#: lookupui.c:519
-msgid "Mende"
-msgstr "门德语"
-
-#
-#: lookupui.c:520
-msgid "Me'en"
-msgstr "Me'en"
-
-#
-#: lookupui.c:521
-msgid "Mizo"
-msgstr "Mizo"
-
-#
-#: lookupui.c:523
-msgid "Male"
-msgstr "马累"
-
-#
-#: lookupui.c:524 macenc.c:2331 macencui.c:172
-msgid "Malagasy"
-msgstr "马达加斯加语"
-
-#
-#: lookupui.c:525
-msgid "Malinke"
-msgstr "Malinke"
-
-#
-#: lookupui.c:526
-msgid "Malayalam Reformed"
-msgstr "马来语Ref."
-
-#
-#: lookupui.c:528
-msgid "Mandinka"
-msgstr "Mandinka"
-
-#
-#: lookupui.c:529
-msgid "Lang|Mongolian"
-msgstr "蒙古语"
-
-#
-#: lookupui.c:531
-msgid "Maninka"
-msgstr "Maninka"
-
-#
-#: lookupui.c:532 macenc.c:2350 macencui.c:191
-msgid "Manx Gaelic"
-msgstr "马恩岛盖尔语"
-
-#: lookupui.c:533
-msgid "Mohawk"
-msgstr ""
-
-#
-#: lookupui.c:534
-msgid "Moksha"
-msgstr "莫克沙语"
-
-#
-#: lookupui.c:535 macenc.c:2291 macencui.c:132
-msgid "Moldavian"
-msgstr "摩尔达维亚语"
-
-#
-#: lookupui.c:536
-msgid "Mon"
-msgstr "孟邦"
-
-#
-#: lookupui.c:537
-msgid "Moroccan"
-msgstr "Moroccan"
-
-#
-#: lookupui.c:539
-msgid "Maithili"
-msgstr "米德勒语"
-
-#
-#: lookupui.c:541
-msgid "Mundari"
-msgstr "Mundari"
-
-#
-#: lookupui.c:542
-msgid "Naga-Assamese"
-msgstr "Naga-Assamese"
-
-#
-#: lookupui.c:543
-msgid "Nanai"
-msgstr "Nanai"
-
-#
-#: lookupui.c:544
-msgid "Naskapi"
-msgstr "Naskapi"
-
-#
-#: lookupui.c:545
-msgid "N-Cree"
-msgstr "N-Cree"
-
-#
-#: lookupui.c:546
-msgid "Ndebele"
-msgstr "Ndebele"
-
-#
-#: lookupui.c:547
-msgid "Ndonga"
-msgstr "恩敦加语"
-
-#
-#: lookupui.c:549
-msgid "Newari"
-msgstr "Newari"
-
-#: lookupui.c:550
-msgid "Nagari"
-msgstr ""
-
-#
-#: lookupui.c:551
-msgid "Norway House Cree"
-msgstr "Norway House Cree"
-
-#
-#: lookupui.c:552
-msgid "Nisi"
-msgstr "Nisi"
-
-#
-#: lookupui.c:553
-msgid "Niuean"
-msgstr "纽埃语"
-
-#
-#: lookupui.c:554
-msgid "Nkole"
-msgstr "Nkole"
-
-#
-#: lookupui.c:557
-msgid "Nogai"
-msgstr "诺盖语"
-
-#
-#: lookupui.c:558 macenc.c:2245 macencui.c:86
-msgid "Norwegian"
-msgstr "挪威语"
-
-#
-#: lookupui.c:559
-msgid "Northern Sami"
-msgstr "北萨莫斯语"
-
-#
-#: lookupui.c:560
-msgid "Northern Tai"
-msgstr "Northern Tai"
-
-#
-#: lookupui.c:561 macenc.c:2332 macencui.c:173
-msgid "Esperanto"
-msgstr "世界语"
-
-#
-#: lookupui.c:562
-msgid "Nynorsk"
-msgstr "Nynorsk"
-
-#: lookupui.c:563
-msgid "Occitan"
-msgstr ""
-
-#
-#: lookupui.c:564
-msgid "Oji-Cree"
-msgstr "Oji-Cree"
-
-#
-#: lookupui.c:565
-msgid "Ojibway"
-msgstr "Ojibway"
-
-#
-#: lookupui.c:568
-msgid "Ossetian"
-msgstr "Ossetian"
-
-#
-#: lookupui.c:569
-msgid "Palestinian Aramaic"
-msgstr "Palestinian Aramaic"
-
-#
-#: lookupui.c:570
-msgid "Pali"
-msgstr "巴利语"
-
-#
-#: lookupui.c:571 macenc.c:2308 macencui.c:149
-msgid "Punjabi"
-msgstr "旁遮普语"
-
-#
-#: lookupui.c:572
-msgid "Palpa"
-msgstr "Palpa"
-
-#
-#: lookupui.c:574
-msgid "Polytonic Greek"
-msgstr "Polytonic Greek"
-
-#: lookupui.c:575
-msgid "Pilipino (Filipino)"
-msgstr ""
-
-#
-#: lookupui.c:576
-msgid "Palaung"
-msgstr "Palaung"
-
-#
-#: lookupui.c:578
-msgid "Provencal"
-msgstr "普罗旺斯语"
-
-#
-#: lookupui.c:579 macenc.c:2244 macencui.c:85
-msgid "Portuguese"
-msgstr "葡萄牙语"
-
-#
-#: lookupui.c:580
-msgid "Chin"
-msgstr "钦邦"
-
-#
-#: lookupui.c:581
-msgid "Rajasthani"
-msgstr "拉贾斯坦语"
-
-#
-#: lookupui.c:582
-msgid "R-Cree"
-msgstr "R-Cree"
-
-#
-#: lookupui.c:583
-msgid "Russian Buriat"
-msgstr "俄语Buriat"
-
-#
-#: lookupui.c:584
-msgid "Riang"
-msgstr "Riang"
-
-#
-#: lookupui.c:587
-msgid "Romany"
-msgstr "Romany"
-
-#
-#: lookupui.c:588
-msgid "Rusyn"
-msgstr "Rusyn"
-
-#
-#: lookupui.c:589
-msgid "Ruanda"
-msgstr "Ruanda"
-
-#
-#: lookupui.c:591
-msgid "Sadri"
-msgstr "Sadri"
-
-#
-#: lookupui.c:593
-msgid "Santali"
-msgstr "桑塔利语"
-
-#
-#: lookupui.c:594
-msgid "Sayisi"
-msgstr "Sayisi"
-
-#
-#: lookupui.c:595
-msgid "Sekota"
-msgstr "Sekota"
-
-#
-#: lookupui.c:596
-msgid "Selkup"
-msgstr "塞尔库普语"
-
-#
-#: lookupui.c:597
-msgid "Sango"
-msgstr "桑戈语"
-
-#
-#: lookupui.c:598
-msgid "Shan"
-msgstr "掸语"
-
-#
-#: lookupui.c:599
-msgid "Sibe"
-msgstr "Sibe"
-
-#
-#: lookupui.c:600
-msgid "Sidamo"
-msgstr "锡达莫语"
-
-#
-#: lookupui.c:601
-msgid "Silte Gurage"
-msgstr "Silte Gurage"
-
-#
-#: lookupui.c:602
-msgid "Skolt Sami"
-msgstr "斯高特萨莫斯语"
-
-#
-#: lookupui.c:604
-msgid "Slavey"
-msgstr "Slavey"
-
-#
-#: lookupui.c:606 macenc.c:2326 macencui.c:167
-msgid "Somali"
-msgstr "索马里语"
-
-#
-#: lookupui.c:607
-msgid "Samoan"
-msgstr "萨摩亚语"
-
-#
-#: lookupui.c:608
-msgid "Sena"
-msgstr "Sena"
-
-#
-#: lookupui.c:609 macenc.c:2300 macencui.c:141
-msgid "Sindhi"
-msgstr "信德语"
-
-#
-#: lookupui.c:611
-msgid "Soninke"
-msgstr "索宁克语"
-
-#
-#: lookupui.c:612
-msgid "Sodo Gurage"
-msgstr "Sodo Gurage"
-
-#
-#: lookupui.c:613
-msgid "Sotho"
-msgstr "Sotho"
-
-#
-#: lookupui.c:615 macenc.c:2280 macencui.c:121
-msgid "Serbian"
-msgstr "塞尔维亚语"
-
-#
-#: lookupui.c:616
-msgid "Saraiki"
-msgstr "Saraiki"
-
-#
-#: lookupui.c:617
-msgid "Serer"
-msgstr "塞雷尔语"
-
-#
-#: lookupui.c:618
-msgid "South Slavey"
-msgstr "South Slavey"
-
-#
-#: lookupui.c:619
-msgid "Southern Sami"
-msgstr "Southern Sami"
-
-#
-#: lookupui.c:620
-msgid "Suri"
-msgstr "Suri"
-
-#
-#: lookupui.c:621
-msgid "Svan"
-msgstr "Svan"
-
-#
-#: lookupui.c:623
-msgid "Swadaya Aramaic"
-msgstr "Swadaya Aramaic"
-
-#
-#: lookupui.c:624 macenc.c:2327 macencui.c:168
-msgid "Swahili"
-msgstr "斯瓦希里语"
-
-#
-#: lookupui.c:625
-msgid "Swazi"
-msgstr "Swazi"
-
-#
-#: lookupui.c:628
-msgid "Tabasaran"
-msgstr "Tabasaran"
-
-#
-#: lookupui.c:629 macenc.c:2293 macencui.c:134
-msgid "Tajiki"
-msgstr "Tajiki"
-
-#
-#: lookupui.c:631 macenc.c:2340 macencui.c:181
-msgid "Tatar"
-msgstr "塔塔尔语"
-
-#
-#: lookupui.c:632
-msgid "TH-Cree"
-msgstr "TH-Cree"
-
-#
-#: lookupui.c:634 macenc.c:2352 macencui.c:193
-msgid "Tongan"
-msgstr "东干语"
-
-#
-#: lookupui.c:635
-msgid "Tigre"
-msgstr "提格雷语"
-
-#
-#: lookupui.c:636 macenc.c:2324 macencui.c:165
-msgid "Tigrinya"
-msgstr "提格里尼亚语"
-
-#
-#: lookupui.c:638
-msgid "Tahitian"
-msgstr "塔希提语"
-
-#
-#: lookupui.c:639 macenc.c:2301 macencui.c:142
-msgid "Lang|Tibetan"
-msgstr "藏语"
-
-#
-#: lookupui.c:641
-msgid "Temne"
-msgstr "Temne"
-
-#
-#: lookupui.c:643
-msgid "Tundra Nenets"
-msgstr "Tundra Nenets"
-
-#
-#: lookupui.c:644
-msgid "Tonga"
-msgstr "汤加语"
-
-#
-#: lookupui.c:645
-msgid "Todo"
-msgstr "待做"
-
-#
-#: lookupui.c:648
-msgid "Turoyo Aramaic"
-msgstr "Turoyo Aramaic"
-
-#
-#: lookupui.c:649
-msgid "Tulu"
-msgstr "Tulu"
-
-#
-#: lookupui.c:650
-msgid "Tuvin"
-msgstr "Tuvin"
-
-#
-#: lookupui.c:651
-msgid "Twi"
-msgstr "特维语"
-
-#
-#: lookupui.c:652
-msgid "Udmurt"
-msgstr "乌德穆尔特语"
-
-#
-#: lookupui.c:654 macenc.c:2256 macencui.c:97
-msgid "Urdu"
-msgstr "乌尔都语"
-
-#
-#: lookupui.c:655
-msgid "Upper Sorbian"
-msgstr "上索布语"
-
-#
-#: lookupui.c:656
-msgid "Uyghur"
-msgstr "维吾尔语"
-
-#
-#: lookupui.c:657 macenc.c:2285 macencui.c:126
-msgid "Uzbek"
-msgstr "乌兹别克语"
-
-#
-#: lookupui.c:660
-msgid "Wa"
-msgstr "Wa"
-
-#
-#: lookupui.c:661
-msgid "Wagdi"
-msgstr "Wagdi"
-
-#
-#: lookupui.c:662
-msgid "West-Cree"
-msgstr "West-Cree"
-
-#
-#: lookupui.c:664
-msgid "Wolof"
-msgstr "沃洛夫语"
-
-#: lookupui.c:665
-msgid "Tai Lue"
-msgstr ""
-
-#
-#: lookupui.c:667
-msgid "Yakut"
-msgstr "雅库特语"
-
-#
-#: lookupui.c:669
-msgid "Y-Cree"
-msgstr "Y-Cree"
-
-#
-#: lookupui.c:670
-msgid "Yi Classic"
-msgstr "Yi Classic"
-
-#
-#: lookupui.c:671
-msgid "Yi Modern"
-msgstr "Yi Modern"
-
-#: lookupui.c:672
-msgid "Chinese Hong Kong"
-msgstr ""
-
-#
-#: lookupui.c:673
-msgid "Chinese Phonetic"
-msgstr "汉语拼音"
-
-#
-#: lookupui.c:674
-msgid "Chinese Simplified"
-msgstr "简体中文"
-
-#
-#: lookupui.c:675
-msgid "Chinese Traditional"
-msgstr "繁体中文"
-
-#
-#: lookupui.c:676
-msgid "Zande"
-msgstr "Zande"
-
-#
-#: lookupui.c:687
-msgid "Language(s)"
-msgstr "语言"
-
-#
-#: lookupui.c:692
-msgid "Script(s) & Language(s)"
-msgstr "文字与语言"
-
-#
-#: lookupui.c:812 lookupui.c:814 macenc.c:2368
-msgid "Unknown Language"
-msgstr "未知语言"
-
-#: lookupui.c:812
-#, c-format
-msgid ""
-"The language, '%s', is not in the list of known languages and will be omitted"
-msgstr ""
-
-#: lookupui.c:814
-#, c-format
-msgid ""
-"Several language tags, including '%s', are not in the list of known "
-"languages and will be omitted"
-msgstr ""
-
-#
-#: lookupui.c:823
-msgid "Language List"
-msgstr "语言列表"
-
-#: lookupui.c:841
-msgid ""
-"Select as many languages as needed\n"
-"Hold down the control key when clicking\n"
-"to make disjoint selections."
-msgstr ""
-
-#
-#: lookupui.c:899
-msgid "Language Missing"
-msgstr "缺语言"
-
-#
-#: lookupui.c:899
-msgid ""
-"You must select at least one language.\n"
-"Use the \"Default\" language if nothing else fits."
-msgstr ""
-"至少选一种语言。\n"
-"若无合适的就用默认语言。"
-
-#
-#: lookupui.c:986 lookupui.c:3535
-msgid "No scripts"
-msgstr "无文字"
-
-#
-#: lookupui.c:986
-msgid "You must select at least one script if you provide a feature tag."
-msgstr "若有特征标签，则至少选一种文字"
-
-#
-#: lookupui.c:993 lookupui.c:999 lookupui.c:1578 lookupui.c:1584
-msgid "Bad script tag"
-msgstr "不良文字标签"
-
-#: lookupui.c:993
-#, c-format
-msgid ""
-"The script tag on line %d (%s) is too long.  It may be at most 4 letters"
-msgstr ""
-
-#: lookupui.c:999
-#, c-format
-msgid "The script tag on line %d (%s) should be in ASCII.\n"
-msgstr ""
-
-#
-#: lookupui.c:1006
-msgid "No languages"
-msgstr "无语言"
-
-#
-#: lookupui.c:1006
-msgid "You must select at least one language for each script."
-msgstr "为每种文字至少选一种语言"
-
-#
-#: lookupui.c:1012 lookupui.c:1018 lookupui.c:1592 lookupui.c:1598
-msgid "Bad language tag"
-msgstr "不良语言标签"
-
-#: lookupui.c:1012 lookupui.c:1592
-#, c-format
-msgid "A language tag on line %d (%s) should be in ASCII.\n"
-msgstr ""
-
-#
-#: lookupui.c:1018 lookupui.c:1598
-#, c-format
-msgid ""
-"A language tag on line %d (%s) is too long.  It may be at most 4 letters"
-msgstr "行 %d (%s) 处语言标签太长.  最多4字母"
-
-#
-#: lookupui.c:1108
-msgid "Script(s)"
-msgstr "手写体(S)"
-
-#: lookupui.c:1126
-msgid ""
-"Each feature is active for a specific set of\n"
-"scripts and languages.\n"
-"Usually only one script is specified, but\n"
-"occasionally more will be.\n"
-"A script is a four letter OpenType script tag\n"
-msgstr ""
-
-#
-#: lookupui.c:1178 lookupui.c:1950
-msgid "OpenTypeFeature|New"
-msgstr "新建"
-
-#
-#: lookupui.c:1499
-msgid "You must choose a lookup type"
-msgstr "应选一种查找类型"
-
-#
-#: lookupui.c:1552
-msgid "No Lookup Type Selected"
-msgstr "未选中查找类型"
-
-#
-#: lookupui.c:1552
-msgid "You must select a Lookup Type."
-msgstr "至少选一种查找类型"
-
-#
-#: lookupui.c:1556
-msgid "Unnamed lookup"
-msgstr "无命名查找"
-
-#
-#: lookupui.c:1556
-msgid "You must name the lookup."
-msgstr "您必须命名此次查找。"
-
-#
-#: lookupui.c:1563 lookupui.c:1569
-msgid "Bad feature tag"
-msgstr "不良特征标签"
-
-#: lookupui.c:1563
-#, c-format
-msgid ""
-"The feature tag on line %d (%s) is too long.  It may be at most 4 letters "
-"(or it could be a mac feature setting, two numbers in brokets <3,4>)"
-msgstr ""
-
-#: lookupui.c:1569
-#, c-format
-msgid "The feature tag on line %d (%s) should be in ASCII.\n"
-msgstr ""
-
-#: lookupui.c:1578
-#, c-format
-msgid "A script tag on line %d (%s) should be in ASCII.\n"
-msgstr ""
-
-#: lookupui.c:1584
-#, c-format
-msgid ""
-"A script tag on line %d (%s) is too long.  It may be at most 4 letters"
-msgstr ""
-
-#
-#: lookupui.c:1614
-msgid "Lookup name already used"
-msgstr "查找已使用"
-
-#: lookupui.c:1614
-msgid ""
-"This name has already been used for another lookup.\n"
-"Lookup names must be unique."
-msgstr ""
-
-#
-#: lookupui.c:1706
-msgid "Lookup"
-msgstr "查找"
-
-#: lookupui.c:1735
-msgid ""
-"Each lookup may contain many transformations,\n"
-"but each transformation must be of the same type."
-msgstr ""
-
-#: lookupui.c:1762
-msgid ""
-"Most lookups will be attached to a feature\n"
-"active in a specific script for certain languages.\n"
-"In some cases lookups will not be attached to any\n"
-"feature, but will be invoked by another lookup,\n"
-"a conditional one. In other cases a lookup might\n"
-"be attached to several features.\n"
-"A feature is either a four letter OpenType feature\n"
-"tag, or a two number mac <feature,setting> combination."
-msgstr ""
-
-#
-#: lookupui.c:1776 statemachine.c:1381
-msgid "Right To Left"
-msgstr "自右至左"
-
-#
-#: lookupui.c:1785
-msgid "Ignore Base Glyphs"
-msgstr "忽略基本字形"
-
-#
-#: lookupui.c:1794
-msgid "Ignore Ligatures"
-msgstr "忽略连字"
-
-#
-#: lookupui.c:1803
-msgid "Ignore Combining Marks"
-msgstr "忽略组合标记"
-
-#. GT: Process is a verb here and Mark is a noun.
-#. GT: Marks of the given mark class are to be processed
-#: lookupui.c:1812
-msgid "Mark Class:"
-msgstr ""
-
-#. GT: Mark is a noun here and Set is also a noun.
-#: lookupui.c:1832
-msgid "Mark Set:"
-msgstr ""
-
-#
-#: lookupui.c:1862
-msgid "Lookup Name:"
-msgstr "查找:"
-
-#
-#: lookupui.c:1894
-msgid "Store ligature data in AFM files"
-msgstr "存储连写信息于 AFM 文件"
-
-#
-#: lookupui.c:2062 lookupui.c:2103
-msgid "Name in use"
-msgstr "正使用"
-
-#: lookupui.c:2062 lookupui.c:2103
-#, c-format
-msgid ""
-"The name, %.80s, has already been used to identify an anchor class in a "
-"different lookup subtable (%.80s)"
-msgstr ""
-
-#: lookupui.c:2093
-msgid "Name used twice"
-msgstr ""
-
-#: lookupui.c:2093
-#, c-format
-msgid ""
-"The name, %.80s, appears twice in this list.\n"
-"Each anchor class must have a distinct name."
-msgstr ""
-
-#
-#: lookupui.c:2120
-msgid "Remove Anchor Class?"
-msgstr "移除锚点类属？"
-
-#: lookupui.c:2120
-#, c-format
-msgid ""
-"Do you really want to remove the anchor class, %.80s?\n"
-"This will remove all anchor points associated with that class."
-msgstr ""
-
-#
-#: lookupui.c:2195
-msgid "Anchor Class Name"
-msgstr "锚点类属名"
-
-#
-#: lookupui.c:2258
-#, c-format
-msgid "Anchor classes in subtable %.80s"
-msgstr "锚类属于替代表 %.80s"
-
-#
-#: lookupui.c:2329
-msgid "New Anchor Class"
-msgstr "新锚点类属"
-
-#
-#: lookupui.c:2545 lookupui.c:2555 lookupui.c:2573 lookupui.c:2623
-msgid "Base Glyph Name"
-msgstr "基本字形名称"
-
-#
-#: lookupui.c:2550
-msgid "Ligature Glyph Name"
-msgstr "连字符名称"
-
-#
-#: lookupui.c:2589 lookupui.c:2631
-msgid "First Glyph Name"
-msgstr "首字形名称"
-
-#: lookupui.c:3535
-msgid ""
-"There are no scripts bound to features bound to this lookup. So nothing "
-"happens."
-msgstr ""
-
-#
-#: lookupui.c:3701
-#, c-format
-msgid "There is no glyph named %s in the font"
-msgstr "字体中无字形 %s"
-
-#
-#: lookupui.c:3713
-#, c-format
-msgid "You must specify a replacement glyph for %s"
-msgstr "应为 %s 指定替换字形"
-
-#: lookupui.c:3726
-#, c-format
-msgid ""
-"For glyph %.60s you refer to a glyph named %.80s, which is not in the font "
-"yet. Was this intentional?"
-msgstr ""
-
-#
-#: lookupui.c:3748 lookupui.c:3753
-msgid "Duplicate data"
-msgstr "复制数据"
-
-#
-#: lookupui.c:3748
-#, c-format
-msgid "There are two entries for the same glyph set (%.80s and %.80s)"
-msgstr "字形集 (%.80s and %.80s)有两个入口"
-
-#
-#: lookupui.c:3753
-#, c-format
-msgid "There are two entries for the same glyph (%.80s)"
-msgstr "同一字形 (%.80s)有两个入口"
-
-#
-#: lookupui.c:4193
-#, c-format
-msgid "Lookup Subtable, %s"
-msgstr "查找替代表, %s"
-
-#
-#: lookupui.c:4208
-msgid "_Alphabetic"
-msgstr "字母表(_A)"
-
-#
-#: lookupui.c:4214
-msgid "Sort this display based on the alphabetic name of the glyph"
-msgstr "字形按名称的字母顺序排列"
-
-#
-#: lookupui.c:4226
-msgid "Sort this display based on the unicode code of the glyph"
-msgstr "字形按统一码排序"
-
-#
-#: lookupui.c:4232
-msgid "_By Base Char"
-msgstr "按基本字符(_B)"
-
-#: lookupui.c:4238
-msgid ""
-"Sort first using the base glyph (if any).\n"
-"Thus Agrave would sort with A"
-msgstr ""
-
-#
-#: lookupui.c:4244
-msgid "By _Scripts"
-msgstr "按手写体(_S)"
-
-#: lookupui.c:4250
-msgid ""
-"Sort first using the glyph's script.\n"
-"Thus A and Z would sort together\n"
-"while Alpha would sort with Omega and not A"
-msgstr ""
-
-#: lookupui.c:4273
-msgid ""
-"Don't display columns of 0s.\n"
-"The OpenType lookup allows for up to 8 kinds\n"
-"of data, but almost all lookups will use just one or two.\n"
-"Omitting the others makes the behavior clearer."
-msgstr ""
-
-#
-#: lookupui.c:4290
-msgid "_Populate"
-msgstr "增加(_P)"
-
-#: lookupui.c:4292
-msgid "Auto_Kern"
-msgstr ""
-
-#: lookupui.c:4302
-msgid ""
-"For each script to which this lookup applies, look at all pairs of\n"
-"glyphs in that script and try to guess a reasonable kerning value\n"
-"for that pair."
-msgstr ""
-
-#: lookupui.c:4307
-msgid ""
-"Add entries for all glyphs in the scripts to which this lookup applies.\n"
-"When FontForge can find a default value it will add that too."
-msgstr ""
-
-#
-#: lookupui.c:4312
-msgid "_Add Selected"
-msgstr "添加选中项(_A)"
-
-#: lookupui.c:4314
-msgid "_AutoKern Selected"
-msgstr ""
-
-#: lookupui.c:4323
-msgid "Add kerning info between all pairs of selected glyphs"
-msgstr ""
-
-#: lookupui.c:4326
-msgid "Add entries for all selected glyphs."
-msgstr "为选中的字形添加入口。"
-
-#
-#: lookupui.c:4331
-msgid "_Remove Empty"
-msgstr "移除空缺(_R)"
-
-#: lookupui.c:4338
-msgid "Remove all \"empty\" entries -- those where all fields are 0"
-msgstr ""
-
-#: lookupui.c:4339
-msgid "Remove all \"empty\" entries -- entries with no second glyph"
-msgstr ""
-
-#: lookupui.c:4340
-msgid "Remove all \"empty\" entries -- those with no source glyphs"
-msgstr ""
-
-#: lookupui.c:4341
-msgid "Remove all \"empty\" entries -- those with no replacement glyphs"
-msgstr ""
-
-#: lookupui.c:4345
-msgid "Remove All"
-msgstr ""
-
-#: lookupui.c:4351
-msgid "Remove all entries."
-msgstr ""
-
-#
-#: lookupui.c:4356
-msgid "_Default Using Suffix:"
-msgstr "默认使用后缀(_D):"
-
-#: lookupui.c:4363
-msgid ""
-"Add entries to the lookup based on the following suffix.\n"
-"So if the suffix is set to \"superior\" and the font\n"
-"contains glyphs named \"A\" and \"A.superior\" (and the\n"
-"lookup applies to the latin script), then FontForge will\n"
-"add an entry mapping \"A\" -> \"A.superior\"."
-msgstr ""
-
-#: lookupui.c:4387
-msgid "_Default New Entries to First"
-msgstr "默认新条目在第一(_D)"
-
-#: lookupui.c:4395
-msgid ""
-"When adding new entries, give them the same\n"
-"delta values as those on the first line."
-msgstr ""
-
-#: lookupui.c:4497 lookupui.c:5425
-msgid "When adding new entries provide default kerning values."
-msgstr ""
-
-#
-#: lookupui.c:4685
-msgid "Please name this subtable"
-msgstr "请为此子表命名"
-
-#
-#: lookupui.c:4691
-msgid "Duplicate name"
-msgstr "复制名称"
-
-#
-#: lookupui.c:4691
-msgid "There is already a subtable with that name, please pick another."
-msgstr "已有同名子表，请选择另一个。"
-
-#
-#: lookupui.c:4757
-msgid "No Subtable"
-msgstr "无替代表"
-
-#
-#: lookupui.c:4856
-msgid "Create a new lookup"
-msgstr "新查找"
-
-#
-#: lookupui.c:4858 lookupui.c:4859
-msgid "Add a subtable to which lookup?"
-msgstr "添加替代表到哪个查询？"
-
-#: lookupui.c:5009
-msgid "Select glyphs for the first part of the kern pair"
-msgstr ""
-
-#: lookupui.c:5012
-msgid "Select glyphs for the second part of the kern pair"
-msgstr ""
-
-#: lookupui.c:5094
-msgid "No selection"
-msgstr ""
-
-#: lookupui.c:5094
-msgid ""
-"Please select some glyphs in the font views at the bottom of the dialog for "
-"FontForge to put into classes."
-msgstr ""
-
-#: lookupui.c:5130
-msgid "Intra Class Distance"
-msgstr ""
-
-#
-#: lookupui.c:5225 lookupui.c:5551
-msgid "Kerning format"
-msgstr "压缩格式"
-
-#: lookupui.c:5250
-msgid "Use individual kerning pairs"
-msgstr ""
-
-#: lookupui.c:5256
-msgid ""
-"In this format you specify every kerning pair in which\n"
-"you are interested in."
-msgstr ""
-
-#: lookupui.c:5263
-msgid "Use a matrix of kerning classes"
-msgstr ""
-
-#: lookupui.c:5269
-msgid ""
-"In this format you define a series of glyph classes and\n"
-"specify a matix showing how each class interacts with all\n"
-"the others."
-msgstr ""
-
-#: lookupui.c:5277
-msgid "FontForge will guess kerning classes for selected glyphs"
-msgstr ""
-
-#: lookupui.c:5283
-msgid ""
-"FontForge will look at the glyphs selected in the font view\n"
-"and will try to find groups of glyphs which are most alike\n"
-"and generate kerning classes based on that information."
-msgstr ""
-
-#: lookupui.c:5294
-msgid "Intra Class Distance:"
-msgstr ""
-
-#: lookupui.c:5301
-msgid ""
-"This is roughly (very roughly) the number off em-units\n"
-"of error that two glyphs may have to belong in the same\n"
-"class. This error is taken by comparing the two glyphs\n"
-"to all other glyphs and summing the differences.\n"
-"A small number here (like 2) means lots of small classes,\n"
-"while a larger number (like 20) will mean fewer classes,\n"
-"each with more glyphs."
-msgstr ""
-
-#
-#: lookupui.c:5549
-msgid "_Pairs"
-msgstr "对(_P)"
-
-#
-#: lookupui.c:5549
-msgid "C_lasses"
-msgstr "类属(_L)"
-
-#: lookupui.c:5551
-msgid ""
-"Kerning may be specified either by classes of glyphs\n"
-"or by pairwise combinatins of individual glyphs.\n"
-"Which do you want for this subtable?"
-msgstr ""
-
-#: lookupui.c:5709
-msgid "No Script Tag"
-msgstr ""
-
-#: lookupui.c:5709 lookupui.c:5716
-msgid "Please specify a 4 letter opentype script tag"
-msgstr ""
-
-#: lookupui.c:5716
-msgid "Script Tag too long"
-msgstr ""
-
-#: lookupui.c:5724
-msgid "Invalid language"
-msgstr ""
-
-#: lookupui.c:5724
-msgid ""
-"Please specify a comma separated list of 4 letter opentype language tags"
-msgstr ""
-
-#: lookupui.c:5839
-msgid "Add Language(s) to Script"
-msgstr ""
-
-#: lookupui.c:5839
-msgid "Remove Language(s) from Script"
-msgstr ""
-
-#: lookupui.c:5848
-msgid "Script Tag:"
-msgstr ""
-
-#: lookupui.c:5863
-msgid "Language Tag:"
-msgstr ""
-
-#
-#: lookupui.c:5969
-msgid "No Start Glyph"
-msgstr "无起始字形"
-
-#: lookupui.c:5969
-#, c-format
-msgid "The encoding does not contain something named %.40s"
-msgstr "编码中不包含有名为 %.40s的东西"
-
-#
-#: lookupui.c:5975
-msgid "Not enough glyphs"
-msgstr "无足够字形"
-
-#: lookupui.c:5975
-msgid ""
-"There aren't enough glyphs in the encoding to name all the selected "
-"characters"
-msgstr ""
-
-#
-#: lookupui.c:5979
-msgid "Bad selection"
-msgstr "不良选择"
-
-#: lookupui.c:5979
-msgid ""
-"You may not rename any of the base glyphs, but your selection overlaps the "
-"set of base glyphs."
-msgstr ""
-
-#: lookupui.c:5992
-msgid "Can't specify a subtable here"
-msgstr "不能指定替代表"
-
-#: lookupui.c:5992
-msgid ""
-"As the selected glyphs are also source glyphs, they will be renamed, so they "
-"can't act as source glyphs for a lookup."
-msgstr ""
-
-#
-#: lookupui.c:5998
-msgid "Missing suffix"
-msgstr "遗失后缀"
-
-#: lookupui.c:5998
-msgid "If you don't specify a suffix, the glyphs don't get renamed."
-msgstr ""
-
-#
-#: lookupui.c:6159
-msgid "Mass Glyph Rename"
-msgstr "批量字形重命名"
-
-#
-#: lookupui.c:6168
-msgid "Rename all glyphs in the selection"
-msgstr "重命名选中的字形"
-
-#: lookupui.c:6176
-msgid "By appending the suffix:"
-msgstr "添加后缀:"
-
-#: lookupui.c:6190
-msgid "To their own names"
-msgstr "到它们自己的名称"
-
-#
-#: lookupui.c:6199
-msgid "To the glyph names starting at:"
-msgstr "到字形名称始于:"
-
-#: lookupui.c:6204 lookupui.c:6211
-msgid ""
-"So if you type \"A\" here the first selected glyph would be named "
-"\"A.suffix\".\n"
-"The second \"B.suffix\", and so on."
-msgstr ""
-
-#: lookupui.c:6215
-msgid "If one of those glyphs already has a suffix"
-msgstr ""
-
-#: lookupui.c:6223
-msgid "Append to it"
-msgstr "添加到它"
-
-#
-#: lookupui.c:6231
-msgid "Replace it"
-msgstr "替换它"
-
-#: lookupui.c:6240
-msgid "Optionally, add this mapping to the lookup subtable:"
-msgstr ""
-
-#: macbinary.c:693
-#, c-format
-msgid "Warning: %s(%s) is both extended and condensed. That's impossible.\n"
-msgstr ""
-
-#: macbinary.c:696
-msgid "Warning: Both extended and condensed. That's impossible.\n"
-msgstr ""
-
-#: macbinary.c:871 macbinary.c:1223
-msgid "The generated font won't work with ATM"
-msgstr ""
-
-#: macbinary.c:871 macbinary.c:1223
-msgid ""
-"ATM requires that fonts be encoded with the Macintosh Latin encoding. This "
-"postscript font will print fine, but only the bitmap versions will be "
-"displayed on the screen"
-msgstr ""
-
-#
-#: macbinary.c:1983
-msgid "Can't open temporary file for postscript output\n"
-msgstr "不能打开临时文件以供postscript输出\n"
-
-#
-#: macbinary.c:2003
-#, c-format
-msgid "Missing POST resource %u\n"
-msgstr "缺少 POST 资源 %u\n"
-
-#
-#: macbinary.c:2039
-msgid "Out of memory\n"
-msgstr "内存不足\n"
-
-#
-#: macbinary.c:2133 macbinary.c:2625 parsepdf.c:2076 parsettf.c:621 svg.c:1298
-msgid "Not in Collection"
-msgstr "不在集中"
-
-#
-#: macbinary.c:2133 macbinary.c:2625 parsepdf.c:2076 svg.c:1298
-#, c-format
-msgid "%s is not in %.100s"
-msgstr "%s 不在 %.100s"
-
-#
-#: macbinary.c:2140 macbinary.c:2634 parsepdf.c:2088 parsettf.c:632
-#: parsettf.c:655 parsettf.c:5505 svg.c:1305
-msgid "Pick a font, any font..."
-msgstr "选择一个字体，任何字体..."
-
-#: macbinary.c:2140 macbinary.c:2635 parsepdf.c:2088 parsettf.c:632
-#: parsettf.c:656 svg.c:1305
-msgid "There are multiple fonts in this file, pick one"
-msgstr ""
-
-#
-#: macbinary.c:2162
-msgid "Can't open temporary file for truetype output.\n"
-msgstr "不能打开临时文件以供truetype输出\n"
-
-#
-#: macbinary.c:2750
-#, c-format
-msgid "No kerning table for %s\n"
-msgstr "无对应 %s的缩合表\n"
-
-#
-#: macbinary.c:3007
-msgid "can't create temporary file\n"
-msgstr "不能创建临时文件\n"
-
-#
-#: macbinary.c:3168
-#, c-format
-msgid "Couldn't find a font file named %s\n"
-msgstr "未找到字体文件 %s\n"
-
-#: macbinary.c:3170
-#, c-format
-msgid ""
-"%s is a mac resource file but contains no postscript or truetype fonts\n"
-msgstr ""
-
-#
-#: macenc.c:2266 macencui.c:107
-msgid "Faroese (Icelandic)"
-msgstr "Faroese(冰岛语)"
-
-#
-#. GT: See the long comment at "Property|New"
-#. GT: The msgstr should contain a translation of "Farsi/Persian"), ignore "Lang|"
-#. GT: See the long comment at "Property|New"
-#. GT: The msgstr should contain a translation of "Farsi/Persian", ignore "Lang|"
-#: macenc.c:2269 macencui.c:110
-msgid "Lang|Farsi/Persian"
-msgstr "波斯文"
-
-#
-#: macenc.c:2273 macencui.c:114
-msgid "Irish Gaelic"
-msgstr "盖尔语(爱尔兰)"
-
-#
-#: macenc.c:2287 macencui.c:128
-msgid "Axerbaijani (Cyrillic)"
-msgstr "阿塞拜疆语(西里尔字母)"
-
-#
-#: macenc.c:2288 macencui.c:129
-msgid "Axerbaijani (Arabic)"
-msgstr "阿塞拜疆语(阿拉伯字母)"
-
-#
-#: macenc.c:2296 macencui.c:137
-msgid "Mongolian (cyrillic)"
-msgstr "蒙古语 (西里尔字母)"
-
-#
-#: macenc.c:2321 macencui.c:162
-msgid "Malay (roman)"
-msgstr "Malay (罗马字母)"
-
-#
-#: macenc.c:2322 macencui.c:163
-msgid "Malay (arabic)"
-msgstr "Malay (阿拉伯字母)"
-
-#
-#: macenc.c:2325 macencui.c:166
-msgid "Galla"
-msgstr "盖拉语"
-
-#
-#: macenc.c:2328 macencui.c:169
-msgid "Kinyarwanda/Ruanda"
-msgstr "卢旺达"
-
-#
-#: macenc.c:2329 macencui.c:170
-msgid "Rundi"
-msgstr "隆迪语"
-
-#
-#: macenc.c:2330 macencui.c:171
-msgid "Nyanja/Chewa"
-msgstr "尼扬贾语"
-
-#
-#: macenc.c:2337 macencui.c:178
-msgid "Quechua"
-msgstr "盖丘亚语"
-
-#
-#: macenc.c:2343 macencui.c:184
-msgid "Javanese (roman)"
-msgstr "Javanese (罗马字母)"
-
-#
-#: macenc.c:2344 macencui.c:185
-msgid "Sundanese (roman)"
-msgstr "Sundanese (罗马字母)"
-
-#
-#: macenc.c:2349 macencui.c:190
-msgid "Scottish Gaelic"
-msgstr "苏格兰盖尔语"
-
-#
-#: macenc.c:2351 macencui.c:192
-msgid "Irish Gaelic (with dot)"
-msgstr "爱尔兰盖尔语 (有修饰点)"
-
-#
-#: macenc.c:2353 macencui.c:194
-msgid "Greek (polytonic)"
-msgstr "Polytonic 希腊语"
-
-#
-#: macenc.c:2355 macencui.c:196
-msgid "Azebaijani (roman)"
-msgstr "阿塞拜疆语(罗马字母)"
-
-#
-#: macenc.c:2362
-msgid "Unspecified Language"
-msgstr "未知语言"
-
-#
-#: macencui.c:365
-msgid "Bad Language"
-msgstr "不良语言"
-
-#
-#: macencui.c:382 macencui.c:1031
-msgid "This feature code is already used"
-msgstr "此特征代码已使用"
-
-#
-#: macencui.c:451 macencui.c:808 prefs.c:1469
-msgid "Setting"
-msgstr "设定"
-
-#
-#: macencui.c:461
-msgid "_Language:"
-msgstr "语言(_L):"
-
-#
-#: macencui.c:485 macencui.c:843 macencui.c:1143
-msgid "_Name:"
-msgstr "名称(_N):"
-
-#
-#: macencui.c:652
-msgid "MacName|_New..."
-msgstr "新建(_N)…"
-
-#
-#: macencui.c:731
-msgid "This setting is already used"
-msgstr "设置已被采用"
-
-#
-#: macencui.c:818
-msgid "Setting Id:"
-msgstr "设置编号:"
-
-#
-#: macencui.c:834
-msgid "_Enabled"
-msgstr "已启用(_E)"
-
-#
-#: macencui.c:1119
-msgid "Feature _Id:"
-msgstr "特征标识(_I):"
-
-#
-#: macencui.c:1135
-msgid "Mutually Exclusive"
-msgstr "互相排斥"
-
-#
-#: macencui.c:1153
-msgid "Settings"
-msgstr "设置"
-
-#
-#: macencui.c:1171
-msgid "MacSetting|_New..."
-msgstr "新建(_N)..."
-
-#
-#: macencui.c:1363
-msgid "MacFeature|_New..."
-msgstr "新建(_N)..."
-
-#
-#: macencui.c:1399
-msgid "MacFeature|Default"
-msgstr "默认"
-
-#
-#: math.c:38
-msgid "Constants"
-msgstr "常数"
-
-#
-#: math.c:39
-msgid "Sub/Superscript"
-msgstr "上标"
-
-#: math.c:40
-msgid "Limits"
-msgstr "限制"
-
-#
-#: math.c:41
-msgid "Stacks"
-msgstr "堆栈"
-
-#
-#: math.c:42
-msgid "Fractions"
-msgstr "比例"
-
-#: math.c:43
-msgid "Over/Underbars"
-msgstr "上/下线条"
-
-#
-#: math.c:44
-msgid "Radicals"
-msgstr "部首"
-
-#
-#: math.c:45
-msgid "Connectors"
-msgstr "连接"
-
-#: math.c:79
-msgid "Top Accent Horiz. Pos"
-msgstr "上重音符号水平位置"
-
-#: math.c:88
-msgid "Pre-Built Larger Variants"
-msgstr "预设较大变量"
-
-#. GT: Italic correction
-#: math.c:95
-msgid "I.C."
-msgstr "倾斜修正"
-
-#
-#: math.c:99
-msgid "Parts List"
-msgstr "部件列表"
-
-#
-#: math.c:105
-msgid "Height/Kern Data"
-msgstr "高度/缩合信息"
-
-#
-#: math.c:135
-msgid "Kern"
-msgstr "压缩"
-
-#
-#: math.c:137
-msgid "Height Adjusts"
-msgstr "高度调整"
-
-#
-#: math.c:138
-msgid "Kern Adjusts"
-msgstr "压缩调整"
-
-#: math.c:156
-msgid "Exten Shapes"
-msgstr "扩展形状"
-
-#
-#: math.c:158
-msgid "Top Accent"
-msgstr "顶部重音符"
-
-#
-#: math.c:159
-msgid "Math Kern"
-msgstr "数学压缩"
-
-#
-#: math.c:161
-msgid "Vert. Construction"
-msgstr "垂直构建"
-
-#
-#: math.c:162
-msgid "Hor. Variants"
-msgstr "水平变形"
-
-#
-#: math.c:163
-msgid "Hor. Construction"
-msgstr "水平构建"
-
-#
-#: math.c:168
-msgid "Top Right"
-msgstr "右上"
-
-#
-#: math.c:169
-msgid "Top Left"
-msgstr "正上"
-
-#
-#: math.c:170
-msgid "Bottom Right"
-msgstr "右下"
-
-#: math.c:171
-msgid "Bottom Left"
-msgstr ""
-
-#
-#: math.c:780
-msgid "Glyph Construction"
-msgstr "字形构建"
-
-#
-#: math.c:895 math.c:919 math.c:1659
-msgid "Bad device table"
-msgstr "不良设备表"
-
-#: math.c:895
-#, c-format
-msgid "Bad device table for %s"
-msgstr "不良设备表%s"
-
-#
-#: math.c:911
-msgid "Missing Glyph"
-msgstr "缺字形"
-
-#
-#: math.c:911
-#, c-format
-msgid "There is no glyph named %s (used in %s)"
-msgstr "字体中无字形 %s(用于%s)"
-
-#: math.c:919
-#, c-format
-msgid "Bad device table for glyph %s in %s"
-msgstr ""
-
-#
-#: math.c:927
-msgid "Bad Parts List"
-msgstr "不良部件列表"
-
-#: math.c:927
-#, c-format
-msgid "Bad parts list for glyph %s in %s"
-msgstr ""
-
-#
-#: math.c:934
-msgid "Bad Variants List"
-msgstr "不良变形列表"
-
-#: math.c:934
-#, c-format
-msgid "Bad Variants list for glyph %s in %s"
-msgstr ""
-
-#
-#: math.c:1082
-msgid "MATH table"
-msgstr "数学表"
-
-#: math.c:1659
-#, c-format
-msgid "Bad device table for in row %d of %s"
-msgstr ""
-
-#: math.c:1848
-msgid "TopRight"
-msgstr ""
-
-#: math.c:1849
-msgid "TopLeft"
-msgstr ""
-
-#: math.c:1850
-msgid "BottomRight"
-msgstr ""
-
-#: math.c:1851
-msgid "BottomLeft"
-msgstr ""
-
-#: math.c:1978
-msgid "Graphical"
-msgstr "图形的"
-
-#: math.c:1982
-msgid "Textual"
-msgstr "文本性"
-
-#
-#: mathconstants.c:46
-msgid "ScriptPercentScaleDown:"
-msgstr "文字缩小比例:"
-
-#: mathconstants.c:46
-msgid "Percentage scale down for script level 1"
-msgstr ""
-
-#: mathconstants.c:47
-msgid "ScriptScriptPercentScaleDown:"
-msgstr ""
-
-#: mathconstants.c:47
-msgid "Percentage scale down for script level 2"
-msgstr ""
-
-#: mathconstants.c:48
-msgid "DelimitedSubFormulaMinHeight:"
-msgstr ""
-
-#: mathconstants.c:48
-msgid ""
-"Minimum height at which to treat a delimited\n"
-"expression as a subformula"
-msgstr ""
-
-#: mathconstants.c:49
-msgid "DisplayOperatorMinHeight:"
-msgstr ""
-
-#: mathconstants.c:49
-msgid "Minimum height of n-ary operators (integration, summation, etc.)"
-msgstr ""
-
-#
-#: mathconstants.c:50
-msgid "MathLeading:"
-msgstr "数学边位："
-
-#: mathconstants.c:50
-msgid ""
-"White space to be left between math formulae\n"
-"to ensure proper line spacing."
-msgstr ""
-
-#
-#: mathconstants.c:51
-msgid "AxisHeight:"
-msgstr "轴高:"
-
-#: mathconstants.c:51
-msgid "Axis height of the font"
-msgstr "字体数轴高："
-
-#: mathconstants.c:52
-msgid "AccentBaseHeight:"
-msgstr "上升部高:"
-
-#: mathconstants.c:52
-msgid ""
-"Maximum (ink) height of accent base that\n"
-"does not require raising the accents."
-msgstr ""
-
-#: mathconstants.c:53
-msgid "FlattenedAccentBaseHeight:"
-msgstr ""
-
-#: mathconstants.c:53
-msgid ""
-"Maximum (ink) height of accent base that\n"
-"does not require flattening the accents."
-msgstr ""
-
-#
-#: mathconstants.c:54
-msgid "SubscriptShiftDown:"
-msgstr "下标下沉："
-
-#: mathconstants.c:54
-msgid ""
-"The standard shift down applied to subscript elements.\n"
-"Positive for moving downward."
-msgstr ""
-
-#
-#: mathconstants.c:55
-msgid "SubscriptTopMax:"
-msgstr "下标上限："
-
-#: mathconstants.c:55
-msgid ""
-"Maximum height of the (ink) top of subscripts\n"
-"that does not require moving\n"
-"ubscripts further down."
-msgstr ""
-
-#
-#: mathconstants.c:56
-msgid "SubscriptBaselineDropMin:"
-msgstr "下标基线下沉最小值："
-
-#: mathconstants.c:56
-msgid ""
-"Maximum allowed drop of the baseline of\n"
-"subscripts realtive to the bottom of the base.\n"
-"Used for bases that are treated as a box\n"
-"or extended shape. Positive for subscript\n"
-"baseline dropped below base bottom."
-msgstr ""
-
-#
-#: mathconstants.c:57
-msgid "SuperscriptShiftUp:"
-msgstr "上标上升:"
-
-#: mathconstants.c:57
-msgid "Standard shift up applied to superscript elements."
-msgstr ""
-
-#: mathconstants.c:58
-msgid "SuperscriptShiftUpCramped:"
-msgstr ""
-
-#: mathconstants.c:58
-msgid ""
-"Standard shift of superscript relative\n"
-"to base in cramped mode."
-msgstr ""
-
-#
-#: mathconstants.c:59
-msgid "SuperscriptBottomMin:"
-msgstr "上标底端最小值："
-
-#: mathconstants.c:59
-msgid ""
-"Minimum allowed hieght of the bottom\n"
-"of superscripts that does not require moving\n"
-"them further up."
-msgstr ""
-
-#
-#: mathconstants.c:60
-msgid "SuperscriptBaselineDropMax:"
-msgstr "上标基线下降最大值："
-
-#: mathconstants.c:60
-msgid ""
-"Maximum allowed drop of the baseline of\n"
-"superscripts realtive to the top of the base.\n"
-"Used for bases that are treated as a box\n"
-"or extended shape. Positive for superscript\n"
-"baseline below base top."
-msgstr ""
-
-#
-#: mathconstants.c:61
-msgid "SubSuperscriptGapMin:"
-msgstr "上标间隙最小值:"
-
-#: mathconstants.c:61
-msgid "Minimum gap between the supersecript and subscript ink."
-msgstr ""
-
-#: mathconstants.c:62
-msgid "SuperscriptBottomMaxWithSubscript:"
-msgstr ""
-
-#: mathconstants.c:62
-msgid ""
-"The maximum level to which the (ink) bottom\n"
-"of superscript can be pushed to increase the\n"
-"gap between superscript and subscript, before\n"
-"subscript starts being moved down."
-msgstr ""
-
-#
-#: mathconstants.c:63
-msgid "SpaceAfterScript:"
-msgstr "字符间距:"
-
-#: mathconstants.c:63
-msgid ""
-"Extra white space to be added after each\n"
-"ub/superscript."
-msgstr ""
-
-#: mathconstants.c:64
-msgid "UpperLimitGapMin:"
-msgstr ""
-
-#: mathconstants.c:64
-msgid ""
-"Minimum gap between the bottom of the\n"
-"upper limit, and the top of the base operator."
-msgstr ""
-
-#: mathconstants.c:65
-msgid "UpperLimitBaselineRiseMin:"
-msgstr ""
-
-#: mathconstants.c:65
-msgid ""
-"Minimum distance between the baseline of an upper\n"
-"limit and the bottom of the base operator."
-msgstr ""
-
-#: mathconstants.c:66
-msgid "LowerLimitGapMin:"
-msgstr ""
-
-#: mathconstants.c:66
-msgid ""
-"Minimum gap between (ink) top of the lower limit,\n"
-"and (ink) bottom of the base operator."
-msgstr ""
-
-#: mathconstants.c:67
-msgid "LowerLimitBaselineDropMin:"
-msgstr ""
-
-#: mathconstants.c:67
-msgid ""
-"Minimum distance between the baseline of the\n"
-"lower limit and bottom of the base operator."
-msgstr ""
-
-#: mathconstants.c:68
-msgid "StackTopShiftUp:"
-msgstr ""
-
-#: mathconstants.c:68
-msgid "Standard shift up applied to the top element of a stack."
-msgstr ""
-
-#: mathconstants.c:69
-msgid "StackTopDisplayStyleShiftUp:"
-msgstr ""
-
-#: mathconstants.c:69
-msgid ""
-"Standard shift up applied to the top element of\n"
-"a stack in display style."
-msgstr ""
-
-#: mathconstants.c:70
-msgid "StackBottomShiftDown:"
-msgstr ""
-
-#: mathconstants.c:70
-msgid ""
-"Standard shift down applied to the bottom element of a stack.\n"
-"Positive values indicate downward motion."
-msgstr ""
-
-#: mathconstants.c:71
-msgid "StackBottomDisplayStyleShiftDown:"
-msgstr ""
-
-#: mathconstants.c:71
-msgid ""
-"Standard shift down applied to the bottom\n"
-"element of a stack in display style.\n"
-"Positive values indicate downward motion."
-msgstr ""
-
-#: mathconstants.c:72
-msgid "StackGapMin:"
-msgstr ""
-
-#: mathconstants.c:72
-msgid ""
-"Minimum gap between bottom of the top\n"
-"element of a stack, and the top of the bottom element."
-msgstr ""
-
-#: mathconstants.c:73
-msgid "StackDisplayStyleGapMin:"
-msgstr ""
-
-#: mathconstants.c:73
-msgid ""
-"Minimum gap between bottom of the top\n"
-"element of a stack and the top of the bottom\n"
-"element in display style."
-msgstr ""
-
-#: mathconstants.c:74
-msgid "StretchStackTopShiftUp:"
-msgstr ""
-
-#: mathconstants.c:74
-msgid "Standard shift up applied to the top element of the stretch stack."
-msgstr ""
-
-#: mathconstants.c:75
-msgid "StretchStackBottomShiftDown:"
-msgstr ""
-
-#: mathconstants.c:75
-msgid ""
-"Standard shift down applied to the bottom\n"
-"element of the stretch stack.\n"
-"Positive values indicate downward motion."
-msgstr ""
-
-#: mathconstants.c:76
-msgid "StretchStackGapAboveMin:"
-msgstr ""
-
-#: mathconstants.c:76
-msgid ""
-"Minimum gap between the ink of the stretched\n"
-"element and the ink bottom of the element\n"
-"above.."
-msgstr ""
-
-#: mathconstants.c:77
-msgid "StretchStackGapBelowMin:"
-msgstr ""
-
-#: mathconstants.c:77
-msgid ""
-"Minimum gap between the ink of the stretched\n"
-"element and the ink top of the element below."
-msgstr ""
-
-#: mathconstants.c:78
-msgid "FractionNumeratorShiftUp:"
-msgstr ""
-
-#: mathconstants.c:78
-msgid "Standard shift up applied to the numerator."
-msgstr ""
-
-#: mathconstants.c:79
-msgid "FractionNumeratorDisplayStyleShiftUp:"
-msgstr ""
-
-#: mathconstants.c:79
-msgid ""
-"Standard shift up applied to the\n"
-"numerator in display style."
-msgstr ""
-
-#: mathconstants.c:80
-msgid "FractionDenominatorShiftDown:"
-msgstr ""
-
-#: mathconstants.c:80
-msgid ""
-"Standard shift down applied to the denominator.\n"
-"Postive values indicate downward motion."
-msgstr ""
-
-#: mathconstants.c:81
-msgid "FractionDenominatorDisplayStyleShiftDown:"
-msgstr ""
-
-#: mathconstants.c:81
-msgid ""
-"Standard shift down applied to the\n"
-"denominator in display style.\n"
-"Postive values indicate downward motion."
-msgstr ""
-
-#: mathconstants.c:82
-msgid "FractionNumeratorGapMin:"
-msgstr ""
-
-#: mathconstants.c:82
-msgid ""
-"Minimum tolerated gap between the ink\n"
-"bottom of the numerator and the ink of the fraction bar."
-msgstr ""
-
-#: mathconstants.c:83
-msgid "FractionNumeratorDisplayStyleGapMin:"
-msgstr ""
-
-#: mathconstants.c:83
-msgid ""
-"Minimum tolerated gap between the ink\n"
-"bottom of the numerator and the ink of the fraction\n"
-"bar in display style."
-msgstr ""
-
-#: mathconstants.c:84
-msgid "FractionRuleThickness:"
-msgstr ""
-
-#: mathconstants.c:84
-msgid "Thickness of the fraction bar."
-msgstr "分数线的宽度。"
-
-#: mathconstants.c:85
-msgid "FractionDenominatorGapMin:"
-msgstr ""
-
-#: mathconstants.c:85
-msgid ""
-"Minimum tolerated gap between the ink top of the denominator\n"
-"and the ink of the fraction bar.."
-msgstr ""
-
-#: mathconstants.c:86
-msgid "FractionDenominatorDisplayStyleGapMin:"
-msgstr ""
-
-#: mathconstants.c:86
-msgid ""
-"Minimum tolerated gap between the ink top of the denominator\n"
-"and the ink of the fraction bar in display style."
-msgstr ""
-
-#: mathconstants.c:87
-msgid "SkewedFractionHorizontalGap:"
-msgstr ""
-
-#: mathconstants.c:87
-msgid ""
-"Horizontal distance between the top\n"
-"and bottom elemnts of a skewed fraction."
-msgstr ""
-
-#: mathconstants.c:88
-msgid "SkewedFractionVerticalGap:"
-msgstr ""
-
-#: mathconstants.c:88
-msgid ""
-"Vertical distance between the ink of the top and\n"
-"bottom elements of a skewed fraction."
-msgstr ""
-
-#: mathconstants.c:89
-msgid "OverbarVerticalGap:"
-msgstr ""
-
-#: mathconstants.c:89
-msgid ""
-"Distance between the overbar and\n"
-"the ink top of the base."
-msgstr ""
-
-#: mathconstants.c:90
-msgid "OverbarRuleThickness:"
-msgstr ""
-
-#: mathconstants.c:90
-msgid "Thickness of the overbar."
-msgstr "上线条粗细"
-
-#: mathconstants.c:91
-msgid "OverbarExtraAscender:"
-msgstr ""
-
-#: mathconstants.c:91
-msgid "Extra white space reserved above the overbar."
-msgstr ""
-
-#: mathconstants.c:92
-msgid "UnderbarVerticalGap:"
-msgstr ""
-
-#: mathconstants.c:92
-msgid ""
-"Distance between underbar and\n"
-"the (ink) bottom of the base."
-msgstr ""
-
-#: mathconstants.c:93
-msgid "UnderbarRuleThickness:"
-msgstr ""
-
-#: mathconstants.c:93
-msgid "Thickness of the underbar."
-msgstr "下线条粗细"
-
-#: mathconstants.c:94
-msgid "UnderbarExtraDescender:"
-msgstr ""
-
-#: mathconstants.c:94
-msgid "Extra white space resevered below the underbar."
-msgstr ""
-
-#: mathconstants.c:95
-msgid "RadicalVerticalGap:"
-msgstr ""
-
-#: mathconstants.c:95
-msgid ""
-"Space between the ink to of the\n"
-"expression and the bar over it."
-msgstr ""
-
-#: mathconstants.c:96
-msgid "RadicalDisplayStyleVerticalGap:"
-msgstr ""
-
-#: mathconstants.c:96
-msgid ""
-"Space between the ink top of the\n"
-"expression and the bar over it in display\n"
-"style."
-msgstr ""
-
-#: mathconstants.c:97
-msgid "RadicalRuleThickness:"
-msgstr ""
-
-#: mathconstants.c:97
-msgid ""
-"Thickness of the radical rule in\n"
-"designed or constructed radical\n"
-"signs."
-msgstr ""
-
-#: mathconstants.c:98
-msgid "RadicalExtraAscender:"
-msgstr ""
-
-#: mathconstants.c:98
-msgid "Extra white space reserved above the radical."
-msgstr ""
-
-#: mathconstants.c:99
-msgid "RadicalKernBeforeDegree:"
-msgstr ""
-
-#: mathconstants.c:99
-msgid ""
-"Extra horizontal kern before the degree of a\n"
-"radical if such be present."
-msgstr ""
-
-#: mathconstants.c:100
-msgid "RadicalKernAfterDegree:"
-msgstr ""
-
-#: mathconstants.c:100
-msgid ""
-"Negative horizontal kern after the degree of a\n"
-"radical if such be present."
-msgstr ""
-
-#: mathconstants.c:101
-msgid "RadicalDegreeBottomRaisePercent:"
-msgstr ""
-
-#: mathconstants.c:101
-msgid ""
-"Height of the bottom of the radical degree, if\n"
-"such be present, in proportion to the ascender\n"
-"of the radical sign."
-msgstr ""
-
-#: mathconstants.c:102
-msgid "MinConnectorOverlap:"
-msgstr ""
-
-#: mathconstants.c:102
-msgid ""
-"Minimum overlap of connecting glyphs during\n"
-"glyph construction."
-msgstr ""
-
-#
-#: metricsview.c:633
-msgid "Name:"
-msgstr "名称："
-
-#
-#. GT: Top/Left (side) bearing
-#: metricsview.c:649
-msgid "TBearing:"
-msgstr "上边位:"
-
-#
-#: metricsview.c:649
-msgid "LBearing:"
-msgstr "左边位："
-
-#
-#. GT: Bottom/Right (side) bearing
-#: metricsview.c:654
-msgid "BBearing:"
-msgstr "底边位:"
-
-#
-#: metricsview.c:654
-msgid "RBearing:"
-msgstr "右边位："
-
-#
-#: metricsview.c:658
-msgid "VKern:"
-msgstr "垂直压缩："
-
-#
-#: metricsview.c:658
-msgid "Kern:"
-msgstr "压缩："
-
-#: metricsview.c:1022
-msgid "_Alter Class"
-msgstr ""
-
-#: metricsview.c:1023
-msgid "_Create Pair"
-msgstr ""
-
-#
-#: metricsview.c:1025
-msgid "Use Kerning Class?"
-msgstr "使用压缩类属？"
-
-#: metricsview.c:1026
-#, c-format
-msgid ""
-"This kerning pair (%.20s and %.20s) is currently part of a kerning class "
-"with a 0 offset for this combination. Would you like to alter this kerning "
-"class entry (or create a kerning pair for just these two glyphs)?"
-msgstr ""
-
-#
-#: metricsview.c:1591 metricsview.c:1710
-msgid "Load Word List..."
-msgstr "载入词表…"
-
-#
-#: metricsview.c:1592 metricsview.c:1715
-msgid "Load Glyph Name List..."
-msgstr "载入字形名称列表…"
-
-#: metricsview.c:2711
-#, c-format
-msgid "Kerning Metrics For %.50s"
-msgstr ""
-
-#: metricsview.c:2712
-#, c-format
-msgid "Advance Width Metrics For %.50s"
-msgstr ""
-
-#
-#: metricsview.c:2713
-#, c-format
-msgid "Metrics For %.50s"
-msgstr "%.50s 的尺寸"
-
-#: metricsview.c:2773
-msgid "Point Size"
-msgstr ""
-
-#: metricsview.c:2778
-msgid "Number out of range"
-msgstr ""
-
-#: metricsview.c:2845
-msgid "Set Point Size"
-msgstr ""
-
-#: metricsview.c:2854
-msgid "Point Size:"
-msgstr ""
-
-#
-#: metricsview.c:3131
-msgid "_Inline"
-msgstr "内线(_I)"
-
-#
-#: metricsview.c:3132 metricsview.c:3332
-msgid "_Outline"
-msgstr "轮廓(_O)"
-
-#
-#: metricsview.c:3133
-msgid "_Shadow"
-msgstr "阴影(_S)"
-
-#
-#: metricsview.c:3134
-msgid "_Wireframe"
-msgstr "线框(_W)"
-
-#
-#: metricsview.c:3183
-msgid "Effects"
-msgstr "效果"
-
-#: metricsview.c:3278
-msgid "_Partial"
-msgstr ""
-
-#: metricsview.c:3279
-msgid "Hide when _Moving"
-msgstr ""
-
-#: metricsview.c:3280
-msgid "_Hide"
-msgstr ""
-
-#
-#: metricsview.c:3309
-msgid "Insert Glyph _After..."
-msgstr "插入字形于后(_A)"
-
-#
-#: metricsview.c:3310
-msgid "Insert Glyph _Before..."
-msgstr "插入字形于前(_B)"
-
-#
-#: metricsview.c:3311
-msgid "_Replace Glyph..."
-msgstr "替换字形(_R)"
-
-#
-#: metricsview.c:3322
-msgid "Show _Grid"
-msgstr "显示网格(_G)"
-
-#: metricsview.c:3327
-msgid "Size set from _Window"
-msgstr ""
-
-#: metricsview.c:3328
-msgid "Set Point _Size"
-msgstr ""
-
-#: metricsview.c:3345
-msgid "_Kerning only"
-msgstr ""
-
-#: metricsview.c:3346
-msgid "_Advance Width only"
-msgstr ""
-
-#: metricsview.c:3347
-msgid "_Both"
-msgstr ""
-
-#: metricsview.c:3373
-msgid "_Window Type"
-msgstr ""
-
-#: metricsview.c:4812
-msgid "Advance Width Col"
-msgstr ""
-
-#: metricsview.c:4812
-msgid "Color used to draw the advance width line of a glyph"
-msgstr ""
-
-#: metricsview.c:4813
-msgid "Italic Advance Col"
-msgstr ""
-
-#: metricsview.c:4813
-msgid "Color used to draw the italic advance width line of a glyph"
-msgstr ""
-
-#: metricsview.c:4814
-msgid "Kern Line Color"
-msgstr ""
-
-#: metricsview.c:4814
-msgid "Color used to draw the kerning line"
-msgstr ""
-
-#: metricsview.c:4815
-msgid "Side Bearing Color"
-msgstr ""
-
-#: metricsview.c:4815
-msgid "Color used to draw the left side bearing"
-msgstr ""
-
-#: metricsview.c:4816
-msgid "Selected Glyph Col"
-msgstr ""
-
-#: metricsview.c:4816
-msgid "Color used to mark the selected glyph"
-msgstr ""
-
-#: metricsview.c:4826
-msgid "MetricsView"
-msgstr ""
-
-#: metricsview.c:4827
-msgid "This window displays metrics information about a font"
-msgstr ""
-
-#: mm.c:304
-msgid ""
-"One of the multiple master instances contains quadratic splines. It must be "
-"converted to cubic splines before it can be used in a multiple master"
-msgstr ""
-
-#: mm.c:306 mm.c:528
-msgid "The different instances of this mm have a different number of glyphs"
-msgstr ""
-
-#: mm.c:310 mm.c:314
-msgid "This glyph is defined in one instance font but not in another"
-msgstr ""
-
-#: mm.c:368
-msgid ""
-"This glyph contains a different number of references in different instances"
-msgstr ""
-
-#: mm.c:370
-msgid ""
-"A reference in this glyph refers to a different encoding in different "
-"instances"
-msgstr ""
-
-#: mm.c:433 mm.c:445
-msgid ""
-"A contour in this glyph contains a different number of points in different "
-"instances"
-msgstr ""
-
-#: mm.c:455
-msgid ""
-"This glyph contains a different number of contours in different instances"
-msgstr ""
-
-#: mm.c:491
-msgid ""
-"This glyph contains a different number of hints in different instances"
-msgstr ""
-
-#: mm.c:506
-msgid "This glyph contains different kerning pairs in different instances"
-msgstr ""
-
-#: mm.c:671
-msgid "Various errors occurred at the selected glyphs"
-msgstr ""
-
-#: mm.c:673
-#, c-format
-msgid "The following error occurred on the selected glyphs: %.100s"
-msgstr ""
-
-#: mm.c:984
-#, c-format
-msgid ""
-"The font %.30s contains cubic splines. It must be converted to quadratic "
-"splines before it can be used in an apple distortable font"
-msgstr ""
-
-#: mm.c:987
-#, c-format
-msgid ""
-"The font %.30s contains quadratic splines. It must be converted to cubic "
-"splines before it can be used in a multiple master"
-msgstr ""
-
-#: mm.c:998 mm.c:1019
-#, c-format
-msgid ""
-"There is no ForceBoldThreshold entry in the weighted font, but there is a "
-"ForceBold entry in font %30s"
-msgstr ""
-
-#: mm.c:1006
-#, c-format
-msgid ""
-"The fonts %1$.30s and %2$.30s have a different number of glyphs or different "
-"encodings"
-msgstr ""
-
-#: mm.c:1011
-#, c-format
-msgid ""
-"The fonts %1$.30s and %2$.30s use different types of splines (one quadratic, "
-"one cubic)"
-msgstr ""
-
-#: mm.c:1027
-#, c-format
-msgid ""
-"The entry \"%1$.20s\" is not present in the private dictionary of both "
-"%2$.30s and %3$.30s"
-msgstr ""
-
-#: mm.c:1041 mm.c:1044
-#, c-format
-msgid "The glyph %1$.30s is defined in font %2$.30s but not in %3$.30s"
-msgstr ""
-
-#: mm.c:1054 mm.c:1064
-#, c-format
-msgid ""
-"The glyph %1$.30s in %2$.30s has both references and contours. This is not "
-"supported in a font with variations"
-msgstr ""
-
-#: mm.c:1072
-#, c-format
-msgid ""
-"The glyph %1$.30s has a different number of contours in font %2$.30s than in "
-"%3$.30s"
-msgstr ""
-
-#: mm.c:1079
-#, c-format
-msgid ""
-"The glyph %1$.30s in font %2$.30s has a different number of points (or "
-"control points) on its contours than in %3$.30s"
-msgstr ""
-
-#: mm.c:1086
-#, c-format
-msgid ""
-"The glyph %1$.30s in font %2$.30s has contours running in a different "
-"direction than in %3$.30s"
-msgstr ""
-
-#: mm.c:1093
-#, c-format
-msgid ""
-"The glyph %1$.30s in font %2$.30s has a different number of references than "
-"in %3$.30s"
-msgstr ""
-
-#: mm.c:1100
-#, c-format
-msgid ""
-"The glyph %1$.30s in font %2$.30s has references with different scaling or "
-"rotation (etc.) than in %3$.30s"
-msgstr ""
-
-#: mm.c:1107
-#, c-format
-msgid ""
-"The glyph %1$.30s in font %2$.30s has a different set of kern pairs than in "
-"%3$.30s"
-msgstr ""
-
-#: mm.c:1116
-#, c-format
-msgid ""
-"The glyph %1$.30s has a different numbering of points (and control points) "
-"on its contours than in the various instances of the font"
-msgstr ""
-
-#: mm.c:1126 mm.c:1133
-#, c-format
-msgid ""
-"The %1$s hints in glyph \"%2$.30s\" in font %3$.30s do not match those in "
-"%4$.30s (different number or different overlap criteria)"
-msgstr ""
-
-#: mm.c:1143
-#, c-format
-msgid ""
-"The glyph %1$.30s in font %2$.30s has a different hint mask on its contours "
-"than in %3$.30s"
-msgstr ""
-
-#: mm.c:1159
-#, c-format
-msgid ""
-"The default font does not have a 'cvt ' table, but the instance %.30s does"
-msgstr ""
-
-#: mm.c:1172
-#, c-format
-msgid ""
-"Instance fonts may only contain a 'cvt ' table, but %.30s has some other "
-"truetype table as well"
-msgstr ""
-
-#: mm.c:1179
-#, c-format
-msgid ""
-"The 'cvt ' table in instance %.30s is a different size from that in the "
-"default font"
-msgstr ""
-
-#: mm.c:1188
-msgid "OK"
-msgstr "确定"
-
-#
-#: mm.c:1188
-msgid "No problems detected"
-msgstr "未发现问题"
-
-#
-#: mmdlg.c:94
-msgid "Axis 1"
-msgstr "轴1"
-
-#
-#: mmdlg.c:94
-msgid "Axis 2"
-msgstr "轴2"
-
-#
-#: mmdlg.c:94
-msgid "Axis 3"
-msgstr "轴3"
-
-#
-#: mmdlg.c:94
-msgid "Axis 4"
-msgstr "轴4"
-
-#
-#: mmdlg.c:416 mmdlg.c:421 mmdlg.c:428
-msgid "Bad MM Weights"
-msgstr "字体集粗细不良"
-
-#: mmdlg.c:416
-msgid "Incorrect number of instances weights, or illegal numbers"
-msgstr ""
-
-#: mmdlg.c:421
-msgid "The weights for the default version of the font must sum to 1.0"
-msgstr ""
-
-#: mmdlg.c:428
-msgid ""
-"The results produced by applying the NormalizeDesignVector and "
-"ConvertDesignVector functions were not the results expected. You may need to "
-"change these functions"
-msgstr ""
-
-#
-#: mmdlg.c:594
-msgid "Blend to New Font"
-msgstr "混合到新字体"
-
-#
-#: mmdlg.c:594
-msgid "MM Change Def Weights"
-msgstr "字体集更改默认粗细"
-
-#. GT: The following strings should be concatenated together, the result
-#. GT: translated, and then broken into lines by hand. I'm sure it would
-#. GT: be better to specify this all as one string, but my widgets won't support
-#. GT: that
-#: mmdlg.c:619
-msgid "You may specify the new instance of this font"
-msgstr ""
-
-#: mmdlg.c:619
-msgid "You may change the default instance of this font"
-msgstr ""
-
-#: mmdlg.c:626
-msgid "either by explicitly entering the contribution"
-msgstr ""
-
-#: mmdlg.c:633
-msgid "of each master design, or by entering the design"
-msgstr ""
-
-#
-#: mmdlg.c:640
-msgid "values for each axis"
-msgstr "各轴的值"
-
-#: mmdlg.c:647 mmdlg.c:3032
-msgid "Contribution of each master design"
-msgstr ""
-
-#
-#: mmdlg.c:656 mmdlg.c:3041
-msgid "Design Axis Values"
-msgstr "设计轴的值"
-
-#
-#: mmdlg.c:934
-msgid "You must provide at least one name here"
-msgstr "至少提供一个名字"
-
-#
-#: mmdlg.c:1025 mmdlg.c:2941
-msgid "Named Styles"
-msgstr "命名的样式"
-
-#
-#: mmdlg.c:1234 mmdlg.c:1242 mmdlg.c:1291 mmdlg.c:1302 mmdlg.c:2032
-#: mmdlg.c:2047 mmdlg.c:2066 mmdlg.c:2078
-msgid "Bad Axis"
-msgstr "不良轴"
-
-#
-#: mmdlg.c:1234 mmdlg.c:1291 ../gdraw/ctlvalues.c:37
-#, c-format
-msgid "Bad Number in %s"
-msgstr "不良数值于 %s"
-
-#
-#: mmdlg.c:1242
-#, c-format
-msgid "Wrong number of entries in %s"
-msgstr "错误数值输入 %s"
-
-#
-#: mmdlg.c:1302
-#, c-format
-msgid "The %s list is not ordered"
-msgstr "%s列表无序"
-
-#
-#: mmdlg.c:1681
-msgid "Font|New"
-msgstr "新建"
-
-#
-#: mmdlg.c:1762 mmdlg.c:3062
-msgid "Force Bold Threshold:"
-msgstr "强制加粗阈值:"
-
-#
-#: mmdlg.c:2032
-msgid "Please set the Axis Type field"
-msgstr "请设定数轴类型域"
-
-#: mmdlg.c:2047
-msgid ""
-"When building an Apple distortable font, you must specify at least one name "
-"for the axis"
-msgstr ""
-
-#
-#: mmdlg.c:2053 mmdlg.c:2736
-msgid "Begin:"
-msgstr "起点："
-
-#
-#: mmdlg.c:2055 mmdlg.c:2769
-msgid "End:"
-msgstr "终点："
-
-#
-#: mmdlg.c:2058
-msgid "AxisValue|Default"
-msgstr "默认"
-
-#
-#: mmdlg.c:2066
-msgid "Axis range not valid"
-msgstr "轴域不可用"
-
-#
-#: mmdlg.c:2070 mmdlg.c:2823
-msgid "Design Settings:"
-msgstr "设计设定："
-
-#
-#: mmdlg.c:2072 mmdlg.c:2840
-msgid "Normalized Settings:"
-msgstr "规范化设定："
-
-#: mmdlg.c:2078
-msgid ""
-"The number of entries in the design settings must match the number in "
-"normalized settings"
-msgstr ""
-
-#: mmdlg.c:2100 mmdlg.c:2902
-msgid "Normalized position of this design along each axis"
-msgstr ""
-
-#: mmdlg.c:2135
-#, c-format
-msgid "The set of positions, %.30s, is used more than once"
-msgstr ""
-
-#: mmdlg.c:2147
-#, c-format
-msgid "The font %.30s is assigned to two master designs"
-msgstr ""
-
-#: mmdlg.c:2159
-#, c-format
-msgid ""
-"The set of positions, %.30s, is not specified in any design (and should be)"
-msgstr ""
-
-#: mmdlg.c:2162
-#, c-format
-msgid ""
-"The set of positions, %.30s, is not specified in any design.\n"
-"Is that what you want?"
-msgstr ""
-
-#
-#: mmdlg.c:2182
-msgid "Disordered designs"
-msgstr "无序设计"
-
-#: mmdlg.c:2182
-msgid ""
-"The master designs are not positioned in the expected order. FontForge will "
-"be unable to suggest a ConvertDesignVector for you. Is this what you want?"
-msgstr ""
-
-#
-#: mmdlg.c:2188
-msgid "Bad PostScript function"
-msgstr "错误 PostScript 函数"
-
-#: mmdlg.c:2367 mmdlg.c:2370
-msgid "CID keyed fonts may not be a master design of a multiple master font"
-msgstr ""
-
-#
-#: mmdlg.c:2527
-msgid "Create MM"
-msgstr "创建字体集"
-
-#
-#: mmdlg.c:2527
-msgid "MM _Info"
-msgstr "字体集信息(_I)"
-
-#
-#: mmdlg.c:2603
-msgid "Type of distortable font:"
-msgstr "可变形字体类型:"
-
-#
-#: mmdlg.c:2610
-msgid "Adobe"
-msgstr "Adobe"
-
-#
-#: mmdlg.c:2620 parsettf.c:4473 savefontdlg.c:709
-msgid "Apple"
-msgstr "Apple"
-
-#
-#: mmdlg.c:2630
-msgid "Number of Axes:"
-msgstr "轴数:"
-
-#
-#: mmdlg.c:2648
-msgid "Number of Master Designs:"
-msgstr "主设计数:"
-
-#
-#: mmdlg.c:2697
-msgid "Axis Type:"
-msgstr "轴类型:"
-
-#
-#: mmdlg.c:2715
-msgid "Axis Range:"
-msgstr "轴域:"
-
-#
-#: mmdlg.c:2752
-msgid "Default:"
-msgstr "默认:"
-
-#
-#: mmdlg.c:2785
-msgid "Intermediate Points:"
-msgstr "中间点:"
-
-#: mmdlg.c:2888
-msgid "Source from which this design is to be taken"
-msgstr ""
-
-#
-#: mmdlg.c:2921
-msgid "Master Designs"
-msgstr "主设计"
-
-#
-#: mmdlg.c:2960
-msgid "Design|_New..."
-msgstr "新建(_N)…"
-
-#: mmdlg.c:2998
-msgid "Normalize Design Vector Function:"
-msgstr ""
-
-#
-#: mmdlg.c:3012
-msgid "Convert Design Vector Function:"
-msgstr "转换设计矢量函数:"
-
-#
-#: namelist.c:560
-msgid "NameList base missing"
-msgstr "名称列表基础缺失"
-
-#: namelist.c:560
-#, c-format
-msgid "NameList %s based on %s which could not be found"
-msgstr ""
-
-#
-#: namelist.c:564
-msgid "NameList based twice"
-msgstr "名称列表参照两次"
-
-#: namelist.c:564
-#, c-format
-msgid "NameList %s based on two NameLists"
-msgstr ""
-
-#
-#: namelist.c:573 namelist.c:582 namelist.c:599 namelist.c:606 namelist.c:615
-#: namelist.c:635
-msgid "NameList parsing error"
-msgstr "名称列表解析行出错"
-
-#
-#: namelist.c:573 namelist.c:582
-#, c-format
-msgid ""
-"Missing rename \"to\" name %s\n"
-"%s"
-msgstr ""
-"缺失的重命名 \"为\" 名称 %s\n"
-"%s"
-
-#: namelist.c:599
-#, c-format
-msgid ""
-"Bad unicode value when parsing %s\n"
-"%s"
-msgstr ""
-
-#: namelist.c:606
-#, c-format
-msgid "Missing name when parsing %s for unicode %x"
-msgstr ""
-
-#: namelist.c:615
-#, c-format
-msgid "Bad name when parsing %s for unicode %x"
-msgstr ""
-
-#: namelist.c:635
-#, c-format
-msgid "Multiple names when parsing %s for unicode %x"
-msgstr ""
-
-#
-#: namelist.c:4155
-msgid "AGL without afii"
-msgstr "AGL 无 afii"
-
-#
-#: namelist.c:6233
-msgid "Adobe Glyph List"
-msgstr "Adobe 字形列表"
-
-#
-#: namelist.c:7534
-msgid "AGL with PUA"
-msgstr "AGL 带 PUA"
-
-#
-#: namelist.c:8058
-msgid "Greek small caps"
-msgstr "希腊小大写"
-
-#
-#: namelist.c:11172
-msgid "ΤεΧ Names"
-msgstr "ΤεΧ 名称"
-
-#
-#: namelist.c:14545
-msgid "AMS Names"
-msgstr "AMS名称"
-
-#
-#: nonlineartrans.c:94 nonlineartrans.c:140 nonlineartrans.c:148
-#: nonlineartrans.c:156 nonlineartrans.c:164 nonlineartrans.c:198
-#: nonlineartrans.c:211 nonlineartrans.c:218 nonlineartrans.c:224
-#: nonlineartrans.c:237 nonlineartrans.c:355 nonlineartrans.c:374
-msgid "Bad Token"
-msgstr "不良标记"
-
-#: nonlineartrans.c:94
-#, c-format
-msgid ""
-"Bad token \"%.30s\"\n"
-"near ...%40s"
-msgstr ""
-
-#: nonlineartrans.c:140 nonlineartrans.c:148 nonlineartrans.c:156
-#, c-format
-msgid ""
-"Bad token. Expected \"%.10s\" got \"%.10s\"\n"
-"near ...%40s"
-msgstr ""
-
-#: nonlineartrans.c:164
-#, c-format
-msgid ""
-"Bad token. got \"%1$c\"\n"
-"near ...%2$40s"
-msgstr ""
-
-#: nonlineartrans.c:198 nonlineartrans.c:211 nonlineartrans.c:218
-#: nonlineartrans.c:224 nonlineartrans.c:355
-#, c-format
-msgid ""
-"Bad token. Expected \"%.10s\"\n"
-"near ...%40s"
-msgstr ""
-
-#
-#: nonlineartrans.c:237
-#, c-format
-msgid ""
-"Unexpected token.\n"
-"before ...%40s"
-msgstr ""
-"未预期的标识。\n"
-"在%40s之前"
-
-#: nonlineartrans.c:374
-#, c-format
-msgid ""
-"Unexpected token after expression end.\n"
-"before ...%40s"
-msgstr ""
-
-#: nonlineartrans.c:405
-#, c-format
-msgid "Attempt to take logarithm of %1$g in %2$.30s"
-msgstr ""
-
-#: nonlineartrans.c:412
-#, c-format
-msgid "Attempt to take the square root of %1$g in %2$.30s"
-msgstr ""
-
-#: nonlineartrans.c:443
-#, c-format
-msgid "Attempt to divide by 0 in %.30s"
-msgstr ""
-
-#
-#: nonlineartrans.c:862
-msgid "Projecting..."
-msgstr "投影…"
-
-#
-#: nonlineartransui.c:71
-msgid "Non Linear Transform"
-msgstr "非线性变换"
-
-#
-#. GT: an expression describing the transformation applied to the X coordinate
-#: nonlineartransui.c:82
-msgid "X Expr:"
-msgstr "X 表达式:"
-
-#: nonlineartransui.c:87 nonlineartransui.c:100 nonlineartransui.c:110
-#: nonlineartransui.c:124
-msgid ""
-"These expressions may contain the operators +,-,*,/,%,^ (which means raise "
-"to the power of here), and ?: It may also contain a few standard functions. "
-"Basic terms are real numbers, x and y.\n"
-"Examples:\n"
-" x^3+2.5*x^2+5\n"
-" (x-300)*(y-200)/100\n"
-" y+sin(100*x)"
-msgstr ""
-
-#
-#. GT: an expression describing the transformation applied to the Y coordinate
-#: nonlineartransui.c:105
-msgid "Y Expr:"
-msgstr "Y 表达式:"
-
-#
-#: nonlineartransui.c:206 nonlineartransui.c:213 transform.c:87
-msgid "Glyph Origin"
-msgstr "字形原点"
-
-#
-#: nonlineartransui.c:207 nonlineartransui.c:214 transform.c:88
-msgid "Center of Selection"
-msgstr "选中部分的中心"
-
-#
-#. GT: The (x,y) position on the window where the user last pressed a mouse button
-#: nonlineartransui.c:209 nonlineartransui.c:216 transform.c:90
-msgid "Last Press"
-msgstr "最近鼠标点击位置"
-
-#
-#: nonlineartransui.c:322
-msgid "Point of View Projection"
-msgstr "投影视点"
-
-#
-#: nonlineartransui.c:333
-msgid "View Point"
-msgstr "视点"
-
-#
-#: nonlineartransui.c:413 nonlineartransui.c:581
-msgid "Distance to drawing plane:"
-msgstr "到绘图面的距离:"
-
-#
-#: nonlineartransui.c:432 nonlineartransui.c:582
-msgid "Distance to projection plane:"
-msgstr "到投影面的距离:"
-
-#
-#: nonlineartransui.c:451 nonlineartransui.c:583
-msgid "Drawing plane tilt:"
-msgstr "绘画平面倾斜:"
-
-#
-#: nonlineartransui.c:483 nonlineartransui.c:584
-msgid "Direction of gaze:"
-msgstr "查看方向:"
-
-#
-#: nonlineartransui.c:515
-msgid "Vanishing Point:"
-msgstr "消失点:"
-
-#: nonlineartransui.c:520 nonlineartransui.c:529
-msgid ""
-"This is the approximate location of the vanishing point.\n"
-"It does not include the offset induced by \"Center of selection\"\n"
-"nor \"Last Press\"."
-msgstr ""
-
-#
-#: noprefs.c:175 prefs.c:278
-msgid "OtherSubrsFile"
-msgstr "其他文件"
-
-#: noprefs.c:175 prefs.c:278
-#, c-format
-msgid ""
-"If you wish to replace Adobe's OtherSubrs array (for Type1 fonts)\n"
-"with an array of your own, set this to point to a file containing\n"
-"a list of up to 14 PostScript subroutines. Each subroutine must\n"
-"be preceded by a line starting with '%%%%' (any text before the\n"
-"first '%%%%' line will be treated as an initial copyright notice).\n"
-"The first three subroutines are for flex hints, the next for hint\n"
-"substitution (this MUST be present), the 14th (or 13 as the\n"
-"numbering actually starts with 0) is for counter hints.\n"
-"The subroutines should not be enclosed in a [ ] pair."
-msgstr ""
-
-#
-#: noprefs.c:176 prefs.c:291
-msgid "NewCharset"
-msgstr "新字符集"
-
-#
-#: noprefs.c:176 prefs.c:291
-msgid ""
-"Default encoding for\n"
-"new fonts"
-msgstr ""
-"默认编码\n"
-"新字体"
-
-#
-#: noprefs.c:177 prefs.c:292
-msgid "NewEmSize"
-msgstr "新M全身尺寸"
-
-#
-#: noprefs.c:177 prefs.c:292
-msgid "The default size of the Em-Square in a newly created font."
-msgstr "新创字体的M全身尺寸(EM)的默认值。"
-
-#
-#: noprefs.c:178 prefs.c:293
-msgid "NewFontsQuadratic"
-msgstr "新字体Quadratic"
-
-#: noprefs.c:178 prefs.c:293
-msgid ""
-"Whether new fonts should contain splines of quadratic (truetype)\n"
-"or cubic (postscript & opentype)."
-msgstr ""
-
-#
-#: noprefs.c:179 prefs.c:279
-msgid "FreeTypeInFontView"
-msgstr "字体视图用FreeType"
-
-#: noprefs.c:179 prefs.c:279
-msgid ""
-"Use the FreeType rasterizer (when available)\n"
-"to rasterize glyphs in the font view.\n"
-"This generally results in better quality."
-msgstr ""
-
-#
-#: noprefs.c:180 prefs.c:294
-msgid "LoadedFontsAsNew"
-msgstr "载入字体作为新文件"
-
-#: noprefs.c:180 prefs.c:294
-msgid ""
-"Whether fonts loaded from the disk should retain their splines\n"
-"with the original order (quadratic or cubic), or whether the\n"
-"splines should be converted to the default order for new fonts\n"
-"(see NewFontsQuadratic)."
-msgstr ""
-
-#
-#: noprefs.c:181 prefs.c:298
-msgid "PreferCJKEncodings"
-msgstr "用中日韩编码(CJK)"
-
-#: noprefs.c:181 prefs.c:298
-msgid ""
-"When loading a truetype or opentype font which has both a unicode\n"
-"and a CJK encoding table, use this flag to specify which\n"
-"should be loaded for the font."
-msgstr ""
-
-#
-#: noprefs.c:182 prefs.c:299
-msgid "AskUserForCMap"
-msgstr "询问CMap"
-
-#: noprefs.c:182 prefs.c:299
-msgid ""
-"When loading a font in sfnt format (TrueType, OpenType, etc.),\n"
-"ask the user to specify which cmap to use initially."
-msgstr ""
-
-#
-#: noprefs.c:183 prefs.c:300
-msgid "PreserveTables"
-msgstr "预留表"
-
-#: noprefs.c:183 prefs.c:300
-msgid ""
-"Enter a list of 4 letter table tags, separated by commas.\n"
-"FontForge will make a binary copy of these tables when it\n"
-"loads a True/OpenType font, and will output them (unchanged)\n"
-"when it generates the font. Do not include table tags which\n"
-"FontForge thinks it understands."
-msgstr ""
-
-#
-#: noprefs.c:184 prefs.c:311
-msgid "ItalicConstrained"
-msgstr "倾斜限制"
-
-#: noprefs.c:184 prefs.c:311
-msgid ""
-"In the Outline View, the Shift key constrains motion to be parallel to the "
-"ItalicAngle rather than constraining it to be vertical."
-msgstr ""
-
-#
-#: noprefs.c:185 prefs.c:316
-msgid "SnapToInt"
-msgstr "捕捉到整点"
-
-#: noprefs.c:185 prefs.c:316
-msgid ""
-"When the user clicks in the editing window, round the location to the "
-"nearest integers."
-msgstr ""
-
-#
-#: noprefs.c:186 prefs.c:317
-msgid "JoinSnap"
-msgstr "联合捕捉"
-
-#
-#: noprefs.c:186 prefs.c:317
-msgid ""
-"The Edit->Join command will join points which are this close together\n"
-"A value of 0 means they must be coincident"
-msgstr ""
-"编辑->连接命令将连接靠的很近的两点，\n"
-"值为0意味着它们是同一点。"
-
-#
-#: noprefs.c:187 prefs.c:319
-msgid "CopyMetaData"
-msgstr "复制元数据"
-
-#
-#: noprefs.c:187 noprefs.c:192 prefs.c:319
-msgid ""
-"When copying glyphs from the font view, also copy the\n"
-"glyphs' metadata (name, encoding, comment, etc)."
-msgstr ""
-"从字体视图复制字形时，一并复制字形的元数据\n"
-"如名称、编码、注释等。"
-
-#
-#: noprefs.c:188 prefs.c:320
-msgid "UndoDepth"
-msgstr "取消步数"
-
-#
-#: noprefs.c:188 prefs.c:320
-msgid "The maximum number of Undoes/Redoes stored in a glyph"
-msgstr "保存在字形中的取消/重来的最多数量"
-
-#
-#: noprefs.c:189 prefs.c:326
-msgid "AutoWidthSync"
-msgstr "自动宽度对正"
-
-#: noprefs.c:189 prefs.c:326
-msgid ""
-"Changing the width of a glyph\n"
-"changes the widths of all accented\n"
-"glyphs based on it."
-msgstr ""
-
-#
-#: noprefs.c:190 prefs.c:327
-msgid "AutoLBearingSync"
-msgstr "自动左边位对正"
-
-#: noprefs.c:190 prefs.c:327
-msgid ""
-"Changing the left side bearing\n"
-"of a glyph adjusts the lbearing\n"
-"of other references in all accented\n"
-"glyphs based on it."
-msgstr ""
-
-#
-#: noprefs.c:191 prefs.c:331
-msgid "ClearInstrsBigChanges"
-msgstr "清除大变化指令"
-
-#: noprefs.c:191 prefs.c:331
-msgid ""
-"Instructions in a TrueType font refer to\n"
-"points by number, so if you edit a glyph\n"
-"in such a way that some points have different\n"
-"numbers (add points, remove them, etc.) then\n"
-"the instructions will be applied to the wrong\n"
-"points with disasterous results.\n"
-"  Normally FontForge will remove the instructions\n"
-"if it detects that the points have been renumbered\n"
-"in order to avoid the above problem. You may turn\n"
-"this behavior off -- but be careful!"
-msgstr ""
-
-#
-#: noprefs.c:192 prefs.c:332
-msgid "CopyTTFInstrs"
-msgstr "复制TTF指令"
-
-#
-#: noprefs.c:193 prefs.c:336
-msgid "AccentOffsetPercent"
-msgstr "重音符偏移比例"
-
-#: noprefs.c:193 prefs.c:336
-msgid ""
-"The percentage of an em by which an accent is offset from its base glyph in "
-"Build Accent"
-msgstr ""
-
-#
-#: noprefs.c:194 prefs.c:337
-msgid "AccentCenterLowest"
-msgstr "重音符中心最低"
-
-#: noprefs.c:194 prefs.c:337 prefs.c:483
-msgid ""
-"When placing grave and acute accents above letters, should\n"
-"FontForge center them based on their full width, or\n"
-"should it just center based on the lowest point\n"
-"of the accent."
-msgstr ""
-
-#
-#: noprefs.c:195 prefs.c:338
-msgid "CharCenterHighest"
-msgstr "字符中心最高"
-
-#: noprefs.c:195 prefs.c:338
-msgid ""
-"When centering an accent over a glyph, should the accent\n"
-"be centered on the highest point(s) of the glyph,\n"
-"or the middle of the glyph?"
-msgstr ""
-
-#
-#: noprefs.c:196 prefs.c:339
-msgid "PreferSpacingAccents"
-msgstr "重音符间距"
-
-#: noprefs.c:196 prefs.c:339
-msgid ""
-"Use spacing accents (Unicode: 02C0-02FF) rather than\n"
-"combining accents (Unicode: 0300-036F) when\n"
-"building accented glyphs."
-msgstr ""
-
-#
-#: noprefs.c:197 prefs.c:343
-msgid "PreferPotrace"
-msgstr "采用Potrace"
-
-#: noprefs.c:197 prefs.c:343
-msgid ""
-"FontForge supports two different helper applications to do autotracing\n"
-" autotrace and potrace\n"
-"If your system only has one it will use that one, if you have both\n"
-"use this option to tell FontForge which to pick."
-msgstr ""
-
-#
-#: noprefs.c:198 prefs.c:344
-msgid "AutotraceArgs"
-msgstr "Autotrace参数"
-
-#: noprefs.c:198 prefs.c:344
-msgid ""
-"Extra arguments for configuring the autotrace program\n"
-"(either autotrace or potrace)"
-msgstr ""
-
-#
-#: noprefs.c:199 prefs.c:345
-msgid "AutotraceAsk"
-msgstr "询问Autotrace"
-
-#
-#: noprefs.c:199 prefs.c:345
-msgid "Ask the user for autotrace arguments each time autotrace is invoked"
-msgstr "每次autotrace启动时向用户询问参数"
-
-#
-#: noprefs.c:200 prefs.c:346
-msgid "MfArgs"
-msgstr "MF参数"
-
-#
-#: noprefs.c:200 prefs.c:346
-msgid ""
-"Commands to pass to mf (metafont) program, the filename will follow these"
-msgstr "传给 mf (metafont) 程序的参数, 文件名应遵循这些"
-
-#
-#: noprefs.c:201 prefs.c:347
-msgid "MfAsk"
-msgstr "询问MF"
-
-#
-#: noprefs.c:201 prefs.c:347
-msgid "Ask the user for mf commands each time mf is invoked"
-msgstr "每次启用mf时向用户询问其参数"
-
-#
-#: noprefs.c:202 prefs.c:348
-msgid "MfClearBg"
-msgstr "MF清除背景"
-
-#: noprefs.c:202 prefs.c:348
-msgid ""
-"FontForge loads large images into the background of each glyph\n"
-"prior to autotracing them. You may retain those\n"
-"images to look at after mf processing is complete, or\n"
-"remove them to save space"
-msgstr ""
-
-#
-#: noprefs.c:203 prefs.c:349
-msgid "MfShowErr"
-msgstr "MF提示错误"
-
-#
-#: noprefs.c:203 prefs.c:349
-msgid ""
-"MetaFont (mf) generates lots of verbiage to stdout.\n"
-"Most of the time I find it an annoyance but it is\n"
-"important to see if something goes wrong."
-msgstr ""
-"MetaFont (mf) 生成许多提示到 stdout.\n"
-"很多时候显得很罗嗦，不过看看这些也很重要，\n"
-"尤其是出错的时候。"
-
-#
-#: noprefs.c:204 prefs.c:353
-msgid "FoundryName"
-msgstr "制作工具"
-
-#
-#: noprefs.c:204 prefs.c:353
-msgid ""
-"Name used for foundry field in bdf\n"
-"font generation"
-msgstr ""
-"生成bdf字体时用作制作工具字段\n"
-"的名称"
-
-#
-#: noprefs.c:205 prefs.c:354
-msgid "TTFFoundry"
-msgstr "TTF作者"
-
-#
-#: noprefs.c:205 prefs.c:354
-msgid ""
-"Name used for Vendor ID field in\n"
-"ttf (OS/2 table) font generation.\n"
-"Must be no more than 4 characters"
-msgstr ""
-"生成TTF(OS/2表)字体时的\n"
-"制作者的标识字段名称，长度\n"
-"不应超过 4 个字符。"
-
-#
-#: noprefs.c:206 prefs.c:355
-msgid "NewFontNameList"
-msgstr "新的字体名称列表"
-
-#: noprefs.c:206 prefs.c:355
-msgid ""
-"FontForge will use this namelist when assigning\n"
-"glyph names to code points in a new font."
-msgstr ""
-
-#
-#: noprefs.c:207 prefs.c:356
-msgid "RecognizePUANames"
-msgstr "识别PUA名称"
-
-#: noprefs.c:207 prefs.c:356
-msgid ""
-"Once upon a time, Adobe assigned PUA (public use area) encodings\n"
-"for many stylistic variants of characters (small caps, old style\n"
-"numerals, etc.). Adobe no longer believes this to be a good idea,\n"
-"and recommends that these encodings be ignored.\n"
-"\n"
-" The assignments were originally made because most applications\n"
-"could not handle OpenType features for accessing variants. Adobe\n"
-"now believes that all apps that matter can now do so. Applications\n"
-"like Word and OpenOffice still can't handle these features, so\n"
-" fontforge's default behavior is to ignore Adobe's current\n"
-"recommendations.\n"
-"\n"
-"Note: This does not affect figuring out unicode from the font's encoding,\n"
-"it just controls determining unicode from a name."
-msgstr ""
-
-#
-#: noprefs.c:208 prefs.c:357
-msgid "UnicodeGlyphNames"
-msgstr "统一码字形名称"
-
-#: noprefs.c:208 prefs.c:357
-msgid ""
-"Allow the full unicode character set in glyph names.\n"
-"This does not conform to adobe's glyph name standard.\n"
-"Such names should be for internal use only and\n"
-"should NOT end up in production fonts."
-msgstr ""
-
-#
-#: noprefs.c:209
-msgid "XUID-Base"
-msgstr "XUID-Base"
-
-#: noprefs.c:209 prefs.c:476
-msgid ""
-"If specified this should be a space separated list of integers each\n"
-"less than 16777216 which uniquely identify your organization\n"
-"FontForge will generate a random number for the final component."
-msgstr ""
-
-#
-#: noprefs.c:210 noprefs.c:249 prefs.c:362
-msgid "AskBDFResolution"
-msgstr "询问BDF分辨率"
-
-#: noprefs.c:210 noprefs.c:249 prefs.c:362
-msgid ""
-"When generating a set of BDF fonts ask the user\n"
-"to specify the screen resolution of the fonts\n"
-"otherwise FontForge will guess depending on the pixel size."
-msgstr ""
-
-#
-#: noprefs.c:211 prefs.c:363
-msgid "AutoHint"
-msgstr "自动消隐"
-
-#
-#: noprefs.c:211 prefs.c:363
-msgid "AutoHint changed glyphs before generating a font"
-msgstr "生成字体之前自动消隐改变字形"
-
-#
-#: noprefs.c:212 prefs.c:369
-msgid "HintBoundingBoxes"
-msgstr "消隐外框"
-
-#: noprefs.c:212 prefs.c:369
-msgid ""
-"FontForge will place vertical or horizontal hints to describe the bounding "
-"boxes of suitable glyphs."
-msgstr ""
-
-#
-#: noprefs.c:213 prefs.c:370
-msgid "HintDiagonalEnds"
-msgstr "消隐对角端部"
-
-#: noprefs.c:213 prefs.c:370
-msgid ""
-"FontForge will place vertical or horizontal hints at the ends of diagonal "
-"stems."
-msgstr ""
-
-#
-#: noprefs.c:214 prefs.c:371
-msgid "HintDiagonalInter"
-msgstr "消隐对角内部"
-
-#: noprefs.c:214 prefs.c:371
-msgid ""
-"FontForge will place vertical or horizontal hints at the intersections of "
-"diagonal stems."
-msgstr ""
-
-#
-#: noprefs.c:215 prefs.c:372
-msgid "DetectDiagonalStems"
-msgstr "侦测对角项"
-
-#: noprefs.c:215 prefs.c:372
-msgid ""
-"FontForge will generate diagonal stem hints, which then can be used by the "
-"AutoInstr command."
-msgstr ""
-
-#
-#: noprefs.c:216 prefs.c:384
-msgid "UseNewIndicScripts"
-msgstr "使用新印地语文字"
-
-#: noprefs.c:216 prefs.c:384
-msgid ""
-"MS has changed (in August 2006) the inner workings of their Indic shaping\n"
-"engine, and to disambiguate this change has created a parallel set of "
-"script\n"
-"tags (generally ending in '2') for Indic writing systems. If you are "
-"working\n"
-"with the new system set this flag, if you are working with the old unset "
-"it.\n"
-"(if you aren't doing Indic work, this flag is irrelevant)."
-msgstr ""
-
-#
-#. GT: The following strings have no spaces and an odd capitalization
-#. GT: this is because these strings are used in two different ways, one
-#. GT: translated (which the user sees, and should probably have added spaces,
-#. GT: and one untranslated which needs the current odd format
-#: noprefs.c:239 prefs.c:267
-msgid "ResourceFile"
-msgstr "资源文件"
-
-#: noprefs.c:239 prefs.c:267
-msgid ""
-"When FontForge starts up, it loads display related resources from a\n"
-"property on the screen. Sometimes it is useful to be able to store\n"
-"these resources in a file. These resources are only read at start\n"
-"up, so changing this has no effect until the next time you start\n"
-"FontForge."
-msgstr ""
-
-#
-#: noprefs.c:240 prefs.c:277
-msgid "HelpDir"
-msgstr "帮助目录"
-
-#: noprefs.c:240 prefs.c:277
-msgid ""
-"The directory on your local system in which FontForge will search for help\n"
-"files.  If a file is not found there, then FontForge will look for it on the "
-"net."
-msgstr ""
-
-#
-#: noprefs.c:241 prefs.c:280
-msgid "SplashScreen"
-msgstr "欢迎窗口"
-
-#
-#: noprefs.c:241 prefs.c:280
-msgid "Show splash screen on start-up"
-msgstr "启动时显示欢迎窗口"
-
-#
-#: noprefs.c:242 prefs.c:306
-msgid "GlyphAutoGoto"
-msgstr "字形自动跳转"
-
-#
-#: noprefs.c:242 prefs.c:306
-msgid ""
-"Typing a normal character in the glyph view window changes the window to "
-"look at that character"
-msgstr ""
-"在字形视图打一个字符将\n"
-"跳转到该字符"
-
-#
-#: noprefs.c:243 prefs.c:307
-msgid "OpenCharsInNewWindow"
-msgstr "于新窗口显示字符"
-
-#: noprefs.c:243 prefs.c:307
-msgid ""
-"When double clicking on a character in the font view\n"
-"open that character in a new window, otherwise\n"
-"reuse an existing one."
-msgstr ""
-
-#
-#: noprefs.c:244 prefs.c:312
-msgid "ArrowMoveSize"
-msgstr "方向键移动尺寸"
-
-#
-#: noprefs.c:244 prefs.c:312
-msgid ""
-"The number of em-units by which an arrow key will move a selected point"
-msgstr "方向键按此尺寸移动选定点"
-
-#: noprefs.c:245 prefs.c:313
-msgid "ArrowAccelFactor"
-msgstr "方向键加速系数"
-
-#: noprefs.c:245 prefs.c:313
-msgid ""
-"Holding down the Alt (or Meta) key will speed up arrow key motion by this "
-"factor"
-msgstr ""
-
-#
-#: noprefs.c:246 prefs.c:315
-msgid "SnapDistance"
-msgstr "捕捉间距"
-
-#
-#: noprefs.c:246 prefs.c:315
-msgid ""
-"When the mouse pointer is within this many pixels\n"
-"of one of the various interesting features (baseline,\n"
-"width, grid splines, etc.) the pointer will snap\n"
-"to that feature."
-msgstr ""
-"当鼠标在相关特征的像素范围\n"
-"中时，鼠标将捕捉到该特征。\n"
-"这些特征包括:\n"
-"基线、宽度、网格样条线等。"
-
-#
-#: noprefs.c:247 prefs.c:318
-msgid "StopAtJoin"
-msgstr "联合处停止"
-
-#: noprefs.c:247 prefs.c:318
-msgid ""
-"When dragging points in the outline view a join may occur\n"
-"(two open contours may connect at their endpoints). When\n"
-"this is On a join will cause FontForge to stop moving the\n"
-"selection (as if the user had released the mouse button).\n"
-"This is handy if your fingers are inclined to wiggle a bit."
-msgstr ""
-
-#
-#: noprefs.c:248 prefs.c:321
-msgid "UpdateFlex"
-msgstr "更新Flex"
-
-#
-#: noprefs.c:248 prefs.c:321
-msgid "Figure out flex hints after every change"
-msgstr "每次修改后指出flex消隐"
-
-#
-#: noprefs.c:263 prefs.c:410
-msgid "Display rulers in the Outline Glyph View"
-msgstr "轮廓字形视图中显示标尺"
-
-#
-#: nowakowskittfinstr.c:748
-msgid "Can't insert 'cvt'"
-msgstr "不能插入 'cvt'"
-
-#: nowakowskittfinstr.c:749
-msgid ""
-"There already exists a 'cvt' table, perhaps legacy. FontForge can use it, "
-"but can't make any assumptions on values stored there, so generated "
-"instructions will be of lower quality. If legacy hinting is to be scrapped, "
-"it is suggested to clear the `cvt` and repeat autoinstructing. "
-msgstr ""
-
-#
-#: nowakowskittfinstr.c:1636
-msgid "Can't insert 'fpgm'"
-msgstr "不能插入 'fpgm'"
-
-#: nowakowskittfinstr.c:1637
-msgid ""
-"There exists a 'fpgm' code that seems incompatible with FontForge's. "
-"Instructions generated will be of lower quality. If legacy hinting is to be "
-"scrapped, it is suggested to clear the `fpgm` and repeat autoinstructing. It "
-"will be then possible to append user's code to FontForge's 'fpgm', but due "
-"to possible future updates, it is extremely advised to use high numbers for "
-"user's functions."
-msgstr ""
-
-#: nowakowskittfinstr.c:1953
-msgid "Can't insert 'prep'"
-msgstr "不能插入 'prep'"
-
-#: nowakowskittfinstr.c:1954
-msgid ""
-"There exists a 'prep' code incompatible with FontForge's. It can't be "
-"guaranteed it will work well. It is suggested to allow FontForge to insert "
-"its code and then append user's own."
-msgstr ""
-
-#
-#: nowakowskittfinstr.c:5184 nowakowskittfinstr.c:5197 ttfinstrsui.c:903
-#: ttfinstrsui.c:916
-msgid "Can't instruct this glyph"
-msgstr "不能构建此字形"
-
-#: nowakowskittfinstr.c:5185 ttfinstrsui.c:904
-#, c-format
-msgid ""
-"TrueType does not support mixed references and contours.\n"
-"If you want instructions for %.30s you should either:\n"
-" * Unlink the reference(s)\n"
-" * Copy the inline contours into their own (unencoded\n"
-"    glyph) and make a reference to that."
-msgstr ""
-
-#: nowakowskittfinstr.c:5198 ttfinstrsui.c:917
-#, c-format
-msgid ""
-"TrueType does not support references which\n"
-"are scaled by more than 200%%.  But %1$.30s\n"
-"has been in %2$.30s. Any instructions\n"
-"added would be meaningless."
-msgstr ""
-
-#: oflib.c:63
-msgid "January"
-msgstr ""
-
-#: oflib.c:63
-msgid "February"
-msgstr ""
-
-#: oflib.c:63
-msgid "March"
-msgstr ""
-
-#: oflib.c:63
-msgid "April"
-msgstr ""
-
-#: oflib.c:63
-msgid "May"
-msgstr ""
-
-#: oflib.c:63
-msgid "June"
-msgstr ""
-
-#: oflib.c:63
-msgid "July"
-msgstr ""
-
-#: oflib.c:63
-msgid "August"
-msgstr ""
-
-#: oflib.c:63
-msgid "September"
-msgstr ""
-
-#: oflib.c:63
-msgid "October"
-msgstr ""
-
-#: oflib.c:63
-msgid "November"
-msgstr ""
-
-#: oflib.c:63
-msgid "December"
-msgstr ""
-
-#: oflib.c:192
-msgid "Midnight"
-msgstr ""
-
-#: oflib.c:192
-msgid "Noon"
-msgstr ""
-
-#: oflib.c:195
-msgid "AM"
-msgstr ""
-
-#: oflib.c:195
-msgid "PM"
-msgstr ""
-
-#: oflib.c:705
-msgid "Show All"
-msgstr ""
-
-#: oflib.c:708
-msgid "Tag(s)"
-msgstr ""
-
-#: oflib.c:1894
-msgid "Browse the Open Font Library"
-msgstr ""
-
-#: oflib.c:1917
-msgid "Sort by:"
-msgstr ""
-
-#: oflib.c:1925
-msgid "Date"
-msgstr ""
-
-#: oflib.c:1955
-msgid "Reverse"
-msgstr ""
-
-#: oflib.c:1970
-msgid "Search:"
-msgstr ""
-
-#: oflib.c:1996
-msgid "Fonts on http://openfontlibrary.org/"
-msgstr ""
-
-#: oflib.c:2057
-msgid "Automatically download preview after selecting a font (be patient)"
-msgstr ""
-
-#: oflib.c:2079
-msgid "Preview"
-msgstr ""
-
-#: oflib.c:2089
-msgid "Done"
-msgstr ""
-
-#: oflib.c:2135
-msgid "Checking for new fonts"
-msgstr ""
-
-#: oflib.c:2135
-msgid "Checking server for additional fonts"
-msgstr ""
-
-#
-#: openfontdlg.c:40
-msgid "All Fonts"
-msgstr "所有字体"
-
-#
-#: openfontdlg.c:80
-msgid "Outline Fonts"
-msgstr "轮廓字体"
-
-#
-#: openfontdlg.c:109
-msgid "Bitmap Fonts"
-msgstr "位图字体"
-
-#
-#: openfontdlg.c:124
-msgid "PostScript"
-msgstr "PostScript"
-
-#
-#: openfontdlg.c:126 openfontdlg.c:128 openfontdlg.c:130 prefs.c:507
-#: savefontdlg.c:720
-msgid "OpenType"
-msgstr "OpenType"
-
-#
-#: openfontdlg.c:132
-msgid "Type1"
-msgstr "Type1"
-
-#
-#: openfontdlg.c:133
-msgid "Type2"
-msgstr "Type2"
-
-#
-#: openfontdlg.c:134
-msgid "Type3"
-msgstr "Type3"
-
-#
-#: openfontdlg.c:138
-msgid "FontForge's SFD"
-msgstr "FontForge SFD格式"
-
-#: openfontdlg.c:139
-msgid "Backup SFD"
-msgstr "备份SFD"
-
-#
-#: openfontdlg.c:140
-msgid "Extract from PDF"
-msgstr "从PDF提取"
-
-#: openfontdlg.c:142
-msgid "Archives"
-msgstr ""
-
-#
-#: openfontdlg.c:143
-msgid "All Files"
-msgstr "所有文件"
-
-#
-#: openfontdlg.c:193
-msgid "Edit Filter List"
-msgstr "编辑过滤列表"
-
-#
-#: openfontdlg.c:277
-msgid "Filter"
-msgstr "过滤"
-
-#
-#: openfontdlg.c:343
-msgid "Edit Font Filters"
-msgstr "编辑字体过滤器"
-
-#
-#: openfontdlg.c:401
-msgid "Filter|New"
-msgstr "新建"
-
-#
-#: openfontdlg.c:622
-msgid "Filter:"
-msgstr "过滤:"
-
-#
-#: openfontdlg.c:627 openfontdlg.c:633
-msgid "Display files of this type"
-msgstr "显示此类文件"
-
-#
-#: openfontdlg.c:643 savefontdlg.c:2552
-msgid "Force glyph names to:"
-msgstr "限定字形名为："
-
-#: openfontdlg.c:648 openfontdlg.c:655 savefontdlg.c:2557 savefontdlg.c:2565
-#: savefontdlg.c:2598
-msgid ""
-"In the saved font, force all glyph names to match those in the specified "
-"namelist"
-msgstr ""
-
-#
-#: openfontdlg.c:660 savefontdlg.c:2570
-msgid "No Rename"
-msgstr "无重命名"
-
-#: othersubrs.c:514
-msgid "Too many subroutines. We can deal with at most 14 (0-13)\n"
-msgstr ""
-
-#: palmfonts.c:188
-msgid "Warning: Byte swapped font mark in palm font.\n"
-msgstr ""
-
-#: palmfonts.c:304
-msgid "Warning: Font Bucket version 4 treated as 0.\n"
-msgstr ""
-
-#
-#: palmfonts.c:467 palmfonts.c:471 palmfonts.c:481 palmfonts.c:486
-#: palmfonts.c:491
-msgid "Bad Metrics"
-msgstr "不良尺寸"
-
-#: palmfonts.c:467
-msgid "Only the first 256 glyphs in the encoding will be used"
-msgstr ""
-
-#: palmfonts.c:471
-#, c-format
-msgid "One of the fonts %1$d,%2$d is missing glyph %3$d"
-msgstr ""
-
-#: palmfonts.c:481
-#, c-format
-msgid ""
-"In font %1$d the glyph %2$.30s either starts before 0, or extends after the "
-"advance width or is above the ascent or below the descent"
-msgstr ""
-
-#: palmfonts.c:486
-#, c-format
-msgid ""
-"In font %1$d the advance width of glyph %2$.30s does not scale the base "
-"advance width properly, it shall be forced to the proper value"
-msgstr ""
-
-#: palmfonts.c:491
-#, c-format
-msgid "Advance width of glyph %.30s must be less than 127"
-msgstr ""
-
-#
-#: palmfonts.c:618
-msgid "Unexpected density"
-msgstr "未料到的密度数值"
-
-#: palmfonts.c:618
-#, c-format
-msgid ""
-"One of the bitmap fonts specified, %1$d, is not an integral scale up of the "
-"smallest font, %2$d (or is too large a factor)"
-msgstr ""
-
-#
-#: palmfonts.c:637
-msgid "Multiple-Density Font"
-msgstr "多密度字体"
-
-#
-#: palmfonts.c:638
-msgid "High-Density Font"
-msgstr "高密度字体"
-
-#: palmfonts.c:639
-msgid "Single and Multi-Density Fonts"
-msgstr ""
-
-#: palmfonts.c:640
-msgid "Single and High-Density Fonts"
-msgstr ""
-
-#
-#: palmfonts.c:642
-msgid "Choose a file format..."
-msgstr "选择文件格式..."
-
-#: palmfonts.c:642
-msgid "What type(s) of palm font records do you want?"
-msgstr ""
-
-#: parsepdf.c:462
-msgid "Compressed object container is itself a compressed object"
-msgstr ""
-
-#
-#: parsepdf.c:811 parsepdf.c:827
-msgid "Flate decompression failed.\n"
-msgstr "解压缩失败。\n"
-
-#: parsepdf.c:870
-msgid "A pdf stream object may not be a compressed object"
-msgstr ""
-
-#: parsepdf.c:874
-msgid "A pdf stream object is missing a Length attribute"
-msgstr ""
-
-#
-#: parsepdf.c:910
-#, c-format
-msgid "Unsupported filter: %s"
-msgstr "不支持的过滤: %s"
-
-#. GT: NaN is a concept in IEEE floating point which means "Not a Number"
-#. GT: it is used to represent errors like 0/0 or sqrt(-1).
-#: parsepdf.c:1175 psread.c:539
-#, c-format
-msgid "Bad number, infinity or nan: %s\n"
-msgstr ""
-
-#: parsepdf.c:1314 psread.c:2650
-msgid "No mark in ] (close array)\n"
-msgstr ""
-
-#: parsepdf.c:1617
-#, c-format
-msgid "Syntax error while parsing type3 glyph: %s"
-msgstr ""
-
-#: parsepdf.c:1629 parsepdf.c:1638
-msgid "Syntax error while parsing pdf graphics"
-msgstr ""
-
-#: parsepdf.c:1634
-msgid "Syntax error while parsing pdf graphics: Page with no Contents"
-msgstr ""
-
-#: parsepdf.c:1811
-msgid "Syntax errors while parsing ToUnicode CMap"
-msgstr ""
-
-#: parsepdf.c:1902
-msgid "Syntax errors while parsing Type3 font headers"
-msgstr ""
-
-#: parsepdf.c:1940
-#, c-format
-msgid ""
-"The font %s is one of the standard fonts. It isn't actually in the file."
-msgstr ""
-
-#: parsepdf.c:1973
-#, c-format
-msgid "Unable to parse the pdf objects that make up %s"
-msgstr ""
-
-#
-#: parsepdf.c:2007 parsepdf.c:2049 parsepdf.c:2136
-msgid "Doesn't look like a valid pdf file, couldn't find xref section"
-msgstr "不像有效的pdf文件，未能找到xref段"
-
-#: parsepdf.c:2014 parsepdf.c:2055 parsepdf.c:2142
-msgid ""
-"This pdf file contains an /Encrypt dictionary, and FontForge does not "
-"currently\n"
-"support pdf encryption"
-msgstr ""
-
-#
-#: parsepdf.c:2061
-msgid "This pdf file has no fonts"
-msgstr "此pdf文件不含字体"
-
-#: parsepdf.c:2148
-msgid "This pdf file has no pages"
-msgstr ""
-
-#: parsepdf.c:2162
-#, c-format
-msgid "There are %d pages in this file, which do you want?"
-msgstr ""
-
-#: parsepdf.c:2163
-msgid "Pick a page"
-msgstr ""
-
-#: parsepfa.c:1347 parsepfa.c:1402
-msgid "Invalid hex digit in sfnts array\n"
-msgstr ""
-
-#: parsepfa.c:1384
-msgid "Invalid character outside of string in sfnts array\n"
-msgstr ""
-
-#
-#: parsepfa.c:1526 parsepfa.c:1974
-#, c-format
-msgid "Index too big (must be <%d) \"%s"
-msgstr "索引太大 (应小于%d) \"%s"
-
-#
-#: parsepfa.c:1535 parsepfa.c:1682 parsepfa.c:1941 parsepfa.c:1978
-#, c-format
-msgid "Didn't understand \"%s"
-msgstr "不理解·\"%s"
-
-#
-#: parsepfa.c:1546 parsepfa.c:1984
-#, c-format
-msgid "No name for CharStrings dictionary \"%s"
-msgstr "字符字串字典无名称 \"%s"
-
-#
-#: parsepfa.c:1551 parsepfa.c:1988
-#, c-format
-msgid "Too many entries in CharStrings dictionary \"%s"
-msgstr "字符字串字典中有过多项 \"%s"
-
-#
-#: parsepfa.c:1712 parsepfa.c:1808
-msgid "Ignoring duplicate /CharStrings entry\n"
-msgstr "忽略重复的 /字符字串项\n"
-
-#
-#: parsepfa.c:1720
-msgid "Ignoring duplicate /Subrs entry\n"
-msgstr "忽略重复的 /Subrs 项目\n"
-
-#: parsepfa.c:1874
-msgid ""
-"This font contains a \"UniqueId\" variable, but the correct name for it is\n"
-"\t\"UniqueID\" (postscript is case concious)\n"
-msgstr ""
-
-#: parsepfa.c:1954
-msgid "Bad CharString. Does not include lenIV bytes.\n"
-msgstr ""
-
-#
-#: parsepfa.c:1968
-#, c-format
-msgid "Duplicate definition of subroutine %d\n"
-msgstr "复制子程序 %d的定义\n"
-
-#
-#: parsepfa.c:2024
-#, c-format
-msgid "Shouldn't be in addinfo \"%s"
-msgstr "不应在addinfo中 \"%s"
-
-#: parsepfa.c:2354
-#, c-format
-msgid "Invalid FD (%d) assigned to CID %d.\n"
-msgstr ""
-
-#
-#: parsepfa.c:2364
-#, c-format
-msgid "Bad CID offset for CID %d\n"
-msgstr "CID %d 不良偏移\n"
-
-#: parsepfa.c:2439
-msgid "Failed to parse the StartData command properly\n"
-msgstr ""
-
-#: parsepfa.c:2446
-msgid "Failed to parse the StartData command properly, bad count\n"
-msgstr ""
-
-#
-#: parsepfa.c:2577
-msgid "Cannot open a temporary file\n"
-msgstr "未能打开临时文件\n"
-
-#
-#: parsepfa.c:2606
-#, c-format
-msgid "Cannot open %s\n"
-msgstr "未能打开 %s\n"
-
-#: parsettf.c:418
-#, c-format
-msgid ""
-"The truetype encoding specified by platform=%d specific=%d (which we map to "
-"%s) is not supported by your version of iconv(3).\n"
-msgstr ""
-
-#
-#. GT: The user is trying to open a font file which contains multiple fonts and
-#. GT: has asked for a font which is not in that file.
-#. GT: The string will look like: <fontname> is not in <filename>
-#: parsettf.c:625
-#, c-format
-msgid "%1$s is not in %2$.100s"
-msgstr "%1$s 不在 %2$.100s"
-
-#: parsettf.c:733
-#, c-format
-msgid ""
-"Unexpected values for binsearch header. Based on the number of tables I\n"
-" expect searchRange=%d (not %d), entrySel=%d (not %d) rangeShift=%d (not "
-"%d)\n"
-msgstr ""
-
-#: parsettf.c:739
-msgid "An sfnt file must contain SOME tables, but this one does not."
-msgstr ""
-
-#: parsettf.c:744
-msgid ""
-"An sfnt file may contain a large number of tables, but this one has over "
-"1000\n"
-" and that seems like too many\n"
-msgstr ""
-
-#: parsettf.c:758
-#, c-format
-msgid ""
-"Table tags should be in alphabetic order in the font header\n"
-" but '%c%c%c%c', appears after '%c%c%c%c'."
-msgstr ""
-
-#: parsettf.c:777
-#, c-format
-msgid "Same table tag, '%c%c%c%c', appears twice in sfnt header"
-msgstr ""
-
-#: parsettf.c:783
-#, c-format
-msgid "Tables '%c%c%c%c' and '%c%c%c%c' overlap"
-msgstr ""
-
-#: parsettf.c:789
-#, c-format
-msgid "Table '%c%c%c%c' extends beyond end of file."
-msgstr ""
-
-#: parsettf.c:796
-msgid "File checksum is incorrect."
-msgstr ""
-
-#: parsettf.c:801
-#, c-format
-msgid "Table '%c%c%c%c' has a bad checksum."
-msgstr ""
-
-#: parsettf.c:813
-#, c-format
-msgid "Table '%c%c%c%c' has a bad length, must be even."
-msgstr ""
-
-#: parsettf.c:819
-#, c-format
-msgid "Table '%c%c%c%c' has a bad length, must be 54 but is %d."
-msgstr ""
-
-#: parsettf.c:828
-#, c-format
-msgid "Table '%c%c%c%c' has a bad length, must be 36 but is %d."
-msgstr ""
-
-#: parsettf.c:835
-#, c-format
-msgid "Table '%c%c%c%c' has a bad length, must be 32 or 6 but is %d."
-msgstr ""
-
-#: parsettf.c:842
-#, c-format
-msgid "Table '%c%c%c%c' has a bad length, must be 78, 86 or 96 but is %d."
-msgstr ""
-
-#: parsettf.c:864
-msgid "Missing required table: \"head\""
-msgstr ""
-
-#: parsettf.c:866
-msgid "Missing required table: \"hhea\""
-msgstr ""
-
-#: parsettf.c:868
-msgid "Missing required table: \"maxp\""
-msgstr ""
-
-#: parsettf.c:870
-msgid "Missing required table: \"post\""
-msgstr ""
-
-#: parsettf.c:872
-msgid "Missing required table: \"name\""
-msgstr ""
-
-#: parsettf.c:874
-msgid "Missing required table: \"loca\""
-msgstr ""
-
-#: parsettf.c:876
-msgid "Missing \"OS/2\" table"
-msgstr ""
-
-#: parsettf.c:878
-msgid "Missing required table: \"glyf\""
-msgstr ""
-
-#: parsettf.c:880
-msgid "This font contains neither \"CFF \" nor \"glyf\"/\"loca\" tables"
-msgstr ""
-
-#: parsettf.c:887
-msgid "accent attachment table"
-msgstr ""
-
-#: parsettf.c:888
-msgid "axis variation table"
-msgstr ""
-
-#: parsettf.c:889
-msgid "Baseline table (OT version)"
-msgstr ""
-
-#: parsettf.c:890
-msgid "bitmap data table (AAT version)"
-msgstr ""
-
-#: parsettf.c:891
-msgid "BDF bitmap properties table"
-msgstr ""
-
-#: parsettf.c:892
-msgid "bitmap font header table"
-msgstr ""
-
-#: parsettf.c:893
-msgid "bitmap location table (AAT version)"
-msgstr ""
-
-#: parsettf.c:894
-msgid "baseline table (AAT version)"
-msgstr ""
-
-#: parsettf.c:895
-msgid "PostScript font program (Compact Font Format)"
-msgstr ""
-
-#: parsettf.c:896
-msgid "Obsolete table for a type1 CID keyed font"
-msgstr ""
-
-#: parsettf.c:897
-msgid "character code mapping table"
-msgstr ""
-
-#: parsettf.c:898
-msgid "CVT variation table"
-msgstr ""
-
-#: parsettf.c:899
-msgid "control value table"
-msgstr ""
-
-#: parsettf.c:900
-msgid "digital signature table"
-msgstr ""
-
-#: parsettf.c:901
-msgid "bitmap data table (OT version)"
-msgstr ""
-
-#: parsettf.c:902
-msgid "bitmap location table (OT version)"
-msgstr ""
-
-#: parsettf.c:903
-msgid "embedded bitmap scaling control table"
-msgstr ""
-
-#: parsettf.c:904
-msgid "electronic end user license table"
-msgstr ""
-
-#: parsettf.c:905
-msgid "font descriptor table"
-msgstr ""
-
-#: parsettf.c:906
-msgid "layout feature table"
-msgstr ""
-
-#: parsettf.c:907
-msgid "SIL Graphite layout feature table"
-msgstr ""
-
-#: parsettf.c:908
-msgid "FontForge time stamp table"
-msgstr ""
-
-#: parsettf.c:909
-msgid "font metrics table"
-msgstr ""
-
-#: parsettf.c:910
-msgid "font program table"
-msgstr ""
-
-#: parsettf.c:911
-msgid "font variation table"
-msgstr ""
-
-#: parsettf.c:912
-msgid "grid-fitting and scan-conversion procedure table"
-msgstr ""
-
-#: parsettf.c:913
-msgid "glyph definition table"
-msgstr ""
-
-#: parsettf.c:914
-msgid "Graphite glyph attribute table"
-msgstr ""
-
-#: parsettf.c:915
-msgid "Graphite glyph location in Glat table"
-msgstr ""
-
-#: parsettf.c:916
-msgid "glyph outline table"
-msgstr ""
-
-#: parsettf.c:917
-msgid "glyph positioning table"
-msgstr ""
-
-#: parsettf.c:918
-msgid "glyph variation table"
-msgstr ""
-
-#: parsettf.c:919
-msgid "glyph substitution table"
-msgstr ""
-
-#: parsettf.c:920
-msgid "horizontal device metrics table"
-msgstr ""
-
-#: parsettf.c:921
-msgid "font header table"
-msgstr ""
-
-#: parsettf.c:922
-msgid "horizontal header table"
-msgstr ""
-
-#: parsettf.c:923
-msgid "horizontal metrics table"
-msgstr ""
-
-#: parsettf.c:924
-msgid "horizontal style table"
-msgstr ""
-
-#: parsettf.c:925
-msgid "justification table (AAT version)"
-msgstr ""
-
-#: parsettf.c:926
-msgid "justification table (OT version)"
-msgstr ""
-
-#: parsettf.c:927
-msgid "kerning table"
-msgstr ""
-
-#: parsettf.c:928
-msgid "ligature caret table"
-msgstr ""
-
-#: parsettf.c:929
-msgid "glyph location table"
-msgstr ""
-
-#: parsettf.c:930
-msgid "linear threshold table"
-msgstr ""
-
-#: parsettf.c:931
-msgid "math table"
-msgstr ""
-
-#: parsettf.c:932
-msgid "maximum profile table"
-msgstr ""
-
-#: parsettf.c:933 parsettf.c:934
-msgid "Multi-Master table, obsolete"
-msgstr ""
-
-#: parsettf.c:935
-msgid "metamorphosis table"
-msgstr ""
-
-#: parsettf.c:936
-msgid "extended metamorphosis table"
-msgstr ""
-
-#: parsettf.c:937
-msgid "name table"
-msgstr ""
-
-#: parsettf.c:938
-msgid "optical bounds table"
-msgstr ""
-
-#: parsettf.c:939
-msgid "OS/2 and Windows specific metrics table"
-msgstr ""
-
-#: parsettf.c:940
-msgid "PCL 5 data table"
-msgstr ""
-
-#: parsettf.c:941
-msgid "FontForge font debugging table"
-msgstr ""
-
-#: parsettf.c:942
-msgid "glyph name and PostScript compatibility table"
-msgstr ""
-
-#: parsettf.c:943
-msgid "control value program table"
-msgstr ""
-
-#: parsettf.c:944
-msgid "properties table"
-msgstr ""
-
-#: parsettf.c:945
-msgid "SIL Graphite rule table"
-msgstr ""
-
-#: parsettf.c:946
-msgid "(unspecified) SIL Graphite table"
-msgstr ""
-
-#: parsettf.c:947
-msgid "unknown SIL table"
-msgstr ""
-
-#: parsettf.c:948
-msgid "TeX table"
-msgstr ""
-
-#: parsettf.c:949
-msgid "tracking table"
-msgstr ""
-
-#: parsettf.c:950
-msgid "Obsolete table for a type1 font"
-msgstr ""
-
-#: parsettf.c:951
-msgid "vertical device metrics table"
-msgstr ""
-
-#: parsettf.c:952
-msgid "vertical header table"
-msgstr ""
-
-#: parsettf.c:953
-msgid "vertical metrics table"
-msgstr ""
-
-#: parsettf.c:954
-msgid "vertical origin table"
-msgstr ""
-
-#: parsettf.c:955
-msgid "glyph reference table"
-msgstr ""
-
-#: parsettf.c:982
-msgid "Nifty, you've got one of the old Apple/Adobe type1 sfnts here\n"
-msgstr ""
-
-#: parsettf.c:1082 tottf.c:4192
-#, c-format
-msgid ""
-"Windows has decided that fonts with 'name' tables bigger than 5K are\n"
-"insecure and will refuse to load them. Don't ask me why they believe this.\n"
-"This font has a name table which is %d bytes and is bigger than this limit.\n"
-msgstr ""
-
-#: parsettf.c:1187
-msgid "The following table(s) in the font have been ignored by FontForge\n"
-msgstr ""
-
-#: parsettf.c:1194
-#, c-format
-msgid "  Ignoring '%c%c%c%c'\n"
-msgstr ""
-
-#: parsettf.c:1196
-#, c-format
-msgid "  Ignoring '%c%c%c%c' %s\n"
-msgstr ""
-
-#: parsettf.c:1203
-msgid ""
-"This font contains both truetype and PostScript glyph descriptions\n"
-"  only one will be used.\n"
-msgstr ""
-
-#: parsettf.c:1207
-msgid ""
-"This font contains multiple glyph descriptions\n"
-"  only one will be used.\n"
-msgstr ""
-
-#: parsettf.c:1209
-msgid ""
-"This font contains both a 'kern' table and a 'GPOS' table.\n"
-"  The 'kern' table will only be read if there is no 'kern' feature in "
-"'GPOS'.\n"
-msgstr ""
-
-#: parsettf.c:1211
-msgid ""
-"This font contains both a 'mor[tx]' table and a 'GSUB' table.\n"
-"  FF will only read feature/settings in 'morx' which do not match features\n"
-"  found in 'GSUB'.\n"
-msgstr ""
-
-#: parsettf.c:1213
-msgid ""
-"This font contains both a 'BASE' table and a 'bsln' table.\n"
-"  FontForge will only read one of them ('BASE').\n"
-msgstr ""
-
-#
-#: parsettf.c:1325
-msgid "Bad Glyph Count"
-msgstr "不良字形计数"
-
-#: parsettf.c:1325
-#, c-format
-msgid "Font file has bad glyph count field. maxp says: %d sizeof(loca)=>%d"
-msgstr ""
-
-#: parsettf.c:1420
-#, c-format
-msgid ""
-"The fontname begins with the utf8 byte order sequence. This is illegal. %s"
-msgstr ""
-
-#: parsettf.c:1439 parsettf.c:1450
-#, c-format
-msgid ""
-"The PostScript font name \"%.63s\" is invalid.\n"
-"It should be printable ASCII,\n"
-"must not contain (){}[]<>%%/ or space\n"
-"and must be shorter than 63 characters"
-msgstr ""
-
-#: parsettf.c:1564
-#, c-format
-msgid ""
-"Warning: Mac and Unicode entries in the 'name' table differ for the\n"
-" %s string in the language %s\n"
-" Mac String: %s\n"
-"Mac Unicode String: %s\n"
-msgstr ""
-
-#: parsettf.c:1568
-#, c-format
-msgid ""
-"Warning: Mac string is a subset of the Unicode string in the 'name' table\n"
-" for the %s string in the %s language.\n"
-msgstr ""
-
-#: parsettf.c:1573
-#, c-format
-msgid ""
-"Warning: Mac and Windows entries in the 'name' table differ for the\n"
-" %s string in the language %s\n"
-" Mac String: %s\n"
-"Windows String: %s\n"
-msgstr ""
-
-#: parsettf.c:1577
-#, c-format
-msgid ""
-"Warning: Mac string is a subset of the Windows string in the 'name' table\n"
-" for the %s string in the %s language.\n"
-msgstr ""
-
-#
-#: parsettf.c:1591
-msgid "Use _First"
-msgstr "用第一个(_F)"
-
-#
-#: parsettf.c:1592
-msgid "First to _All"
-msgstr "首先(_A)"
-
-#
-#: parsettf.c:1593
-msgid "Second _to All"
-msgstr "其次(_T)"
-
-#
-#: parsettf.c:1594
-msgid "Use _Second"
-msgstr "用第二个"
-
-#
-#: parsettf.c:1596
-msgid "Multiple names for language"
-msgstr "语言的多个名称"
-
-#: parsettf.c:1597
-#, c-format
-msgid ""
-"The 'name' table contains (at least) two strings for the %s in language %s, "
-"the first '%.12s...' the second '%.12s...'.\n"
-"Which do you prefer?"
-msgstr ""
-
-#: parsettf.c:1940
-#, c-format
-msgid "Bad tt font: contour ends make no sense in glyph %d.\n"
-msgstr ""
-
-#: parsettf.c:1991 parsettf.c:2014
-#, c-format
-msgid "A point in GID %d is outside the glyph bounding box\n"
-msgstr ""
-
-#: parsettf.c:2034
-msgid "Reached end of file when reading simple glyph\n"
-msgstr ""
-
-#
-#: parsettf.c:2045
-#, c-format
-msgid "Empty composite %d\n"
-msgstr "空组合 %d\n"
-
-#: parsettf.c:2052
-#, c-format
-msgid "Bad flags value, implied MORE components at end of glyph %d\n"
-msgstr ""
-
-#: parsettf.c:2060
-#, c-format
-msgid "Reference to glyph %d out of bounds when parsing 'glyf' table.\n"
-msgstr ""
-
-#: parsettf.c:2076
-#, c-format
-msgid "Use-my-metrics flag set on at least two components in glyph %d\n"
-msgstr ""
-
-#: parsettf.c:2160
-#, c-format
-msgid "Glyph %d attempts to reference glyph %d which is outside the font\n"
-msgstr ""
-
-#: parsettf.c:2170
-msgid "Reached end of file when reading composit glyph\n"
-msgstr ""
-
-#: parsettf.c:2200
-#, c-format
-msgid ""
-"Bad glyph (%d), its definition extends beyond the end of the glyf table\n"
-msgstr ""
-
-#: parsettf.c:2206
-#, c-format
-msgid "Bad glyph (%d), its data length is negative\n"
-msgstr ""
-
-#: parsettf.c:2225
-#, c-format
-msgid "Glyph bounding box data exceeds font bounding box data for GID %d\n"
-msgstr ""
-
-#: parsettf.c:2240
-#, c-format
-msgid "Bad glyph (%d), disordered 'loca' table (start comes after end)\n"
-msgstr ""
-
-#: parsettf.c:2243
-#, c-format
-msgid ""
-"Bad glyph (%d), its definition extends beyond the space allowed for it\n"
-msgstr ""
-
-#
-#. GT: The CFF font type contains a thing called a name INDEX, and that INDEX
-#. GT: is bad. It is an index of many of the names used in the CFF font.
-#. GT: We hope the user will never see this.
-#: parsettf.c:2724
-msgid "Bad CFF name INDEX\n"
-msgstr "不良 CFF 名称 INDEX\n"
-
-#
-#: parsettf.c:2804
-#, c-format
-msgid "Unexpected value in dictionary %d\n"
-msgstr "未预期的值于字典 %d\n"
-
-#. GT: DICT is a magic term inside CFF fonts, as is INDEX, and I guess CFF and type2
-#: parsettf.c:2821
-msgid ""
-"FontForge does not support type2 programs embedded in CFF DICT INDICES.\n"
-msgstr ""
-
-#: parsettf.c:2962
-msgid "Bad subroutine INDEX in cff font.\n"
-msgstr ""
-
-#
-#: parsettf.c:3010
-msgid "No argument to operator\n"
-msgstr "操作符无参数\n"
-
-#: parsettf.c:3080
-msgid "FontForge does not support synthetic fonts\n"
-msgstr ""
-
-#: parsettf.c:3094
-msgid "FontForge does not support type2 multiple master fonts\n"
-msgstr ""
-
-#: parsettf.c:3138
-msgid "FontForge does not support Chameleon fonts\n"
-msgstr ""
-
-#
-#: parsettf.c:3141 parsettf.c:3272
-#, c-format
-msgid "Unknown operator in %s: %x\n"
-msgstr "未知操作符于 %s: %x\n"
-
-#: parsettf.c:3177
-#, c-format
-msgid "No argument to operator %d in private dict\n"
-msgstr ""
-
-#
-#: parsettf.c:3318
-#, c-format
-msgid "Bad sid %d (must be less than %d)\n"
-msgstr "错误的 sid %d (应小于 %d)\n"
-
-#
-#: parsettf.c:3380
-#, c-format
-msgid "Unexpected encoding format in cff: %d\n"
-msgstr "未预期的编码格式于cff: %d\n"
-
-#
-#: parsettf.c:3504
-#, c-format
-msgid "Unexpected charset format in cff: %d\n"
-msgstr "未预期的字符集格式于 cff: %d\n"
-
-#
-#: parsettf.c:3527
-msgid "Bad fdselect\n"
-msgstr "不良 fd 选择\n"
-
-#
-#: parsettf.c:3535
-#, c-format
-msgid "Didn't understand format for fdselect %d\n"
-msgstr "不能理解的格式fdselect %d\n"
-
-#
-#: parsettf.c:3889 parsettf.c:6413
-msgid "CFF version mismatch\n"
-msgstr "CFF 版本不匹配\n"
-
-#: parsettf.c:4081
-msgid "Invalid ttf hmtx table (or hhea), numOfLongMetrics is 0\n"
-msgstr ""
-
-#: parsettf.c:4160
-msgid "Invalid ttf vmtx table (or vhea), numOfLongVerMetrics is 0\n"
-msgstr ""
-
-#: parsettf.c:4268
-#, c-format
-msgid ""
-"Encoding subtable for platform=%d, specific=%d has an unsupported format "
-"%d.\n"
-msgstr ""
-
-#: parsettf.c:4283
-#, c-format
-msgid ""
-"Encoding subtable for platform=%d, specific=%d has a 0 length subtable.\n"
-msgstr ""
-
-#: parsettf.c:4300
-#, c-format
-msgid ""
-"Encoding subtable for platform=%d, specific=%d (which must be 14)\n"
-"has an unsupported format %d.\n"
-msgstr ""
-
-#: parsettf.c:4349
-#, c-format
-msgid "No glyph with unicode U+%05x in font\n"
-msgstr "统一码编码为 U+%05x 的字形不存在于字体\n"
-
-#: parsettf.c:4382
-#, c-format
-msgid "GID out of range (%d) in format 14 'cmap' subtable\n"
-msgstr ""
-
-#
-#: parsettf.c:4429
-msgid "Script|Roman"
-msgstr "Script|Roman"
-
-#
-#: parsettf.c:4429
-msgid "Script|Japanese"
-msgstr "日文"
-
-#
-#: parsettf.c:4429
-msgid "Script|Traditional Chinese"
-msgstr "繁体中文"
-
-#
-#: parsettf.c:4429
-msgid "Script|Korean"
-msgstr "朝鲜文"
-
-#
-#. GT: Don't ask me what RSymbol means, I don't know either. It's in apple's
-#. GT:  docs though
-#: parsettf.c:4433
-msgid "Script|Cyrillic"
-msgstr "Script|Cyrillic"
-
-#
-#: parsettf.c:4433
-msgid "Script|RSymbol"
-msgstr "Script|RSymbol"
-
-#
-#: parsettf.c:4433
-msgid "Script|Devanagari"
-msgstr "Script|Devanagari"
-
-#
-#: parsettf.c:4434
-msgid "Script|Gurmukhi"
-msgstr "Script|Gurmukhi"
-
-#
-#: parsettf.c:4436
-msgid "Script|Simplified Chinese"
-msgstr "简体中文"
-
-#
-#: parsettf.c:4437
-msgid "Script|Central European"
-msgstr "中欧"
-
-#
-#: parsettf.c:4450
-msgid "Unicode 1.0"
-msgstr "统一码1.0"
-
-#
-#: parsettf.c:4453
-msgid "Unicode 1.1"
-msgstr "统一码1.1"
-
-#
-#: parsettf.c:4456
-msgid "ISO 10646:1993"
-msgstr "ISO 10646:1993"
-
-#
-#: parsettf.c:4459
-msgid "Unicode 2.0+, BMP only"
-msgstr "统一码2.0+，基础页"
-
-#
-#: parsettf.c:4462
-msgid "Unicode 2.0+, all planes"
-msgstr "统一码2.0+，所有页"
-
-#
-#: parsettf.c:4466
-msgid "\"Symbol\""
-msgstr "符号"
-
-#
-#: parsettf.c:4474
-msgid "ISO (Deprecated)"
-msgstr "ISO (不建议)"
-
-#
-#: parsettf.c:4475
-msgid "MicroSoft"
-msgstr "MicroSoft"
-
-#
-#: parsettf.c:4477
-msgid "FreeType internals"
-msgstr "FreeType 内部"
-
-#
-#: parsettf.c:4492 parsettf.c:4493
-msgid "Pick a CMap subtable"
-msgstr "选择CMap替代表"
-
-#
-#: parsettf.c:4553
-msgid "Could not find any valid encoding tables"
-msgstr "未能找到任何有效的编码表"
-
-#: parsettf.c:4614
-msgid "Could not find a usable encoding table"
-msgstr ""
-
-#
-#: parsettf.c:4743 parsettf.c:4787 parsettf.c:4793
-#, c-format
-msgid "Attempt to encode missing glyph %d to %d (0x%x)\n"
-msgstr "试图将缺失的字形 %d 编码为 %d (0x%x)\n"
-
-#: parsettf.c:4751 parsettf.c:4801
-#, c-format
-msgid ""
-"Multiple glyphs map to the same unicode encoding U+%04X, only one will be "
-"used\n"
-msgstr ""
-
-#: parsettf.c:4774
-#, c-format
-msgid ""
-"Glyph index out of bounds. Was %d, must be less than %d.\n"
-" In attempt to associate a glyph with encoding %x in segment %d\n"
-" with platform=%d, specific=%d (in 'cmap')\n"
-msgstr ""
-
-#: parsettf.c:4816
-msgid ""
-"Use of a range offset of 0xffff to mean a missing glyph in cmap table\n"
-msgstr ""
-
-#
-#: parsettf.c:5001
-msgid "Bad font: Encoding data out of range.\n"
-msgstr "不良字体: 编码超出范围。\n"
-
-#
-#: parsettf.c:5118
-#, c-format
-msgid "Warning: Glyph %d has the same name (%s) as Glyph %d\n"
-msgstr "警告:字形 %d 的名称 (%s) 相同于字形 %d\n"
-
-#
-#: parsettf.c:5121
-#, c-format
-msgid ""
-"Warning: Glyph %d is named %s which should mean it is mapped to\n"
-" Unicode U+%04X, but Glyph %d already has that encoding.\n"
-msgstr ""
-"警告: 字形 %d 命名为 %s 意为它应映射到\n"
-" 统一码 U+%04X, 但字形 %d 已经用了这个编码。\n"
-
-#
-#: parsettf.c:5141
-msgid "Reading Names"
-msgstr "读取名称"
-
-#
-#: parsettf.c:5235
-#, c-format
-msgid ""
-"Glyph %d is called \".notdef\", a singularly inept choice of name (only "
-"glyph 0\n"
-" may be called .notdef)\n"
-"FontForge will rename it.\n"
-msgstr ""
-"字形 %d 被命名为 \".notdef\",  (只有字形 0\n"
-" 可被命名为 .notdef)\n"
-"FontForge 为之重命名。\n"
-
-#: parsettf.c:5364
-msgid "Invalid point match. Point would be after this reference.\n"
-msgstr ""
-
-#: parsettf.c:5389
-#, c-format
-msgid ""
-"Could not match points in composite glyph (%d to %d) when adding %s to %s\n"
-msgstr ""
-
-#
-#: parsettf.c:5433
-msgid "Fixing up References"
-msgstr "修整参照"
-
-#
-#: parsettf.c:5450
-#, c-format
-msgid "Unlikely length for table, so I'm ignoring it. %u\n"
-msgstr "不像表的长度,拟忽略之. %u\n"
-
-#
-#: parsettf.c:5501
-msgid "TTF 'glyf'"
-msgstr "TTF 'glyf'"
-
-#
-#: parsettf.c:5502
-msgid "OTF 'CFF '"
-msgstr "OTF 'CFF '"
-
-#: parsettf.c:5505
-msgid ""
-"This font contains both a TrueType 'glyf' table and an OpenType 'CFF ' "
-"table. FontForge can only deal with one at a time, please pick which one you "
-"want to use"
-msgstr ""
-
-#
-#: parsettf.c:5544
-msgid "No Bitmap Strikes"
-msgstr "无位图部件"
-
-#: parsettf.c:5544
-#, c-format
-msgid "No (useable) bitmap strikes in this TTF font: %s"
-msgstr ""
-
-#
-#: parsettf.c:5675 searchview.c:518 sfd.c:7641
-msgid "Yes"
-msgstr "确定"
-
-#
-#: parsettf.c:5676
-msgid "No"
-msgstr "否"
-
-#: parsettf.c:5693
-#, c-format
-msgid ""
-"The glyph named %.30s is not mapped to any unicode code point.\n"
-"But its name indicates it should be mapped to U+%04X.\n"
-msgstr ""
-"名为%.30s 的字形未被映射到任何统一码。\n"
-"但它的名称表明它映射到 U+%04X.\n"
-
-#: parsettf.c:5701
-#, c-format
-msgid ""
-"The glyph named %.30s is mapped to U+%04X.\n"
-"But its name indicates it should be mapped to U+%04X.\n"
-msgstr ""
-"名为%.30s 的字形被映射到 U+%04X.\n"
-"但它的名称表明它应映射到 U+%04X.\n"
-
-#
-#: parsettf.c:5712 parsettf.c:5715
-msgid "Bad glyph name"
-msgstr "不良字形名称"
-
-#: parsettf.c:5712
-#, c-format
-msgid ""
-"The glyph named %.30s is not mapped to any unicode code point. But its name "
-"indicates it should be mapped to U+%04X.\n"
-"Would you like to retain the name in spite of this?"
-msgstr ""
-"名为%.30s 的字形未被映射到任何统一码。但它的名称表明它映射到 U+%04X.\n"
-"你想忽略这个而保留它的名称么?"
-
-#: parsettf.c:5715
-#, c-format
-msgid ""
-"The glyph named %.30s is mapped to U+%04X.\n"
-"But its name indicates it should be mapped to U+%04X.\n"
-"Would you like to retain the name in spite of this?"
-msgstr ""
-"名为%.30s 的字形被映射到 U+%04X.\n"
-"但它的名称表明它应映射到 U+%04X.\n"
-"你想忽略这个而保留它的名称么?"
-
-#: parsettf.c:6312
-#, c-format
-msgid "A point in %s is outside the font bounding box data.\n"
-msgstr ""
-
-#: parsettf.c:6316
-#, c-format
-msgid ""
-"The advance width of %s (%d) does not match the font's advanceWidthMax (%d) "
-"and this is a fixed pitch font\n"
-msgstr ""
-
-#
-#: parsettfatt.c:48
-msgid "Bad Apple Kern Class\n"
-msgstr "不良 Apple 缩合类属\n"
-
-#: parsettfatt.c:73
-#, c-format
-msgid "Class index out of range %d (must be <%d)\n"
-msgstr ""
-
-#: parsettfatt.c:168
-msgid "GID out of range.\n"
-msgstr ""
-
-#: parsettfatt.c:226 parsettfatt.c:254
-msgid "coverage table extends beyond end of table\n"
-msgstr ""
-
-#
-#: parsettfatt.c:234
-msgid "Bad count.\n"
-msgstr "错误计数。\n"
-
-#: parsettfatt.c:239 parsettfatt.c:264
-msgid "End of file found in coverage table.\n"
-msgstr ""
-
-#: parsettfatt.c:245
-#, c-format
-msgid "Bad coverage table. Glyph %d out of range [0,%d)\n"
-msgstr ""
-
-#: parsettfatt.c:270
-#, c-format
-msgid "Bad coverage table. Glyph range %d-%d out of range [0,%d)\n"
-msgstr ""
-
-#: parsettfatt.c:289
-#, c-format
-msgid "Bad format for coverage table %d\n"
-msgstr ""
-
-#: parsettfatt.c:320
-#, c-format
-msgid "Bad class def table. start=%d cnt=%d, max glyph=%d\n"
-msgstr ""
-
-#: parsettfatt.c:324 parsettfatt.c:333
-msgid "Class definition sub-table extends beyond end of table\n"
-msgstr ""
-
-#: parsettfatt.c:341
-#, c-format
-msgid "Bad class def table. Glyph range %d-%d out of range [0,%d)\n"
-msgstr ""
-
-#
-#: parsettfatt.c:349
-#, c-format
-msgid "Unknown class table format: %d\n"
-msgstr "未知类属表格式: %d\n"
-
-#: parsettfatt.c:358
-#, c-format
-msgid ""
-"Nonsensical class assigned to a glyph-- class=%d is too big. Glyph=%d\n"
-msgstr ""
-
-#
-#: parsettfatt.c:405
-msgid "Bad device table\n"
-msgstr "不良设备表\n"
-
-#: parsettfatt.c:477
-#, c-format
-msgid "Bad pair position: glyphs %d & %d should have been < %d\n"
-msgstr ""
-
-#: parsettfatt.c:516
-#, c-format
-msgid "Bad kern pair: glyphs %d & %d should have been < %d\n"
-msgstr ""
-
-#. GT: This continues a multi-line error message, hence the leading space
-#: parsettfatt.c:561
-msgid " Bad pairwise kerning table, ignored\n"
-msgstr ""
-
-#. GT: This continues a multi-line error message, hence the leading space
-#: parsettfatt.c:604
-msgid " Bad kerning class table, ignored\n"
-msgstr ""
-
-#. GT: This continues a multi-line error message, hence the leading space
-#: parsettfatt.c:742
-msgid " Bad cursive alignment table, ignored\n"
-msgstr ""
-
-#
-#: parsettfatt.c:748
-#, c-format
-msgid "Cursive-%d"
-msgstr "草写-%d"
-
-#
-#: parsettfatt.c:804
-msgid "Bad mark table.\n"
-msgstr "不当标记表。\n"
-
-#: parsettfatt.c:815
-msgid "Class out of bounds in GPOS mark sub-table\n"
-msgstr ""
-
-#: parsettfatt.c:817
-#, c-format
-msgid "Class out of bounds in GPOS mark sub-table for mark %.30s\n"
-msgstr ""
-
-#
-#: parsettfatt.c:844
-msgid "Bad base table.\n"
-msgstr "不当基础表。\n"
-
-#
-#: parsettfatt.c:875
-msgid "Bad ligature base table.\n"
-msgstr "不良缩合基础表。\n"
-
-#
-#: parsettfatt.c:889
-msgid "Bad ligature anchor count.\n"
-msgstr "不良连写锚点计数.\n"
-
-#: parsettfatt.c:925
-msgid " Bad mark attachment table, ignored\n"
-msgstr ""
-
-#: parsettfatt.c:982
-msgid " Bad simple positioning table, ignored\n"
-msgstr ""
-
-#: parsettfatt.c:1011
-#, c-format
-msgid ""
-"Attempt to reference lookup %d (within a contextual lookup), but there are\n"
-" only %d lookups in %s\n"
-msgstr ""
-
-#. GT: This continues a multi-line error message, hence the leading space
-#: parsettfatt.c:1050
-msgid " Bad contextual table, ignored\n"
-msgstr ""
-
-#: parsettfatt.c:1071 parsettfatt.c:1213
-#, c-format
-msgid "Bad contextual or chaining sub table. Glyph %d out of range [0,%d)\n"
-msgstr ""
-
-#: parsettfatt.c:1084 parsettfatt.c:1233 parsettfatt.c:1352 parsettfatt.c:1506
-#, c-format
-msgid ""
-"Attempt to apply a lookup to a location out of the range of this contextual\n"
-" lookup seq=%d max=%d\n"
-msgstr ""
-
-#: parsettfatt.c:1162
-msgid " Bad contextual chaining table, ignored\n"
-msgstr ""
-
-#: parsettfatt.c:1177 parsettfatt.c:1188 parsettfatt.c:1200 parsettfatt.c:1224
-msgid "Unexpected end of file in contextual chaining subtable.\n"
-msgstr ""
-
-#: parsettfatt.c:1319 parsettfatt.c:1453
-msgid "Bad count in context chaining sub-table.\n"
-msgstr ""
-
-#: parsettfatt.c:1332 parsettfatt.c:1465 parsettfatt.c:1475 parsettfatt.c:1486
-msgid "Bad class count in contextual chaining sub-table.\n"
-msgstr ""
-
-#: parsettfatt.c:1342 parsettfatt.c:1496
-msgid "Bad count in contextual chaining sub-table.\n"
-msgstr ""
-
-#. GT: This continues a multi-line error message, hence the leading space
-#: parsettfatt.c:1385
-msgid " Bad contextual substitution table, ignored\n"
-msgstr ""
-
-#. GT: This continues a multi-line error message, hence the leading space
-#: parsettfatt.c:1540
-msgid " Bad contextual chaining substitution table, ignored\n"
-msgstr ""
-
-#: parsettfatt.c:1608
-msgid "End of file in context chaining sub-table.\n"
-msgstr ""
-
-#: parsettfatt.c:1619 parsettfatt.c:1705
-#, c-format
-msgid ""
-"Attempt to apply a lookup to a location out of the range of this contextual\n"
-" lookup seq=%d, max=%d\n"
-msgstr ""
-
-#: parsettfatt.c:1670 parsettfatt.c:1679 parsettfatt.c:1688 parsettfatt.c:1697
-msgid "End of file in context chaining subtable.\n"
-msgstr ""
-
-#: parsettfatt.c:1829
-msgid " Bad simple substitution table, ignored\n"
-msgstr ""
-
-#: parsettfatt.c:1873
-#, c-format
-msgid "Bad substitution glyph: GID %d not less than %d\n"
-msgstr ""
-
-#: parsettfatt.c:1914 parsettfatt.c:1943 parsettfatt.c:1955
-msgid "Unexpected end of file in GSUB sub-table.\n"
-msgstr ""
-
-#: parsettfatt.c:1924
-msgid " Bad multiple substitution table, ignored\n"
-msgstr ""
-
-#: parsettfatt.c:1929
-msgid ""
-"Coverage table specifies a different number of glyphs than the sub-table "
-"expects.\n"
-msgstr ""
-
-#: parsettfatt.c:1961
-#, c-format
-msgid "Bad Multiple/Alternate substitution glyph. GID %d not less than %d\n"
-msgstr ""
-
-#: parsettfatt.c:2013 parsettfatt.c:2029 parsettfatt.c:2037
-msgid "Unexpected end of file in GSUB ligature sub-table.\n"
-msgstr ""
-
-#: parsettfatt.c:2022
-msgid " Bad ligature table, ignored\n"
-msgstr ""
-
-#: parsettfatt.c:2045
-#, c-format
-msgid "Bad ligature glyph. GID %d not less than %d\n"
-msgstr ""
-
-#: parsettfatt.c:2052
-#, c-format
-msgid ""
-"Unlikely count of ligature components (%d), I suspect this ligature sub-\n"
-" table is garbage, I'm giving up on it.\n"
-msgstr ""
-
-#: parsettfatt.c:2063
-#, c-format
-msgid ""
-"Bad ligature component glyph. GID %d not less than %d (in ligature %d)\n"
-msgstr ""
-
-#: parsettfatt.c:2204
-#, c-format
-msgid ""
-"Bad reverse contextual chaining substitution glyph: %d is not less than %d\n"
-msgstr ""
-
-#: parsettfatt.c:2271
-#, c-format
-msgid ""
-"This font, %s, has multiple GPOS 'size' features. I'm not sure how to "
-"interpret that. I shall pick one arbitrarily.\n"
-msgstr ""
-
-#
-#: parsettfatt.c:2272
-msgid "<Untitled>"
-msgstr "<未命名>"
-
-#: parsettfatt.c:2292
-msgid ""
-"This font contains a 'size' feature with a design size and design range but "
-"no stylename. That is technically an error, but we'll let it pass"
-msgstr ""
-
-#: parsettfatt.c:2316
-msgid ""
-"The 'size' feature does not seem to follow the standard,\n"
-"nor does it conform to Adobe's early misinterpretation of\n"
-"the standard. I cannot parse it.\n"
-msgstr ""
-
-#: parsettfatt.c:2321
-msgid ""
-"The 'size' feature of this font conforms to Adobe's early misinterpretation "
-"of the otf standard.\n"
-msgstr ""
-
-#: parsettfatt.c:2346
-#, c-format
-msgid ""
-"The name parameter of the '%c%c%c%c' feature does not contain a valid name "
-"id.\n"
-msgstr ""
-
-#: parsettfatt.c:2349
-#, c-format
-msgid ""
-"The name parameter of the '%c%c%c%c' feature has an unlikely version number "
-"%d.\n"
-msgstr ""
-
-#: parsettfatt.c:2358
-#, c-format
-msgid ""
-"There are multiple name ids naming the '%c%c%c%c' feature\n"
-" this is technically legitimate, but fontforge can't handle it.\n"
-msgstr ""
-
-#: parsettfatt.c:2377 parsettfatt.c:2415
-#, c-format
-msgid "Attempt to read script data beyond end of %s table"
-msgstr ""
-
-#
-#: parsettfatt.c:2386
-#, c-format
-msgid "Too many scripts %d\n"
-msgstr "过多文字 %d\n"
-
-#: parsettfatt.c:2424
-#, c-format
-msgid "End of file when reading scripts in %s table"
-msgstr ""
-
-#: parsettfatt.c:2435
-#, c-format
-msgid "End of file in %s table"
-msgstr ""
-
-#: parsettfatt.c:2452 parsettfatt.c:2474
-#, c-format
-msgid "Attempt to read feature data beyond end of %s table"
-msgstr ""
-
-#
-#: parsettfatt.c:2461
-#, c-format
-msgid "Too many features %d\n"
-msgstr "过多特征 %d\n"
-
-#: parsettfatt.c:2490
-#, c-format
-msgid "End of file when reading features in %s table"
-msgstr ""
-
-#: parsettfatt.c:2509 parsettfatt.c:2531
-#, c-format
-msgid "Attempt to read lookup data beyond end of %s table"
-msgstr ""
-
-#
-#: parsettfatt.c:2521
-#, c-format
-msgid "Too many lookups %d\n"
-msgstr "过多查找 %d\n"
-
-#: parsettfatt.c:2557
-#, c-format
-msgid "End of file when reading lookups in %s table"
-msgstr ""
-
-#: parsettfatt.c:2601
-msgid "Lookup out of bounds in feature table.\n"
-msgstr ""
-
-#: parsettfatt.c:2634
-msgid "Required feature out of bounds in script table.\n"
-msgstr ""
-
-#: parsettfatt.c:2641
-msgid "Feature out of bounds in script table.\n"
-msgstr ""
-
-#: parsettfatt.c:2701
-msgid ""
-"This font is erroneous: it has a GPOS extension subtable that points to\n"
-"another extension sub-table.\n"
-msgstr ""
-
-#: parsettfatt.c:2706 parsettfatt.c:2792
-#, c-format
-msgid "Unknown GPOS sub-table type: %d\n"
-msgstr ""
-
-#: parsettfatt.c:2711 parsettfatt.c:2797
-msgid "Subtable extends beyond end of GPOS table\n"
-msgstr ""
-
-#: parsettfatt.c:2746
-msgid ""
-"This font is erroneous: it has a GSUB extension subtable that points to\n"
-"another extension sub-table.\n"
-msgstr ""
-
-#: parsettfatt.c:2754 parsettfatt.c:2830
-#, c-format
-msgid "Unknown GSUB sub-table type: %d\n"
-msgstr ""
-
-#: parsettfatt.c:2759 parsettfatt.c:2835
-msgid "Subtable extends beyond end of GSUB table\n"
-msgstr ""
-
-#
-#: parsettfatt.c:2978
-#, c-format
-msgid "MarkClass-%d"
-msgstr "标记类属-%d"
-
-#: parsettfatt.c:2990
-#, c-format
-msgid "MarkSet-%d"
-msgstr ""
-
-#
-#: parsettfatt.c:3059
-#, c-format
-msgid "!!!! Unknown caret format %d !!!!\n"
-msgstr "!!!! 未知游标格式 %d !!!!\n"
-
-#: parsettfatt.c:3097
-#, c-format
-msgid ""
-"Bad lookup table: format=2 (%d/%d), first=%d last=%d total glyphs in "
-"font=%d\n"
-msgstr ""
-
-#: parsettfatt.c:3121
-#, c-format
-msgid ""
-"Bad lookup table: format=4 (%d/%d), first=%d last=%d total glyphs in "
-"font=%d\n"
-msgstr ""
-
-#: parsettfatt.c:3145
-#, c-format
-msgid "Bad lookup table: format=6, first=%d total glyphs in font=%d\n"
-msgstr ""
-
-#: parsettfatt.c:3160
-#, c-format
-msgid "Bad lookup table: format=8, first=%d cnt=%d total glyphs in font=%d\n"
-msgstr ""
-
-#
-#: parsettfatt.c:3172
-#, c-format
-msgid "Invalid lookup table format. %d\n"
-msgstr "无效查找表格式。 %d\n"
-
-#
-#. GT: This is to give the name to a nested substitution lookup invoked by
-#. GT: a statemachine. The %s is the name of the statemachine('s lookup)
-#. GT: and the %d is n, where this lookup is the n'th defined for this state
-#. GT: machine
-#: parsettfatt.c:3248
-#, c-format
-msgid "%s nested-substitutions %d"
-msgstr "%s 嵌套替代 %d"
-
-#
-#: parsettfatt.c:3252
-msgid "subtable"
-msgstr "替代表"
-
-#: parsettfatt.c:3271
-#, c-format
-msgid "Glyph out of bounds in 'prop' table %d\n"
-msgstr ""
-
-#: parsettfatt.c:3345
-#, c-format
-msgid "Glyph out of bounds in 'lcar' table %d\n"
-msgstr ""
-
-#
-#: parsettfatt.c:3400
-#, c-format
-msgid "Glyph out of bounds in 'opbd' table %d\n"
-msgstr "'opbd' 表 %d 中字形超出边界\n"
-
-#: parsettfatt.c:3528
-#, c-format
-msgid "Glyph out of bounds in 'mort'/'morx' table %d\n"
-msgstr ""
-
-#: parsettfatt.c:3540
-#, c-format
-msgid "Substitute glyph out of bounds in 'mort'/'morx' table %d\n"
-msgstr ""
-
-#
-#: parsettfatt.c:3608 parsettfatt.c:3618
-msgid "Bad font, offset out of bounds.\n"
-msgstr "不良字体: 偏移超出范围。\n"
-
-#
-#: parsettfatt.c:3662 parsettfatt.c:3789
-msgid "Invalid ligature offset\n"
-msgstr "无效的缩合偏移量\n"
-
-#: parsettfatt.c:3670
-#, c-format
-msgid "Attempt to make a ligature for glyph %d out of "
-msgstr ""
-
-#. GT: This is a reference to "Much Ado About Nothing". The string should read
-#. GT: "A ligature sub-table in Apple's 'mort'/'morx' table is too\ncomplex for me to understand. I shall give up on it.\nYour ligatures may not be complete."
-#: parsettfatt.c:3741 parsettfatt.c:3863
-msgid ""
-"In an attempt to process the ligatures of this font, I've concluded\n"
-"that the state machine in Apple's mort/morx table is\n"
-"(like the learned constable) too cunning to be understood.\n"
-"I shall give up on it. Your ligatures may be incomplete.\n"
-msgstr ""
-
-#: parsettfatt.c:3797
-#, c-format
-msgid "Attempt to make a ligature for (non-existent) glyph %d out of "
-msgstr ""
-
-#: parsettfatt.c:3907
-msgid "Bad mort ligature table. Not long enough\n"
-msgstr ""
-
-#
-#: parsettfatt.c:4020 parsettfatt.c:4039
-msgid "Bad class in state machine.\n"
-msgstr "状态机中不良类属。\n"
-
-#: parsettfatt.c:4030
-msgid "Bad glyph count in mort table.\n"
-msgstr ""
-
-#: parsettfatt.c:4076
-msgid ""
-"It looks to me as though there's a morx sub-table with more than 1000\n"
-" transitions. Which makes me think there's probably an error\n"
-msgstr ""
-
-#: parsettfatt.c:4095
-msgid ""
-"It looks to me as though there's a morx sub-table with more than 1000\n"
-" states. Which makes me think there's probably an error\n"
-msgstr ""
-
-#: parsettfatt.c:4753 parsettfatt.c:4762
-msgid "Unexpected end of file found in morx chain.\n"
-msgstr ""
-
-#: parsettfatt.c:4820
-#, c-format
-msgid "Invalid or unsupported version (0x%x) for 'kern' table"
-msgstr ""
-
-#: parsettfatt.c:4826
-#, c-format
-msgid "Warning: Unlikely number of subtables (%d) for 'kern' table"
-msgstr ""
-
-#: parsettfatt.c:4871
-msgid ""
-"In the 'kern' table, a subtable's length does not match the number of "
-"kerning pairs."
-msgstr ""
-
-#: parsettfatt.c:4899
-#, c-format
-msgid "Bad kern pair: glyphs %d & %d must be less than %d\n"
-msgstr ""
-
-#: parsettfatt.c:4967
-#, c-format
-msgid "Kerning subtable 3 says the glyph count is %d, but maxp says %d\n"
-msgstr ""
-
-#: parsettfatt.c:5002
-#, c-format
-msgid "Invalid or unsupported format (%d) for subtable of 'kern' table"
-msgstr ""
-
-#
-#: parsettfatt.c:5024 parsettfatt.c:5048 parsettfatt.c:5069
-msgid "End of file in feat table.\n"
-msgstr "feat table文件末尾。\n"
-
-#: parsettfatt.c:5372
-msgid "Bad glyph variant subtable of MATH table.\n"
-msgstr ""
-
-#: parsettfatt.c:5801 parsettfatt.c:5809 parsettfatt.c:5851 parsettfatt.c:5860
-#: parsettfatt.c:5874 parsettfatt.c:5892 parsettfatt.c:5993 parsettfatt.c:6000
-#: parsettfatt.c:6077 parsettfatt.c:6088
-msgid "JSTF table is too long.\n"
-msgstr ""
-
-#: parsettfatt.c:5819
-msgid "Bad GID in JSTF extenser table.\n"
-msgstr ""
-
-#: parsettfatt.c:5880
-#, c-format
-msgid "Lookup index (%d) out of bounds in GSUB from JSTF table.\n"
-msgstr ""
-
-#: parsettfatt.c:5898
-#, c-format
-msgid "Lookup index (%d) out of bounds in GPOS from JSTF table.\n"
-msgstr ""
-
-#. GT: This string is used to generate a name for an OpenType lookup.
-#. GT:  the %c%c... is the language followed by the script (OT tags)
-#: parsettfatt.c:5916
-#, c-format
-msgid "JSTF shrinkage max at priority %d #%d for %c%c%c%c in %c%c%c%c"
-msgstr ""
-
-#: parsettfatt.c:5927
-#, c-format
-msgid "JSTF extension max at priority %d #%d for %c%c%c%c in %c%c%c%c"
-msgstr ""
-
-#: parsettfatt.c:5945
-#, c-format
-msgid "%s subtable %d"
-msgstr ""
-
-#: parsettfatt.c:6061
-#, c-format
-msgid ""
-"Unlikely script count (%d), I suspect the JSTF-\n"
-" table is garbage, I'm giving up on it.\n"
-msgstr ""
-
-#: parsettfatt.c:6071 parsettfatt.c:6099
-msgid "End of file found in JSTF table.\n"
-msgstr ""
-
-#
-#: parsettfbmf.c:563 parsettfbmf.c:567
-msgid "Load Bitmap Fonts"
-msgstr "载入位图字体"
-
-#: parsettfbmf.c:564 parsettfbmf.c:568
-msgid ""
-"Do you want to load the bitmap fonts embedded in this true/open type file?\n"
-"(And if so, which)"
-msgstr ""
-
-#
-#: parsettfbmf.c:1224 savefont.c:919 winfonts.c:847
-msgid "Saving Bitmap Font(s)"
-msgstr "保存位图字体"
-
-#
-#: parsettfbmf.c:1278 savefont.c:798
-msgid "Saving TrueType Font"
-msgstr "保存TrueType字体"
-
-#: parsettfvar.c:99
-msgid "Hmm, this 'fvar' table has more count/size pairs than I expect\n"
-msgstr ""
-
-#: parsettfvar.c:101
-msgid ""
-"Hmm, this 'fvar' table has too few count/size pairs, I shan't parse it\n"
-msgstr ""
-
-#: parsettfvar.c:107
-msgid "Hmm, this 'fvar' table has no axes, that doesn't make sense.\n"
-msgstr ""
-
-#: parsettfvar.c:109
-msgid "Hmm, this 'fvar' table has more axes than FontForge can handle.\n"
-msgstr ""
-
-#: parsettfvar.c:113
-msgid ""
-"Hmm, this 'fvar' table has an unexpected size for an axis, I shan't parse "
-"it\n"
-msgstr ""
-
-#: parsettfvar.c:118
-msgid ""
-"Hmm, this 'fvar' table has an unexpected size for an instance, I shan't "
-"parse it\n"
-msgstr ""
-
-#: parsettfvar.c:122
-msgid "Hmm, this 'fvar' table is too short\n"
-msgstr ""
-
-#: parsettfvar.c:167
-msgid ""
-"Hmm, the axis count in the 'avar' table is different from that in the 'fvar' "
-"table.\n"
-msgstr ""
-
-#: parsettfvar.c:183
-msgid "Hmm, the the 'avar' table is too long.\n"
-msgstr ""
-
-#: parsettfvar.c:497
-msgid "Mismatched local and shared tuple flags.\n"
-msgstr ""
-
-#
-#: parsettfvar.c:515
-#, c-format
-msgid "Incorrect number of deltas in glyph %d (%s)\n"
-msgstr "不正确的增量于字形 %d (%s)中\n"
-
-#: parsettfvar.c:537
-msgid ""
-"Hmm, the axis count in the 'gvar' table is different from that in the 'fvar' "
-"table.\n"
-msgstr ""
-
-#: parsettfvar.c:548
-msgid "Hmm, no global tuples specified in the 'gvar' table.\n"
-msgstr ""
-
-#: parsettfvar.c:550
-#, c-format
-msgid ""
-"Hmm, too many global tuples specified in the 'gvar' table.\n"
-" FontForge only supports %d\n"
-msgstr ""
-
-#: parsettfvar.c:555
-msgid ""
-"Hmm, more glyph variation data specified than there are glyphs in font.\n"
-msgstr ""
-
-#: parsettfvar.c:599
-#, c-format
-msgid ""
-"Warning: Glyph %d contains either private or intermediate tuple data.\n"
-" FontForge supports neither.\n"
-msgstr ""
-
-#: parsettfvar.c:673
-msgid "Incorrect number of deltas in cvt\n"
-msgstr ""
-
-#: parsettfvar.c:718
-msgid ""
-"Warning: 'cvar' contains intermediate tuple data.\n"
-" FontForge doesn't support this.\n"
-msgstr ""
-
-#
-#: parsettfvar.c:763
-msgid "Processing Variations"
-msgstr "i处理变化"
-
-#: prefs.c:269
-msgid "PixmapDir"
-msgstr ""
-
-#: prefs.c:270
-msgid ""
-"As FontForge creates windows, it loads images for its menus\n"
-"from files in a standard directory. You may change this to\n"
-"point to a different directory to load a different icon set.\n"
-"(If you want no icons at all, change to an empty directory).\n"
-"This may not effect windows of a type that is already initialized,\n"
-"restarting FontForge will fix that."
-msgstr ""
-
-#: prefs.c:282
-msgid "UseCairoDrawing"
-msgstr ""
-
-#: prefs.c:282 prefs.c:467 prefs.c:470
-msgid ""
-"Use the cairo library for drawing (if available)\n"
-"This makes for prettier (anti-aliased) but slower drawing\n"
-"This applies to any windows created AFTER this is set.\n"
-"Already existing windows will continue as they are."
-msgstr ""
-
-#: prefs.c:285
-msgid "UsePangoDrawing"
-msgstr ""
-
-#: prefs.c:285
-msgid ""
-"Use the pango library for text (if available)\n"
-"This makes for prettier and handles complex scripts.\n"
-"But it can slow things down on older machines.\n"
-"This applies to any windows created AFTER this is set.\n"
-"Already existing windows will continue as they are."
-msgstr ""
-
-#: prefs.c:287
-msgid "ExportClipboard"
-msgstr ""
-
-#: prefs.c:287
-msgid ""
-"If you are running an X11 clipboard manager you might want\n"
-"to turn this off. FF can put things into its internal clipboard\n"
-"which it cannot export to X11 (things like copying more than\n"
-"one glyph in the fontview). If you have a clipboard manager\n"
-"running it will force these to be exported with consequent\n"
-"loss of data."
-msgstr ""
-
-#: prefs.c:301
-msgid "SeekCharacter"
-msgstr ""
-
-#: prefs.c:301
-msgid ""
-"When fontforge opens a (non-sfd) font it will try to display this unicode "
-"character in the fontview."
-msgstr ""
-
-#: prefs.c:302
-msgid "CompactOnOpen"
-msgstr ""
-
-#: prefs.c:302
-msgid "When a font is opened, should it be made compact?"
-msgstr ""
-
-#: prefs.c:314
-msgid "InterpolateCPsOnMotion"
-msgstr ""
-
-#: prefs.c:314
-msgid ""
-"When moving one end point of a spline but not the other\n"
-"interpolate the control points between the two."
-msgstr ""
-
-#: prefs.c:322
-msgid "AutoKernDialog"
-msgstr ""
-
-#: prefs.c:322
-msgid "Open AutoKern dialog for new kerning subtables"
-msgstr ""
-
-#: prefs.c:332
-msgid ""
-"When copying glyphs from the font view, also copy the\n"
-"glyphs' truetype instructions."
-msgstr ""
-
-#: prefs.c:358
-msgid "AddCharToNameList"
-msgstr ""
-
-#: prefs.c:358
-msgid ""
-"When displaying a list of glyph names\n"
-"(or sometimes just a single glyph name)\n"
-"FontForge will add the unicode character\n"
-"the name refers to in parenthesis after\n"
-"the name. It does this because some names\n"
-"are obscure.\n"
-"Some people would prefer not to see this,\n"
-"so this preference item lets you turn off\n"
-" this behavior"
-msgstr ""
-
-#: prefs.c:367
-msgid "StandardSlopeError"
-msgstr ""
-
-#: prefs.c:367
-msgid ""
-"The maximum slope difference which still allows to consider two points "
-"\"parallel\".\n"
-"Enlarge this to make the autohinter more tolerable to small deviations from "
-"straight lines when detecting stem edges."
-msgstr ""
-
-#: prefs.c:368
-msgid "SerifSlopeError"
-msgstr ""
-
-#: prefs.c:368
-msgid ""
-"Same as above, but for terminals of small features (e. g. serifs), which can "
-"deviate more significantly from the horizontal or vertical direction."
-msgstr ""
-
-#: prefs.c:376
-msgid "InstructDiagonalStems"
-msgstr ""
-
-#: prefs.c:376
-msgid "Generate instructions for diagonal stem hints."
-msgstr ""
-
-#: prefs.c:377
-msgid "InstructSerifs"
-msgstr ""
-
-#: prefs.c:377
-msgid ""
-"Try to detect serifs and other elements protruding from base stems and "
-"generate instructions for them."
-msgstr ""
-
-#: prefs.c:378
-msgid "InstructBallTerminals"
-msgstr ""
-
-#: prefs.c:378
-msgid "Generate instructions for ball terminals."
-msgstr ""
-
-#: prefs.c:379
-msgid "InterpolateStrongPoints"
-msgstr ""
-
-#: prefs.c:379
-msgid ""
-"Interpolate between stem edges some important points, not affected by other "
-"instructions."
-msgstr ""
-
-#: prefs.c:380
-msgid "CounterControl"
-msgstr ""
-
-#: prefs.c:380
-msgid ""
-"Make sure similar or equal counters remain the same in gridfitted outlines.\n"
-"Enabling this option may result in glyph advance widths being\n"
-"inconsistently scaled at some PPEMs."
-msgstr ""
-
-#: prefs.c:481 savefontdlg.c:756
-msgid ""
-"When generating a truetype or opentype font it is occasionally\n"
-"useful to know the mapping between truetype glyph ids and\n"
-"glyph names. Setting this option will cause FontForge to\n"
-"produce a file (with extension .g2n) containing those data."
-msgstr ""
-
-#: prefs.c:484
-msgid ""
-"Apple and MS/Adobe differ about the format of truetype and opentype files.\n"
-"This controls the default setting of the Apple checkbox in the\n"
-"File->Generate Font dialog.\n"
-"The main differences are:\n"
-" Bitmap data are stored in different tables\n"
-" Scaled composite glyphs are treated differently\n"
-" Use of GSUB rather than morx(t)/feat\n"
-" Use of GPOS rather than kern/opbd\n"
-" Use of GDEF rather than lcar/prop\n"
-"If both this and OpenType are set, both formats are generated"
-msgstr ""
-
-#: prefs.c:485
-msgid ""
-"Apple and MS/Adobe differ about the format of truetype and opentype files.\n"
-"This controls the default setting of the OpenType checkbox in the\n"
-"File->Generate Font dialog.\n"
-"The main differences are:\n"
-" Bitmap data are stored in different tables\n"
-" Scaled composite glyphs are treated differently\n"
-" Use of GSUB rather than morx(t)/feat\n"
-" Use of GPOS rather than kern/opbd\n"
-" Use of GDEF rather than lcar/prop\n"
-"If both this and Apple are set, both formats are generated"
-msgstr ""
-
-#
-#: prefs.c:494
-msgid "Generic"
-msgstr "一般"
-
-#
-#: prefs.c:495
-msgid "New Font"
-msgstr "新字体"
-
-#
-#: prefs.c:497
-msgid "Navigation"
-msgstr "浏览"
-
-#
-#: prefs.c:498
-msgid "Editing"
-msgstr "编辑"
-
-#
-#: prefs.c:499
-msgid "Synchronize"
-msgstr "同步"
-
-#
-#: prefs.c:500
-msgid "TT"
-msgstr "TrueType"
-
-#
-#: prefs.c:501
-msgid "Accents"
-msgstr "重音符"
-
-#
-#: prefs.c:502
-msgid "Apps"
-msgstr "应用程序"
-
-#
-#: prefs.c:503
-msgid "Font Info"
-msgstr "字体信息"
-
-#
-#: prefs.c:504
-msgid "Generate"
-msgstr "生成"
-
-#
-#: prefs.c:505
-msgid "PS Hints"
-msgstr "PS消隐"
-
-#: prefs.c:506
-msgid "TT Instrs"
-msgstr ""
-
-#
-#: prefs.c:1254 scriptingdlg.c:62
-msgid "Call Script"
-msgstr "调用脚本"
-
-#: prefs.c:1393
-msgid "This feature, setting combination is already used"
-msgstr ""
-
-#: prefs.c:1394
-msgid ""
-"This feature, setting combination is already used\n"
-"Do you really wish to reuse it?"
-msgstr ""
-
-#
-#: prefs.c:1410
-msgid "Tag too long"
-msgstr "标签过长"
-
-#
-#: prefs.c:1410
-msgid "Feature tags must be exactly 4 ASCII characters"
-msgstr "特征标签应为4个ASCII字符"
-
-#
-#: prefs.c:1447 prefs.c:2276
-msgid "Mapping"
-msgstr "映射"
-
-#
-#: prefs.c:1457
-msgid "_Feature:"
-msgstr "特征(_F)："
-
-#
-#: prefs.c:1484
-msgid "_Tag:"
-msgstr "标签(_T)…"
-
-#
-#: prefs.c:1653
-msgid "Menu name with no associated script"
-msgstr "菜单无相关脚本"
-
-#
-#: prefs.c:1656
-msgid "Script with no associated menu name"
-msgstr "脚本未相关菜单"
-
-#
-#: prefs.c:1887
-msgid "Preferences"
-msgstr "选项"
-
-#
-#: prefs.c:1919
-msgid "MacMap|_New..."
-msgstr "新建(_N)…"
-
-#
-#: prefs.c:1954
-msgid "MacMapping|Default"
-msgstr "默认"
-
-#
-#: prefs.c:1978
-msgid "Menu Name"
-msgstr "菜单名"
-
-#
-#: prefs.c:1981
-msgid ""
-"You may create a script menu containing up to 10 frequently used scripts.\n"
-"Each entry in the menu needs both a name to display in the menu and\n"
-"a script file to execute. The menu name may contain any unicode characters.\n"
-"The button labeled \"...\" will allow you to browse for a script file."
-msgstr ""
-"可创建一脚本菜单容纳10个常用脚本。其中\n"
-"每项都需要一个名称以便显示以及相应的脚\n"
-"本文件。菜单名称可包括任意Unicode字符。\n"
-"带 \"...\" 的按钮可让你浏览脚本文件。"
-
-#
-#: prefs.c:1988
-msgid "Script File"
-msgstr "脚本文件"
-
-#
-#: prefs.c:1991
-msgid ""
-"You may create a script menu containing up to 10 frequently used scripts\n"
-"Each entry in the menu needs both a name to display in the menu and\n"
-"a script file to execute. The menu name may contain any unicode characters.\n"
-"The button labeled \"...\" will allow you to browse for a script file."
-msgstr ""
-"可创建一脚本菜单容纳10个常用脚本。其中\n"
-"每项都需要一个名称以便显示以及相应的脚\n"
-"本文件。菜单名称可包括任意Unicode字符。\n"
-"带 \"...\" 的按钮可让你浏览脚本文件。"
-
-#
-#: prefs.c:2022 savefontdlg.c:2938
-msgid "..."
-msgstr "..."
-
-#
-#: prefs.c:2087
-msgid "On"
-msgstr "开"
-
-#
-#: prefs.c:2095
-msgid "Off"
-msgstr "关"
-
-#. GT: See the long comment at "Property|New"
-#. GT: This and the next few strings show a limitation of my widget set which
-#. GT: cannot handle multi-line text labels. These strings should be concatenated
-#. GT: (after striping off "Prefs_App|") together, translated, and then broken up
-#. GT: to fit the dialog. There is an extra blank line, not used in English,
-#. GT: into which your text may extend if needed.
-#: prefs.c:2236
-msgid "Prefs_App|Normally FontForge will find applications by searching for"
-msgstr ""
-
-#: prefs.c:2237
-msgid "Prefs_App|them in your PATH environment variable, if you want"
-msgstr ""
-
-#: prefs.c:2238
-msgid "Prefs_App|to alter that behavior you may set an environment"
-msgstr ""
-
-#: prefs.c:2239
-msgid "Prefs_App|variable giving the full path spec of the application."
-msgstr ""
-
-#: prefs.c:2240
-msgid "Prefs_App|FontForge recognizes BROWSER, MF and AUTOTRACE."
-msgstr ""
-
-#: prefs.c:2241
-msgid "Prefs_App| "
-msgstr ""
-
-#
-#: prefs.c:2272
-msgid "Features"
-msgstr "特征"
-
-#
-#: print.c:1489
-msgid "Printing Font"
-msgstr "打印字体"
-
-#: print.c:1490
-msgid "Generating PostScript Font"
-msgstr ""
-
-#
-#: print.c:1515
-msgid "Failed to generate postscript font"
-msgstr "未能生成Postscript字体"
-
-#
-#: print.c:1764 tottf.c:6203
-msgid "Warning: Font contained no glyphs"
-msgstr "警告：字体中无字形"
-
-#
-#: print.c:2961 print.c:2966
-#, c-format
-msgid "Failed to generate postscript in file %s"
-msgstr "未能生成postscript 于文件 %s"
-
-#: problems.c:221 problems.c:1631
-msgid "This glyph contains a horizontal hint near the specified width"
-msgstr ""
-
-#: problems.c:231 problems.c:1631
-msgid "This glyph contains a vertical hint near the specified width"
-msgstr ""
-
-#: problems.c:242 problems.c:588 problems.c:1751
-msgid ""
-"This reference has been flipped, so the paths in it are drawn backwards"
-msgstr ""
-
-#: problems.c:261 problems.c:602 problems.c:1947
-msgid "This glyph's advance width is different from the standard width"
-msgstr ""
-
-#: problems.c:264 problems.c:603 problems.c:1956
-msgid "This glyph's vertical advance is different from the standard width"
-msgstr ""
-
-#: problems.c:269 problems.c:604 problems.c:2074
-msgid ""
-"This glyph is not mapped to any unicode code point, but its name should be."
-msgstr ""
-
-#: problems.c:270 problems.c:607 problems.c:2076
-msgid ""
-"This glyph is mapped to a unicode code point which is different from its "
-"name."
-msgstr "字形映射到与其名称不符的统一码上。"
-
-#
-#: problems.c:279
-msgid "Can't fix"
-msgstr "不能修补"
-
-#: problems.c:279
-#, c-format
-msgid ""
-"The name FontForge would like to assign to this glyph, %.30s, is already "
-"used by a different glyph."
-msgstr ""
-
-#: problems.c:317 problems.c:589 problems.c:1215
-msgid "The x coord of the selected point is near the specified value"
-msgstr ""
-
-#: problems.c:317 problems.c:589 problems.c:1547
-msgid "The selected point is near a vertical stem hint"
-msgstr ""
-
-#: problems.c:322 problems.c:605 problems.c:1123
-msgid "The selected point is not at integral coordinates"
-msgstr ""
-
-#: problems.c:323 problems.c:606 problems.c:1125
-msgid "The selected point does not have integral control points"
-msgstr ""
-
-#: problems.c:328 problems.c:590 problems.c:1240
-msgid "The y coord of the selected point is near the specified value"
-msgstr ""
-
-#: problems.c:328 problems.c:590 problems.c:1547
-msgid "The selected point is near a horizontal stem hint"
-msgstr ""
-
-#: problems.c:329 problems.c:592 problems.c:1271
-msgid "The y coord of the selected point is near the baseline"
-msgstr ""
-
-#: problems.c:329 problems.c:592 problems.c:1274
-msgid "The y coord of the selected point is near the xheight"
-msgstr ""
-
-#: problems.c:330 problems.c:593 problems.c:1277
-msgid "The y coord of the selected point is near the cap height"
-msgstr ""
-
-#: problems.c:330 problems.c:593 problems.c:1280
-msgid "The y coord of the selected point is near the ascender height"
-msgstr ""
-
-#: problems.c:331 problems.c:594 problems.c:1283
-msgid "The y coord of the selected point is near the descender height"
-msgstr ""
-
-#: problems.c:336 problems.c:601 problems.c:1724
-msgid ""
-"The selected spline attains its extrema somewhere other than its endpoints"
-msgstr ""
-
-#: problems.c:339 problems.c:595 problems.c:763
-msgid "The selected line segment is nearly horizontal"
-msgstr ""
-
-#: problems.c:351 problems.c:596 problems.c:764
-msgid "The control point above the selected point is nearly horizontal"
-msgstr ""
-
-#: problems.c:351 problems.c:596 problems.c:765
-msgid "The control point below the selected point is nearly horizontal"
-msgstr ""
-
-#: problems.c:352 problems.c:597 problems.c:766
-msgid "The control point right of the selected point is nearly horizontal"
-msgstr ""
-
-#: problems.c:352 problems.c:597 problems.c:767
-msgid "The control point left of the selected point is nearly horizontal"
-msgstr ""
-
-#: problems.c:376 problems.c:595 problems.c:770
-msgid "The selected line segment is nearly vertical"
-msgstr ""
-
-#: problems.c:388 problems.c:598 problems.c:771
-msgid "The control point above the selected point is nearly vertical"
-msgstr ""
-
-#: problems.c:388 problems.c:598 problems.c:772
-msgid "The control point below the selected point is nearly vertical"
-msgstr ""
-
-#: problems.c:389 problems.c:599 problems.c:773
-msgid "The control point right of the selected point is nearly vertical"
-msgstr ""
-
-#: problems.c:389 problems.c:599 problems.c:774
-msgid "The control point left of the selected point is nearly vertical"
-msgstr ""
-
-#: problems.c:413 problems.c:600 problems.c:1684
-msgid "This path should have been drawn in a counter-clockwise direction"
-msgstr ""
-
-#: problems.c:413 problems.c:600 problems.c:1686
-msgid "This path should have been drawn in a clockwise direction"
-msgstr ""
-
-#: problems.c:415 problems.c:591 problems.c:1427
-msgid ""
-"This glyph contains control points which are probably too close to the main "
-"points to alter the look of the spline"
-msgstr ""
-
-#
-#: problems.c:497
-msgid "Problem explanation"
-msgstr "问题解释"
-
-#
-#: problems.c:523 problems.c:2374
-msgid "Ignore this problem in the future"
-msgstr "I以后忽略此问题"
-
-#
-#: problems.c:534
-msgid "_Next"
-msgstr "下一个(_N)"
-
-#
-#: problems.c:546
-msgid "Fix"
-msgstr "修正"
-
-#
-#: problems.c:557 ../gdraw/gprogress.c:295
-msgid "_Stop"
-msgstr "停止(_S)"
-
-#: problems.c:611 problems.c:650 problems.c:2007
-msgid ""
-"This glyph contains a substitution or ligature entry which refers to an "
-"empty char"
-msgstr ""
-
-#
-#: problems.c:613
-#, c-format
-msgid "%2$.20s refers to an empty character \"%1$.20s\""
-msgstr "%2$.20s 参照空字符 \"%1$.20s\""
-
-#: problems.c:615 problems.c:2028
-msgid ""
-"This glyph contains anchor points from some, but not all anchor classes in a "
-"subtable"
-msgstr ""
-
-#: problems.c:617
-#, c-format
-msgid "There is no anchor for class %1$.30s in subtable %2$.30s"
-msgstr ""
-
-#: problems.c:620 problems.c:2043
-msgid ""
-"Two glyphs share the same unicode code point.\n"
-"Change the encoding to \"Glyph Order\" and use\n"
-"Edit->Select->Wildcard with the following code point"
-msgstr ""
-
-#: problems.c:621
-#, c-format
-msgid "U+%04x"
-msgstr ""
-
-#: problems.c:622 problems.c:2058
-msgid ""
-"Two glyphs have the same name.\n"
-"Change the encoding to \"Glyph Order\" and use\n"
-"Edit->Select->Wildcard with the following name"
-msgstr ""
-
-#
-#: problems.c:623
-#, c-format
-msgid "%.40s"
-msgstr "%.40s"
-
-#
-#: problems.c:627
-#, c-format
-msgid "Found %1$.4g, expected %2$.4g"
-msgstr "发现 %1$.4g, 期望 %2$.4g"
-
-#: problems.c:777
-msgid "The selected line segment is near the italic angle"
-msgstr ""
-
-#: problems.c:778
-msgid "The control point above the selected point is near the italic angle"
-msgstr ""
-
-#: problems.c:779
-msgid "The control point below the selected point is near the italic angle"
-msgstr ""
-
-#: problems.c:780
-msgid ""
-"The control point right of the selected point is near the italic angle"
-msgstr ""
-
-#: problems.c:781
-msgid "The control point left of the selected point is near the italic angle"
-msgstr ""
-
-#: problems.c:845
-msgid ""
-"The control point above the selected point is outside the spline segment"
-msgstr ""
-
-#: problems.c:845
-msgid ""
-"The control point below the selected point is outside the spline segment"
-msgstr ""
-
-#: problems.c:847
-msgid ""
-"The control point right of the selected point is outside the spline segment"
-msgstr ""
-
-#: problems.c:847
-msgid ""
-"The control point left of the selected point is outside the spline segment"
-msgstr ""
-
-#: problems.c:890
-msgid ""
-"This glyph has four hints, but if this one were omitted it would fit a stem3 "
-"hint"
-msgstr ""
-
-#
-#: problems.c:903
-msgid "This glyph can use a stem3 hint"
-msgstr "此字形可用 stem3 消隐"
-
-#: problems.c:913
-msgid ""
-"The counters between these hints are not the same size, bad for a stem3 hint"
-msgstr ""
-
-#: problems.c:928 problems.c:940 problems.c:952
-msgid "This hint has the wrong width for a stem3 hint"
-msgstr ""
-
-#: problems.c:1072
-msgid "The two selected points are the endpoints of an open path"
-msgstr ""
-
-#: problems.c:1101
-msgid "The paths that make up this glyph intersect one another"
-msgstr ""
-
-#: problems.c:1156
-msgid "The selected point is too far from the origin"
-msgstr ""
-
-#: problems.c:1159
-msgid ""
-"The selected points (or the intermediate control points) are too far apart"
-msgstr ""
-
-#: problems.c:1192
-msgid "The selected points are too close to each other"
-msgstr ""
-
-#
-#: problems.c:1464 problems.c:1493
-msgid "This hint does not control any points"
-msgstr "此消隐不控制任何点"
-
-#: problems.c:1578
-msgid "The hint mask of the selected point contains overlapping hints"
-msgstr ""
-
-#: problems.c:1603
-msgid ""
-"There are no hint masks in this layer but there are overlapping hints."
-msgstr ""
-
-#: problems.c:1665
-msgid "This glyph self-intersects"
-msgstr ""
-
-#: problems.c:1665
-msgid ""
-"This glyph self-intersects. Checking for correct direction is meaningless "
-"until that is fixed"
-msgstr ""
-
-#: problems.c:1682
-msgid ""
-"This path probably intersects itself (though I could not find that when\n"
-" I checked for intersections), look closely at the corners"
-msgstr ""
-
-#: problems.c:1774
-msgid ""
-"This reference has a transformation matrix which cannot be expressed in "
-"truetype.\n"
-"All entries (except translation) must be between [-2.0,2.0).\n"
-"Translation must be integral."
-msgstr ""
-
-#: problems.c:1799
-msgid ""
-"This glyph contains both contours and references.\n"
-"(or contains a reference which has a bad transformation matrix and counts as "
-"a contour).\n"
-"This cannot be expressed in the TrueType glyph format."
-msgstr ""
-
-#: problems.c:1820
-msgid ""
-"This reference has a transformation matrix which cannot be expressed in "
-"Type1/2 fonts.\n"
-"No scaling or rotation allowed."
-msgstr ""
-
-#: problems.c:1843
-msgid "Both selected references have use-my-metrics set"
-msgstr ""
-
-#: problems.c:1863
-msgid ""
-"This reference uses point-matching but it refers to a glyph\n"
-"(or a previous reference refers to a glyph)\n"
-"whose points have been renumbered."
-msgstr ""
-
-#: problems.c:1877
-msgid ""
-"References are nested more deeply in this glyph than the maximum allowed"
-msgstr ""
-
-#: problems.c:1891
-msgid "There are more points in this glyph than the maximum allowed"
-msgstr ""
-
-#: problems.c:1905
-msgid "There are more hints in this glyph than the maximum allowed"
-msgstr ""
-
-#
-#: problems.c:1917
-msgid "This outline glyph is missing a bitmap version"
-msgstr "此轮廓字形缺少相应位图字形"
-
-#: problems.c:1934
-msgid ""
-"This outline glyph's advance width is different from that of the bitmap's"
-msgstr ""
-
-#: problems.c:1967
-msgid "This glyph is taller than desired"
-msgstr "字形比预期的高"
-
-#: problems.c:1973
-msgid "This glyph extends further below the baseline than desired"
-msgstr "字形伸出底线超过预期"
-
-#: problems.c:1979
-msgid "This glyph is wider than desired"
-msgstr "字形比预期的宽"
-
-#: problems.c:1985
-msgid "This glyph extends left further than desired"
-msgstr "字形左边超出预期"
-
-#: problems.c:2098
-msgid "This glyph is defined in more than one of the CID subfonts"
-msgstr ""
-
-#
-#: problems.c:2103
-msgid "This glyph is not defined in any of the CID subfonts"
-msgstr "字形未被定义于任何 CID 替代字体"
-
-#
-#: problems.c:2259
-msgid "position"
-msgstr "位置"
-
-#
-#: problems.c:2259
-msgid "pair"
-msgstr "对"
-
-#
-#: problems.c:2260
-msgid "alternate subs"
-msgstr "交换替代"
-
-#
-#: problems.c:2260
-msgid "multiple subs"
-msgstr "多个替代"
-
-#
-#: problems.c:2261
-msgid "Contextual position"
-msgstr "关联位置"
-
-#
-#: problems.c:2261 problems.c:2263
-msgid "Contextual substitution"
-msgstr "关联替代"
-
-#
-#: problems.c:2262
-msgid "Chaining position"
-msgstr "链位置"
-
-#
-#: problems.c:2262
-msgid "Chaining substitution"
-msgstr "链式替代"
-
-#
-#: problems.c:2262
-msgid "Reverse chaining subs"
-msgstr "反向链式替代"
-
-#
-#: problems.c:2263
-msgid "Indic reordering"
-msgstr "印地语调序"
-
-#
-#: problems.c:2264
-msgid "Lig"
-msgstr "连字"
-
-#
-#: problems.c:2264
-msgid "Contextual insertion"
-msgstr "关联插入"
-
-#
-#: problems.c:2285
-#, c-format
-msgid "Glyph %1$.50s with a %2$s from lookup subtable %3$.50s"
-msgstr "字形 %1$.50s 附带 %2$s 来源于查找替代表 %3$.50s"
-
-#
-#: problems.c:2290 problems.c:2295 problems.c:2300
-#, c-format
-msgid "%1$s from lookup subtable %2$.50s"
-msgstr "%1$s 来自查找替代表 %2$.50s"
-
-#
-#: problems.c:2301
-msgid "Kerning Class"
-msgstr "压缩类属"
-
-#
-#: problems.c:2301
-msgid "Vertical Kerning Class"
-msgstr "垂直压缩类属"
-
-#
-#: problems.c:2320
-msgid "Check for missing glyph names"
-msgstr "检查缺失字形名称"
-
-#
-#: problems.c:2338
-msgid " refers to a missing glyph"
-msgstr " 参照了缺失字形"
-
-#
-#: problems.c:2352
-msgid "Replace With:"
-msgstr "替代为："
-
-#
-#: problems.c:2368
-msgid "Always"
-msgstr "经常"
-
-#
-#: problems.c:2396
-msgid "Remove"
-msgstr "移除"
-
-#
-#: problems.c:2406
-msgid "Skip"
-msgstr "跳过"
-
-#: problems.c:2611
-#, c-format
-msgid ""
-"The lookup %.30s which invokes lookup %.30s is active for glyph %.30s which "
-"has script '%c%c%c%c', yet this script does not appear in any of the "
-"features which apply the lookup.\n"
-"Would you like to add this script to one of those features?"
-msgstr ""
-
-#: problems.c:2620
-#, c-format
-msgid ""
-"The lookup %.30s is active for glyph %.30s which has script '%c%c%c%c', yet "
-"this script does not appear in any of the features which apply the lookup.\n"
-"\n"
-"Would you like to add this script to one of those features?"
-msgstr ""
-
-#
-#: problems.c:2626
-msgid "_Skip"
-msgstr "跳过(_S)"
-
-#
-#: problems.c:2627
-msgid "Missing Script"
-msgstr "缺位图"
-
-#: problems.c:2825
-msgid "This blank outline glyph has an unexpected bitmap version"
-msgstr ""
-
-#
-#: problems.c:2833
-msgid "No problems found"
-msgstr "未发现问题"
-
-#
-#: problems.c:2940 problems.c:3130
-msgid "_X near¹"
-msgstr "_X 临近¹"
-
-#
-#: problems.c:2942 problems.c:3160
-msgid "_Y near¹"
-msgstr "_Y 临近¹"
-
-#
-#: problems.c:2944 problems.c:3559
-msgid "Hint _Width Near¹"
-msgstr "消隐宽度临近¹(_W)"
-
-#
-#: problems.c:2946
-msgid "Advance Width not"
-msgstr "前导宽度不"
-
-#
-#: problems.c:2948
-msgid "Vertical Advance not"
-msgstr "垂直间距不"
-
-#
-#: problems.c:2950
-msgid "Bounding box above"
-msgstr "边框上"
-
-#
-#: problems.c:2952
-msgid "Bounding box below"
-msgstr "边框下"
-
-#
-#: problems.c:2954
-msgid "Bounding box right of"
-msgstr "边框右"
-
-#
-#: problems.c:2956
-msgid "Bounding box left of"
-msgstr "边框左"
-
-#
-#: problems.c:2958 problems.c:3373
-msgid "_More points than:"
-msgstr "点数超过(_M):"
-
-#
-#: problems.c:2960 problems.c:3623
-msgid "_More hints than:"
-msgstr "消隐超过(_M):"
-
-#
-#. GT: Refs is an abbreviation for References. Space is somewhat constrained here
-#: problems.c:2963 problems.c:3468
-msgid "Refs neste_d deeper than:"
-msgstr "参照递归深度超过(_D):"
-
-#
-#: problems.c:2965 problems.c:3241
-msgid "Irrelevant _Factor:"
-msgstr "不相关系数(_F):"
-
-#
-#: problems.c:2966
-msgid "Near"
-msgstr "临近"
-
-#
-#: problems.c:3103
-msgid "Find Problems"
-msgstr "查找问题"
-
-#: problems.c:3113
-msgid "Non-_Integral coordinates"
-msgstr ""
-
-#: problems.c:3121
-msgid ""
-"The coordinates of all points and control points in truetype\n"
-"must be integers (if they are not integers then FontForge will\n"
-"round them when it outputs them, potentially causing havoc).\n"
-"Even in PostScript fonts it is generally a good idea to use\n"
-"integral values."
-msgstr ""
-
-#: problems.c:3138
-msgid ""
-"Allows you to check that vertical stems in several\n"
-"characters start at the same location."
-msgstr ""
-
-#: problems.c:3168
-msgid ""
-"Allows you to check that horizontal stems in several\n"
-"characters start at the same location."
-msgstr ""
-
-#
-#: problems.c:3190
-msgid "Y near¹ _standard heights"
-msgstr "Y 临近¹ 标准高度(_S)"
-
-#: problems.c:3198
-msgid ""
-"Allows you to find points which are slightly\n"
-"off from the baseline, xheight, cap height,\n"
-"ascender, descender heights."
-msgstr ""
-
-#
-#: problems.c:3203
-msgid "_Control Points near horizontal/vertical"
-msgstr "控制点临近水平/垂直"
-
-#
-#: problems.c:3203
-msgid "Control Points near horizontal/vertical/italic"
-msgstr "控制点临近水平/垂直/倾斜"
-
-#: problems.c:3211
-msgid ""
-"Allows you to find control points which are almost,\n"
-"but not quite horizontal or vertical\n"
-"from their base point\n"
-"(or at the italic angle)."
-msgstr ""
-
-#
-#: problems.c:3216
-msgid "Control Points _beyond spline"
-msgstr "控制点在样条线之外(_B)"
-
-#: problems.c:3224
-msgid ""
-"Allows you to find control points which when projected\n"
-"onto the line segment between the two end points lie\n"
-"outside of those end points"
-msgstr ""
-
-#
-#: problems.c:3229
-msgid "Check for _irrelevant control points"
-msgstr "检查不相关控制点(_I)"
-
-#: problems.c:3236
-msgid ""
-"Control points are irrelevant if they are too close to the main\n"
-"point to make a significant difference in the shape of the curve."
-msgstr ""
-
-#: problems.c:3246 problems.c:3257 problems.c:3267
-msgid ""
-"A control point is deemed irrelevant if the distance between it and the "
-"main\n"
-"(end) point is less than this times the distance between the two end points"
-msgstr ""
-
-#
-#: problems.c:3276
-msgid "Poin_ts too close"
-msgstr "点太近邻(_T)"
-
-#: problems.c:3283
-msgid ""
-"If two adjacent points on the same path are less than a few\n"
-"emunits apart they will cause problems for some of FontForge's\n"
-"commands. PostScript shouldn't care though."
-msgstr ""
-
-#: problems.c:3288
-msgid "_Points too far"
-msgstr ""
-
-#: problems.c:3295
-msgid ""
-"Most font formats cannot specify adjacent points (or control points)\n"
-"which are more than 32767 em-units apart in either the x or y direction"
-msgstr ""
-
-#
-#: problems.c:3310
-msgid "O_pen Paths"
-msgstr "开放的路径(_P)"
-
-#: problems.c:3318
-msgid ""
-"All paths should be closed loops, there should be no exposed endpoints"
-msgstr ""
-
-#
-#: problems.c:3323
-msgid "Intersecting Paths"
-msgstr "交叉的路径"
-
-#
-#: problems.c:3330
-msgid "No paths with within a glyph should intersect"
-msgstr "字形内路径不应相交"
-
-#
-#: problems.c:3335
-msgid "_Edges near horizontal/vertical"
-msgstr "边线临近水平线/垂直线(_E)"
-
-#
-#: problems.c:3335
-msgid "Edges near horizontal/vertical/italic"
-msgstr "边线临近水平线/垂直线/倾斜线"
-
-#: problems.c:3343
-msgid ""
-"Allows you to find lines which are almost,\n"
-"but not quite horizontal or vertical\n"
-"(or at the italic angle)."
-msgstr ""
-
-#
-#: problems.c:3348
-msgid "Check _outermost paths clockwise"
-msgstr "检查顺时针方向最外边的路径"
-
-#: problems.c:3356
-msgid ""
-"PostScript and TrueType require that paths be drawn\n"
-"in a clockwise direction. This lets you check that they\n"
-"are.\n"
-" Before doing this test insure that\n"
-"no paths self-intersect"
-msgstr ""
-
-#
-#: problems.c:3361
-msgid "Check _missing extrema"
-msgstr "检查缺失极点(_M)"
-
-#: problems.c:3368
-msgid ""
-"PostScript and TrueType require that when a path\n"
-"reaches its maximum or minimum position\n"
-"there must be a point at that location."
-msgstr ""
-
-#: problems.c:3381 problems.c:3393
-msgid ""
-"The PostScript Language Reference Manual (Appendix B) says that\n"
-"an interpreter need not support paths with more than 1500 points.\n"
-"I think this count includes control points. From PostScript's point\n"
-"of view, all the contours in a character make up one path. Modern\n"
-"interpreters tend to support paths with more points than this limit.\n"
-"(Note a truetype font after conversion to PS will contain\n"
-"twice as many control points)"
-msgstr ""
-
-#
-#: problems.c:3413
-msgid "Check _flipped references"
-msgstr "检查翻转参照(_f)"
-
-#: problems.c:3421
-msgid ""
-"PostScript and TrueType require that paths be drawn\n"
-"in a clockwise direction. If you have a reference\n"
-"that has been flipped then the paths in that reference will\n"
-"probably be counter-clockwise. You should unlink it and do\n"
-"Element->Correct direction on it."
-msgstr ""
-
-#
-#. GT: Refs is an abbreviation for References. Space is somewhat constrained here
-#: problems.c:3427
-msgid "Refs with bad tt transformation matrices"
-msgstr "参照了不良tt变换矩阵"
-
-#: problems.c:3435
-msgid ""
-"TrueType requires that all scaling and rotational\n"
-"entries in a transformation matrix be between -2 and 2"
-msgstr ""
-
-#
-#: problems.c:3440
-msgid "Mixed contours and references"
-msgstr "混合的轮廓及参照"
-
-#: problems.c:3448
-msgid ""
-"TrueType glyphs can either contain references or contours.\n"
-"Not both."
-msgstr ""
-
-#
-#. GT: Refs is an abbreviation for References. Space is somewhat constrained here
-#: problems.c:3454
-msgid "Refs with bad ps transformation matrices"
-msgstr "参照了不良ps变换矩阵"
-
-#: problems.c:3462
-msgid ""
-"Type1 and 2 fonts only support translation of references.\n"
-"The first four entries of the transformation matrix should be\n"
-"[1 0 0 1]."
-msgstr ""
-
-#: problems.c:3476 problems.c:3488
-msgid ""
-"The Type 2 Charstring Reference (Appendix B) says that\n"
-"subroutines may not be nested more than 10 deep. Each\n"
-"nesting level for references requires one subroutine\n"
-"level, and hints may require another level."
-msgstr ""
-
-#
-#: problems.c:3498
-msgid "Refs with out of date point matching"
-msgstr "参照了过期匹配点"
-
-#: problems.c:3506
-msgid ""
-"If a glyph has been edited so that it has a different\n"
-"number of points now, then any references\n"
-"which use point matching and depended on that glyph's\n"
-"point count will be incorrect."
-msgstr ""
-
-#: problems.c:3511
-msgid "Multiple refs with use-my-metrics"
-msgstr ""
-
-#: problems.c:3518
-msgid "There may be at most one reference with the use-my-metrics bit set"
-msgstr ""
-
-#
-#: problems.c:3533
-msgid "_Hints controlling no points"
-msgstr "消隐无点控制(_H)"
-
-#: problems.c:3541
-msgid ""
-"Ghostview (perhaps other interpreters) has a problem when a\n"
-"hint exists without any points that lie on it."
-msgstr ""
-
-#
-#: problems.c:3546
-msgid "_Points near¹ hint edges"
-msgstr "点临近¹消隐边(_P)"
-
-#: problems.c:3554
-msgid ""
-"Often if a point is slightly off from a hint\n"
-"it is because a stem is made up\n"
-"of several segments, and one of them\n"
-"has the wrong width."
-msgstr ""
-
-#: problems.c:3567
-msgid "Allows you to check that stems have consistent widths.."
-msgstr ""
-
-#
-#. GT: The _3 is used to mark an accelerator
-#: problems.c:3590
-msgid "Almost stem_3 hint"
-msgstr "全部stem_3消隐"
-
-#: problems.c:3598
-msgid ""
-"This checks if the character almost, but not exactly,\n"
-"conforms to the requirements for a stem3 hint.\n"
-"That is, either vertically or horizontally, there must\n"
-"be exactly three hints, and they must have the same\n"
-"width and they must be evenly spaced."
-msgstr ""
-
-#
-#: problems.c:3604
-msgid "_Show Exact *stem3"
-msgstr "显示确切的 *stem3"
-
-#: problems.c:3613
-msgid "Shows when this character is exactly a stem3 hint"
-msgstr ""
-
-#: problems.c:3630 problems.c:3642
-msgid ""
-"The Type 2 Charstring Reference (Appendix B) says that\n"
-"there may be at most 96 horizontal and vertical stem hints\n"
-"in a character."
-msgstr ""
-
-#: problems.c:3652
-msgid "_Overlapped hints"
-msgstr ""
-
-#: problems.c:3658
-msgid ""
-"Either a glyph should have no overlapping hints,\n"
-"or a glyph with hint masks should have no overlapping\n"
-"hints within a hint mask."
-msgstr ""
-
-#
-#: problems.c:3675
-msgid "Check missing _bitmaps"
-msgstr "查找缺失位图(_B)"
-
-#: problems.c:3683
-msgid ""
-"Are there any outline characters which don't have a bitmap version in one of "
-"the bitmap fonts?\n"
-"Conversely are there any bitmap characters without a corresponding outline "
-"character?"
-msgstr ""
-
-#: problems.c:3687
-msgid "Bitmap/outline _advance mismatch"
-msgstr ""
-
-#: problems.c:3695
-msgid ""
-"Are there any bitmap glyphs whose advance width\n"
-"is not is expected from scaling and rounding\n"
-"the outline's advance width?"
-msgstr ""
-
-#
-#: problems.c:3699 problems.c:3705
-msgid "Check multiple Unicode"
-msgstr "检查多重统一码"
-
-#
-#: problems.c:3709
-msgid "Check multiple Names"
-msgstr "检查多重名称"
-
-#: problems.c:3715
-msgid "Check for multiple characters with the same name"
-msgstr ""
-
-#: problems.c:3719
-msgid "Check Unicode/Name mismatch"
-msgstr "检查统一码/名称的不匹配"
-
-#: problems.c:3725
-msgid ""
-"Check for characters whose name maps to a unicode code point\n"
-"which does not map the character's assigned code point."
-msgstr ""
-
-#: problems.c:3743
-msgid "Glyph BB Above"
-msgstr "字形边框上"
-
-#: problems.c:3751
-msgid "Are there any glyph's whose bounding boxes extend above this number?"
-msgstr ""
-
-#: problems.c:3772
-msgid "Glyph BB Below"
-msgstr "字形边框下"
-
-#: problems.c:3780
-msgid "Are there any glyph's whose bounding boxes extend below this number?"
-msgstr ""
-
-#
-#: problems.c:3796
-msgid "Glyph BB Right Of"
-msgstr "字形边框右"
-
-#: problems.c:3803
-msgid ""
-"Are there any glyphs whose bounding boxes extend to the right of this number?"
-msgstr ""
-
-#
-#: problems.c:3819
-msgid "Glyph BB Left Of"
-msgstr "字形边框左"
-
-#: problems.c:3826
-msgid ""
-"Are there any glyph's whose bounding boxes extend to the left of this number?"
-msgstr ""
-
-#
-#: problems.c:3842
-msgid "Check Advance:"
-msgstr "检查间距:"
-
-#: problems.c:3850
-msgid "Check for characters whose advance width is not the displayed value."
-msgstr ""
-
-#
-#: problems.c:3868
-msgid "Check VAdvance:\n"
-msgstr "检查垂直间距:\n"
-
-#: problems.c:3876
-msgid ""
-"Check for characters whose vertical advance width is not the displayed value."
-msgstr ""
-
-#
-#: problems.c:3906
-msgid "Check for CIDs defined _twice"
-msgstr "检查CID定义了两次(_T)"
-
-#: problems.c:3914
-msgid "Check whether a CID is defined in more than one sub-font"
-msgstr ""
-
-#
-#: problems.c:3919
-msgid "Check for _undefined CIDs"
-msgstr "检查未定义的CID"
-
-#: problems.c:3927
-msgid "Check whether a CID is undefined in all sub-fonts"
-msgstr ""
-
-#
-#: problems.c:3942
-msgid "Check for missing _glyph names"
-msgstr "检查缺失字形名称(_G)"
-
-#: problems.c:3949
-msgid ""
-"Check whether a substitution, kerning class, etc. uses a glyph name which "
-"does not match any glyph in the font"
-msgstr ""
-
-#
-#: problems.c:3954
-msgid "Check for missing _scripts in features"
-msgstr "检查缺失手写体(_S)"
-
-#: problems.c:3962
-msgid ""
-"In every lookup that uses a glyph, check that at\n"
-"least one feature is active for the glyph's script."
-msgstr ""
-
-#
-#: problems.c:3968
-msgid "Check subtitutions for empty chars"
-msgstr "查找空字符的替代"
-
-#: problems.c:3974
-msgid ""
-"Check for characters which contain 'GSUB' entries which refer to empty "
-"characters"
-msgstr ""
-
-#: problems.c:3979
-msgid "Check for incomplete mark to base subtables"
-msgstr ""
-
-#: problems.c:3986
-msgid ""
-"The OpenType documentation suggests in a rather confusing way\n"
-"that if a base glyph (or base mark) contains an anchor point\n"
-"for one class in a lookup subtable, then it should contain\n"
-"anchors for all classes in the subtable"
-msgstr ""
-
-#
-#: problems.c:4011
-msgid "Paths"
-msgstr "路径"
-
-#
-#. GT: Refs is an abbreviation for References. Space is tight here
-#: problems.c:4016
-msgid "Refs"
-msgstr "参照"
-
-#
-#: problems.c:4020 savefontdlg.c:589
-msgid "Hints"
-msgstr "消隐"
-
-#
-#: problems.c:4024
-msgid "ATT"
-msgstr "ATT"
-
-#
-#: problems.c:4028
-msgid "CID"
-msgstr "字符标识(CID)"
-
-#: problems.c:4033
-msgid "BB"
-msgstr "BB"
-
-#
-#: problems.c:4037
-msgid "Random"
-msgstr "随机"
-
-#
-#: problems.c:4064
-msgid "Set All"
-msgstr "设置全部"
-
-#
-#: problems.c:4085
-msgid "¹ \"Near\" means within"
-msgstr "¹ \"临近\"意为在内"
-
-#
-#: problems.c:4104 scstylesui.c:1243 scstylesui.c:1307 scstylesui.c:1351
-#: scstylesui.c:1468 scstylesui.c:1511 scstylesui.c:1554 scstylesui.c:1624
-#: simplifydlg.c:186 simplifydlg.c:350 simplifydlg.c:388
-msgid "em-units"
-msgstr "M单位"
-
-#
-#: problems.c:4213
-msgid "Open Contour"
-msgstr "轮廓开放"
-
-#
-#: problems.c:4214
-msgid "Self Intersecting"
-msgstr "自身相交"
-
-#
-#: problems.c:4215
-msgid "Wrong Direction"
-msgstr "错误方向"
-
-#
-#: problems.c:4216
-msgid "Flipped References"
-msgstr "翻转参照"
-
-#
-#: problems.c:4217
-msgid "Missing Points at Extrema"
-msgstr "在极值处缺少点"
-
-#: problems.c:4218
-msgid "Unknown glyph referenced in GSUB/GPOS/MATH"
-msgstr ""
-
-#
-#: problems.c:4219
-msgid "Too Many Points"
-msgstr "过多点"
-
-#
-#: problems.c:4220
-msgid "Too Many Hints"
-msgstr "过多消隐"
-
-#
-#: problems.c:4221
-msgid "Bad Glyph Name"
-msgstr "不良字形名称"
-
-#: problems.c:4230
-msgid "Distance between adjacent points is too big"
-msgstr ""
-
-#: problems.c:4231
-msgid "Non-integral coordinates"
-msgstr ""
-
-#: problems.c:4232
-msgid "Contains anchor points for some, but not all, classes in a subtable"
-msgstr ""
-
-#: problems.c:4233
-msgid "There is another glyph in the font with this name"
-msgstr ""
-
-#: problems.c:4234
-msgid "There is another glyph in the font with this unicode code point"
-msgstr ""
-
-#: problems.c:4235
-msgid "Glyph contains overlapped hints (in the same hintmask)"
-msgstr ""
-
-#: problems.c:4239
-msgid "Odd number of elements in BlueValues/OtherBlues array."
-msgstr ""
-
-#: problems.c:4240
-msgid "Elements in BlueValues/OtherBlues array are disordered."
-msgstr ""
-
-#: problems.c:4241
-msgid "Too many elements in BlueValues/OtherBlues array."
-msgstr ""
-
-#: problems.c:4242
-msgid ""
-"Elements in BlueValues/OtherBlues array are too close (Change BlueFuzz)."
-msgstr ""
-
-#: problems.c:4243
-msgid "Elements in BlueValues/OtherBlues array are not integers."
-msgstr ""
-
-#: problems.c:4244
-msgid ""
-"Alignment zone height in BlueValues/OtherBlues array is too big for "
-"BlueScale."
-msgstr ""
-
-#: problems.c:4247
-msgid "Odd number of elements in FamilyBlues/FamilyOtherBlues array."
-msgstr ""
-
-#: problems.c:4248
-msgid "Elements in FamilyBlues/FamilyOtherBlues array are disordered."
-msgstr ""
-
-#: problems.c:4249
-msgid "Too many elements in FamilyBlues/FamilyOtherBlues array."
-msgstr ""
-
-#: problems.c:4250
-msgid ""
-"Elements in FamilyBlues/FamilyOtherBlues array are too close (Change "
-"BlueFuzz)."
-msgstr ""
-
-#: problems.c:4251
-msgid "Elements in FamilyBlues/FamilyOtherBlues array are not integers."
-msgstr ""
-
-#: problems.c:4252
-msgid ""
-"Alignment zone height in FamilyBlues/FamilyOtherBlues array is too big for "
-"BlueScale."
-msgstr ""
-
-#
-#: problems.c:4255
-msgid "Missing BlueValues entry."
-msgstr "丢失蓝值项"
-
-#: problems.c:4256
-msgid "Bad BlueFuzz entry."
-msgstr "不良 BlueFuzz 条目."
-
-#: problems.c:4257
-msgid "Bad BlueScale entry."
-msgstr "不良 BlueScale 条目."
-
-#: problems.c:4258
-msgid "Bad StdHW entry."
-msgstr "不良 StdHW 项目."
-
-#: problems.c:4259
-msgid "Bad StdVW entry."
-msgstr "不良 StdVW 项目."
-
-#: problems.c:4260
-msgid "Bad StemSnapH entry."
-msgstr "不良 StemSnapH 项目."
-
-#: problems.c:4261
-msgid "Bad StemSnapV entry."
-msgstr "不良 StemSnapV 项目."
-
-#: problems.c:4262
-msgid "StemSnapH does not contain StdHW value."
-msgstr ""
-
-#: problems.c:4263
-msgid "StemSnapV does not contain StdVW value."
-msgstr ""
-
-#: problems.c:4264
-msgid "Bad BlueShift entry."
-msgstr "不良 BlueShift 条目."
-
-#
-#: problems.c:4278 problems.c:4290
-msgid "Bad Private Dictionary"
-msgstr "不良私用词典"
-
-#
-#: problems.c:4751
-msgid "Glyph not in font"
-msgstr "字形不在字体中"
-
-#
-#: problems.c:4754
-msgid "Glyph Valid"
-msgstr "字形有效"
-
-#: problems.c:4754
-#, c-format
-msgid "No problems detected in %s"
-msgstr "未发现错误于%s"
-
-#: problems.c:4806
-msgid "problselect|Errors"
-msgstr "错误"
-
-#
-#: problems.c:4807
-msgid "problselect|Open Contours"
-msgstr "轮廓开放"
-
-#
-#: problems.c:4808
-msgid "problselect|Bad Direction"
-msgstr "方向错误"
-
-#
-#: problems.c:4809
-msgid "problselect|Self Intersections"
-msgstr "自身相交"
-
-#: problems.c:4810
-msgid "problselect|Missing Extrema"
-msgstr "缺少极点"
-
-#: problems.c:5005
-msgid "problfixup|Open Contours"
-msgstr "轮廓开放"
-
-#
-#: problems.c:5006
-msgid "problfixup|Self Intersections"
-msgstr "自身相交"
-
-#: problems.c:5007
-msgid "problfixup|Mark for Overlap fix before Save"
-msgstr "保存前标记未连接的"
-
-#: problems.c:5008
-msgid "problfixup|Bad Directions"
-msgstr "不良方向"
-
-#: problems.c:5009
-msgid "problfixup|Missing Extrema (cautiously)"
-msgstr ""
-
-#: problems.c:5010
-msgid "problfixup|Missing Extrema"
-msgstr "缺少极点"
-
-#
-#: problems.c:5011
-msgid "problfixup|Too Many Points"
-msgstr "过多点"
-
-#
-#: problems.c:5016
-msgid "Close Open Contours"
-msgstr "关闭所有已打开的轮廓"
-
-#
-#: problems.c:5017
-msgid "Inline All References"
-msgstr "内联所有参照"
-
-#
-#: problems.c:5018
-msgid "Remove Overlap"
-msgstr "移除重叠"
-
-#: problems.c:5019
-msgid "Mark for Overlap fix before Save"
-msgstr "标记重叠者，保存前处理"
-
-#
-#: problems.c:5020
-msgid "Inline Flipped References"
-msgstr "在线翻转参照"
-
-#
-#: problems.c:5021
-msgid "Correct Direction"
-msgstr "正确方向"
-
-#
-#: problems.c:5022
-msgid "Add Good Extrema"
-msgstr "添加好极点"
-
-#
-#: problems.c:5023
-msgid "Add All Extrema"
-msgstr "添加全部极点"
-
-#
-#: problems.c:5024 simplifydlg.c:151
-msgid "Simplify"
-msgstr "简化"
-
-#: problems.c:5026
-msgid "Revalidate All"
-msgstr ""
-
-#: problems.c:5027
-msgid "Revalidate"
-msgstr "再确认"
-
-#
-#: problems.c:5028
-msgid "Open Glyph"
-msgstr "打开字形"
-
-#
-#: problems.c:5030
-msgid "Scroll To Glyph"
-msgstr "滚动到字形"
-
-#
-#: problems.c:5032
-msgid "Select Glyphs With"
-msgstr "选择字形凭"
-
-#: problems.c:5033
-msgid "Try To Fix Glyphs With"
-msgstr "尝试修复字形"
-
-#: problems.c:5114
-msgid "Passed Validation"
-msgstr "检验通过"
-
-#
-#: problems.c:5114
-msgid "Thinking..."
-msgstr "正在思考..."
-
-#
-#. GT: "Private" is a keyword (sort of) in PostScript. Perhaps it
-#. GT: should remain untranslated?
-#: problems.c:5166
-msgid "Private Dictionary"
-msgstr "私用词典"
-
-#: problems.c:5218
-msgid "Report as Error"
-msgstr ""
-
-#: problems.c:5218
-msgid "Ignore"
-msgstr ""
-
-#: problems.c:5219
-msgid "Not sure if this is an error..."
-msgstr ""
-
-#: problems.c:5220
-msgid ""
-"This font contains non-integral coordinates. That's OK\n"
-"in PostScript and SVG but causes problems in TrueType.\n"
-"Should I consider that an error here?"
-msgstr ""
-
-#
-#: problems.c:5386
-#, c-format
-msgid "Validation of %.100s"
-msgstr "检验 %.100s"
-
-#
-#: psread.c:300
-msgid "Can't back up with nothing on stack\n"
-msgstr "堆栈中什么也没有，不能备份\n"
-
-#
-#: psread.c:302
-msgid "Attempt to back up twice\n"
-msgstr "试图备份两次\n"
-
-#. GT: This is part of the PostScript language. "exit" should not be translated
-#. GT: as it is a PostScript keyword. (FF contains a small PostScript interpreter
-#. GT: so it can understand some PostScript fonts, and can generate errors when
-#. GT: handed bad PostScript).
-#: psread.c:360
-msgid "Use of \"exit\" when not in a loop\n"
-msgstr ""
-
-#. GT: This is part of the PostScript language. Neither "stop" nor "stopped"
-#. GT: should be translated as both are PostScript keywords.
-#: psread.c:386
-msgid "Use of \"stop\" when not in a stopped\n"
-msgstr ""
-
-#: psread.c:583
-msgid "Attempt to invert a singular matrix\n"
-msgstr ""
-
-#. GT: Here "def" is a PostScript keyword, (meaning define).
-#. GT: This "def" should not be translated as it is part of the PostScript language.
-#: psread.c:626
-msgid "Key for a def must be a string or name literal\n"
-msgstr ""
-
-#
-#: psread.c:688 psread.c:695
-msgid "Value out of bounds in spline.\n"
-msgstr "样条线值越界.\n"
-
-#: psread.c:1059
-msgid "Unknown character after backslash in literal string.\n"
-msgstr ""
-
-#
-#: psread.c:1065
-msgid "Unknown string type\n"
-msgstr "位置字符串类型\n"
-
-#: psread.c:1145
-msgid "FontForge does not support dictionary based imagemask operators.\n"
-msgstr ""
-
-#: psread.c:1150
-msgid ""
-"Fourth argument of imagemask must be a 6-element transformation matrix.\n"
-msgstr ""
-
-#
-#: psread.c:1155
-msgid "Third argument of imagemask must be a boolean.\n"
-msgstr "蒙板的第三个参数必须为布尔类型.\n"
-
-#: psread.c:1161
-msgid "First and second arguments of imagemask must be integers.\n"
-msgstr ""
-
-#: psread.c:1170
-msgid ""
-"Width or height arguments to imagemask contain invalid values\n"
-"(either negative or they require more data than provided).\n"
-msgstr ""
-
-#
-#: psread.c:1585 psread.c:1594 psread.c:1603
-msgid "Divide by zero in postscript code.\n"
-msgstr "postscript 编码中除零.\n"
-
-#
-#: psread.c:1685
-msgid "Can't compare arrays\n"
-msgstr "不能比较阵列\n"
-
-#: psread.c:2463
-msgid ""
-"This version of FontForge does not support the imagemask operator.\n"
-"For support configure --with-multilayer.\n"
-msgstr ""
-
-#
-#: psread.c:2622
-msgid "No mark in counttomark\n"
-msgstr "无标记于 counttomark\n"
-
-#
-#: psread.c:2633
-msgid "No mark in cleartomark\n"
-msgstr "No mark in cleartomark\n"
-
-#
-#: psread.c:2735
-msgid "Nothing on stack to print\n"
-msgstr "栈内没有要打印的\n"
-
-#: psread.c:2812
-#, c-format
-msgid "Warning: Unable to parse token %s, some features may be lost\n"
-msgstr ""
-
-#
-#: psread.c:3291
-msgid "We don't understand this font\n"
-msgstr "不识别此字体\n"
-
-#
-#: psread.c:3690
-#, c-format
-msgid "Stack got too big in %s\n"
-msgstr "%s 中堆栈太大\n"
-
-#: psread.c:3734
-#, c-format
-msgid "%s's dotsection operator is depreciated for Type2\n"
-msgstr ""
-
-#: psread.c:3738
-#, c-format
-msgid "Stack underflow on vstem3 in %s\n"
-msgstr ""
-
-#: psread.c:3743 psread.c:3781
-#, c-format
-msgid "%s's vstem3 operator is not supported for Type2\n"
-msgstr ""
-
-#: psread.c:3779
-#, c-format
-msgid "Stack underflow on hstem3 in %s\n"
-msgstr ""
-
-#: psread.c:3816
-#, c-format
-msgid "Stack underflow on seac in %s\n"
-msgstr ""
-
-#: psread.c:3818
-#, c-format
-msgid "%s's SEAC operator is invalid for Type2\n"
-msgstr ""
-
-#: psread.c:3819
-#, c-format
-msgid "%s's SEAC-like endchar operator is depreciated for Type2\n"
-msgstr ""
-
-#
-#: psread.c:3837
-#, c-format
-msgid "Reference encoding out of bounds in %s\n"
-msgstr "参照编码越界 %s\n"
-
-#: psread.c:3849
-#, c-format
-msgid "Stack underflow on sbw in %s\n"
-msgstr ""
-
-#: psread.c:3851
-#, c-format
-msgid "%s's sbw operator is not supported for Type2\n"
-msgstr ""
-
-#: psread.c:3859
-#, c-format
-msgid "Stack underflow on unary operator in %s\n"
-msgstr ""
-
-#: psread.c:3868
-#, c-format
-msgid "Stack underflow on binary operator in %s\n"
-msgstr ""
-
-#: psread.c:3895
-#, c-format
-msgid "Stack underflow on ifelse in %s\n"
-msgstr ""
-
-#: psread.c:3916
-msgid "Type2 fonts do not support the Type1 callothersubrs operator"
-msgstr ""
-
-#: psread.c:3918
-#, c-format
-msgid "Stack underflow on callothersubr in %s\n"
-msgstr ""
-
-#
-#: psread.c:3963 psread.c:4027
-#, c-format
-msgid "Bad flex subroutine in %s\n"
-msgstr "不良 flex 子程序于 %s\n"
-
-#: psread.c:4005
-#, c-format
-msgid "No previous point on path in curveto from flex 0 in %s\n"
-msgstr ""
-
-#: psread.c:4020
-#, c-format
-msgid "No previous point on path in lineto from flex 0 in %s\n"
-msgstr ""
-
-#: psread.c:4043
-#, c-format
-msgid "Attempt to use a multiple master subroutine in a non-mm font in %s.\n"
-msgstr ""
-
-#: psread.c:4045
-#, c-format
-msgid ""
-"Multiple master subroutine called with the wrong number of arguments in %s.\n"
-msgstr ""
-
-#: psread.c:4079
-#, c-format
-msgid "Too few items on stack for put in %s\n"
-msgstr ""
-
-#: psread.c:4080 psread.c:4088
-#, c-format
-msgid "Reference to transient memory out of bounds in put in %s\n"
-msgstr ""
-
-#: psread.c:4087
-#, c-format
-msgid "Too few items on stack for get in %s\n"
-msgstr ""
-
-#: psread.c:4098
-#, c-format
-msgid "Pop stack underflow on pop in %s\n"
-msgstr ""
-
-#
-#: psread.c:4121
-#, c-format
-msgid "Index out of range in %s\n"
-msgstr "%s中索引超出范围\n"
-
-#
-#: psread.c:4132
-#, c-format
-msgid "roll out of range in %s\n"
-msgstr "卷动越界于 %s\n"
-
-#: psread.c:4148
-msgid "Type2 fonts do not support the Type1 setcurrentpoint operator"
-msgstr ""
-
-#: psread.c:4149
-#, c-format
-msgid "Stack underflow on setcurrentpoint in %s\n"
-msgstr ""
-
-#: psread.c:4232
-#, c-format
-msgid "No previous point on path in flex operator in %s\n"
-msgstr ""
-
-#
-#: psread.c:4236
-#, c-format
-msgid "Uninterpreted opcode 12,%d in %s\n"
-msgstr "未解释的操作码 12,%d 于 %s\n"
-
-#: psread.c:4248
-#, c-format
-msgid "Stack underflow on hstem in %s\n"
-msgstr ""
-
-#: psread.c:4300
-#, c-format
-msgid "Stack underflow on vstem in %s\n"
-msgstr ""
-
-#: psread.c:4351
-#, c-format
-msgid "Hint mask (or counter mask) with too many hints in %s\n"
-msgstr ""
-
-#: psread.c:4388
-#, c-format
-msgid "Stack underflow on hsbw in %s\n"
-msgstr ""
-
-#: psread.c:4430
-#, c-format
-msgid "Stack underflow on rlineto/rmoveto in %s\n"
-msgstr ""
-
-#: psread.c:4437
-#, c-format
-msgid "Stack underflow on hlineto/hmoveto in %s\n"
-msgstr ""
-
-#: psread.c:4443
-#, c-format
-msgid "Stack underflow on vlineto/vmoveto in %s\n"
-msgstr ""
-
-#: psread.c:4475
-#, c-format
-msgid "No previous point on path in lineto in %s\n"
-msgstr ""
-
-#: psread.c:4507
-#, c-format
-msgid "Stack underflow on rrcurveto in %s\n"
-msgstr ""
-
-#: psread.c:4519 psread.c:4530
-#, c-format
-msgid "Stack underflow on hhcurveto in %s\n"
-msgstr ""
-
-#: psread.c:4541
-#, c-format
-msgid "Stack underflow on hvcurveto in %s\n"
-msgstr ""
-
-#: psread.c:4553
-#, c-format
-msgid "Stack underflow on vhcurveto in %s\n"
-msgstr ""
-
-#: psread.c:4580
-#, c-format
-msgid "No previous point on path in curveto in %s\n"
-msgstr ""
-
-#: psread.c:4600
-#, c-format
-msgid "Stack underflow on callsubr in %s\n"
-msgstr ""
-
-#
-#: psread.c:4603
-#, c-format
-msgid "Too many subroutine calls in %s\n"
-msgstr "过多子程序调用于 %s\n"
-
-#
-#: psread.c:4612
-#, c-format
-msgid "Subroutine number out of bounds in %s\n"
-msgstr "子程序数越界于%s\n"
-
-#
-#: psread.c:4625
-#, c-format
-msgid "return when not in subroutine in %s\n"
-msgstr "返回若不在子程序中%s\n"
-
-#: psread.c:4635
-msgid "Attempt to use a multiple master subroutine in a non-mm font.\n"
-msgstr ""
-
-#: psread.c:4637
-#, c-format
-msgid "Too few items on stack for blend in %s\n"
-msgstr ""
-
-#
-#: psread.c:4640
-msgid "Use of obsolete blend operator.\n"
-msgstr "使用失效的操作.\n"
-
-#
-#: psread.c:4657
-#, c-format
-msgid "Uninterpreted opcode %d in %s\n"
-msgstr "未解释的代码 %d于%s\n"
-
-#: psread.c:4663
-#, c-format
-msgid "end of subroutine reached with no return in %s\n"
-msgstr ""
-
-#
-#: python.c:3765
-msgid "<no glyph>"
-msgstr "<无字形>"
-
-#: python.c:15128 scstylesui.c:469
-msgid ""
-"The horizontal and vertical stem add amounts must either both be zero, or "
-"neither may be 0"
-msgstr ""
-
-#: python.c:15135 scstylesui.c:476
-msgid ""
-"The horizontal and vertical stem add amounts may not differ by more than a "
-"factor of 4"
-msgstr ""
-
-#
-#: savefont.c:89
-msgid "Saving AFM File"
-msgstr "保存AFM文件"
-
-#
-#: savefont.c:168
-msgid "Saving TFM File"
-msgstr "保存TFM文件"
-
-#
-#: savefont.c:231
-msgid "Saving OFM File"
-msgstr "保存OFM文件"
-
-#
-#: savefont.c:341 winfonts.c:858
-#, c-format
-msgid "Attempt to save a pixel size that has not been created (%d@%d)"
-msgstr "试图保存尚未创建的像素尺寸 (%d@%d)"
-
-#: savefont.c:348
-msgid "Currently, FontForge only supports bitmap (not bytemap) type3 output"
-msgstr ""
-
-#
-#: savefont.c:401
-msgid "No Sub Font Definition file"
-msgstr "无替代字体定义文件"
-
-#
-#: savefont.c:424
-msgid "Wrong type of SFD file"
-msgstr "错误类型的SFD文件"
-
-#: savefont.c:424
-msgid ""
-"This looks like one of FontForge's SplineFont DataBase files.\n"
-"Not one of TeX's SubFont Definition files.\n"
-"An unfortunate confusion of extensions."
-msgstr ""
-
-#
-#: savefont.c:473
-#, c-format
-msgid "Bad offset: %d for subfont %s\n"
-msgstr "不良偏移: %d 对替代字体 %s\n"
-
-#: savefont.c:504
-#, c-format
-msgid ""
-"Warning: Encoding %d (0x%x) is mapped to at least two locations (%s@0x%02x "
-"and %s@0x%02x)\n"
-" Only one will be used here.\n"
-msgstr ""
-"警告: 编码 %d (0x%x) 映射到至少两个位置 (%s@0x%02x 和 %s@0x%02x)\n"
-" 这里只用一个。\n"
-
-#
-#: savefont.c:515
-#, c-format
-msgid "More than 256 entries in subfont %s\n"
-msgstr "超过 256 项于替代字体 %s\n"
-
-#
-#: savefont.c:660 savefont.c:876
-msgid "Afm Save Failed"
-msgstr "Afm保存失败"
-
-#
-#: savefont.c:666 savefont.c:863
-msgid "Tfm Save Failed"
-msgstr "Tfm保存失败"
-
-#
-#: savefont.c:709
-msgid "Bad Extension"
-msgstr "不良扩展名"
-
-#: savefont.c:709
-msgid "You must specify a standard type1 extension (.pfb or .pfa)"
-msgstr ""
-
-#
-#: savefont.c:730 savefont.c:796
-msgid "Saving font"
-msgstr "保存字体"
-
-#: savefont.c:731
-msgid "Saving Multiple PostScript Fonts"
-msgstr ""
-
-#
-#: savefont.c:762
-msgid "Bad Drawing Operation"
-msgstr "不良绘制操作"
-
-#: savefont.c:762
-msgid ""
-"This font contains at least one translucent layer, but type3 does not "
-"support that (anything translucent or transparent is treated as opaque). Do "
-"you want to proceed anyway?"
-msgstr ""
-
-#
-#: savefont.c:799 tottf.c:2095
-msgid "Saving OpenType Font"
-msgstr "保存OpenType字体"
-
-#
-#: savefont.c:801
-msgid "Saving CID keyed font"
-msgstr "保存CID索引的字符"
-
-#
-#: savefont.c:802
-msgid "Saving multi-master font"
-msgstr "保存字体集"
-
-#
-#: savefont.c:803
-msgid "Saving SVG font"
-msgstr "保存SVG字体"
-
-#
-#: savefont.c:804
-msgid "Saving Unified Font Object"
-msgstr "保存一致字体对象"
-
-#: savefont.c:814
-msgid "Mac Resource Not Remote"
-msgstr ""
-
-#: savefont.c:814
-msgid "You may not save a mac resource file to a remote location"
-msgstr ""
-
-#: savefont.c:817
-msgid "Directory Not Remote"
-msgstr ""
-
-#: savefont.c:817
-msgid "You may not save ufo directory to a remote location"
-msgstr ""
-
-#
-#: savefont.c:869
-msgid "Ofm Save Failed"
-msgstr "Ofm保存失败"
-
-#
-#: savefont.c:883
-msgid "FontLog Save Failed"
-msgstr "字体信息保存失败"
-
-#
-#: savefont.c:888
-msgid "Saving PFM File"
-msgstr "保存PFM文件"
-
-#
-#: savefont.c:891
-msgid "Pfm Save Failed"
-msgstr "Pfm保存失败"
-
-#
-#: savefontdlg.c:143
-msgid "PS Type 1 (Ascii)"
-msgstr "PS Type 1 (Ascii)"
-
-#
-#: savefontdlg.c:144
-msgid "PS Type 1 (Binary)"
-msgstr "PS Type 1 (二进制)"
-
-#
-#: savefontdlg.c:146
-msgid "PS Type 1 (Resource)"
-msgstr "PS Type 1 (资源)"
-
-#
-#: savefontdlg.c:148
-msgid "PS Type 1 (MacBin)"
-msgstr "PS Type 1 (MacBin)"
-
-#
-#: savefontdlg.c:150
-msgid "PS Type 1 (Multiple)"
-msgstr "PS Type 1 (Multiple)"
-
-#
-#: savefontdlg.c:151
-msgid "PS Multiple Master(A)"
-msgstr "PS 字体集(A)"
-
-#
-#: savefontdlg.c:152
-msgid "PS Multiple Master(B)"
-msgstr "PS 字体集(B)"
-
-#
-#: savefontdlg.c:153
-msgid "PS Type 3"
-msgstr "PS Type 3"
-
-#
-#: savefontdlg.c:154
-msgid "PS Type 0"
-msgstr "PS Type 0"
-
-#
-#: savefontdlg.c:155
-msgid "PS CID"
-msgstr "PS CID"
-
-#
-#. GT: "CFF (Bare)" means a CFF font without the normal OpenType wrapper
-#. GT: CFF is a font format that normally lives inside an OpenType font
-#. GT: but it is perfectly meaningful to remove all the OpenType complexity
-#. GT: and just leave a bare CFF font
-#: savefontdlg.c:160
-msgid "CFF (Bare)"
-msgstr "CFF (Bare)"
-
-#
-#: savefontdlg.c:161
-msgid "CFF CID (Bare)"
-msgstr "CFF CID (Bare)"
-
-#
-#: savefontdlg.c:162
-msgid "Type42"
-msgstr "Type42"
-
-#
-#: savefontdlg.c:163
-msgid "Type11 (CID 2)"
-msgstr "Type11 (CID 2)"
-
-#
-#: savefontdlg.c:165
-msgid "TrueType (Symbol)"
-msgstr "TrueType (符号)"
-
-#
-#: savefontdlg.c:167
-msgid "TrueType (Resource)"
-msgstr "TrueType (资源)"
-
-#
-#: savefontdlg.c:169
-msgid "TrueType (MacBin)"
-msgstr "TrueType (MacBin)"
-
-#: savefontdlg.c:171
-msgid "TrueType (TTC)"
-msgstr ""
-
-#
-#: savefontdlg.c:172
-msgid "TrueType (Mac dfont)"
-msgstr "TrueType (Mac dfont)"
-
-#
-#: savefontdlg.c:173
-msgid "OpenType (CFF)"
-msgstr "OpenType (CFF)"
-
-#
-#: savefontdlg.c:174
-msgid "OpenType (Mac dfont)"
-msgstr "OpenType (Mac dfont)"
-
-#
-#: savefontdlg.c:175
-msgid "OpenType CID"
-msgstr "OpenType CID"
-
-#
-#: savefontdlg.c:176
-msgid "OpenType CID (dfont)"
-msgstr "OpenType CID (dfont)"
-
-#
-#: savefontdlg.c:177
-msgid "SVG font"
-msgstr "SVG 字体"
-
-#
-#: savefontdlg.c:178
-msgid "Unified Font Object"
-msgstr "统一字体对象"
-
-#: savefontdlg.c:179
-msgid "Web Open Font"
-msgstr ""
-
-#
-#: savefontdlg.c:180
-msgid "No Outline Font"
-msgstr "无轮廓字体"
-
-#
-#: savefontdlg.c:185
-msgid "In TTF/OTF"
-msgstr "TTF/OTF"
-
-#
-#: savefontdlg.c:186
-msgid "Apple bitmap only sfnt (dfont)"
-msgstr "Apple 位图字体 sfnt (dfont)"
-
-#
-#: savefontdlg.c:187
-msgid "(faked) MS bitmap only sfnt (ttf)"
-msgstr "(弃用) MS 位图字体 sfnt (ttf)"
-
-#
-#: savefontdlg.c:188
-msgid "X11 bitmap only sfnt (otb)"
-msgstr "X11 位图字体 sfnt (otb)"
-
-#
-#: savefontdlg.c:190
-msgid "NFNT (Resource)"
-msgstr "NFNT (Resource)"
-
-#
-#: savefontdlg.c:192
-msgid "NFNT (MacBin)"
-msgstr "NFNT (MacBin)"
-
-#
-#: savefontdlg.c:197
-msgid "Win FNT"
-msgstr "Win FNT"
-
-#
-#: savefontdlg.c:198
-msgid "Palm OS Bitmap"
-msgstr "Palm OS Bitmap"
-
-#
-#: savefontdlg.c:199
-msgid "PS Type3 Bitmap"
-msgstr "PS Type3 Bitmap"
-
-#
-#: savefontdlg.c:200
-msgid "No Bitmap Fonts"
-msgstr "无位图字体"
-
-#
-#: savefontdlg.c:238 savefontdlg.c:1444 savefontdlg.c:1473
-msgid "Pixel List"
-msgstr "像素列表"
-
-#
-#: savefontdlg.c:547 savefontdlg.c:2357
-msgid "Options"
-msgstr "选项"
-
-#
-#: savefontdlg.c:579
-msgid "Round"
-msgstr "圆整"
-
-#
-#: savefontdlg.c:581
-msgid "Do you want to round coordinates to integers (this saves space)?"
-msgstr "是否圆整坐标值以节省空间？"
-
-#
-#: savefontdlg.c:591
-msgid "Do you want the font file to contain PostScript hints?"
-msgstr "是否包含PostScript信息在字体文件中?"
-
-#
-#: savefontdlg.c:600
-msgid "Flex Hints"
-msgstr "Flex信息"
-
-#
-#: savefontdlg.c:602
-msgid "Do you want the font file to contain PostScript flex hints?"
-msgstr "是否包含PostScript Flex信息在字体文件中?"
-
-#
-#: savefontdlg.c:611
-msgid "Hint Substitution"
-msgstr "消隐替换"
-
-#
-#: savefontdlg.c:613
-msgid "Do you want the font file to do hint substitution?"
-msgstr "是否包含消隐替换信息在字体文件中?"
-
-#
-#: savefontdlg.c:620
-msgid "First 256"
-msgstr "开始的256"
-
-#: savefontdlg.c:622
-msgid ""
-"Limit the font so that only the glyphs referenced in the first 256 "
-"encodings\n"
-"will be included in the file"
-msgstr ""
-
-#
-#: savefontdlg.c:629
-msgid "Output AFM"
-msgstr "生成AFM"
-
-#: savefontdlg.c:631
-msgid ""
-"The AFM file contains metrics information that many word-processors will "
-"read when using a PostScript® font."
-msgstr "AFM 文件中包含的内容可以被许多文字处理软件在使用 PostScript® 字体时读取。"
-
-#
-#: savefontdlg.c:639
-msgid "Composites in AFM"
-msgstr "AFM组合"
-
-#: savefontdlg.c:641
-msgid ""
-"The AFM format allows some information about composites\n"
-"(roughly the same as mark to base anchor classes) to be\n"
-"included. However it tends to make AFM files huge as it\n"
-"is not stored in an efficient manner."
-msgstr ""
-
-#
-#: savefontdlg.c:649
-msgid "Output PFM"
-msgstr "生成PFM"
-
-#: savefontdlg.c:651
-msgid ""
-"The PFM file contains information Windows needs to install a PostScript® "
-"font."
-msgstr "PFM 文件包含的内容在Windows下需要安装 PostScript® 字体。"
-
-#
-#: savefontdlg.c:659
-msgid "Output TFM & ENC"
-msgstr "生成 TFM 及 ENC"
-
-#: savefontdlg.c:661
-msgid ""
-"The tfm and enc files contain information TeX needs to install a PostScript® "
-"font."
-msgstr "TFM 和 ENC 文件包含的内容 TeX 需要安装 PostScript® 字体。"
-
-#: savefontdlg.c:674
-msgid "SFNT"
-msgstr ""
-
-#
-#: savefontdlg.c:689
-msgid "TrueType Hints"
-msgstr "TrueType消隐"
-
-#: savefontdlg.c:691
-msgid ""
-"Do you want the font file to contain truetype hints? This will not\n"
-"generate new instructions, it will just make use of whatever is associated\n"
-"with each character."
-msgstr ""
-
-#
-#: savefontdlg.c:699
-msgid "PS Glyph Names"
-msgstr "PS字形名称"
-
-#: savefontdlg.c:701
-msgid ""
-"Do you want the font file to contain the names of each glyph in the font?"
-msgstr ""
-
-#: savefontdlg.c:711
-msgid ""
-"Apple and MS/Adobe differ about the format of truetype and opentype files\n"
-"This allows you to select which standard to follow for your font.\n"
-"The main differences are:\n"
-" The requirements for the 'postscript' name in the name table conflict\n"
-" Bitmap data are stored in different tables\n"
-" Scaled composite characters are treated differently\n"
-" Use of GSUB rather than morx(t)/feat\n"
-" Use of GPOS rather than kern/opbd\n"
-" Use of GDEF rather than lcar/prop"
-msgstr ""
-
-#: savefontdlg.c:722
-msgid ""
-"Apple and MS/Adobe differ about the format of truetype and opentype files\n"
-"This allows you to select which standard to follow for your font.\n"
-"The main differences are:\n"
-" The requirements for the 'postscript' name in the name table conflict\n"
-" Bitmap data are stored in different tables\n"
-" Scaled composite glyphs are treated differently\n"
-" Use of GSUB rather than morx(t)/feat\n"
-" Use of GPOS rather than kern/opbd\n"
-" Use of GDEF rather than lcar/prop"
-msgstr ""
-
-#
-#: savefontdlg.c:730
-msgid "Old style 'kern'"
-msgstr "旧类型'kern'"
-
-#: savefontdlg.c:732
-msgid ""
-"Many applications still don't support 'GPOS' kerning.\n"
-"If you want to include both 'GPOS' and old-style 'kern'\n"
-"tables set this check box.\n"
-"It may not be set in conjunction with the Apple checkbox.\n"
-"This may confuse other applications though."
-msgstr ""
-
-#: savefontdlg.c:741
-msgid "Dummy 'DSIG'"
-msgstr ""
-
-#: savefontdlg.c:744
-msgid ""
-"MS uses the presence of a 'DSIG' table to determine whether to use an "
-"OpenType\n"
-"icon for the tt font. FontForge can't generate a useful 'DSIG' table, but it "
-"can\n"
-"generate an empty one with no signature info. A pointless table."
-msgstr ""
-
-#
-#: savefontdlg.c:754
-msgid "Output Glyph Map"
-msgstr "生成字形映射"
-
-#
-#: savefontdlg.c:764
-msgid "Output OFM & CFG"
-msgstr "生成 OFM 及 CFG"
-
-#: savefontdlg.c:766
-msgid ""
-"The ofm and cfg files contain information Omega needs to process a font."
-msgstr ""
-
-#
-#: savefontdlg.c:774
-msgid "PfaEdit Table"
-msgstr "PfaEdit表"
-
-#: savefontdlg.c:776
-msgid ""
-"The PfaEdit table is an extension to the TrueType format\n"
-"and contains various data used by FontForge\n"
-"(It should be called the FontForge table,\n"
-"but isn't for historical reasons)"
-msgstr ""
-
-#
-#: savefontdlg.c:784
-msgid "Save Comments"
-msgstr "保存注释"
-
-#
-#: savefontdlg.c:786
-msgid "Save glyph comments in the PfEd table"
-msgstr "保存字形注释到PfaEdit表"
-
-#
-#: savefontdlg.c:794
-msgid "Save Colors"
-msgstr "保存颜色"
-
-#
-#: savefontdlg.c:796
-msgid "Save glyph colors in the PfEd table"
-msgstr "保存字形颜色到PfaEdit表"
-
-#
-#: savefontdlg.c:804
-msgid "Lookup Names"
-msgstr "查找名称"
-
-#: savefontdlg.c:806
-msgid "Preserve the names of the GPOS/GSUB lookups and subtables"
-msgstr ""
-
-#
-#: savefontdlg.c:814
-msgid "Save Guides"
-msgstr "保存导引"
-
-#: savefontdlg.c:816
-msgid "Save the guidelines in the Guide layer."
-msgstr ""
-
-#: savefontdlg.c:824
-msgid "Save Layers"
-msgstr ""
-
-#: savefontdlg.c:827
-msgid ""
-"Preserve any background and spiro layers.\n"
-"Also if we output a truetype font from a\n"
-"cubic database, save the cubic splines."
-msgstr ""
-
-#
-#: savefontdlg.c:837
-msgid "TeX Table"
-msgstr "TeX表"
-
-#: savefontdlg.c:839
-msgid ""
-"The TeX table is an extension to the TrueType format\n"
-"and the various data you would expect to find in\n"
-"a tfm file (that isn't already stored elsewhere\n"
-"in the ttf file)\n"
-msgstr ""
-
-#
-#: savefontdlg.c:854
-msgid "Output Font Log"
-msgstr "生成字体信息"
-
-#: savefontdlg.c:857
-msgid ""
-"The FONTLOG is a text file containing pertinent information\n"
-"about the font including such things as its change history.\n"
-"The SIL Open Font License highly recommends its use.\n"
-"\n"
-"If your font contains a FONTLOG (see the Element->Font Info)\n"
-"and you check this box, then the internal FONTLOG will be\n"
-"written to the file \"FONTLOG.txt\" in the same directory\n"
-"as the font itself."
-msgstr ""
-
-#
-#: savefontdlg.c:966 savefontdlg.c:981
-msgid "BDF Resolution"
-msgstr "BDF分辨率"
-
-#
-#: savefontdlg.c:1027
-msgid "Guess each font's resolution based on its pixel size"
-msgstr "基于点阵尺寸猜测字体的分辨率"
-
-#
-#: savefontdlg.c:1240
-msgid "Find Sub Font Definition file"
-msgstr "查找替代字体定义文件"
-
-#
-#: savefontdlg.c:1354
-msgid "Notdef name"
-msgstr "未定义名称"
-
-#: savefontdlg.c:1354
-#, c-format
-msgid ""
-"The glyph at encoding %d is named \".notdef\" but contains an outline. "
-"Because it is called \".notdef\" it will not be included in the generated "
-"font. You may give it a new name using Element->Glyph Info. Do you wish to "
-"continue font generation (and omit this character)?"
-msgstr ""
-
-#
-#: savefontdlg.c:1366
-msgid "Not a CID format"
-msgstr "非CID格式"
-
-#: savefontdlg.c:1366
-msgid ""
-"You are attempting to save a CID font in a non-CID format. This is ok, but "
-"it means that only the current sub-font will be saved.\n"
-"Is that what you want?"
-msgstr ""
-
-#: savefontdlg.c:1374
-#, c-format
-msgid ""
-"The truetype instructions on glyph %s are out of date.\n"
-"Do you want to proceed anyway?"
-msgstr ""
-
-#
-#: savefontdlg.c:1382
-msgid "Reference point match out of date"
-msgstr "参照点匹配过期"
-
-#: savefontdlg.c:1382
-#, c-format
-msgid ""
-"In glyph %s the reference to %s is positioned by point matching, and the "
-"point numbers may no longer reflect the original intent.\n"
-"Do you want to proceed anyway?"
-msgstr ""
-
-#: savefontdlg.c:1393
-msgid "Bad OS/2 version"
-msgstr ""
-
-#: savefontdlg.c:1393
-msgid ""
-"OpenType fonts must have a version greater than 1\n"
-"Use Element->Font Info->OS/2->Misc to change this."
-msgstr ""
-
-#
-#: savefontdlg.c:1405 savefontdlg.c:1423
-msgid "Non-standard Em-Size"
-msgstr "非标准M尺寸"
-
-#: savefontdlg.c:1405
-#, c-format
-msgid ""
-"The convention is that PostScript fonts should have an Em-Size of 1000. But "
-"this font has a size of %d. This is not an error, but you might consider "
-"altering the Em-Size with the Element->Font Info->General dialog.\n"
-"Do you wish to continue to generate your font in spite of this?"
-msgstr ""
-
-#: savefontdlg.c:1423
-#, c-format
-msgid ""
-"The convention is that TrueType fonts should have an Em-Size which is a "
-"power of 2. But this font has a size of %d. This is not an error, but you "
-"might consider altering the Em-Size with the Element->Font Info->General "
-"dialog.\n"
-"Do you wish to continue to generate your font in spite of this?"
-msgstr ""
-
-#: savefontdlg.c:1438
-msgid ""
-"Your font has a 2 byte encoding, but you are attempting to save it in a "
-"format that only supports one byte encodings. This means that you won't be "
-"able to access anything after the first 256 characters without reencoding "
-"the font.\n"
-"\n"
-"Do you want to proceed anyway?"
-msgstr ""
-
-#
-#: savefontdlg.c:1449
-msgid "The 'NFNT' bitmap format is obsolete"
-msgstr "'NFNT' 位图格式已过时"
-
-#: savefontdlg.c:1449
-msgid ""
-"The 'NFNT' bitmap format is not used under OS/X (though you still need to "
-"create a (useless) bitmap font if you are saving a type1 PostScript resource)"
-msgstr ""
-
-#
-#: savefontdlg.c:1452
-msgid "Needs bitmap font"
-msgstr "需要位图字体"
-
-#: savefontdlg.c:1452
-msgid ""
-"When generating a Mac Type1 resource font, you MUST generate at least one "
-"NFNT bitmap font to go with it. If you have not created any bitmaps for this "
-"font, cancel this dlg and use the Element->Bitmaps Available command to "
-"create one"
-msgstr ""
-
-#: savefontdlg.c:1456
-msgid "The 'POST' type1 format is probably deprecated"
-msgstr ""
-
-#: savefontdlg.c:1456
-msgid ""
-"The 'POST' type1 format is probably depreciated and may not work in future "
-"version of the mac."
-msgstr ""
-
-#
-#: savefontdlg.c:1500
-msgid "_Review"
-msgstr "检查(_R)"
-
-#: savefontdlg.c:1504
-msgid "Errors detected"
-msgstr "检测到错误"
-
-#: savefontdlg.c:1504
-#, c-format
-msgid ""
-"The font contains errors.\n"
-"%sWould you like to review the errors or save the font anyway?"
-msgstr ""
-
-#: savefontdlg.c:1651
-msgid "Bad OFLib upload"
-msgstr "不良OFLib上传"
-
-#: savefontdlg.c:1653
-msgid "Missing OFLib password"
-msgstr "确是OFLib密码"
-
-#
-#: savefontdlg.c:1655
-msgid "Missing OFLib username"
-msgstr "缺失OFLib用户名"
-
-#: savefontdlg.c:1657
-msgid "Missing OFLib description"
-msgstr "确是OFLib描述"
-
-#
-#: savefontdlg.c:1659
-msgid "Missing OFLib name"
-msgstr "缺失OFLib名称"
-
-#: savefontdlg.c:1660
-msgid "Missing OFLib keywords"
-msgstr "缺失OFLib关键词"
-
-#
-#: savefontdlg.c:1755 ../gdraw/gsavefiledlg.c:153
-msgid "Create directory..."
-msgstr "创建目录…"
-
-#: savefontdlg.c:1984
-msgid "Browse for a preview image"
-msgstr ""
-
-#
-#: savefontdlg.c:2259 savefontdlg.c:2263
-msgid "Bad Mac Family"
-msgstr "不良Mac字族"
-
-#
-#: savefontdlg.c:2259
-msgid ""
-"To generate a Mac family file, the current font must have plain (Normal, "
-"Regular, etc.) style, and there must be other open fonts with the same "
-"family name."
-msgstr "要生成Mac字族文件,当前字体须有一般样式(Normal,Regular等), 同时要有其他打开的同族名的字体。."
-
-#: savefontdlg.c:2263
-#, c-format
-msgid ""
-"There are two open fonts with the current family name and the same style. "
-"%.30s and %.30s"
-msgstr ""
-
-#
-#: savefontdlg.c:2279
-msgid "Generate Mac Family"
-msgstr "生成Mac字族"
-
-#
-#: savefontdlg.c:2279
-msgid "Generate Fonts"
-msgstr "生成字体"
-
-#: savefontdlg.c:2359
-msgid "Allows you to select optional behavior when generating the font"
-msgstr ""
-
-#: savefontdlg.c:2593
-msgid "Layer:"
-msgstr ""
-
-#: savefontdlg.c:2604
-msgid "Save a font based on the specified layer"
-msgstr ""
-
-#: savefontdlg.c:2619
-msgid "Validate Before Saving"
-msgstr "保存之前确认"
-
-#: savefontdlg.c:2629
-msgid ""
-"Check the glyph outlines for standard errors before saving\n"
-"This can be slow."
-msgstr ""
-
-#: savefontdlg.c:2634
-msgid "Append a FONTLOG entry"
-msgstr ""
-
-#: savefontdlg.c:2641
-msgid "The FONTLOG allows you to keep a log of changes made to your font."
-msgstr ""
-
-#: savefontdlg.c:2656
-msgid "Upload to the"
-msgstr "上传至"
-
-#: savefontdlg.c:2661
-msgid ""
-"Once you have a final version of your font\n"
-"and if your font is licensed under the Open\n"
-"Font License, then you might consider uploading\n"
-"it to the Open Font Library. This is a website\n"
-"of Free/Libre fonts.\n"
-"\n"
-"You must have previously registered with OFLib\n"
-"and have a valid username/password there.\n"
-"\n"
-"Obviously you must be connected to the internet\n"
-"for this to work."
-msgstr ""
-
-#
-#: savefontdlg.c:2683
-msgid "Open Font Library"
-msgstr "打开字体库"
-
-#
-#: savefontdlg.c:2694
-msgid "Register"
-msgstr "注册"
-
-#: savefontdlg.c:2719
-msgid "Username:"
-msgstr "用户名："
-
-#: savefontdlg.c:2723 savefontdlg.c:2733
-msgid "Username on OFLib"
-msgstr "OFLib用户名"
-
-#: savefontdlg.c:2738
-msgid "Password:"
-msgstr "密码："
-
-#: savefontdlg.c:2742 savefontdlg.c:2756
-msgid "Password on OFLib"
-msgstr "OFLib密码"
-
-#: savefontdlg.c:2762
-msgid "Remember Me"
-msgstr "记住我"
-
-#: savefontdlg.c:2768
-msgid ""
-"FontForge will remember your username/password\n"
-"by storing them as plain text (insecurely) in your preference file"
-msgstr ""
-
-#
-#: savefontdlg.c:2776
-msgid "OFLib Name:"
-msgstr "OFLib 名称:"
-
-#: savefontdlg.c:2780 savefontdlg.c:2789
-msgid "Font name to display on OFLib"
-msgstr "OFL库中显示的字体名称"
-
-#
-#: savefontdlg.c:2794
-msgid "Artists:"
-msgstr "美工:"
-
-#: savefontdlg.c:2798 savefontdlg.c:2804
-msgid ""
-"Other artists involved in the design of this font.\n"
-"Collaborators, etc."
-msgstr ""
-
-#: savefontdlg.c:2810
-msgid "Keyword Tags:"
-msgstr "关键词标签："
-
-#: savefontdlg.c:2814
-msgid ""
-"A comma separated list of keywords that describe\n"
-"the font to help others search for it.\n"
-"You may use whatever keyword tags you desire.\n"
-"Suggestions: serif, sans_serif, bold, italic, oblique,\n"
-"extended, compressed, thin, demibold, black, outline, regular,\n"
-"display, etc."
-msgstr ""
-
-#: savefontdlg.c:2820
-msgid ""
-"A comma separated list of keywords that describe\n"
-"the font to help others search for it.\n"
-"You may use whatever keyword tags you desire.\n"
-"Suggestions: serif, sans_serif, bold, italic, oblique,\n"
-"extended, compressed, thin, demibold, black, outline,\n"
-"regular, display, etc."
-msgstr ""
-
-#
-#: savefontdlg.c:2826
-msgid "Description:"
-msgstr "描述："
-
-#: savefontdlg.c:2830 savefontdlg.c:2837 savefontdlg.c:2847
-msgid "A description of the font"
-msgstr "字体描述"
-
-#
-#: savefontdlg.c:2843
-msgid "License:"
-msgstr "许可："
-
-#: savefontdlg.c:2852
-msgid "SIL"
-msgstr "SIL"
-
-#: savefontdlg.c:2858
-msgid ""
-"The SIL Open Font License\n"
-"Please see http://scripts.sil.org/OFL"
-msgstr ""
-
-#: savefontdlg.c:2863 savefontdlg.c:2867
-msgid "Public Domain"
-msgstr "公共域"
-
-#: savefontdlg.c:2872
-msgid "Upload License"
-msgstr ""
-
-#: savefontdlg.c:2878
-msgid "Upload the license (as found in the list of truetype names)"
-msgstr ""
-
-#: savefontdlg.c:2885
-msgid "Upload FONTLOG"
-msgstr ""
-
-#: savefontdlg.c:2897
-msgid "Preview:"
-msgstr ""
-
-#: savefontdlg.c:2901
-msgid "An image of the font in use"
-msgstr ""
-
-#: savefontdlg.c:2906
-msgid "Generated Image"
-msgstr ""
-
-#: savefontdlg.c:2911
-msgid ""
-"FontForge will generate a sample image for you\n"
-"before uploading."
-msgstr ""
-
-#: savefontdlg.c:2916
-msgid "No Preview"
-msgstr ""
-
-#: savefontdlg.c:2921
-msgid "No image will be uploaded."
-msgstr ""
-
-#: savefontdlg.c:2927 savefontdlg.c:2933 savefontdlg.c:2943
-msgid ""
-"If you have already created a preview image of the font\n"
-"then provide the pathspec here."
-msgstr ""
-
-#: savefontdlg.c:2963
-msgid "Not Safe for Work"
-msgstr "不安全"
-
-#: savefontdlg.c:2967
-msgid ""
-"If for some reason the font is deemed inappropriate\n"
-"for a work environment."
-msgstr ""
-
-#: savefontdlg.c:3056
-msgid "Merge tables across fonts"
-msgstr ""
-
-#: savefontdlg.c:3061
-msgid ""
-"FontForge can generate two styles of ttc file.\n"
-"In the first each font is a separate entity\n"
-"with no connection to other fonts. In the second\n"
-"FontForge will attempt to use the same glyph table\n"
-"for all fonts, merging duplicate glyphs. It will\n"
-"also attempt to use the same space for tables in\n"
-"different fonts which are bit by bit the same.\n"
-"\n"
-"FontForge isn't always able to perform a merge, in\n"
-"which case it falls back on generating independent\n"
-"fonts within the ttc.\n"
-" FontForge cannot merge if:\n"
-"  * The fonts have different em-sizes\n"
-"  * Bitmaps are involved\n"
-"  * The merged glyf table has more than 65534 glyphs\n"
-"\n"
-"(Merging will take longer)"
-msgstr ""
-
-#: savefontdlg.c:3080
-msgid "As CFF fonts"
-msgstr ""
-
-#: savefontdlg.c:3085
-msgid ""
-"Put CFF fonts into the ttc rather than TTF.\n"
-" These seem to work on the mac and linux\n"
-" but are documented not to work on Windows."
-msgstr ""
-
-#
-#: scripting.c:214
-msgid "Called from...\n"
-msgstr "调用自...\n"
-
-#
-#: scripting.c:215
-#, c-format
-msgid " %s: line %d\n"
-msgstr " %s: 行 %d\n"
-
-#
-#: scripting.c:243
-#, c-format
-msgid "%s: %d Expected %s, got %s"
-msgstr "%s: %d 需要 %s, 却得到 %s"
-
-#
-#: scripting.c:246
-#, c-format
-msgid "%1$s: %2$d. Expected %3$s got %4$s"
-msgstr "%1$s: %2$d. 期待 %3$s 得到 %4$s"
-
-#
-#: scripting.c:256
-#, c-format
-msgid "%s: %d Unexpected %s found"
-msgstr "%s: %d 未找到 %s 找到"
-
-#
-#: scripting.c:276 scripting.c:317
-#, c-format
-msgid "%s line: %d %s\n"
-msgstr "%s 行: %d %s\n"
-
-#
-#: scripting.c:294
-#, c-format
-msgid "%s line: %d %s: %s\n"
-msgstr "%s 行: %d %s: %s\n"
-
-#
-#: scripting.c:429
-msgid "Attention"
-msgstr "注意"
-
-#: scripting.c:1891
-#, c-format
-msgid ""
-"Warning: %s has a different family name than does %s (GenerateFamily)\n"
-msgstr ""
-
-#
-#: scripting.c:1923
-#, c-format
-msgid "%s(%s) and %s(%s) 0x%x in FOND %s\n"
-msgstr "%s(%s) 与 %s(%s) 0x%x 于 FOND %s\n"
-
-#: scripting.c:5627
-#, c-format
-msgid ""
-"Warning: could not figure out where the hint (%d,%d %d,%d %d,%d) is valid\n"
-msgstr ""
-
-#: scripting.c:5637
-#, c-format
-msgid "Warning: No characters selected in AddDHint(%d,%d %d,%d %d,%d)\n"
-msgstr ""
-
-#: scripting.c:5685
-#, c-format
-msgid "Warning: No characters selected in AddHint(%d,%d,%d)\n"
-msgstr ""
-
-#: scripting.c:6165
-#, c-format
-msgid "Warning: %dth axis value (%g) is outside the allowed range [%g,%g]\n"
-msgstr ""
-
-#
-#: scripting.c:8694
-#, c-format
-msgid "%s:%d Unexpected character %c (%d)\n"
-msgstr "%s:%d 需要字符 %c (%d)\n"
-
-#
-#: scriptingdlg.c:258
-msgid "Execute Script"
-msgstr "执行脚本"
-
-#
-#: scriptingdlg.c:282
-msgid "_Python"
-msgstr "_Python"
-
-#
-#: scriptingdlg.c:293
-msgid "_FF"
-msgstr "_FF"
-
-#
-#: scriptingdlg.c:337
-msgid "C_all..."
-msgstr "调用(_A)..."
-
-#: scstyles.c:2678
-msgid "Small Capitals"
-msgstr ""
-
-#: scstyles.c:2679
-msgid "Building small capitals"
-msgstr ""
-
-#: scstyles.c:2925
-msgid "Subscripts/Superscripts"
-msgstr ""
-
-#: scstyles.c:2926
-msgid "Building sub/superscripts"
-msgstr ""
-
-#: scstyles.c:2928
-msgid "Generic change"
-msgstr ""
-
-#: scstyles.c:2929
-msgid "Changing glyphs"
-msgstr ""
-
-#: scstyles.c:6815 scstylesui.c:2422
-msgid "Italic"
-msgstr ""
-
-#: scstyles.c:6816
-msgid "Italic Conversion"
-msgstr ""
-
-#: scstyles.c:6922 scstyles.c:6923
-msgid "Change X-Height"
-msgstr ""
-
-#: scstylesui.c:81
-msgid "Counter Expansion Factor"
-msgstr "计数扩展因子"
-
-#
-#: scstylesui.c:82
-msgid "Counter Addition"
-msgstr "计数增加"
-
-#: scstylesui.c:83
-msgid "Side Bearing Expansion Factor"
-msgstr "边位缩放系数"
-
-#
-#: scstylesui.c:84
-msgid "Side Bearing Addition"
-msgstr "侧边位增加"
-
-#
-#: scstylesui.c:145
-msgid "Condense/Extend"
-msgstr "压缩/扩展"
-
-#
-#: scstylesui.c:161
-msgid "Scale By"
-msgstr "缩放至"
-
-#
-#: scstylesui.c:179 scstylesui.c:2141
-msgid "Counters:"
-msgstr "计数:"
-
-#
-#: scstylesui.c:216
-msgid "Side Bearings:"
-msgstr "侧边位:"
-
-#
-#: scstylesui.c:253
-msgid "Correct for Italic Angle"
-msgstr "倾斜角修正"
-
-#: scstylesui.c:446
-msgid "Horizontal Stem Height Scale"
-msgstr ""
-
-#: scstylesui.c:447
-msgid "Horizontal Stem Height Add"
-msgstr ""
-
-#: scstylesui.c:448
-msgid "Threshold between Thin and Thick Stems"
-msgstr ""
-
-#: scstylesui.c:453
-msgid "Vertical Stem Width Scale"
-msgstr ""
-
-#: scstylesui.c:454
-msgid "Vertical Stem Width Add"
-msgstr ""
-
-#: scstylesui.c:460
-msgid "Unlikely stem threshold"
-msgstr ""
-
-#: scstylesui.c:460
-msgid "Stem threshold should be positive"
-msgstr ""
-
-#: scstylesui.c:463
-msgid "Unlikely scale factor"
-msgstr ""
-
-#: scstylesui.c:463
-msgid "Scale factors must be between 3 and 1000 percent"
-msgstr ""
-
-#: scstylesui.c:469 scstylesui.c:476
-msgid "Bad stem add"
-msgstr ""
-
-#: scstylesui.c:496
-msgid "Bad tag"
-msgstr ""
-
-#: scstylesui.c:496
-msgid "Feature tags are limited to 4 letters"
-msgstr ""
-
-#: scstylesui.c:506
-msgid "Missing glyph extension"
-msgstr ""
-
-#: scstylesui.c:506
-msgid "You must specify a glyph extension"
-msgstr ""
-
-#: scstylesui.c:510
-msgid "Vertical Offset"
-msgstr ""
-
-#: scstylesui.c:521
-msgid "Missing extension"
-msgstr ""
-
-#: scstylesui.c:521
-msgid "You must provide a glyph extension"
-msgstr ""
-
-#: scstylesui.c:532
-msgid "Horizontal Counter Scale"
-msgstr ""
-
-#: scstylesui.c:533
-msgid "Horizontal Counter Add"
-msgstr ""
-
-#: scstylesui.c:540
-msgid "Left Side Bearing Scale"
-msgstr ""
-
-#: scstylesui.c:541
-msgid "Left Side Bearing Add"
-msgstr ""
-
-#: scstylesui.c:542
-msgid "Right Side Bearing Scale"
-msgstr ""
-
-#: scstylesui.c:543
-msgid "Right Side Bearing Add"
-msgstr ""
-
-#: scstylesui.c:555
-msgid "Vertical Scale"
-msgstr ""
-
-#: scstylesui.c:575
-msgid "Vertical Counter Scale"
-msgstr ""
-
-#: scstylesui.c:576
-msgid "Vertical Counter Add"
-msgstr ""
-
-#: scstylesui.c:596
-msgid "Width of Vertical Stems:"
-msgstr ""
-
-#: scstylesui.c:597
-msgid "Width/Height of Thick Stems:"
-msgstr ""
-
-#: scstylesui.c:601
-msgid "Height of Horizontal Stems:"
-msgstr ""
-
-#: scstylesui.c:602
-msgid "Width/Height of Thin Stems:"
-msgstr ""
-
-#: scstylesui.c:778
-msgid "Original Y Position"
-msgstr ""
-
-#: scstylesui.c:779
-msgid "Extent"
-msgstr ""
-
-#: scstylesui.c:780
-msgid "Resultant Y Position"
-msgstr ""
-
-#: scstylesui.c:964
-msgid "Create Subscript/Superscript"
-msgstr ""
-
-#: scstylesui.c:965
-msgid "Create Small Caps"
-msgstr ""
-
-#: scstylesui.c:966
-msgid "Change Glyphs"
-msgstr ""
-
-#: scstylesui.c:984
-msgid ""
-"Unlike most commands this one does not work directly on the\n"
-"selected glyphs. Instead, if you select a glyph FontForge will\n"
-"create (or reuse) another glyph named by appending the extension\n"
-"to the original name, and it will copy a modified version of\n"
-"the original glyph into the new one."
-msgstr ""
-
-#: scstylesui.c:1002
-msgid "Feature Tag:"
-msgstr ""
-
-#: scstylesui.c:1021
-msgid "Glyph Extension:"
-msgstr ""
-
-#: scstylesui.c:1043
-msgid "Vertical Offset:"
-msgstr ""
-
-#: scstylesui.c:1071 scstylesui.c:1186
-msgid "Introduction"
-msgstr ""
-
-#: scstylesui.c:1079
-msgid ""
-"Unlike most commands this one does not work directly on the\n"
-"selected glyphs. Instead, if you select an \"A\" (or an \"a\")\n"
-"FontForge will create (or reuse) a glyph named \"a.sc\", and\n"
-"it will copy a modified version of the \"A\" glyph into \"a.sc\"."
-msgstr ""
-
-#: scstylesui.c:1106
-msgid "Petite Caps"
-msgstr ""
-
-#: scstylesui.c:1122
-msgid "Glyph Extensions"
-msgstr ""
-
-#: scstylesui.c:1131
-msgid "Letters:"
-msgstr ""
-
-#: scstylesui.c:1147
-msgid "Symbols:"
-msgstr ""
-
-#: scstylesui.c:1170
-msgid "Create small caps variants for symbols as well as letters"
-msgstr ""
-
-#: scstylesui.c:1202
-msgid "Uniform scaling for stems of any width and direction"
-msgstr ""
-
-#: scstylesui.c:1213
-msgid "Separate ratios for thin and thick stems"
-msgstr ""
-
-#: scstylesui.c:1224
-msgid "Threshold between \"thin\" and \"thick\":"
-msgstr ""
-
-#: scstylesui.c:1259
-msgid "Separate ratios for horizontal and vertical stems"
-msgstr ""
-
-#: scstylesui.c:1288 scstylesui.c:1333 scstylesui.c:1450 scstylesui.c:1494
-#: scstylesui.c:1537 scstylesui.c:1607
-msgid "% +"
-msgstr ""
-
-#: scstylesui.c:1367
-msgid "Activate diagonal stem processing"
-msgstr ""
-
-#: scstylesui.c:1382 scstylesui.c:2667
-msgid "Stems"
-msgstr ""
-
-#: scstylesui.c:1388
-msgid "Retain current advance width, center glyph within that width"
-msgstr ""
-
-#: scstylesui.c:1399
-msgid "Retain current advance width, scale side bearings proportionally"
-msgstr ""
-
-#: scstylesui.c:1410
-msgid "Uniform scaling for horizontal counters and side bearings"
-msgstr ""
-
-#: scstylesui.c:1421
-msgid "Non uniform scaling for horizontal counters and side bearings"
-msgstr ""
-
-#: scstylesui.c:1432
-msgid "Counter Size:"
-msgstr ""
-
-#: scstylesui.c:1477
-msgid "Left Side Bearing:"
-msgstr ""
-
-#: scstylesui.c:1520
-msgid "Right Side Bearing:"
-msgstr ""
-
-#
-#: scstylesui.c:1574 transform.c:461
-msgid "Horizontal"
-msgstr "水平"
-
-#: scstylesui.c:1580
-msgid "Control Vertical Counters (use for CJK)"
-msgstr ""
-
-#: scstylesui.c:1590
-msgid "Vertical Counters:"
-msgstr ""
-
-#: scstylesui.c:1641
-msgid "Control Vertical Mapping (use for Latin, Greek, Cyrillic)"
-msgstr ""
-
-#: scstylesui.c:1646
-msgid "These mappings may be used to fix certain standard heights."
-msgstr ""
-
-#: scstylesui.c:1653
-msgid "Vertical Scale:"
-msgstr ""
-
-#
-#: scstylesui.c:1671 transform.c:479 transform.c:488
-msgid "%"
-msgstr "%"
-
-#
-#: scstylesui.c:1700 transform.c:470
-msgid "Vertical"
-msgstr "垂直"
-
-#: scstylesui.c:1725
-msgid "Everything to its default value"
-msgstr ""
-
-#: scstylesui.c:1726
-msgid "Reset"
-msgstr ""
-
-#
-#: scstylesui.c:1833
-msgid "Embolden by"
-msgstr "内嵌"
-
-#
-#: scstylesui.c:1838 scstylesui.c:2099 scstylesui.c:2882
-msgid "Serif Height"
-msgstr "衬线高度"
-
-#: scstylesui.c:1839
-msgid "Serif Height Fuzz"
-msgstr "衬线高度系数"
-
-#
-#: scstylesui.c:1841
-msgid "Top Zone"
-msgstr "上部区域"
-
-#
-#: scstylesui.c:1842
-msgid "Bottom Zone"
-msgstr "下部区域"
-
-#
-#: scstylesui.c:1843
-msgid "Top Hint"
-msgstr "顶部消隐"
-
-#
-#: scstylesui.c:1844
-msgid "Bottom Hint"
-msgstr "底部消隐"
-
-#
-#: scstylesui.c:1915
-msgid "Change Weight"
-msgstr "更改粗细"
-
-#
-#: scstylesui.c:1928
-msgid "Embolden by:"
-msgstr "内嵌："
-
-#: scstylesui.c:1956
-msgid "_LCG"
-msgstr "_LCG"
-
-#: scstylesui.c:1957
-msgid "Embolden as appropriate for Latin, Cyrillic and Greek scripts"
-msgstr ""
-
-#: scstylesui.c:1967
-msgid "_CJK"
-msgstr "中日韩(_C)"
-
-#: scstylesui.c:1968
-msgid "Embolden as appropriate for Chinese, Japanese, Korean scripts"
-msgstr ""
-
-#
-#: scstylesui.c:1978
-msgid "_Auto"
-msgstr "自动(_A)"
-
-#: scstylesui.c:1979
-msgid "Choose the appropriate method depending on the glyph's script"
-msgstr ""
-
-#
-#: scstylesui.c:1989
-msgid "C_ustom"
-msgstr "自定义(_U)"
-
-#: scstylesui.c:1990
-msgid "User controls the emboldening with the next two fields"
-msgstr ""
-
-#
-#: scstylesui.c:2010
-msgid "_Top hint:"
-msgstr "顶部消隐(_T):"
-
-#
-#: scstylesui.c:2032
-msgid "_Zone:"
-msgstr "区域(_Z):"
-
-#
-#: scstylesui.c:2055
-msgid "_Bottom hint:"
-msgstr "底部消隐(_B):"
-
-#
-#: scstylesui.c:2076
-msgid "Zone:"
-msgstr "区域:"
-
-#: scstylesui.c:2104
-msgid ""
-"Any points this high will be assumed to be on serifs,\n"
-"and will remain at that height after processing.\n"
-"(So serifs should remain the same size).\n"
-"(If you do wish the serifs to grow, set this to 0)"
-msgstr ""
-
-#: scstylesui.c:2120
-msgid "Fuzz"
-msgstr "模糊"
-
-#: scstylesui.c:2125
-msgid "Allow the height match to differ by this much"
-msgstr ""
-
-#: scstylesui.c:2142
-msgid ""
-"The simple application of this algorithm will squeeze counters\n"
-"That is not normally seen in bold latin fonts"
-msgstr ""
-
-#
-#: scstylesui.c:2150
-msgid "Squish"
-msgstr "Squish"
-
-#: scstylesui.c:2151
-msgid "Make the counters narrower"
-msgstr "使轮廓窄些"
-
-#: scstylesui.c:2162
-msgid ""
-"Try to insure that the counters are as wide\n"
-"afterward as they were before"
-msgstr ""
-
-#
-#: scstylesui.c:2172
-msgid "Auto"
-msgstr "自动"
-
-#: scstylesui.c:2173
-msgid ""
-"Retain counter size for glyphs using latin algorithm\n"
-"Squish them for those using CJK."
-msgstr ""
-
-#: scstylesui.c:2285
-msgid "Oblique Slant..."
-msgstr ""
-
-#: scstylesui.c:2285
-msgid "By what angle (in degrees) do you want to slant the font?"
-msgstr ""
-
-#: scstylesui.c:2354
-msgid "LSB Compression Percent"
-msgstr ""
-
-#: scstylesui.c:2355
-msgid "Stem Compression Percent"
-msgstr ""
-
-#: scstylesui.c:2356
-msgid "Counter Compression Percent"
-msgstr ""
-
-#: scstylesui.c:2357
-msgid "RSB Compression Percent"
-msgstr ""
-
-#: scstylesui.c:2361
-msgid "XHeight Percent"
-msgstr ""
-
-#: scstylesui.c:2362
-msgid "Italic Angle"
-msgstr ""
-
-#: scstylesui.c:2380
-msgid "Bad setting"
-msgstr ""
-
-#: scstylesui.c:2380
-msgid "You may not select both variants of 'f'"
-msgstr ""
-
-#: scstylesui.c:2537
-msgid "Transform baseline serifs"
-msgstr ""
-
-#: scstylesui.c:2549
-msgid "Transform x-height serifs"
-msgstr ""
-
-#: scstylesui.c:2561
-msgid "Transform ascender serifs"
-msgstr ""
-
-#: scstylesui.c:2573
-msgid "Transform descender serifs"
-msgstr ""
-
-#: scstylesui.c:2585
-msgid "Transform diagonal serifs"
-msgstr ""
-
-#: scstylesui.c:2597
-msgid "When serifs are removed (as first two in \"m\"), replace with:"
-msgstr ""
-
-#: scstylesui.c:2604
-msgid "Flat"
-msgstr ""
-
-#: scstylesui.c:2616
-msgid "Slanted"
-msgstr ""
-
-#: scstylesui.c:2628
-msgid "Pen Slanted"
-msgstr ""
-
-#: scstylesui.c:2650
-msgid "Compress (as a percentage)"
-msgstr ""
-
-#: scstylesui.c:2659
-msgid "LSB"
-msgstr ""
-
-#: scstylesui.c:2663
-msgid "Left Side Bearing"
-msgstr ""
-
-#: scstylesui.c:2681
-msgid "RSB"
-msgstr ""
-
-#: scstylesui.c:2685
-msgid "Right Side Bearing"
-msgstr ""
-
-#
-#: scstylesui.c:2692
-msgid "Lower Case"
-msgstr "小写"
-
-#
-#: scstylesui.c:2692
-msgid "Upper Case"
-msgstr "大写"
-
-#: scstylesui.c:2692
-msgid "Others"
-msgstr ""
-
-#: scstylesui.c:2751
-msgid "XHeight Percent:"
-msgstr ""
-
-#: scstylesui.c:2765
-msgid ""
-"Traditionally the x-height of an italic face is slightly less\n"
-"than the x-height of the companion roman"
-msgstr ""
-
-#: scstylesui.c:2769
-msgid "Italic Angle:"
-msgstr ""
-
-#: scstylesui.c:2798
-msgid ""
-"This italic conversion will be incomplete!\n"
-"You will probably want to do manual fixups on e, g, k, and v-z\n"
-"And on в, г, д, е, ж, л, м, ц, щ, ъ, ђ\n"
-"And on all Greek lower case letters. And maybe everything else."
-msgstr ""
-
-#: scstylesui.c:2880
-msgid "Current X-Height"
-msgstr ""
-
-#: scstylesui.c:2881
-msgid "Desired X-Height"
-msgstr ""
-
-#: scstylesui.c:2917
-msgid "Change XHeight"
-msgstr ""
-
-#: scstylesui.c:2931
-msgid "Current x-height:"
-msgstr ""
-
-#: scstylesui.c:2948
-msgid "Desired x-height:"
-msgstr ""
-
-#: scstylesui.c:2965
-msgid "Serif height:"
-msgstr ""
-
-#
-#: search.c:1262
-msgid "Replace Outline with Reference"
-msgstr "替换轮廓为参照"
-
-#
-#: search.c:1274 searchview.c:144 searchview.c:168
-msgid "Not Found"
-msgstr "未找到"
-
-#: search.c:1274
-#, c-format
-msgid "The outlines of glyph %2$.30s were not found in the font %1$.60s"
-msgstr ""
-
-#: search.c:1452
-msgid "Correcting References"
-msgstr ""
-
-#: search.c:1453
-msgid ""
-"Adding new glyphs and referring to them when a glyph contains a bad truetype "
-"reference"
-msgstr ""
-
-#: search.c:1460
-#, c-format
-msgid ""
-"%s had both contours and references, so the contours were moved into this "
-"glyph, and the a reference to it was added in the original."
-msgstr ""
-
-#: search.c:1481
-#, c-format
-msgid ""
-"%1$s had a reference, %2$s, with a bad transformation matrix (one of the "
-"matrix elements was bigger than 2). I moved the transformed contours into "
-"this glyph and made a reference to it, instead."
-msgstr ""
-
-#: searchview.c:144
-#, c-format
-msgid "The search pattern was not found again in the font %.100s"
-msgstr ""
-
-#: searchview.c:144 searchview.c:168
-#, c-format
-msgid "The search pattern was not found in the font %.100s"
-msgstr ""
-
-#
-#: searchview.c:146 searchview.c:399 searchview.c:477 searchview.c:894
-msgid "Find"
-msgstr "查找"
-
-#
-#: searchview.c:157 searchview.c:802
-msgid "Find Next"
-msgstr "查找下一个"
-
-#: searchview.c:189
-msgid "Match Fuzziness:"
-msgstr "匹配模糊系数:"
-
-#: searchview.c:203 searchview.c:208 searchview.c:210
-msgid "Bad search pattern"
-msgstr ""
-
-#: searchview.c:203
-msgid "Nothing to match."
-msgstr ""
-
-#: searchview.c:208
-msgid ""
-"When \"Endpoints specify minimum length and direction only\" is checked, the "
-"search pattern must be a single open contour."
-msgstr ""
-
-#: searchview.c:210
-msgid ""
-"When \"Endpoints specify minimum length and direction only\" is checked, the "
-"search pattern must be a single open contour with at least 3 points on it "
-"(otherwise there is nothing to match)."
-msgstr ""
-
-#: searchview.c:212 searchview.c:219
-msgid "Bad replace pattern"
-msgstr ""
-
-#: searchview.c:212
-msgid ""
-"When \"Endpoints specify minimum length and direction only\" is checked, the "
-"replace pattern must be a single open contour with at least 3 points on it."
-msgstr ""
-
-#: searchview.c:219
-msgid ""
-"When the search path is a single open contour, the replace pattern must also "
-"be."
-msgstr ""
-
-#
-#: searchview.c:380
-msgid "Search Pattern:"
-msgstr "搜索模式:"
-
-#
-#: searchview.c:386
-msgid "Replace Pattern:"
-msgstr "替代模式"
-
-#
-#: searchview.c:476
-#, c-format
-msgid "Find in %.100s"
-msgstr "在 %.100s 中查找"
-
-#
-#: searchview.c:519 ../gdraw/gsavefiledlg.c:73
-msgid "Cancel"
-msgstr "取消"
-
-#: searchview.c:524
-#, c-format
-msgid ""
-"The %1$s in the search dialog contains a reference to %2$.20hs which does "
-"not exist in the new font.\n"
-"Should I remove the reference?"
-msgstr ""
-
-#: searchview.c:525
-msgid "Search Pattern"
-msgstr ""
-
-#: searchview.c:525
-msgid "Replace Pattern"
-msgstr ""
-
-#
-#: searchview.c:713
-msgid "Allow:"
-msgstr "允许:"
-
-#: searchview.c:719 searchview.c:729 searchview.c:739 searchview.c:749
-msgid ""
-"Allow a match even if the search pattern has\n"
-"to be transformed by a combination of the\n"
-"following transformations."
-msgstr ""
-
-#
-#: searchview.c:723
-msgid "Flipping"
-msgstr "翻转"
-
-#
-#: searchview.c:733
-msgid "Scaling"
-msgstr "缩放"
-
-#
-#: searchview.c:743
-msgid "Rotating"
-msgstr "旋转"
-
-#: searchview.c:753
-msgid "_Match Fuzziness:"
-msgstr "匹配模糊系数(_M):"
-
-#: searchview.c:772
-msgid "Endpoints specify minimum length and direction only"
-msgstr ""
-
-#: searchview.c:779
-msgid ""
-"If the search pattern is a single open contour\n"
-"then do not match the end points. They merely\n"
-"specify the direction from which the curve should\n"
-"move toward the next point (which will be matched),\n"
-"and the minimum distance between the first matched\n"
-"point and the one before it. The endpoints of the\n"
-"replace contour will also only be used for positioning.\n"
-"\n"
-"This allows you to match a right angle corner\n"
-"without needed to specify exactly how long the edges\n"
-"are which form the right angle."
-msgstr ""
-
-#: searchview.c:793
-msgid "Search Selected Chars Only"
-msgstr ""
-
-#: searchview.c:799
-msgid ""
-"Only search characters selected in the fontview.\n"
-"Normally we search all characters in the font."
-msgstr ""
-
-#
-#: searchview.c:812
-msgid "Find All"
-msgstr "查找全部"
-
-#
-#: searchview.c:832
-msgid "Replace All"
-msgstr "全部替代"
-
-#
-#: sfd.c:2392
-msgid "Saving Bitmaps"
-msgstr "保存位图"
-
-#
-#: sfd.c:2520
-msgid "Saving..."
-msgstr "保存"
-
-#
-#: sfd.c:2520
-msgid "Saving Spline Font Database"
-msgstr "保存样条字体库"
-
-#
-#: sfd.c:2520
-msgid "Saving Outlines"
-msgstr "保存轮廓"
-
-#
-#: sfd.c:5125 splinefont.c:590 splinefont.c:607
-msgid "Interpreting Glyphs"
-msgstr "处理字形"
-
-#: sfd.c:6650
-msgid ""
-"Warning: This version of FontForge does not contain extended type3/svg "
-"support\n"
-" needed for this font.\n"
-"Reconfigure with --with-type3.\n"
-msgstr ""
-
-#: sfd.c:7642
-msgid "_Skip for now"
-msgstr ""
-
-#
-#: sfd.c:7643
-msgid "Forget _to All"
-msgstr "全忽略(_T)"
-
-#: sfd.c:7643
-msgid "_Forget about it"
-msgstr "忽略之(_F)"
-
-#
-#: sfd.c:7645
-msgid "Recover old edit"
-msgstr "恢复旧版本"
-
-#: sfd.c:7645
-#, c-format
-msgid ""
-"You appear to have an old editing session on %s.\n"
-"Would you like to recover it?"
-msgstr ""
-
-#
-#: sfd.c:7681
-msgid "Recovery Failed"
-msgstr "恢复失败"
-
-#: sfd.c:7681
-#, c-format
-msgid ""
-"Automagic recovery of changes to %.80s failed.\n"
-"Should FontForge try again to recover next time you start it?"
-msgstr ""
-
-#
-#. GT: Need to split some AnchorClasses into two classes, one for normal
-#. GT:  base letters, and one for ligatures. So create a new AnchorClass
-#. GT:  name for the ligature version
-#: sfd1.c:457
-#, c-format
-msgid "Ligature %s"
-msgstr "连体 %s"
-
-#
-#: sflayout.c:1264 sftextfield.c:898
-msgid "Unsupported image format"
-msgstr "不支持的图像格式"
-
-#
-#: sflayout.c:1266 sftextfield.c:900
-msgid "Unsupported image format must be bmp or png"
-msgstr "支持的图片格式须是bmp或png"
-
-#
-#: sflayout.c:1268 sftextfield.c:902
-msgid "Unsupported image format must be bmp"
-msgstr "不支持的图片格式须是bmp"
-
-#
-#: sflayout.c:1272 sftextfield.c:906
-msgid "Could not write"
-msgstr "未能写入"
-
-#
-#: sflayout.c:1272 sftextfield.c:906
-#, c-format
-msgid "Could not write %.100s"
-msgstr "未能写入%.100s"
-
-#
-#: sftextfield.c:723 ../gdraw/gtextfield.c:1139
-msgid "Open"
-msgstr "打开"
-
-#
-#: sftextfield.c:731 sftextfield.c:799
-msgid "Could not open"
-msgstr "不能打开"
-
-#
-#: sftextfield.c:731 sftextfield.c:799 ../gdraw/gtextfield.c:1154
-#: ../gdraw/gtextfield.c:1186
-#, c-format
-msgid "Could not open %.100s"
-msgstr "不能打开 %.100s"
-
-#
-#: sftextfield.c:756
-msgid "No letters in font"
-msgstr "字体中无字母"
-
-#
-#: sftextfield.c:762
-msgid "Text from script"
-msgstr "手写文本"
-
-#: sftextfield.c:762
-msgid "Insert random text in the specified script"
-msgstr ""
-
-#
-#: sftextfield.c:791 showatt.c:2320 showatt.c:2373 ../gdraw/gtextfield.c:1172
-msgid "Save"
-msgstr "保存"
-
-#
-#: sftextfield.c:852 sftextfield.c:854
-msgid "Save Image"
-msgstr "保存图像"
-
-#
-#: sftextfield.c:971 ../gdraw/gresedit.c:2257
-msgid "_Save As..."
-msgstr "保存为(_S)…"
-
-#
-#: sftextfield.c:973
-msgid "_Insert Random Text..."
-msgstr "插入随机文本(_I)…"
-
-#
-#: sftextfield.c:975
-msgid "Save As _Image..."
-msgstr "保存为图像(_I)…"
-
-#
-#: showatt.c:131
-#, c-format
-msgid "Component %d %.30s (%d,%d)"
-msgstr "组件 %d %.30s (%d,%d)"
-
-#
-#: showatt.c:174
-msgid "Base Glyphs"
-msgstr "基础字形"
-
-#
-#: showatt.c:175
-msgid "Base Ligatures"
-msgstr "基础组合字"
-
-#
-#: showatt.c:176
-msgid "Base Marks"
-msgstr "基础标记"
-
-#
-#: showatt.c:181 showatt.c:208 showatt.c:243
-msgid "Empty"
-msgstr "空"
-
-#
-#: showatt.c:202
-#, c-format
-msgid "Mark Class %.20s"
-msgstr "标记类属 %.20s"
-
-#
-#: showatt.c:215
-#, c-format
-msgid "%.30s (%d,%d)"
-msgstr "%.30s (%d,%d)"
-
-#
-#: showatt.c:268
-#, c-format
-msgid "Entry (%d,%d)"
-msgstr "起点 (%d,%d)"
-
-#
-#: showatt.c:275
-#, c-format
-msgid "Exit (%d,%d)"
-msgstr "终点 (%d,%d)"
-
-#
-#: showatt.c:422
-msgid "Backtrack Match: "
-msgstr "逆溯匹配: "
-
-#
-#: showatt.c:438
-msgid "Match: "
-msgstr "匹配: "
-
-#
-#: showatt.c:447
-msgid "Lookahead Match: "
-msgstr "前循匹配: "
-
-#
-#: showatt.c:460
-msgid "Backtrack class: "
-msgid_plural "Backtrack classes: "
-msgstr[0] "逆溯类属: "
-
-#
-#: showatt.c:475
-msgid "Class"
-msgid_plural "Classes"
-msgstr[0] "类属"
-
-#: showatt.c:490
-msgid "Lookahead Class"
-msgid_plural "Lookahead Classes"
-msgstr[0] ""
-msgstr[1] ""
-
-#
-#: showatt.c:508
-#, c-format
-msgid "Back coverage %d: "
-msgstr "后向范围 %d: "
-
-#
-#: showatt.c:518
-#, c-format
-msgid "Coverage %d: "
-msgstr "范围 %d: "
-
-#
-#: showatt.c:528
-#, c-format
-msgid "Lookahead coverage %d: "
-msgstr "前向范围 %d: "
-
-#
-#: showatt.c:544
-#, c-format
-msgid "Apply at %d %.80s"
-msgstr "应用到 %d %.80s"
-
-#
-#: showatt.c:556
-msgid "Replacement: "
-msgstr "替代： "
-
-#
-#: showatt.c:579
-msgid "Chaining Positioning"
-msgstr "链定位"
-
-#
-#: showatt.c:579
-msgid "Chaining Substitution"
-msgstr "链式替代"
-
-#
-#: showatt.c:580
-msgid "Reverse Chaining Subs"
-msgstr "反向链式替代"
-
-#
-#: showatt.c:581
-msgid "glyphs"
-msgstr "字形"
-
-#
-#: showatt.c:581
-msgid "classes"
-msgstr "类属"
-
-#
-#: showatt.c:581
-msgid "coverage"
-msgstr "范围"
-
-#
-#. GT: There are various broad classes of lookups here and the first string
-#. GT: describes those: "Contextual Positioning", Contextual Substitution", etc.
-#. GT: Each of those may be formated in 3 different ways: by (or perhaps using
-#. GT: would be a better word) glyphs, classes or coverage tables.
-#. GT: So this might look like:
-#. GT:  Contextual Positioning by classes
-#: showatt.c:594
-#, c-format
-msgid "%s by %s"
-msgstr "%s 由 %s"
-
-#
-#: showatt.c:603
-#, c-format
-msgid "Backtrack class %d: "
-msgstr "逆溯类属 %d: "
-
-#
-#: showatt.c:613 showatt.c:691
-#, c-format
-msgid "Class %d: "
-msgstr "类属 %d: "
-
-#
-#: showatt.c:623
-#, c-format
-msgid "Lookahead class %d: "
-msgstr "前循类属%d: "
-
-#
-#: showatt.c:634
-#, c-format
-msgid "Rule %d"
-msgstr "规则 %d"
-
-#
-#: showatt.c:654
-msgid "Indic Reordering"
-msgstr "印地语重排序"
-
-#
-#: showatt.c:655 showatt.c:656 showatt.c:657 showatt.c:658
-msgid "<undefined>"
-msgstr "<未定义>"
-
-#
-#: showatt.c:655
-msgid "Simple Substitution"
-msgstr "简单替代"
-
-#
-#: showatt.c:656
-msgid "Glyph Insertion"
-msgstr "字形插入"
-
-#
-#: showatt.c:659
-msgid "Kern by State"
-msgstr "按状态压缩"
-
-#
-#. GT: You're in a state machine, and this is describing the %4d'th state of
-#. GT: that machine. From the state the next state will be a list of
-#. GT: state-numbers which are appended to this string.
-#: showatt.c:704
-#, c-format
-msgid "State %4d Next: "
-msgstr "状态%4d Next: "
-
-#
-#: showatt.c:713
-#, c-format
-msgid "State %4d Flags:"
-msgstr "状态 %4d Flags:"
-
-#
-#: showatt.c:723
-#, c-format
-msgid "State %4d Mark: "
-msgstr "状态 %4d Mark: "
-
-#
-#: showatt.c:735
-#, c-format
-msgid "State %4d Cur:  "
-msgstr "状态 %4d Cur:  "
-
-#
-#: showatt.c:750
-#, c-format
-msgid "Nested Substitution %.80s"
-msgstr "嵌套替代 %.80s"
-
-#: showatt.c:1183
-msgid "Lookups Enabled for Expansion"
-msgstr ""
-
-#: showatt.c:1183
-msgid "No Lookups Enabled for Expansion"
-msgstr ""
-
-#: showatt.c:1184
-msgid "Lookups Disabled for Expansion"
-msgstr ""
-
-#: showatt.c:1184
-msgid "No Lookups Disabled for Expansion"
-msgstr ""
-
-#: showatt.c:1185
-msgid "Lookups Limiting Expansion"
-msgstr ""
-
-#: showatt.c:1185
-msgid "No Lookups Limiting Expansion"
-msgstr ""
-
-#: showatt.c:1186
-msgid "Lookups Enabled for Shrinkage"
-msgstr ""
-
-#: showatt.c:1186
-msgid "No Lookups Enabled for Shrinkage"
-msgstr ""
-
-#: showatt.c:1187
-msgid "Lookups Disabled for Shrinkage"
-msgstr ""
-
-#: showatt.c:1187
-msgid "No Lookups Disabled for Shrinkage"
-msgstr ""
-
-#: showatt.c:1188
-msgid "Lookups Limiting Shrinkage"
-msgstr ""
-
-#: showatt.c:1188
-msgid "No Lookups Limiting Shrinkage"
-msgstr ""
-
-#: showatt.c:1189
-#, c-format
-msgid "Priority: %d"
-msgstr ""
-
-#: showatt.c:1253
-msgid "No Extender Glyphs"
-msgstr ""
-
-#: showatt.c:1257
-msgid "Extender Glyphs"
-msgstr ""
-
-#
-#: showatt.c:1413
-msgid "Not classified"
-msgstr "未分类"
-
-#
-#: showatt.c:1475
-msgid "Glyph Definition Sub-Table"
-msgstr "字形定义替代表"
-
-#
-#. GT: Here caret means where to place the cursor inside a ligature. So OpenType
-#. GT: allows there to be a typing cursor inside a ligature (for instance you
-#. GT: can have a cursor between f and i in the "fi" ligature)
-#: showatt.c:1483
-msgid "Ligature Caret Sub-Table"
-msgstr "连写缩合替换表"
-
-#
-#: showatt.c:1488
-msgid "Mark Attachment Classes"
-msgstr "标记附在类属"
-
-#: showatt.c:1507
-#, c-format
-msgid "%c%c%c%c  Min Extent=%d, Max Extent=%d"
-msgstr ""
-
-#: showatt.c:1535
-#, c-format
-msgid "Script '%c%c%c%c' on %c%c%c%c "
-msgstr ""
-
-#: showatt.c:1545
-#, c-format
-msgid "Script '%c%c%c%c' "
-msgstr ""
-
-#: showatt.c:1572
-#, c-format
-msgid "Default Baseline: '%s'"
-msgstr ""
-
-#: showatt.c:1580
-#, c-format
-msgid ""
-"Offsets from def. baseline:  romn: %d  idcn: %d  ideo: %d  hang: %d  math: %d"
-msgstr ""
-
-#: showatt.c:1585
-msgid "All glyphs have the same baseline"
-msgstr ""
-
-#: showatt.c:1588
-msgid "Per glyph baseline data"
-msgstr ""
-
-#
-#: showatt.c:1642
-#, c-format
-msgid "  Left Bound=%d"
-msgstr "  左边=%d"
-
-#
-#: showatt.c:1645
-#, c-format
-msgid "  Right Bound=%d"
-msgstr "  右边=%d"
-
-#
-#: showatt.c:1701
-msgid "Strong Left to Right"
-msgstr "强从左到右"
-
-#
-#: showatt.c:1702
-msgid "Strong Right to Left"
-msgstr "强从右到左"
-
-#
-#: showatt.c:1703
-msgid "Arabic Right to Left"
-msgstr "阿拉伯文从右到左"
-
-#
-#: showatt.c:1704
-msgid "European Number"
-msgstr "欧洲数字"
-
-#
-#: showatt.c:1705
-msgid "European Number Separator"
-msgstr "欧洲数字分隔符"
-
-#
-#: showatt.c:1706
-msgid "European Number Terminator"
-msgstr "欧洲数字终止符"
-
-#
-#: showatt.c:1707
-msgid "Arabic Number"
-msgstr "阿拉伯数字"
-
-#
-#: showatt.c:1708
-msgid "Common Number Separator"
-msgstr "共同数字分隔符"
-
-#
-#: showatt.c:1709
-msgid "Block Separator"
-msgstr "块分隔符"
-
-#
-#: showatt.c:1710
-msgid "Segment Separator"
-msgstr "段分隔符"
-
-#
-#: showatt.c:1711
-msgid "White Space"
-msgstr "空白"
-
-#
-#: showatt.c:1712
-msgid "Neutral"
-msgstr "中立"
-
-#
-#: showatt.c:1713
-msgid "<Unknown direction>"
-msgstr "<未知方向>"
-
-#
-#: showatt.c:1715
-msgid "  Floating accent"
-msgstr "  浮动重音符"
-
-#
-#: showatt.c:1717
-msgid "  Hang left"
-msgstr "  左手"
-
-#
-#: showatt.c:1719
-msgid "  Hang right"
-msgstr "  右手"
-
-#
-#: showatt.c:1721
-msgid "  Attach right"
-msgstr "  右侧附加"
-
-#
-#: showatt.c:1729 showatt.c:1735
-#, c-format
-msgid "  Mirror=%.30s"
-msgstr "  镜像=%.30s"
-
-#
-#: showatt.c:1998
-msgid "No Advanced Typography"
-msgstr "无高级字体"
-
-#
-#: showatt.c:2004
-msgid "OpenType Tables"
-msgstr "OpenType表"
-
-#: showatt.c:2010
-msgid "'BASE' Baseline Table"
-msgstr ""
-
-#: showatt.c:2018
-#, c-format
-msgid "Horizontal: %d baseline"
-msgid_plural "Horizontal: %d baselines"
-msgstr[0] ""
-msgstr[1] ""
-
-#: showatt.c:2028
-#, c-format
-msgid "Vertical: %d baseline"
-msgid_plural "Vertical: %d baselines"
-msgstr[0] ""
-msgstr[1] ""
-
-#
-#: showatt.c:2038
-msgid "'GDEF' Glyph Definition Table"
-msgstr "'GDEF' 字形定义表"
-
-#
-#: showatt.c:2044
-msgid "'GPOS' Glyph Positioning Table"
-msgstr "'GPOS' 字形定位表"
-
-#
-#: showatt.c:2050
-msgid "'GSUB' Glyph Substitution Table"
-msgstr "'GSUB' 字形替代表"
-
-#: showatt.c:2057
-msgid "'JSTF' Justification Table"
-msgstr ""
-
-#
-#: showatt.c:2066
-msgid "Apple Advanced Typography"
-msgstr "Apple高级字体"
-
-#: showatt.c:2071
-msgid "'bsln' Horizontal Baseline Table"
-msgstr ""
-
-#
-#: showatt.c:2077
-msgid "'kern' Horizontal Kerning Table"
-msgstr "'kern' 水平压缩表"
-
-#
-#: showatt.c:2083
-msgid "'lcar' Ligature Caret Table"
-msgstr "'lcar' 连写缩合表"
-
-#: showatt.c:2089
-msgid "'morx' Glyph Extended Metamorphosis Table"
-msgstr ""
-
-#
-#: showatt.c:2095
-msgid "'opbd' Optical Bounds Table"
-msgstr "'opbd' 光学边界表"
-
-#
-#: showatt.c:2101
-msgid "'prop' Glyph Properties Table"
-msgstr "'prop' 字形属性表"
-
-#
-#: showatt.c:2854
-msgid "Show ATT"
-msgstr "显示ATT"
-
-#
-#: showatt.c:2944
-msgid "No differences found"
-msgstr "未发现差异"
-
-#
-#: showatt.c:2946
-msgid "Differences..."
-msgstr "差异..."
-
-#
-#: showatt.c:2963
-#, c-format
-msgid "Compare %s to %s"
-msgstr "比较 %s 与 %s"
-
-#
-#: showatt.c:2966
-#, c-format
-msgid "Compare version %s of %s to %s"
-msgstr "比较版本 %s (%s) 对 %s"
-
-#
-#: showatt.c:2969 showatt.c:3115
-msgid "Font Compare"
-msgstr "字体比较"
-
-#
-#: showatt.c:3125
-#, c-format
-msgid "Font to compare with %.20s"
-msgstr "字体与 %.20s 比较"
-
-#
-#: showatt.c:3146
-msgid "Compare _Outlines"
-msgstr "比较轮廓(_O)"
-
-#
-#: showatt.c:3163
-msgid "Accept outlines which exactly match the original"
-msgstr "接受与原先确切匹配的轮廓"
-
-#
-#: showatt.c:3171
-msgid "_Accept inexact"
-msgstr "接受模糊(_A)"
-
-#: showatt.c:3176
-msgid ""
-"Accept an outline which is a close approximation to the original.\n"
-"It may be off by an em-unit, or have a reference which matches a contour."
-msgstr ""
-
-#
-#: showatt.c:3184
-msgid "_Warn if inexact"
-msgstr "不确切则警告(_W)"
-
-#: showatt.c:3189
-msgid "Warn if the outlines are close but not exactly the same"
-msgstr ""
-
-#
-#: showatt.c:3197
-msgid "Warn if _unlinked references"
-msgstr "警告未连接的参照"
-
-#: showatt.c:3202
-msgid ""
-"Warn if one glyph contains an outline while the other contains a reference "
-"(but the reference describes the same outline)"
-msgstr ""
-
-#
-#: showatt.c:3210
-msgid "Compare _Hints"
-msgstr "比较消隐(_H)"
-
-#: showatt.c:3215
-msgid "Compare postscript hints and hintmasks and truetype instructions"
-msgstr ""
-
-#
-#: showatt.c:3223
-msgid "Compare Hint_Masks"
-msgstr "比较消隐蒙板(_M)"
-
-#
-#: showatt.c:3228
-msgid "Compare hintmasks"
-msgstr "比较消隐蒙板"
-
-#
-#: showatt.c:3236
-msgid "HintMasks only if conflicts"
-msgstr "消隐蒙板(仅冲突时)"
-
-#: showatt.c:3241
-msgid "Don't compare hintmasks if the glyph has no hint conflicts"
-msgstr ""
-
-#
-#: showatt.c:3249
-msgid "Don't Compare HintMasks"
-msgstr "不要比较消隐蒙板"
-
-#
-#: showatt.c:3261
-msgid "_Add Diff Outlines to Background"
-msgstr "添加不同差异轮廓到背景(_A)"
-
-#: showatt.c:3266
-msgid ""
-"If two glyphs differ, then add the outlines of the second glyph\n"
-"to the background layer of the first (So when opening the first\n"
-"the differences will be visible)."
-msgstr ""
-
-#
-#: showatt.c:3274
-msgid "Add _Missing Glyphs"
-msgstr "添加缺失字形(_M)"
-
-#: showatt.c:3279
-msgid ""
-"If a glyph in the second font is missing from the first, then\n"
-"add it to the first with the outlines of the second font in\n"
-"the background"
-msgstr ""
-
-#
-#: showatt.c:3287
-msgid "Compare _Bitmaps"
-msgstr "比较位图(_B)"
-
-#
-#: showatt.c:3296
-msgid "Compare _Names"
-msgstr "比较名称(_N)"
-
-#
-#: showatt.c:3305
-msgid "Compare Glyph _Positioning"
-msgstr "比较字形位置(_P)"
-
-#
-#: showatt.c:3310
-msgid "Kerning & such"
-msgstr "组合字等"
-
-#
-#: showatt.c:3315
-msgid "Compare Glyph _Substitution"
-msgstr "比较字形替代(_S)"
-
-#
-#: showatt.c:3320
-msgid "Ligatures & such"
-msgstr "组合字等"
-
-#
-#: simplifydlg.c:82 simplifydlg.c:163
-msgid "_Error Limit:"
-msgstr "误差限(_E):"
-
-#
-#: simplifydlg.c:86
-msgid "Bump Size"
-msgstr "凸起大小"
-
-#
-#: simplifydlg.c:87
-msgid "Line length max"
-msgstr "最大线长"
-
-#
-#: simplifydlg.c:197
-msgid "Allow _removal of extrema"
-msgstr "允许移除极点(_R)"
-
-#: simplifydlg.c:205
-msgid ""
-"Normally simplify will not remove points at the extrema of curves\n"
-"(both PostScript and TrueType suggest you retain these points)"
-msgstr ""
-
-#
-#: simplifydlg.c:210
-msgid "Allow _slopes to change"
-msgstr "允许倾斜改变(_S)"
-
-#: simplifydlg.c:219
-msgid ""
-"Normally simplify will not change the slope of the contour at the points."
-msgstr ""
-
-#
-#: simplifydlg.c:223
-msgid "Start contours at e_xtrema"
-msgstr "在极值处开始轮廓"
-
-#: simplifydlg.c:232
-msgid ""
-"If the start point of a contour is not an extremum, find a new start point "
-"(on the contour) which is."
-msgstr ""
-
-#
-#: simplifydlg.c:242
-msgid "Allow _curve smoothing"
-msgstr "允许曲线平滑(_C)"
-
-#: simplifydlg.c:254
-msgid ""
-"Simplify will examine corner points whose control points are almost\n"
-"colinear and smooth them into curve points"
-msgstr ""
-
-#
-#. GT: here "tan" means trigonometric tangent
-#: simplifydlg.c:260
-msgid "if tan less than"
-msgstr "若少于"
-
-#
-#: simplifydlg.c:286
-msgid "S_nap to horizontal/vertical"
-msgstr "定位到水平线/垂直线"
-
-#: simplifydlg.c:298
-msgid ""
-"If the slope of an adjusted point is near horizontal or vertical\n"
-"snap to that"
-msgstr ""
-
-#
-#: simplifydlg.c:308
-msgid "_Flatten bumps on lines"
-msgstr "平整线(_F)"
-
-#: simplifydlg.c:320
-msgid "If a line has a bump on it then flatten out that bump"
-msgstr ""
-
-#
-#: simplifydlg.c:325
-msgid "if smaller than"
-msgstr "若小于"
-
-#
-#: simplifydlg.c:357
-msgid "Don't smooth lines"
-msgstr "不平滑线"
-
-#
-#: simplifydlg.c:366
-msgid "longer than"
-msgstr "长于"
-
-#
-#: simplifydlg.c:402
-msgid "Set as Default"
-msgstr "设为默认"
-
-#
-#: splinechar.c:1006
-#, c-format
-msgid ""
-"There is already a glyph with this Unicode encoding\n"
-"(named %1$.40s, at local encoding %2$d).\n"
-"Is that what you want?"
-msgstr ""
-"已有相同统一码字形 %1$.40s，\n"
-"此处编码为%2$d 。\n"
-"是否所需？"
-
-#
-#: splinechar.c:1015
-msgid ""
-"There is already a glyph with this name,\n"
-"do you want to swap names?"
-msgstr ""
-"已有同名字形，\n"
-"要交换名字么?"
-
-#
-#: splinechar.c:1810
-msgid "Validating..."
-msgstr "正在校验文件"
-
-#
-#: splinechar.c:2547
-msgid "You changed the point numbering"
-msgstr "你改了点数"
-
-#
-#: splinechar.c:2548
-#, c-format
-msgid "You have just changed the point numbering of glyph %s.%s%s%s"
-msgstr "你改了字形 %s.%s%s%s 的点数"
-
-#
-#: splinechar.c:2551
-msgid ""
-" Instructions in this glyph (or one that refers to it) have been lost."
-msgstr " 此字形（或参照此字形的其他字形）的指令已丢失。"
-
-#
-#: splinechar.c:2552
-msgid ""
-" Instructions in this glyph (or one that refers to it) are now out of date."
-msgstr " 此字形（或参照此字形的其他字形）的指令已过期。"
-
-#: splinechar.c:2553
-msgid ""
-" At least one reference to this glyph used point matching. That match is now "
-"out of date."
-msgstr ""
-
-#: splinechar.c:2555
-msgid ""
-" At least one anchor point used point matching. It may be out of date now."
-msgstr ""
-
-#
-#: splinefill.c:1553 splinefill.c:1711
-#, c-format
-msgid "%d pixels"
-msgstr "%d 像素"
-
-#
-#: splinefill.c:1554
-msgid "Generating bitmap font"
-msgstr "生成位图字体"
-
-#
-#: splinefill.c:1560 splinefill.c:1718
-msgid "Rasterizing..."
-msgstr "光栅化..."
-
-#
-#: splinefill.c:1712
-msgid "Generating anti-alias font"
-msgstr "生成抗锯齿字体"
-
-#: splinefont.c:757
-msgid "Which archived item should be opened?"
-msgstr ""
-
-#: splinefont.c:757
-msgid "There are multiple files in this archive, pick one"
-msgstr ""
-
-#
-#: splinefont.c:1009
-msgid "Loading font from "
-msgstr "载入字体 "
-
-#
-#: splinefont.c:1218 splinefont.c:1220 splinefont.c:1222
-msgid "Couldn't open font"
-msgstr "未能打开字体"
-
-#
-#: splinefont.c:1218
-#, c-format
-msgid "The requested file, %.100s, does not exist"
-msgstr "查询的文件%.100s不存在"
-
-#
-#: splinefont.c:1220
-#, c-format
-msgid "You do not have permission to read %.100s"
-msgstr "你无权读%.100s"
-
-#: splinefont.c:1222
-#, c-format
-msgid ""
-"%.100s is not in a known format (or uses features of that format fontforge "
-"does not support, or is so badly corrupted as to be unreadable)"
-msgstr ""
-
-#
-#: splinefont.c:1239
-msgid "Restricted Font"
-msgstr "受限字体"
-
-#: splinefont.c:1239
-msgid ""
-"This font is marked with an FSType of 2 (Restricted\n"
-"License). That means it is not editable without the\n"
-"permission of the legal owner.\n"
-"\n"
-"Do you have such permission?"
-msgstr ""
-
-#: splinefont.c:1946
-#, c-format
-msgid "Attempt to have a font with more than %d layers"
-msgstr ""
-
-#: splineoverlap.c:2456
-#, c-format
-msgid ""
-"Glyph %.40s contains an overlapped region where two contours with opposite "
-"orientations intersect. This will not be removed. In many cases doing "
-"Element->Correct Direction before Remove Overlap will improve matters."
-msgstr ""
-
-#: splinesave.c:2310
-#, c-format
-msgid "Number out of range: %g in type2 output (must be [-65536,65535])\n"
-msgstr ""
-
-#
-#: splinesaveafm.c:112 splinesaveafm.c:205
-msgid "Reading AFM file"
-msgstr "读取AFM文件"
-
-#
-#: splinesaveafm.c:771 splinesaveafm.c:773
-msgid "Unlikely Ofm File"
-msgstr "不像 Ofm 文件"
-
-#: splinesaveafm.c:771
-msgid ""
-"This looks like a level1 (or level2) ofm. FontForge only supports level0 "
-"files, and can't read a real level1 file."
-msgstr ""
-
-#
-#: splinesaveafm.c:773
-msgid "This doesn't look like an ofm file, I don't know how to read it."
-msgstr "这个看来不像ofm文件，不知道怎么打开。"
-
-#
-#: splinesaveafm.c:2036 splinesaveafm.c:2041
-msgid "<Temporary kerning>"
-msgstr "<临时压缩>"
-
-#: splinesaveafm.c:3048
-#, c-format
-msgid ""
-"The width of %s is too big to fit in a tfm fix_word, it shall be truncated "
-"to the largest size allowed."
-msgstr ""
-
-#
-#: splinesaveafm.c:3064
-msgid "Value exceeds tfm limitations"
-msgstr "值超过 tfm 极限"
-
-#: splinesaveafm.c:3064
-#, c-format
-msgid ""
-"The width, height, depth or italic correction of %s is too big. Tfm files "
-"may not contain values bigger than 16 times the em-size of the font. "
-"Width=%g, height=%g, depth=%g, italic correction=%g"
-msgstr ""
-
-#: splinestroke.c:3665
-msgid "Some fragments did not join"
-msgstr ""
-
-#: splinestroke.c:3665
-#, c-format
-msgid "Some fragments did not join in %s"
-msgstr ""
-
-#
-#: splinestroke.c:3895
-msgid "Stroking..."
-msgstr "笔画..."
-
-#
-#: splineutil.c:2205
-#, c-format
-msgid "Couldn't find referenced character \"%s\" in %s\n"
-msgstr "未能找到参照字符 \"%s\" 于 %s\n"
-
-#
-#: splineutil.c:2639
-msgid "Multiple master font with more than 16 instances\n"
-msgstr "多主字体超过16实例\n"
-
-#
-#: splineutil.c:2664
-msgid "Multiple master font with more than 4 axes\n"
-msgstr "多主字体超过4轴\n"
-
-#: splineutil.c:2672
-#, c-format
-msgid ""
-"This multiple master font has %1$d instance fonts, but it needs at least "
-"%2$d master fonts for %3$d axes. FontForge will not be able to edit this "
-"correctly"
-msgstr ""
-
-#: splineutil.c:2674
-#, c-format
-msgid ""
-"This multiple master font has %1$d instance fonts, but FontForge can only "
-"handle %2$d master fonts for %3$d axes. FontForge will not be able to edit "
-"this correctly"
-msgstr ""
-
-#: splineutil.c:2691
-msgid "Too many axis positions specified in /BlendDesignPositions.\n"
-msgstr ""
-
-#: splineutil.c:2723
-#, c-format
-msgid ""
-"Too many mapping data points specified in /BlendDesignMap for axis %s.\n"
-msgstr ""
-
-#: splineutil.c:2732
-#, c-format
-msgid "Bad value for blend in /BlendDesignMap for axis %s.\n"
-msgstr ""
-
-#: splineutil.c:2745
-#, c-format
-msgid "Bad few values in /BlendDesignMap for axis %s.\n"
-msgstr ""
-
-#: splineutil.c:2858
-#, c-format
-msgid "Could not parse a CID font, %sCIDFontType %d, %sfonttype %d\n"
-msgstr ""
-
-#: splineutil.c:2866
-msgid "CID format doesn't contain what we expected it to.\n"
-msgstr ""
-
-#: splineutil2.c:5127 splineutil2.c:5209
-msgid "Warning: Unreasonably big splines. They will be ignored.\n"
-msgstr ""
-
-#. GT: These strings are for fun. If they are offensive or incomprehensible
-#. GT: simply translate them as something dull like: "FontForge"
-#. GT: This is a spoof of political slogans, designed to point out how foolish they are
-#: startui.c:828 startui.c:829
-msgid ""
-"A free press discriminates\n"
-"against the illiterate."
-msgstr ""
-
-#
-#. GT: This is a pun on the old latin drinking song "Gaudeamus igature!"
-#: startui.c:831 startui.c:832
-msgid "Gaudeamus Ligature!"
-msgstr "Gaudeamus 连写!"
-
-#
-#. GT: Spoof on the bible
-#: startui.c:834
-msgid "In the beginning was the letter..."
-msgstr "开头是字母..."
-
-#. GT: Some wit at MIT came up with this ("ontology recapitulates phylogony" is the original)
-#: startui.c:836
-msgid "fontology recapitulates file-ogeny"
-msgstr ""
-
-#: startui.c:1214
-msgid "Flag0x10+"
-msgstr ""
-
-#
-#: statemachine.c:214
-msgid "Ax => xA"
-msgstr "Ax => xA"
-
-#
-#: statemachine.c:215
-msgid "xD => Dx"
-msgstr "xD => Dx"
-
-#
-#: statemachine.c:216
-msgid "AxD => DxA"
-msgstr "AxD => DxA"
-
-#
-#: statemachine.c:217
-msgid "ABx => xAB"
-msgstr "ABx => xAB"
-
-#
-#: statemachine.c:218
-msgid "ABx => xBA"
-msgstr "ABx => xBA"
-
-#
-#: statemachine.c:219
-msgid "xCD => CDx"
-msgstr "xCD => CDx"
-
-#
-#: statemachine.c:220
-msgid "xCD => DCx"
-msgstr "xCD => DCx"
-
-#
-#: statemachine.c:221
-msgid "AxCD => CDxA"
-msgstr "AxCD => CDxA"
-
-#
-#: statemachine.c:222
-msgid "AxCD => DCxA"
-msgstr "AxCD => DCxA"
-
-#
-#: statemachine.c:223
-msgid "ABxD => DxAB"
-msgstr "ABxD => DxAB"
-
-#
-#: statemachine.c:224
-msgid "ABxD => DxBA"
-msgstr "ABxD => DxBA"
-
-#
-#: statemachine.c:225
-msgid "ABxCD => CDxAB"
-msgstr "ABxCD => CDxAB"
-
-#
-#: statemachine.c:226
-msgid "ABxCD => CDxBA"
-msgstr "ABxCD => CDxBA"
-
-#
-#: statemachine.c:227
-msgid "ABxCD => DCxAB"
-msgstr "ABxCD => DCxAB"
-
-#
-#: statemachine.c:228
-msgid "ABxCD => DCxBA"
-msgstr "ABxCD => DCxBA"
-
-#
-#: statemachine.c:272 statemachine.c:551
-#, c-format
-msgid "State %d,  %.40s"
-msgstr "状态 %d,  %.40s"
-
-#
-#: statemachine.c:332 statemachine.c:561
-msgid "Next State:"
-msgstr "下一状态:"
-
-#
-#: statemachine.c:352 statemachine.c:668
-msgid "Kern Values:"
-msgstr "压缩值:"
-
-#
-#: statemachine.c:355
-msgid "Too Many Kerns"
-msgstr "过多缩合"
-
-#: statemachine.c:355
-msgid "At most 8 kerning values may be specified here"
-msgstr ""
-
-#
-#: statemachine.c:360
-msgid "Kerning values must be even"
-msgstr "压缩值应为偶数"
-
-#
-#: statemachine.c:381 statemachine.c:394
-#, c-format
-msgid "Lookup, %s, does not exist"
-msgstr "查找的 %s 不存在"
-
-#
-#: statemachine.c:385 statemachine.c:398
-msgid "Bad lookup type"
-msgstr "不良查找类型"
-
-#: statemachine.c:385 statemachine.c:398
-#, c-format
-msgid ""
-"Lookups in contextual state machines must be simple substitutions,\n"
-", but %s is not"
-msgstr ""
-
-#
-#: statemachine.c:415 statemachine.c:432
-msgid "Missing Glyph Name"
-msgstr "缺字形名称"
-
-#
-#: statemachine.c:424 statemachine.c:440
-msgid "Too Many Glyphs"
-msgstr "过多字形"
-
-#
-#: statemachine.c:424 statemachine.c:440
-msgid "At most 31 glyphs may be specified in an insert list"
-msgstr "插入列表中最多可有31个字形"
-
-#
-#: statemachine.c:541
-msgid "Edit State Transition"
-msgstr "编辑状态转变"
-
-#
-#: statemachine.c:552
-msgid "Class 1: {Everything Else}"
-msgstr "类 1: {其他}"
-
-#
-#: statemachine.c:573
-msgid "Advance To Next Glyph"
-msgstr "到下一字形"
-
-#
-#: statemachine.c:581
-msgid "Push Current Glyph"
-msgstr "压入当前字形"
-
-#
-#: statemachine.c:582
-msgid "Mark Current Glyph"
-msgstr "标记当前字形"
-
-#
-#: statemachine.c:583
-msgid "Mark Current Glyph As First"
-msgstr "标记当前字形为第一"
-
-#
-#: statemachine.c:598
-msgid "Mark Current Glyph As Last"
-msgstr "标记当前字形为最末"
-
-#: statemachine.c:612
-msgid "Current Glyph Is Kashida Like"
-msgstr ""
-
-#: statemachine.c:620
-msgid "Marked Glyph Is Kashida Like"
-msgstr ""
-
-#
-#: statemachine.c:628
-msgid "Insert Before Current Glyph"
-msgstr "当前字形前插入"
-
-#
-#: statemachine.c:636
-msgid "Insert Before Marked Glyph"
-msgstr "标记字形前插入"
-
-#
-#: statemachine.c:644
-msgid "Mark Insert:"
-msgstr "标记插入："
-
-#
-#: statemachine.c:656
-msgid "Current Insert:"
-msgstr "当前插入:"
-
-#
-#: statemachine.c:680
-msgid "Mark Subs:"
-msgstr "标记替代:"
-
-#
-#: statemachine.c:693
-msgid "Current Subs:"
-msgstr "当前替代:"
-
-#
-#: statemachine.c:707
-msgid "_Up↑"
-msgstr "_Up↑"
-
-#
-#: statemachine.c:719
-msgid "←_Left"
-msgstr "←左(_L)"
-
-#
-#: statemachine.c:730
-msgid "_Right→"
-msgstr "右(_R)→"
-
-#
-#: statemachine.c:741
-msgid "↓_Down"
-msgstr "↓向下(_D)"
-
-#
-#: statemachine.c:913
-msgid "{Start of Input}"
-msgstr "{输入开始}"
-
-#
-#: statemachine.c:915
-msgid "{Start of Line}"
-msgstr "{行首}"
-
-#
-#: statemachine.c:1326
-msgid "Edit Indic Rearrangement"
-msgstr "编辑印地文调整"
-
-#: statemachine.c:1326
-msgid "Edit Contextual Glyph Insertion"
-msgstr ""
-
-#
-#: statemachine.c:1326
-msgid "Edit Contextual Kerning"
-msgstr "编辑上下文压缩"
-
-#
-#: statemachine.c:1327
-msgid "New Indic Rearrangement"
-msgstr "新印地语整理"
-
-#
-#: statemachine.c:1327
-msgid "New Contextual Glyph Insertion"
-msgstr "新相关字形插入"
-
-#
-#: statemachine.c:1327
-msgid "New Contextual Kerning"
-msgstr "新建上下文压缩"
-
-#: statemachine.c:1341
-msgid "{End of Text}"
-msgstr ""
-
-#: statemachine.c:1343
-msgid "{Deleted Glyph}"
-msgstr ""
-
-#: statemachine.c:1344
-msgid "{End of Line}"
-msgstr ""
-
-#
-#: statemachine.c:1392
-msgid "Vertical Only"
-msgstr "仅垂直"
-
-#: svg.c:1694 svg.c:1772
-#, c-format
-msgid "Unknown type '%c' found in path specification\n"
-msgstr ""
-
-#: svg.c:2498
-#, c-format
-msgid "Bad hex color spec: %s\n"
-msgstr ""
-
-#: svg.c:2510
-#, c-format
-msgid "Bad RGB color spec: %s\n"
-msgstr ""
-
-#
-#: svg.c:2530
-#, c-format
-msgid "Failed to parse color %s\n"
-msgstr "解析颜色 %s 失败\n"
-
-#: svg.c:3443
-msgid "This font does not specify units-per-em\n"
-msgstr ""
-
-#: svg.c:3578
-msgid "This font does not specify font-face\n"
-msgstr ""
-
-#
-#: svg.c:3759
-msgid "This file contains no SVG fonts.\n"
-msgstr "此文件不含SVG字体。\n"
-
-#
-#: svg.c:3799 svg.c:3824 svg.c:3844 svg.c:3887 ufo.c:1724 ufo.c:2048
-msgid "Can't find libxml2.\n"
-msgstr "未找到 libxml2.\n"
-
-#: svg.c:3901
-#, c-format
-msgid "%s does not contain an <svg> element at the top\n"
-msgstr ""
-
-#
-#: tilepath.c:770
-msgid "Medial"
-msgstr "中等"
-
-#
-#: tilepath.c:770
-msgid "Final"
-msgstr "最终"
-
-#
-#: tilepath.c:770
-msgid "Isolated"
-msgstr "分立"
-
-#
-#: tilepath.c:926 tilepath.c:928
-msgid "Bad Tile"
-msgstr "不良标题"
-
-#: tilepath.c:926
-msgid "You must specify an isolated (or medial) tile"
-msgstr ""
-
-#
-#: tilepath.c:928
-msgid "You must specify a medial tile"
-msgstr "您必须指定平均倾斜"
-
-#
-#: tilepath.c:1065
-msgid "Tile Path"
-msgstr "倾斜路径"
-
-#: tilepath.c:1113
-msgid "Include Whitespace below Tile"
-msgstr ""
-
-#: tilepath.c:1117
-msgid ""
-"Normally the Tile will consist of everything\n"
-"within the minimum bounding box of the tile --\n"
-"so adjacent tiles will abut directly on one\n"
-"another. If you wish whitespace between tiles\n"
-"set this flag"
-msgstr ""
-
-#
-#: tilepath.c:1127
-msgid "_Left"
-msgstr "左(_L)"
-
-#: tilepath.c:1131
-msgid ""
-"The tiles should be placed to the left of the path\n"
-"as the path is traced from its start point to its end"
-msgstr ""
-
-#: tilepath.c:1143
-msgid "The tiles should be centered on the path"
-msgstr ""
-
-#
-#: tilepath.c:1151
-msgid "_Right"
-msgstr "右(_R)"
-
-#: tilepath.c:1155
-msgid ""
-"The tiles should be placed to the right of the path\n"
-"as the path is traced from its start point to its end"
-msgstr ""
-
-#
-#: tilepath.c:1172
-msgid "_Tile"
-msgstr "重叠(_T)"
-
-#: tilepath.c:1176
-msgid "Multiple copies of the selection should be tiled onto the path"
-msgstr ""
-
-#
-#: tilepath.c:1184
-msgid "Sc_ale & Tile"
-msgstr "缩放与倾斜(_A)"
-
-#: tilepath.c:1188
-msgid ""
-"An integral number of the selection will be used to cover the path.\n"
-"If the path length is not evenly divisible by the selection's\n"
-"height, then the selection should be scaled slightly."
-msgstr ""
-
-#
-#: tilepath.c:1196
-msgid "_Scale"
-msgstr "缩放(_S)"
-
-#: tilepath.c:1200
-msgid ""
-"The selection should be scaled so that it will cover the path's length"
-msgstr ""
-
-#: tilepath.c:1627
-msgid "X Repeat Count"
-msgstr ""
-
-#: tilepath.c:1628
-msgid "Y Repeat Count"
-msgstr ""
-
-#: tilepath.c:1632 tilepath.c:1636
-msgid "Bad Pattern Size"
-msgstr ""
-
-#: tilepath.c:1632
-msgid "The pattern size (width & height) must be a positive number"
-msgstr ""
-
-#: tilepath.c:1636
-msgid "The repeat counts must be positive numbers"
-msgstr ""
-
-#: tilepath.c:1645
-msgid "Bad Pattern"
-msgstr ""
-
-#: tilepath.c:1645
-msgid "You must specify a pattern"
-msgstr ""
-
-#: tilepath.c:1721
-msgid "Pattern"
-msgstr ""
-
-#: tilepath.c:1784
-msgid "Pattern Size:"
-msgstr ""
-
-#: tilepath.c:1836
-msgid "Repeat Counts:"
-msgstr ""
-
-#: tottf.c:600
-#, c-format
-msgid ""
-"Attempt to output %d into a 16-bit field. It will be truncated and the file "
-"may not be useful."
-msgstr ""
-
-#: tottf.c:4366 tottf.c:4372 tottf.c:4378
-#, c-format
-msgid ""
-"There is a single byte character (%d) using one of the slots needed for "
-"double byte characters"
-msgstr ""
-
-#: tottf.c:4384 tottf.c:4390
-#, c-format
-msgid "There is a character (%d) which cannot be encoded"
-msgstr ""
-
-#: tottf.c:4421 tottf.c:4429
-#, c-format
-msgid "There is a character (%d) which is not normally in the encoding"
-msgstr ""
-
-#
-#: tottf.c:5780
-msgid "Missing bitmap strike"
-msgstr "缺少位图删除线"
-
-#: tottf.c:5780
-#, c-format
-msgid "The font database does not contain a bitmap of size %d and depth %d"
-msgstr ""
-
-#
-#: tottf.c:5794
-msgid "No bitmap strikes"
-msgstr "无位图部件"
-
-#: tottf.c:5803
-msgid "Too many glyphs"
-msgstr ""
-
-#: tottf.c:5803
-#, c-format
-msgid ""
-"The 'sfnt' format is currently limited to 65535 glyphs, and your font has %d "
-"of them."
-msgstr ""
-
-#: tottf.c:6064
-#, c-format
-msgid "Failed to open glyph to name map file for writing: %s\n"
-msgstr ""
-
-#
-#: tottf.c:6203 tottf.c:6210 tottf.c:6213
-msgid "No Encoded Glyphs"
-msgstr "无已编码字形"
-
-#: tottf.c:6210
-msgid ""
-"This font contains no glyphs with unicode encodings.\n"
-"Would you like to use a \"Symbol\" encoding instead of Unicode?"
-msgstr ""
-
-#: tottf.c:6213
-msgid ""
-"This font contains no glyphs with unicode encodings.\n"
-"You will probably not be able to use the output."
-msgstr ""
-
-#
-#: tottf.c:6283
-msgid "Table length should not be odd\n"
-msgstr "表的长度不能是奇数\n"
-
-#: tottf.c:7133
-msgid "Something went wrong"
-msgstr ""
-
-#: tottfaat.c:202
-msgid "Too many kern pairs"
-msgstr ""
-
-#: tottfaat.c:202
-msgid "The 'kern' table supports at most 10920 kern pairs in a subtable"
-msgstr ""
-
-#: tottfaat.c:259
-msgid "Kerning is likely to fail on Windows"
-msgstr ""
-
-#: tottfaat.c:260
-#, c-format
-msgid ""
-"On Windows many apps will have problems with this font's kerning, because %d "
-"of its glyph kern pairs cannot be mapped to unicode-BMP kern pairs"
-msgstr ""
-
-#: tottfgpos.c:1136
-#, c-format
-msgid ""
-"Lookup subtable %s contains a glyph %s whose kerning information takes up "
-"more than 64k bytes\n"
-msgstr ""
-
-#: tottfgpos.c:1141
-#, c-format
-msgid ""
-"Lookup subtable %s had to be split into several subtables\n"
-"because it was too big.\n"
-msgstr ""
-
-#: tottfgpos.c:1248
-#, c-format
-msgid ""
-"I miscalculated the size of subtable %s, this means the kerning output is "
-"wrong."
-msgstr ""
-
-#
-#: tottfgpos.c:1560
-msgid "Two cursive anchor classes"
-msgstr "双草写锚点类属"
-
-#: tottfgpos.c:1560
-#, c-format
-msgid "Two cursive anchor classes in the same subtable, %s"
-msgstr ""
-
-#
-#: tottfgpos.c:2966
-msgid "Lookup potentially too big"
-msgstr "查找太大"
-
-#: tottfgpos.c:2967
-#, c-format
-msgid ""
-"Lookup %s has an\n"
-"offset bigger than 65535 bytes. This means\n"
-"FontForge must use an extension lookup to output it.\n"
-"Not all applications support extension lookups."
-msgstr ""
-
-#: tottfgpos.c:4626
-msgid "Failure"
-msgstr ""
-
-#: tottfgpos.c:4626
-msgid "Offset in JSTF table is too big. The resultant font will not work."
-msgstr ""
-
-#
-#: transform.c:95
-msgid "Do Nothing"
-msgstr "不变换"
-
-#
-#: transform.c:96
-msgid "Move..."
-msgstr "移动..."
-
-#
-#: transform.c:97
-msgid "Rotate..."
-msgstr "旋转..."
-
-#
-#: transform.c:98
-msgid "Scale Uniformly..."
-msgstr "等比缩放..."
-
-#
-#: transform.c:99
-msgid "Scale..."
-msgstr "缩放..."
-
-#
-#: transform.c:100
-msgid "Flip..."
-msgstr "翻转..."
-
-#
-#: transform.c:102
-msgid "Rotate 3D Around..."
-msgstr "三维旋转..."
-
-#
-#: transform.c:103
-msgid "Move by Ruler..."
-msgstr "按标尺移动..."
-
-#
-#: transform.c:104
-msgid "Rotate by Ruler..."
-msgstr "按标尺旋转..."
-
-#
-#: transform.c:105
-msgid "Skew by Ruler..."
-msgstr "按标尺倾斜..."
-
-#
-#: transform.c:158
-msgid "X Movement"
-msgstr "X向移动量(水平)"
-
-#
-#: transform.c:159
-msgid "Y Movement"
-msgstr "Y向移动量(垂直)"
-
-#
-#: transform.c:163
-msgid "Rotation Angle"
-msgstr "旋转角度"
-
-#
-#: transform.c:180
-msgid "Scale Factor"
-msgstr "缩放比例"
-
-#
-#: transform.c:184
-msgid "X Scale Factor"
-msgstr "X向缩放比例"
-
-#
-#: transform.c:185
-msgid "Y Scale Factor"
-msgstr "Y向缩放比例"
-
-#
-#: transform.c:198
-msgid "Skew Angle"
-msgstr "倾斜角度"
-
-#
-#: transform.c:206
-msgid "Rotation about X Axis"
-msgstr "绕X轴旋转"
-
-#
-#: transform.c:207
-msgid "Rotation about Y Axis"
-msgstr "绕Y轴旋转"
-
-#
-#: transform.c:251
-msgid ""
-"After rotating or skewing a glyph you should probably apply Element->Add "
-"Extrema"
-msgstr "旋转或倾斜字形后可能要执行“基础->增加极点”"
-
-#
-#: transform.c:423
-msgid "° Clockwise"
-msgstr "° 顺时针"
-
-#
-#. GT: Sometimes spelled Widdershins. An old word which means counter clockwise.
-#. GT: I used it because "counter clockwise" took too much space.
-#: transform.c:434
-msgid "° Withershins"
-msgstr "° 逆时针"
-
-#
-#: transform.c:613
-msgid "Transform"
-msgstr "变换"
-
-#
-#: transform.c:624
-msgid "Origin:"
-msgstr "原点:"
-
-#: transform.c:659
-msgid "Transform _All Layers"
-msgstr ""
-
-#
-#: transform.c:670
-msgid "Transform _Guide Layer Too"
-msgstr "亦变换引导层(_G)"
-
-#: transform.c:681
-msgid "Transform _Width Too"
-msgstr ""
-
-#
-#: transform.c:693
-msgid "Transform kerning _classes too"
-msgstr "亦变换压缩类(_C)"
-
-#
-#: transform.c:706
-msgid "Transform simple positioning features & _kern pairs"
-msgstr "变换简单定位特征及压缩对(_K)"
-
-#
-#: transform.c:717
-msgid "Round To _Int"
-msgstr "圆整(_I)"
-
-#
-#: ttfinstrs.c:309
-msgid "A value must be between [-32768,32767]"
-msgstr "值的范围 [-32768,32767]"
-
-#
-#: ttfinstrs.c:317
-msgid "A value must be between [-8,-1] or [1,8]"
-msgstr "值的范围 [-8,-1] 或 [1,8]"
-
-#
-#: ttfinstrs.c:324
-msgid "Number expected"
-msgstr "需要数字"
-
-#
-#: ttfinstrs.c:332
-msgid "A value must be between [0,15]"
-msgstr "值的范围 [0,15]"
-
-#: ttfinstrs.c:348
-msgid "Missing left parenthesis in command to get a cvt index"
-msgstr ""
-
-#: ttfinstrs.c:355
-msgid "Missing right paren in command to get a cvt index"
-msgstr ""
-
-#: ttfinstrs.c:370
-msgid "Expected a number for a push count"
-msgstr ""
-
-#: ttfinstrs.c:372
-msgid "The push count must be a number between 0 and 255"
-msgstr ""
-
-#
-#: ttfinstrs.c:381
-msgid "More pushes specified than needed"
-msgstr "过多弹出，超过所需"
-
-#: ttfinstrs.c:389
-msgid "A value to be pushed by a byte push must be between 0 and 255"
-msgstr ""
-
-#
-#: ttfinstrs.c:396
-msgid "Unexpected number"
-msgstr "不良数字"
-
-#
-#: ttfinstrs.c:402
-msgid "Missing pushes"
-msgstr "缺少压入操作"
-
-#: ttfinstrs.c:446
-msgid "Missing right bracket in command (or bad binary value in bracket)"
-msgstr ""
-
-#
-#: ttfinstrs.c:450
-msgid "Bracketted value is too large"
-msgstr "值太大"
-
-#: ttfinstrsui.c:63
-msgid ""
-"Adjust Angle\n"
-"Obsolete instruction\n"
-"Pops one value"
-msgstr ""
-
-#: ttfinstrsui.c:64
-msgid ""
-"ABSolute Value\n"
-"Replaces top of stack with its abs"
-msgstr ""
-
-#: ttfinstrsui.c:65
-msgid ""
-"ADD\n"
-"Pops two 26.6 fixed numbers from stack\n"
-"adds them, pushes result"
-msgstr ""
-
-#: ttfinstrsui.c:66
-msgid ""
-"ALIGN PoinTS\n"
-"Aligns (&pops) the two points which are on the stack\n"
-"by moving along freedom vector to the average of their\n"
-"positions on projection vector"
-msgstr ""
-
-#: ttfinstrsui.c:67
-msgid ""
-"ALIGN to Reference Point\n"
-"Pops as many points as specified in loop counter\n"
-"Aligns points with RP0 by moving each\n"
-"along freedom vector until distance to\n"
-"RP0 on projection vector is 0"
-msgstr ""
-
-#: ttfinstrsui.c:68
-msgid ""
-"logical AND\n"
-"Pops two values, ands them, pushes result"
-msgstr ""
-
-#: ttfinstrsui.c:69
-msgid ""
-"CALL function\n"
-"Pops a value, calls the function represented by it"
-msgstr ""
-
-#: ttfinstrsui.c:70
-msgid ""
-"CEILING\n"
-"Pops one 26.6 value, rounds upward to an int\n"
-"pushes result"
-msgstr ""
-
-#: ttfinstrsui.c:71
-msgid ""
-"Copy INDEXed element to stack\n"
-"Pops an index & copies stack\n"
-"element[index] to top of stack"
-msgstr ""
-
-#: ttfinstrsui.c:72
-msgid ""
-"CLEAR\n"
-"Pops all elements on stack"
-msgstr ""
-
-#: ttfinstrsui.c:73
-msgid ""
-"DEBUG call\n"
-"Pops a value and executes a debugging interpreter\n"
-"(if available)"
-msgstr ""
-
-#: ttfinstrsui.c:74
-msgid ""
-"DELTA exception C1\n"
-"Pops a value n & then n exception specifications & cvt entries\n"
-"changes each cvt entry at a given size by the pixel amount"
-msgstr ""
-
-#: ttfinstrsui.c:75
-msgid ""
-"DELTA exception C2\n"
-"Pops a value n & then n exception specifications & cvt entries\n"
-"changes each cvt entry at a given size by the amount"
-msgstr ""
-
-#: ttfinstrsui.c:76
-msgid ""
-"DELTA exception C3\n"
-"Pops a value n & then n exception specifications & cvt entries\n"
-"changes each cvt entry at a given size by the amount"
-msgstr ""
-
-#: ttfinstrsui.c:77
-msgid ""
-"DELTA exception P1\n"
-"Pops a value n & then n exception specifications & points\n"
-"moves each point at a given size by the amount"
-msgstr ""
-
-#: ttfinstrsui.c:78
-msgid ""
-"DELTA exception P2\n"
-"Pops a value n & then n exception specifications & points\n"
-"moves each point at a given size by the amount"
-msgstr ""
-
-#: ttfinstrsui.c:79
-msgid ""
-"DELTA exception P3\n"
-"Pops a value n & then n exception specifications & points\n"
-"moves each point at a given size by the amount"
-msgstr ""
-
-#: ttfinstrsui.c:80
-msgid ""
-"DEPTH of stack\n"
-"Pushes the number of elements on the stack"
-msgstr ""
-
-#: ttfinstrsui.c:81
-msgid ""
-"DIVide\n"
-"Pops two 26.6 numbers, divides them, pushes result"
-msgstr ""
-
-#: ttfinstrsui.c:82
-msgid ""
-"DUPlicate top stack element\n"
-"Pushes the top stack element again"
-msgstr ""
-
-#: ttfinstrsui.c:83
-msgid ""
-"End IF\n"
-"Ends an IF or IF-ELSE sequence"
-msgstr ""
-
-#: ttfinstrsui.c:84
-msgid ""
-"ELSE clause\n"
-"Start of Else clause of preceding IF"
-msgstr ""
-
-#: ttfinstrsui.c:85
-msgid "END Function definition"
-msgstr ""
-
-#: ttfinstrsui.c:86
-msgid ""
-"EQual\n"
-"Pops two values, tests for equality, pushes result(0/1)"
-msgstr ""
-
-#: ttfinstrsui.c:87
-msgid ""
-"EVEN\n"
-"Pops one value, rounds it and tests if it is even(0/1)"
-msgstr ""
-
-#: ttfinstrsui.c:88
-msgid ""
-"Function DEFinition\n"
-"Pops a value (n) and starts the nth\n"
-"function definition"
-msgstr ""
-
-#: ttfinstrsui.c:89
-msgid "set the auto FLIP boolean to OFF"
-msgstr ""
-
-#: ttfinstrsui.c:90
-msgid "set the auto FLIP boolean to ON"
-msgstr ""
-
-#: ttfinstrsui.c:91
-msgid ""
-"FLIP PoinT\n"
-"Pops as many points as specified in loop counter\n"
-"Flips whether each point is on/off curve"
-msgstr ""
-
-#: ttfinstrsui.c:92
-msgid ""
-"FLIP RanGe OFF\n"
-"Pops two point numbers\n"
-"sets all points between to be off curve points"
-msgstr ""
-
-#: ttfinstrsui.c:93
-msgid ""
-"FLIP RanGe ON\n"
-"Pops two point numbers\n"
-"sets all points between to be on curve points"
-msgstr ""
-
-#: ttfinstrsui.c:94
-msgid ""
-"FLOOR\n"
-"Pops a value, rounds to lowest int, pushes result"
-msgstr ""
-
-#: ttfinstrsui.c:95
-msgid ""
-"Get Coordinate[a] projected onto projection vector\n"
-" 0=>use current pos\n"
-" 1=>use original pos\n"
-"Pops one point, pushes the coordinate of\n"
-"the point along projection vector"
-msgstr ""
-
-#: ttfinstrsui.c:96
-msgid ""
-"GET INFOrmation\n"
-"Pops information type, pushes result"
-msgstr ""
-
-#: ttfinstrsui.c:97
-msgid ""
-"Get Freedom Vector\n"
-"Decomposes freedom vector, pushes its\n"
-"two coordinates onto stack as 2.14"
-msgstr ""
-
-#: ttfinstrsui.c:98
-msgid ""
-"Get Projection Vector\n"
-"Decomposes projection vector, pushes its\n"
-"two coordinates onto stack as 2.14"
-msgstr ""
-
-#: ttfinstrsui.c:99
-msgid ""
-"Greater Than\n"
-"Pops two values, pushes (0/1) if bottom el > top"
-msgstr ""
-
-#: ttfinstrsui.c:100
-msgid ""
-"Greater Than or EQual\n"
-"Pops two values, pushes (0/1) if bottom el >= top"
-msgstr ""
-
-#: ttfinstrsui.c:101
-msgid ""
-"Instruction DEFinition\n"
-"Pops a value which becomes the opcode\n"
-"and begins definition of new instruction"
-msgstr ""
-
-#: ttfinstrsui.c:102
-msgid ""
-"IF test\n"
-"Pops an integer,\n"
-"if 0 (false) next instruction is ELSE or EIF\n"
-"if non-0 execution continues normally\n"
-"(unless there's an ELSE)"
-msgstr ""
-
-#: ttfinstrsui.c:103
-msgid ""
-"INSTRuction execution ConTRoL\n"
-"Pops a selector and value\n"
-"Sets a state variable"
-msgstr ""
-
-#: ttfinstrsui.c:104
-msgid ""
-"Interpolate Point\n"
-"Pops as many points as specified in loop counter\n"
-"Interpolates each point to preserve original status\n"
-"with respect to RP1 and RP2"
-msgstr ""
-
-#: ttfinstrsui.c:105
-msgid ""
-"moves point to InterSECTion of two lines\n"
-"Pops start,end start,end points of two lines\n"
-"and a point to move. Point is moved to\n"
-"intersection"
-msgstr ""
-
-#: ttfinstrsui.c:106
-msgid ""
-"Interpolate Untouched Points[a]\n"
-" 0=> interpolate in y direction\n"
-" 1=> x direction"
-msgstr ""
-
-#: ttfinstrsui.c:107
-msgid ""
-"JuMP Relative\n"
-"Pops offset (in bytes) to move the instruction pointer"
-msgstr ""
-
-#: ttfinstrsui.c:108
-msgid ""
-"Jump Relative On False\n"
-"Pops a boolean and an offset\n"
-"Changes instruction pointer by offset bytes\n"
-"if boolean is false"
-msgstr ""
-
-#: ttfinstrsui.c:109
-msgid ""
-"Jump Relative On True\n"
-"Pops a boolean and an offset\n"
-"Changes instruction pointer by offset bytes\n"
-"if boolean is true"
-msgstr ""
-
-#: ttfinstrsui.c:110
-msgid ""
-"LOOP and CALL function\n"
-"Pops a function number & count\n"
-"Calls function count times"
-msgstr ""
-
-#: ttfinstrsui.c:111
-msgid ""
-"Less Than\n"
-"Pops two values, pushes (0/1) if bottom el < top"
-msgstr ""
-
-#: ttfinstrsui.c:112
-msgid ""
-"Less Than or EQual\n"
-"Pops two values, pushes (0/1) if bottom el <= top"
-msgstr ""
-
-#: ttfinstrsui.c:113
-msgid ""
-"MAXimum of top two stack entries\n"
-"Pops two values, pushes the maximum back"
-msgstr ""
-
-#: ttfinstrsui.c:114
-msgid ""
-"Measure Distance[a]\n"
-" 0=>distance with current positions\n"
-" 1=>distance with original positions\n"
-"Pops two point numbers, pushes distance between them"
-msgstr ""
-
-#: ttfinstrsui.c:115
-msgid ""
-"Move Direct Absolute Point[a]\n"
-" 0=>do not round\n"
-" 1=>round\n"
-"Pops a point number, touches that point\n"
-"and perhaps rounds it to the grid along\n"
-"the projection vector. Sets rp0&rp1 to the point"
-msgstr ""
-
-#: ttfinstrsui.c:116
-msgid ""
-"Move Direct Relative Point[abcde]\n"
-" a=0=>don't set rp0\n"
-" a=1=>set rp0 to p\n"
-" b=0=>do not keep distance more than minimum\n"
-" b=1=>keep distance at least minimum\n"
-" c=0 do not round\n"
-" c=1 round\n"
-" de=0 => grey distance\n"
-" de=1 => black distance\n"
-" de=2 => white distance\n"
-"Pops a point moves it so that it maintains\n"
-"its original distance to the rp0. Sets\n"
-"rp1 to rp0, rp2 to point, sometimes rp0 to point"
-msgstr ""
-
-#: ttfinstrsui.c:117
-msgid ""
-"Move Indirect Absolute Point[a]\n"
-" 0=>do not round, don't use cvt cutin\n"
-" 1=>round\n"
-"Pops a point number & a cvt entry,\n"
-"touches the point and moves it to the coord\n"
-"specified in the cvt (along the projection vector).\n"
-"Sets rp0&rp1 to the point"
-msgstr ""
-
-#: ttfinstrsui.c:118
-msgid ""
-"Minimum of top two stack entries\n"
-"Pops two values, pushes the minimum back"
-msgstr ""
-
-#: ttfinstrsui.c:119
-msgid ""
-"Move INDEXed element to stack\n"
-"Pops an index & moves stack\n"
-"element[index] to top of stack\n"
-"(removing it from where it was)"
-msgstr ""
-
-#: ttfinstrsui.c:120
-msgid ""
-"Move Indirect Relative Point[abcde]\n"
-" a=0=>don't set rp0\n"
-" a=1=>set rp0 to p\n"
-" b=0=>do not keep distance more than minimum\n"
-" b=1=>keep distance at least minimum\n"
-" c=0 do not round nor use cvt cutin\n"
-" c=1 round & use cvt cutin\n"
-" de=0 => grey distance\n"
-" de=1 => black distance\n"
-" de=2 => white distance\n"
-"Pops a cvt index and a point moves it so that it\n"
-"is cvt[index] from rp0. Sets\n"
-"rp1 to rp0, rp2 to point, sometimes rp0 to point"
-msgstr ""
-
-#: ttfinstrsui.c:121
-msgid ""
-"Measure Pixels Per EM\n"
-"Pushs the pixels per em (for current rasterization)"
-msgstr ""
-
-#: ttfinstrsui.c:122
-msgid ""
-"Measure Point Size\n"
-"Pushes the current point size"
-msgstr ""
-
-#: ttfinstrsui.c:123
-msgid ""
-"Move Stack Indirect Relative Point[a]\n"
-" 0=>do not set rp0\n"
-" 1=>set rp0 to point\n"
-"Pops a 26.6 distance and a point\n"
-"Moves point so it is distance from rp0"
-msgstr ""
-
-#: ttfinstrsui.c:124
-msgid ""
-"MULtiply\n"
-"Pops two 26.6 numbers, multiplies them, pushes result"
-msgstr ""
-
-#: ttfinstrsui.c:125
-msgid ""
-"NEGate\n"
-"Negates the top of the stack"
-msgstr ""
-
-#: ttfinstrsui.c:126
-msgid ""
-"Not EQual\n"
-"Pops two values, tests for inequality, pushes result(0/1)"
-msgstr ""
-
-#: ttfinstrsui.c:127
-msgid ""
-"logical NOT\n"
-"Pops a number, if 0 pushes 1, else pushes 0"
-msgstr ""
-
-#: ttfinstrsui.c:128
-msgid ""
-"N PUSH Bytes\n"
-"Reads an (unsigned) count byte from the\n"
-"instruction stream, then reads and pushes\n"
-"that many unsigned bytes"
-msgstr ""
-
-#: ttfinstrsui.c:129
-msgid ""
-"N PUSH Words\n"
-"Reads an (unsigned) count byte from the\n"
-"instruction stream, then reads and pushes\n"
-"that many signed 2byte words"
-msgstr ""
-
-#: ttfinstrsui.c:130
-msgid ""
-"No ROUNDing of value[ab]\n"
-" ab=0 => grey distance\n"
-" ab=1 => black distance\n"
-" ab=2 => white distance\n"
-"Pops a coordinate (26.6), changes it (without\n"
-"rounding) to compensate for engine effects\n"
-"pushes it back"
-msgstr ""
-
-#: ttfinstrsui.c:131
-msgid ""
-"ODD\n"
-"Pops one value, rounds it and tests if it is odd(0/1)"
-msgstr ""
-
-#: ttfinstrsui.c:132
-msgid ""
-"logical OR\n"
-"Pops two values, ors them, pushes result"
-msgstr ""
-
-#: ttfinstrsui.c:133
-msgid "POP top stack element"
-msgstr ""
-
-#: ttfinstrsui.c:134
-msgid ""
-"PUSH Byte[abc]\n"
-" abc is the number-1 of bytes to push\n"
-"Reads abc+1 unsigned bytes from\n"
-"the instruction stream and pushes them"
-msgstr ""
-
-#: ttfinstrsui.c:135
-msgid ""
-"PUSH Word[abc]\n"
-" abc is the number-1 of words to push\n"
-"Reads abc+1 signed words from\n"
-"the instruction stream and pushes them"
-msgstr ""
-
-#: ttfinstrsui.c:136
-msgid ""
-"Read Control Value Table entry\n"
-"Pops an index to the CVT and\n"
-"pushes it in 26.6 format"
-msgstr ""
-
-#: ttfinstrsui.c:137
-msgid ""
-"Round Down To Grid\n"
-"\n"
-"Sets round state to the obvious"
-msgstr ""
-
-#: ttfinstrsui.c:138
-msgid ""
-"Round OFF\n"
-"Sets round state so that no rounding occurs\n"
-"but engine compensation does"
-msgstr ""
-
-#: ttfinstrsui.c:139
-msgid "ROLL the top three stack elements"
-msgstr ""
-
-#: ttfinstrsui.c:140
-msgid ""
-"ROUND value[ab]\n"
-" ab=0 => grey distance\n"
-" ab=1 => black distance\n"
-" ab=2 => white distance\n"
-"Rounds a coordinate (26.6) at top of stack\n"
-"and compensates for engine effects"
-msgstr ""
-
-#: ttfinstrsui.c:141
-msgid ""
-"Read Store\n"
-"Pops an index into store array\n"
-"Pushes value at that index"
-msgstr ""
-
-#: ttfinstrsui.c:142
-msgid ""
-"Round To Double Grid\n"
-"Sets the round state (round to closest .5/int)"
-msgstr ""
-
-#: ttfinstrsui.c:143
-msgid ""
-"Round To Grid\n"
-"Sets the round state"
-msgstr ""
-
-#: ttfinstrsui.c:144
-msgid ""
-"Round To Half Grid\n"
-"Sets the round state (round to closest .5 not int)"
-msgstr ""
-
-#: ttfinstrsui.c:145
-msgid ""
-"Round Up To Grid\n"
-"Sets the round state"
-msgstr ""
-
-#: ttfinstrsui.c:146
-msgid ""
-"Super 45° ROUND\n"
-"Too complicated. Look it up"
-msgstr ""
-
-#: ttfinstrsui.c:147
-msgid ""
-"Set ANGle Weight\n"
-"Pops an int, and sets the angle\n"
-"weight state variable to it\n"
-"Obsolete"
-msgstr ""
-
-#: ttfinstrsui.c:148
-msgid ""
-"SCAN conversion ConTRoL\n"
-"Pops a number which sets the\n"
-"dropout control mode"
-msgstr ""
-
-#: ttfinstrsui.c:149
-msgid ""
-"SCANTYPE\n"
-"Pops number which sets which scan\n"
-"conversion rules to use"
-msgstr ""
-
-#: ttfinstrsui.c:150
-msgid ""
-"Sets Coordinate From Stack using projection & freedom vectors\n"
-"Pops a coordinate 26.6 and a point\n"
-"Moves point to given coordinate"
-msgstr ""
-
-#: ttfinstrsui.c:151
-msgid ""
-"Sets Control Value Table Cut-In\n"
-"Pops 26.6 from stack, sets cvt cutin"
-msgstr ""
-
-#: ttfinstrsui.c:152
-msgid ""
-"Set Delta Base\n"
-"Pops value sets delta base"
-msgstr ""
-
-#: ttfinstrsui.c:153
-msgid ""
-"Set Dual Projection Vector To Line[a]\n"
-" 0 => parallel to line\n"
-" 1=>orthogonal to line\n"
-"Pops two points used to establish the line\n"
-"Sets a second projection vector based on original\n"
-"positions of points"
-msgstr ""
-
-#: ttfinstrsui.c:154
-msgid ""
-"Set Delta Shift\n"
-"Pops a new value for delta shift"
-msgstr ""
-
-#: ttfinstrsui.c:155
-msgid ""
-"Set Freedom Vector From Stack\n"
-"pops 2 2.14 values (x,y) from stack\n"
-"must be a unit vector"
-msgstr ""
-
-#: ttfinstrsui.c:156
-msgid ""
-"Set Freedom Vector To Coordinate Axis[a]\n"
-" 0=>y axis\n"
-" 1=>x axis\n"
-msgstr ""
-
-#: ttfinstrsui.c:157
-msgid ""
-"Set Freedom Vector To Line[a]\n"
-" 0 => parallel to line\n"
-" 1=>orthogonal to line\n"
-"Pops two points used to establish the line\n"
-"Sets the freedom vector"
-msgstr ""
-
-#: ttfinstrsui.c:158
-msgid "Set Freedom Vector To Projection Vector"
-msgstr ""
-
-#: ttfinstrsui.c:159
-msgid ""
-"SHift Contour using reference point[a]\n"
-" 0=>uses rp2 in zp1\n"
-" 1=>uses rp1 in zp0\n"
-"Pops number of contour to be shifted\n"
-"Shifts the entire contour by the amount\n"
-"reference point was shifted"
-msgstr ""
-
-#: ttfinstrsui.c:160
-msgid ""
-"SHift Point using reference point[a]\n"
-" 0=>uses rp2 in zp1\n"
-" 1=>uses rp1 in zp0\n"
-"Pops as many points as specified by the loop count\n"
-"Shifts each by the amount the reference\n"
-"point was shifted"
-msgstr ""
-
-#: ttfinstrsui.c:161
-msgid ""
-"SHift point by a PIXel amount\n"
-"Pops an amount (26.6) and as many points\n"
-"as the loop counter specifies\n"
-"each point is shifted along the FREEDOM vector"
-msgstr ""
-
-#: ttfinstrsui.c:162
-msgid ""
-"SHift Zone using reference point[a]\n"
-" 0=>uses rp2 in zp1\n"
-" 1=>uses rp1 in zp0\n"
-"Pops the zone to be shifted\n"
-"Shifts all points in zone by the amount\n"
-"the reference point was shifted"
-msgstr ""
-
-#: ttfinstrsui.c:163
-msgid ""
-"Set LOOP variable\n"
-"Pops the new value for the loop counter\n"
-"Defaults to 1 after each use"
-msgstr ""
-
-#: ttfinstrsui.c:164
-msgid ""
-"Set Minimum Distance\n"
-"Pops a 26.6 value from stack to be new minimum distance"
-msgstr ""
-
-#: ttfinstrsui.c:165
-msgid ""
-"Set Projection Vector From Stack\n"
-"pops 2 2.14 values (x,y) from stack\n"
-"must be a unit vector"
-msgstr ""
-
-#: ttfinstrsui.c:166
-msgid ""
-"Set Projection Vector To Coordinate Axis[a]\n"
-" 0=>y axis\n"
-" 1=>x axis\n"
-msgstr ""
-
-#: ttfinstrsui.c:167
-msgid ""
-"Set Projection Vector To Line[a]\n"
-" 0 => parallel to line\n"
-" 1=>orthogonal to line\n"
-"Pops two points used to establish the line\n"
-"Sets the projection vector"
-msgstr ""
-
-#: ttfinstrsui.c:168
-msgid ""
-"Super ROUND\n"
-"Too complicated. Look it up"
-msgstr ""
-
-#: ttfinstrsui.c:169
-msgid ""
-"Set Reference Point 0\n"
-"Pops a point which becomes the new rp0"
-msgstr ""
-
-#: ttfinstrsui.c:170
-msgid ""
-"Set Reference Point 1\n"
-"Pops a point which becomes the new rp1"
-msgstr ""
-
-#: ttfinstrsui.c:171
-msgid ""
-"Set Reference Point 2\n"
-"Pops a point which becomes the new rp2"
-msgstr ""
-
-#: ttfinstrsui.c:172
-msgid ""
-"Set Single Width\n"
-"Pops value for single width value (FUnit)"
-msgstr ""
-
-#: ttfinstrsui.c:173
-msgid ""
-"Set Single Width Cut-In\n"
-"Pops value for single width cut-in value (26.6)"
-msgstr ""
-
-#: ttfinstrsui.c:174
-msgid ""
-"SUBtract\n"
-"Pops two 26.6 fixed numbers from stack\n"
-"subtracts them, pushes result"
-msgstr ""
-
-#: ttfinstrsui.c:175
-msgid ""
-"Set freedom & projection Vectors To Coordinate Axis[a]\n"
-" 0=>both to y axis\n"
-" 1=>both to x axis\n"
-msgstr ""
-
-#: ttfinstrsui.c:176
-msgid "SWAP top two elements on stack"
-msgstr ""
-
-#: ttfinstrsui.c:177
-msgid ""
-"Set Zone Pointer 0\n"
-"Pops the zone number into zp0"
-msgstr ""
-
-#: ttfinstrsui.c:178
-msgid ""
-"Set Zone Pointer 1\n"
-"Pops the zone number into zp1"
-msgstr ""
-
-#: ttfinstrsui.c:179
-msgid ""
-"Set Zone Pointer 2\n"
-"Pops the zone number into zp2"
-msgstr ""
-
-#: ttfinstrsui.c:180
-msgid ""
-"Set Zone PointerS\n"
-"Pops the zone number into zp0,zp1 and zp2"
-msgstr ""
-
-#: ttfinstrsui.c:181
-msgid ""
-"UnTouch Point\n"
-"Pops a point number and marks it untouched"
-msgstr ""
-
-#: ttfinstrsui.c:182
-msgid ""
-"Write Control Value Table in Funits\n"
-"Pops a number(Funits) and a\n"
-"CVT index and writes the number to cvt[index]"
-msgstr ""
-
-#: ttfinstrsui.c:183
-msgid ""
-"Write Control Value Table in Pixel units\n"
-"Pops a number(26.6) and a\n"
-"CVT index and writes the number to cvt[index]"
-msgstr ""
-
-#: ttfinstrsui.c:184
-msgid ""
-"Write Store\n"
-"Pops a value and an index and writes the value to storage[index]"
-msgstr ""
-
-#
-#: ttfinstrsui.c:261
-msgid "Parse Error"
-msgstr "解析错误"
-
-#: ttfinstrsui.c:412
-msgid "<instrs inherited>"
-msgstr ""
-
-#: ttfinstrsui.c:415
-msgid "<no instrs>"
-msgstr ""
-
-#: ttfinstrsui.c:431
-msgid "<return>"
-msgstr ""
-
-#: ttfinstrsui.c:512
-msgid "A short to be pushed on the stack"
-msgstr ""
-
-#: ttfinstrsui.c:515
-msgid ""
-"A count specifying how many bytes/shorts\n"
-"should be pushed on the stack"
-msgstr ""
-
-#: ttfinstrsui.c:518
-msgid "An unsigned byte to be pushed on the stack"
-msgstr ""
-
-#
-#: ttfinstrsui.c:793
-msgid "_Parse"
-msgstr "解析(_P)"
-
-#
-#: ttfinstrsui.c:935 ttfinstrsui.c:1994
-#, c-format
-msgid "TrueType Instructions for %.50s"
-msgstr "T%.50s的rueType指令"
-
-#
-#: ttfinstrsui.c:1077 ttfinstrsui.c:1483
-msgid "Change Length"
-msgstr "改变长度"
-
-#: ttfinstrsui.c:1077
-msgid "How many entries should there be in the cvt table?"
-msgstr ""
-
-#
-#: ttfinstrsui.c:1363 ttfinstrsui.c:1364
-msgid "Index"
-msgstr "索引"
-
-#
-#: ttfinstrsui.c:1625 ttfinstrsui.c:1637
-msgid "Instructions were changed"
-msgstr "指令已改变"
-
-#: ttfinstrsui.c:1625 ttfinstrsui.c:1637
-#, c-format
-msgid ""
-"The instructions for %.80s have changed. Do you want to lose those changes?"
-msgstr ""
-
-#
-#: ttfinstrsui.c:1682
-msgid "Zones"
-msgstr "区域"
-
-#: ttfinstrsui.c:1683
-msgid "Twilight Zone Point Count"
-msgstr ""
-
-#
-#: ttfinstrsui.c:1685
-msgid "Max Stack Depth"
-msgstr "最大堆栈深度"
-
-#
-#: ttfinstrsui.c:1686
-msgid "Max # Functions"
-msgstr "最多函数"
-
-#
-#: ttfinstrsui.c:1687
-msgid "Max Instruction Defines"
-msgstr "最大指令定义"
-
-#
-#: ttfinstrsui.c:1784
-msgid "_Zones:"
-msgstr "区域(_Z):"
-
-#: ttfinstrsui.c:1805
-msgid "_Twilight Pnt Cnt:"
-msgstr ""
-
-#
-#: ttfinstrsui.c:1826
-msgid "St_orage:"
-msgstr "存储(_O):"
-
-#
-#: ttfinstrsui.c:1847
-msgid "Max _Stack Depth:"
-msgstr "堆栈最大深度:"
-
-#
-#: ttfinstrsui.c:1868
-msgid "_FDEF"
-msgstr "_FDEF"
-
-#
-#: ttfinstrsui.c:1888
-msgid "_IDEFs"
-msgstr "_IDEFs"
-
-#: ttfspecial.c:998
-msgid "Bad glyph range specified in glyph comment subtable of PfEd table\n"
-msgstr ""
-
-#: ttfspecial.c:1032
-msgid "Bad glyph range specified in color subtable of PfEd table\n"
-msgstr ""
-
-#
-#: ttfspecial.c:1574
-#, c-format
-msgid "Unknown subtable '%c%c%c%c' in 'PfEd' table, ignored\n"
-msgstr "未知替代表 '%c%c%c%c' 于 'PfEd' 表中,忽略之\n"
-
-#
-#: ttfspecial.c:1904
-#, c-format
-msgid "Unknown subtable '%c%c%c%c' in 'TeX ' table, ignored\n"
-msgstr "未知替代表'%c%c%c%c' 于 'TeX ' 表中, 忽略之\n"
-
-#
-#: ufo.c:1176
-msgid "Expected glyph file with format==1\n"
-msgstr "期望字形文件格式==1\n"
-
-#
-#: ufo.c:1229
-msgid "component with no base glyph"
-msgstr "无基字形组件"
-
-#
-#: ufo.c:1437
-#, c-format
-msgid "Bad glif file %s\n"
-msgstr "不良 glif 文件 %s\n"
-
-#: ufo.c:1455
-#, c-format
-msgid "Failed to find glyph %s when fixing up references\n"
-msgstr ""
-
-#
-#: ufo.c:1484
-msgid "Bad contents.plist\n"
-msgstr "不良 contents.plist\n"
-
-#
-#: ufo.c:1490 ufo.c:1547 ufo.c:1747 ufo.c:2029
-msgid "Expected property list file"
-msgstr "需要属性列表文件"
-
-#: ufo.c:1968
-msgid "This font does not specify unitsPerEm\n"
-msgstr ""
-
-#: uiutil.c:75
-#, c-format
-msgid ""
-"Failed to default value of exten \"%s\".\n"
-" Error=%ld"
-msgstr ""
-
-#
-#: uiutil.c:82
-#, c-format
-msgid "Failed to find program \"%s\"\n"
-msgstr "未找到程序 \"%s\"\n"
-
-#
-#: uiutil.c:86
-#, c-format
-msgid "Failed to find \"%s->shell\"\n"
-msgstr "未找到 \"%s->shell\"\n"
-
-#
-#: uiutil.c:91 uiutil.c:96
-#, c-format
-msgid "Failed to find \"%s->shell->open\"\n"
-msgstr "未能找到\"%s->外壳->打开\"\n"
-
-#: uiutil.c:103
-#, c-format
-msgid "Failed to find default for \"%s->shell->open->command\"\n"
-msgstr ""
-
-#
-#: uiutil.c:123 uiutil.c:309
-msgid "No Browser"
-msgstr "无浏览窗口"
-
-#: uiutil.c:123 uiutil.c:309
-msgid ""
-"Could not find a browser. Set the BROWSER environment variable to point to "
-"one"
-msgstr ""
-
-#
-#: uiutil.c:390
-msgid "Leave X"
-msgstr "离开X"
-
-#: uiutil.c:390
-msgid ""
-"A browser is probably running in the native Mac windowing system. You must "
-"leave the X environment to view it. Try Cmd-Opt-A"
-msgstr ""
-
-#
-#: unicoderange.c:38
-msgid "Unicode Basic Multilingual Plane"
-msgstr "统一码基础多语言平面"
-
-#
-#: unicoderange.c:39
-msgid "Basic Multilingual Plane"
-msgstr "基础多语言平面"
-
-#
-#: unicoderange.c:40
-msgid "Alphabetic"
-msgstr "字母表"
-
-#
-#: unicoderange.c:41
-msgid "C0 Control Character"
-msgstr "C0控制字符"
-
-#
-#: unicoderange.c:42
-msgid "NUL, Default Character"
-msgstr "NUL，默认字符"
-
-#
-#: unicoderange.c:44
-msgid "Delete Character"
-msgstr "删除字符"
-
-#
-#: unicoderange.c:45
-msgid "C1 Control Character"
-msgstr "C1控制字符"
-
-#
-#: unicoderange.c:52
-msgid "Greek"
-msgstr "希腊语"
-
-#
-#: unicoderange.c:55
-msgid "Cyrillic Supplement"
-msgstr "Cyrillic增补"
-
-#
-#: unicoderange.c:60
-msgid "Arabic Supplement"
-msgstr "Arabic增补"
-
-#
-#: unicoderange.c:63
-msgid "Samaritan"
-msgstr "萨马利亚阿拉米语"
-
-#: unicoderange.c:64
-msgid "Samaritan, Punctuation"
-msgstr ""
-
-#
-#: unicoderange.c:65
-msgid "Mandaic"
-msgstr "Mandaic"
-
-#
-#: unicoderange.c:66
-msgid "Devangari"
-msgstr "梵文字母, 天城体"
-
-#
-#: unicoderange.c:81
-msgid "Hangul Jamo, Choseong"
-msgstr "韩文兼容, Choseong"
-
-#
-#: unicoderange.c:82
-msgid "Hangul Jamo, Jungseong"
-msgstr "韩文兼容, Jungseong"
-
-#
-#: unicoderange.c:83
-msgid "Hangul Jamo, Jongseong"
-msgstr "韩文兼容, Jongseong"
-
-#
-#: unicoderange.c:85
-msgid "Ethiopic Supplement"
-msgstr "Ethiopic增补"
-
-#
-#: unicoderange.c:90
-msgid "Tagalog"
-msgstr "塔加路语"
-
-#
-#: unicoderange.c:91
-msgid "Hanunóo"
-msgstr "Hanunóo"
-
-#
-#: unicoderange.c:92
-msgid "Buhid"
-msgstr "Buhid"
-
-#
-#: unicoderange.c:93
-msgid "Tagbanwa"
-msgstr "塔格班瓦语"
-
-#: unicoderange.c:96
-msgid "Unified Canadian Aboriginal Syllabics Extended"
-msgstr ""
-
-#
-#: unicoderange.c:100
-msgid "Khmer Symbols"
-msgstr "高棉文符号"
-
-#: unicoderange.c:102
-msgid "Tai Tham"
-msgstr ""
-
-#: unicoderange.c:104
-msgid "Sundanese"
-msgstr ""
-
-#: unicoderange.c:105
-msgid "Batak"
-msgstr ""
-
-#
-#: unicoderange.c:108
-msgid "Phonetic Extensions"
-msgstr "音标扩展"
-
-#
-#: unicoderange.c:109
-msgid "Phonetic Extensions Supplement"
-msgstr "音标扩展增补"
-
-#
-#: unicoderange.c:110
-msgid "Combining Diacritical Marks Supplement"
-msgstr "组合变音标记补充"
-
-#
-#: unicoderange.c:113
-msgid "Symbols"
-msgstr "符号"
-
-#
-#: unicoderange.c:115
-msgid "Super and Sub scripts"
-msgstr "上下标"
-
-#: unicoderange.c:117
-msgid "Combining Marks for Symbols"
-msgstr ""
-
-#
-#: unicoderange.c:119
-msgid "Number Forms"
-msgstr "数字形式"
-
-#
-#: unicoderange.c:120
-msgid "Arrows"
-msgstr "箭头"
-
-#
-#: unicoderange.c:121
-msgid "Mathematical Operators"
-msgstr "数学运算符号"
-
-#
-#: unicoderange.c:122
-msgid "Miscellaneous Technical Symbols"
-msgstr "其他科技符号"
-
-#: unicoderange.c:123
-msgid "Technical Symbols Misc."
-msgstr ""
-
-#
-#: unicoderange.c:125
-msgid "OCR"
-msgstr "OCR"
-
-#: unicoderange.c:131
-msgid "Symbols Misc."
-msgstr ""
-
-#
-#: unicoderange.c:133
-msgid "Zapf Dingbats"
-msgstr "花体字"
-
-#
-#: unicoderange.c:134
-msgid "Miscellaneous Math Symbols-A"
-msgstr "其他数学符号A"
-
-#: unicoderange.c:135
-msgid "Math Misc. Symbols-A"
-msgstr ""
-
-#
-#: unicoderange.c:136
-msgid "Supplemental Arrows-A"
-msgstr "补充箭头 A"
-
-#: unicoderange.c:137
-msgid "Arrows Supplement-A"
-msgstr ""
-
-#
-#: unicoderange.c:139
-msgid "Supplemental Arrows-B"
-msgstr "补充箭头 B"
-
-#: unicoderange.c:140
-msgid "Arrows Supplement-B"
-msgstr ""
-
-#
-#: unicoderange.c:141
-msgid "Miscellaneous Math Symbols-B"
-msgstr "其他数学符号B"
-
-#: unicoderange.c:142
-msgid "Math Misc. Symbols-B"
-msgstr ""
-
-#
-#: unicoderange.c:143
-msgid "Supplemental Math Operators"
-msgstr "补充的数学运算符"
-
-#: unicoderange.c:144
-msgid "Math Operators Supplement"
-msgstr ""
-
-#
-#: unicoderange.c:145
-msgid "Supplemental Symbols and Arrows"
-msgstr "其它符号和箭头"
-
-#: unicoderange.c:146
-msgid "Symbols and Arrows Supplement"
-msgstr ""
-
-#
-#: unicoderange.c:147
-msgid "Alphabetic Extended"
-msgstr "字母扩展"
-
-#
-#: unicoderange.c:149
-msgid "Latin Extended-C"
-msgstr "拉丁文扩展 C"
-
-#
-#: unicoderange.c:151
-msgid "Georgian Supplement"
-msgstr "格鲁吉亚文补充"
-
-#
-#: unicoderange.c:153
-msgid "Ethiopic Extended"
-msgstr "埃塞额比亚文扩展"
-
-#: unicoderange.c:154
-msgid "Cyrillic Extended-A"
-msgstr ""
-
-#
-#: unicoderange.c:155
-msgid "Supplemental Punctuation"
-msgstr "补充标点符号"
-
-#: unicoderange.c:156
-msgid "Punctuation Supplement"
-msgstr ""
-
-#: unicoderange.c:157
-msgid "CJK Radicals Supplement"
-msgstr ""
-
-#
-#: unicoderange.c:158
-msgid "Kanqxi Radicals"
-msgstr "康熙字典部首"
-
-#: unicoderange.c:159
-msgid "Ideographic Description Characters"
-msgstr ""
-
-#
-#: unicoderange.c:160
-msgid "CJK Phonetics and Symbols"
-msgstr "中日韩注音符号"
-
-#
-#: unicoderange.c:166
-msgid "Kanbun"
-msgstr "日本汉字"
-
-#
-#: unicoderange.c:167
-msgid "Bopomofo Extended"
-msgstr "注音字母扩展"
-
-#
-#: unicoderange.c:168
-msgid "CJK Strokes"
-msgstr "中日韩笔画"
-
-#
-#: unicoderange.c:169
-msgid "Katakana Phonetic Extensions"
-msgstr "片假名语音扩展"
-
-#
-#: unicoderange.c:171
-msgid "CJK Enclosed Letters and Months"
-msgstr "带圈的中日韩字符和月时"
-
-#
-#: unicoderange.c:173
-msgid "CJK Unified Ideographs Extension A"
-msgstr "中日韩统一表意符号扩展A"
-
-#: unicoderange.c:176
-msgid "Yi Syllables"
-msgstr ""
-
-#
-#: unicoderange.c:177
-msgid "Yi"
-msgstr "彝语"
-
-#
-#: unicoderange.c:178
-msgid "Yi Radicals"
-msgstr "彝文部首"
-
-#: unicoderange.c:179
-msgid "Lisu"
-msgstr ""
-
-#: unicoderange.c:181
-msgid "Cyrillic Extended-B"
-msgstr ""
-
-#: unicoderange.c:182
-msgid "Bamum"
-msgstr ""
-
-#
-#: unicoderange.c:183
-msgid "Modifier Tone Letters"
-msgstr "修饰符语调字母"
-
-#
-#: unicoderange.c:184
-msgid "Latin Extended-D"
-msgstr "拉丁文扩展 D"
-
-#: unicoderange.c:186
-msgid "Common Indic Number Forms"
-msgstr ""
-
-#: unicoderange.c:189
-msgid "Devanagari Extended"
-msgstr ""
-
-#: unicoderange.c:192
-msgid "Hangul Jamo Extended-A"
-msgstr ""
-
-#: unicoderange.c:193
-msgid "Javanese"
-msgstr ""
-
-#: unicoderange.c:195
-msgid "Myanmar Extended-A"
-msgstr ""
-
-#: unicoderange.c:196
-msgid "Tai Viet"
-msgstr ""
-
-#: unicoderange.c:197
-msgid "Ethiopic Extended-A"
-msgstr ""
-
-#: unicoderange.c:198
-msgid "Meetei Mayek"
-msgstr ""
-
-#
-#: unicoderange.c:200
-msgid "High Surrogate"
-msgstr "高半超大字符集"
-
-#
-#: unicoderange.c:201
-msgid "Surrogate High"
-msgstr "高半超大字符集"
-
-#
-#: unicoderange.c:202
-msgid "Surrogate High, Non Private Use"
-msgstr "非私用高半超大字符集"
-
-#
-#: unicoderange.c:203
-msgid "Surrogate High, Private Use"
-msgstr "私用高半超大字符集"
-
-#: unicoderange.c:204
-msgid "Low Surrogates"
-msgstr ""
-
-#
-#: unicoderange.c:206
-msgid "Private Use"
-msgstr "私人应用"
-
-#
-#: unicoderange.c:209
-msgid "Corporate Use"
-msgstr "企业应用"
-
-#
-#: unicoderange.c:210
-msgid "MicroSoft Symbol Area"
-msgstr "微软符号区"
-
-#
-#: unicoderange.c:213
-msgid "Latin Ligatures"
-msgstr "拉丁组合字"
-
-#
-#: unicoderange.c:214
-msgid "Armenian Ligatures"
-msgstr "Armenian 组合字"
-
-#
-#: unicoderange.c:215
-msgid "Hebrew Ligatures/Pointed Letters"
-msgstr "Hebrew Ligatures/Pointed Letters"
-
-#
-#: unicoderange.c:216
-msgid "Arabic Presentation Forms A"
-msgstr "阿拉伯文表现形式 A"
-
-#: unicoderange.c:218
-msgid "Vertical Forms"
-msgstr ""
-
-#
-#: unicoderange.c:222
-msgid "Arabic Presentation Forms B"
-msgstr "阿拉伯文表现形式 B"
-
-#
-#: unicoderange.c:223
-msgid "Byte Order Mark"
-msgstr "字节顺序标记"
-
-#
-#: unicoderange.c:224
-msgid "Half and Full Width Forms"
-msgstr "半宽全宽形式"
-
-#
-#: unicoderange.c:225
-msgid "Latin Full Width Forms"
-msgstr "拉丁全宽形式"
-
-#
-#: unicoderange.c:226
-msgid "KataKana Half Width Forms"
-msgstr "KataKana Half Width Forms"
-
-#
-#: unicoderange.c:227
-msgid "Hangul Jamo Half Width Forms"
-msgstr "韩语谚文半宽形式"
-
-#
-#: unicoderange.c:229
-msgid "Not a Unicode Character"
-msgstr "非统一码字符"
-
-#
-#: unicoderange.c:230
-msgid "Signature Mark"
-msgstr "签名标记"
-
-#
-#: unicoderange.c:232
-msgid "Unicode Supplementary Multilingual Plane"
-msgstr "统一码补充多语言平面"
-
-#
-#: unicoderange.c:233
-msgid "Supplementary Multilingual Plane"
-msgstr "补充多语言字符面"
-
-#
-#: unicoderange.c:234
-msgid "Aegean scripts"
-msgstr "Aegean scripts"
-
-#
-#: unicoderange.c:235
-msgid "Linear B Syllabary"
-msgstr "线性 B 字音表"
-
-#
-#: unicoderange.c:236
-msgid "Linear B Ideograms"
-msgstr "线性 B 表意符号"
-
-#
-#: unicoderange.c:237
-msgid "Aegean numbers"
-msgstr "Aegean numbers"
-
-#
-#: unicoderange.c:243
-msgid "Alphabetic and syllabic LTR scripts"
-msgstr "字母与音节自左至右书写"
-
-#
-#: unicoderange.c:251
-msgid "Alphabetic and syllabic RTL scripts"
-msgstr "字母与音节自右至左书写"
-
-#: unicoderange.c:253
-msgid "Imperial Aramaic"
-msgstr ""
-
-#
-#: unicoderange.c:256
-msgid "Kharosthi"
-msgstr "Kharosthi"
-
-#: unicoderange.c:257
-msgid "Old South Arabian"
-msgstr ""
-
-#: unicoderange.c:258
-msgid "Avestan"
-msgstr ""
-
-#: unicoderange.c:259
-msgid "Inscriptional Parthian"
-msgstr ""
-
-#: unicoderange.c:260
-msgid "Inscriptional Pahlavi"
-msgstr ""
-
-#: unicoderange.c:261
-msgid "Old Turkic"
-msgstr ""
-
-#: unicoderange.c:262
-msgid "Rumi Numeral Symbols"
-msgstr ""
-
-#: unicoderange.c:264
-msgid "Brahmi"
-msgstr ""
-
-#: unicoderange.c:265
-msgid "Kaithi"
-msgstr ""
-
-#
-#: unicoderange.c:266
-msgid "African and other syllabic scripts"
-msgstr "非洲等其他音节文字"
-
-#: unicoderange.c:267
-msgid "Cuneiform and other Near Eastern Scripts"
-msgstr ""
-
-#: unicoderange.c:268
-msgid "Cuneiform"
-msgstr ""
-
-#
-#: unicoderange.c:269
-msgid "Sumero-Akkadian Cuneiform"
-msgstr "Sumero-Akkadian Cuneiform"
-
-#
-#: unicoderange.c:270
-msgid "Cuneiform Numbers"
-msgstr "Cuneiform Numbers"
-
-#: unicoderange.c:272
-msgid "Egyptian hieroglyphs"
-msgstr ""
-
-#: unicoderange.c:273
-msgid "North American ideographs and pictograms"
-msgstr ""
-
-#: unicoderange.c:274
-msgid "Egyptian and Mayan hieroglyphs"
-msgstr ""
-
-#: unicoderange.c:275
-msgid "Bamum Supplement"
-msgstr ""
-
-#
-#: unicoderange.c:276
-msgid "Sumerian pictograms"
-msgstr "Sumerian pictograms"
-
-#
-#: unicoderange.c:277
-msgid "Large Asian Scripts"
-msgstr "泛亚洲字符"
-
-#: unicoderange.c:278
-msgid "Kana Supplement"
-msgstr ""
-
-#
-#: unicoderange.c:279
-msgid "Notational systems"
-msgstr "符号系统"
-
-#
-#: unicoderange.c:280
-msgid "Byzantine Musical Symbols"
-msgstr "拜占庭乐符"
-
-#
-#: unicoderange.c:281
-msgid "Musical Symbols"
-msgstr "音乐符号"
-
-#
-#: unicoderange.c:282
-msgid "Ancient Greek Musical Notation"
-msgstr "古希腊音符"
-
-#
-#: unicoderange.c:284
-msgid "Chinese counting rod numerals"
-msgstr "中文数目字"
-
-#: unicoderange.c:286
-msgid "Mahjong Tiles"
-msgstr ""
-
-#: unicoderange.c:287
-msgid "Domino Tiles"
-msgstr ""
-
-#: unicoderange.c:288
-msgid "Playing Cards"
-msgstr ""
-
-#: unicoderange.c:289
-msgid "Enclosed Alphanumeric Supplement"
-msgstr ""
-
-#: unicoderange.c:290
-msgid "Enclosed Ideographic Supplement"
-msgstr ""
-
-#: unicoderange.c:291
-msgid "Miscellaneous Symbols And Pictographs"
-msgstr ""
-
-#: unicoderange.c:292
-msgid "Emoticons"
-msgstr ""
-
-#: unicoderange.c:293
-msgid "Transport And Map Symbols"
-msgstr ""
-
-#: unicoderange.c:294
-msgid "Alchemical Symbols"
-msgstr ""
-
-#
-#: unicoderange.c:296
-msgid "Unicode Supplementary Ideographic Plane"
-msgstr "统一码补充表意字符"
-
-#
-#: unicoderange.c:297
-msgid "Supplementary Ideographic Plane"
-msgstr "补充表意字符面"
-
-#
-#: unicoderange.c:298
-msgid "CJK Unified Ideographs Extension B"
-msgstr "中日韩统一表意字符扩展B"
-
-#: unicoderange.c:299
-msgid "CJK Unified Ideographs Extension C"
-msgstr ""
-
-#: unicoderange.c:300
-msgid "CJK Unified Ideographs Extension D"
-msgstr ""
-
-#
-#: unicoderange.c:301
-msgid "CJK Compatibility Ideographs Supplement"
-msgstr "中日韩兼容表意字符补充"
-
-#
-#: unicoderange.c:303
-msgid "Unicode Supplementary Special-purpose Plane"
-msgstr "统一码增补特别用途平面"
-
-#
-#: unicoderange.c:304
-msgid "Supplementary Special-purpose Plane"
-msgstr "增补特用平面"
-
-#
-#: unicoderange.c:305
-msgid "Tag characters"
-msgstr "标签字符"
-
-#: unicoderange.c:306
-msgid "Variation Selectors B"
-msgstr ""
-
-#
-#: unicoderange.c:308
-msgid "Supplementary Private Use Area-A"
-msgstr "补充私用空间 A"
-
-#
-#: unicoderange.c:309
-msgid "Supplementary Private Use Area-B"
-msgstr "补充私用空间 B"
-
-#
-#: unicoderange.c:314
-msgid "Non-Unicode Glyphs"
-msgstr "非统一码字形"
-
-#
-#: unicoderange.c:315
-msgid "Unassigned Code Points"
-msgstr "未定的编码点"
-
-#: winfonts.c:387
-msgid "Bad magic number"
-msgstr ""
-
-#: winfonts.c:387
-msgid "This does not appear to be a Windows FNT for FON file"
-msgstr ""
-
-#: winfonts.c:509
-#, c-format
-msgid ""
-"At pixelsize %d the character %s either starts before the origin or extends "
-"beyond the advance width.\n"
-msgstr ""
-
-#
-#: winfonts.c:599
-msgid "Internal error in creating FNT. File offset wrong\n"
-msgstr "创建FNT时发生内部错误。 文件偏移错误\n"
-
-#
-#: winfonts.c:627
-msgid "Internal error in creating FNT. File offset wrong in bitmap data\n"
-msgstr "创建FNT时发生内部错误。 文件偏移错误于位图数据\n"
-
-#
-#: winfonts.c:938
-#, c-format
-msgid "Could not open output file: %s"
-msgstr "未能打开输出文件: %s"
-
-#: woff.c:38 woff.c:44 woff.c:50 woff.c:286 woff.c:436
-msgid "WOFF not supported"
-msgstr ""
-
-#: woff.c:38 woff.c:44 woff.c:50
-msgid ""
-"This version of fontforge cannot handle WOFF files. You need to recompile it "
-"with libpng and zlib"
-msgstr ""
-
-#: woff.c:187
-msgid "Decompressed length did not match expected length for table"
-msgstr ""
-
-#: woff.c:286 woff.c:436
-msgid "Could not find the zlib library which is needed to understand WOFF"
-msgstr ""
-
-#: woff.c:294
-msgid "Bad signature in WOFF"
-msgstr ""
-
-#: woff.c:301
-msgid ""
-"File length as specified in the WOFF header does not match the actual file "
-"length."
-msgstr ""
-
-#: woff.c:307
-msgid "Bad WOFF header, a field which must be 0 is not."
-msgstr ""
-
-#: woff.c:322
-msgid "Could not open temporary file."
-msgstr ""
-
-#: woff.c:347
-#, c-format
-msgid "Invalid compressed table length for '%c%c%c%c'."
-msgstr ""
-
-#: woff.c:350
-#, c-format
-msgid "Table length stretches beyond end of file for '%c%c%c%c'."
-msgstr ""
-
-#: woff.c:371
-#, c-format
-msgid "Problem decompressing '%c%c%c%c' table."
-msgstr ""
-
-#
-#: ../gdraw/gaskdlg.c:1493
-msgid "_None"
-msgstr "无"
-
-#: ../gdraw/gbuttons.c:55
-msgid "Label"
-msgstr ""
-
-#: ../gdraw/gbuttons.c:56
-msgid "Text Labels"
-msgstr ""
-
-#: ../gdraw/gbuttons.c:73
-msgid "Shift On Press"
-msgstr ""
-
-#: ../gdraw/gbuttons.c:73 ../gdraw/gmatrixedit.c:48
-msgid "Background color of column headers at the top of a matrix edit"
-msgstr ""
-
-#: ../gdraw/gbuttons.c:82
-msgid "Button"
-msgstr ""
-
-#: ../gdraw/gbuttons.c:83
-msgid "Buttons"
-msgstr ""
-
-#: ../gdraw/gbuttons.c:108
-msgid "Default Button"
-msgstr ""
-
-#: ../gdraw/gbuttons.c:109
-msgid "Default Buttons"
-msgstr ""
-
-#: ../gdraw/gbuttons.c:132
-msgid "Cancel Button"
-msgstr ""
-
-#: ../gdraw/gbuttons.c:133
-msgid "Cancel Buttons"
-msgstr ""
-
-#: ../gdraw/gbuttons.c:156 ../gdraw/gbuttons.c:157
-msgid "Color Button"
-msgstr ""
-
-#: ../gdraw/gbuttons.c:181 ../gdraw/gbuttons.c:182
-msgid "Drop List Button"
-msgstr ""
-
-#: ../gdraw/gcolor.c:179
-msgid "Hue:"
-msgstr ""
-
-#: ../gdraw/gcolor.c:179
-msgid "Saturation:"
-msgstr ""
-
-#: ../gdraw/gcolor.c:179
-msgid "Value:"
-msgstr ""
-
-#: ../gdraw/gcolor.c:179
-msgid "Red:"
-msgstr ""
-
-#: ../gdraw/gcolor.c:179
-msgid "Green:"
-msgstr ""
-
-#: ../gdraw/gcolor.c:179
-msgid "Blue:"
-msgstr ""
-
-#: ../gdraw/gcolor.c:197
-msgid "Value out of bounds"
-msgstr ""
-
-#: ../gdraw/gcolor.c:197
-msgid "Saturation and Value, and the three colors must be between 0 and 1"
-msgstr ""
-
-#: ../gdraw/gdrawable.c:44
-msgid "Drawing Area"
-msgstr ""
-
-#: ../gdraw/gdrawable.c:45
-msgid "A canvas (sub-window) wrapped up in a gadget, for drawing"
-msgstr ""
-
-#
-#: ../gdraw/gfilechooser.c:827
-msgid "Show Hidden Files"
-msgstr "显示隐藏文件"
-
-#: ../gdraw/gfilechooser.c:828
-msgid "Directories Amid Files"
-msgstr ""
-
-#: ../gdraw/gfilechooser.c:829
-msgid "Directories First"
-msgstr ""
-
-#: ../gdraw/gfilechooser.c:830
-msgid "Directories Separate"
-msgstr ""
-
-#
-#: ../gdraw/gfilechooser.c:831
-msgid "Refresh File List"
-msgstr "刷新文件列表"
-
-#: ../gdraw/gfilechooser.c:920
-msgid "Remove bookmarks"
-msgstr "移除书签"
-
-#: ../gdraw/gfilechooser.c:921
-msgid "Remove selected bookmarks"
-msgstr ""
-
-#: ../gdraw/gfilechooser.c:973
-msgid "Directory|Back"
-msgstr ""
-
-#: ../gdraw/gfilechooser.c:974
-msgid "Directory|Forward"
-msgstr ""
-
-#: ../gdraw/gfilechooser.c:976
-msgid "Bookmark Current Dir"
-msgstr ""
-
-#: ../gdraw/gfilechooser.c:977
-msgid "Remove Bookmark..."
-msgstr ""
-
-#: ../gdraw/gfilechooser.c:1480
-msgid "Home Folder"
-msgstr ""
-
-#: ../gdraw/gfilechooser.c:1489
-msgid "Bookmarks"
-msgstr "书签"
-
-#: ../gdraw/gfilechooser.c:1504
-msgid "Parent Folder"
-msgstr ""
-
-#: ../gdraw/gfilechooser.c:1513
-msgid "Configure"
-msgstr "配置"
-
-#: ../gdraw/ggadgets.c:67
-msgid "Text Image Skip"
-msgstr ""
-
-#: ../gdraw/ggadgets.c:67
-msgid ""
-"Space (in points) left between images and text in labels, buttons, menu "
-"items, etc. which have both"
-msgstr ""
-
-#: ../gdraw/ggadgets.c:68
-msgid "Image Path"
-msgstr ""
-
-#: ../gdraw/ggadgets.c:68
-msgid "List of directories to search for images, separated by colons"
-msgstr ""
-
-#: ../gdraw/ggadgets.c:77
-msgid "GGadget"
-msgstr ""
-
-#: ../gdraw/ggadgets.c:78
-msgid ""
-"This is an \"abstract\" gadget. It will never appear on the screen\n"
-"but it is the root of gadget tree from which all others inherit"
-msgstr ""
-
-#: ../gdraw/ggadgets.c:84 ../gdraw/gprogress.c:189
-msgid "Color|Foreground"
-msgstr ""
-
-#: ../gdraw/ggadgets.c:84
-msgid "Text color for popup windows"
-msgstr ""
-
-#: ../gdraw/ggadgets.c:85
-msgid "Background color for popup windows"
-msgstr ""
-
-#: ../gdraw/ggadgets.c:86
-msgid "Delay"
-msgstr ""
-
-#: ../gdraw/ggadgets.c:86
-msgid "Delay (in milliseconds) before popup windows appear"
-msgstr ""
-
-#: ../gdraw/ggadgets.c:87
-msgid "Life Time"
-msgstr ""
-
-#: ../gdraw/ggadgets.c:87
-msgid "Time (in milliseconds) that popup windows remain visible"
-msgstr ""
-
-#: ../gdraw/ggadgets.c:96
-msgid "Popup"
-msgstr ""
-
-#: ../gdraw/ggadgets.c:97 ../gdraw/gprogress.c:200
-msgid "Popup windows"
-msgstr ""
-
-#: ../gdraw/ggadgets.c:107
-msgid "Image used for enabled listmarks (overrides the box)"
-msgstr ""
-
-#: ../gdraw/ggadgets.c:108 ../gdraw/gradio.c:74 ../gdraw/gradio.c:92
-#: ../gdraw/gradio.c:135 ../gdraw/gradio.c:153
-msgid "Disabled Image"
-msgstr ""
-
-#: ../gdraw/ggadgets.c:108
-msgid "Image used for disabled listmarks (overrides the box)"
-msgstr ""
-
-#: ../gdraw/ggadgets.c:109
-msgid "Size of the list mark"
-msgstr ""
-
-#: ../gdraw/ggadgets.c:130
-msgid "List Mark"
-msgstr ""
-
-#: ../gdraw/ggadgets.c:131
-msgid ""
-"This is the mark that differentiates ComboBoxes and ListButtons\n"
-"from TextFields and normal Buttons."
-msgstr ""
-
-#: ../gdraw/ggroupbox.c:46
-msgid "Line"
-msgstr ""
-
-#: ../gdraw/ggroupbox.c:47
-msgid "A separator line drawn across a dialog or in a menu"
-msgstr ""
-
-#: ../gdraw/ghvbox.c:48
-msgid "HV Group Box"
-msgstr ""
-
-#: ../gdraw/ghvbox.c:49
-msgid "A box drawn around other gadgets"
-msgstr ""
-
-#: ../gdraw/glist.c:972 ../gdraw/glist.c:973
-msgid "List"
-msgstr ""
-
-#: ../gdraw/gmatrixedit.c:48
-msgid "Title Background"
-msgstr ""
-
-#: ../gdraw/gmatrixedit.c:49
-msgid "Title Text Color"
-msgstr ""
-
-#: ../gdraw/gmatrixedit.c:49
-msgid "Text color of column headers at the top of a matrix edit"
-msgstr ""
-
-#: ../gdraw/gmatrixedit.c:50
-msgid "Title Divider Color"
-msgstr ""
-
-#: ../gdraw/gmatrixedit.c:50
-msgid "Color of column dividers in the title section of a matrix edit"
-msgstr ""
-
-#: ../gdraw/gmatrixedit.c:51
-msgid "Rule Color"
-msgstr ""
-
-#: ../gdraw/gmatrixedit.c:51
-msgid "Color of column dividers in the main section of a matrix edit"
-msgstr ""
-
-#: ../gdraw/gmatrixedit.c:52
-msgid "Frozen Color"
-msgstr ""
-
-#: ../gdraw/gmatrixedit.c:52
-msgid ""
-"Color of frozen (unchangeable) entries in the main section of a matrix edit"
-msgstr ""
-
-#: ../gdraw/gmatrixedit.c:53
-msgid "Active Color"
-msgstr ""
-
-#: ../gdraw/gmatrixedit.c:53
-msgid "Color of the active entry in the main section of a matrix edit"
-msgstr ""
-
-#: ../gdraw/gmatrixedit.c:54
-msgid "Active Background"
-msgstr ""
-
-#: ../gdraw/gmatrixedit.c:54
-msgid ""
-"Background color of the active entry in the main section of a matrix edit"
-msgstr ""
-
-#: ../gdraw/gmatrixedit.c:55
-msgid "Title Font"
-msgstr ""
-
-#: ../gdraw/gmatrixedit.c:55
-msgid "Font used to draw titles of a matrix edit"
-msgstr ""
-
-#: ../gdraw/gmatrixedit.c:64
-msgid "Matrix Edit"
-msgstr ""
-
-#: ../gdraw/gmatrixedit.c:65 ../gdraw/gmatrixedit.c:79
-msgid "Matrix Edit (sort of like a spreadsheet)"
-msgstr ""
-
-#: ../gdraw/gmatrixedit.c:78
-msgid "Matrix Edit Continued"
-msgstr ""
-
-#
-#: ../gdraw/gmatrixedit.c:1625
-msgid "Row|New"
-msgstr "新建"
-
-#: ../gdraw/gmenu.c:68 ../gdraw/gmenu.c:69
-msgid "Menu Bar"
-msgstr ""
-
-#: ../gdraw/gmenu.c:76
-msgid "MacIcons"
-msgstr ""
-
-#: ../gdraw/gmenu.c:76
-msgid ""
-"Whether to use mac-like icons to indicate modifiers (for instance ^ for "
-"Control)\n"
-"or to use an abbreviation (for instance \"Cnt-\")"
-msgstr ""
-
-#: ../gdraw/gprogress.c:189
-msgid "Text color for progress windows"
-msgstr ""
-
-#: ../gdraw/gprogress.c:190
-msgid "Color|FillColor"
-msgstr ""
-
-#: ../gdraw/gprogress.c:190
-msgid "Color used to draw the progress bar"
-msgstr ""
-
-#: ../gdraw/gprogress.c:191
-msgid "Background color for progress windows"
-msgstr ""
-
-#: ../gdraw/gprogress.c:199
-msgid "Progress"
-msgstr ""
-
-#: ../gdraw/gradio.c:65 ../gdraw/gradio.c:66
-msgid "Radio Button"
-msgstr ""
-
-#: ../gdraw/gradio.c:73 ../gdraw/gradio.c:134
-msgid "Image used instead of the Radio On Mark"
-msgstr ""
-
-#: ../gdraw/gradio.c:74 ../gdraw/gradio.c:135
-msgid "Image used instead of the Radio On Mark (when the radio is disabled)"
-msgstr ""
-
-#: ../gdraw/gradio.c:83
-msgid "Radio On Mark"
-msgstr ""
-
-#: ../gdraw/gradio.c:84
-msgid "The mark showing a radio button is on (depressed, selected)"
-msgstr ""
-
-#: ../gdraw/gradio.c:91
-msgid "Image used instead of the Radio Off Mark"
-msgstr ""
-
-#: ../gdraw/gradio.c:92
-msgid "Image used instead of the Radio Off Mark (when the radio is disabled)"
-msgstr ""
-
-#: ../gdraw/gradio.c:101
-msgid "Radio Off Mark"
-msgstr ""
-
-#: ../gdraw/gradio.c:102
-msgid "The mark showing a radio button is off (up, not selected)"
-msgstr ""
-
-#: ../gdraw/gradio.c:126 ../gdraw/gradio.c:127
-msgid "Check Box"
-msgstr ""
-
-#: ../gdraw/gradio.c:144
-msgid "Check Box On Mark"
-msgstr ""
-
-#: ../gdraw/gradio.c:145
-msgid "The mark showing a checkbox is on (depressed, selected)"
-msgstr ""
-
-#: ../gdraw/gradio.c:152
-msgid "Image used instead of the Check Box Off Mark"
-msgstr ""
-
-#: ../gdraw/gradio.c:153
-msgid ""
-"Image used instead of the Check Box Off Mark (when the radio is disabled)"
-msgstr ""
-
-#: ../gdraw/gradio.c:162
-msgid "Check Box Off Mark"
-msgstr ""
-
-#: ../gdraw/gradio.c:163
-msgid "The mark showing a checkbox is off (up, not selected)"
-msgstr ""
-
-#: ../gdraw/gresedit.c:487 ../gdraw/gresedit.c:508
-msgid "Bad font"
-msgstr ""
-
-#: ../gdraw/gresedit.c:487 ../gdraw/gresedit.c:508
-msgid "Bad font specification"
-msgstr ""
-
-#: ../gdraw/gresedit.c:551
-msgid "Could not open image"
-msgstr ""
-
-#: ../gdraw/gresedit.c:551
-#, c-format
-msgid "Could not open %s"
-msgstr ""
-
-#: ../gdraw/gresedit.c:689
-msgid "Store this filename in preferences"
-msgstr ""
-
-#: ../gdraw/gresedit.c:699
-msgid "Save Resource file as..."
-msgstr ""
-
-#: ../gdraw/gresedit.c:704
-msgid "Open failed"
-msgstr ""
-
-#: ../gdraw/gresedit.c:704
-#, c-format
-msgid "Failed to open %s for output"
-msgstr ""
-
-#: ../gdraw/gresedit.c:752 ../gdraw/gresedit.c:783 ../gdraw/gresedit.c:795
-#: ../gdraw/gresedit.c:901 ../gdraw/gresedit.c:915
-#, c-format
-msgid "Bad numeric value for %s.%s"
-msgstr ""
-
-#: ../gdraw/gresedit.c:849
-msgid "Write failed"
-msgstr ""
-
-#: ../gdraw/gresedit.c:849
-msgid "An error occurred when writing the resource file"
-msgstr ""
-
-#: ../gdraw/gresedit.c:868
-msgid "Border Width"
-msgstr ""
-
-#: ../gdraw/gresedit.c:868
-msgid "Padding"
-msgstr ""
-
-#: ../gdraw/gresedit.c:868
-msgid "Radius"
-msgstr ""
-
-#: ../gdraw/gresedit.c:875
-#, c-format
-msgid "Bad numeric value for %s.%s must be between 0 and 255"
-msgstr ""
-
-#: ../gdraw/gresedit.c:984
-msgid "X Resource Editor"
-msgstr ""
-
-#: ../gdraw/gresedit.c:1049
-msgid "Inherits from"
-msgstr ""
-
-#: ../gdraw/gresedit.c:1072
-msgid "Does not inherit from anything"
-msgstr ""
-
-#: ../gdraw/gresedit.c:1083 ../gdraw/gresedit.c:1111 ../gdraw/gresedit.c:1142
-#: ../gdraw/gresedit.c:1170 ../gdraw/gresedit.c:1201 ../gdraw/gresedit.c:1229
-#: ../gdraw/gresedit.c:1260
-msgid "Inherit"
-msgstr ""
-
-#: ../gdraw/gresedit.c:1087 ../gdraw/gresedit.c:1115 ../gdraw/gresedit.c:1146
-#: ../gdraw/gresedit.c:1174 ../gdraw/gresedit.c:1205 ../gdraw/gresedit.c:1233
-#: ../gdraw/gresedit.c:1264 ../gdraw/gresedit.c:1305 ../gdraw/gresedit.c:1340
-#: ../gdraw/gresedit.c:1377 ../gdraw/gresedit.c:1412 ../gdraw/gresedit.c:1449
-#: ../gdraw/gresedit.c:1484 ../gdraw/gresedit.c:1521 ../gdraw/gresedit.c:1556
-#: ../gdraw/gresedit.c:1593 ../gdraw/gresedit.c:1628 ../gdraw/gresedit.c:1665
-#: ../gdraw/gresedit.c:1706 ../gdraw/gresedit.c:1742 ../gdraw/gresedit.c:1780
-#: ../gdraw/gresedit.c:1819 ../gdraw/gresedit.c:1860 ../gdraw/gresedit.c:1914
-msgid "Inherits for same field in parent"
-msgstr ""
-
-#: ../gdraw/gresedit.c:1093
-msgid "Outline Inner Border"
-msgstr ""
-
-#: ../gdraw/gresedit.c:1121
-msgid "Outline Outer Border"
-msgstr ""
-
-#: ../gdraw/gresedit.c:1152
-msgid "Show Active Border"
-msgstr ""
-
-#: ../gdraw/gresedit.c:1180
-msgid "Outer Shadow"
-msgstr ""
-
-#: ../gdraw/gresedit.c:1211
-msgid "Depressed Background"
-msgstr ""
-
-#: ../gdraw/gresedit.c:1239
-msgid "Outline Default Button"
-msgstr ""
-
-#: ../gdraw/gresedit.c:1270
-msgid "Background Gradient"
-msgstr ""
-
-#. GT: "I." is an abreviation for "Inherits"
-#: ../gdraw/gresedit.c:1301 ../gdraw/gresedit.c:1336 ../gdraw/gresedit.c:1373
-#: ../gdraw/gresedit.c:1408 ../gdraw/gresedit.c:1445 ../gdraw/gresedit.c:1480
-#: ../gdraw/gresedit.c:1517 ../gdraw/gresedit.c:1552 ../gdraw/gresedit.c:1589
-#: ../gdraw/gresedit.c:1624 ../gdraw/gresedit.c:1661 ../gdraw/gresedit.c:1702
-#: ../gdraw/gresedit.c:1738 ../gdraw/gresedit.c:1776 ../gdraw/gresedit.c:1815
-#: ../gdraw/gresedit.c:1856 ../gdraw/gresedit.c:1910
-msgid "I."
-msgstr ""
-
-#: ../gdraw/gresedit.c:1311
-msgid "Normal Text Color:"
-msgstr ""
-
-#: ../gdraw/gresedit.c:1346
-msgid "Disabled Text Color:"
-msgstr ""
-
-#: ../gdraw/gresedit.c:1383
-msgid "Normal Background:"
-msgstr ""
-
-#: ../gdraw/gresedit.c:1418
-msgid "Disabled Background:"
-msgstr ""
-
-#: ../gdraw/gresedit.c:1455
-msgid "Depressed Background:"
-msgstr ""
-
-#: ../gdraw/gresedit.c:1490
-msgid "Background Gradient:"
-msgstr ""
-
-#: ../gdraw/gresedit.c:1527
-msgid "Brightest Border:"
-msgstr ""
-
-#: ../gdraw/gresedit.c:1562
-msgid "Brighter Border:"
-msgstr ""
-
-#: ../gdraw/gresedit.c:1599
-msgid "Darker Border:"
-msgstr ""
-
-#: ../gdraw/gresedit.c:1634
-msgid "Darkest Border:"
-msgstr ""
-
-#: ../gdraw/gresedit.c:1671
-msgid "Active Border:"
-msgstr ""
-
-#: ../gdraw/gresedit.c:1712
-msgid "Border Type:"
-msgstr ""
-
-#: ../gdraw/gresedit.c:1748
-msgid "Border Shape:"
-msgstr ""
-
-#: ../gdraw/gresedit.c:1786
-msgid "Border Width:"
-msgstr ""
-
-#: ../gdraw/gresedit.c:1825
-msgid "Padding:"
-msgstr ""
-
-#: ../gdraw/gresedit.c:1866
-msgid "Radius:"
-msgstr ""
-
-#: ../gdraw/gresedit.c:1920
-msgid "Font:"
-msgstr ""
-
-#: ../gdraw/gresedit.c:1953
-msgid "See also:"
-msgstr ""
-
-#: ../gdraw/gresedit.c:2350 ../gdraw/gresedit.c:2356
-msgid "Default Background"
-msgstr ""
-
-#: ../gdraw/gresedit.c:2350 ../gdraw/gresedit.c:2356
-msgid "Default background color for windows"
-msgstr ""
-
-#: ../gdraw/gresedit.c:2351 ../gdraw/gresedit.c:2357
-msgid "Default Foreground"
-msgstr ""
-
-#: ../gdraw/gresedit.c:2351 ../gdraw/gresedit.c:2357
-msgid "Default foreground color for windows"
-msgstr ""
-
-#: ../gdraw/gresedit.c:2352
-msgid "Screen Width in Centimeters"
-msgstr ""
-
-#: ../gdraw/gresedit.c:2352
-msgid ""
-"Physical screen width, measured in centimeters\n"
-"For this to take effect you must save the resource data (press the [Save] "
-"button)\n"
-"and restart fontforge"
-msgstr ""
-
-#: ../gdraw/gresedit.c:2358
-msgid "Screen Width in Inches"
-msgstr ""
-
-#: ../gdraw/gresedit.c:2358
-msgid ""
-"Physical screen width, measured in inches\n"
-"For this to take effect you must save the resource data (press the [Save] "
-"button)\n"
-"and restart fontforge"
-msgstr ""
-
-#: ../gdraw/gresedit.c:2367
-msgid "GDraw"
-msgstr ""
-
-#: ../gdraw/gresedit.c:2368
-msgid "General facts about the windowing system"
-msgstr ""
-
-#
-#: ../gdraw/gsavefiledlg.c:138
-#, c-format
-msgid ""
-"Couldn't create directory: %1$s\n"
-"%2$s\n"
-"%3$s"
-msgstr ""
-"未能创建目录: %1$s\n"
-"%2$s\n"
-"%3$s"
-
-#: ../gdraw/gscrollbar.c:54
-msgid "ScrollBar"
-msgstr ""
-
-#: ../gdraw/gscrollbar.c:55
-msgid "Scroll Bar"
-msgstr ""
-
-#: ../gdraw/gscrollbar.c:68
-msgid "SB Thumb"
-msgstr ""
-
-#: ../gdraw/gscrollbar.c:69
-msgid "Scroll Bar Thumb"
-msgstr ""
-
-#: ../gdraw/gtabset.c:44
-msgid "TabSet"
-msgstr ""
-
-#: ../gdraw/gtabset.c:45
-msgid "Tab Set"
-msgstr ""
-
-#: ../gdraw/gtextfield.c:69 ../gdraw/gtextfield.c:70
-msgid "Text Field"
-msgstr ""
-
-#: ../gdraw/gtextfield.c:89
-msgid "List Field"
-msgstr ""
-
-#: ../gdraw/gtextfield.c:90
-msgid "List Field (Combo Box)"
-msgstr ""
-
-#: ../gdraw/gtextfield.c:101
-msgid "List Field Menu"
-msgstr ""
-
-#: ../gdraw/gtextfield.c:102
-msgid "Box surrounding the ListMark in a list field (combobox)"
-msgstr ""
-
-#: ../gdraw/gtextfield.c:121
-msgid "Numeric Field"
-msgstr ""
-
-#: ../gdraw/gtextfield.c:122
-msgid "Numeric Field (Spinner)"
-msgstr ""
-
-#: ../gdraw/gtextfield.c:133
-msgid "Numeric Field Sign"
-msgstr ""
-
-#: ../gdraw/gtextfield.c:134
-msgid "The box around the up/down arrows of a numeric field (spinner)"
-msgstr ""
-
-#
-#: ../gdraw/gtextfield.c:1154 ../gdraw/gtextfield.c:1186
-msgid "Could not open file"
-msgstr "未能打开文件"
-
-#
-#: ../gdraw/gtextfield.c:1298
-msgid "_Save in UTF8"
-msgstr "存为UTF8(_S)"
-
-#
-#: ../gdraw/gtextfield.c:1299
-msgid "Save in _UCS2"
-msgstr "存为_UCS2"
-
-#
-#. GT: This is an unusual string. It is used to get around a limitation in
-#. GT: FontForge's widget set. You should put a number here (do NOT translate
-#. GT: "GGadget|ButtonSize|", that's only to provide context. The number should
-#. GT: be the number of points used for a standard sized button. It should be
-#. GT: big enough to contain "OK", "Cancel", "New...", "Edit...", "Delete"
-#. GT: (in their translated forms of course).
-#: ../gdraw/gtextinfo.c:1057
-msgid "GGadget|ButtonSize|55"
-msgstr "GGadget|ButtonSize|55"
-
-#
-#. GT: This is an unusual string. It is used to get around a limitation in
-#. GT: FontForge's widget set. You should put a number here (do NOT translate
-#. GT: "GGadget|ScaleFactor|", that's only to provide context. The number should
-#. GT: be a percentage and indicates the the ratio of the length of a string in
-#. GT: your language to the same string's length in English.
-#. GT: Suppose it takes 116 pixels to say "Ne pas enregistrer" in French but
-#. GT: only 67 pixels to say "Don't Save" in English. Then a value for ScaleFactor
-#. GT: might be 116*100/67 = 173
-#: ../gdraw/gtextinfo.c:1069
-msgid "GGadget|ScaleFactor|100"
-msgstr "GGadget|ScaleFactor|100"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/friendly-recovery.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/friendly-recovery.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/friendly-recovery.po	2014-02-24 08:24:42.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/friendly-recovery.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,274 +0,0 @@
-# Simplified Chinese translation for friendly-recovery
-# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the friendly-recovery package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
-#
-# YunQiang Su <wzssyqa@gmail.com>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: friendly-recovery\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-03-08 14:38-0500\n"
-"PO-Revision-Date: 2012-04-12 15:51+0000\n"
-"Last-Translator: YunQiang Su <wzssyqa@gmail.com>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-12 13:49+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
-"Language: \n"
-
-#: ../lib/recovery-mode/options/apt-snapshots:20
-#, sh-format
-msgid "Revert to old snapshot and reboot"
-msgstr "恢复到旧快照，然后重新启动"
-
-#: ../lib/recovery-mode/options/apt-snapshots:31
-#, sh-format
-msgid "Snapshot"
-msgstr "快照"
-
-#: ../lib/recovery-mode/options/clean:6
-#, sh-format
-msgid "Try to make free space"
-msgstr "尝试释放空间"
-
-#: ../lib/recovery-mode/options/clean:12
-#, sh-format
-msgid ""
-"Trying to find packages you don't need (apt-get autoremove), please review "
-"carefully."
-msgstr "正在尝试查找您不需要的软件包(apt-get autoremove)，请仔细查看。"
-
-#: ../lib/recovery-mode/options/clean:16 ../lib/recovery-mode/options/dpkg:41
-#: ../lib/recovery-mode/options/grub:16 ../lib/recovery-mode/recovery-menu:84
-#, sh-format
-msgid "Finished, please press ENTER"
-msgstr "已完成，请按回车键"
-
-#: ../lib/recovery-mode/options/dpkg:6
-#, sh-format
-msgid "Repair broken packages"
-msgstr "修复被损坏的包文件"
-
-#: ../lib/recovery-mode/options/failsafeX:11
-#, sh-format
-msgid "Run in failsafe graphic mode"
-msgstr "在安全图形模式下运行"
-
-#: ../lib/recovery-mode/options/fsck:6
-#, sh-format
-msgid "Check all file systems"
-msgstr "检查所有文件系统"
-
-#: ../lib/recovery-mode/options/grub:6
-#, sh-format
-msgid "Update grub bootloader"
-msgstr "更新 grub 引导程序"
-
-#: ../lib/recovery-mode/options/network:6
-#, sh-format
-msgid "Enable networking"
-msgstr "启用联网"
-
-#: ../lib/recovery-mode/options/root:9
-#, sh-format
-msgid "Drop to root shell prompt"
-msgstr "降格为 root 用户的 shell 提示符"
-
-#: ../lib/recovery-mode/options/system-summary:9
-#: ../lib/recovery-mode/options/system-summary:107
-#, sh-format
-msgid "System summary"
-msgstr "系统摘要"
-
-#: ../lib/recovery-mode/options/system-summary:15
-#, sh-format
-msgid "Read-only mode"
-msgstr "只读模式"
-
-#: ../lib/recovery-mode/options/system-summary:17
-#, sh-format
-msgid "Read/Write mode"
-msgstr "读/写模式"
-
-#: ../lib/recovery-mode/options/system-summary:21
-#, sh-format
-msgid "none"
-msgstr "无"
-
-#: ../lib/recovery-mode/options/system-summary:23
-#, sh-format
-msgid "IP configured"
-msgstr "IP 已配置"
-
-#: ../lib/recovery-mode/options/system-summary:25
-#, sh-format
-msgid "IP and DNS configured"
-msgstr "IP 和 DNS 已配置"
-
-#: ../lib/recovery-mode/options/system-summary:36
-#, sh-format
-msgid "No software RAID detected (mdstat)"
-msgstr "未检测到软 RAID (mdstat)"
-
-#: ../lib/recovery-mode/options/system-summary:42
-#, sh-format
-msgid "No LVM detected (vgscan)"
-msgstr "未检测到 LVM (vgscan)"
-
-#: ../lib/recovery-mode/options/system-summary:46
-#, sh-format
-msgid "Unknown (must be run as root)"
-msgstr "未知(必须以 root 运行)"
-
-#: ../lib/recovery-mode/options/system-summary:48
-#, sh-format
-msgid "Physical Volumes:"
-msgstr "物理卷："
-
-#: ../lib/recovery-mode/options/system-summary:51
-#: ../lib/recovery-mode/options/system-summary:60
-#, sh-format
-msgid "ok (good)"
-msgstr "完好"
-
-#: ../lib/recovery-mode/options/system-summary:53
-#: ../lib/recovery-mode/options/system-summary:62
-#, sh-format
-msgid "not ok (BAD)"
-msgstr "损坏"
-
-#: ../lib/recovery-mode/options/system-summary:57
-#, sh-format
-msgid "Volume Groups:"
-msgstr "卷组："
-
-#: ../lib/recovery-mode/options/system-summary:69
-#, sh-format
-msgid "unknown (read-only filesystem)"
-msgstr "未知(只读文件系统)"
-
-#: ../lib/recovery-mode/options/system-summary:71
-#, sh-format
-msgid "unknown (must be run as root)"
-msgstr "未知(必须以 root 运行)"
-
-#: ../lib/recovery-mode/options/system-summary:75
-#, sh-format
-msgid "yes (good)"
-msgstr "完好"
-
-#: ../lib/recovery-mode/options/system-summary:77
-#, sh-format
-msgid "no (BAD)"
-msgstr "损坏"
-
-#: ../lib/recovery-mode/options/system-summary:81
-#, sh-format
-msgid "(Use arrows/PageUp/PageDown keys to scroll and TAB key to select)"
-msgstr "(使用 方向/PageUp/PageDown 键滚屏，用 TAB 键选择)"
-
-#: ../lib/recovery-mode/options/system-summary:83
-#, sh-format
-msgid "=== General information ==="
-msgstr "=== 一般信息 ==="
-
-#: ../lib/recovery-mode/options/system-summary:84
-#, sh-format
-msgid "System mode:"
-msgstr "系统模式："
-
-#: ../lib/recovery-mode/options/system-summary:85
-#, sh-format
-msgid "CPU information:"
-msgstr "CPU 信息："
-
-#: ../lib/recovery-mode/options/system-summary:86
-#, sh-format
-msgid "Network connectivity:"
-msgstr "网络连接："
-
-#: ../lib/recovery-mode/options/system-summary:88
-#, sh-format
-msgid "=== Detailed disk usage ==="
-msgstr "=== 详细磁盘使用情况 ==="
-
-#: ../lib/recovery-mode/options/system-summary:91
-#, sh-format
-msgid "=== Software RAID state ==="
-msgstr "=== 软 RAID 状态 ==="
-
-#: ../lib/recovery-mode/options/system-summary:94
-#, sh-format
-msgid "=== LVM state ==="
-msgstr "=== LVM 状态 ==="
-
-#: ../lib/recovery-mode/options/system-summary:97
-#, sh-format
-msgid "=== Detailed memory usage ==="
-msgstr "=== 详细内存使用情况 ==="
-
-#: ../lib/recovery-mode/options/system-summary:100
-#, sh-format
-msgid "=== Detailed network configuration ==="
-msgstr "=== 详细网络配置 ==="
-
-#: ../lib/recovery-mode/options/system-summary:103
-#, sh-format
-msgid "=== System database (APT) ==="
-msgstr "=== 系统数据库 (APT) ==="
-
-#: ../lib/recovery-mode/options/system-summary:104
-#, sh-format
-msgid "Database is consistent:"
-msgstr "数据库一致："
-
-#: ../lib/recovery-mode/recovery-menu:20
-#, sh-format
-msgid "Recovery Menu (filesystem state: read-only)"
-msgstr "恢复菜单(文件系统状态：只读)"
-
-#: ../lib/recovery-mode/recovery-menu:22
-#, sh-format
-msgid "Recovery Menu (filesystem state: read/write)"
-msgstr "恢复菜单(文件系统状态：读/写)"
-
-#: ../lib/recovery-mode/recovery-menu:26
-#, sh-format
-msgid "   Resume normal boot"
-msgstr "   恢复正常启动"
-
-#: ../lib/recovery-mode/recovery-menu:47
-#, sh-format
-msgid ""
-"You are now going to exit the recovery mode and continue the boot sequence. "
-"Please note that some graphic drivers require a full graphical boot and so "
-"will fail when resuming from recovery.\n"
-"If that's the case, simply reboot from the login screen and then perform a "
-"standard boot."
-msgstr ""
-"您现在将退出恢复模式，然后继续执行启动顺序。请注意，一些图形驱动程序需要完全图形启动，因此在从恢复继续时将会失败。\n"
-"如果是这种情况，只需从登录屏幕重新启动然后执行标准启动即可。"
-
-#: ../lib/recovery-mode/recovery-menu:67
-#, sh-format
-msgid ""
-"Continuing will remount your / filesystem in read/write mode and mount any "
-"other filesystem defined in /etc/fstab.\n"
-"Do you wish to continue?"
-msgstr ""
-"正在继续，将在读/写模式下重新挂载您的根(/)文件系统，以及挂载在 /etc/fstab 中定义的其他任何文件系统。\n"
-"是否要继续？"
-
-#: ../lib/recovery-mode/recovery-menu:95
-#, sh-format
-msgid ""
-"The option you selected requires your filesystem to be in read-only mode. "
-"Unfortunately another option you selected earlier, made you exit this mode.\n"
-"The easiest way of getting back in read-only mode is to reboot your system."
-msgstr ""
-"您选择的选项要求您的文件系统处于只读模式。遗憾的是，您先前选择的另一个选项使您退出了该模式。\n"
-"回到只读模式的最简单方式是重新启动您的系统。"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/gas.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/gas.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/gas.po	2014-02-24 08:24:24.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/gas.po	2014-03-24 09:42:31.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 10:38+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 10:40+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: app.c:488 app.c:502
 msgid "end of file in comment"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/gawk.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/gawk.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/gawk.po	2014-02-24 08:24:27.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/gawk.po	2014-03-24 09:42:34.000000000 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:00+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 11:06+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: array.c:140
 #, c-format
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/gcc-4.7.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/gcc-4.7.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/gcc-4.7.po	2014-02-24 08:24:48.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/gcc-4.7.po	2014-03-24 09:42:56.000000000 +0000
@@ -8,15 +8,15 @@
 "Project-Id-Version: gcc 4.6.0\n"
 "Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n"
 "POT-Creation-Date: 2012-09-19 14:50+0000\n"
-"PO-Revision-Date: 2014-01-13 03:44+0000\n"
+"PO-Revision-Date: 2014-02-25 19:57+0000\n"
 "Last-Translator: Meng Jie <Unknown>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:46+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 14:28+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "X-Poedit-Country: CHINA\n"
 "Language: zh_CN\n"
 "X-Poedit-Language: Chinese\n"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/gdb.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/gdb.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/gdb.po	2014-02-24 08:24:27.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/gdb.po	2014-03-24 09:42:34.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:03+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 11:11+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: aarch64-linux-nat.c:334 gdbserver/linux-aarch64-low.c:622
 msgid "Unexpected error setting hardware debug registers"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/gettext-runtime.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/gettext-runtime.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/gettext-runtime.po	2014-02-24 08:24:27.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/gettext-runtime.po	2014-03-24 09:42:35.000000000 +0000
@@ -19,8 +19,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:05+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 11:13+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: gnulib-lib/closeout.c:66
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/gettext-tools.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/gettext-tools.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/gettext-tools.po	2014-02-24 08:24:28.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/gettext-tools.po	2014-03-24 09:42:35.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:06+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 11:14+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: gnulib-lib/argmatch.c:133
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/git-gui.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/git-gui.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/git-gui.po	2014-02-24 08:24:36.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/git-gui.po	2014-03-24 09:42:43.000000000 +0000
@@ -31,8 +31,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:05+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:23+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903
 #: git-gui.sh:922
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/git.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/git.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/git.po	2014-02-24 08:24:36.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/git.po	2014-03-24 09:42:43.000000000 +0000
@@ -20,8 +20,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:04+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:22+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: advice.c:57
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/glance.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/glance.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/glance.po	2014-02-24 08:24:47.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/glance.po	2014-03-24 09:42:54.000000000 +0000
@@ -7,17 +7,83 @@
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-11-23 06:03+0000\n"
+"POT-Creation-Date: 2014-01-31 06:01+0000\n"
 "PO-Revision-Date: 2012-03-21 17:44+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: zh_CN <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:36+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 14:14+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Generated-By: Babel 1.3\n"
 
+#: glance/notifier.py:31
+msgid ""
+"Notifications can be sent when images are create, updated or deleted. There "
+"are three methods of sending notifications, logging (via the log_file "
+"directive), rabbit (via a rabbitmq queue), qpid (via a Qpid message queue), "
+"or noop (no notifications sent, the default). (DEPRECATED)"
+msgstr ""
+
+#: glance/notifier.py:62
+msgid "notifier_strategy was deprecated in favor of `notification_driver`"
+msgstr ""
+
+#: glance/notifier.py:212 glance/api/common.py:82
+#, python-format
+msgid "An error occurred during image.send notification: %(err)s"
+msgstr "在执行 image.send notification时发生错误：%(err)s"
+
+#: glance/notifier.py:222 glance/api/v1/upload_utils.py:184
+#: glance/api/v2/image_data.py:90
+#, python-format
+msgid "Image storage media is full: %s"
+msgstr "镜像存储介质已满：%s"
+
+#: glance/notifier.py:226 glance/api/v1/upload_utils.py:193
+#: glance/api/v2/image_data.py:108
+#, python-format
+msgid "Insufficient permissions on image storage media: %s"
+msgstr "没有足够的权限访问镜像存储介质：%s"
+
+#: glance/notifier.py:231
+#, python-format
+msgid "Cannot save data for image %(image_id)s: %(error)s"
+msgstr ""
+
+#: glance/notifier.py:237
+#, python-format
+msgid ""
+"Unable to upload duplicate image data for image%(image_id)s: %(error)s"
+msgstr ""
+
+#: glance/notifier.py:244
+#, python-format
+msgid "Not allowed to upload image data for image %(image_id)s: %(error)s"
+msgstr ""
+
+#: glance/notifier.py:250
+#, python-format
+msgid ""
+"Image %(image_id)s could not be found after upload. The image may have been "
+"deleted during the upload: %(error)s"
+msgstr ""
+
+#: glance/notifier.py:257
+#, python-format
+msgid ""
+"Failed to upload image data for image %(image_id)s due to HTTP error: "
+"%(error)s"
+msgstr ""
+
+#: glance/notifier.py:264
+#, python-format
+msgid ""
+"Failed to upload image data for image %(image_id)s due to internal error: "
+"%(error)s"
+msgstr ""
+
 #: glance/schema.py:56
 #, python-format
 msgid "custom properties (%(props)s) conflict with base properties"
@@ -56,15 +122,20 @@
 msgid "Public images do not have members."
 msgstr ""
 
-#: glance/api/authorization.py:235
+#: glance/api/authorization.py:204
 #, python-format
-msgid "You are not permitted to modify '%s' on this image."
+msgid "You are not permitted to modify '%(attr)s' on this %(resource)s."
 msgstr ""
 
 #: glance/api/authorization.py:214
 msgid "You are not permitted to modify locations for this image."
 msgstr ""
 
+#: glance/api/authorization.py:235
+#, python-format
+msgid "You are not permitted to modify '%s' on this image."
+msgstr ""
+
 #: glance/api/authorization.py:239
 msgid "You are not permitted to modify this image."
 msgstr "您无权修改此镜像"
@@ -81,6 +152,16 @@
 msgid "You are not permitted to upload data for this image."
 msgstr "您无权向此镜像上传数据"
 
+#: glance/api/authorization.py:339 glance/api/authorization.py:343
+#: glance/api/authorization.py:347
+msgid "You are not permitted to set status on this task."
+msgstr ""
+
+#: glance/api/authorization.py:394
+#, python-format
+msgid "You are not permitted to create this task with owner as: %s"
+msgstr ""
+
 #: glance/api/common.py:44
 #, python-format
 msgid ""
@@ -100,11 +181,6 @@
 msgid "Corrupt image download for image %(image_id)s"
 msgstr "镜像%(image_id)s 的下载损坏"
 
-#: glance/notifier.py:212 glance/api/common.py:82
-#, python-format
-msgid "An error occurred during image.send notification: %(err)s"
-msgstr "在执行 image.send notification时发生错误：%(err)s"
-
 #: glance/api/policy.py:33
 msgid "The location of the policy file."
 msgstr "策略文件的位置"
@@ -250,6 +326,13 @@
 "match."
 msgstr ""
 
+#: glance/api/v1/images.py:171
+#, python-format
+msgid ""
+"The limit has been exceeded on the number of allowed image properties. "
+"Attempted: %(num)s, Maximum: %(quota)s"
+msgstr ""
+
 #: glance/api/v1/images.py:193 glance/api/v1/images.py:237
 #: glance/api/v1/images.py:271
 #, python-format
@@ -261,6 +344,16 @@
 msgid "External sourcing not supported for store %s"
 msgstr ""
 
+#: glance/api/v1/images.py:491
+#, python-format
+msgid "Required store %s is invalid"
+msgstr ""
+
+#: glance/api/v1/images.py:503 glance/api/v1/images.py:875
+#, python-format
+msgid "Invalid location %s"
+msgstr ""
+
 #: glance/api/v1/images.py:526
 #, python-format
 msgid "An image with identifier %s already exists"
@@ -307,11 +400,11 @@
 msgid "Triggering asynchronous copy from external source"
 msgstr ""
 
-#: glance/api/v1/images.py:648
+#: glance/api/v1/images.py:707
 #, python-format
 msgid ""
 "Provided image size must match the stored image size. (provided size: "
-"%(ps)d, stored size: %(ss)d)ps"
+"%(ps)d, stored size: %(ss)d)"
 msgstr ""
 
 #: glance/api/v1/images.py:829
@@ -375,11 +468,6 @@
 msgid "Store for scheme %s not found"
 msgstr ""
 
-#: glance/api/v1/images.py:975
-#, python-format
-msgid "Incoming image size of %s was not convertible to an integer."
-msgstr "引入的镜像 %s 的大小无法转换成整数。"
-
 #: glance/api/v1/images.py:1082 glance/api/v1/upload_utils.py:202
 #, python-format
 msgid "Denying attempt to upload image larger than %d bytes."
@@ -398,14 +486,21 @@
 msgid "Unauthorized image access"
 msgstr "未授权的镜像访问"
 
+#: glance/api/v1/members.py:118 glance/common/exception.py:283
+#, python-format
+msgid ""
+"The limit has been exceeded on the number of allowed image members for this "
+"image. Attempted: %(attempted)s, Maximum: %(maximum)s"
+msgstr ""
+
 #: glance/api/v1/upload_utils.py:72
 #, python-format
 msgid "Unable to kill image %(id)s: "
 msgstr ""
 
-#: glance/api/v1/upload_utils.py:109
+#: glance/api/v1/upload_utils.py:107
 #, python-format
-msgid "Cleaning up %s after exceeding the quota %s"
+msgid "Cleaning up %s after exceeding the quota"
 msgstr ""
 
 #: glance/api/v1/upload_utils.py:115
@@ -439,18 +534,6 @@
 msgid "Forbidden upload attempt: %s"
 msgstr ""
 
-#: glance/notifier.py:222 glance/api/v1/upload_utils.py:184
-#: glance/api/v2/image_data.py:90
-#, python-format
-msgid "Image storage media is full: %s"
-msgstr "镜像存储介质已满：%s"
-
-#: glance/notifier.py:226 glance/api/v1/upload_utils.py:193
-#: glance/api/v2/image_data.py:108
-#, python-format
-msgid "Insufficient permissions on image storage media: %s"
-msgstr "没有足够的权限访问镜像存储介质：%s"
-
 #: glance/api/v1/upload_utils.py:212 glance/api/v2/images.py:135
 #, python-format
 msgid "Denying attempt to upload image because it exceeds the .quota: %s"
@@ -470,16 +553,11 @@
 msgid "Failed to upload image %s"
 msgstr ""
 
-#: glance/api/v2/image_data.py:58
+#: glance/api/v2/image_data.py:55
 #, python-format
 msgid ""
-"Image %s could not be found after upload.The image may have been deleted "
-"during the upload: %s Cleaning up the chunks uploaded"
-msgstr ""
-
-#: glance/api/v2/image_data.py:77
-#, python-format
-msgid "Unable to upload duplicate image data for image: %s"
+"Image %(id)s could not be found after upload.The image may have been deleted "
+"during the upload: %(error)s Cleaning up the chunks uploaded"
 msgstr ""
 
 #: glance/api/v2/image_data.py:81
@@ -492,8 +570,9 @@
 msgid "Image exceeds the storage quota: %s"
 msgstr ""
 
-#: glance/api/v2/image_data.py:110
-msgid "The incoming image is too large: %"
+#: glance/api/v2/image_data.py:102
+#, python-format
+msgid "The incoming image is too large: %s"
 msgstr ""
 
 #: glance/api/v2/image_data.py:114
@@ -504,10 +583,6 @@
 msgid "Failed to upload image data due to internal error"
 msgstr ""
 
-#: glance/common/exception.py:333 glance/store/__init__.py:702
-msgid "No image data could be found"
-msgstr ""
-
 #: glance/api/v2/image_members.py:189 glance/api/v2/images.py:290
 msgid "Body expected in request."
 msgstr ""
@@ -732,6 +807,97 @@
 "properties"
 msgstr ""
 
+#: glance/api/v2/tasks.py:65
+#, python-format
+msgid "Forbidden to create task. Reason: %(reason)s"
+msgstr ""
+
+#: glance/api/v2/tasks.py:103
+#, python-format
+msgid "Failed to find task %(task_id)s. Reason: %(reason)s"
+msgstr ""
+
+#: glance/api/v2/tasks.py:108
+#, python-format
+msgid "Forbidden to get task %(task_id)s. Reason: %(reason)s"
+msgstr ""
+
+#: glance/api/v2/tasks.py:121
+msgid "Body expected in request"
+msgstr ""
+
+#: glance/api/v2/tasks.py:136
+#, python-format
+msgid "Invalid status value: %s"
+msgstr ""
+
+#: glance/api/v2/tasks.py:142
+#, python-format
+msgid "Invalid type value: %s"
+msgstr ""
+
+#: glance/api/v2/tasks.py:149 glance/registry/api/v1/images.py:255
+msgid "Invalid marker format"
+msgstr "无效的标记格式"
+
+#: glance/api/v2/tasks.py:170
+#, python-format
+msgid "Task '%s' is required"
+msgstr ""
+
+#: glance/api/v2/tasks.py:180
+#, python-format
+msgid "Input does not contain '%s' field"
+msgstr ""
+
+#: glance/api/v2/tasks.py:276
+msgid "An identifier for the task"
+msgstr ""
+
+#: glance/api/v2/tasks.py:277
+msgid ""
+"^([0-9a-fA-F]){8}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-"
+"fA-F]){12}$"
+msgstr ""
+
+#: glance/api/v2/tasks.py:282
+msgid "The type of task represented by this content"
+msgstr ""
+
+#: glance/api/v2/tasks.py:289
+msgid "The current status of this task"
+msgstr ""
+
+#: glance/api/v2/tasks.py:299
+msgid "The parameters required by task, JSON blob"
+msgstr ""
+
+#: glance/api/v2/tasks.py:303
+msgid "The result of current task, JSON blob"
+msgstr ""
+
+#: glance/api/v2/tasks.py:307
+msgid "An identifier for the owner of this task"
+msgstr ""
+
+#: glance/api/v2/tasks.py:311
+msgid ""
+"Human-readable informative message only included when appropriate (usually "
+"on failure)"
+msgstr ""
+
+#: glance/api/v2/tasks.py:316
+msgid "Datetime when this resource would be subject to removal"
+msgstr ""
+
+#: glance/api/v2/tasks.py:321
+msgid "Datetime when this resource was created"
+msgstr ""
+
+#: glance/api/v2/tasks.py:325
+msgid "Datetime when this resource was updated"
+msgstr ""
+
 #: glance/cmd/replicator.py:54
 #, python-format
 msgid ""
@@ -775,7 +941,7 @@
 
 #: glance/cmd/replicator.py:302
 #, python-format
-msgid "Total size is %d bytes across %d images"
+msgid "Total size is %(size)d bytes across %(img_count)d images"
 msgstr ""
 
 #: glance/cmd/replicator.py:332 glance/cmd/replicator.py:422
@@ -937,12 +1103,49 @@
 msgid "Name of the paste configuration file."
 msgstr ""
 
+#: glance/common/config.py:45
+msgid "Supported values for the 'container_format' image attribute"
+msgstr ""
+
+#: glance/common/config.py:52
+msgid "Supported values for the 'disk_format' image attribute"
+msgstr ""
+
+#: glance/common/config.py:60
+msgid ""
+"Time in hours for which a task lives after, either succeeding or failing"
+msgstr ""
+
 #: glance/common/config.py:67
 msgid ""
 "Whether to allow users to specify image properties beyond what the image "
 "schema provides"
 msgstr ""
 
+#: glance/common/config.py:70
+msgid ""
+"Maximum number of image members per image. Negative values evaluate to "
+"unlimited."
+msgstr ""
+
+#: glance/common/config.py:73
+msgid ""
+"Maximum number of properties allowed on an image. Negative values evaluate "
+"to unlimited."
+msgstr ""
+
+#: glance/common/config.py:76
+msgid ""
+"Maximum number of tags allowed on an image. Negative values evaluate to "
+"unlimited."
+msgstr ""
+
+#: glance/common/config.py:79
+msgid ""
+"Maximum number of locations allowed on an image. Negative values evaluate to "
+"unlimited."
+msgstr ""
+
 #: glance/common/config.py:82
 msgid "Python module path of data access API"
 msgstr ""
@@ -958,10 +1161,10 @@
 "Maximum permissible number of items that could be returned by a request"
 msgstr ""
 
-#: glance/common/config.py:57
+#: glance/common/config.py:90
 msgid ""
 "Whether to include the backend image storage location in image properties. "
-"Revealing storage location can bea security risk, so use this setting with "
+"Revealing storage location can be a security risk, so use this setting with "
 "caution!"
 msgstr ""
 
@@ -1023,10 +1226,6 @@
 msgid "An unknown exception occurred"
 msgstr "发生未知异常"
 
-#: glance/common/exception.py:57
-msgid "Missing required argument."
-msgstr "缺少必要参数"
-
 #: glance/common/exception.py:55
 #, python-format
 msgid "Missing required credential: %(required)s"
@@ -1056,6 +1255,10 @@
 msgid "An object with the same identifier already exists."
 msgstr "已经存在相同标识的对象。"
 
+#: glance/common/exception.py:80
+msgid "An object with the same identifier is currently being operated on."
+msgstr ""
+
 #: glance/common/exception.py:85
 msgid "There is not enough disk space on the image storage media."
 msgstr "镜像存储介质没有足够的磁盘空间。"
@@ -1224,11 +1427,6 @@
 "Configuration for store failed. Adding images to this store is disabled."
 msgstr "存储配置失败。禁止向此存储添加镜像。"
 
-#: glance/common/exception.py:245
-#, python-format
-msgid "'%(strategy)s' is not an available notifier strategy."
-msgstr "'%(strategy)s' 不是可用通知策略。"
-
 #: glance/common/exception.py:239
 #, python-format
 msgid "Maximum redirects (%(redirects)s) was exceeded."
@@ -1279,16 +1477,77 @@
 msgid "The provided image is too large."
 msgstr ""
 
+#: glance/common/exception.py:289
+#, python-format
+msgid ""
+"The limit has been exceeded on the number of allowed image properties. "
+"Attempted: %(attempted)s, Maximum: %(maximum)s"
+msgstr ""
+
+#: glance/common/exception.py:294
+#, python-format
+msgid ""
+"The limit has been exceeded on the number of allowed image tags. Attempted: "
+"%(attempted)s, Maximum: %(maximum)s"
+msgstr ""
+
+#: glance/common/exception.py:299
+#, python-format
+msgid ""
+"The limit has been exceeded on the number of allowed image locations. "
+"Attempted: %(attempted)s, Maximum: %(maximum)s"
+msgstr ""
+
 #: glance/common/exception.py:304
 #, python-format
 msgid "%(cls)s exception was raised in the last rpc call: %(val)s"
 msgstr ""
 
+#: glance/common/exception.py:308
+msgid "An unknown task exception occurred"
+msgstr ""
+
 #: glance/common/exception.py:312
 #, python-format
 msgid "Task with the given id %(task_id)s was not found"
 msgstr ""
 
+#: glance/common/exception.py:316
+#, python-format
+msgid "Provided status of task is unsupported: %(status)s"
+msgstr ""
+
+#: glance/common/exception.py:320
+#, python-format
+msgid "Provided type of task is unsupported: %(type)s"
+msgstr ""
+
+#: glance/common/exception.py:324
+#, python-format
+msgid ""
+"Status transition from %(cur_status)s to %(new_status)s is not allowed"
+msgstr ""
+
+#: glance/common/exception.py:329
+#, python-format
+msgid "The location %(location)s already exists"
+msgstr ""
+
+#: glance/common/exception.py:333 glance/store/__init__.py:702
+msgid "No image data could be found"
+msgstr ""
+
+#: glance/common/exception.py:337
+#, python-format
+msgid "Invalid value '%(value)s' for parameter '%(param)s': %(extra_msg)s"
+msgstr ""
+
+#: glance/common/exception.py:342
+#, python-format
+msgid ""
+"Image status transition from %(cur_status)s to %(new_status)s is not allowed"
+msgstr ""
+
 #: glance/common/property_utils.py:37
 msgid "The location of the property protection file."
 msgstr ""
@@ -1299,9 +1558,9 @@
 "the property protection file."
 msgstr ""
 
-#: glance/common/property_utils.py:73
+#: glance/common/property_utils.py:75
 #, python-format
-msgid "Couldn't find property protection file %s:%s."
+msgid "Couldn't find property protection file %(file)s: %(error)s."
 msgstr ""
 
 #: glance/common/property_utils.py:82
@@ -1311,22 +1570,30 @@
 "values are 'roles' and 'policies'"
 msgstr ""
 
-#: glance/common/property_utils.py:96
+#: glance/common/property_utils.py:101
 #, python-format
 msgid ""
-"Multiple policies '%s' not allowed for a given operation. Policies can be "
+"Multiple policies '%s' not allowedfor a given operation. Policies can be "
 "combined in the policy file"
 msgstr ""
 
-#: glance/common/property_utils.py:125
+#: glance/common/property_utils.py:114
 #, python-format
-msgid "Encountered a malformed property protection rule %s:%s."
+msgid ""
+"Malformed property protection rule in [%(prop)s] %(op)s=%(perm)s: '@' and "
+"'!' are mutually exclusive"
 msgstr ""
 
-#: glance/common/property_utils.py:168
+#: glance/common/property_utils.py:127
 #, python-format
 msgid ""
-"Malformed property protection rule '%s': '@' and '!' are mutually exclusive"
+"Property protection on operation %(operation)s for rule %(rule)s is not "
+"found. No role will be allowed to perform this operation."
+msgstr ""
+
+#: glance/common/property_utils.py:139
+#, python-format
+msgid "Encountered a malformed property protection rule %(rule)s: %(error)s."
 msgstr ""
 
 #: glance/common/rpc.py:138
@@ -1364,6 +1631,16 @@
 msgid "Bad header: %(header_name)s"
 msgstr ""
 
+#: glance/common/utils.py:261
+#, python-format
+msgid "Cannot convert image %(key)s '%(value)s' to an integer."
+msgstr ""
+
+#: glance/common/utils.py:268
+#, python-format
+msgid "Image %(key)s must be >= 0 ('%(value)s' specified)."
+msgstr ""
+
 #: glance/common/utils.py:431
 msgid "Read-only access"
 msgstr "只读访问"
@@ -1373,22 +1650,25 @@
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: glance/common/utils.py:495
+#: glance/common/utils.py:508
 #, python-format
-msgid "There is a problem with your %s %s.  Please verify it.  Error: %s"
+msgid ""
+"There is a problem with your %(error_key_name)s %(error_filename)s.  Please "
+"verify it.  Error: %(ioe)s"
 msgstr ""
 
-#: glance/common/utils.py:499
+#: glance/common/utils.py:515
 #, python-format
 msgid ""
-"There is a problem with your %s %s.  Please verify it. OpenSSL error: %s"
+"There is a problem with your %(error_key_name)s %(error_filename)s.  Please "
+"verify it. OpenSSL error: %(ce)s"
 msgstr ""
 
-#: glance/common/utils.py:510
+#: glance/common/utils.py:529
 #, python-format
 msgid ""
-"There is a problem with your key pair.  Please verify that cert %s and key "
-"%s belong together.  OpenSSL error %s"
+"There is a problem with your key pair.  Please verify that cert "
+"%(cert_file)s and key %(key_file)s belong together.  OpenSSL error %(ce)s"
 msgstr ""
 
 #: glance/common/wsgi.py:49
@@ -1437,16 +1717,23 @@
 "http://eventlet.net/doc/hubs.html for more details."
 msgstr ""
 
+#: glance/common/wsgi.py:81
+msgid ""
+"Maximum line size of message headers to be accepted. max_header_line may "
+"need to be increased when using large tokens (typically those generated by "
+"the Keystone v3 API with big service catalogs"
+msgstr ""
+
 #: glance/common/wsgi.py:127
 msgid ""
 "When running server in SSL mode, you must specify both a cert_file and "
 "key_file option value in your configuration file"
 msgstr "在通过SSL连接方式运行服务器时，您必须在配置文件中指定cert_file和key_file参数值"
 
-#: glance/common/wsgi.py:173
+#: glance/common/wsgi.py:165
 #, python-format
-msgid "Could not bind to %s:%s after trying for 30 seconds"
-msgstr "试了30秒后无法绑定到%s:%s"
+msgid "Could not bind to %(host)s:%(port)s after trying for 30 seconds"
+msgstr ""
 
 #: glance/common/wsgi.py:240 glance/openstack/common/service.py:240
 #, python-format
@@ -1498,6 +1785,39 @@
 msgid "Malformed JSON in request body."
 msgstr ""
 
+#: glance/common/location_strategy/__init__.py:25
+msgid ""
+"This value sets what strategy will be used to determine the image location "
+"order. Currently two strategies are packaged with Glance 'location_order' "
+"and 'store_type'."
+msgstr ""
+
+#: glance/common/location_strategy/__init__.py:52
+#, python-format
+msgid ""
+"%(strategy)s is registered as a module twice. %(module)s is not being used."
+msgstr ""
+
+#: glance/common/location_strategy/__init__.py:61
+#, python-format
+msgid "Failed to load location strategy module %(module)s: %(e)s"
+msgstr ""
+
+#: glance/common/location_strategy/__init__.py:74
+#, python-format
+msgid ""
+"Invalid location_strategy option: %(name)s. The valid strategy option(s) "
+"is(are): %(strategies)s"
+msgstr ""
+
+#: glance/common/location_strategy/store_type.py:26
+msgid ""
+"The store names to use to get store preference order. The name must be "
+"registered by one of the stores defined by the 'known_stores' config option. "
+"This option will be applied when you using 'store_type' option as image "
+"location strategy defined by the 'location_strategy' config option."
+msgstr ""
+
 #: glance/db/__init__.py:63 glance/db/__init__.py:164 glance/db/__init__.py:176
 #: glance/db/sqlalchemy/api.py:159
 #, python-format
@@ -1516,8 +1836,14 @@
 msgid "The specified member %s could not be found"
 msgstr ""
 
-#: glance/db/simple/api.py:41
-#, python-format
+#: glance/db/__init__.py:317 glance/db/__init__.py:342
+#: glance/db/__init__.py:359 glance/db/simple/api.py:761
+#, python-format
+msgid "Could not find task %s"
+msgstr ""
+
+#: glance/db/simple/api.py:41
+#, python-format
 msgid "Calling %(funcname)s: args=%(args)s, kwargs=%(kwargs)s"
 msgstr ""
 
@@ -1543,18 +1869,16 @@
 msgid "Unable to get unowned image"
 msgstr ""
 
+#: glance/db/simple/api.py:424 glance/db/sqlalchemy/api.py:929
+msgid "Image id is required."
+msgstr ""
+
 #: glance/db/simple/api.py:739 glance/db/simple/api.py:789
 #: glance/db/sqlalchemy/api.py:1233
 #, python-format
 msgid "No task found with ID %s"
 msgstr ""
 
-#: glance/db/__init__.py:317 glance/db/__init__.py:342
-#: glance/db/__init__.py:359 glance/db/simple/api.py:761
-#, python-format
-msgid "Could not find task %s"
-msgstr ""
-
 #: glance/db/simple/api.py:766
 #, python-format
 msgid "Unable to get deleted task %s"
@@ -1569,37 +1893,14 @@
 msgid "Task does not exist"
 msgstr ""
 
-#: glance/db/sqlalchemy/api.py:56
+#: glance/db/simple/api.py:912
 #, python-format
-msgid ""
-"A valid SQLAlchemy connection string for the registry database. Default: "
-"%(default)s"
+msgid "No task info found with task id %s"
 msgstr ""
 
-#: glance/db/sqlalchemy/api.py:62
-msgid ""
-"Period in seconds after which SQLAlchemy should reestablish its connection "
-"to the database."
-msgstr ""
-
-#: glance/db/sqlalchemy/api.py:65
-msgid "The number of times to retry a connection to the SQLserver."
-msgstr ""
-
-#: glance/db/sqlalchemy/api.py:68
-msgid ""
-"The amount of time to wait (in seconds) before attempting to retry the SQL "
-"connection."
-msgstr ""
-
-#: glance/db/sqlalchemy/api.py:71
-msgid ""
-"A boolean that determines if the database will be automatically created."
-msgstr ""
-
-#: glance/db/sqlalchemy/api.py:74
-msgid ""
-"Enable debug logging in sqlalchemy which prints every query and result"
+#: glance/db/simple/api.py:928
+#, python-format
+msgid "Could not find task info %s"
 msgstr ""
 
 #: glance/db/sqlalchemy/api.py:58
@@ -1610,26 +1911,6 @@
 msgid "You do not own this image"
 msgstr "您没有这个镜像的所有权"
 
-#: glance/db/sqlalchemy/api.py:184
-#, python-format
-msgid ""
-"Error configuring registry database with supplied sql_connection. Got error: "
-"%s"
-msgstr ""
-
-#: glance/db/sqlalchemy/api.py:194
-msgid "auto-creating glance registry DB"
-msgstr ""
-
-#: glance/db/sqlalchemy/api.py:202
-msgid "not auto-creating glance registry DB"
-msgstr ""
-
-#: glance/db/sqlalchemy/api.py:241
-#, python-format
-msgid "SQL connection failed. %d attempts left."
-msgstr ""
-
 #: glance/db/sqlalchemy/api.py:165
 #, python-format
 msgid "Forbidding request, image %s not visible"
@@ -1645,22 +1926,17 @@
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: glance/db/sqlalchemy/migration.py:44
-msgid "database is not under migration control"
-msgstr ""
-
-#: glance/db/sqlalchemy/migration.py:59
+#: glance/db/sqlalchemy/api.py:660
+#: glance/tests/unit/v2/test_registry_client.py:484
 #, python-format
-msgid "Upgrading database to version %s"
+msgid ""
+"cannot transition from %(current)s to %(next)s in update (wanted "
+"from_state=%(from)s)"
 msgstr ""
 
-#: glance/db/sqlalchemy/migration.py:74
+#: glance/db/sqlalchemy/api.py:1062
 #, python-format
-msgid "Downgrading database to version %s"
-msgstr ""
-
-#: glance/db/sqlalchemy/migration.py:87
-msgid "database is already under migration control"
+msgid "TaskInfo was not found for task with id %(task_id)s"
 msgstr ""
 
 #: glance/db/sqlalchemy/migrate_repo/schema.py:96
@@ -1685,10 +1961,10 @@
 "出现多次。如果指定一个URI类似swift://user:pass@http://authurl.com/v1/container/obj，必须把它改为是"
 "swift+https://的方案，如：swift+http://user:pass@authurl.com/v1/container/obj"
 
-#: glance/db/sqlalchemy/migrate_repo/versions/015_quote_swift_credentials.py:91
-#: glance/db/sqlalchemy/migrate_repo/versions/017_quote_encrypted_swift_credentials.py:154
+#: glance/db/sqlalchemy/migrate_repo/versions/015_quote_swift_credentials.py:89
+#: glance/db/sqlalchemy/migrate_repo/versions/017_quote_encrypted_swift_credentials.py:152
 #, python-format
-msgid "Invalid store uri for image %s: %s"
+msgid "Invalid store uri for image %(image_id)s: %(reason)s"
 msgstr ""
 
 #: glance/db/sqlalchemy/migrate_repo/versions/015_quote_swift_credentials.py:121
@@ -1703,9 +1979,10 @@
 msgid "Badly formed credentials in Swift URI."
 msgstr ""
 
-#: glance/store/s3.py:165
+#: glance/db/sqlalchemy/migrate_repo/versions/015_quote_swift_credentials.py:152
+#: glance/db/sqlalchemy/migrate_repo/versions/017_quote_encrypted_swift_credentials.py:215
 #, python-format
-msgid "Badly formed S3 URI: %s"
+msgid "Badly formed S3 URI: %(uri)s"
 msgstr ""
 
 #: glance/db/sqlalchemy/migrate_repo/versions/017_quote_encrypted_swift_credentials.py:66
@@ -1714,17 +1991,9 @@
 "file was not specified. This means that this migration is a NOOP."
 msgstr ""
 
-#: glance/db/sqlalchemy/migrate_repo/versions/017_quote_encrypted_swift_credentials.py:89
+#: glance/db/sqlalchemy/migrate_repo/versions/017_quote_encrypted_swift_credentials.py:87
 #, python-format
-msgid "Failed to decrypt location value for image %s"
-msgstr ""
-
-#: glance/common/config.py:45
-msgid "Supported values for the 'container_format' image attribute"
-msgstr ""
-
-#: glance/common/config.py:52
-msgid "Supported values for the 'disk_format' image attribute"
+msgid "Failed to decrypt location value for image %(image_id)s"
 msgstr ""
 
 #: glance/domain/__init__.py:147
@@ -1737,10 +2006,28 @@
 msgid "Properties %s must be set prior to saving data."
 msgstr ""
 
+#: glance/domain/__init__.py:184
+msgid "Attribute container_format can be only replaced for a queued image."
+msgstr ""
+
+#: glance/domain/__init__.py:196
+msgid "Attribute disk_format can be only replaced for a queued image."
+msgstr ""
+
 #: glance/domain/__init__.py:286
 msgid "Status must be \"pending\", \"accepted\" or \"rejected\"."
 msgstr ""
 
+#: glance/domain/__init__.py:353
+#, python-format
+msgid "Task status changed from %(cur_status)s to %(new_status)s"
+msgstr ""
+
+#: glance/domain/__init__.py:358
+#, python-format
+msgid "Task status failed to change from %(cur_status)s to %(new_status)s"
+msgstr ""
+
 #: glance/image_cache/__init__.py:34
 msgid "The driver to use for image cache management."
 msgstr ""
@@ -1814,11 +2101,11 @@
 msgid "Checksum verification failed. Aborted caching of image '%s'."
 msgstr ""
 
-#: glance/image_cache/__init__.py:265
+#: glance/image_cache/__init__.py:263
 #, python-format
 msgid ""
-"Exception encountered while tee'ing image '%s' into cache: %s. Continuing "
-"with response."
+"Exception encountered while tee'ing image '%(image_id)s' into cache: "
+"%(error)s. Continuing with response."
 msgstr ""
 
 #: glance/image_cache/prefetcher.py:46
@@ -1976,164 +2263,29 @@
 msgid "Reaped %(reaped)s %(entry_type)s cache entries"
 msgstr "清除 %(reaped)s 个 %(entry_type)s 的缓存条目"
 
-#: glance/notifier/__init__.py:34
-msgid ""
-"Notifications can be sent when images are create, updated or deleted. There "
-"are three methods of sending notifications, logging (via the log_file "
-"directive), rabbit (via a rabbitmq queue), qpid (via a Qpid message queue), "
-"or noop (no notifications sent, the default)."
-msgstr ""
-
-#: glance/notifier/__init__.py:63
-#, python-format
-msgid "Converted strategy alias %s to %s"
-msgstr ""
-
-#: glance/notifier/__init__.py:67
-#, python-format
-msgid "No strategy alias found for %s"
-msgstr ""
-
-#: glance/notifier/__init__.py:213
-#, python-format
-msgid "Cannot save data for image %s: %s"
-msgstr ""
-
-#: glance/notifier/__init__.py:218
-#, python-format
-msgid "Unable to upload duplicate image data for image %s: %s"
-msgstr ""
-
-#: glance/notifier/__init__.py:223
-#, python-format
-msgid "Not allowed to upload image data for image %s: %s"
-msgstr ""
-
-#: glance/notifier/__init__.py:228
+#: glance/openstack/common/excutils.py:62
 #, python-format
-msgid ""
-"Image %s could not be found after upload. The image may have been deleted "
-"during the upload: %s"
+msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: glance/notifier/__init__.py:234
+#: glance/openstack/common/excutils.py:91
 #, python-format
-msgid "Failed to upload image data for image %s due to HTTP error: %s"
+msgid "Unexpected exception occurred %d time(s)... retrying."
 msgstr ""
 
-#: glance/notifier/__init__.py:240
+#: glance/openstack/common/fileutils.py:63
 #, python-format
-msgid "Failed to upload image data for image %s due to internal error: %s"
-msgstr ""
-
-#: glance/notifier/notify_kombu.py:31
-msgid "The host name of the rabbitmq server"
-msgstr ""
-
-#: glance/notifier/notify_kombu.py:33
-msgid "The port on which the rabbitmq server is listening"
-msgstr ""
-
-#: glance/notifier/notify_kombu.py:35
-msgid "A boolean value indicating if the selected rabbitmq server uses SSL."
-msgstr ""
-
-#: glance/notifier/notify_kombu.py:38
-msgid "The user ID for authentication with rabbitmq."
-msgstr ""
-
-#: glance/notifier/notify_kombu.py:40
-msgid ""
-"The password that will be used for authentication with the rabbitmq server."
-msgstr ""
-
-#: glance/notifier/notify_kombu.py:43
-msgid "The virtual host used in the rabbitmq connection."
-msgstr ""
-
-#: glance/notifier/notify_kombu.py:45
-msgid "Exchange name to use for connection when using rabbit strategy."
-msgstr ""
-
-#: glance/notifier/notify_kombu.py:48
-msgid "Topic to use for connection when using rabbit strategy."
-msgstr ""
-
-#: glance/notifier/notify_kombu.py:51
-msgid "The maximum number of times to attempt to connect to the AMQP server."
+msgid "Reloading cached file %s"
 msgstr ""
 
-#: glance/notifier/notify_kombu.py:54
-msgid ""
-"This value multiplied by the number of connection attempts gives the amount "
-"of time in seconds to sleep between connection attempts to the AMQP server."
+#: glance/openstack/common/gettextutils.py:263
+msgid "Message objects do not support addition."
 msgstr ""
 
-#: glance/notifier/notify_kombu.py:58
+#: glance/openstack/common/gettextutils.py:272
 msgid ""
-"The maximum amount of time to wait between connection attempts.  The delay "
-"time will be the smaller of this value and the value of "
-"<rabbit_retry_backoff> * <the number of failed connection attempts so far>."
-msgstr ""
-
-#: glance/notifier/notify_kombu.py:110
-#, python-format
-msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
-msgstr "正在重新连接位于 %(hostname)s:%(port)d 的AMQP服务器"
-
-#: glance/notifier/notify_kombu.py:114
-#, python-format
-msgid "Connecting to AMQP server on %(hostname)s:%(port)d"
-msgstr "正在连接位于 %(hostname)s:%(port)d 的AMQP服务器"
-
-#: glance/notifier/notify_kombu.py:144
-#, python-format
-msgid "Connected to AMQP server on %(hostname)s:%(port)d"
-msgstr "连接到位于 %(hostname)s:%(port)d 的AMQP服务器"
-
-#: glance/notifier/notify_kombu.py:173
-#, python-format
-msgid ""
-"Unable to connect to AMQP server on %(hostname)s:%(port)d after "
-"%(max_retries)d tries: %(err_str)s"
-msgstr "%(max_retries)d 次尝试后无法连接到位于%(hostname)s:%(port)d的AMQP服务器：%(err_str)s"
-
-#: glance/notifier/notify_kombu.py:185
-#, python-format
-msgid ""
-"AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
-"again in %(sleep_time)d seconds."
-msgstr ""
-"位于%(hostname)s:%(port)d的AMQP服务器不可达：%(err_str)s。%(sleep_time)d 秒钟后请再尝试。"
-
-#: glance/notifier/notify_kombu.py:192
-#, python-format
-msgid "Notification with priority %(priority)s failed: msg=%(msg)s"
-msgstr ""
-
-#: glance/notifier/notify_kombu.py:231
-#, python-format
-msgid "Unable to send notification: %s"
-msgstr "无法发送通知：%s"
-
-#: glance/notifier/notify_qpid.py:110
-#, python-format
-msgid "Connected to AMQP server on %s"
-msgstr "连接到位于 %s 的AMQP服务器"
-
-#: glance/notifier/notify_qpid.py:139
-#, python-format
-msgid "Notification error.  Priority: %(priority)s Message: %(msg)s"
-msgstr ""
-
-#: glance/openstack/common/excutils.py:62
-#, python-format
-msgid "Original exception being dropped: %s"
-msgstr ""
-
-#: glance/openstack/common/fileutils.py:63
-#, python-format
-msgid "Reloading cached file %s"
+"Message objects do not support str() because they may contain non-ascii "
+"characters. Please use unicode() or translate() instead."
 msgstr ""
 
 #: glance/openstack/common/lockutils.py:103
@@ -2321,6 +2473,16 @@
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: glance/openstack/common/strutils.py:188
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: glance/openstack/common/strutils.py:195
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
 #: glance/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2337,9 +2499,9 @@
 msgid "DB exception wrapped."
 msgstr ""
 
-#: glance/openstack/common/db/sqlalchemy/session.py:616
+#: glance/openstack/common/db/sqlalchemy/session.py:621
 #, python-format
-msgid "Got mysql server has gone away: %s"
+msgid "Database server has gone away: %s"
 msgstr ""
 
 #: glance/openstack/common/db/sqlalchemy/session.py:703
@@ -2370,34 +2532,6 @@
 msgid "Unsupported id columns type"
 msgstr ""
 
-#: glance/openstack/common/notifier/api.py:125
-#, python-format
-msgid "%s not in valid priorities"
-msgstr ""
-
-#: glance/openstack/common/notifier/api.py:141
-#, python-format
-msgid ""
-"Problem '%(e)s' attempting to send to notification system. "
-"Payload=%(payload)s"
-msgstr ""
-
-#: glance/openstack/common/notifier/api.py:171
-#, python-format
-msgid "Failed to load notifier %s. These notifications will not be sent."
-msgstr ""
-
-#: glance/openstack/common/notifier/rabbit_notifier.py:27
-msgid ""
-"The rabbit_notifier is now deprecated. Please use rpc_notifier instead."
-msgstr ""
-
-#: glance/openstack/common/notifier/rpc_notifier.py:45
-#: glance/openstack/common/notifier/rpc_notifier2.py:51
-#, python-format
-msgid "Could not send notification to %(topic)s. Payload=%(message)s"
-msgstr ""
-
 #: glance/quota/__init__.py:307
 #, python-format
 msgid "Cleaning up %s after exceeding the quota."
@@ -2411,10 +2545,23 @@
 msgid "Port the registry server is listening on."
 msgstr ""
 
+#: glance/registry/api/v1/images.py:105
+#, python-format
+msgid "Invalid marker. Image %(id)s could not be found."
+msgstr ""
+
 #: glance/registry/api/v1/images.py:107 glance/registry/api/v1/images.py:112
 msgid "Invalid marker. Image could not be found."
 msgstr "错误的标记。无法找到镜像。"
 
+#: glance/registry/api/v1/images.py:110 glance/registry/api/v1/images.py:325
+#: glance/registry/api/v1/images.py:353 glance/registry/api/v1/images.py:466
+#: glance/registry/api/v1/members.py:72 glance/registry/api/v1/members.py:106
+#: glance/registry/api/v1/members.py:219 glance/registry/api/v1/members.py:279
+#, python-format
+msgid "Access denied to image %(id)s but returning 'not found'"
+msgstr ""
+
 #: glance/registry/api/v1/images.py:144
 msgid "Returning image list"
 msgstr ""
@@ -2431,10 +2578,6 @@
 msgid "protected must be True, or False"
 msgstr "protected必须为True，或False"
 
-#: glance/api/v2/tasks.py:149 glance/registry/api/v1/images.py:255
-msgid "Invalid marker format"
-msgstr "无效的标记格式"
-
 #: glance/registry/api/v1/images.py:265
 #, python-format
 msgid "Unsupported sort_key. Acceptable values: %s"
@@ -2462,14 +2605,6 @@
 msgid "Image %(id)s not found"
 msgstr ""
 
-#: glance/registry/api/v1/images.py:110 glance/registry/api/v1/images.py:325
-#: glance/registry/api/v1/images.py:353 glance/registry/api/v1/images.py:466
-#: glance/registry/api/v1/members.py:72 glance/registry/api/v1/members.py:106
-#: glance/registry/api/v1/members.py:219 glance/registry/api/v1/members.py:279
-#, python-format
-msgid "Access denied to image %(id)s but returning 'not found'"
-msgstr ""
-
 #: glance/registry/api/v1/images.py:343
 #, python-format
 msgid "Successfully deleted image %(id)s"
@@ -2633,8 +2768,8 @@
 msgid "The administrators password."
 msgstr ""
 
-#: glance/registry/client/__init__.py:52
-msgid "The tenant name of the adminstrative user."
+#: glance/registry/client/__init__.py:50
+msgid "The tenant name of the administrative user."
 msgstr ""
 
 #: glance/registry/client/__init__.py:52
@@ -2719,34 +2854,40 @@
 msgid "The amount of time in seconds to delay before performing a delete."
 msgstr ""
 
+#: glance/store/__init__.py:181
+#, python-format
+msgid "%s Skipping store driver."
+msgstr ""
+
 #: glance/store/__init__.py:301
 #, python-format
 msgid "Failed to delete image %s in store from URI"
 msgstr ""
 
-#: glance/store/__init__.py:281
+#: glance/store/__init__.py:307
 #, python-format
-msgid "Failed to delete image %s from store (%s)"
+msgid "Failed to delete image %(image_id)s from store (%(error)s)"
 msgstr ""
 
-#: glance/store/__init__.py:314
+#: glance/store/__init__.py:340
 #, python-format
 msgid ""
-"The image metadata key %s has an invalid type of %s.  Only dict, list, and "
-"unicode are supported."
+"The image metadata key %(key)s has an invalid type of %(val)s.  Only dict, "
+"list, and unicode are supported."
 msgstr ""
 
-#: glance/store/__init__.py:336
+#: glance/store/__init__.py:364
 #, python-format
 msgid ""
-"The storage driver %s returned invalid metadata %sThis must be a dictionary "
-"type"
+"The storage driver %(store)s returned invalid metadata %(metadata)s. This "
+"must be a dictionary type"
 msgstr ""
 
-#: glance/store/__init__.py:344
+#: glance/store/__init__.py:373
 #, python-format
 msgid ""
-"A bad metadata structure was returned from the %s storage driver: %s.  %s."
+"A bad metadata structure was returned from the %(store)s storage driver: "
+"%(metadata)s.  %(error)s."
 msgstr ""
 
 #: glance/store/__init__.py:400
@@ -2852,24 +2993,24 @@
 msgid "Image file %s not found"
 msgstr "无法找到镜像文件 %s"
 
-#: glance/store/filesystem.py:171
+#: glance/store/filesystem.py:169
 #, python-format
 msgid ""
-"The JSON in the metadata file %s could not be used: %s  An empty dictionary "
-"will be returned to the client."
+"The JSON in the metadata file %(file)s could not be used: %(error)s  An "
+"empty dictionary will be returned to the client."
 msgstr ""
 
-#: glance/store/filesystem.py:177
+#: glance/store/filesystem.py:176
 #, python-format
 msgid ""
-"The path for the metadata file %s could not be opened: %s  An empty "
-"dictionary will be returned to the client."
+"The path for the metadata file %(file)s could not be opened: %(error)s  An "
+"empty dictionary will be returned to the client."
 msgstr ""
 
 #: glance/store/filesystem.py:183
 #, python-format
 msgid ""
-"An error occured processing the storage systems meta data file: %s.  An "
+"An error occurred processing the storage systems meta data file: %s.  An "
 "empty dictionary will be returned to the client."
 msgstr ""
 
@@ -2911,11 +3052,11 @@
 
 #: glance/store/filesystem.py:302
 #, python-format
-msgid "Unable to remove partial image data for image %s: %s"
+msgid "Unable to remove partial image data for image %(id)s: %(error)s"
 msgstr ""
 
-#: glance/store/gridfs.py:100
-msgid "Missing dependecies: pymongo"
+#: glance/store/gridfs.py:97
+msgid "Missing dependencies: pymongo"
 msgstr ""
 
 #: glance/store/gridfs.py:113 glance/store/s3.py:252 glance/store/swift.py:366
@@ -2934,14 +3075,14 @@
 msgid "GridFS already has an image at location %s"
 msgstr ""
 
-#: glance/store/gridfs.py:186
+#: glance/store/gridfs.py:183
 #, python-format
-msgid "Adding a new image to GridFS with id %s and size %s"
+msgid "Adding a new image to GridFS with id %(id)s and size %(size)s"
 msgstr ""
 
-#: glance/store/gridfs.py:198
+#: glance/store/gridfs.py:196
 #, python-format
-msgid "Uploaded image %s, md5 %s, length %s to GridFS"
+msgid "Uploaded image %(id)s, md5 %(md5)s, length %(length)s to GridFS"
 msgstr ""
 
 #: glance/store/http.py:80
@@ -2953,31 +3094,42 @@
 msgid "No address specified in HTTP URL"
 msgstr "HTTP URL中没有指定地址"
 
+#: glance/store/http.py:153
+#, python-format
+msgid "The HTTP URL exceeded %s maximum redirects."
+msgstr ""
+
 #: glance/store/http.py:165
 #, python-format
 msgid "HTTP URL returned a %s status code."
 msgstr ""
 
-#: glance/store/http.py:170
-msgid "The HTTP URL attempted to redirect with an invalid status code."
+#: glance/store/http.py:172
+#, python-format
+msgid "The HTTP URL attempted to redirect with an invalid %s status code."
 msgstr ""
 
-#: glance/store/sheepdog.py:42
+#: glance/store/rbd.py:51
 msgid ""
-"Images will be chunked into objects of this size (in megabytes). For best "
-"performance, this should be a power of two."
+"RADOS images will be chunked into objects of this size (in megabytes). For "
+"best performance, this should be a power of two."
 msgstr ""
 
 #: glance/store/rbd.py:55
 msgid "RADOS pool in which images are stored."
 msgstr ""
 
-#: glance/store/rbd.py:61
-msgid "RADOS user to authenticate as (only applicable if using cephx.)"
+#: glance/store/rbd.py:57
+msgid ""
+"RADOS user to authenticate as (only applicable if using Cephx. If <None>, a "
+"default will be chosen based on the client. section in rbd_store_ceph_conf)"
 msgstr ""
 
-#: glance/store/rbd.py:64
-msgid "Ceph configuration file path."
+#: glance/store/rbd.py:61
+msgid ""
+"Ceph configuration file path. If <None>, librados will locate the default "
+"config. If using cephx authentication, this file should include a reference "
+"to the right keyring in a client.<USER> section"
 msgstr ""
 
 #: glance/store/rbd.py:107
@@ -3061,9 +3213,9 @@
 msgid "The S3 bucket to be used to store the Glance data."
 msgstr ""
 
-#: glance/store/s3.py:47
+#: glance/store/s3.py:45
 msgid ""
-"The local directory where uploads will be staged before they are transfered "
+"The local directory where uploads will be staged before they are transferred "
 "into S3."
 msgstr ""
 
@@ -3102,6 +3254,11 @@
 msgid "Badly formed S3 URI. Missing s3 service URL."
 msgstr "错误格式的S3 URI。缺少s3服务URL。"
 
+#: glance/store/s3.py:165
+#, python-format
+msgid "Badly formed S3 URI: %s"
+msgstr ""
+
 #: glance/store/s3.py:307
 #, python-format
 msgid ""
@@ -3266,6 +3423,12 @@
 msgid "Getting images deleted before %s"
 msgstr "在 %s 之前删除镜像"
 
+#: glance/store/sheepdog.py:42
+msgid ""
+"Images will be chunked into objects of this size (in megabytes). For best "
+"performance, this should be a power of two."
+msgstr ""
+
 #: glance/store/sheepdog.py:46
 msgid "Port of sheep daemon."
 msgstr ""
@@ -3378,6 +3541,29 @@
 "compressed format, eg qcow2."
 msgstr ""
 
+#: glance/store/swift.py:110
+msgid ""
+"The number of times a Swift download will be retried before the request "
+"fails."
+msgstr ""
+
+#: glance/store/swift.py:130
+#, python-format
+msgid "Swift exception raised %s"
+msgstr ""
+
+#: glance/store/swift.py:135
+#, python-format
+msgid "Stopping Swift retries after %d attempts"
+msgstr ""
+
+#: glance/store/swift.py:140
+#, python-format
+msgid ""
+"Retrying Swift connection (%(retries)d/%(max_retries)d) with range=%(start)d-"
+"%(end)d"
+msgstr ""
+
 #: glance/store/swift.py:214
 msgid ""
 "URI cannot contain more than one occurrence of a scheme. If you have "
@@ -3395,8 +3581,9 @@
 msgid "Badly formed Swift URI."
 msgstr ""
 
-#: glance/store/swift.py:541 glance/store/swift.py:702
-msgid "Swift could not find image at URI."
+#: glance/store/swift.py:328
+#, python-format
+msgid "Swift could not find object %s."
 msgstr ""
 
 #: glance/store/swift.py:375
@@ -3404,9 +3591,9 @@
 msgid "Deleting chunk %s"
 msgstr ""
 
-#: glance/store/swift.py:331
+#: glance/store/swift.py:379
 #, python-format
-msgid "Failed to delete orphaned chunk %s/%s"
+msgid "Failed to delete orphaned chunk %(container)s/%(chunk)s"
 msgstr ""
 
 #: glance/store/swift.py:391
@@ -3446,6 +3633,10 @@
 "向Swift添加对象失败。\n"
 "从Swift得到错误：%(e)s"
 
+#: glance/store/swift.py:541 glance/store/swift.py:702
+msgid "Swift could not find image at URI."
+msgstr ""
+
 #: glance/store/swift.py:562
 #, python-format
 msgid ""
@@ -3482,6 +3673,159 @@
 msgid "Multi-tenant Swift storage requires a service catalog."
 msgstr ""
 
+#: glance/store/vmware_datastore.py:45
+msgid ""
+"ESX/ESXi or vCenter Server target system. The server value can be an IP "
+"address or a DNS name."
+msgstr ""
+
+#: glance/store/vmware_datastore.py:48
+msgid "Username for authenticating with VMware ESX/VC server."
+msgstr ""
+
+#: glance/store/vmware_datastore.py:51
+msgid "Password for authenticating with VMware ESX/VC server."
+msgstr ""
+
+#: glance/store/vmware_datastore.py:56
+msgid ""
+"Inventory path to a datacenter. If the vmware_server_host specified is an "
+"ESX/ESXi, the vmware_datacenter_path is optional. If specified, it should be "
+"\"ha-datacenter\"."
+msgstr ""
+
+#: glance/store/vmware_datastore.py:61
+msgid "Datastore associated with the datacenter."
+msgstr ""
+
+#: glance/store/vmware_datastore.py:64
+msgid ""
+"Number of times VMware ESX/VC server API must be retried upon connection "
+"related issues."
+msgstr ""
+
+#: glance/store/vmware_datastore.py:68
+msgid ""
+"The interval used for polling remote tasks invoked on VMware ESX/VC server."
+msgstr ""
+
+#: glance/store/vmware_datastore.py:72
+msgid ""
+"The name of the directory where the glance images will be stored in the "
+"VMware datastore."
+msgstr ""
+
+#: glance/store/vmware_datastore.py:76
+msgid "Allow to perform insecure SSL requests to ESX/VC"
+msgstr ""
+
+#: glance/store/vmware_datastore.py:164
+#, python-format
+msgid "Badly formed VMware datastore URI %(uri)s."
+msgstr ""
+
+#: glance/store/vmware_datastore.py:205
+#, python-format
+msgid "Could not find datastore %(ds_name)s in datacenter %(dc_path)s"
+msgstr ""
+
+#: glance/store/vmware_datastore.py:259
+#, python-format
+msgid "Image file %(image_id)s already exists!"
+msgstr ""
+
+#: glance/store/vmware_datastore.py:327
+#, python-format
+msgid "The HTTP URL exceeded %(max_redirects)s maximum redirects."
+msgstr ""
+
+#: glance/store/vmware_datastore.py:336
+msgid "VMware datastore could not find image at URI."
+msgstr ""
+
+#: glance/store/vmware_datastore.py:339
+#, python-format
+msgid "HTTP URL %(url)s returned a %(status)s status code."
+msgstr ""
+
+#: glance/store/vmware_datastore.py:346
+#, python-format
+msgid ""
+"The HTTP URL %(path)s attempted to redirect with an invalid %(status)s "
+"status code."
+msgstr ""
+
+#: glance/store/vmware/api.py:73
+#, python-format
+msgid "Failure while invoking function: %(func)s. Error: %(excep)s."
+msgstr ""
+
+#: glance/store/vmware/api.py:159
+#, python-format
+msgid "Error while terminating session: %s."
+msgstr ""
+
+#: glance/store/vmware/api.py:162
+msgid "Successfully established connection to the server."
+msgstr ""
+
+#: glance/store/vmware/api.py:169
+#, python-format
+msgid "Error while logging out the user: %s."
+msgstr ""
+
+#: glance/store/vmware/api.py:215
+#, python-format
+msgid ""
+"Not authenticated error occurred. Will create session and try API call "
+"again: %s."
+msgstr ""
+
+#: glance/store/vmware/api.py:258
+#, python-format
+msgid "Task: %(task)s progress: %(prog)s."
+msgstr ""
+
+#: glance/store/vmware/api.py:262
+#, python-format
+msgid "Task %s status: success."
+msgstr ""
+
+#: glance/store/vmware/api.py:266 glance/store/vmware/api.py:271
+#, python-format
+msgid "Task: %(task)s failed with error: %(err)s."
+msgstr ""
+
+#: glance/store/vmware/vim.py:155
+#, python-format
+msgid "Error(s): %s occurred in the call to RetrievePropertiesEx."
+msgstr ""
+
+#: glance/store/vmware/vim.py:194
+#, python-format
+msgid "No such SOAP method %(attr)s. Detailed error: %(excep)s."
+msgstr ""
+
+#: glance/store/vmware/vim.py:203
+#, python-format
+msgid "httplib error in %(attr)s: %(excep)s."
+msgstr ""
+
+#: glance/store/vmware/vim.py:214
+#, python-format
+msgid "Socket error in %(attr)s: %(excep)s."
+msgstr ""
+
+#: glance/store/vmware/vim.py:223
+#, python-format
+msgid "Type error in %(attr)s: %(excep)s."
+msgstr ""
+
+#: glance/store/vmware/vim.py:230
+#, python-format
+msgid "Error in %(attr)s. Detailed error: %(excep)s."
+msgstr ""
+
 #: glance/tests/unit/test_migrations.py:843
 #, python-format
 msgid "location: %s data lost"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/gnupg2.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/gnupg2.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/gnupg2.po	2014-02-24 08:24:36.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/gnupg2.po	2014-03-24 09:42:43.000000000 +0000
@@ -8,15 +8,15 @@
 "Project-Id-Version: gnupg 1.4.4\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
 "POT-Creation-Date: 2013-10-04 19:46+0200\n"
-"PO-Revision-Date: 2014-02-19 01:20+0000\n"
+"PO-Revision-Date: 2014-02-20 10:36+0000\n"
 "Last-Translator: Meng Jie <Unknown>\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"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:08+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:27+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "X-Poedit-Country: CHINA\n"
 "Language: zh_CN\n"
 "X-Poedit-Language: Chinese\n"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/gnupg.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/gnupg.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/gnupg.po	2014-02-24 08:24:29.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/gnupg.po	2014-03-24 09:42:36.000000000 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:17+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 11:27+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "X-Poedit-Country: CHINA\n"
 "Language: zh_CN\n"
 "X-Poedit-Language: Chinese\n"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/gODBCConfig.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/gODBCConfig.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/gODBCConfig.po	2014-02-24 08:24:29.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/gODBCConfig.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,466 +0,0 @@
-# Chinese (China) translation for unixodbc
-# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
-# This file is distributed under the same license as the unixodbc package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: unixodbc\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2003-12-02 14:45+0000\n"
-"PO-Revision-Date: 2008-03-04 20:16+0000\n"
-"Last-Translator: Tao Wei <weitao1979@gmail.com>\n"
-"Language-Team: Chinese (China) <zh_CN@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-12 11:45+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
-
-#: src/main.c:25
-msgid "gODBCConfig - ODBC Data Source Administrator"
-msgstr "gODBCC配置－ODBC数据源管理员"
-
-#: src/odbcconfig.c:70 src/odbcconfig.c:194 src/odbcconfig.c:339
-#: src/odbcconfig.c:2163
-msgid "Add"
-msgstr "添加"
-
-#: src/odbcconfig.c:80 src/odbcconfig.c:203 src/odbcconfig.c:348
-msgid "Remove"
-msgstr "删除"
-
-#: src/odbcconfig.c:90 src/odbcconfig.c:212 src/odbcconfig.c:357
-msgid "Configure..."
-msgstr "配置…"
-
-#: src/odbcconfig.c:117
-msgid ""
-"User data source configuration is stored in your home directory. This allows "
-"you configure data access without having to be system administrator"
-msgstr "用户数据源配置被保存在你的用户目录中。这样你就得以对数据存取进行配置，而不必具有系统管理员身份。"
-
-#: src/odbcconfig.c:159 src/odbcconfig.c:277 src/odbcconfig.c:423
-#: src/odbcconfig.c:1823 src/odbcconfig.c:2041 src/odbcconfig.c:2256
-msgid "Name"
-msgstr "名称"
-
-#: src/odbcconfig.c:166 src/odbcconfig.c:284 src/odbcconfig.c:430
-#: src/odbcconfig.c:1852 src/odbcconfig.c:2070 src/odbcconfig.c:2263
-msgid "Description"
-msgstr "描述"
-
-#: src/odbcconfig.c:173 src/odbcconfig.c:291 src/odbcconfig.c:640
-#: src/odbcconfig.c:1833 src/odbcconfig.c:2051
-msgid "Driver"
-msgstr "驱动程序"
-
-#: src/odbcconfig.c:180
-msgid "User DSN"
-msgstr "用户DSN"
-
-#: src/odbcconfig.c:237
-msgid ""
-"System data sources are shared among all users of this machine.These data "
-"sources may also be used by system services. Only the administrator can "
-"configure system data sources."
-msgstr "系统数据源由本机所有用户共享。这些数据源也可以被系统服务所调用。只有管理员有权配置系统数据源。"
-
-#: src/odbcconfig.c:298
-msgid "System DSN"
-msgstr "系统DSN"
-
-#: src/odbcconfig.c:382 src/odbcconfig.c:2215
-msgid ""
-"These drivers facilitate communication between the Driver Manager and the "
-"data server. Many ODBC drivers  for Linux can be downloaded from the "
-"Internet while others are obtained from your database vendor."
-msgstr ""
-"这些驱动程序使驱动程序管理器同数据服务器之间的交流变得容易起来。很多用于Linux的ODBC驱动程序都可以从互联网下载，其他驱动程序可以从你的数据库提供商"
-"获得。"
-
-#: src/odbcconfig.c:437 src/odbcconfig.c:2270
-msgid "Driver Lib"
-msgstr "驱动程序数据库"
-
-#: src/odbcconfig.c:444 src/odbcconfig.c:2277
-msgid "Setup Lib"
-msgstr "设置数据库"
-
-#: src/odbcconfig.c:451
-msgid "Drivers"
-msgstr "驱动程序"
-
-#: src/odbcconfig.c:490
-msgid ""
-"Tracing allows you to create logs of the calls to ODBC drivers. Great for "
-"support people, or to aid you in debugging applications.\n"
-"You must be 'root' to set"
-msgstr ""
-"跟踪程序使你得以创建访问ODBC驱动程序的日志。这对于提供支持，或者进行应用程序调试都是大有裨益的。\n"
-"你必须以“root”身份来进行设置。"
-
-#: src/callbacks.c:1071 src/callbacks.c:1464 src/odbcconfig.c:518
-#: src/odbcconfig.c:1795 src/odbcconfig.c:1804 src/odbcconfig.c:2013
-#: src/odbcconfig.c:2022
-msgid "Browse"
-msgstr "浏览"
-
-#: src/odbcconfig.c:527
-msgid "Trace File"
-msgstr "跟踪文件"
-
-#: src/odbcconfig.c:536
-msgid "Tracing On"
-msgstr "跟踪"
-
-#: src/odbcconfig.c:545
-msgid "Tracing"
-msgstr "跟踪"
-
-#: src/odbcconfig.c:575
-msgid ""
-"Open DataBase Connectivity (ODBC) was developed to be an Open and portable "
-"standard for accessing data. unixODBC implements this standard for "
-"Linux/UNIX."
-msgstr "开放式数据库互联（ODBC）被开发成一个开放性的、便捷的数据库访问标准。unixODBC对Linux/UNIX采用的就是这个标准。"
-
-#: src/odbcconfig.c:585
-msgid "http://www.unixodbc.org"
-msgstr "http://www.unixodbc.org"
-
-#: src/odbcconfig.c:595 src/odbcconfig.c:649
-msgid "Database System"
-msgstr "数据库系统"
-
-#: src/odbcconfig.c:604
-msgid "Credits"
-msgstr "贡献者"
-
-#: src/odbcconfig.c:622
-msgid "Application"
-msgstr "应用程序"
-
-#: src/odbcconfig.c:631
-msgid "Driver Manager"
-msgstr "驱动程序管理器"
-
-#: src/odbcconfig.c:658
-msgid "odbcinst.ini"
-msgstr "odbcinst.ini"
-
-#: src/odbcconfig.c:667
-msgid "odbc.ini"
-msgstr "odbc.ini"
-
-#: src/odbcconfig.c:676
-msgid "Config"
-msgstr "配置"
-
-#: src/odbcconfig.c:739
-msgid "About"
-msgstr "关于"
-
-#: src/odbcconfig.c:847
-msgid "gODBCConfig - Appication"
-msgstr "gODBC配置－应用程序"
-
-#: src/odbcconfig.c:892
-msgid ""
-"The Application communicates with the Driver Manager using the standard ODBC "
-"calls.\n"
-"\n"
-"The application does not care; where the data is stored, how it is stored, "
-"or even how the system is configured to access the data.\n"
-"\n"
-"The Application only needs to know the data source name (DSN)\n"
-"\n"
-"The Application is not hard wired to a particular database system. This "
-"allows the user to select a different database system using the ODBCConfig "
-"Tool."
-msgstr ""
-"本程序使用标准的ODBC调用来与驱动管理程序通信。\n"
-"\n"
-"本程序与数据的存储位置，存储方式，以及系统对数据连接方式的配置无关。\n"
-"\n"
-"本程序只需要数据源名称即可 (DSN)\n"
-"\n"
-"本程序并不与特定的数据库系统绑定。这样可以使用户通过ODBC配置工具选择不同的数据库系统。"
-
-#: src/odbcconfig.c:951
-msgid "gODBCConfig - Driver Manager"
-msgstr "gODBC配置－驱动程序管理器"
-
-#: src/odbcconfig.c:967
-msgid ""
-"The Driver Manager carries out a number of functions, such as:\n"
-"1. Resolve data source names via odbcinst lib)\n"
-"2. Loads any required drivers\n"
-"3. Calls the drivers exposed functions to communicate with the database. "
-"Some functionality, such as listing all Data Source, is only present in the "
-"Driver Manager or via odbcinst lib)."
-msgstr ""
-"本驱动管理程序可以完成许多功能，如下所示：\n"
-"1. 通过ODBC数据库分解数据源名称）\n"
-"2. 加载任何需要的驱动。\n"
-"3. 使驱动程序与数据库进行通讯。某些功能，如列出当前所有数据源，仅在驱动管理工具中或通过驱动数据库工具来实现）。"
-
-#: src/odbcconfig.c:977
-msgid " "
-msgstr " "
-
-#: src/odbcconfig.c:1058
-msgid "ODBCConfig - Drivers"
-msgstr "ODBC配置－驱动程序"
-
-#: src/odbcconfig.c:1093
-msgid ""
-"The ODBC Drivers contain code specific to a Database System and provides a "
-"set of callable functions to the Driver Manager.\n"
-"Drivers may implement some database functionality when it is required by "
-"ODBC and is not present in the Database System.\n"
-"Drivers may also translate data types.\n"
-"\n"
-"ODBC Drivers can be obtained from the Internet or directly from the Database "
-"vendor.\n"
-"\n"
-"Check http://www.unixodbc.org for drivers"
-msgstr ""
-"ODBC驱动包含特殊的联接到数据库系统的代码，同时还提供了可供驱动管理工具使用的一套功能。\n"
-"在ODBC需要，而系同中并不存在相应功能的情况下，驱动程序可以执行某些特殊的数据库功能。\n"
-"驱动程序还可以转换数据类型。\n"
-"\n"
-"ODBC驱动可以从网络或销售商处获得。\n"
-"\n"
-"驱动查找网址 http://www.unixodbc.org"
-
-#: src/odbcconfig.c:1165
-msgid "ODBCConfig - Database Systems"
-msgstr "ODBC配置－数据库系统"
-
-#: src/odbcconfig.c:1181
-msgid ""
-"Perhaps the most common type of Database System today is an SQL Server\n"
-"\n"
-"SQL Servers with Heavy Functionality\n"
-"  ADABAS-D\n"
-"  Empress\n"
-"  Sybase - www.sybase.com\n"
-"  Oracle - www.oracle.com\n"
-"\n"
-"SQL Servers with Lite Functionality\n"
-"  MiniSQL\n"
-"  MySQL\n"
-"  Solid\n"
-"\n"
-"The Database System may be running on the local machine or on a remote "
-"machine. It may also store its information in a variety of ways. This does "
-"not matter to an ODBC application because the Driver Manager and the Driver "
-"provides a consistent interface to the Database System."
-msgstr ""
-"也许现在大多数的数据库系统类型都是SQL数据库\n"
-"\n"
-"重量级SQL数据库\n"
-"  ADABAS-D\n"
-"  Empress\n"
-"  Sybase - www.sybase.com\n"
-"  Oracle - www.oracle.com\n"
-"\n"
-"轻量级SQL数据库\n"
-"  MiniSQL\n"
-"  MySQL\n"
-"  Solid\n"
-"\n"
-"数据库系统可能运行于本地或远程机器上。可能的存储数据方式也有很多种。但这些对于ODBC应用程序来说都不重要，因为驱动管理和驱动程序提供了联接到数据库的统一"
-"接口。"
-
-#: src/odbcconfig.c:1272
-msgid "ODBCConfig - odbc.ini"
-msgstr "ODBC配置－odbc.ini"
-
-#: src/odbcconfig.c:1288
-msgid ""
-"This is the main configuration file for ODBC.\n"
-"It contains Data Source configuration.\n"
-"\n"
-"It is used by the Driver Manager to determine, from a given Data Source "
-"Name, such things as the name of the Driver.\n"
-"\n"
-"It is a simple text file but is configured using the ODBCConfig tool.\n"
-"The User data sources are typically stored in ~/.odbc.ini while the System "
-"data sources are stored in /etc/odbc.ini\n"
-msgstr ""
-"这是ODBC的主要配置文件。\n"
-"文件包含有数据源的配置。\n"
-"\n"
-"文件用于驱动程序管理器从给定的数据源名称来确定诸如驱动程序名称之类的信息。\n"
-"\n"
-"文件是简单的文本文件，不过是用ODBC配置工具来进行配置。\n"
-"作为其特征，用户数据源保存在~/.odbc.ini文件中，而系统数据源保存在/etc/odbc.ini文件中。\n"
-
-#: src/odbcconfig.c:1379
-msgid "ODBCConfig"
-msgstr "ODBC配置"
-
-#: src/odbcconfig.c:1395
-msgid ""
-"This is the program you are using now. This program allows the user to "
-"easily configure ODBC."
-msgstr "这就是你现在正在使用的程序。该程序允许用户较容易地配置ODBC。"
-
-#: src/odbcconfig.c:1486
-msgid "ODBCConfig - odbcinst.ini"
-msgstr "ODBC配置－odbcinst.ini"
-
-#: src/odbcconfig.c:1502
-msgid ""
-"odbcinst.ini contains a list of all installed ODBC Drivers. Each entry also "
-"contains some information about the driver such as the file name(s) of the "
-"driver.\n"
-"\n"
-"An entry should be made when an ODBC driver is installed and removed when "
-"the driver is uninstalled. This can be done using ODBCConfig or the odbcinst "
-"command tool."
-msgstr ""
-"odbcinst.ini包含所有已安装的ODBC驱动程序列表。每个条目也包含该有驱动程序的一些信息，诸如驱动程序的文件名称等。\n"
-"\n"
-"当某个ODBC驱动程序被安装或者被卸载删除时，会创建一个条目。这可以通过使用ODBC配置或者odbcinst命令工具来完成。"
-
-#: src/odbcconfig.c:1594
-msgid "ODBCConfig - Credits"
-msgstr "gODBC配置－贡献者"
-
-#: src/odbcconfig.c:1638
-msgid ""
-"unixODBC consists of the following components\n"
-"\n"
-"- Driver Manager\n"
-"- GUI Data Manager\n"
-"- GUI Config\n"
-"- Several Drivers and Driver Config libs\n"
-"- Driver Code Template\n"
-"- Driver Config Code Template\n"
-"- ODBCINST lib\n"
-"- odbcinst (command line tool for install scripts)\n"
-"- INI lib\n"
-"- LOG lib\n"
-"- LST lib\n"
-"- TRE lib\n"
-"- SQI lib\n"
-"- isql (command line tool for SQL)\n"
-"\n"
-"All code is released under GPL and the LGPL license.\n"
-msgstr ""
-"unixODBC由以下组件构成\n"
-"\n"
-"－驱动程序管理器\n"
-"－图形用户界面数据管理器\n"
-"－图形用户界面配置\n"
-"－若干驱动程序及驱动程序配置数据库\n"
-"－驱动程序代码模板\n"
-"－驱动程序配置代码模板\n"
-"－ODBCINST数据库\n"
-"－odbcinst（用于安装脚本的命令行工具）\n"
-"－INI数据库\n"
-"－LOG数据库\n"
-"－LST数据库\n"
-"－TRE数据库\n"
-"－SQI数据库\n"
-"－isql（用于SQL的命令行工具）\n"
-"\n"
-"所有代码均基于GPL及LGPL许可文件发布。\n"
-
-#: src/odbcconfig.c:1708
-msgid "gODBCConfig - New Driver"
-msgstr "gODBC配置－新驱动程序"
-
-#: src/odbcconfig.c:1813 src/odbcconfig.c:2031
-msgid "FileUsage"
-msgstr "文件使用方法"
-
-#: src/odbcconfig.c:1843 src/odbcconfig.c:2061
-msgid "Setup"
-msgstr "安装"
-
-#: src/odbcconfig.c:1926
-msgid "gODBCConfig - Configure Driver"
-msgstr "gODBC配置－配置驱动程序"
-
-#: src/odbcconfig.c:2143
-msgid "gODBCConfig - Add DSN"
-msgstr "gODBC配置－添加DSN"
-
-#: src/odbcconfig.c:2153
-msgid "Select the DRIVER to use or Add a new one"
-msgstr "选择要使用的驱动程序，或者添加新的驱动程序"
-
-#: src/callbacks.c:118 src/callbacks.c:369
-#, c-format
-msgid "Could not load %s"
-msgstr "不能加载%s"
-
-#: src/callbacks.c:405 src/callbacks.c:730
-#, c-format
-msgid "Could not write to (%s)"
-msgstr "不能写入到(%s)"
-
-#: src/callbacks.c:524
-msgid "Select a driver to remove"
-msgstr "选择要删除的驱动程序"
-
-#: src/callbacks.c:565
-msgid "Select a driver to configure"
-msgstr "选择要进行配置的驱动程序"
-
-#: src/callbacks.c:704
-msgid "Enter a DSN name"
-msgstr "输入一个DSN名称"
-
-#: src/callbacks.c:718 src/callbacks.c:847 src/callbacks.c:1221
-#, c-format
-msgid "Could not construct a property list for (%s)"
-msgstr "不能为(%s)构建属性列表"
-
-#: src/callbacks.c:816
-msgid "Select a driver to Use"
-msgstr "选择要使用的驱动程序"
-
-#: src/callbacks.c:886 src/callbacks.c:1260
-msgid "DSN"
-msgstr "DSN"
-
-#: src/callbacks.c:1176
-msgid "Select a DSN to configure"
-msgstr "选择要进行配置的DSN"
-
-#: src/callbacks.c:1197
-msgid "Unable to find a Driver line for this entry"
-msgstr "未能为本条目找到驱动程序行"
-
-#: src/callbacks.c:1604
-msgid "Select File"
-msgstr "选择文件"
-
-#: src/callbacks.c:1677 src/callbacks.c:1713
-msgid "Select a DSN to Remove"
-msgstr "选择要删除的DSN"
-
-#: src/callbacks.c:1730
-#, c-format
-msgid "Could not write property list for (%s)"
-msgstr "不能为(%s)写入属性列表"
-
-#: src/callbacks.c:1827
-#, c-format
-msgid "Could not write to %s"
-msgstr "不能写入到%s"
-
-#: src/support.c:97 src/support.c:135
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "未能找到象图映射文件：%s"
-
-#: src/support.c:113
-#, c-format
-msgid "Couldn't create pixmap from file: %s"
-msgstr "未能由文件%s创建象图映射文件"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/gold.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/gold.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/gold.po	2014-02-24 08:24:24.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/gold.po	2014-03-24 09:42:32.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 10:39+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 10:40+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: archive.cc:119
 #, c-format
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/gprof.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/gprof.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/gprof.po	2014-02-24 08:24:24.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/gprof.po	2014-03-24 09:42:32.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 10:39+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 10:40+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: alpha.c:102 mips.c:54
 msgid "<indirect child>"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/grep.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/grep.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/grep.po	2014-02-24 08:24:29.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/grep.po	2014-03-24 09:42:36.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:18+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 11:27+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: lib/argmatch.c:133
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/grub.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/grub.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/grub.po	2014-02-24 08:24:36.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/grub.po	2014-03-24 09:42:43.000000000 +0000
@@ -11,14 +11,14 @@
 "Project-Id-Version: grub 1.97+20110101\n"
 "Report-Msgid-Bugs-To: bug-grub@gnu.org\n"
 "POT-Creation-Date: 2013-12-24 21:18+0100\n"
-"PO-Revision-Date: 2014-02-18 11:30+0000\n"
+"PO-Revision-Date: 2014-03-13 14:24+0000\n"
 "Last-Translator: Aron Xu <Unknown>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:11+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:29+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: grub-core/bus/usb/serial/ftdi.c:145 grub-core/bus/usb/serial/pl2303.c:158
@@ -2708,13 +2708,13 @@
 msgid ""
 "Press enter to boot the selected OS, `e' to edit the commands before booting "
 "or `c' for a command-line. ESC to return previous menu."
-msgstr ""
+msgstr "按回车键启动选中的操作系统，按‘e’键编辑启动项，按‘c'进入命令行。按ESC键返回到上一级菜单。"
 
 #: grub-core/gfxmenu/gui_label.c:190 grub-core/normal/menu_text.c:192
 msgid ""
 "Press enter to boot the selected OS, `e' to edit the commands before booting "
 "or `c' for a command-line."
-msgstr ""
+msgstr "按回车键启动选中的操作系统，按‘e’键编辑启动项，按‘c'进入命令行。"
 
 #: grub-core/gfxmenu/gui_label.c:194
 msgid "enter: boot, `e': options, `c': cmd-line"
@@ -6415,7 +6415,7 @@
 
 #: util/grub.d/10_hurd.in:91
 msgid "%s, with Hurd %s (recovery mode)"
-msgstr ""
+msgstr "%s，Hurd %s (恢复模式)"
 
 #: util/grub.d/10_hurd.in:94
 msgid "%s, with Hurd %s"
@@ -6442,7 +6442,7 @@
 #: util/grub.d/10_linux.in:233 util/grub.d/10_netbsd.in:168
 #: util/grub.d/30_os-prober.in:247
 msgid "Advanced options for %s"
-msgstr ""
+msgstr "%s 高级选项"
 
 #: util/grub.d/10_illumos.in:40
 msgid "Loading kernel of Illumos ..."
@@ -6557,7 +6557,7 @@
 #. TRANSLATORS: %s is replaced with an OS name
 #: util/grub.d/20_linux_xen.in:246
 msgid "Advanced options for %s (with Xen hypervisor)"
-msgstr ""
+msgstr "%s 高级选项 (使用 Xen 虚拟机管理程序)"
 
 #: util/grub.d/30_os-prober.in:137
 msgid "Found %s on %s\\n"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/gst-plugins-good-1.0.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/gst-plugins-good-1.0.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/gst-plugins-good-1.0.po	2014-02-24 08:24:49.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/gst-plugins-good-1.0.po	2014-03-24 09:42:56.000000000 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: gst-plugins-good 0.10.16.2\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
 "POT-Creation-Date: 2014-02-08 12:24+0100\n"
-"PO-Revision-Date: 2014-02-18 11:34+0000\n"
+"PO-Revision-Date: 2014-03-15 15:54+0000\n"
 "Last-Translator: Ji ZhengYu <Unknown>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:49+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 14:33+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: ext/jack/gstjackaudiosink.c:358 ext/jack/gstjackaudiosrc.c:366
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/gutenprint.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/gutenprint.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/gutenprint.po	2014-02-24 08:24:39.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/gutenprint.po	2014-03-24 09:42:46.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: gutenprint 20110308\n"
 "Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2014-02-15 11:20-0500\n"
+"POT-Creation-Date: 2014-03-07 07:49-0500\n"
 "PO-Revision-Date: 2012-02-15 08:07+0000\n"
 "Last-Translator: Wylmer Wang <Unknown>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:30+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:51+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: \n"
 
 #: src/main/dither-main.c:44 src/main/print-color.c:49
@@ -1772,7 +1772,7 @@
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:4413 src/main/print-olympus.c:4657
+#: src/main/print-escp2.c:4413 src/main/print-olympus.c:4668
 #: src/main/print-raw.c:237
 msgid "Print options not verified; cannot print.\n"
 msgstr "打印选项无法证实：不能打印.\n"
@@ -10472,5077 +10472,5109 @@
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4605
-msgid "Epson Stylus NX635"
+msgid "Epson Stylus NX630"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4606
-msgid "Epson Stylus Photo PX650"
+msgid "Epson Stylus NX635"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4607
-msgid "Epson Stylus Photo PX700W"
+msgid "Epson Stylus NX645"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4608
-msgid "Epson Stylus Photo PX710W"
+msgid "Epson Stylus Photo PX650"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4609
-msgid "Epson Stylus Photo PX800FW"
+msgid "Epson Stylus Photo PX700W"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4610
-msgid "Epson Stylus Photo PX810FW"
+msgid "Epson Stylus Photo PX710W"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4611
-msgid "Epson Stylus S20"
+msgid "Epson Stylus Photo PX800FW"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4612
-msgid "Epson Stylus S21"
+msgid "Epson Stylus Photo PX810FW"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4613
-msgid "Epson Stylus S50"
+msgid "Epson Stylus S20"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4614
-msgid "Epson Stylus SX100"
+msgid "Epson Stylus S21"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4615
-msgid "Epson Stylus SX105"
+msgid "Epson Stylus S50"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4616
-msgid "Epson Stylus SX110"
+msgid "Epson Stylus SX100"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4617
-msgid "Epson Stylus SX115"
+msgid "Epson Stylus SX105"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4618
-msgid "Epson Stylus SX200"
+msgid "Epson Stylus SX110"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4619
-msgid "Epson Stylus SX205"
+msgid "Epson Stylus SX115"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4620
-msgid "Epson Stylus SX210"
+msgid "Epson Stylus SX200"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4621
-msgid "Epson Stylus SX215"
+msgid "Epson Stylus SX205"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4622
-msgid "Epson Stylus SX400"
+msgid "Epson Stylus SX210"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4623
-msgid "Epson Stylus SX405"
+msgid "Epson Stylus SX215"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4624
-msgid "Epson Stylus SX410"
+msgid "Epson Stylus SX400"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4625
-msgid "Epson Stylus SX415"
+msgid "Epson Stylus SX405"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4626
-msgid "Epson Stylus SX420"
+msgid "Epson Stylus SX410"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4627
-msgid "Epson Stylus SX445W"
+msgid "Epson Stylus SX415"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4628
-msgid "Epson Stylus SX510W"
+msgid "Epson Stylus SX420"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4629
-msgid "Epson Stylus SX515"
+msgid "Epson Stylus SX445W"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4630
-msgid "Epson Stylus SX525"
+msgid "Epson Stylus SX510W"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4631
-msgid "Epson Stylus SX535FW"
+msgid "Epson Stylus SX515"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4632
-msgid "Epson Stylus SX600FW"
+msgid "Epson Stylus SX525"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4633
-msgid "Epson Stylus SX610FW"
+msgid "Epson Stylus SX535FW"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4634
-msgid "Epson Stylus SX615"
+msgid "Epson Stylus SX600FW"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4635
-msgid "Epson Stylus SX650"
+msgid "Epson Stylus SX610FW"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4636
-msgid "Epson Stylus T13"
+msgid "Epson Stylus SX615"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4637
-msgid "Epson Stylus T20"
+msgid "Epson Stylus SX630"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4638
-msgid "Epson Stylus T21"
+msgid "Epson Stylus SX635"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4639
-msgid "Epson Stylus T22"
+msgid "Epson Stylus SX645"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4640
-msgid "Epson Stylus T22E"
+msgid "Epson Stylus SX650"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4641
-msgid "Epson Stylus T26"
+msgid "Epson Stylus T13"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4642
-msgid "Epson Stylus T30"
+msgid "Epson Stylus T20"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4643
-msgid "Epson Stylus T40W"
+msgid "Epson Stylus T21"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4644
-msgid "Epson Stylus T50"
+msgid "Epson Stylus T22"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4645
-msgid "Epson Stylus T59"
+msgid "Epson Stylus T22E"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4646
-msgid "Epson Stylus T60"
+msgid "Epson Stylus T26"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4647
-msgid "Epson Stylus TX100"
+msgid "Epson Stylus T30"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4648
-msgid "Epson Stylus TX101"
+msgid "Epson Stylus T40W"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4649
-msgid "Epson Stylus TX102"
+msgid "Epson Stylus T50"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4650
-msgid "Epson Stylus TX103"
+msgid "Epson Stylus T59"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4651
-msgid "Epson Stylus TX104"
+msgid "Epson Stylus T60"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4652
-msgid "Epson Stylus TX105"
+msgid "Epson Stylus TX100"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4653
-msgid "Epson Stylus TX106"
+msgid "Epson Stylus TX101"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4654
-msgid "Epson Stylus TX109"
+msgid "Epson Stylus TX102"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4655
-msgid "Epson Stylus TX110"
+msgid "Epson Stylus TX103"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4656
-msgid "Epson Stylus TX125"
+msgid "Epson Stylus TX104"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4657
-msgid "Epson Stylus TX200"
+msgid "Epson Stylus TX105"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4658
-msgid "Epson Stylus TX210"
+msgid "Epson Stylus TX106"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4659
-msgid "Epson Stylus TX300F"
+msgid "Epson Stylus TX109"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4660
-msgid "Epson Stylus TX400"
+msgid "Epson Stylus TX110"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4661
-msgid "Epson Stylus TX410"
+msgid "Epson Stylus TX125"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4662
-msgid "Epson Stylus TX420"
+msgid "Epson Stylus TX200"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4663
-msgid "Epson Stylus TX510FN"
+msgid "Epson Stylus TX210"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4664
-msgid "Epson Stylus TX550W"
+msgid "Epson Stylus TX300F"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4665
-msgid "Epson Stylus TX610FW"
+msgid "Epson Stylus TX400"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4666
-msgid "Epson Stylus TX615"
+msgid "Epson Stylus TX410"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4667
-msgid "Epson Stylus TX650"
+msgid "Epson Stylus TX420"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4668
-msgid "Epson Stylus TX659"
+msgid "Epson Stylus TX510FN"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4669
-msgid "Epson PictureMate"
+msgid "Epson Stylus TX550W"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4670
-msgid "Epson PictureMate Dash"
+msgid "Epson Stylus TX610FW"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4671
-msgid "Epson PictureMate Deluxe"
+msgid "Epson Stylus TX615"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4672
-msgid "Epson PictureMate Flash"
+msgid "Epson Stylus TX630"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4673
-msgid "Epson PictureMate Pal"
+msgid "Epson Stylus TX635"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4674
-msgid "Epson PictureMate Snap"
+msgid "Epson Stylus TX645"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4675
-msgid "Epson PictureMate 100"
+msgid "Epson Stylus TX650"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4676
-msgid "Epson PictureMate 200"
+msgid "Epson Stylus TX659"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4677
-msgid "Epson PictureMate 210"
+msgid "Epson PictureMate"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4678
-msgid "Epson PictureMate 215"
+msgid "Epson PictureMate Dash"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4679
-msgid "Epson PictureMate 240"
+msgid "Epson PictureMate Deluxe"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4680
-msgid "Epson PictureMate 250"
+msgid "Epson PictureMate Flash"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4681
-msgid "Epson PictureMate 260"
+msgid "Epson PictureMate Pal"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4682
-msgid "Epson PictureMate 270"
+msgid "Epson PictureMate Snap"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4683
-msgid "Epson PictureMate 280"
+msgid "Epson PictureMate 100"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4684
-msgid "Epson PictureMate 290"
+msgid "Epson PictureMate 200"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4685
-msgid "Epson PictureMate 500"
+msgid "Epson PictureMate 210"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4686
-msgid "Epson PictureMate 2005"
+msgid "Epson PictureMate 215"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4687
-msgid "Epson WorkForce 30"
+msgid "Epson PictureMate 240"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4688
-msgid "Epson WorkForce 40"
+msgid "Epson PictureMate 250"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4689
-msgid "Epson WorkForce 310"
+msgid "Epson PictureMate 260"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4690
-msgid "Epson WorkForce 315"
+msgid "Epson PictureMate 270"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4691
-msgid "Epson WorkForce 500"
+msgid "Epson PictureMate 280"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4692
-msgid "Epson WorkForce 545"
+msgid "Epson PictureMate 290"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4693
-msgid "Epson WorkForce 600"
+msgid "Epson PictureMate 500"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4694
-msgid "Epson WorkForce 610"
+msgid "Epson PictureMate 2005"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4695
-msgid "Epson WorkForce 615"
+msgid "Epson WorkForce 30"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4696
-msgid "Epson WorkForce 630"
+msgid "Epson WorkForce 40"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4697
-msgid "Epson WorkForce 635"
+msgid "Epson WorkForce 310"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4698
-msgid "Epson WorkForce 645"
+msgid "Epson WorkForce 315"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4699
-msgid "Epson WorkForce 1100"
+msgid "Epson WorkForce 500"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4700
-msgid "Epson WF-7010 Series"
+msgid "Epson WorkForce 545"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4701
-msgid "Epson WF-7011 Series"
+msgid "Epson WorkForce 600"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4702
-msgid "Epson WF-7015 Series"
+msgid "Epson WorkForce 610"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4703
-msgid "Epson WF-7018 Series"
+msgid "Epson WorkForce 615"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4704
-msgid "Epson WF-7510 Series"
+msgid "Epson WorkForce 630"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4705
-msgid "Epson WF-7511 Series"
+msgid "Epson WorkForce 635"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4706
-msgid "Epson WF-7515 Series"
+msgid "Epson WorkForce 645"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4707
-msgid "Epson WF-7520 Series"
+msgid "Epson WorkForce 1100"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4708
-msgid "Epson WF-7521 Series"
+msgid "Epson WF-7010 Series"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4709
-msgid "Epson WF-7525 Series"
+msgid "Epson WF-7011 Series"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4710
-msgid "Epson CL 700"
+msgid "Epson WF-7015 Series"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4711
-msgid "Epson CL 750"
+msgid "Epson WF-7018 Series"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4712
-msgid "Epson CL 760"
+msgid "Epson WF-7510 Series"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4713
-msgid "Epson E 100"
+msgid "Epson WF-7511 Series"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4714
-msgid "Epson E 150"
+msgid "Epson WF-7515 Series"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4715
-msgid "Epson E 200"
+msgid "Epson WF-7520 Series"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4716
-msgid "Epson E 300"
+msgid "Epson WF-7521 Series"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4717
-msgid "Epson E 500"
+msgid "Epson WF-7525 Series"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4718
-msgid "Epson E 520"
+msgid "Epson CL 700"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4719
-msgid "Epson E 700"
+msgid "Epson CL 750"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4720
-msgid "Epson E 720"
+msgid "Epson CL 760"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4721
-msgid "Epson EM 900C"
+msgid "Epson E 100"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4722
-msgid "Epson EM 930C"
+msgid "Epson E 150"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4723
-msgid "Epson EP 302"
+msgid "Epson E 200"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4724
-msgid "Epson EP 702A"
+msgid "Epson E 300"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4725
-msgid "Epson EP 801A"
+msgid "Epson E 500"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4726
-msgid "Epson EP 901A"
+msgid "Epson E 520"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4727
-msgid "Epson EP 901F"
+msgid "Epson E 700"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4728
-msgid "Epson MC 2000"
+msgid "Epson E 720"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4729
-msgid "Epson MC 5000"
+msgid "Epson EM 900C"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4730
-msgid "Epson MC 7000"
+msgid "Epson EM 930C"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4731
-msgid "Epson MC 9000"
+msgid "Epson EP 302"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4732
-msgid "Epson MC 10000"
+msgid "Epson EP 702A"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4733
-msgid "Epson ME 300"
+msgid "Epson EP 801A"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4734
-msgid "Epson ME 320"
+msgid "Epson EP 901A"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4735
-msgid "Epson ME Office 70"
+msgid "Epson EP 901F"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4736
-msgid "Epson ME Office 80W"
+msgid "Epson MC 2000"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4737
-msgid "Epson ME Office 360"
+msgid "Epson MC 5000"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4738
-msgid "Epson ME Office 600F"
+msgid "Epson MC 7000"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4739
-msgid "Epson ME Office 620F"
+msgid "Epson MC 9000"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4740
-msgid "Epson ME Office 700FW"
+msgid "Epson MC 10000"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4741
-msgid "Epson ME Office 940FW"
+msgid "Epson ME 300"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4742
-msgid "Epson ME Office 1100"
+msgid "Epson ME 320"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4743
-msgid "Epson MJ 930C"
+msgid "Epson ME Office 70"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4744
-msgid "Epson MJ 5100C"
+msgid "Epson ME Office 80W"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4745
-msgid "Epson MJ 6000C"
+msgid "Epson ME Office 360"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4746
-msgid "Epson MJ 8000C"
+msgid "Epson ME Office 600F"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4747
-msgid "Epson PM 670C"
+msgid "Epson ME Office 620F"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4748
-msgid "Epson PM 700C"
+msgid "Epson ME Office 700FW"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4749
-msgid "Epson PM 730C"
+msgid "Epson ME Office 940FW"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4750
-msgid "Epson PM 740C"
+msgid "Epson ME Office 1100"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4751
-msgid "Epson PM 750C"
+msgid "Epson MJ 930C"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4752
-msgid "Epson PM 760C"
+msgid "Epson MJ 5100C"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4753
-msgid "Epson PM 770C"
+msgid "Epson MJ 6000C"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4754
-msgid "Epson PM 780C"
+msgid "Epson MJ 8000C"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4755
-msgid "Epson PM 790PT"
+msgid "Epson PM 670C"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4756
-msgid "Epson PM 800C"
+msgid "Epson PM 700C"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4757
-msgid "Epson PM 850PT"
+msgid "Epson PM 730C"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4758
-msgid "Epson PM 870C"
+msgid "Epson PM 740C"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4759
-msgid "Epson PM 880C"
+msgid "Epson PM 750C"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4760
-msgid "Epson PM 930C"
+msgid "Epson PM 760C"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4761
-msgid "Epson PM 940C"
+msgid "Epson PM 770C"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4762
-msgid "Epson PM 950C"
+msgid "Epson PM 780C"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4763
-msgid "Epson PM 970C"
+msgid "Epson PM 790PT"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4764
-msgid "Epson PM 980C"
+msgid "Epson PM 800C"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4765
-msgid "Epson PM 2000C"
+msgid "Epson PM 850PT"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4766
-msgid "Epson PM 2200C"
+msgid "Epson PM 870C"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4767
-msgid "Epson PM 3000C"
+msgid "Epson PM 880C"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4768
-msgid "Epson PM 3300C"
+msgid "Epson PM 930C"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4769
-msgid "Epson PM 3500C"
+msgid "Epson PM 940C"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4770
-msgid "Epson PM 3700C"
+msgid "Epson PM 950C"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4771
-msgid "Epson PM 4000PX"
+msgid "Epson PM 970C"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4772
-msgid "Epson PM 5000C"
+msgid "Epson PM 980C"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4773
-msgid "Epson PM 7000C"
+msgid "Epson PM 2000C"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4774
-msgid "Epson PM 9000C"
+msgid "Epson PM 2200C"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4775
-msgid "Epson PM 10000"
+msgid "Epson PM 3000C"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4776
-msgid "Epson PM A650"
+msgid "Epson PM 3300C"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4777
-msgid "Epson PM A750"
+msgid "Epson PM 3500C"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4778
-msgid "Epson PM A820"
+msgid "Epson PM 3700C"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4779
-msgid "Epson PM A890"
+msgid "Epson PM 4000PX"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4780
-msgid "Epson PM A900"
+msgid "Epson PM 5000C"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4781
-msgid "Epson PM A940"
+msgid "Epson PM 7000C"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4782
-msgid "Epson PM A950"
+msgid "Epson PM 9000C"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4783
-msgid "Epson PM D600"
+msgid "Epson PM 10000"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4784
-msgid "Epson PM D750"
+msgid "Epson PM A650"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4785
-msgid "Epson PM D770"
+msgid "Epson PM A750"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4786
-msgid "Epson PM D800"
+msgid "Epson PM A820"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4787
-msgid "Epson PM D870"
+msgid "Epson PM A890"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4788
-msgid "Epson PM D1000"
+msgid "Epson PM A900"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4789
-msgid "Epson PM G700"
+msgid "Epson PM A940"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4790
-msgid "Epson PM G720"
+msgid "Epson PM A950"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4791
-msgid "Epson PM G730"
+msgid "Epson PM D600"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4792
-msgid "Epson PM G800"
+msgid "Epson PM D750"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4793
-msgid "Epson PM G820"
+msgid "Epson PM D770"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4794
-msgid "Epson PM G850"
+msgid "Epson PM D800"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4795
-msgid "Epson PM T960"
+msgid "Epson PM D870"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4796
-msgid "Epson PM G4500"
+msgid "Epson PM D1000"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4797
-msgid "Epson PX A650"
+msgid "Epson PM G700"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4798
-msgid "Epson Offirio PX B300"
+msgid "Epson PM G720"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4799
-msgid "Epson Offirio PX B500"
+msgid "Epson PM G730"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4800
-msgid "Epson PX 7V"
+msgid "Epson PM G800"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4801
-msgid "Epson PX 101"
+msgid "Epson PM G820"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4802
-msgid "Epson PX 201"
+msgid "Epson PM G850"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4803
-msgid "Epson PX 204"
+msgid "Epson PM T960"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4804
-msgid "Epson PX 401A"
+msgid "Epson PM G4500"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4805
-msgid "Epson PX 504A"
+msgid "Epson PX A650"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4806
-msgid "Epson PX 601F"
+msgid "Epson Offirio PX B300"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4807
-msgid "Epson PX 1001"
+msgid "Epson Offirio PX B500"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4808
-msgid "Epson PX 1200"
+msgid "Epson PX 7V"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4809
-msgid "Epson PX 1600F"
+msgid "Epson PX 101"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4810
-msgid "Epson PX 1700F"
+msgid "Epson PX 201"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4811
-msgid "Epson PX G900"
+msgid "Epson PX 204"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4812
-msgid "Epson PX G920"
+msgid "Epson PX 401A"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4813
-msgid "Epson PX G5000"
+msgid "Epson PX 504A"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4814
-msgid "Epson PX G5300"
+msgid "Epson PX 601F"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4815
-msgid "Epson PX V500"
+msgid "Epson PX 1001"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4816
-msgid "Epson PX V600"
+msgid "Epson PX 1200"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4817
-msgid "Epson PX V630"
+msgid "Epson PX 1600F"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4818
-msgid "Epson PX V780"
+msgid "Epson PX 1700F"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4819
-msgid "Epson PX 5500"
+msgid "Epson PX G900"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4820
-msgid "Epson PX G5600"
+msgid "Epson PX G920"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4821
-msgid "Epson PX 7000"
+msgid "Epson PX G5000"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4822
-msgid "Epson PX 9000"
+msgid "Epson PX G5300"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4823
-msgid "Apollo P-2100"
+msgid "Epson PX V500"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4824
-msgid "Apollo P-2150"
+msgid "Epson PX V600"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4825
-msgid "Apollo P-2200"
+msgid "Epson PX V630"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4826
-msgid "Apollo P-2250"
+msgid "Epson PX V780"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4827
-msgid "Apollo P-2500"
+msgid "Epson PX 5500"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4828
-msgid "Apollo P-2550"
+msgid "Epson PX G5600"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4829
-msgid "Apollo P-2600"
+msgid "Epson PX 7000"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4830
-msgid "Apollo P-2650"
+msgid "Epson PX 9000"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4831
-msgid "Apple Color StyleWriter 4100"
+msgid "Apollo P-2100"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4832
-msgid "Apple Color StyleWriter 4500"
+msgid "Apollo P-2150"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4833
-msgid "Apple Color StyleWriter 6500"
+msgid "Apollo P-2200"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4834
-msgid "Apple LaserWriter Select 360"
+msgid "Apollo P-2250"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4835
-msgid "Brother DCP-1200"
+msgid "Apollo P-2500"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4836
-msgid "Brother DCP-8045D"
+msgid "Apollo P-2550"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4837
-msgid "Brother HL-1040"
+msgid "Apollo P-2600"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4838
-msgid "Brother HL-1050"
+msgid "Apollo P-2650"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4839
-msgid "Brother HL-1060"
+msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4840
-msgid "Brother HL-1070"
+msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4841
-msgid "Brother HL-10V"
+msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4842
-msgid "Brother HL-10h"
+msgid "Apple LaserWriter Select 360"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4843
-msgid "Brother HL-1240"
+msgid "Brother DCP-1200"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4844
-msgid "Brother HL-1250"
+msgid "Brother DCP-8045D"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4845
-msgid "Brother HL-1260"
+msgid "Brother HL-1040"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4846
-msgid "Brother HL-1270N"
+msgid "Brother HL-1050"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4847
-msgid "Brother HL-1430"
+msgid "Brother HL-1060"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4848
-msgid "Brother HL-1440"
+msgid "Brother HL-1070"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4849
-msgid "Brother HL-1450"
+msgid "Brother HL-10V"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4850
-msgid "Brother HL-1470N"
+msgid "Brother HL-10h"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4851
-msgid "Brother HL-1650"
+msgid "Brother HL-1240"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4852
-msgid "Brother HL-1660e"
+msgid "Brother HL-1250"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4853
-msgid "Brother HL-1670N"
+msgid "Brother HL-1260"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4854
-msgid "Brother HL-1850"
+msgid "Brother HL-1270N"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4855
-msgid "Brother HL-1870N"
+msgid "Brother HL-1430"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4856
-msgid "Brother HL-2030"
+msgid "Brother HL-1440"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4857
-msgid "Brother HL-2035"
+msgid "Brother HL-1450"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4858
-msgid "Brother HL-2060"
+msgid "Brother HL-1470N"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4859
-msgid "Brother HL-2460"
+msgid "Brother HL-1650"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4860
-msgid "Brother HL-2460N"
+msgid "Brother HL-1660e"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4861
-msgid "Brother HL-4Ve"
+msgid "Brother HL-1670N"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4862
-msgid "Brother HL-5030"
+msgid "Brother HL-1850"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4863
-msgid "Brother HL-5040"
+msgid "Brother HL-1870N"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4864
-msgid "Brother HL-5050"
+msgid "Brother HL-2030"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4865
-msgid "Brother HL-5070N"
+msgid "Brother HL-2035"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4866
-msgid "Brother HL-5140"
+msgid "Brother HL-2060"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4867
-msgid "Brother HL-5150D"
+msgid "Brother HL-2460"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4868
-msgid "Brother HL-5170DN"
+msgid "Brother HL-2460N"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4869
-msgid "Brother HL-630"
+msgid "Brother HL-4Ve"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4870
-msgid "Brother HL-660"
+msgid "Brother HL-5030"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4871
-msgid "Brother HL-7050"
+msgid "Brother HL-5040"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4872
-msgid "Brother HL-7050N"
+msgid "Brother HL-5050"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4873
-msgid "Brother HL-760"
+msgid "Brother HL-5070N"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4874
-msgid "Brother HL-960"
+msgid "Brother HL-5140"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4875
-msgid "Brother MFC-6550MC"
+msgid "Brother HL-5150D"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4876
-msgid "Brother MFC-8300"
+msgid "Brother HL-5170DN"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4877
-msgid "Brother MFC-9500"
+msgid "Brother HL-630"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4878
-msgid "Brother MFC-9600"
+msgid "Brother HL-660"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4879
-msgid "Canon GP 335"
+msgid "Brother HL-7050"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4880
-msgid "Canon LBP-4sx"
+msgid "Brother HL-7050N"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4881
-msgid "Canon LBP-430"
+msgid "Brother HL-760"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4882
-msgid "Canon LBP-1000"
+msgid "Brother HL-960"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4883
-msgid "Canon LBP-1260"
+msgid "Brother MFC-6550MC"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4884
-msgid "Canon LBP-1760"
+msgid "Brother MFC-8300"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4885
-msgid "Canon LBP-3360"
+msgid "Brother MFC-9500"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4886
-msgid "Canon imageRunner 330s"
+msgid "Brother MFC-9600"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4887
-msgid "Citizen ProJet II"
+msgid "Canon GP 335"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4888
-msgid "DEC 1800"
+msgid "Canon LBP-4sx"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4889
-msgid "DEC LN17"
+msgid "Canon LBP-430"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4890
-msgid "Epson ActionLaser 1100"
+msgid "Canon LBP-1000"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4891
-msgid "Epson ActionLaser II"
+msgid "Canon LBP-1260"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4892
-msgid "Epson AL-C2000"
+msgid "Canon LBP-1760"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4893
-msgid "Epson AL-C2000 PS3"
+msgid "Canon LBP-3360"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4894
-msgid "Epson AL-C8500"
+msgid "Canon imageRunner 330s"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4895
-msgid "Epson AL-C8500PS"
+msgid "Citizen ProJet II"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4896
-msgid "Epson AL-C8600"
+msgid "DEC 1800"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4897
-msgid "Epson AL-C8600 PS3"
+msgid "DEC LN17"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4898
-msgid "Epson EPL-5200"
+msgid "Epson ActionLaser 1100"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4899
-msgid "Epson EPL-5200+"
+msgid "Epson ActionLaser II"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4900
-msgid "Epson EPL-5700"
+msgid "Epson AL-C2000"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4901
-msgid "Epson EPL-5700PS"
+msgid "Epson AL-C2000 PS3"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4902
-msgid "Epson EPL-5800"
+msgid "Epson AL-C8500"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4903
-msgid "Epson EPL-5800PS"
+msgid "Epson AL-C8500PS"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4904
-msgid "Epson EPL-5900"
+msgid "Epson AL-C8600"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4905
-msgid "Epson EPL-5900 PS3"
+msgid "Epson AL-C8600 PS3"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4906
-msgid "Epson EPL-6100"
+msgid "Epson EPL-5200"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4907
-msgid "Epson EPL-6100 PS3"
+msgid "Epson EPL-5200+"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4908
-msgid "Epson EPL-7100"
+msgid "Epson EPL-5700"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4909
-msgid "Epson EPL-N2050"
+msgid "Epson EPL-5700PS"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4910
-msgid "Epson EPL-N2050+"
+msgid "Epson EPL-5800"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4911
-msgid "Epson EPL-N2050PS"
+msgid "Epson EPL-5800PS"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4912
-msgid "Epson EPL-N2050PS+"
+msgid "Epson EPL-5900"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4913
-msgid "Epson EPL-N2120"
+msgid "Epson EPL-5900 PS3"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4914
-msgid "Epson EPL-N2500"
+msgid "Epson EPL-6100"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4915
-msgid "Epson EPL-N2500 PS3"
+msgid "Epson EPL-6100 PS3"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4916
-msgid "Epson EPL-N2750"
+msgid "Epson EPL-7100"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4917
-msgid "Epson EPL-N2750PS"
+msgid "Epson EPL-N2050"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4918
-msgid "Fujitsu PrintPartner 10V"
+msgid "Epson EPL-N2050+"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4919
-msgid "Fujitsu PrintPartner 16DV"
+msgid "Epson EPL-N2050PS"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4920
-msgid "Fujitsu PrintPartner 20W"
+msgid "Epson EPL-N2050PS+"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4921
-msgid "Fujitsu PrintPartner 8000"
+msgid "Epson EPL-N2120"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4922
-msgid "Generic PCL 4 Printer"
+msgid "Epson EPL-N2500"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4923
-msgid "Generic PCL 4 LF Printer"
+msgid "Epson EPL-N2500 PS3"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4924
-msgid "Generic PCL 5 Printer"
+msgid "Epson EPL-N2750"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4925
-msgid "Generic PCL 5 LF Printer"
+msgid "Epson EPL-N2750PS"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4926
-msgid "Generic PCL 5c Printer"
+msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4927
-msgid "Generic PCL 5c LF Printer"
+msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4928
-msgid "Generic PCL 5e Printer"
+msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4929
-msgid "Generic PCL 5e LF Printer"
+msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4930
-msgid "Generic PCL 6/PCL XL Printer"
+msgid "Generic PCL 4 Printer"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4931
-msgid "Generic PCL 6/PCL XL LF Printer"
+msgid "Generic PCL 4 LF Printer"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4932
-msgid "Gestetner 10512"
+msgid "Generic PCL 5 Printer"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4933
-msgid "Gestetner 2212"
+msgid "Generic PCL 5 LF Printer"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4934
-msgid "Gestetner 2712"
+msgid "Generic PCL 5c Printer"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4935
-msgid "Gestetner 3212"
+msgid "Generic PCL 5c LF Printer"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4936
-msgid "Gestetner 3502"
+msgid "Generic PCL 5e Printer"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4937
-msgid "Gestetner 3532/4235g"
+msgid "Generic PCL 5e LF Printer"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4938
-msgid "Gestetner 4502"
+msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4939
-msgid "Gestetner 4532/4245g"
+msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4940
-msgid "Gestetner 6002"
+msgid "Gestetner 10512"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4941
-msgid "Gestetner 7502"
+msgid "Gestetner 2212"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4942
-msgid "Gestetner 9002"
+msgid "Gestetner 2712"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4943
-msgid "Gestetner DSm415"
+msgid "Gestetner 3212"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4944
-msgid "Gestetner DSm615"
+msgid "Gestetner 3502"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4945
-msgid "Gestetner DSm616"
+msgid "Gestetner 3532/4235g"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4946
-msgid "Gestetner DSm618"
+msgid "Gestetner 4502"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4947
-msgid "Gestetner DSm618d"
+msgid "Gestetner 4532/4245g"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4948
-msgid "Gestetner DSm620"
+msgid "Gestetner 6002"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4949
-msgid "Gestetner DSm620d"
+msgid "Gestetner 7502"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4950
-msgid "Gestetner DSm622"
+msgid "Gestetner 9002"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4951
-msgid "Gestetner DSm627"
+msgid "Gestetner DSm415"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4952
-msgid "Gestetner DSm635/635G"
+msgid "Gestetner DSm615"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4953
-msgid "Gestetner DSm645/645G"
+msgid "Gestetner DSm616"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4954
-msgid "Gestetner DSm651"
+msgid "Gestetner DSm618"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4955
-msgid "Gestetner DSm660"
+msgid "Gestetner DSm618d"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4956
-msgid "Gestetner DSm675"
+msgid "Gestetner DSm620"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4957
-msgid "Gestetner DSm725"
+msgid "Gestetner DSm620d"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4958
-msgid "Gestetner DSm730"
+msgid "Gestetner DSm622"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4959
-msgid "Gestetner DSm735/735G"
+msgid "Gestetner DSm627"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4960
-msgid "Gestetner DSm745/745G"
+msgid "Gestetner DSm635/635G"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4961
-msgid "Gestetner MP1100/DSm7110"
+msgid "Gestetner DSm645/645G"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4962
-msgid "Gestetner MP1350/DSm7135"
+msgid "Gestetner DSm651"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4963
-msgid "Gestetner MP1600/DSm716"
+msgid "Gestetner DSm660"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4964
-msgid "Gestetner MP2000/DSm721d"
+msgid "Gestetner DSm675"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4965
-msgid "Gestetner MP2500/DSm625"
+msgid "Gestetner DSm725"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4966
-msgid "Gestetner MP3500/DSm735e"
+msgid "Gestetner DSm730"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4967
-msgid "Gestetner MP4500/DSm745e"
+msgid "Gestetner DSm735/735G"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4968
-msgid "Gestetner MP5500/DSm755"
+msgid "Gestetner DSm745/745G"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4969
-msgid "Gestetner MP6500/DSm765"
+msgid "Gestetner MP1100/DSm7110"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4970
-msgid "Gestetner MP7500/DSm775"
+msgid "Gestetner MP1350/DSm7135"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4971
-msgid "Gestetner MP9000/DSm790"
+msgid "Gestetner MP1600/DSm716"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4972
-msgid "Gestetner MP 161/DSm416"
+msgid "Gestetner MP2000/DSm721d"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:4973
+msgid "Gestetner MP2500/DSm625"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4974
+msgid "Gestetner MP3500/DSm735e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4975
+msgid "Gestetner MP4500/DSm745e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4976
+msgid "Gestetner MP5500/DSm755"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4977
+msgid "Gestetner MP6500/DSm765"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4978
+msgid "Gestetner MP7500/DSm775"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4979
+msgid "Gestetner MP9000/DSm790"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4980
+msgid "Gestetner MP 161/DSm416"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4981
 msgid "Gestetner MP 2510/DSm725e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4974
+#: src/xml/xmli18n-tmp.h:4982
 msgid "Gestetner MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4975
+#: src/xml/xmli18n-tmp.h:4983
 msgid "Gestetner MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4976
+#: src/xml/xmli18n-tmp.h:4984
 msgid "Gestetner MP 3010/DSm730e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4977
+#: src/xml/xmli18n-tmp.h:4985
 msgid "Gestetner MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4978
+#: src/xml/xmli18n-tmp.h:4986
 msgid "Gestetner MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4979
+#: src/xml/xmli18n-tmp.h:4987
 msgid "Gestetner MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4980
+#: src/xml/xmli18n-tmp.h:4988
 msgid "Gestetner MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4981
+#: src/xml/xmli18n-tmp.h:4989
 msgid "Gestetner MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4990
 msgid "Gestetner MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4983
+#: src/xml/xmli18n-tmp.h:4991
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4992
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4985
+#: src/xml/xmli18n-tmp.h:4993
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4986
+#: src/xml/xmli18n-tmp.h:4994
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4987
+#: src/xml/xmli18n-tmp.h:4995
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4988
+#: src/xml/xmli18n-tmp.h:4996
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4989
+#: src/xml/xmli18n-tmp.h:4997
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4990
+#: src/xml/xmli18n-tmp.h:4998
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:4999
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4992
+#: src/xml/xmli18n-tmp.h:5000
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4993
+#: src/xml/xmli18n-tmp.h:5001
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4994
+#: src/xml/xmli18n-tmp.h:5002
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4995
+#: src/xml/xmli18n-tmp.h:5003
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4996
+#: src/xml/xmli18n-tmp.h:5004
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5005
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4998
+#: src/xml/xmli18n-tmp.h:5006
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5007
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:5008
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5001
+#: src/xml/xmli18n-tmp.h:5009
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5010
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5003
+#: src/xml/xmli18n-tmp.h:5011
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:5012
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5005
+#: src/xml/xmli18n-tmp.h:5013
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5006
+#: src/xml/xmli18n-tmp.h:5014
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:5015
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5016
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5009
+#: src/xml/xmli18n-tmp.h:5017
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5010
+#: src/xml/xmli18n-tmp.h:5018
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:5019
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5012
+#: src/xml/xmli18n-tmp.h:5020
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5021
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:5022
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5015
+#: src/xml/xmli18n-tmp.h:5023
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5016
+#: src/xml/xmli18n-tmp.h:5024
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5017
+#: src/xml/xmli18n-tmp.h:5025
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:5026
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5027
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5020
+#: src/xml/xmli18n-tmp.h:5028
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:5029
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5022
+#: src/xml/xmli18n-tmp.h:5030
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:5031
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:5032
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5025
+#: src/xml/xmli18n-tmp.h:5033
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5034
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5035
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5028
+#: src/xml/xmli18n-tmp.h:5036
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5029
+#: src/xml/xmli18n-tmp.h:5037
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5038
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5031
+#: src/xml/xmli18n-tmp.h:5039
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:5040
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5033
+#: src/xml/xmli18n-tmp.h:5041
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5034
+#: src/xml/xmli18n-tmp.h:5042
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5035
+#: src/xml/xmli18n-tmp.h:5043
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5036
+#: src/xml/xmli18n-tmp.h:5044
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5045
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5038
+#: src/xml/xmli18n-tmp.h:5046
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:5047
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5040
+#: src/xml/xmli18n-tmp.h:5048
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:5049
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:5050
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:5051
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:5052
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5053
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5046
+#: src/xml/xmli18n-tmp.h:5054
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:5055
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5048
+#: src/xml/xmli18n-tmp.h:5056
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5049
+#: src/xml/xmli18n-tmp.h:5057
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:5058
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5051
+#: src/xml/xmli18n-tmp.h:5059
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:5060
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5053
+#: src/xml/xmli18n-tmp.h:5061
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5062
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5063
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5056
+#: src/xml/xmli18n-tmp.h:5064
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5057
+#: src/xml/xmli18n-tmp.h:5065
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5066
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5067
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5060
+#: src/xml/xmli18n-tmp.h:5068
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5069
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5062
+#: src/xml/xmli18n-tmp.h:5070
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5063
+#: src/xml/xmli18n-tmp.h:5071
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:5072
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5073
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:5074
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5067
+#: src/xml/xmli18n-tmp.h:5075
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5076
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5077
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5070
+#: src/xml/xmli18n-tmp.h:5078
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:5079
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5072
+#: src/xml/xmli18n-tmp.h:5080
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5073
+#: src/xml/xmli18n-tmp.h:5081
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5074
+#: src/xml/xmli18n-tmp.h:5082
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5075
+#: src/xml/xmli18n-tmp.h:5083
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5076
+#: src/xml/xmli18n-tmp.h:5084
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:5085
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5078
+#: src/xml/xmli18n-tmp.h:5086
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5079
+#: src/xml/xmli18n-tmp.h:5087
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5088
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5081
+#: src/xml/xmli18n-tmp.h:5089
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5090
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5091
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5092
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5093
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5086
+#: src/xml/xmli18n-tmp.h:5094
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5095
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5088
+#: src/xml/xmli18n-tmp.h:5096
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:5097
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5090
+#: src/xml/xmli18n-tmp.h:5098
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5091
+#: src/xml/xmli18n-tmp.h:5099
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5092
+#: src/xml/xmli18n-tmp.h:5100
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5093
+#: src/xml/xmli18n-tmp.h:5101
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5094
+#: src/xml/xmli18n-tmp.h:5102
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5103
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5096
+#: src/xml/xmli18n-tmp.h:5104
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:5105
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5106
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5099
+#: src/xml/xmli18n-tmp.h:5107
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:5108
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5101
+#: src/xml/xmli18n-tmp.h:5109
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:5110
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5103
+#: src/xml/xmli18n-tmp.h:5111
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5104
+#: src/xml/xmli18n-tmp.h:5112
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5113
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5114
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5107
+#: src/xml/xmli18n-tmp.h:5115
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5108
+#: src/xml/xmli18n-tmp.h:5116
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5117
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5110
+#: src/xml/xmli18n-tmp.h:5118
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:5119
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5120
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5113
+#: src/xml/xmli18n-tmp.h:5121
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5114
+#: src/xml/xmli18n-tmp.h:5122
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5115
+#: src/xml/xmli18n-tmp.h:5123
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5124
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5125
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5118
+#: src/xml/xmli18n-tmp.h:5126
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5127
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5120
+#: src/xml/xmli18n-tmp.h:5128
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:5129
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:5130
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:5131
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:5132
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5133
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5126
+#: src/xml/xmli18n-tmp.h:5134
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5127
+#: src/xml/xmli18n-tmp.h:5135
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5136
 msgid "HP LaserJet 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5129
+#: src/xml/xmli18n-tmp.h:5137
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5138
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5131
+#: src/xml/xmli18n-tmp.h:5139
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5132
+#: src/xml/xmli18n-tmp.h:5140
 msgid "HP LaserJet 1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5133
+#: src/xml/xmli18n-tmp.h:5141
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5134
+#: src/xml/xmli18n-tmp.h:5142
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:5143
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5136
+#: src/xml/xmli18n-tmp.h:5144
 msgid "HP LaserJet 1320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5145
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5138
+#: src/xml/xmli18n-tmp.h:5146
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5147
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5148
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5149
 msgid "HP LaserJet 2410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:5150
 msgid "HP LaserJet 2420"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5151
 msgid "HP LaserJet 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5144
+#: src/xml/xmli18n-tmp.h:5152
 msgid "HP LaserJet 3015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:5153
 msgid "HP LaserJet 3020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5146
+#: src/xml/xmli18n-tmp.h:5154
 msgid "HP LaserJet 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5147
+#: src/xml/xmli18n-tmp.h:5155
 msgid "HP LaserJet 3050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:5156
 msgid "HP LaserJet 3052"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5149
+#: src/xml/xmli18n-tmp.h:5157
 msgid "HP LaserJet 3055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5150
+#: src/xml/xmli18n-tmp.h:5158
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5151
+#: src/xml/xmli18n-tmp.h:5159
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5160
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5161
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5154
+#: src/xml/xmli18n-tmp.h:5162
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5155
+#: src/xml/xmli18n-tmp.h:5163
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:5164
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:5165
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5158
+#: src/xml/xmli18n-tmp.h:5166
 msgid "HP LaserJet 3380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:5167
 msgid "HP LaserJet 3390"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5160
+#: src/xml/xmli18n-tmp.h:5168
 msgid "HP LaserJet 3392"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5161
+#: src/xml/xmli18n-tmp.h:5169
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:5170
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5171
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5172
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5165
+#: src/xml/xmli18n-tmp.h:5173
 msgid "HP LaserJet 4240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5174
 msgid "HP LaserJet 4250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5175
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5168
+#: src/xml/xmli18n-tmp.h:5176
 msgid "HP LaserJet 4345 mfp"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5169
+#: src/xml/xmli18n-tmp.h:5177
 msgid "HP LaserJet 4350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5170
+#: src/xml/xmli18n-tmp.h:5178
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5171
+#: src/xml/xmli18n-tmp.h:5179
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:5180
 msgid "HP LaserJet 5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5173
+#: src/xml/xmli18n-tmp.h:5181
 msgid "HP LaserJet 5200L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5174
+#: src/xml/xmli18n-tmp.h:5182
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5183
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5176
+#: src/xml/xmli18n-tmp.h:5184
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5177
+#: src/xml/xmli18n-tmp.h:5185
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5186
 msgid "HP LaserJet 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5179
+#: src/xml/xmli18n-tmp.h:5187
 msgid "HP LaserJet 9040 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:5188
 msgid "HP LaserJet 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:5189
 msgid "HP LaserJet 9050 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:5190
 msgid "HP LaserJet M3027 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5183
+#: src/xml/xmli18n-tmp.h:5191
 msgid "HP LaserJet M3035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5184
+#: src/xml/xmli18n-tmp.h:5192
 msgid "HP LaserJet M4345 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5193
 msgid "HP LaserJet M5025 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5186
+#: src/xml/xmli18n-tmp.h:5194
 msgid "HP LaserJet M5035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5195
 msgid "HP LaserJet P2010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5188
+#: src/xml/xmli18n-tmp.h:5196
 msgid "HP LaserJet P2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5189
+#: src/xml/xmli18n-tmp.h:5197
 msgid "HP LaserJet P3004"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5190
+#: src/xml/xmli18n-tmp.h:5198
 msgid "HP LaserJet P3005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5191
+#: src/xml/xmli18n-tmp.h:5199
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5192
+#: src/xml/xmli18n-tmp.h:5200
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:5201
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5194
+#: src/xml/xmli18n-tmp.h:5202
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5203
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:5204
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5197
+#: src/xml/xmli18n-tmp.h:5205
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5206
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5199
+#: src/xml/xmli18n-tmp.h:5207
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5208
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5201
+#: src/xml/xmli18n-tmp.h:5209
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5202
+#: src/xml/xmli18n-tmp.h:5210
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5211
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:5212
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5205
+#: src/xml/xmli18n-tmp.h:5213
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5206
+#: src/xml/xmli18n-tmp.h:5214
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:5215
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5208
+#: src/xml/xmli18n-tmp.h:5216
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:5217
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5218
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5211
+#: src/xml/xmli18n-tmp.h:5219
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5212
+#: src/xml/xmli18n-tmp.h:5220
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5213
+#: src/xml/xmli18n-tmp.h:5221
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:5222
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:5223
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5216
+#: src/xml/xmli18n-tmp.h:5224
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5225
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5218
+#: src/xml/xmli18n-tmp.h:5226
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5227
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5228
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5221
+#: src/xml/xmli18n-tmp.h:5229
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:5230
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:5231
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5224
+#: src/xml/xmli18n-tmp.h:5232
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5225
+#: src/xml/xmli18n-tmp.h:5233
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:5234
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5227
+#: src/xml/xmli18n-tmp.h:5235
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:5236
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5229
+#: src/xml/xmli18n-tmp.h:5237
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5230
+#: src/xml/xmli18n-tmp.h:5238
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5231
+#: src/xml/xmli18n-tmp.h:5239
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5232
+#: src/xml/xmli18n-tmp.h:5240
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5241
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5234
+#: src/xml/xmli18n-tmp.h:5242
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5243
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5236
+#: src/xml/xmli18n-tmp.h:5244
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5245
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:5246
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:5247
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:5248
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:5249
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5242
+#: src/xml/xmli18n-tmp.h:5250
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:5251
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5244
+#: src/xml/xmli18n-tmp.h:5252
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5245
+#: src/xml/xmli18n-tmp.h:5253
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5254
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5247
+#: src/xml/xmli18n-tmp.h:5255
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5256
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5249
+#: src/xml/xmli18n-tmp.h:5257
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:5258
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5259
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5252
+#: src/xml/xmli18n-tmp.h:5260
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5253
+#: src/xml/xmli18n-tmp.h:5261
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:5262
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5263
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5256
+#: src/xml/xmli18n-tmp.h:5264
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:5265
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5258
+#: src/xml/xmli18n-tmp.h:5266
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5259
+#: src/xml/xmli18n-tmp.h:5267
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:5268
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:5269
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5270
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5263
+#: src/xml/xmli18n-tmp.h:5271
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:5272
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5273
 msgid "HP e-printer e20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5266
+#: src/xml/xmli18n-tmp.h:5274
 msgid "IBM 4019"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5275
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5268
+#: src/xml/xmli18n-tmp.h:5276
 msgid "IBM 4312"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5269
+#: src/xml/xmli18n-tmp.h:5277
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5270
+#: src/xml/xmli18n-tmp.h:5278
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5271
+#: src/xml/xmli18n-tmp.h:5279
 msgid "Infotec 4353 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5272
+#: src/xml/xmli18n-tmp.h:5280
 msgid "Infotec 4452 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5273
+#: src/xml/xmli18n-tmp.h:5281
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5274
+#: src/xml/xmli18n-tmp.h:5282
 msgid "Infotec IS2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5283
 msgid "Infotec IS2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5276
+#: src/xml/xmli18n-tmp.h:5284
 msgid "Infotec IS2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5277
+#: src/xml/xmli18n-tmp.h:5285
 msgid "Infotec IS2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5278
+#: src/xml/xmli18n-tmp.h:5286
 msgid "Infotec IS2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5279
+#: src/xml/xmli18n-tmp.h:5287
 msgid "Infotec IS2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5288
 msgid "Infotec IS2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5289
 msgid "Infotec IS 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5290
 msgid "Infotec IS 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5283
+#: src/xml/xmli18n-tmp.h:5291
 msgid "Infotec IS 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5284
+#: src/xml/xmli18n-tmp.h:5292
 msgid "Infotec IS 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5285
+#: src/xml/xmli18n-tmp.h:5293
 msgid "Infotec IS 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5286
+#: src/xml/xmli18n-tmp.h:5294
 msgid "Infotec IS 2122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5287
+#: src/xml/xmli18n-tmp.h:5295
 msgid "Infotec IS 2127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5288
+#: src/xml/xmli18n-tmp.h:5296
 msgid "Infotec IS 2132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5289
+#: src/xml/xmli18n-tmp.h:5297
 msgid "Infotec IS 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5290
+#: src/xml/xmli18n-tmp.h:5298
 msgid "Infotec IS 2145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5291
+#: src/xml/xmli18n-tmp.h:5299
 msgid "Infotec IS 2151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5292
+#: src/xml/xmli18n-tmp.h:5300
 msgid "Infotec IS 2160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5301
 msgid "Infotec IS 2175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5294
+#: src/xml/xmli18n-tmp.h:5302
 msgid "Infotec IS 2215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5303
 msgid "Infotec IS 2216"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5296
+#: src/xml/xmli18n-tmp.h:5304
 msgid "Infotec IS 2220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5305
 msgid "Infotec IS 2220D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5306
 msgid "Infotec IS 2225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5299
+#: src/xml/xmli18n-tmp.h:5307
 msgid "Infotec IS 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5308
 msgid "Infotec IS 2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5301
+#: src/xml/xmli18n-tmp.h:5309
 msgid "Infotec IS 2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5310
 msgid "Infotec IS 2255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5303
+#: src/xml/xmli18n-tmp.h:5311
 msgid "Infotec IS 2265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5304
+#: src/xml/xmli18n-tmp.h:5312
 msgid "Infotec IS 2275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5305
+#: src/xml/xmli18n-tmp.h:5313
 msgid "Infotec IS 2316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5306
+#: src/xml/xmli18n-tmp.h:5314
 msgid "Infotec IS 2320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5307
+#: src/xml/xmli18n-tmp.h:5315
 msgid "Infotec IS 2325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5308
+#: src/xml/xmli18n-tmp.h:5316
 msgid "Infotec IS 2416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5317
 msgid "Infotec IS 2425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5318
 msgid "Infotec IS 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5311
+#: src/xml/xmli18n-tmp.h:5319
 msgid "Infotec IS 2435"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5320
 msgid "Infotec IS 2445"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5313
+#: src/xml/xmli18n-tmp.h:5321
 msgid "Infotec IS 3090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5314
+#: src/xml/xmli18n-tmp.h:5322
 msgid "Infotec IS 3110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5315
+#: src/xml/xmli18n-tmp.h:5323
 msgid "Infotec IS 3135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5316
+#: src/xml/xmli18n-tmp.h:5324
 msgid "Infotec MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5317
+#: src/xml/xmli18n-tmp.h:5325
 msgid "Infotec MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5318
+#: src/xml/xmli18n-tmp.h:5326
 msgid "Infotec MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5327
 msgid "Infotec MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5320
+#: src/xml/xmli18n-tmp.h:5328
 msgid "Infotec MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5321
+#: src/xml/xmli18n-tmp.h:5329
 msgid "Infotec MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5330
 msgid "Infotec MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5331
 msgid "Infotec MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5324
+#: src/xml/xmli18n-tmp.h:5332
 msgid "Kyocera CS-1815"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5325
+#: src/xml/xmli18n-tmp.h:5333
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5326
+#: src/xml/xmli18n-tmp.h:5334
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5327
+#: src/xml/xmli18n-tmp.h:5335
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5328
+#: src/xml/xmli18n-tmp.h:5336
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5337
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5330
+#: src/xml/xmli18n-tmp.h:5338
 msgid "Kyocera FS-920"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5331
+#: src/xml/xmli18n-tmp.h:5339
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5340
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5341
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5334
+#: src/xml/xmli18n-tmp.h:5342
 msgid "Kyocera FS-1018MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5335
+#: src/xml/xmli18n-tmp.h:5343
 msgid "Kyocera FS-1020D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5336
+#: src/xml/xmli18n-tmp.h:5344
 msgid "Kyocera FS-1030D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5337
+#: src/xml/xmli18n-tmp.h:5345
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5338
+#: src/xml/xmli18n-tmp.h:5346
 msgid "Kyocera FS-1118MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5339
+#: src/xml/xmli18n-tmp.h:5347
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5340
+#: src/xml/xmli18n-tmp.h:5348
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5341
+#: src/xml/xmli18n-tmp.h:5349
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5350
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5351
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5344
+#: src/xml/xmli18n-tmp.h:5352
 msgid "Kyocera FS-1714M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5345
+#: src/xml/xmli18n-tmp.h:5353
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5354
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5347
+#: src/xml/xmli18n-tmp.h:5355
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5348
+#: src/xml/xmli18n-tmp.h:5356
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5349
+#: src/xml/xmli18n-tmp.h:5357
 msgid "Kyocera FS-1920"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5358
 msgid "Kyocera FS-2000D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5351
+#: src/xml/xmli18n-tmp.h:5359
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5352
+#: src/xml/xmli18n-tmp.h:5360
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5361
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5354
+#: src/xml/xmli18n-tmp.h:5362
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5355
+#: src/xml/xmli18n-tmp.h:5363
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5356
+#: src/xml/xmli18n-tmp.h:5364
 msgid "Kyocera FS-3718M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5357
+#: src/xml/xmli18n-tmp.h:5365
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5358
+#: src/xml/xmli18n-tmp.h:5366
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5367
 msgid "Kyocera FS-3820N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5368
 msgid "Kyocera FS-3830N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5361
+#: src/xml/xmli18n-tmp.h:5369
 msgid "Kyocera FS-3900DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5370
 msgid "Kyocera FS-4000DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5363
+#: src/xml/xmli18n-tmp.h:5371
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5364
+#: src/xml/xmli18n-tmp.h:5372
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5365
+#: src/xml/xmli18n-tmp.h:5373
 msgid "Kyocera FS-6020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5366
+#: src/xml/xmli18n-tmp.h:5374
 msgid "Kyocera FS-6026"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5367
+#: src/xml/xmli18n-tmp.h:5375
 msgid "Kyocera FS-6300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5368
+#: src/xml/xmli18n-tmp.h:5376
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5377
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5370
+#: src/xml/xmli18n-tmp.h:5378
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5371
+#: src/xml/xmli18n-tmp.h:5379
 msgid "Kyocera FS-6750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5380
 msgid "Kyocera FS-6900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5373
+#: src/xml/xmli18n-tmp.h:5381
 msgid "Kyocera FS-6950DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5374
+#: src/xml/xmli18n-tmp.h:5382
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5375
+#: src/xml/xmli18n-tmp.h:5383
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5376
+#: src/xml/xmli18n-tmp.h:5384
 msgid "Kyocera FS-7028M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5377
+#: src/xml/xmli18n-tmp.h:5385
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5378
+#: src/xml/xmli18n-tmp.h:5386
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5379
+#: src/xml/xmli18n-tmp.h:5387
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5380
+#: src/xml/xmli18n-tmp.h:5388
 msgid "Kyocera FS-9130DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5389
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5382
+#: src/xml/xmli18n-tmp.h:5390
 msgid "Kyocera FS-9530DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5383
+#: src/xml/xmli18n-tmp.h:5391
 msgid "Kyocera KM-1510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5384
+#: src/xml/xmli18n-tmp.h:5392
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5385
+#: src/xml/xmli18n-tmp.h:5393
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5386
+#: src/xml/xmli18n-tmp.h:5394
 msgid "Kyocera KM-1815"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5387
+#: src/xml/xmli18n-tmp.h:5395
 msgid "Kyocera KM-1820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5388
+#: src/xml/xmli18n-tmp.h:5396
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5397
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5390
+#: src/xml/xmli18n-tmp.h:5398
 msgid "Kyocera KM-3050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5391
+#: src/xml/xmli18n-tmp.h:5399
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5392
+#: src/xml/xmli18n-tmp.h:5400
 msgid "Kyocera KM-4050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5393
+#: src/xml/xmli18n-tmp.h:5401
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5394
+#: src/xml/xmli18n-tmp.h:5402
 msgid "Kyocera KM-4230/5230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5395
+#: src/xml/xmli18n-tmp.h:5403
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5404
 msgid "Kyocera KM-5050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5397
+#: src/xml/xmli18n-tmp.h:5405
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5406
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407
 msgid "Kyocera KM-6030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5408
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5401
+#: src/xml/xmli18n-tmp.h:5409
 msgid "Kyocera KM-8030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5410
 msgid "Lanier 5622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5403
+#: src/xml/xmli18n-tmp.h:5411
 msgid "Lanier 5627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5404
+#: src/xml/xmli18n-tmp.h:5412
 msgid "Lanier 5632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5405
+#: src/xml/xmli18n-tmp.h:5413
 msgid "Lanier 5635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5406
+#: src/xml/xmli18n-tmp.h:5414
 msgid "Lanier 5645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5407
+#: src/xml/xmli18n-tmp.h:5415
 msgid "Lanier LD0105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5408
+#: src/xml/xmli18n-tmp.h:5416
 msgid "Lanier LD015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5409
+#: src/xml/xmli18n-tmp.h:5417
 msgid "Lanier LD035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5410
+#: src/xml/xmli18n-tmp.h:5418
 msgid "Lanier LD045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5419
 msgid "Lanier LD060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5420
 msgid "Lanier LD075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5413
+#: src/xml/xmli18n-tmp.h:5421
 msgid "Lanier LD090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422
 msgid "Lanier LD115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5423
 msgid "Lanier LD116"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5424
 msgid "Lanier LD118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5417
+#: src/xml/xmli18n-tmp.h:5425
 msgid "Lanier LD118d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5426
 msgid "Lanier LD120"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5419
+#: src/xml/xmli18n-tmp.h:5427
 msgid "Lanier LD120d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5420
+#: src/xml/xmli18n-tmp.h:5428
 msgid "Lanier LD122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5421
+#: src/xml/xmli18n-tmp.h:5429
 msgid "Lanier LD127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5422
+#: src/xml/xmli18n-tmp.h:5430
 msgid "Lanier LD132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5423
+#: src/xml/xmli18n-tmp.h:5431
 msgid "Lanier LD135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5424
+#: src/xml/xmli18n-tmp.h:5432
 msgid "Lanier LD145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5425
+#: src/xml/xmli18n-tmp.h:5433
 msgid "Lanier LD151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5426
+#: src/xml/xmli18n-tmp.h:5434
 msgid "Lanier LD160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5435
 msgid "Lanier LD175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5428
+#: src/xml/xmli18n-tmp.h:5436
 msgid "Lanier LD225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5437
 msgid "Lanier LD230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5430
+#: src/xml/xmli18n-tmp.h:5438
 msgid "Lanier LD235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5439
 msgid "Lanier LD245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5440
 msgid "Lanier MP2500/LD125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5433
+#: src/xml/xmli18n-tmp.h:5441
 msgid "Lanier MP 1100/LD1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5442
 msgid "Lanier MP 1350/LD1135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5435
+#: src/xml/xmli18n-tmp.h:5443
 msgid "Lanier MP 1600/LD316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5436
+#: src/xml/xmli18n-tmp.h:5444
 msgid "Lanier MP 161/LD016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5437
+#: src/xml/xmli18n-tmp.h:5445
 msgid "Lanier MP 2000/LD320d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5438
+#: src/xml/xmli18n-tmp.h:5446
 msgid "Lanier MP 2510/LD325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5439
+#: src/xml/xmli18n-tmp.h:5447
 msgid "Lanier MP 2550B/LD425B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5440
+#: src/xml/xmli18n-tmp.h:5448
 msgid "Lanier MP 2550/LD425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5441
+#: src/xml/xmli18n-tmp.h:5449
 msgid "Lanier MP 3010/LD330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5442
+#: src/xml/xmli18n-tmp.h:5450
 msgid "Lanier MP 3350B/LD433B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5451
 msgid "Lanier MP 3350/LD433"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5444
+#: src/xml/xmli18n-tmp.h:5452
 msgid "Lanier MP 3500/LD335"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5445
+#: src/xml/xmli18n-tmp.h:5453
 msgid "Lanier MP 4000B/LD040B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5454
 msgid "Lanier MP 4000/LD040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5447
+#: src/xml/xmli18n-tmp.h:5455
 msgid "Lanier MP 4500/LD345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5448
+#: src/xml/xmli18n-tmp.h:5456
 msgid "Lanier MP 5000B/LD050B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5449
+#: src/xml/xmli18n-tmp.h:5457
 msgid "Lanier MP 5000/LD050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5450
+#: src/xml/xmli18n-tmp.h:5458
 msgid "Lanier MP 5500/LD255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5451
+#: src/xml/xmli18n-tmp.h:5459
 msgid "Lanier MP 6500/LD265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5452
+#: src/xml/xmli18n-tmp.h:5460
 msgid "Lanier MP 7500/LD275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5453
+#: src/xml/xmli18n-tmp.h:5461
 msgid "Lanier MP 9000/LD190"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5454
+#: src/xml/xmli18n-tmp.h:5462
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5455
+#: src/xml/xmli18n-tmp.h:5463
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5464
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5465
 msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5458
+#: src/xml/xmli18n-tmp.h:5466
 msgid "Lexmark Optra E321"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5459
+#: src/xml/xmli18n-tmp.h:5467
 msgid "Lexmark Optra E323"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5460
+#: src/xml/xmli18n-tmp.h:5468
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5461
+#: src/xml/xmli18n-tmp.h:5469
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5462
+#: src/xml/xmli18n-tmp.h:5470
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5463
+#: src/xml/xmli18n-tmp.h:5471
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5464
+#: src/xml/xmli18n-tmp.h:5472
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5465
+#: src/xml/xmli18n-tmp.h:5473
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5474
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5467
+#: src/xml/xmli18n-tmp.h:5475
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5468
+#: src/xml/xmli18n-tmp.h:5476
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5477
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5470
+#: src/xml/xmli18n-tmp.h:5478
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5471
+#: src/xml/xmli18n-tmp.h:5479
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5472
+#: src/xml/xmli18n-tmp.h:5480
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5473
+#: src/xml/xmli18n-tmp.h:5481
 msgid "NRG 10515/10518/10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5474
+#: src/xml/xmli18n-tmp.h:5482
 msgid "NRG 2205/2238/2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5475
+#: src/xml/xmli18n-tmp.h:5483
 msgid "NRG 2705/2738/2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5476
+#: src/xml/xmli18n-tmp.h:5484
 msgid "NRG 3205/3238/3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5477
+#: src/xml/xmli18n-tmp.h:5485
 msgid "NRG 3525/3508/3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5478
+#: src/xml/xmli18n-tmp.h:5486
 msgid "NRG 3545/3518/3532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5479
+#: src/xml/xmli18n-tmp.h:5487
 msgid "NRG 4525/4508/4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5488
 msgid "NRG 4545/4518/4532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5481
+#: src/xml/xmli18n-tmp.h:5489
 msgid "NRG 6002/6005/6008"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5482
+#: src/xml/xmli18n-tmp.h:5490
 msgid "NRG 7502/7505/7508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5483
+#: src/xml/xmli18n-tmp.h:5491
 msgid "NRG 9005/9008/9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5492
 msgid "NRG DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5485
+#: src/xml/xmli18n-tmp.h:5493
 msgid "NRG DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5486
+#: src/xml/xmli18n-tmp.h:5494
 msgid "NRG DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5495
 msgid "NRG DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5496
 msgid "NRG DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5497
 msgid "NRG DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5490
+#: src/xml/xmli18n-tmp.h:5498
 msgid "NRG DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5499
 msgid "NRG DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5492
+#: src/xml/xmli18n-tmp.h:5500
 msgid "NRG DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5493
+#: src/xml/xmli18n-tmp.h:5501
 msgid "NRG DSm632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5494
+#: src/xml/xmli18n-tmp.h:5502
 msgid "NRG DSm635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5495
+#: src/xml/xmli18n-tmp.h:5503
 msgid "NRG DSm645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5496
+#: src/xml/xmli18n-tmp.h:5504
 msgid "NRG DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5497
+#: src/xml/xmli18n-tmp.h:5505
 msgid "NRG DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5506
 msgid "NRG DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5499
+#: src/xml/xmli18n-tmp.h:5507
 msgid "NRG DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5500
+#: src/xml/xmli18n-tmp.h:5508
 msgid "NRG DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5509
 msgid "NRG DSm735"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5502
+#: src/xml/xmli18n-tmp.h:5510
 msgid "NRG DSm745"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5511
 msgid "NRG MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5504
+#: src/xml/xmli18n-tmp.h:5512
 msgid "NRG MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5505
+#: src/xml/xmli18n-tmp.h:5513
 msgid "NRG MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5514
 msgid "NRG MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5507
+#: src/xml/xmli18n-tmp.h:5515
 msgid "NRG MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5508
+#: src/xml/xmli18n-tmp.h:5516
 msgid "NRG MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5509
+#: src/xml/xmli18n-tmp.h:5517
 msgid "NRG MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5510
+#: src/xml/xmli18n-tmp.h:5518
 msgid "NRG MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5511
+#: src/xml/xmli18n-tmp.h:5519
 msgid "NRG MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5512
+#: src/xml/xmli18n-tmp.h:5520
 msgid "NRG MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5521
 msgid "NRG MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5514
+#: src/xml/xmli18n-tmp.h:5522
 msgid "NRG MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5523
 msgid "NRG MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5516
+#: src/xml/xmli18n-tmp.h:5524
 msgid "NRG MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5525
 msgid "NRG MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5518
+#: src/xml/xmli18n-tmp.h:5526
 msgid "NRG MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5519
+#: src/xml/xmli18n-tmp.h:5527
 msgid "NRG MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5528
 msgid "NRG MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5521
+#: src/xml/xmli18n-tmp.h:5529
 msgid "NRG MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5522
+#: src/xml/xmli18n-tmp.h:5530
 msgid "NRG MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5531
 msgid "NRG MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5532
 msgid "NRG MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5525
+#: src/xml/xmli18n-tmp.h:5533
 msgid "Oki B401d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5534
 msgid "Oki B4350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5527
+#: src/xml/xmli18n-tmp.h:5535
 msgid "Oki OL400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5536
 msgid "Oki OL400e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5529
+#: src/xml/xmli18n-tmp.h:5537
 msgid "Oki OL400ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5530
+#: src/xml/xmli18n-tmp.h:5538
 msgid "Oki OL410e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5531
+#: src/xml/xmli18n-tmp.h:5539
 msgid "Oki OL600e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5540
 msgid "Oki OL610e/S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5533
+#: src/xml/xmli18n-tmp.h:5541
 msgid "Oki OL800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5534
+#: src/xml/xmli18n-tmp.h:5542
 msgid "Oki OL810ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5535
+#: src/xml/xmli18n-tmp.h:5543
 msgid "Oki Okipage 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5536
+#: src/xml/xmli18n-tmp.h:5544
 msgid "Oki Okipage 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5537
+#: src/xml/xmli18n-tmp.h:5545
 msgid "Oki Okipage 8p"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5538
+#: src/xml/xmli18n-tmp.h:5546
 msgid "Oki Okipage 10e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5547
 msgid "Oki Okipage 10ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5540
+#: src/xml/xmli18n-tmp.h:5548
 msgid "Oki Okipage 14ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5541
+#: src/xml/xmli18n-tmp.h:5549
 msgid "Oki Super 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5542
+#: src/xml/xmli18n-tmp.h:5550
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5543
+#: src/xml/xmli18n-tmp.h:5551
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5544
+#: src/xml/xmli18n-tmp.h:5552
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5553
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5554
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5547
+#: src/xml/xmli18n-tmp.h:5555
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5556
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5557
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5550
+#: src/xml/xmli18n-tmp.h:5558
 msgid "Ricoh Aficio 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5551
+#: src/xml/xmli18n-tmp.h:5559
 msgid "Ricoh Aficio 1027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5552
+#: src/xml/xmli18n-tmp.h:5560
 msgid "Ricoh Aficio 1032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5553
+#: src/xml/xmli18n-tmp.h:5561
 msgid "Ricoh Aficio 1035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5554
+#: src/xml/xmli18n-tmp.h:5562
 msgid "Ricoh Aficio 1045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5555
+#: src/xml/xmli18n-tmp.h:5563
 msgid "Ricoh Aficio 1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5556
+#: src/xml/xmli18n-tmp.h:5564
 msgid "Ricoh Aficio 1075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5557
+#: src/xml/xmli18n-tmp.h:5565
 msgid "Ricoh Aficio 1515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5558
+#: src/xml/xmli18n-tmp.h:5566
 msgid "Ricoh Aficio 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5567
 msgid "Ricoh Aficio 2016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5560
+#: src/xml/xmli18n-tmp.h:5568
 msgid "Ricoh Aficio 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5569
 msgid "Ricoh Aficio 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5562
+#: src/xml/xmli18n-tmp.h:5570
 msgid "Ricoh Aficio 2020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5563
+#: src/xml/xmli18n-tmp.h:5571
 msgid "Ricoh Aficio 2020D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5564
+#: src/xml/xmli18n-tmp.h:5572
 msgid "Ricoh Aficio 2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5573
 msgid "Ricoh Aficio 2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5566
+#: src/xml/xmli18n-tmp.h:5574
 msgid "Ricoh Aficio 2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5575
 msgid "Ricoh Aficio 2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5568
+#: src/xml/xmli18n-tmp.h:5576
 msgid "Ricoh Aficio 2035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5569
+#: src/xml/xmli18n-tmp.h:5577
 msgid "Ricoh Aficio 2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5570
+#: src/xml/xmli18n-tmp.h:5578
 msgid "Ricoh Aficio 2045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5571
+#: src/xml/xmli18n-tmp.h:5579
 msgid "Ricoh Aficio 2051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5572
+#: src/xml/xmli18n-tmp.h:5580
 msgid "Ricoh Aficio 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5573
+#: src/xml/xmli18n-tmp.h:5581
 msgid "Ricoh Aficio 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5574
+#: src/xml/xmli18n-tmp.h:5582
 msgid "Ricoh Aficio 2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5575
+#: src/xml/xmli18n-tmp.h:5583
 msgid "Ricoh Aficio 2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5576
+#: src/xml/xmli18n-tmp.h:5584
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5577
+#: src/xml/xmli18n-tmp.h:5585
 msgid "Ricoh Aficio 3025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5586
 msgid "Ricoh Aficio 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5579
+#: src/xml/xmli18n-tmp.h:5587
 msgid "Ricoh Aficio 3035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5580
+#: src/xml/xmli18n-tmp.h:5588
 msgid "Ricoh Aficio 3045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5581
+#: src/xml/xmli18n-tmp.h:5589
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5582
+#: src/xml/xmli18n-tmp.h:5590
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5591
 msgid "Ricoh Aficio MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5584
+#: src/xml/xmli18n-tmp.h:5592
 msgid "Ricoh Aficio MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5593
 msgid "Ricoh Aficio MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5586
+#: src/xml/xmli18n-tmp.h:5594
 msgid "Ricoh Aficio MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5587
+#: src/xml/xmli18n-tmp.h:5595
 msgid "Ricoh Aficio MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5596
 msgid "Ricoh Aficio MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5589
+#: src/xml/xmli18n-tmp.h:5597
 msgid "Ricoh Aficio MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5590
+#: src/xml/xmli18n-tmp.h:5598
 msgid "Ricoh Aficio MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5591
+#: src/xml/xmli18n-tmp.h:5599
 msgid "Ricoh Aficio MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5592
+#: src/xml/xmli18n-tmp.h:5600
 msgid "Ricoh Aficio MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5593
+#: src/xml/xmli18n-tmp.h:5601
 msgid "Ricoh Aficio MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5594
+#: src/xml/xmli18n-tmp.h:5602
 msgid "Ricoh Aficio MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5595
+#: src/xml/xmli18n-tmp.h:5603
 msgid "Ricoh Aficio MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5596
+#: src/xml/xmli18n-tmp.h:5604
 msgid "Ricoh Aficio MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5597
+#: src/xml/xmli18n-tmp.h:5605
 msgid "Ricoh Aficio MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5598
+#: src/xml/xmli18n-tmp.h:5606
 msgid "Ricoh Aficio MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5607
 msgid "Ricoh Aficio MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5600
+#: src/xml/xmli18n-tmp.h:5608
 msgid "Ricoh Aficio MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5609
 msgid "Ricoh Aficio MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5602
+#: src/xml/xmli18n-tmp.h:5610
 msgid "Ricoh Aficio MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5603
+#: src/xml/xmli18n-tmp.h:5611
 msgid "Ricoh Aficio MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5604
+#: src/xml/xmli18n-tmp.h:5612
 msgid "Ricoh Aficio MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5605
+#: src/xml/xmli18n-tmp.h:5613
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5606
+#: src/xml/xmli18n-tmp.h:5614
 msgid "Samsung ML-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5607
+#: src/xml/xmli18n-tmp.h:5615
 msgid "Samsung ML-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5608
+#: src/xml/xmli18n-tmp.h:5616
 msgid "Samsung ML-1450PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5609
+#: src/xml/xmli18n-tmp.h:5617
 msgid "Samsung ML-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5618
 msgid "Samsung ML-1651N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5611
+#: src/xml/xmli18n-tmp.h:5619
 msgid "Samsung ML-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5612
+#: src/xml/xmli18n-tmp.h:5620
 msgid "Samsung ML-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5621
 msgid "Samsung ML-2150PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5614
+#: src/xml/xmli18n-tmp.h:5622
 msgid "Samsung ML-2151N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5623
 msgid "Samsung ML-2151NPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5616
+#: src/xml/xmli18n-tmp.h:5624
 msgid "Samsung ML-2152W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5617
+#: src/xml/xmli18n-tmp.h:5625
 msgid "Samsung ML-2152WPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5618
+#: src/xml/xmli18n-tmp.h:5626
 msgid "Samsung ML-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5619
+#: src/xml/xmli18n-tmp.h:5627
 msgid "Samsung ML-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5620
+#: src/xml/xmli18n-tmp.h:5628
 msgid "Samsung ML-2551N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5629
 msgid "Samsung ML-2552W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5630
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5623
+#: src/xml/xmli18n-tmp.h:5631
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5632
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5625
+#: src/xml/xmli18n-tmp.h:5633
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5626
+#: src/xml/xmli18n-tmp.h:5634
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5627
+#: src/xml/xmli18n-tmp.h:5635
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5636
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5629
+#: src/xml/xmli18n-tmp.h:5637
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5630
+#: src/xml/xmli18n-tmp.h:5638
 msgid "Samsung ML-7300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5631
+#: src/xml/xmli18n-tmp.h:5639
 msgid "Samsung ML-7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5632
+#: src/xml/xmli18n-tmp.h:5640
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5633
+#: src/xml/xmli18n-tmp.h:5641
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5634
+#: src/xml/xmli18n-tmp.h:5642
 msgid "Savin 2522"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5635
+#: src/xml/xmli18n-tmp.h:5643
 msgid "Savin 2527"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5636
+#: src/xml/xmli18n-tmp.h:5644
 msgid "Savin 2532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5637
+#: src/xml/xmli18n-tmp.h:5645
 msgid "Savin 2535/2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5638
+#: src/xml/xmli18n-tmp.h:5646
 msgid "Savin 2545/2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5639
+#: src/xml/xmli18n-tmp.h:5647
 msgid "Savin 2560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5640
+#: src/xml/xmli18n-tmp.h:5648
 msgid "Savin 2575"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5649
 msgid "Savin 3515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5642
+#: src/xml/xmli18n-tmp.h:5650
 msgid "Savin 40105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5643
+#: src/xml/xmli18n-tmp.h:5651
 msgid "Savin 4015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5644
+#: src/xml/xmli18n-tmp.h:5652
 msgid "Savin 4018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5645
+#: src/xml/xmli18n-tmp.h:5653
 msgid "Savin 4018d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5654
 msgid "Savin 4022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5647
+#: src/xml/xmli18n-tmp.h:5655
 msgid "Savin 4027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5656
 msgid "Savin 4035/4135g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5649
+#: src/xml/xmli18n-tmp.h:5657
 msgid "Savin 4035e/4135eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5658
 msgid "Savin 4045/4145g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5651
+#: src/xml/xmli18n-tmp.h:5659
 msgid "Savin 4045e/4145eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5652
+#: src/xml/xmli18n-tmp.h:5660
 msgid "Savin 4051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5653
+#: src/xml/xmli18n-tmp.h:5661
 msgid "Savin 4060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5654
+#: src/xml/xmli18n-tmp.h:5662
 msgid "Savin 4075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5655
+#: src/xml/xmli18n-tmp.h:5663
 msgid "Savin 4090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5656
+#: src/xml/xmli18n-tmp.h:5664
 msgid "Savin 7025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5657
+#: src/xml/xmli18n-tmp.h:5665
 msgid "Savin 8016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5658
+#: src/xml/xmli18n-tmp.h:5666
 msgid "Savin 8020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5659
+#: src/xml/xmli18n-tmp.h:5667
 msgid "Savin 8020d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5668
 msgid "Savin 8025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5661
+#: src/xml/xmli18n-tmp.h:5669
 msgid "Savin 8025e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5662
+#: src/xml/xmli18n-tmp.h:5670
 msgid "Savin 8030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5671
 msgid "Savin 8030e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5664
+#: src/xml/xmli18n-tmp.h:5672
 msgid "Savin 8035/8035g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5665
+#: src/xml/xmli18n-tmp.h:5673
 msgid "Savin 8035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5666
+#: src/xml/xmli18n-tmp.h:5674
 msgid "Savin 8045/8045g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5667
+#: src/xml/xmli18n-tmp.h:5675
 msgid "Savin 8045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5668
+#: src/xml/xmli18n-tmp.h:5676
 msgid "Savin 8055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5669
+#: src/xml/xmli18n-tmp.h:5677
 msgid "Savin 8065"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5670
+#: src/xml/xmli18n-tmp.h:5678
 msgid "Savin 8075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5679
 msgid "Savin 8090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5672
+#: src/xml/xmli18n-tmp.h:5680
 msgid "Savin 8110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5681
 msgid "Savin 8135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5674
+#: src/xml/xmli18n-tmp.h:5682
 msgid "Savin 816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5675
+#: src/xml/xmli18n-tmp.h:5683
 msgid "Savin 9016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5676
+#: src/xml/xmli18n-tmp.h:5684
 msgid "Savin 9021d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5685
 msgid "Savin 9025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5678
+#: src/xml/xmli18n-tmp.h:5686
 msgid "Savin 9025b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5679
+#: src/xml/xmli18n-tmp.h:5687
 msgid "Savin 9033"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5680
+#: src/xml/xmli18n-tmp.h:5688
 msgid "Savin 9033b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5681
+#: src/xml/xmli18n-tmp.h:5689
 msgid "Savin 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5682
+#: src/xml/xmli18n-tmp.h:5690
 msgid "Savin 9040b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5691
 msgid "Savin 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5684
+#: src/xml/xmli18n-tmp.h:5692
 msgid "Savin 9050b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5685
+#: src/xml/xmli18n-tmp.h:5693
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5686
+#: src/xml/xmli18n-tmp.h:5694
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5687
+#: src/xml/xmli18n-tmp.h:5695
 msgid "Sharp AR-M257"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5688
+#: src/xml/xmli18n-tmp.h:5696
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5689
+#: src/xml/xmli18n-tmp.h:5697
 msgid "Star LS-04"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5690
+#: src/xml/xmli18n-tmp.h:5698
 msgid "Star LaserPrinter 8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5699
 msgid "Tally MT908"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5692
+#: src/xml/xmli18n-tmp.h:5700
 msgid "Tektronix Phaser 750DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5701
 msgid "Tektronix Phaser 750DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5694
+#: src/xml/xmli18n-tmp.h:5702
 msgid "Tektronix Phaser 750N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5695
+#: src/xml/xmli18n-tmp.h:5703
 msgid "Tektronix Phaser 750P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5696
+#: src/xml/xmli18n-tmp.h:5704
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5697
+#: src/xml/xmli18n-tmp.h:5705
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5698
+#: src/xml/xmli18n-tmp.h:5706
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5699
+#: src/xml/xmli18n-tmp.h:5707
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5700
+#: src/xml/xmli18n-tmp.h:5708
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:5709
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5710
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5711
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5712
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5705
+#: src/xml/xmli18n-tmp.h:5713
 msgid "Xerox Phaser 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5714
 msgid "Xerox Phaser 4400B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5707
+#: src/xml/xmli18n-tmp.h:5715
 msgid "Xerox Phaser 4400DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5708
+#: src/xml/xmli18n-tmp.h:5716
 msgid "Xerox Phaser 4400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5709
+#: src/xml/xmli18n-tmp.h:5717
 msgid "Xerox Phaser 4400N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5710
+#: src/xml/xmli18n-tmp.h:5718
 msgid "Xerox Phaser 4500B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5711
+#: src/xml/xmli18n-tmp.h:5719
 msgid "Xerox Phaser 4500DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5712
+#: src/xml/xmli18n-tmp.h:5720
 msgid "Xerox Phaser 4500DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5713
+#: src/xml/xmli18n-tmp.h:5721
 msgid "Xerox Phaser 4500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5714
+#: src/xml/xmli18n-tmp.h:5722
 msgid "Xerox Phaser 4510B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5715
+#: src/xml/xmli18n-tmp.h:5723
 msgid "Xerox Phaser 4510DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5716
+#: src/xml/xmli18n-tmp.h:5724
 msgid "Xerox Phaser 4510DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5717
+#: src/xml/xmli18n-tmp.h:5725
 msgid "Xerox Phaser 4510N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5726
 msgid "Xerox Phaser 5500B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5719
+#: src/xml/xmli18n-tmp.h:5727
 msgid "Xerox Phaser 5500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5720
+#: src/xml/xmli18n-tmp.h:5728
 msgid "Xerox Phaser 5500DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5721
+#: src/xml/xmli18n-tmp.h:5729
 msgid "Xerox Phaser 5500DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5722
+#: src/xml/xmli18n-tmp.h:5730
 msgid "Xerox Phaser 5500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5723
+#: src/xml/xmli18n-tmp.h:5731
 msgid "Xerox Phaser 6130N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5724
+#: src/xml/xmli18n-tmp.h:5732
 msgid "Xerox Phaser 6180DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5725
+#: src/xml/xmli18n-tmp.h:5733
 msgid "Xerox Phaser 6180MFP-D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5726
+#: src/xml/xmli18n-tmp.h:5734
 msgid "Xerox Phaser 6200B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5727
+#: src/xml/xmli18n-tmp.h:5735
 msgid "Xerox Phaser 6200DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5728
+#: src/xml/xmli18n-tmp.h:5736
 msgid "Xerox Phaser 6200DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5729
+#: src/xml/xmli18n-tmp.h:5737
 msgid "Xerox Phaser 6200N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5730
+#: src/xml/xmli18n-tmp.h:5738
 msgid "Xerox Phaser 6250B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5731
+#: src/xml/xmli18n-tmp.h:5739
 msgid "Xerox Phaser 6250DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5732
+#: src/xml/xmli18n-tmp.h:5740
 msgid "Xerox Phaser 6250DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5733
+#: src/xml/xmli18n-tmp.h:5741
 msgid "Xerox Phaser 6250DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5734
+#: src/xml/xmli18n-tmp.h:5742
 msgid "Xerox Phaser 6250N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5735
+#: src/xml/xmli18n-tmp.h:5743
 msgid "Xerox Phaser 6300DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5744
 msgid "Xerox Phaser 6300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5745
 msgid "Xerox Phaser 6350DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5738
+#: src/xml/xmli18n-tmp.h:5746
 msgid "Xerox Phaser 6350DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5739
+#: src/xml/xmli18n-tmp.h:5747
 msgid "Xerox Phaser 6350DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5740
+#: src/xml/xmli18n-tmp.h:5748
 msgid "Xerox Phaser 6360DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5741
+#: src/xml/xmli18n-tmp.h:5749
 msgid "Xerox Phaser 6360DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5742
+#: src/xml/xmli18n-tmp.h:5750
 msgid "Xerox Phaser 7300B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5743
+#: src/xml/xmli18n-tmp.h:5751
 msgid "Xerox Phaser 7300DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5744
+#: src/xml/xmli18n-tmp.h:5752
 msgid "Xerox Phaser 7300DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5745
+#: src/xml/xmli18n-tmp.h:5753
 msgid "Xerox Phaser 7300DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5746
+#: src/xml/xmli18n-tmp.h:5754
 msgid "Xerox Phaser 7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5747
+#: src/xml/xmli18n-tmp.h:5755
 msgid "Xerox Phaser 7400DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5748
+#: src/xml/xmli18n-tmp.h:5756
 msgid "Xerox Phaser 7400DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5749
+#: src/xml/xmli18n-tmp.h:5757
 msgid "Xerox Phaser 7400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5750
+#: src/xml/xmli18n-tmp.h:5758
 msgid "Xerox Phaser 7400DXF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5751
+#: src/xml/xmli18n-tmp.h:5759
 msgid "Xerox Phaser 7400N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5760
 msgid "Xerox Phaser 7700DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5761
 msgid "Xerox Phaser 7700DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5754
+#: src/xml/xmli18n-tmp.h:5762
 msgid "Xerox Phaser 7700GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5755
+#: src/xml/xmli18n-tmp.h:5763
 msgid "Xerox Phaser 7750B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5756
+#: src/xml/xmli18n-tmp.h:5764
 msgid "Xerox Phaser 7750DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5757
+#: src/xml/xmli18n-tmp.h:5765
 msgid "Xerox Phaser 7750DXF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5766
 msgid "Xerox Phaser 7750GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5759
+#: src/xml/xmli18n-tmp.h:5767
 msgid "Xerox Phaser 7760DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5768
 msgid "Xerox Phaser 7760DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5761
+#: src/xml/xmli18n-tmp.h:5769
 msgid "Xerox Phaser 7760GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5762
+#: src/xml/xmli18n-tmp.h:5770
 msgid "Xerox Phaser 8400B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5763
+#: src/xml/xmli18n-tmp.h:5771
 msgid "Xerox Phaser 8400BD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5764
+#: src/xml/xmli18n-tmp.h:5772
 msgid "Xerox Phaser 8400DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5765
+#: src/xml/xmli18n-tmp.h:5773
 msgid "Xerox Phaser 8400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5766
+#: src/xml/xmli18n-tmp.h:5774
 msgid "Xerox Phaser 8400N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5767
+#: src/xml/xmli18n-tmp.h:5775
 msgid "Xerox Phaser 8500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5768
+#: src/xml/xmli18n-tmp.h:5776
 msgid "Xerox Phaser 8500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5769
+#: src/xml/xmli18n-tmp.h:5777
 msgid "Xerox Phaser 8550DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5770
+#: src/xml/xmli18n-tmp.h:5778
 msgid "Xerox Phaser 8550DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5779
 msgid "Xerox Phaser 8550DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5780
 msgid "Xerox Phaser 8560DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5781
 msgid "Xerox WorkCentre 7345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5774
+#: src/xml/xmli18n-tmp.h:5782
 msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5775
+#: src/xml/xmli18n-tmp.h:5783
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5784
 msgid "Lexmark X73"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5777
+#: src/xml/xmli18n-tmp.h:5785
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5778
+#: src/xml/xmli18n-tmp.h:5786
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5779
+#: src/xml/xmli18n-tmp.h:5787
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5780
+#: src/xml/xmli18n-tmp.h:5788
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5781
+#: src/xml/xmli18n-tmp.h:5789
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5782
+#: src/xml/xmli18n-tmp.h:5790
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5791
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5784
+#: src/xml/xmli18n-tmp.h:5792
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5785
+#: src/xml/xmli18n-tmp.h:5793
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5794
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5795
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5788
+#: src/xml/xmli18n-tmp.h:5796
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5797
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5790
+#: src/xml/xmli18n-tmp.h:5798
 msgid "Olympus P-440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5791
+#: src/xml/xmli18n-tmp.h:5799
 msgid "Olympus P-S100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5792
+#: src/xml/xmli18n-tmp.h:5800
 msgid "Canon CP-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5793
+#: src/xml/xmli18n-tmp.h:5801
 msgid "Canon CP-100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5794
+#: src/xml/xmli18n-tmp.h:5802
 msgid "Canon CP-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5795
+#: src/xml/xmli18n-tmp.h:5803
 msgid "Canon CP-220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5804
 msgid "Canon CP-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5805
 msgid "Canon CP-330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5798
+#: src/xml/xmli18n-tmp.h:5806
 msgid "Canon SELPHY CP400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5799
+#: src/xml/xmli18n-tmp.h:5807
 msgid "Canon SELPHY CP500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5800
+#: src/xml/xmli18n-tmp.h:5808
 msgid "Canon SELPHY CP510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5801
+#: src/xml/xmli18n-tmp.h:5809
 msgid "Canon SELPHY CP520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5802
+#: src/xml/xmli18n-tmp.h:5810
 msgid "Canon SELPHY CP530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5803
+#: src/xml/xmli18n-tmp.h:5811
 msgid "Canon SELPHY CP600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5804
+#: src/xml/xmli18n-tmp.h:5812
 msgid "Canon SELPHY CP710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5805
+#: src/xml/xmli18n-tmp.h:5813
 msgid "Canon SELPHY CP720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5806
+#: src/xml/xmli18n-tmp.h:5814
 msgid "Canon SELPHY CP730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5807
+#: src/xml/xmli18n-tmp.h:5815
 msgid "Canon SELPHY CP740"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5816
 msgid "Canon SELPHY CP750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5809
+#: src/xml/xmli18n-tmp.h:5817
 msgid "Canon SELPHY CP760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5810
+#: src/xml/xmli18n-tmp.h:5818
 msgid "Canon SELPHY CP770"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5811
+#: src/xml/xmli18n-tmp.h:5819
 msgid "Canon SELPHY CP780"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5812
+#: src/xml/xmli18n-tmp.h:5820
 msgid "Canon SELPHY CP790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5813
+#: src/xml/xmli18n-tmp.h:5821
 msgid "Canon SELPHY CP800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5814
+#: src/xml/xmli18n-tmp.h:5822
 msgid "Canon SELPHY CP810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5815
+#: src/xml/xmli18n-tmp.h:5823
 msgid "Canon SELPHY CP900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5816
+#: src/xml/xmli18n-tmp.h:5824
 msgid "Canon SELPHY ES1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5817
+#: src/xml/xmli18n-tmp.h:5825
 msgid "Canon SELPHY ES2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5818
+#: src/xml/xmli18n-tmp.h:5826
 msgid "Canon SELPHY ES3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5819
+#: src/xml/xmli18n-tmp.h:5827
 msgid "Canon SELPHY ES20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5828
 msgid "Canon SELPHY ES30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5829
 msgid "Canon SELPHY ES40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5822
+#: src/xml/xmli18n-tmp.h:5830
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5823
+#: src/xml/xmli18n-tmp.h:5831
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5824
+#: src/xml/xmli18n-tmp.h:5832
 msgid "Sony DPP-EX5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5825
+#: src/xml/xmli18n-tmp.h:5833
 msgid "Sony DPP-EX7"
 msgstr "Sony DPP-EX7"
 
-#: src/xml/xmli18n-tmp.h:5826
+#: src/xml/xmli18n-tmp.h:5834
 msgid "Sony UP-DR100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5827
+#: src/xml/xmli18n-tmp.h:5835
 msgid "Sony UP-DR200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5828
+#: src/xml/xmli18n-tmp.h:5836
 msgid "Fujifilm Printpix-CX-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5829
+#: src/xml/xmli18n-tmp.h:5837
 msgid "Fujifilm Printpix-CX-550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5830
+#: src/xml/xmli18n-tmp.h:5838
 msgid "Fujifilm FinePix-NX-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5831
+#: src/xml/xmli18n-tmp.h:5839
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5832
+#: src/xml/xmli18n-tmp.h:5840
 msgid "Kodak EasyShare-G600-Printer-Dock"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5833
+#: src/xml/xmli18n-tmp.h:5841
 msgid "Kodak PD-4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:5842
 msgid "Kodak PD-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5835
+#: src/xml/xmli18n-tmp.h:5843
 msgid "Kodak Photo-Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5836
+#: src/xml/xmli18n-tmp.h:5844
 msgid "Kodak Photo-Printer-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:5845
 msgid "Kodak Printer-Dock-Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5846
 msgid "Kodak Printer-Dock-Plus-S3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5839
+#: src/xml/xmli18n-tmp.h:5847
 msgid "Kodak 6800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5840
+#: src/xml/xmli18n-tmp.h:5848
 msgid "Kodak 6850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5841
+#: src/xml/xmli18n-tmp.h:5849
 msgid "Kodak 605"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5842
+#: src/xml/xmli18n-tmp.h:5850
 msgid "Kodak 1400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5843
+#: src/xml/xmli18n-tmp.h:5851
 msgid "Kodak 805"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5844
+#: src/xml/xmli18n-tmp.h:5852
 msgid "Kodak 9810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5845
+#: src/xml/xmli18n-tmp.h:5853
 msgid "Kodak 8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5854
 msgid "Mitsubishi CP-3020D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5847
+#: src/xml/xmli18n-tmp.h:5855
 msgid "Mitsubishi CP-3020DU"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5848
+#: src/xml/xmli18n-tmp.h:5856
 msgid "Mitsubishi CP-3020DE"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5849
+#: src/xml/xmli18n-tmp.h:5857
 msgid "Mitsubishi CP-3020DA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5850
+#: src/xml/xmli18n-tmp.h:5858
 msgid "Mitsubishi CP-3020DAE"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5851
+#: src/xml/xmli18n-tmp.h:5859
 msgid "Mitsubishi CP-9550D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5852
+#: src/xml/xmli18n-tmp.h:5860
 msgid "Mitsubishi CP-9550DW"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5853
+#: src/xml/xmli18n-tmp.h:5861
 msgid "Mitsubishi CP-9810D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5854
+#: src/xml/xmli18n-tmp.h:5862
 msgid "Mitsubishi CP-9810DW"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5855
+#: src/xml/xmli18n-tmp.h:5863
 msgid "Mitsubishi CP-D70DW"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5856
+#: src/xml/xmli18n-tmp.h:5864
 msgid "Mitsubishi CP-D707DW"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5865
 msgid "Mitsubishi CP-K60DW"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5858
+#: src/xml/xmli18n-tmp.h:5866
 msgid "Shinko CHC-S9045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5859
+#: src/xml/xmli18n-tmp.h:5867
 msgid "Shinko CHC-S2145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5860
+#: src/xml/xmli18n-tmp.h:5868
 msgid "Sinfonia CHC-S2145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5861
+#: src/xml/xmli18n-tmp.h:5869
 msgid "Dai Nippon Printing DS40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5862
+#: src/xml/xmli18n-tmp.h:5870
 msgid "Dai Nippon Printing DS80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5863
+#: src/xml/xmli18n-tmp.h:5871
 msgid "Dai Nippon Printing DSRX1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5864
+#: src/xml/xmli18n-tmp.h:5872
 msgid "Citizen CX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5865
+#: src/xml/xmli18n-tmp.h:5873
 msgid "Citizen CX-W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5866
+#: src/xml/xmli18n-tmp.h:5874
 msgid "Citizen CY"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5875
 msgid "Citizen CW-01"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5868
+#: src/xml/xmli18n-tmp.h:5876
 msgid "Citizen OP900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5869
+#: src/xml/xmli18n-tmp.h:5877
 msgid "Citizen CW-02"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5870
+#: src/xml/xmli18n-tmp.h:5878
 msgid "Citizen OP900II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5879
 msgid "Mitsubishi CP-3800DW"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5872
+#: src/xml/xmli18n-tmp.h:5880
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5873
+#: src/xml/xmli18n-tmp.h:5881
 msgid "RAW DATA 8 bit"
 msgstr ""
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/hello-debhelper.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/hello-debhelper.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/hello-debhelper.po	2014-02-24 08:24:37.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/hello-debhelper.po	2014-03-24 09:42:43.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:11+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:29+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: src/hello.c:98
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/hello.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/hello.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/hello.po	2014-02-24 08:24:37.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/hello.po	2014-03-24 09:42:43.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:11+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:29+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: src/hello.c:98
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/help2man.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/help2man.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/help2man.po	2014-02-24 08:24:29.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/help2man.po	2014-03-24 09:42:37.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:23+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 11:33+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: help2man:73
 #, perl-format
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/human-theme.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/human-theme.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/human-theme.po	2014-02-24 08:24:39.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/human-theme.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# Simplified Chinese translation for human-theme
-# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the human-theme package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: human-theme\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-06-23 11:36+0000\n"
-"PO-Revision-Date: 2009-08-06 11:58+0000\n"
-"Last-Translator: Tao Wei <weitao1979@gmail.com>\n"
-"Language-Team: Simplified Chinese <zh_CN@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-12 13:14+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
-
-#: ../index.theme.in.h:1
-msgid "Ubuntu default theme"
-msgstr "Ubuntu 默认主题"
-
-#: ../Human-Clearlooks/index.theme.in.h:1
-msgid "Human-Clearlooks"
-msgstr "Human-Clearlooks"
-
-#: ../DarkRoom/index.theme.in.h:1
-msgid "DarkRoom"
-msgstr "黑暗房间"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/hunspell.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/hunspell.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/hunspell.po	2014-02-24 08:24:38.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/hunspell.po	2014-03-24 09:42:44.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:19+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:37+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: src/tools/hunspell.cxx:205 src/tools/hunspell.cxx:313
 #, c-format
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/ibus-anthy.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/ibus-anthy.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/ibus-anthy.po	2014-02-24 08:24:44.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/ibus-anthy.po	2014-03-24 09:42:51.000000000 +0000
@@ -8,15 +8,15 @@
 msgstr ""
 "Project-Id-Version: ibus-anthy 1.2\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2014-02-17 13:48+0000\n"
+"POT-Creation-Date: 2014-03-11 03:52+0000\n"
 "PO-Revision-Date: 2013-12-30 18:38+0000\n"
 "Last-Translator: Peng Huang <Unknown>\n"
 "Language-Team: Peng Huang <shawn.p.huang@gmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:14+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:47+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: \n"
 
 #: ../engine/engine.py:207 ../setup/main.py:393
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/ibus-chewing.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/ibus-chewing.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/ibus-chewing.po	2014-02-24 08:24:44.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/ibus-chewing.po	2014-03-24 09:42:52.000000000 +0000
@@ -6,15 +6,15 @@
 msgstr ""
 "Project-Id-Version: ibus-chewing 1.4.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-16 22:50+1000\n"
+"POT-Creation-Date: 2014-02-01 12:23+0800\n"
 "PO-Revision-Date: 2013-12-20 23:42+0000\n"
 "Last-Translator: Leah Liu <Unknown>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:15+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:48+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh-CN\n"
 
 #: ../src/IBusChewingEngine.gob:367
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/ibus-hangul.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/ibus-hangul.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/ibus-hangul.po	2014-02-24 08:24:44.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/ibus-hangul.po	2014-03-24 09:42:51.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:13+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:47+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: \n"
 
 #: ../setup/keycapturedialog.py:15
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/ibus-pinyin.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/ibus-pinyin.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/ibus-pinyin.po	2014-02-24 08:24:44.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/ibus-pinyin.po	2014-03-24 09:42:51.000000000 +0000
@@ -7,58 +7,58 @@
 msgstr ""
 "Project-Id-Version: ibus-pinyin 1.2.99\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-17 13:49+0000\n"
-"PO-Revision-Date: 2014-02-18 11:48+0000\n"
+"POT-Creation-Date: 2014-02-27 12:00+0000\n"
+"PO-Revision-Date: 2014-02-28 03:48+0000\n"
 "Last-Translator: Peng Huang <Unknown>\n"
 "Language-Team: Peng Huang <shawn.p.huang@gmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:12+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:45+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
-#: ../src/PYMain.cc:95
+#: ../src/PYMain.cc:106
 msgid "Pinyin input method"
 msgstr "拼音输入法"
 
-#: ../src/PYMain.cc:104
+#: ../src/PYMain.cc:115
 msgid "Pinyin (debug)"
 msgstr "拼音（调试）"
 
-#: ../src/PYMain.cc:105
+#: ../src/PYMain.cc:116
 msgid "Pinyin input method (debug)"
 msgstr "拼音输入法（调试）"
 
-#: ../src/PYMain.cc:114
+#: ../src/PYMain.cc:127
 msgid "Bopomofo (debug)"
 msgstr "注音（调试）"
 
-#: ../src/PYMain.cc:115
+#: ../src/PYMain.cc:128
 msgid "Bopomofo input method (debug)"
 msgstr "注音输入法（调试）"
 
-#: ../src/PYPinyinProperties.cc:42 ../setup/ibus-pinyin-preferences.ui.h:5
+#: ../src/PYPinyinProperties.cc:46 ../setup/ibus-pinyin-preferences.ui.h:5
 msgid "Chinese"
 msgstr "中文"
 
-#: ../src/PYPinyinProperties.cc:49
+#: ../src/PYPinyinProperties.cc:53
 msgid "Full/Half width"
 msgstr "全角/半角"
 
-#: ../src/PYPinyinProperties.cc:56
+#: ../src/PYPinyinProperties.cc:60
 msgid "Full/Half width punctuation"
 msgstr "半角符号"
 
-#: ../src/PYPinyinProperties.cc:63
+#: ../src/PYPinyinProperties.cc:67
 msgid "Simplfied/Traditional Chinese"
 msgstr "简体/繁体中文"
 
-#: ../src/PYPinyinProperties.cc:66 ../src/PYPinyinProperties.cc:68
+#: ../src/PYPinyinProperties.cc:70 ../src/PYPinyinProperties.cc:72
 #: ../setup/ibus-pinyin-preferences.ui.h:1
 msgid "Preferences"
 msgstr "首选项"
 
-#: ../setup/main.py:389 ../setup/ibus-pinyin-preferences.ui.h:50
+#: ../setup/main.py:382 ../setup/ibus-pinyin-preferences.ui.h:50
 #, no-c-format, python-format
 msgid "<big><b>IBus Pinyin %s</b></big>"
 msgstr "<big><b>IBus 拼音 %s</b></big>"
@@ -277,49 +277,49 @@
 msgstr "关于"
 
 #: ../setup/ibus-pinyin-preferences.ui.h:64
+msgid "Standard"
+msgstr "标准"
+
+#: ../setup/ibus-pinyin-preferences.ui.h:65
+msgid "GinYieh"
+msgstr "精业"
+
+#: ../setup/ibus-pinyin-preferences.ui.h:66
+msgid "Eten"
+msgstr "倚天"
+
+#: ../setup/ibus-pinyin-preferences.ui.h:67
+msgid "IBM"
+msgstr "IBM"
+
+#: ../setup/ibus-pinyin-preferences.ui.h:68
 msgid "MSPY"
 msgstr "微软拼音"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:65
+#: ../setup/ibus-pinyin-preferences.ui.h:69
 msgid "ZRM"
 msgstr "自然码"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:66
+#: ../setup/ibus-pinyin-preferences.ui.h:70
 msgid "ABC"
 msgstr "智能 ABC"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:67
+#: ../setup/ibus-pinyin-preferences.ui.h:71
 msgid "ZGPY"
 msgstr "紫光拼音"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:68
+#: ../setup/ibus-pinyin-preferences.ui.h:72
 msgid "PYJJ"
 msgstr "拼音加加"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:69
+#: ../setup/ibus-pinyin-preferences.ui.h:73
 msgid "XHE"
 msgstr "小鹤"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:70
+#: ../setup/ibus-pinyin-preferences.ui.h:74
 msgid "Horizontal"
 msgstr "水平"
 
-#: ../setup/ibus-pinyin-preferences.ui.h:71
+#: ../setup/ibus-pinyin-preferences.ui.h:75
 msgid "Vertical"
 msgstr "竖直"
-
-#: ../setup/ibus-pinyin-preferences.ui.h:72
-msgid "Standard"
-msgstr "标准"
-
-#: ../setup/ibus-pinyin-preferences.ui.h:73
-msgid "GinYieh"
-msgstr "精业"
-
-#: ../setup/ibus-pinyin-preferences.ui.h:74
-msgid "Eten"
-msgstr "倚天"
-
-#: ../setup/ibus-pinyin-preferences.ui.h:75
-msgid "IBM"
-msgstr "IBM"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/ibus-table.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/ibus-table.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/ibus-table.po	2014-02-24 08:24:44.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/ibus-table.po	2014-03-24 09:42:51.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:14+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:47+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: \n"
 
 #: engine/table.py:1255
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/ibus-unikey.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/ibus-unikey.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/ibus-unikey.po	2014-02-24 08:24:45.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/ibus-unikey.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,185 +0,0 @@
-# Chinese (Simplified) translation for ibus-unikey
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the ibus-unikey package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: ibus-unikey\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-06-11 17:18+0700\n"
-"PO-Revision-Date: 2010-10-10 17:12+0000\n"
-"Last-Translator: Qiu Haoyu <Unknown>\n"
-"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-12 14:13+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
-
-#: src/engine.cpp:680
-msgid "Enable spell check"
-msgstr "启用拼写检查"
-
-#: src/engine.cpp:681
-msgid "If enable, you can decrease mistake when typing"
-msgstr "启用后您可以减少打字时的错误"
-
-#: src/engine.cpp:696
-msgid "Auto restore keys with invalid words"
-msgstr ""
-
-#: src/engine.cpp:697
-msgid ""
-"When typing a word not in Vietnamese,\n"
-"it will auto restore keystroke into original"
-msgstr ""
-
-#: src/engine.cpp:712
-msgid "Use oà, uý (instead of òa, úy)"
-msgstr ""
-
-#: src/engine.cpp:729
-msgid "Allow type with more freedom"
-msgstr ""
-
-#: src/engine.cpp:745
-msgid "Enable Macro"
-msgstr "启用宏"
-
-#: src/engine.cpp:761
-msgid "Process W at word begin"
-msgstr ""
-
-#: src/engine.cpp:777
-msgid "Capture mouse event"
-msgstr "捕获鼠标事件"
-
-#: src/engine.cpp:778
-msgid "Auto send PreEdit string to Application when mouse move or click"
-msgstr ""
-
-#: src/engine.cpp:800
-msgid "Run Setup..."
-msgstr "运行设置..."
-
-#: src/engine.cpp:801
-msgid "Run setup utility for IBus-Unikey"
-msgstr "运行 IBus-Unikey 的设置实用工具"
-
-#: src/engine.cpp:824
-msgid "Choose input method"
-msgstr "选择输入法"
-
-#: src/engine.cpp:844
-msgid "Choose output charset"
-msgstr "选择输出字符集"
-
-#: src/engine.cpp:858
-msgid "Options"
-msgstr "选项"
-
-#: src/engine.cpp:859
-msgid "Options for Unikey"
-msgstr "Unikey 选项"
-
-#: src/utils.cpp:14
-msgid ""
-"Vietnamese Input Method Engine for IBus using Unikey Engine\n"
-"Usage:\n"
-"  - Choose input method, output charset, options in language bar.\n"
-"  - There are 4 input methods: Telex, Vni, STelex (simple telex) and STelex2 "
-"(which same as STelex, the difference is it use w as ư).\n"
-"  - And 7 output charsets: Unicode (UTF-8), TCVN3, VNI Win, VIQR, CString, "
-"NCR Decimal and NCR Hex.\n"
-"  - Use <Shift>+<Space> or <Shift>+<Shift> to restore keystrokes.\n"
-"  - Use <Control> to commit a word."
-msgstr ""
-
-#: setup/setup-main.glade:27
-msgid "IBus-Unikey Setup"
-msgstr "IBus-Unikey 设置"
-
-#: setup/setup-main.glade:58
-msgid "Input method:"
-msgstr "输入法："
-
-#: setup/setup-main.glade:69
-msgid "Output charset: "
-msgstr "输出字符集： "
-
-#: setup/setup-main.glade:131
-msgid "<b>Input/Output</b>"
-msgstr "<b>输入/输出</b>"
-
-#: setup/setup-main.glade:155
-msgid "Enable _spell check"
-msgstr "启用拼写检查(_S)"
-
-#: setup/setup-main.glade:168
-msgid "Auto _restore keys with invalid words"
-msgstr ""
-
-#: setup/setup-main.glade:181
-msgid "Use oà, _uý (instead of òa, úy)"
-msgstr ""
-
-#: setup/setup-main.glade:194
-msgid "Allow type with more _freedom"
-msgstr ""
-
-#: setup/setup-main.glade:210
-msgid "Enable _macro"
-msgstr "启用宏(_M)"
-
-#: setup/setup-main.glade:223
-msgid "_Edit macro"
-msgstr "编辑宏(_E)"
-
-#: setup/setup-main.glade:242
-msgid "Process _W at word begin"
-msgstr ""
-
-#: setup/setup-main.glade:255
-msgid "Capture _mouse event"
-msgstr ""
-
-#: setup/setup-main.glade:273
-msgid "<b>Options</b>"
-msgstr "<b>选项</b>"
-
-#: setup/setup-macro.glade:15
-msgid "Macro table definition"
-msgstr ""
-
-#: setup/setup-macro.glade:46
-msgid "Word"
-msgstr ""
-
-#: setup/setup-macro.glade:62
-msgid "Replace with"
-msgstr ""
-
-#: setup/setup-macro.glade:102
-msgid "Delete _all"
-msgstr ""
-
-#: setup/setup-macro.glade:126
-msgid "_Import..."
-msgstr ""
-
-#: setup/setup-macro.glade:140
-msgid "_Export..."
-msgstr ""
-
-#: setup/dlg_macro_table.cpp:13
-msgid "(replace text)"
-msgstr ""
-
-#: setup/dlg_macro_table.cpp:346
-msgid "Choose file to import"
-msgstr ""
-
-#: setup/dlg_macro_table.cpp:396
-msgid "Choose file to export"
-msgstr ""
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/im-config.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/im-config.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/im-config.po	2014-02-24 08:24:46.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/im-config.po	2014-03-24 09:42:53.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:32+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 14:08+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: \n"
 
 #: ../im-config:15
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/indent.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/indent.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/indent.po	2014-02-24 08:24:29.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/indent.po	2014-03-24 09:42:37.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:23+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 11:33+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "X-Poedit-Basepath: d:\\msys\\source\\indent-2.2.9\n"
 
 #: src/args.c:611
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/isoquery.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/isoquery.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/isoquery.po	2014-02-24 08:24:44.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/isoquery.po	2014-03-24 09:42:51.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: isoquery\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-06-01 23:46+0200\n"
+"POT-Creation-Date: 2012-01-07 23:33+0100\n"
 "PO-Revision-Date: 2009-10-19 18:07+0000\n"
 "Last-Translator: Tao Wei <weitao1979@gmail.com>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-12 14:02+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:43+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: isoquery/cmdline_parser.py:30
 msgid "Usage: %prog [options] [ISO codes]"
@@ -94,7 +94,7 @@
 msgstr "isoquery %(version)s"
 
 #: isoquery/cmdline_parser.py:127
-msgid "Copyright © 2007-2011 Tobias Quathamer"
+msgid "Copyright © 2007-2012 Tobias Quathamer"
 msgstr ""
 
 #. TRANSLATORS: Please change the uppercase words as appropriate for
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/JabberBot.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/JabberBot.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/JabberBot.po	2014-02-24 08:24:33.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/JabberBot.po	2014-03-24 09:42:40.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:46+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 11:59+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #, python-format
 msgid ""
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/jade.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/jade.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/jade.po	2014-02-24 08:24:32.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/jade.po	2014-03-24 09:42:38.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:39+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 11:51+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 msgid "cannot open output file %1 (%2)"
 msgstr "无法打开输出文件 %1 (%2)"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/kbd.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/kbd.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/kbd.po	2014-02-24 08:24:37.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/kbd.po	2014-03-24 09:42:43.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:11+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:29+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: src/chvt.c:28
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/kerneloops.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/kerneloops.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/kerneloops.po	2014-02-24 08:24:43.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/kerneloops.po	2014-03-24 09:42:51.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:10+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:42+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: kerneloops-applet.c:170 kerneloops-applet.c:212
 msgid "Always"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/keystone.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/keystone.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/keystone.po	2014-02-24 08:24:47.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/keystone.po	2014-03-24 09:42:54.000000000 +0000
@@ -7,16 +7,16 @@
 msgstr ""
 "Project-Id-Version: Keystone\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2013-12-28 06:00+0000\n"
-"PO-Revision-Date: 2014-01-24 06:24+0000\n"
+"POT-Creation-Date: 2014-03-02 06:00+0000\n"
+"PO-Revision-Date: 2014-03-14 06:37+0000\n"
 "Last-Translator: Ying Chun Guo <guoyingc@cn.ibm.com>\n"
 "Language-Team: Chinese (China) "
 "(http://www.transifex.com/projects/p/openstack/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:38+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 14:17+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Generated-By: Babel 1.3\n"
 
 #: keystone/clean.py:23
@@ -40,15 +40,16 @@
 msgid "%(property_name)s is not a %(display_expected_type)s"
 msgstr ""
 
-#: keystone/cli.py:81 keystone/cli.py:117
-msgid "This extension does not provide migrations."
+#: keystone/cli.py:80 keystone/cli.py:118
+#, python-format
+msgid "%s extension does not exist."
 msgstr ""
 
-#: keystone/exception.py:50
+#: keystone/exception.py:48
 msgid "missing exception kwargs (programmer error)"
 msgstr ""
 
-#: keystone/exception.py:80
+#: keystone/exception.py:78
 #, python-format
 msgid ""
 "Expecting to find %(attribute)s in %(target)s. The server could not comply "
@@ -56,21 +57,21 @@
 "client is assumed to be in error."
 msgstr ""
 
-#: keystone/exception.py:89
+#: keystone/exception.py:87
 msgid ""
 "Timestamp not in expected format. The server could not comply with the "
 "request since it is either malformed or otherwise incorrect. The client is "
 "assumed to be in error."
 msgstr ""
 
-#: keystone/exception.py:98
+#: keystone/exception.py:96
 #, python-format
 msgid ""
 "String length exceeded.The length of string '%(string)s' exceeded the limit "
 "of column %(type)s(CHAR(%(length)d))."
 msgstr ""
 
-#: keystone/exception.py:104
+#: keystone/exception.py:102
 #, python-format
 msgid ""
 "Request attribute %(attribute)s must be less than or equal to %(size)i. The "
@@ -78,247 +79,460 @@
 "invalid (too large). The client is assumed to be in error."
 msgstr ""
 
-#: keystone/exception.py:125
-msgid "The request you have made requires authentication."
+#: keystone/exception.py:112
+msgid ""
+"The certificates you requested are not available. It is likely that this "
+"server does not use PKI tokens otherwise this is the result of "
+"misconfiguration."
 msgstr ""
 
 #: keystone/exception.py:131
+msgid "The request you have made requires authentication."
+msgstr ""
+
+#: keystone/exception.py:137
 msgid "Authentication plugin error."
 msgstr ""
 
-#: keystone/exception.py:139
+#: keystone/exception.py:145
 msgid "Attempted to authenticate with an unsupported method."
 msgstr ""
 
-#: keystone/exception.py:147
+#: keystone/exception.py:153
 msgid "Additional authentications steps required."
 msgstr ""
 
-#: keystone/exception.py:155
+#: keystone/exception.py:161
 msgid "You are not authorized to perform the requested action."
 msgstr ""
 
-#: keystone/exception.py:162
+#: keystone/exception.py:168
 #, python-format
 msgid "You are not authorized to perform the requested action, %(action)s."
 msgstr ""
 
-#: keystone/exception.py:167
+#: keystone/exception.py:173
+#, python-format
+msgid ""
+"Could not change immutable attribute %(attribute)s in target %(target)s"
+msgstr ""
+
+#: keystone/exception.py:178
 #, python-format
 msgid "Could not find, %(target)s."
 msgstr ""
 
-#: keystone/exception.py:173
+#: keystone/exception.py:184
 #, python-format
 msgid "Could not find endpoint, %(endpoint_id)s."
 msgstr ""
 
-#: keystone/exception.py:180
+#: keystone/exception.py:191
 msgid "An unhandled exception has occurred: Could not find metadata."
 msgstr ""
 
-#: keystone/exception.py:185
+#: keystone/exception.py:196
 #, python-format
 msgid "Could not find policy, %(policy_id)s."
 msgstr ""
 
-#: keystone/exception.py:189
+#: keystone/exception.py:200
 #, python-format
 msgid "Could not find role, %(role_id)s."
 msgstr ""
 
-#: keystone/exception.py:193
+#: keystone/exception.py:204
+#, python-format
+msgid "Could not find region, %(region_id)s."
+msgstr ""
+
+#: keystone/exception.py:208
 #, python-format
 msgid "Could not find service, %(service_id)s."
 msgstr ""
 
-#: keystone/exception.py:197
+#: keystone/exception.py:212
 #, python-format
 msgid "Could not find domain, %(domain_id)s."
 msgstr ""
 
-#: keystone/exception.py:201
+#: keystone/exception.py:216
 #, python-format
 msgid "Could not find project, %(project_id)s."
 msgstr ""
 
-#: keystone/exception.py:205
+#: keystone/exception.py:220
 #, python-format
 msgid "Could not find token, %(token_id)s."
 msgstr ""
 
-#: keystone/exception.py:209
+#: keystone/exception.py:224
 #, python-format
 msgid "Could not find user, %(user_id)s."
 msgstr ""
 
-#: keystone/exception.py:213
+#: keystone/exception.py:228
 #, python-format
 msgid "Could not find group, %(group_id)s."
 msgstr ""
 
-#: keystone/exception.py:217
+#: keystone/exception.py:232
+#, python-format
+msgid "Could not find mapping, %(mapping_id)s."
+msgstr ""
+
+#: keystone/exception.py:236
 #, python-format
 msgid "Could not find trust, %(trust_id)s."
 msgstr ""
 
-#: keystone/exception.py:221
+#: keystone/exception.py:240
 #, python-format
 msgid "Could not find credential, %(credential_id)s."
 msgstr ""
 
-#: keystone/exception.py:225
+#: keystone/exception.py:244
 #, python-format
 msgid "Could not find version, %(version)s."
 msgstr ""
 
-#: keystone/exception.py:229
+#: keystone/exception.py:248
+#, python-format
+msgid "Could not find IdentityProvider, %(idp_id)s."
+msgstr ""
+
+#: keystone/exception.py:252
+#, python-format
+msgid ""
+"Could not find federated protocol %(protocol_id)s for IdentityProvider, "
+"%(idp_id)s"
+msgstr ""
+
+#: keystone/exception.py:257
 #, python-format
 msgid "Conflict occurred attempting to store %(type)s. %(details)s"
 msgstr ""
 
-#: keystone/exception.py:236
+#: keystone/exception.py:264
 msgid "Request is too large."
 msgstr ""
 
-#: keystone/exception.py:242
+#: keystone/exception.py:270
 #, python-format
 msgid ""
 "An unexpected error prevented the server from fulfilling your request. "
 "%(exception)s"
 msgstr ""
 
-#: keystone/exception.py:249
+#: keystone/exception.py:277
+msgid ""
+"Expected signing certificates are not available on the server. Please check "
+"Keystone configuration."
+msgstr ""
+
+#: keystone/exception.py:282
 #, python-format
 msgid "Malformed endpoint URL (%(endpoint)s), see ERROR log for details."
 msgstr ""
 
-#: keystone/exception.py:254
+#: keystone/exception.py:287
 msgid "The action you have requested has not been implemented."
 msgstr ""
 
-#: keystone/exception.py:261
+#: keystone/exception.py:294
 #, python-format
 msgid "The Keystone configuration file %(config_file)s could not be found."
 msgstr ""
 
-#: keystone/notifications.py:97
+#: keystone/exception.py:300
+#, python-format
+msgid ""
+"%(mod_name)s doesn't provide database migrations. The migration repository "
+"path at %(path)s doesn't exist or isn't a directory."
+msgstr ""
+
+#: keystone/notifications.py:119
+#, python-format
+msgid ""
+"%(event)s is not a valid notification event, must be one of: %(actions)s"
+msgstr ""
+
+#: keystone/notifications.py:128
+#, python-format
+msgid "Method not callable: %s"
+msgstr ""
+
+#: keystone/notifications.py:136
+#, python-format
+msgid "Callback: `%(callback)s` subscribed to event `%(event)s`."
+msgstr ""
+
+#: keystone/notifications.py:155
+#, python-format
+msgid ""
+"Invoking callback %(cb_name)s for event %(service)s %(resource_type)s "
+"%(operation)s for%(payload)s"
+msgstr ""
+
+#: keystone/notifications.py:218
 #, python-format
 msgid "Failed to send %(res_id)s %(event_type)s notification"
 msgstr ""
 
-#: keystone/assignment/controllers.py:70
+#: keystone/notifications.py:289
+#, python-format
+msgid "CADF Event: %s"
+msgstr ""
+
+#: keystone/notifications.py:302
+#, python-format
+msgid "Failed to send %(action)s %(event_type)s notification"
+msgstr ""
+
+#: keystone/assignment/controllers.py:71
 #, python-format
 msgid "Authentication failed: %s"
 msgstr ""
 
-#: keystone/assignment/controllers.py:104
-#: keystone/assignment/controllers.py:217 keystone/identity/controllers.py:130
+#: keystone/assignment/controllers.py:105
+#: keystone/assignment/controllers.py:219 keystone/identity/controllers.py:129
 msgid "Name field is required and cannot be empty"
 msgstr ""
 
-#: keystone/assignment/controllers.py:158
+#: keystone/assignment/controllers.py:142
+#, python-format
+msgid "User %(user_id)s in project %(project_id)s doesn't exist."
+msgstr ""
+
+#: keystone/assignment/controllers.py:160
 msgid "Marker could not be found"
 msgstr ""
 
-#: keystone/assignment/controllers.py:169
+#: keystone/assignment/controllers.py:171
 msgid "Invalid limit value"
 msgstr ""
 
-#: keystone/assignment/controllers.py:612
+#: keystone/assignment/controllers.py:473
 msgid "Specify a domain or project, not both"
 msgstr ""
 
-#: keystone/assignment/controllers.py:617
+#: keystone/assignment/controllers.py:478
 msgid "Specify a user or group, not both"
 msgstr ""
 
-#: keystone/assignment/controllers.py:847
+#: keystone/assignment/controllers.py:691
 #, python-format
 msgid ""
 "Group %(group)s not found for role-assignment - %(target)s with Role: "
 "%(role)s"
 msgstr ""
 
-#: keystone/assignment/core.py:224
+#: keystone/assignment/core.py:240
 #, python-format
 msgid "Creating the default role %s because it does not exist."
 msgstr ""
 
-#: keystone/assignment/core.py:683 keystone/identity/core.py:256
-#: keystone/identity/core.py:268
+#: keystone/assignment/core.py:268
+#, python-format
+msgid "Removing role %s failed because it does not exist."
+msgstr ""
+
+#: keystone/assignment/core.py:330
+msgid "delete the default domain"
+msgstr ""
+
+#: keystone/assignment/core.py:341
+msgid "cannot delete a domain that is enabled, please disable it first."
+msgstr ""
+
+#: keystone/assignment/core.py:378
+#, python-format
+msgid ""
+"Project %(projectid)s not found when deleting domain contents for "
+"%(domainid)s, continuing with cleanup."
+msgstr ""
+
+#: keystone/assignment/core.py:391
+#, python-format
+msgid ""
+"Group %(groupid)s not found when deleting domain contents for %(domainid)s, "
+"continuing with cleanup."
+msgstr ""
+
+#: keystone/assignment/core.py:403
+#, python-format
+msgid ""
+"User %(userid)s not found when deleting domain contents for %(domainid)s, "
+"continuing with cleanup."
+msgstr ""
+
+#: keystone/assignment/core.py:501
+#, python-format
+msgid "Group %s not found, no tokens to invalidate."
+msgstr ""
+
+#: keystone/assignment/core.py:539
+#, python-format
+msgid "Project (%s)"
+msgstr ""
+
+#: keystone/assignment/core.py:541
+#, python-format
+msgid "Domain (%s)"
+msgstr ""
+
+#: keystone/assignment/core.py:543
+msgid "Unknown Target"
+msgstr ""
+
+#: keystone/assignment/core.py:544
+#, python-format
+msgid ""
+"Group (%(group)s), referenced in assignment for %(target)s, not found - "
+"ignoring."
+msgstr ""
+
+#: keystone/assignment/core.py:985 keystone/common/controller.py:261
+#: keystone/identity/core.py:228
 #, python-format
 msgid "Expected dict or list: %s"
 msgstr ""
 
-#: keystone/assignment/backends/kvs.py:140
-#: keystone/assignment/backends/ldap.py:449
-#: keystone/assignment/backends/sql.py:333
-#: keystone/assignment/backends/sql.py:340
+#: keystone/assignment/backends/kvs.py:201
+#: keystone/assignment/backends/ldap.py:580
+#: keystone/assignment/backends/sql.py:351
 #, python-format
 msgid "Cannot remove role that has not been granted, %s"
 msgstr "无法除去尚未授予的角色 %s"
 
-#: keystone/assignment/backends/ldap.py:428
+#: keystone/assignment/backends/ldap.py:110
+msgid "Domain metadata not supported by LDAP"
+msgstr ""
+
+#: keystone/assignment/backends/ldap.py:199
+#: keystone/assignment/backends/ldap.py:247 keystone/common/ldap/core.py:331
+#: keystone/identity/backends/kvs.py:116 keystone/identity/backends/kvs.py:223
+#, python-format
+msgid "Duplicate ID, %s."
+msgstr "标识 %s 重复。"
+
+#: keystone/assignment/backends/ldap.py:207 keystone/common/ldap/core.py:321
+#: keystone/identity/backends/kvs.py:124 keystone/identity/backends/kvs.py:151
+#: keystone/identity/backends/kvs.py:230 keystone/identity/backends/kvs.py:258
+#, python-format
+msgid "Duplicate name, %s."
+msgstr "名称 %s 重复。"
+
+#: keystone/assignment/backends/ldap.py:249
+#: keystone/assignment/backends/ldap.py:257
+#: keystone/assignment/backends/ldap.py:261
+msgid "Domains are read-only against LDAP"
+msgstr ""
+
+#: keystone/assignment/backends/ldap.py:314
+#: keystone/assignment/backends/sql.py:135
+msgid "Inherited roles can only be assigned to domains"
+msgstr ""
+
+#: keystone/assignment/backends/ldap.py:553
+#, python-format
+msgid "User %(user_id)s already has role %(role_id)s in tenant %(tenant_id)s"
+msgstr ""
+
+#: keystone/assignment/backends/ldap.py:559
 #, python-format
 msgid "Role %s not found"
 msgstr "找不到角色 %s"
 
-#: keystone/assignment/backends/sql.py:104
-msgid "Inherited roles can only be assigned to domains"
+#: keystone/assignment/backends/ldap.py:666
+#, python-format
+msgid "Cannot duplicate name %s"
+msgstr ""
+
+#: keystone/assignment/backends/sql.py:122
+#, python-format
+msgid ""
+"Unexpected combination of grant attributes - User, Group, Project, Domain: %s"
+msgstr ""
+
+#: keystone/assignment/backends/sql.py:291
+msgid "Must specify either domain or project"
+msgstr ""
+
+#: keystone/assignment/backends/sql.py:372
+#, python-format
+msgid "Unexpected assignment type encountered, %s"
+msgstr ""
+
+#: keystone/auth/controllers.py:56
+#, python-format
+msgid ""
+"Cannot load an auth-plugin by class-name without a \"method\" attribute "
+"defined: %s"
+msgstr ""
+
+#: keystone/auth/controllers.py:64
+#, python-format
+msgid ""
+"Driver requested method %(req)s does not match plugin name %(plugin)s."
+msgstr ""
+
+#: keystone/auth/controllers.py:69
+#, python-format
+msgid "Auth Plugin %s does not have a \"method\" attribute."
 msgstr ""
 
-#: keystone/auth/controllers.py:75
+#: keystone/auth/controllers.py:73
+#, python-format
+msgid ""
+"Auth plugin %(plugin)s is requesting previously registered method %(method)s"
+msgstr ""
+
+#: keystone/auth/controllers.py:114
 #, python-format
 msgid "Project is disabled: %s"
 msgstr "项目已禁用：%s"
 
-#: keystone/auth/controllers.py:81 keystone/auth/plugins/password.py:42
-#: keystone/token/core.py:77 keystone/token/core.py:93
+#: keystone/auth/controllers.py:120 keystone/auth/plugins/password.py:40
+#: keystone/token/core.py:79 keystone/token/core.py:95
 #, python-format
 msgid "Domain is disabled: %s"
 msgstr "域已禁用：%s"
 
-#: keystone/auth/controllers.py:87 keystone/auth/plugins/password.py:48
-#: keystone/token/core.py:69
-#, python-format
-msgid "User is disabled: %s"
-msgstr "用户已禁用：%s"
-
-#: keystone/auth/controllers.py:267
+#: keystone/auth/controllers.py:277
 msgid "Scoping to both domain and project is not allowed"
 msgstr "不允许同时将作用域限定到域和项目"
 
-#: keystone/auth/controllers.py:270
+#: keystone/auth/controllers.py:280
 msgid "Scoping to both domain and trust is not allowed"
 msgstr "不允许同时将作用域限定到域和信任"
 
-#: keystone/auth/controllers.py:273
+#: keystone/auth/controllers.py:283
 msgid "Scoping to both project and trust is not allowed"
 msgstr "不允许同时将作用域限定到项目和信任"
 
-#: keystone/auth/controllers.py:360
+#: keystone/auth/controllers.py:375
 #, python-format
 msgid ""
 "User %(user_id)s doesn't have access to default project %(project_id)s. The "
 "token will be unscoped rather than scoped to the project."
 msgstr ""
 
-#: keystone/auth/controllers.py:367
+#: keystone/auth/controllers.py:382
 #, python-format
 msgid ""
 "User %(user_id)s's default project %(project_id)s is disabled. The token "
 "will be unscoped rather than scoped to the project."
 msgstr ""
 
-#: keystone/auth/controllers.py:376
+#: keystone/auth/controllers.py:391
 #, python-format
 msgid ""
 "User %(user_id)s's default project %(project_id)s not found. The token will "
 "be unscoped rather than scoped to the project."
 msgstr ""
 
-#: keystone/auth/controllers.py:407
+#: keystone/auth/controllers.py:422
 msgid "User not found"
 msgstr "找不到用户"
 
@@ -331,153 +545,133 @@
 msgid "Unable to lookup user %s"
 msgstr "无法查找用户 %s"
 
-#: keystone/auth/plugins/external.py:105
-msgid ""
-"keystone.auth.external.ExternalDefault is deprecated infavor of "
-"keystone.auth.external.Default"
+#: keystone/auth/plugins/oauth1.py:54
+msgid "Access token is expired"
 msgstr ""
 
-#: keystone/auth/plugins/external.py:113
-msgid ""
-"keystone.auth.external.ExternalDomain is deprecated infavor of "
-"keystone.auth.external.Domain"
+#: keystone/auth/plugins/oauth1.py:68
+msgid "Could not validate the access token"
 msgstr ""
 
-#: keystone/auth/plugins/oauth1.py:55
-msgid "Access token is expired"
-msgstr ""
+#: keystone/auth/plugins/password.py:46 keystone/token/core.py:71
+#, python-format
+msgid "User is disabled: %s"
+msgstr "用户已禁用：%s"
 
-#: keystone/auth/plugins/oauth1.py:75
-#: keystone/contrib/oauth1/controllers.py:269
-msgid "There should not be any non-oauth parameters"
+#: keystone/auth/plugins/password.py:122
+msgid "Invalid username or password"
 msgstr ""
 
-#: keystone/auth/plugins/password.py:120
-msgid "Invalid username or password"
+#: keystone/auth/plugins/saml2.py:88
+msgid "Federation token is expired"
 msgstr ""
 
-#: keystone/catalog/core.py:42
+#: keystone/catalog/core.py:41
 #, python-format
 msgid "Malformed endpoint %(url)s - unknown key %(keyerror)s"
 msgstr "端点 %(url)s 的格式不正确 - 键 %(keyerror)s 未知"
 
-#: keystone/catalog/core.py:47
+#: keystone/catalog/core.py:46
 #, python-format
 msgid ""
 "Malformed endpoint %(url)s - unknown key %(keyerror)s(are you missing "
 "brackets ?)"
 msgstr "端点 %(url)s 的格式不正确 - 键 %(keyerror)s 未知（您遗漏了方括号吗？）"
 
-#: keystone/catalog/core.py:53
+#: keystone/catalog/core.py:52
 #, python-format
 msgid ""
 "Malformed endpoint %s - incomplete format (are you missing a type notifier ?)"
 msgstr ""
 
-#: keystone/catalog/backends/templated.py:107
+#: keystone/catalog/backends/templated.py:105
 #, python-format
 msgid "Unable to open template file %s"
 msgstr "无法打开模板文件 %s"
 
-#: keystone/common/base64utils.py:207 keystone/common/base64utils.py:280
-#: keystone/common/base64utils.py:334
+#: keystone/common/authorization.py:73
+msgid "RBAC: Invalid user data in v3 token"
+msgstr ""
+
+#: keystone/common/authorization.py:78
+msgid "RBAC: Proceeding without project"
+msgstr "RBAC：正在没有项目的情况下继续"
+
+#: keystone/common/authorization.py:96
+msgid "RBAC: Invalid user data in v2 token"
+msgstr ""
+
+#: keystone/common/authorization.py:101
+msgid "RBAC: Proceeding without tenant"
+msgstr "RBAC：正在没有租户的情况下继续"
+
+#: keystone/common/base64utils.py:203 keystone/common/base64utils.py:276
+#: keystone/common/base64utils.py:330
 msgid "pad must be single character"
 msgstr ""
 
-#: keystone/common/base64utils.py:213
+#: keystone/common/base64utils.py:209
 #, python-format
 msgid "text is multiple of 4, but pad \"%s\" occurs before 2nd to last char"
 msgstr ""
 
-#: keystone/common/base64utils.py:217
+#: keystone/common/base64utils.py:213
 #, python-format
 msgid "text is multiple of 4, but pad \"%s\" occurs before non-pad last char"
 msgstr ""
 
-#: keystone/common/base64utils.py:223
+#: keystone/common/base64utils.py:219
 #, python-format
 msgid "text is not a multiple of 4, but contains pad \"%s\""
 msgstr ""
 
-#: keystone/common/base64utils.py:242 keystone/common/base64utils.py:263
+#: keystone/common/base64utils.py:238 keystone/common/base64utils.py:259
 msgid "padded base64url text must be multiple of 4 characters"
 msgstr ""
 
-#: keystone/common/cms.py:42
+#: keystone/common/controller.py:38
 #, python-format
-msgid "Verify error: %s"
-msgstr "发生验证错误：%s"
-
-#: keystone/common/cms.py:134
-msgid ""
-"Signing error: Unable to load certificate - ensure you've configured PKI "
-"with 'keystone-manage pki_setup'"
-msgstr "发生签名错误：无法装入证书 - 请确保您已使用“keystone-manage pki_setup”配置 PKI"
+msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
+msgstr ""
 
-#: keystone/common/cms.py:138
-#, python-format
-msgid "Signing error: %s"
-msgstr "发生签名错误：%s"
+#: keystone/common/controller.py:45
+msgid "RBAC: using auth context from the request environment"
+msgstr ""
 
-#: keystone/common/controller.py:39
-#, python-format
-msgid "RBAC: Authorizing %(action)s(%(kwargs)s)"
+#: keystone/common/controller.py:50
+msgid "RBAC: building auth context from the incoming auth token"
 msgstr ""
 
-#: keystone/common/controller.py:46
+#: keystone/common/controller.py:54 keystone/middleware/core.py:231
 msgid "RBAC: Invalid token"
 msgstr "RBAC：令牌无效"
 
-#: keystone/common/controller.py:60 keystone/common/controller.py:81
-msgid "RBAC: Invalid user"
-msgstr "RBAC：用户无效"
-
-#: keystone/common/controller.py:66
-msgid "RBAC: Proceeding without project"
-msgstr "RBAC：正在没有项目的情况下继续"
-
-#: keystone/common/controller.py:86
-msgid "RBAC: Proceeding without tenant"
-msgstr "RBAC：正在没有租户的情况下继续"
-
-#: keystone/common/controller.py:128 keystone/common/controller.py:215
-#: keystone/common/controller.py:487
+#: keystone/common/controller.py:83 keystone/common/controller.py:174
+#: keystone/common/controller.py:562
 msgid "RBAC: Bypassing authorization"
 msgstr "RBAC：正在绕过授权"
 
-#: keystone/common/controller.py:173 keystone/common/controller.py:213
-#: keystone/common/controller.py:503
+#: keystone/common/controller.py:130 keystone/common/controller.py:172
+#: keystone/common/controller.py:580
 msgid "RBAC: Authorization granted"
 msgstr "RBAC：已授予权限"
 
-#: keystone/common/controller.py:203
+#: keystone/common/controller.py:160
 #, python-format
 msgid "RBAC: Adding query filter params (%s)"
 msgstr "RBAC：正在添加查询过滤器参数 (%s)"
 
-#: keystone/common/controller.py:275
-#, python-format
-msgid "Project (%s)"
-msgstr ""
-
-#: keystone/common/controller.py:277
-#, python-format
-msgid "Domain (%s)"
+#: keystone/common/controller.py:533
+msgid "Invalid token in _get_domain_id_for_request"
 msgstr ""
 
-#: keystone/common/controller.py:279
-msgid "Unknown Target"
+#: keystone/common/dependency.py:81
+msgid "event_callbacks must be a dict"
 msgstr ""
 
-#: keystone/common/controller.py:280
+#: keystone/common/dependency.py:86
 #, python-format
-msgid ""
-"Group (%(group)s), referenced in assignment for %(target)s, not found - "
-"ignoring."
-msgstr ""
-
-#: keystone/common/controller.py:458
-msgid "Invalid token in _get_domain_id_for_request"
+msgid "event_callbacks[%s] must be a dict"
 msgstr ""
 
 #: keystone/common/pemutils.py:221
@@ -516,16 +710,20 @@
 "failed to base64 decode %(pem_type)s PEM at position%(position)d: %(err_msg)s"
 msgstr ""
 
+#: keystone/common/serializer.py:201
+msgid "Multiple truncation attributes found"
+msgstr ""
+
 #: keystone/common/utils.py:76
 #, python-format
 msgid "Truncating user password to %s characters."
 msgstr ""
 
-#: keystone/common/utils.py:185 keystone/credential/controllers.py:42
+#: keystone/common/utils.py:194 keystone/credential/controllers.py:41
 msgid "Invalid blob in credential"
 msgstr ""
 
-#: keystone/common/utils.py:264
+#: keystone/common/utils.py:273
 msgid ""
 "Error setting up the debug environment. Verify that the option --debug-url "
 "has the format <host>:<port> and that a debugger processes is listening on "
@@ -574,234 +772,288 @@
 msgid "Authorization failed. %(exception)s from %(remote_addr)s"
 msgstr ""
 
-#: keystone/common/wsgi.py:462 keystone/tests/test_wsgi.py:282
+#: keystone/common/wsgi.py:287
+#, python-format
+msgid "%s field is required and cannot be empty"
+msgstr ""
+
+#: keystone/common/wsgi.py:299
+msgid "Invalid token in _get_trust_id_for_request"
+msgstr ""
+
+#: keystone/common/wsgi.py:478 keystone/tests/test_wsgi.py:252
 msgid "The resource could not be found."
 msgstr "找不到该资源。"
 
-#: keystone/common/cache/core.py:50
+#: keystone/common/cache/core.py:53
 #, python-format
 msgid "CACHE_GET: Key: \"%(key)r\" Value: \"%(value)r\""
 msgstr ""
 
-#: keystone/common/cache/core.py:56
+#: keystone/common/cache/core.py:59
 #, python-format
 msgid "CACHE_GET_MULTI: \"%(keys)r\" Values: \"%(values)r\""
 msgstr ""
 
-#: keystone/common/cache/core.py:61
+#: keystone/common/cache/core.py:64
 #, python-format
 msgid "CACHE_SET: Key: \"%(key)r\" Value: \"%(value)r\""
 msgstr ""
 
-#: keystone/common/cache/core.py:66
+#: keystone/common/cache/core.py:69
 #, python-format
 msgid "CACHE_SET_MULTI: \"%r\""
 msgstr ""
 
-#: keystone/common/cache/core.py:71
+#: keystone/common/cache/core.py:74
 #, python-format
 msgid "CACHE_DELETE: \"%r\""
 msgstr ""
 
-#: keystone/common/cache/core.py:74
+#: keystone/common/cache/core.py:77
 #, python-format
 msgid "CACHE_DELETE_MULTI: \"%r\""
 msgstr ""
 
-#: keystone/common/cache/core.py:92
+#: keystone/common/cache/core.py:95
 #, python-format
 msgid ""
 "Unable to build cache config-key. Expected format \"<argname>:<value>\". "
 "Skipping unknown format: %s"
 msgstr ""
 
-#: keystone/common/cache/core.py:100
+#: keystone/common/cache/core.py:103
 #, python-format
 msgid "Keystone Cache Config: %s"
 msgstr ""
 
-#: keystone/common/cache/core.py:115
+#: keystone/common/cache/core.py:118
 msgid "region not type dogpile.cache.CacheRegion"
 msgstr ""
 
-#: keystone/common/cache/core.py:148
+#: keystone/common/cache/core.py:151
 #, python-format
 msgid "Adding cache-proxy '%s' to backend."
 msgstr ""
 
-#: keystone/common/environment/__init__.py:53
+#: keystone/common/cache/backends/mongo.py:230
+msgid "db_hosts value is required"
+msgstr ""
+
+#: keystone/common/cache/backends/mongo.py:235
+msgid "database db_name is required"
+msgstr ""
+
+#: keystone/common/cache/backends/mongo.py:240
+msgid "cache_collection name is required"
+msgstr ""
+
+#: keystone/common/cache/backends/mongo.py:251
+msgid "integer value expected for w (write concern attribute)"
+msgstr ""
+
+#: keystone/common/cache/backends/mongo.py:259
+msgid "replicaset_name required when use_replica is True"
+msgstr ""
+
+#: keystone/common/cache/backends/mongo.py:274
+msgid "integer value expected for mongo_ttl_seconds"
+msgstr ""
+
+#: keystone/common/cache/backends/mongo.py:300
+msgid "no ssl support available"
+msgstr ""
+
+#: keystone/common/cache/backends/mongo.py:309
+#, python-format
+msgid ""
+"Invalid ssl_cert_reqs value of %s, must be one of \"NONE\", \"OPTIONAL\", "
+"\"REQUIRED\""
+msgstr ""
+
+#: keystone/common/cache/backends/mongo.py:402
+#, python-format
+msgid ""
+"TTL index already exists on db collection <%(c_name)s>, remove index "
+"<%(indx_name)s> first to make updated mongo_ttl_seconds value to be  "
+"effective"
+msgstr ""
+
+#: keystone/common/environment/__init__.py:51
 #, python-format
 msgid "Environment configured as: %s"
 msgstr ""
 
-#: keystone/common/environment/eventlet_server.py:50
+#: keystone/common/environment/eventlet_server.py:51
 #, python-format
 msgid "Starting %(arg0)s on %(host)s:%(port)s"
 msgstr "正在 %(host)s:%(port)s 上启动 %(arg0)s"
 
-#: keystone/common/environment/eventlet_server.py:112
+#: keystone/common/environment/eventlet_server.py:122
 msgid "Server error"
 msgstr "服务器错误"
 
-#: keystone/common/kvs/core.py:61
+#: keystone/common/kvs/core.py:62
 #, python-format
 msgid "Registering Dogpile Backend %(backend_path)s as %(backend_name)s"
 msgstr ""
 
-#: keystone/common/kvs/core.py:69
+#: keystone/common/kvs/core.py:70
 #, python-format
 msgid "Lock Timeout occurred for key, %(target)s"
 msgstr ""
 
-#: keystone/common/kvs/core.py:104
+#: keystone/common/kvs/core.py:105
 #, python-format
 msgid "KVS region %s is already configured. Cannot reconfigure."
 msgstr ""
 
-#: keystone/common/kvs/core.py:120
+#: keystone/common/kvs/core.py:121
 #, python-format
 msgid "Importing class %s as KVS proxy."
 msgstr ""
 
-#: keystone/common/kvs/core.py:128
+#: keystone/common/kvs/core.py:129
 #, python-format
 msgid "%s is not a dogpile.proxy.ProxyBackend"
 msgstr ""
 
-#: keystone/common/kvs/core.py:132
+#: keystone/common/kvs/core.py:133
 #, python-format
 msgid "Adding proxy '%(proxy)s' to KVS %(name)s."
 msgstr ""
 
-#: keystone/common/kvs/core.py:139
+#: keystone/common/kvs/core.py:140
 #, python-format
 msgid "Key Value Store not configured: %s"
 msgstr ""
 
-#: keystone/common/kvs/core.py:162
+#: keystone/common/kvs/core.py:157
+#, python-format
+msgid ""
+"Non-expiring keys not supported/required by %(region)s backend; unable to "
+"set key_mangler for backend: %(err)s"
+msgstr ""
+
+#: keystone/common/kvs/core.py:183
 #, python-format
 msgid "Using %(func)s as KVS region %(name)s key_mangler"
 msgstr ""
 
-#: keystone/common/kvs/core.py:172
+#: keystone/common/kvs/core.py:193
 msgid "`key_mangler` option must be a function reference"
 msgstr ""
 
-#: keystone/common/kvs/core.py:174
+#: keystone/common/kvs/core.py:195
 #, python-format
 msgid "Using default dogpile sha1_mangle_key as KVS region %s key_mangler"
 msgstr ""
 
-#: keystone/common/kvs/core.py:183
+#: keystone/common/kvs/core.py:205
 #, python-format
 msgid "KVS region %s key_mangler disabled."
 msgstr ""
 
-#: keystone/common/kvs/core.py:211
+#: keystone/common/kvs/core.py:234
 #, python-format
 msgid "KVS region configuration for %(name)s: %(config)r"
 msgstr ""
 
-#: keystone/common/kvs/core.py:324
+#: keystone/common/kvs/core.py:347
 #, python-format
 msgid "Lock key must match target key: %(lock)s != %(target)s"
 msgstr ""
 
-#: keystone/common/kvs/core.py:328
+#: keystone/common/kvs/core.py:351
 msgid "Must be called within an active lock context."
 msgstr ""
 
-#: keystone/common/kvs/core.py:352
+#: keystone/common/kvs/core.py:375
 #, python-format
 msgid "KVS lock acquired for: %s"
 msgstr ""
 
-#: keystone/common/kvs/core.py:371
+#: keystone/common/kvs/core.py:394
 #, python-format
 msgid "KVS lock released for: %s"
 msgstr ""
 
-#: keystone/common/kvs/core.py:373
+#: keystone/common/kvs/core.py:396
 #, python-format
 msgid "KVS lock released (timeout reached) for: %s"
 msgstr ""
 
 #: keystone/common/kvs/backends/memcached.py:71
 #, python-format
-msgid "Maximum lock attempts on %s occured."
+msgid "Maximum lock attempts on %s occurred."
 msgstr ""
 
-#: keystone/common/kvs/backends/memcached.py:106
+#: keystone/common/kvs/backends/memcached.py:110
 #, python-format
-msgid "Backend `%s` is not a valid dogpile memcached backend."
+msgid ""
+"Backend `%(driver)s` is not a valid memcached backend. Valid drivers: "
+"%(driver_list)s"
+msgstr ""
+
+#: keystone/common/kvs/backends/memcached.py:181
+msgid "`key_mangler` functions must be callable."
 msgstr ""
 
-#: keystone/common/ldap/core.py:77
+#: keystone/common/ldap/core.py:76
 #, python-format
-msgid "Invalid LDAP deref option: %s. Choose one of: "
-msgstr "LDAP deref 选项 %s 无效。请选择下列其中一项： "
+msgid "Invalid LDAP deref option: %(option)s. Choose one of: %(options)s"
+msgstr ""
 
-#: keystone/common/ldap/core.py:85
+#: keystone/common/ldap/core.py:86
 #, python-format
 msgid "Invalid LDAP TLS certs option: %(option)s. Choose one of: %(options)s"
 msgstr ""
 
-#: keystone/common/ldap/core.py:97
+#: keystone/common/ldap/core.py:98
 #, python-format
 msgid "Invalid LDAP scope: %(scope)s. Choose one of: %(options)s"
 msgstr ""
 
-#: keystone/common/ldap/core.py:213
+#: keystone/common/ldap/core.py:214
 #, python-format
 msgid ""
 "Invalid additional attribute mapping: \"%s\". Format must be "
 "<ldap_attribute>:<keystone_attribute>"
 msgstr ""
 
-#: keystone/common/ldap/core.py:219
+#: keystone/common/ldap/core.py:220
 #, python-format
 msgid ""
 "Invalid additional attribute mapping: \"%(item)s\". Value \"%(attr_map)s\" "
 "must use one of %(keys)s."
 msgstr ""
 
-#: keystone/common/ldap/core.py:305 keystone/identity/backends/kvs.py:180
-#: keystone/identity/backends/kvs.py:208
-#, python-format
-msgid "Duplicate name, %s."
-msgstr "名称 %s 重复。"
-
-#: keystone/common/ldap/core.py:315 keystone/identity/backends/kvs.py:173
-#, python-format
-msgid "Duplicate ID, %s."
-msgstr "标识 %s 重复。"
-
-#: keystone/common/ldap/core.py:321
+#: keystone/common/ldap/core.py:300
 #, python-format
 msgid "LDAP %s create"
 msgstr "LDAP %s 创建"
 
-#: keystone/common/ldap/core.py:407
+#: keystone/common/ldap/core.py:305
 #, python-format
 msgid "LDAP %s update"
 msgstr "LDAP %s 更新"
 
-#: keystone/common/ldap/core.py:423
-#, python-format
-msgid "Cannot change %(option_name)s %(attr)s"
-msgstr ""
-
-#: keystone/common/ldap/core.py:455
+#: keystone/common/ldap/core.py:310
 #, python-format
 msgid "LDAP %s delete"
 msgstr "LDAP %s 删除"
 
-#: keystone/common/ldap/core.py:484
+#: keystone/common/ldap/core.py:431
+#, python-format
+msgid "Cannot change %(option_name)s %(attr)s"
+msgstr ""
+
+#: keystone/common/ldap/core.py:488
 #, python-format
 msgid "LDAP init: url=%s"
 msgstr "LDAP 初始化：url=%s"
 
-#: keystone/common/ldap/core.py:485
+#: keystone/common/ldap/core.py:489
 #, python-format
 msgid ""
 "LDAP init: use_tls=%(use_tls)s\n"
@@ -811,157 +1063,209 @@
 "tls_avail=%(tls_avail)s\n"
 msgstr ""
 
-#: keystone/common/ldap/core.py:504
+#: keystone/common/ldap/core.py:508
 msgid "Invalid TLS / LDAPS combination"
 msgstr ""
 
-#: keystone/common/ldap/core.py:508
+#: keystone/common/ldap/core.py:512
 #, python-format
 msgid "Invalid LDAP TLS_AVAIL option: %s. TLS not available"
 msgstr ""
 
-#: keystone/common/ldap/core.py:518
+#: keystone/common/ldap/core.py:522
 #, python-format
 msgid "tls_cacertfile %s not found or is not a file"
 msgstr ""
 
-#: keystone/common/ldap/core.py:530
+#: keystone/common/ldap/core.py:534
 #, python-format
 msgid "tls_cacertdir %s not found or is not a directory"
 msgstr ""
 
-#: keystone/common/ldap/core.py:537
+#: keystone/common/ldap/core.py:541
 #, python-format
 msgid "LDAP TLS: invalid TLS_REQUIRE_CERT Option=%s"
 msgstr ""
 
-#: keystone/common/ldap/core.py:551
+#: keystone/common/ldap/core.py:555
 #, python-format
 msgid "LDAP bind: dn=%s"
 msgstr "LDAP 绑定：dn=%s"
 
-#: keystone/common/ldap/core.py:565
+#: keystone/common/ldap/core.py:569
 #, python-format
 msgid "LDAP add: dn=%(dn)s, attrs=%(attrs)s"
 msgstr ""
 
-#: keystone/common/ldap/core.py:576
+#: keystone/common/ldap/core.py:580
 #, python-format
 msgid ""
 "LDAP search: dn=%(dn)s, scope=%(scope)s, query=%(query)s, attrs=%(attrlist)s"
 msgstr ""
 
-#: keystone/common/ldap/core.py:629
+#: keystone/common/ldap/core.py:633
 msgid ""
 "LDAP Server does not support paging. Disable paging in keystone.conf to "
 "avoid this message."
 msgstr "LDAP 服务器不支持页面调度。请在 keystone.conf 中禁用页面调度以避免出现此消息。"
 
-#: keystone/common/ldap/core.py:645
+#: keystone/common/ldap/core.py:649
 #, python-format
 msgid "LDAP modify: dn=%(dn)s, modlist=%(modlist)s"
 msgstr ""
 
-#: keystone/common/ldap/core.py:651
+#: keystone/common/ldap/core.py:655
 #, python-format
 msgid "LDAP delete: dn=%s"
 msgstr "LDAP 删除：dn=%s"
 
-#: keystone/common/ldap/core.py:656
+#: keystone/common/ldap/core.py:660
 #, python-format
 msgid "LDAP delete_ext: dn=%(dn)s, serverctrls=%(serverctrls)s"
 msgstr ""
 
-#: keystone/common/sql/migration.py:57
-#: keystone/openstack/common/db/sqlalchemy/migration.py:220
-msgid "version should be an integer"
+#: keystone/common/sql/core.py:189
+msgid ""
+"Cannot truncate a driver call without hints list as first parameter after "
+"self "
+msgstr ""
+
+#: keystone/common/sql/migration.py:55
+#: keystone/openstack/common/db/sqlalchemy/migration.py:191
+msgid "version should be an integer"
 msgstr "版本应该为整数"
 
-#: keystone/common/sql/migrate_repo/versions/033_migrate_ec2credentials_table_credentials.py:61
+#: keystone/common/sql/migrate_repo/versions/033_migrate_ec2credentials_table_credentials.py:59
 #, python-format
 msgid ""
 "Credential %(access)s already exists with different secret in %(table)s table"
 msgstr ""
 
-#: keystone/common/sql/migrate_repo/versions/033_migrate_ec2credentials_table_credentials.py:71
+#: keystone/common/sql/migrate_repo/versions/033_migrate_ec2credentials_table_credentials.py:69
 #, python-format
 msgid ""
 "Credential %(access)s already exists with different project in %(table)s "
 "table"
 msgstr ""
 
-#: keystone/contrib/ec2/controllers.py:254
+#: keystone/contrib/ec2/controllers.py:305
 msgid "Token belongs to another user"
 msgstr ""
 
-#: keystone/contrib/ec2/controllers.py:287
+#: keystone/contrib/ec2/controllers.py:333
 msgid "Credential belongs to another user"
 msgstr ""
 
-#: keystone/contrib/endpoint_filter/backends/sql.py:53
+#: keystone/contrib/endpoint_filter/backends/sql.py:54
 #, python-format
 msgid "Endpoint %(endpoint_id)s not found in project %(project_id)s"
 msgstr ""
 
-#: keystone/contrib/oauth1/controllers.py:70
+#: keystone/contrib/example/core.py:63 keystone/contrib/example/core.py:72
+#, python-format
+msgid ""
+"Received the following notification: service %(service)s, resource_type: "
+"%(resource_type)s, operation %(operation)s payload %(payload)s"
+msgstr ""
+
+#: keystone/contrib/federation/utils.py:196
+msgid "Could not map user"
+msgstr ""
+
+#: keystone/contrib/federation/utils.py:225
+#, python-format
+msgid "Ignoring user name %s"
+msgstr ""
+
+#: keystone/contrib/kds/cli/api.py:48
+#, python-format
+msgid "Serving on http://%(host)s:%(port)d"
+msgstr ""
+
+#: keystone/contrib/kds/common/exception.py:24
+msgid "An unknown exception occurred"
+msgstr ""
+
+#: keystone/contrib/kds/common/exception.py:42
+#, python-format
+msgid ""
+"Failed to load the '%(backend)s' backend because it is not allowed. Allowed "
+"backends are: %(allowed)s"
+msgstr ""
+
+#: keystone/contrib/kds/common/exception.py:47
+#, python-format
+msgid "Cannot set key data for %(name)s: %(reason)s"
+msgstr ""
+
+#: keystone/contrib/oauth1/controllers.py:69
 msgid "Cannot change consumer secret"
 msgstr ""
 
-#: keystone/contrib/oauth1/controllers.py:143
-#: keystone/contrib/oauth1/backends/sql.py:279
+#: keystone/contrib/oauth1/controllers.py:142
+#: keystone/contrib/oauth1/backends/sql.py:284
 msgid "User IDs do not match"
 msgstr ""
 
-#: keystone/contrib/oauth1/controllers.py:150
+#: keystone/contrib/oauth1/controllers.py:149
 msgid "Could not find role"
 msgstr ""
 
-#: keystone/contrib/oauth1/controllers.py:198
-msgid "Non-oauth parameter - project, do not match"
+#: keystone/contrib/oauth1/controllers.py:192
+msgid "Invalid signature"
 msgstr ""
 
-#: keystone/contrib/oauth1/controllers.py:248
-#: keystone/contrib/oauth1/controllers.py:325
+#: keystone/contrib/oauth1/controllers.py:241
+#: keystone/contrib/oauth1/controllers.py:311
 msgid "Request token is expired"
 msgstr ""
 
-#: keystone/contrib/oauth1/controllers.py:273
+#: keystone/contrib/oauth1/controllers.py:255
+msgid "There should not be any non-oauth parameters"
+msgstr ""
+
+#: keystone/contrib/oauth1/controllers.py:259
 msgid "provided consumer key does not match stored consumer key"
 msgstr ""
 
-#: keystone/contrib/oauth1/controllers.py:277
+#: keystone/contrib/oauth1/controllers.py:263
 msgid "provided verifier does not match stored verifier"
 msgstr ""
 
-#: keystone/contrib/oauth1/controllers.py:281
+#: keystone/contrib/oauth1/controllers.py:267
 msgid "provided request key does not match stored request key"
 msgstr ""
 
-#: keystone/contrib/oauth1/controllers.py:285
+#: keystone/contrib/oauth1/controllers.py:271
 msgid "Request Token does not have an authorizing user id"
 msgstr ""
 
-#: keystone/contrib/oauth1/controllers.py:341
+#: keystone/contrib/oauth1/controllers.py:327
 msgid "authorizing user does not have role required"
 msgstr ""
 
-#: keystone/contrib/oauth1/controllers.py:356
+#: keystone/contrib/oauth1/controllers.py:342
 msgid "User is not a member of the requested project"
 msgstr ""
 
-#: keystone/contrib/oauth1/backends/sql.py:91
+#: keystone/contrib/oauth1/backends/sql.py:94
 msgid "Consumer not found"
 msgstr ""
 
-#: keystone/contrib/oauth1/backends/sql.py:195
+#: keystone/contrib/oauth1/backends/sql.py:198
 msgid "Request token not found"
 msgstr ""
 
-#: keystone/contrib/oauth1/backends/sql.py:259
+#: keystone/contrib/oauth1/backends/sql.py:264
 msgid "Access token not found"
 msgstr ""
 
-#: keystone/identity/controllers.py:133
+#: keystone/credential/core.py:119
+#, python-format
+msgid "Deletion of credential is not required: %s"
+msgstr ""
+
+#: keystone/identity/controllers.py:132
 msgid "Enabled field must be a boolean"
 msgstr ""
 
@@ -969,53 +1273,83 @@
 msgid "Enabled field should be a boolean"
 msgstr ""
 
-#: keystone/identity/controllers.py:204
+#: keystone/identity/controllers.py:200
 #, python-format
 msgid "Unable to remove user %(user)s from %(tenant)s."
 msgstr ""
 
-#: keystone/identity/controllers.py:223
+#: keystone/identity/controllers.py:219
 #, python-format
 msgid "Unable to add user %(user)s to %(tenant)s."
 msgstr ""
 
-#: keystone/identity/core.py:105
+#: keystone/identity/core.py:104
 #, python-format
 msgid "Invalid domain name (%s) found in config file name"
 msgstr ""
 
-#: keystone/identity/core.py:129
+#: keystone/identity/core.py:128
 #, python-format
 msgid "Unable to locate domain config directory: %s"
 msgstr ""
 
-#: keystone/identity/core.py:142
+#: keystone/identity/core.py:141
 #, python-format
 msgid "Ignoring file (%s) while scanning domain config directory"
 msgstr ""
 
-#: keystone/identity/core.py:183
+#: keystone/identity/core.py:182
 msgid ""
 "Running an experimental and unsupported configuration "
 "(domain_specific_drivers_enabled = True); this will result in known issues."
 msgstr ""
 
-#: keystone/identity/backends/kvs.py:129 keystone/identity/backends/kvs.py:138
+#: keystone/identity/backends/kvs.py:71 keystone/identity/backends/kvs.py:73
+#: keystone/identity/backends/ldap.py:56 keystone/identity/backends/ldap.py:58
+#: keystone/identity/backends/ldap.py:64 keystone/identity/backends/ldap.py:66
+#: keystone/identity/backends/pam.py:48 keystone/identity/backends/pam.py:65
+#: keystone/identity/backends/sql.py:111 keystone/identity/backends/sql.py:113
+msgid "Invalid user / password"
+msgstr ""
+
+#: keystone/identity/backends/kvs.py:177 keystone/identity/backends/kvs.py:186
+#: keystone/identity/backends/sql.py:197 keystone/identity/backends/sql.py:208
 msgid "User not found in group"
 msgstr "在组中找不到用户"
 
-#: keystone/identity/backends/ldap.py:161
+#: keystone/identity/backends/ldap.py:95 keystone/identity/backends/sql.py:159
+msgid "Cannot change user ID"
+msgstr ""
+
+#: keystone/identity/backends/ldap.py:98
+msgid "Cannot change user name"
+msgstr ""
+
+#: keystone/identity/backends/ldap.py:166
 #, python-format
 msgid ""
 "Group member '%(user_dn)s' not found in '%(group_id)s'. The user should be "
 "removed from the group. The user will be ignored."
 msgstr ""
 
-#: keystone/identity/backends/ldap.py:302
+#: keystone/identity/backends/ldap.py:307
 #, python-format
 msgid "User %(user_id)s is already a member of group %(group_id)s"
 msgstr ""
 
+#: keystone/middleware/core.py:236
+msgid "Auth token not in the request header. Will not build auth context."
+msgstr ""
+
+#: keystone/middleware/core.py:241
+msgid "Auth context already exists in the request environment"
+msgstr ""
+
+#: keystone/middleware/core.py:246
+#, python-format
+msgid "RBAC: auth_context: %s"
+msgstr ""
+
 #: keystone/openstack/common/eventlet_backdoor.py:140
 #, python-format
 msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
@@ -1040,6 +1374,16 @@
 msgid "Reloading cached file %s"
 msgstr ""
 
+#: keystone/openstack/common/gettextutils.py:252
+msgid "Message objects do not support addition."
+msgstr ""
+
+#: keystone/openstack/common/gettextutils.py:261
+msgid ""
+"Message objects do not support str() because they may contain non-ascii "
+"characters. Please use unicode() or translate() instead."
+msgstr ""
+
 #: keystone/openstack/common/lockutils.py:103
 #, python-format
 msgid "Could not release the acquired lock `%s`"
@@ -1085,17 +1429,17 @@
 msgid "Deprecated: %s"
 msgstr ""
 
-#: keystone/openstack/common/log.py:402
+#: keystone/openstack/common/log.py:404
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: keystone/openstack/common/log.py:453
+#: keystone/openstack/common/log.py:455
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: keystone/openstack/common/log.py:623
+#: keystone/openstack/common/log.py:625
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -1118,49 +1462,49 @@
 msgid "in dynamic looping call"
 msgstr ""
 
-#: keystone/openstack/common/policy.py:73
+#: keystone/openstack/common/policy.py:75
 msgid "JSON file containing policy"
 msgstr ""
 
-#: keystone/openstack/common/policy.py:76
+#: keystone/openstack/common/policy.py:78
 msgid "Rule enforced when requested rule is not found"
 msgstr ""
 
-#: keystone/openstack/common/policy.py:90
+#: keystone/openstack/common/policy.py:92
 #, python-format
 msgid "Policy doesn't allow %s to be performed."
 msgstr ""
 
-#: keystone/openstack/common/policy.py:175
+#: keystone/openstack/common/policy.py:182
 #, python-format
 msgid "Rules must be an instance of dict or Rules, got %s instead"
 msgstr ""
 
-#: keystone/openstack/common/policy.py:205
+#: keystone/openstack/common/policy.py:212
 msgid "Rules successfully reloaded"
 msgstr ""
 
-#: keystone/openstack/common/policy.py:251
+#: keystone/openstack/common/policy.py:258
 #, python-format
 msgid "Rule %s will be now enforced"
 msgstr ""
 
-#: keystone/openstack/common/policy.py:266
+#: keystone/openstack/common/policy.py:273
 #, python-format
 msgid "Rule [%s] doesn't exist"
 msgstr ""
 
-#: keystone/openstack/common/policy.py:474
+#: keystone/openstack/common/policy.py:481
 #, python-format
 msgid "Failed to understand rule %s"
 msgstr ""
 
-#: keystone/openstack/common/policy.py:484
+#: keystone/openstack/common/policy.py:491
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr "对于类型为 %s 的匹配项，不存在任何处理程序"
 
-#: keystone/openstack/common/policy.py:754
+#: keystone/openstack/common/policy.py:761
 #, python-format
 msgid "Failed to understand rule %r"
 msgstr ""
@@ -1292,12 +1636,12 @@
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
-#: keystone/openstack/common/strutils.py:182
+#: keystone/openstack/common/strutils.py:188
 #, python-format
 msgid "Invalid string format: %s"
 msgstr ""
 
-#: keystone/openstack/common/strutils.py:189
+#: keystone/openstack/common/strutils.py:195
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
@@ -1330,24 +1674,33 @@
 msgid "Length of %(given)d is too long, max = %(maximum)d"
 msgstr ""
 
-#: keystone/openstack/common/db/exception.py:42
+#: keystone/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: keystone/openstack/common/db/sqlalchemy/migration.py:252
-msgid "Upgrade DB using Essex release first."
+#: keystone/openstack/common/db/sqlalchemy/migration.py:221
+msgid ""
+"The database is not under version control, but has tables. Please stamp the "
+"current version of the schema manually."
 msgstr ""
 
-#: keystone/openstack/common/db/sqlalchemy/session.py:553
+#: keystone/openstack/common/db/sqlalchemy/session.py:615
 msgid "DB exception wrapped."
 msgstr ""
 
-#: keystone/openstack/common/db/sqlalchemy/session.py:621
+#: keystone/openstack/common/db/sqlalchemy/session.py:684
 #, python-format
 msgid "Database server has gone away: %s"
 msgstr ""
 
-#: keystone/openstack/common/db/sqlalchemy/session.py:704
+#: keystone/openstack/common/db/sqlalchemy/session.py:764
+msgid ""
+"This application has not enabled MySQL traditional mode, which means silent "
+"data corruption may occur. Please encourage the application developers to "
+"enable this mode."
+msgstr ""
+
+#: keystone/openstack/common/db/sqlalchemy/session.py:789
 #, python-format
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
@@ -1397,577 +1750,31 @@
 msgid "Unsupported id columns type"
 msgstr ""
 
-#: keystone/openstack/common/notifier/api.py:129
-#, python-format
-msgid "%s not in valid priorities"
-msgstr ""
-
-#: keystone/openstack/common/notifier/api.py:145
-#, python-format
-msgid ""
-"Problem '%(e)s' attempting to send to notification system. "
-"Payload=%(payload)s"
-msgstr ""
-
-#: keystone/openstack/common/notifier/api.py:164
-#, python-format
-msgid "Failed to load notifier %s. These notifications will not be sent."
-msgstr ""
-
-#: keystone/openstack/common/notifier/rpc_notifier.py:45
-#: keystone/openstack/common/notifier/rpc_notifier2.py:51
-#, python-format
-msgid "Could not send notification to %(topic)s. Payload=%(message)s"
-msgstr ""
-
-#: keystone/openstack/common/rpc/__init__.py:103
-#, python-format
-msgid ""
-"A RPC is being made while holding a lock. The locks currently held are "
-"%(locks)s. This is probably a bug. Please report it. Include the following: "
-"[%(stack)s]."
-msgstr ""
-
-#: keystone/openstack/common/rpc/amqp.py:73
-msgid "Pool creating new connection"
-msgstr ""
-
-#: keystone/openstack/common/rpc/amqp.py:200
-#, python-format
-msgid ""
-"No calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
-msgstr ""
-
-#: keystone/openstack/common/rpc/amqp.py:203
-#, python-format
-msgid "_call_waiters: %s"
-msgstr ""
-
-#: keystone/openstack/common/rpc/amqp.py:210
-#, python-format
-msgid ""
-"Number of call waiters is greater than warning threshold: %d. There could be "
-"a MulticallProxyWaiter leak."
-msgstr ""
-
-#: keystone/openstack/common/rpc/amqp.py:288
-#, python-format
-msgid "unpacked context: %s"
-msgstr ""
-
-#: keystone/openstack/common/rpc/amqp.py:339
-#, python-format
-msgid "UNIQUE_ID is %s."
-msgstr ""
-
-#: keystone/openstack/common/rpc/amqp.py:432
-#, python-format
-msgid "received %s"
-msgstr ""
-
-#: keystone/openstack/common/rpc/amqp.py:440
-#, python-format
-msgid "no method for message: %s"
-msgstr ""
-
-#: keystone/openstack/common/rpc/amqp.py:441
-#, python-format
-msgid "No method for message: %s"
-msgstr ""
-
-#: keystone/openstack/common/rpc/amqp.py:469
-#: keystone/openstack/common/rpc/impl_zmq.py:280
-#, python-format
-msgid "Expected exception during message handling (%s)"
-msgstr ""
-
-#: keystone/openstack/common/rpc/amqp.py:477
-#: keystone/openstack/common/rpc/impl_zmq.py:286
-msgid "Exception during message handling"
-msgstr ""
-
-#: keystone/openstack/common/rpc/amqp.py:551
-#, python-format
-msgid "Making synchronous call on %s ..."
-msgstr ""
-
-#: keystone/openstack/common/rpc/amqp.py:554
-#, python-format
-msgid "MSG_ID is %s"
-msgstr ""
-
-#: keystone/openstack/common/rpc/amqp.py:580
-#, python-format
-msgid "Making asynchronous cast on %s..."
-msgstr ""
-
-#: keystone/openstack/common/rpc/amqp.py:589
-msgid "Making asynchronous fanout cast..."
-msgstr ""
-
-#: keystone/openstack/common/rpc/amqp.py:617
-#, python-format
-msgid "Sending %(event_type)s on %(topic)s"
-msgstr ""
-
-#: keystone/openstack/common/rpc/common.py:76
-msgid "An unknown RPC related exception occurred."
-msgstr ""
-
-#: keystone/openstack/common/rpc/common.py:88
-msgid "Exception in string format operation"
-msgstr ""
-
-#: keystone/openstack/common/rpc/common.py:106
-#, python-format
-msgid ""
-"Remote error: %(exc_type)s %(value)s\n"
-"%(traceback)s."
-msgstr ""
-
-#: keystone/openstack/common/rpc/common.py:123
-#, python-format
-msgid ""
-"Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method: "
-"\"%(method)s\" info: \"%(info)s\""
-msgstr ""
-
-#: keystone/openstack/common/rpc/common.py:140
-#: keystone/openstack/common/rpc/common.py:141
-#: keystone/openstack/common/rpc/common.py:142
-msgid "<unknown>"
-msgstr ""
-
-#: keystone/openstack/common/rpc/common.py:146
-#, python-format
-msgid "Found duplicate message(%(msg_id)s). Skipping it."
-msgstr ""
-
-#: keystone/openstack/common/rpc/common.py:150
-msgid "Invalid reuse of an RPC connection."
-msgstr ""
-
-#: keystone/openstack/common/rpc/common.py:154
-#, python-format
-msgid "Specified RPC version, %(version)s, not supported by this endpoint."
-msgstr ""
-
-#: keystone/openstack/common/rpc/common.py:159
-#, python-format
-msgid ""
-"Specified RPC envelope version, %(version)s, not supported by this endpoint."
-msgstr ""
-
-#: keystone/openstack/common/rpc/common.py:164
-#, python-format
-msgid "Specified RPC version cap, %(version_cap)s, is too low"
-msgstr ""
-
-#: keystone/openstack/common/rpc/common.py:288
-#, python-format
-msgid "Returning exception %s to caller"
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_kombu.py:156
-msgid "Failed to process message ... skipping it."
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_kombu.py:160
-msgid "Failed to process message ... will requeue."
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_kombu.py:495
-#, python-format
-msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_kombu.py:517
-#, python-format
-msgid "Connected to AMQP server on %(hostname)s:%(port)d"
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_kombu.py:554
-#, python-format
-msgid ""
-"Unable to connect to AMQP server on %(hostname)s:%(port)d after "
-"%(max_retries)d tries: %(err_str)s"
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_kombu.py:568
-#, python-format
-msgid ""
-"AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
-"again in %(sleep_time)d seconds."
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_kombu.py:622
-#: keystone/openstack/common/rpc/impl_qpid.py:573
-#, python-format
-msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_kombu.py:640
-#: keystone/openstack/common/rpc/impl_qpid.py:588
-#, python-format
-msgid "Timed out waiting for RPC response: %s"
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_kombu.py:644
-#: keystone/openstack/common/rpc/impl_qpid.py:592
-#, python-format
-msgid "Failed to consume message from queue: %s"
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_kombu.py:683
-#: keystone/openstack/common/rpc/impl_qpid.py:627
-#, python-format
-msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_qpid.py:87
-#, python-format
-msgid "Invalid value for qpid_topology_version: %d"
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_qpid.py:191
-msgid "Failed to process message... skipping it."
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_qpid.py:515
-#, python-format
-msgid "Unable to connect to AMQP server: %(e)s. Sleeping %(delay)s seconds"
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_qpid.py:521
-#, python-format
-msgid "Connected to AMQP server on %s"
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_qpid.py:534
-msgid "Re-established AMQP queues"
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_qpid.py:600
-msgid "Error processing message.  Skipping it."
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:96
-msgid "JSON serialization failed."
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:101
-#, python-format
-msgid "Deserializing: %s"
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:136
-#, python-format
-msgid "Connecting to %(addr)s with %(type)s"
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:137
-#, python-format
-msgid "-> Subscribed to %(subscribe)s"
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:138
-#, python-format
-msgid "-> bind: %(bind)s"
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:146
-msgid "Could not open socket."
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:158
-#, python-format
-msgid "Subscribing to %s"
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:195
-msgid "ZeroMQ socket could not be closed."
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:200
-msgid "You cannot recv on this socket."
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:205
-msgid "You cannot send on this socket."
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:267
-#, python-format
-msgid "Running func with context: %s"
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:305
-msgid "Sending reply"
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:339
-msgid "RPC message did not include method."
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:371
-msgid "Registering reactor"
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:383
-msgid "In reactor registered"
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:388
-msgid "Consuming socket"
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:438
-#, python-format
-msgid "Creating proxy for topic: %s"
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:444
-msgid "Topic contained dangerous characters."
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:476
-msgid "Topic socket file creation failed."
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:482
-#, python-format
-msgid ""
-"Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:498
-#, python-format
-msgid "Required IPC directory does not exist at %s"
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:507
-#, python-format
-msgid "Permission denied to IPC directory at %s"
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:510
-msgid ""
-"Could not create ZeroMQ receiver daemon. Socket may already be in use."
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:544
-#, python-format
-msgid "CONSUMER RECEIVED DATA: %s"
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:563
-msgid "ZMQ Envelope version unsupported or unknown."
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:591
-msgid "Skipping topic registration. Already registered."
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:598
-#, python-format
-msgid "Consumer is a zmq.%s"
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:650
-msgid "Creating payload"
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:663
-msgid "Creating queue socket for reply waiter"
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:676
-msgid "Sending cast"
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:679
-msgid "Cast sent; Waiting reply"
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:682
-#, python-format
-msgid "Received message: %s"
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:683
-msgid "Unpacking response"
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:692
-msgid "Unsupported or unknown ZMQ envelope returned."
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:699
-msgid "RPC Message Invalid."
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:722
-#, python-format
-msgid "%(msg)s"
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:725
-#, python-format
-msgid "Sending message(s) to: %s"
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:729
-msgid "No matchmaker results. Not casting."
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:732
-msgid "No match from matchmaker."
-msgstr ""
-
-#: keystone/openstack/common/rpc/impl_zmq.py:814
-#, python-format
-msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
-msgstr ""
-
-#: keystone/openstack/common/rpc/matchmaker.py:45
-msgid "Match not found by MatchMaker."
-msgstr ""
-
-#: keystone/openstack/common/rpc/matchmaker.py:79
-msgid "Matchmaker does not implement registration or heartbeat."
-msgstr ""
-
-#: keystone/openstack/common/rpc/matchmaker.py:215
-#, python-format
-msgid "Matchmaker unregistered: %(key)s, %(host)s"
-msgstr ""
-
-#: keystone/openstack/common/rpc/matchmaker.py:227
-msgid "Register before starting heartbeat."
-msgstr ""
-
-#: keystone/openstack/common/rpc/matchmaker_ring.py:75
-#: keystone/openstack/common/rpc/matchmaker_ring.py:93
-#, python-format
-msgid "No key defining hosts for topic '%s', see ringfile"
-msgstr ""
-
-#: keystone/openstack/common/rpc/service.py:47
-#, python-format
-msgid "Creating Consumer connection for Service %s"
-msgstr ""
-
-#: keystone/policy/backends/rules.py:100
+#: keystone/policy/backends/rules.py:98
 #, python-format
 msgid "enforce %(action)s: %(credentials)s"
 msgstr ""
 
-#: keystone/tests/core.py:136
+#: keystone/tests/core.py:146
 #, python-format
 msgid "Failed to checkout %s"
 msgstr "未能检出 %s"
 
-#: keystone/tests/fakeldap.py:162
-#, python-format
-msgid "FakeLdap initialize url=%s"
-msgstr "FakeLdap initialize url=%s"
-
-#: keystone/tests/fakeldap.py:174
-#, python-format
-msgid "FakeLdap bind dn=%s"
-msgstr "FakeLdap bind dn=%s"
-
-#: keystone/tests/fakeldap.py:181
-#, python-format
-msgid "FakeLdap bind fail: dn=%s not found"
-msgstr "FakeLdap bind 失败：找不到 dn=%s"
-
-#: keystone/tests/fakeldap.py:188
-#, python-format
-msgid "FakeLdap bind fail: password for dn=%s not found"
-msgstr "FakeLdap bind 失败：找不到 dn=%s 的密码"
-
-#: keystone/tests/fakeldap.py:193
-#, python-format
-msgid "FakeLdap bind fail: password for dn=%s does not match"
-msgstr "FakeLdap bind 失败：dn=%s 的密码不匹配"
-
-#: keystone/tests/fakeldap.py:213
-#, python-format
-msgid "FakeLdap add item: dn=%(dn)s, attrs=%(attrs)s"
-msgstr ""
-
-#: keystone/tests/fakeldap.py:216
-#, python-format
-msgid "FakeLdap add item failed: dn=%s is already in store."
-msgstr "FakeLdap add item 失败：dn=%s 已在存储中。"
-
-#: keystone/tests/fakeldap.py:230 keystone/tests/fakeldap.py:244
+#: keystone/tests/fakeldap.py:249
 #, python-format
 msgid "FakeLdap delete item: dn=%s"
 msgstr "FakeLdap delete item：dn=%s"
 
-#: keystone/tests/fakeldap.py:234 keystone/tests/fakeldap.py:248
-#, python-format
-msgid "FakeLdap delete item failed: dn=%s not found."
-msgstr "FakeLdap delete item 失败：找不到 dn=%s。"
-
-#: keystone/tests/fakeldap.py:263
-#, python-format
-msgid "FakeLdap modify item: dn=%(dn)s attrs=%(attrs)s"
-msgstr ""
-
-#: keystone/tests/fakeldap.py:268
-#, python-format
-msgid "FakeLdap modify item failed: dn=%s not found."
-msgstr "FakeLdap modify item 失败：找不到 dn=%s。"
-
-#: keystone/tests/fakeldap.py:284
-#, python-format
-msgid "FakeLdap modify item failed: item has no attribute \"%s\" to delete"
-msgstr "FakeLdap modify item 失败：项没有要删除的任何属性“%s”"
-
-#: keystone/tests/fakeldap.py:293
-#, python-format
-msgid ""
-"FakeLdap modify item failed: item has no attribute \"%(k)s\" with value "
-"\"%(v)s\" to delete"
-msgstr ""
-
-#: keystone/tests/fakeldap.py:299
-#, python-format
-msgid "FakeLdap modify item failed: unknown command %s"
-msgstr "FakeLdap modify item 失败：命令 %s 未知"
-
-#: keystone/tests/fakeldap.py:301
-#, python-format
-msgid "modify_s action %s not implemented"
-msgstr "未实现 modify_s 操作 %s"
-
-#: keystone/tests/fakeldap.py:320
-#, python-format
-msgid "FakeLdap search at dn=%(dn)s scope=%(scope)s query=%(query)s"
-msgstr ""
-
-#: keystone/tests/fakeldap.py:326
-msgid "FakeLdap search fail: dn not found for SCOPE_BASE"
-msgstr "FakeLdap search 失败：对于 SCOPE_BASE，找不到 dn"
-
-#: keystone/tests/fakeldap.py:340
-#, python-format
-msgid "Search scope %s not implemented."
-msgstr "未实现搜索范围 %s。"
-
-#: keystone/token/controllers.py:380
+#: keystone/token/controllers.py:359
 #, python-format
 msgid "User %(u_id)s is unauthorized for tenant %(t_id)s"
 msgstr ""
 
-#: keystone/token/controllers.py:397 keystone/token/controllers.py:400
+#: keystone/token/controllers.py:376 keystone/token/controllers.py:379
 msgid "Token does not belong to specified tenant."
 msgstr "令牌不属于指定的租户。"
 
-#: keystone/token/core.py:84
+#: keystone/token/core.py:86
 #, python-format
 msgid "Tenant is disabled: %s"
 msgstr ""
@@ -1990,82 +1797,115 @@
 "'PKI'"
 msgstr ""
 
-#: keystone/token/provider.py:193
+#: keystone/token/provider.py:194
 #, python-format
 msgid "Unexpected error or malformed token determining token expiry: %s"
 msgstr ""
 
-#: keystone/token/provider.py:200 keystone/token/providers/common.py:548
-#: keystone/token/providers/common.py:558
-msgid "Failed to validate token"
+#: keystone/token/provider.py:197
+msgid "The token is malformed or expired."
 msgstr ""
 
-#: keystone/token/backends/kvs.py:37
+#: keystone/token/backends/kvs.py:55
 msgid ""
-"kvs token backend is DEPRECATED. Use keystone.token.backends.sql or "
-"keystone.token.backend.memcache instead."
+"It is recommended to only use the base key-value-store implementation for "
+"the token driver for testing purposes.  Please use "
+"keystone.token.backends.memcache.Token or keystone.token.backends.sql.Token "
+"instead."
 msgstr ""
 
-#: keystone/token/backends/memcache.py:142
+#: keystone/token/backends/kvs.py:130
 #, python-format
-msgid ""
-"Successful set of token-index-list for user-key \"%(user_key)s\", #%(count)d "
-"records"
+msgid "Unknown token version %s"
 msgstr ""
 
-#: keystone/token/backends/memcache.py:152
+#: keystone/token/backends/kvs.py:169
 #, python-format
-msgid ""
-"Failed to set token-index-list for user-key \"%(user_key)s\". Attempt "
-"%(cas_retry)d of %(cas_retry_max)d"
+msgid "Token `%(token_id)s` is expired, removing from `%(user_key)s`."
 msgstr ""
 
-#: keystone/token/backends/memcache.py:161
-msgid "Unable to add token user list"
+#: keystone/token/backends/kvs.py:178
+#, python-format
+msgid "Token `%(token_id)s` is revoked, removing from `%(user_key)s`."
 msgstr ""
 
-#: keystone/token/backends/memcache.py:170
-msgid "Unable to add token to revocation list."
-msgstr "无法将令牌添加至撤销列表。"
+#: keystone/token/backends/kvs.py:203
+#, python-format
+msgid "Token `%s` is expired, not adding to the revocation list."
+msgstr ""
 
-#: keystone/token/providers/common.py:184
-msgid "Trustor is disabled."
+#: keystone/token/backends/kvs.py:223
+#, python-format
+msgid ""
+"Reinitializing revocation list due to error in loading revocation list from "
+"backend.  Expected `list` type got `%(type)s`. Old revocation list data: "
+"%(list)r"
 msgstr ""
 
-#: keystone/token/providers/common.py:248
-msgid "Trustee has no delegated roles."
+#: keystone/token/backends/kvs.py:237
+#, python-format
+msgid ""
+"Removing `%s` from revocation list due to invalid expires data in revocation "
+"list."
+msgstr ""
+
+#: keystone/token/backends/kvs.py:268
+#, python-format
+msgid ""
+"Invalid token entry expected tuple of `(<token_id>, <expires>)` got: "
+"`%(item)r`"
+msgstr ""
+
+#: keystone/token/backends/kvs.py:277
+#, python-format
+msgid "Invalid expires time on token `%(token_id)s`: %(expires)r"
 msgstr ""
 
-#: keystone/token/providers/common.py:257
+#: keystone/token/providers/common.py:182
+#: keystone/token/providers/common.py:285
 #, python-format
 msgid "User %(user_id)s has no access to project %(project_id)s"
 msgstr ""
 
-#: keystone/token/providers/common.py:262
+#: keystone/token/providers/common.py:187
+#: keystone/token/providers/common.py:290
 #, python-format
 msgid "User %(user_id)s has no access to domain %(domain_id)s"
 msgstr ""
 
-#: keystone/token/providers/common.py:312
+#: keystone/token/providers/common.py:212
+msgid "Trustor is disabled."
+msgstr ""
+
+#: keystone/token/providers/common.py:276
+msgid "Trustee has no delegated roles."
+msgstr ""
+
+#: keystone/token/providers/common.py:340
 msgid "User is not a trustee."
 msgstr ""
 
-#: keystone/token/providers/common.py:402
+#: keystone/token/providers/common.py:435
 msgid "Oauth is disabled."
 msgstr ""
 
-#: keystone/token/providers/common.py:476
+#: keystone/token/providers/common.py:536
 msgid "Non-default domain is not supported"
 msgstr "非缺省域不受支持"
 
-#: keystone/token/providers/common.py:484
+#: keystone/token/providers/common.py:544
 msgid "Domain scoped token is not supported"
 msgstr "作用域限定到域的令牌不受支持"
 
-#: keystone/token/providers/pki.py:42
+#: keystone/token/providers/common.py:611
+#: keystone/token/providers/common.py:621
+msgid "Failed to validate token"
+msgstr ""
+
+#: keystone/token/providers/pki.py:41
 msgid "Unable to sign token"
 msgstr ""
 
-#: keystone/token/providers/pki.py:43
+#: keystone/token/providers/pki.py:42
 msgid "Unable to sign token."
 msgstr "无法对令牌进行签名。"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/kubuntu-patched-l10n.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/kubuntu-patched-l10n.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/kubuntu-patched-l10n.po	2014-02-24 08:24:50.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/kubuntu-patched-l10n.po	2014-03-24 09:42:57.000000000 +0000
@@ -7,15 +7,19 @@
 msgstr ""
 "Project-Id-Version: kubuntu-patched-l10n\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-10-10 15:32+0100\n"
+"POT-Creation-Date: 2014-02-28 15:23+0100\n"
 "PO-Revision-Date: 2014-01-19 08:37+0000\n"
 "Last-Translator: Wylmer Wang <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:53+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 14:39+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
+
+#: app/kipiinterface.cpp:256
+msgid "Install Plugins"
+msgstr ""
 
 #: projects/k3baudioburndialog.cpp:287 projects/k3bmixedburndialog.cpp:293
 msgid ""
@@ -79,6 +83,44 @@
 "installation of MP3 support via an online update tool."
 msgstr ""
 
+#: k3bsystemproblemdialog.cpp:538
+msgid "System locale charset is ANSI_X3.4-1968"
+msgstr ""
+
+#: k3bsystemproblemdialog.cpp:539
+msgid ""
+"Your system's locale charset (i.e. the charset used to encode filenames) is "
+"set to ANSI_X3.4-1968. It is highly unlikely that this has been done "
+"intentionally. Most likely the locale is not set at all. An invalid setting "
+"will result in problems when creating data projects."
+msgstr ""
+
+#: k3bsystemproblemdialog.cpp:543
+msgid ""
+"To properly set the locale charset make sure the LC_* environment variables "
+"are set. Normally the distribution setup tools take care of this."
+msgstr ""
+
+#: k3bsystemproblemdialog.cpp:556
+msgid "Running K3b as root user"
+msgstr ""
+
+#: k3bsystemproblemdialog.cpp:557
+msgid ""
+"It is not recommended to run K3b under the root user account. This "
+"introduces unnecessary security risks."
+msgstr ""
+
+#: k3bsystemproblemdialog.cpp:559
+msgid ""
+"Run K3b from a proper user account and setup the device and external tool "
+"permissions appropriately."
+msgstr ""
+
+#: k3bsystemproblemdialog.cpp:562
+msgid "The latter can be done via \"Modify Permissions...\"."
+msgstr ""
+
 #: k3bsystemproblemdialog.cpp:592
 msgid "No problems found in system configuration."
 msgstr "系统配置未发现问题。"
@@ -119,7 +161,11 @@
 msgid "Could not start normalize-audio."
 msgstr "无法启动 normalize-audio。"
 
-#: kcmlocale.cpp:1395
+#: drkonqidialog.cpp:188
+msgid "Automatically submit a crash report"
+msgstr ""
+
+#: kcmlocale.cpp:1346
 msgctxt "@status message widget"
 msgid ""
 "You tried to remove your active system language, this is not supported."
@@ -141,7 +187,7 @@
 msgid "Enable autostart handling"
 msgstr "启用自启动处理"
 
-#: image.cpp:181
+#: image.cpp:174
 msgctxt "@action:button"
 msgid "Install Default Wallpapers..."
 msgstr "安装默认壁纸..."
@@ -169,6 +215,10 @@
 msgid "Kubuntu.org News"
 msgstr "Kubuntu.org 新闻"
 
+#: src/akregator_part.cpp:194
+msgid "Kubuntu Wire"
+msgstr ""
+
 #: kilelauncher.cpp:407
 msgid ""
 "This is possibly due to old tools configuration; you can restore default "
@@ -179,13 +229,3 @@
 #: main.cpp:187
 msgid "Debian policy compatibility, not used"
 msgstr "Debian 策略兼容性，无用"
-
-#: kubuntu-firefox-installer-13.04ubuntu3/src/firefox.desktop:3
-msgctxt "Name"
-msgid "Mozilla Firefox Browser Installer"
-msgstr "Mozilla Firefox 浏览器安装程序"
-
-#: kubuntu-firefox-installer-13.04ubuntu3/src/firefox.desktop:4
-msgctxt "GenericName"
-msgid "Mozilla Firefox Browser Installer"
-msgstr ""
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/landscape-client.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/landscape-client.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/landscape-client.po	2014-02-24 08:24:39.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/landscape-client.po	2014-03-24 09:42:46.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: landscape-client\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-02-17 13:54+0000\n"
+"POT-Creation-Date: 2014-02-24 12:49+0000\n"
 "PO-Revision-Date: 2013-07-13 15:09+0000\n"
 "Last-Translator: Wang Dianjin <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:33+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:56+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: ../landscape/ui/controller/app.py:49
 msgid "Success."
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/language-selector.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/language-selector.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/language-selector.po	2014-02-24 08:24:37.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/language-selector.po	2014-03-24 09:42:44.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: language-selector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-13 22:52+0000\n"
+"POT-Creation-Date: 2014-03-19 01:18+0000\n"
 "PO-Revision-Date: 2013-12-14 10:37+0000\n"
 "Last-Translator: Wang Dianjin <Unknown>\n"
 "Language-Team: Chinese (China) <i18n-zh@googlegroups.com>\n"
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:15+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:34+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: \n"
 
 #. Hack for Chinese langpack split
@@ -81,12 +81,12 @@
 msgstr "无"
 
 #: ../LanguageSelector/gtk/GtkLanguageSelector.py:504
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:708
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:709
 msgid "Software database is broken"
 msgstr "软件数据库损坏"
 
 #: ../LanguageSelector/gtk/GtkLanguageSelector.py:505
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:709
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:710
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -106,8 +106,8 @@
 "selector/+filebug?no-redirect 上报告这个问题。"
 
 #: ../LanguageSelector/gtk/GtkLanguageSelector.py:571
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:606
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:610
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:607
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:611
 msgid "Could not install the full language support"
 msgstr "无法安装完整的语言支持"
 
@@ -119,33 +119,33 @@
 "Sources\")."
 msgstr "这通常与软件存档或软件管理器中的错误有关。请检查您在“软件源”中的设置 (点击顶栏最右边的图标并选择“系统设置... -> 软件源”)。"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:607
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:608
 msgid "Failed to authorize to install packages."
 msgstr "安装包验证失败。"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:665
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:666
 msgid "The language support is not installed completely"
 msgstr "语言支持没有安装完整"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:666
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:667
 msgid ""
 "Some translations or writing aids available for your chosen languages are "
 "not installed yet. Do you want to install them now?"
 msgstr "您选择的语言的部分可用翻译或写作帮助还没有安装。您希望现在安装吗？"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:669
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:670
 msgid "_Remind Me Later"
 msgstr "稍后提醒(_R)"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:670
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:671
 msgid "_Install"
 msgstr "安装(_I)"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:673
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:674
 msgid "Details"
 msgstr "详细信息"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:933
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:934
 #, python-format
 msgid ""
 "Failed to apply the '%s' format\n"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/ldm.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/ldm.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/ldm.po	2014-02-24 08:24:43.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/ldm.po	2014-03-24 09:42:50.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:03+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:35+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: ../src/plugin.c:20
 msgid "Username"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/ld.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/ld.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/ld.po	2014-02-24 08:24:24.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/ld.po	2014-03-24 09:42:32.000000000 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: ld 2.15.96\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-10-25 11:20+0100\n"
-"PO-Revision-Date: 2014-02-19 02:52+0000\n"
+"PO-Revision-Date: 2014-03-05 07:47+0000\n"
 "Last-Translator: Meng Jie <Unknown>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 10:39+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 10:41+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: emultempl/armcoff.em:73
 #, c-format
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/lftp.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/lftp.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/lftp.po	2014-02-24 08:24:30.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/lftp.po	2014-03-24 09:42:37.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:28+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 11:39+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "X-Poedit-Country: CHINA\n"
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/libapt-inst1.5.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/libapt-inst1.5.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/libapt-inst1.5.po	2014-02-24 08:24:23.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/libapt-inst1.5.po	2014-03-24 09:42:31.000000000 +0000
@@ -10,14 +10,14 @@
 "Project-Id-Version: apt 0.8.0~pre1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-03-15 19:05+0000\n"
-"PO-Revision-Date: 2014-02-17 19:31+0000\n"
+"PO-Revision-Date: 2014-02-28 15:22+0000\n"
 "Last-Translator: Aron Xu <Unknown>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 10:32+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 10:32+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: \n"
 
 #: apt-inst/contrib/extracttar.cc:114
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/libapt-pkg4.12.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/libapt-pkg4.12.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/libapt-pkg4.12.po	2014-02-24 08:24:23.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/libapt-pkg4.12.po	2014-03-24 09:42:31.000000000 +0000
@@ -10,14 +10,14 @@
 "Project-Id-Version: apt 0.8.0~pre1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-03-15 19:05+0000\n"
-"PO-Revision-Date: 2014-02-17 18:50+0000\n"
+"PO-Revision-Date: 2014-02-28 14:44+0000\n"
 "Last-Translator: Aron Xu <Unknown>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 10:32+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 10:33+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: \n"
 
 #: methods/bzip2.cc:60 methods/gzip.cc:52
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/libc.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/libc.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/libc.po	2014-02-24 08:24:44.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/libc.po	2014-03-24 09:42:52.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: glibc\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-07-24 23:29-0700\n"
-"PO-Revision-Date: 2014-02-18 03:44+0000\n"
+"POT-Creation-Date: 2014-01-05 17:40+1000\n"
+"PO-Revision-Date: 2014-02-25 06:54+0000\n"
 "Last-Translator: LI Daobing <lidaobing@gmail.com>\n"
 "Language-Team: Chinese (China) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:17+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:51+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: argp/argp-help.c:227
 #, c-format
@@ -147,8 +147,8 @@
 #: catgets/gencat.c:229 debug/pcprofiledump.c:209 elf/ldconfig.c:307
 #: elf/pldd.c:219 elf/sln.c:85 elf/sprof.c:372 iconv/iconv_prog.c:408
 #: iconv/iconvconfig.c:379 locale/programs/locale.c:277
-#: locale/programs/localedef.c:364 login/programs/pt_chown.c:88
-#: malloc/memusagestat.c:563 nscd/nscd.c:450 nss/getent.c:965 nss/makedb.c:369
+#: locale/programs/localedef.c:376 login/programs/pt_chown.c:88
+#: malloc/memusagestat.c:563 nss/getent.c:969 nss/makedb.c:369
 #: posix/getconf.c:1121 sunrpc/rpcinfo.c:691
 #: sysdeps/unix/sysv/linux/lddlibc4.c:61
 #, c-format
@@ -160,9 +160,9 @@
 #: catgets/gencat.c:245 debug/pcprofiledump.c:225 debug/xtrace.sh:64
 #: elf/ldconfig.c:323 elf/ldd.bash.in:38 elf/pldd.c:235 elf/sotruss.ksh:75
 #: elf/sprof.c:389 iconv/iconv_prog.c:425 iconv/iconvconfig.c:396
-#: locale/programs/locale.c:294 locale/programs/localedef.c:390
+#: locale/programs/locale.c:294 locale/programs/localedef.c:402
 #: login/programs/pt_chown.c:62 malloc/memusage.sh:71
-#: malloc/memusagestat.c:579 nscd/nscd.c:466 nss/getent.c:86 nss/makedb.c:385
+#: malloc/memusagestat.c:581 nscd/nscd.c:485 nss/getent.c:86 nss/makedb.c:385
 #: posix/getconf.c:1103 sysdeps/unix/sysv/linux/lddlibc4.c:68
 #, c-format
 msgid ""
@@ -176,8 +176,8 @@
 #: catgets/gencat.c:250 debug/pcprofiledump.c:230 debug/xtrace.sh:68
 #: elf/ldconfig.c:328 elf/pldd.c:240 elf/sprof.c:395 iconv/iconv_prog.c:430
 #: iconv/iconvconfig.c:401 locale/programs/locale.c:299
-#: locale/programs/localedef.c:395 malloc/memusage.sh:75
-#: malloc/memusagestat.c:584 nscd/nscd.c:471 nss/getent.c:91 nss/makedb.c:390
+#: locale/programs/localedef.c:407 malloc/memusage.sh:75
+#: malloc/memusagestat.c:586 nscd/nscd.c:490 nss/getent.c:91 nss/makedb.c:390
 #: posix/getconf.c:1108
 #, c-format
 msgid "Written by %s.\n"
@@ -371,60 +371,60 @@
 msgid "unknown"
 msgstr "未知"
 
-#: elf/cache.c:126
+#: elf/cache.c:135
 msgid "Unknown OS"
 msgstr "未知的操作系统"
 
-#: elf/cache.c:131
+#: elf/cache.c:140
 #, c-format
 msgid ", OS ABI: %s %d.%d.%d"
 msgstr ", OS ABI: %s %d.%d.%d"
 
-#: elf/cache.c:148 elf/ldconfig.c:1318
+#: elf/cache.c:157 elf/ldconfig.c:1318
 #, c-format
 msgid "Can't open cache file %s\n"
 msgstr "无法打开缓冲文件 %s\n"
 
-#: elf/cache.c:162
+#: elf/cache.c:171
 #, c-format
 msgid "mmap of cache file failed.\n"
 msgstr "缓冲文件的 mmap 失败。\n"
 
-#: elf/cache.c:166 elf/cache.c:180
+#: elf/cache.c:175 elf/cache.c:189
 #, c-format
 msgid "File is not a cache file.\n"
 msgstr "文件不是缓冲区文件。\n"
 
-#: elf/cache.c:213 elf/cache.c:223
+#: elf/cache.c:222 elf/cache.c:232
 #, c-format
 msgid "%d libs found in cache `%s'\n"
 msgstr "在缓冲区“%2$s”中找到 %1$d 个库\n"
 
-#: elf/cache.c:417
+#: elf/cache.c:426
 #, c-format
 msgid "Can't create temporary cache file %s"
 msgstr "无法创建临时缓冲文件 %s"
 
-#: elf/cache.c:425 elf/cache.c:435 elf/cache.c:439 elf/cache.c:444
+#: elf/cache.c:434 elf/cache.c:444 elf/cache.c:448 elf/cache.c:453
 #, c-format
 msgid "Writing of cache data failed"
 msgstr "写缓冲数据失败"
 
-#: elf/cache.c:449
+#: elf/cache.c:458
 #, c-format
 msgid "Changing access rights of %s to %#o failed"
 msgstr "将 %s 的访问权限改变为 %#o 失败"
 
-#: elf/cache.c:454
+#: elf/cache.c:463
 #, c-format
 msgid "Renaming of %s to %s failed"
 msgstr "将 %s 改名为 %s 失败"
 
-#: elf/dl-close.c:384 elf/dl-open.c:470
+#: elf/dl-close.c:383 elf/dl-open.c:470
 msgid "cannot create scope list"
 msgstr "无法创建范围列表"
 
-#: elf/dl-close.c:777
+#: elf/dl-close.c:776
 msgid "shared object not open"
 msgstr "共享库未打开"
 
@@ -455,11 +455,11 @@
 msgid "Filters not supported with LD_TRACE_PRELINKING"
 msgstr ""
 
-#: elf/dl-error.c:76
+#: elf/dl-error.c:77
 msgid "DYNAMIC LINKER BUG!!!"
 msgstr "动态链接器 BUG!!!"
 
-#: elf/dl-error.c:123
+#: elf/dl-error.c:127
 msgid "error while loading shared libraries"
 msgstr "装入共享库时出错"
 
@@ -483,159 +483,159 @@
 msgid "cannot allocate name record"
 msgstr "无法分配名记录"
 
-#: elf/dl-load.c:542 elf/dl-load.c:658 elf/dl-load.c:743 elf/dl-load.c:862
+#: elf/dl-load.c:550 elf/dl-load.c:666 elf/dl-load.c:749 elf/dl-load.c:868
 msgid "cannot create cache for search path"
 msgstr "无法创建搜索路径缓冲器"
 
-#: elf/dl-load.c:633
+#: elf/dl-load.c:641
 msgid "cannot create RUNPATH/RPATH copy"
 msgstr "无法创建 RUNPATH/RPATH 的副本"
 
-#: elf/dl-load.c:729
+#: elf/dl-load.c:735
 msgid "cannot create search path array"
 msgstr "无法创建搜索路径数组"
 
-#: elf/dl-load.c:934
+#: elf/dl-load.c:940
 msgid "cannot stat shared object"
 msgstr "无法对共享目标进行 stat 操作"
 
-#: elf/dl-load.c:1012
+#: elf/dl-load.c:1018
 msgid "cannot open zero fill device"
 msgstr "无法打开零填充设备"
 
-#: elf/dl-load.c:1059 elf/dl-load.c:2342
+#: elf/dl-load.c:1065 elf/dl-load.c:2348
 msgid "cannot create shared object descriptor"
 msgstr "无法创建共享对象描述符"
 
-#: elf/dl-load.c:1078 elf/dl-load.c:1755 elf/dl-load.c:1858
+#: elf/dl-load.c:1084 elf/dl-load.c:1761 elf/dl-load.c:1864
 msgid "cannot read file data"
 msgstr "无法读入文件数据"
 
-#: elf/dl-load.c:1124
+#: elf/dl-load.c:1130
 msgid "ELF load command alignment not page-aligned"
 msgstr "ELF 加载命令对齐不是按页对齐的"
 
-#: elf/dl-load.c:1131
+#: elf/dl-load.c:1137
 msgid "ELF load command address/offset not properly aligned"
 msgstr "ELF 装入命令的地址/偏移量没有正确地对齐"
 
-#: elf/dl-load.c:1216
+#: elf/dl-load.c:1222
 msgid "cannot allocate TLS data structures for initial thread"
 msgstr "不能为初始线程分配转址旁路缓存(TLS)数据结构"
 
-#: elf/dl-load.c:1239
+#: elf/dl-load.c:1245
 msgid "cannot handle TLS data"
 msgstr "无法处理 TLS 数据"
 
-#: elf/dl-load.c:1258
+#: elf/dl-load.c:1264
 msgid "object file has no loadable segments"
 msgstr "目标文件没有可加载段"
 
-#: elf/dl-load.c:1294
+#: elf/dl-load.c:1300
 msgid "failed to map segment from shared object"
 msgstr "无法从共享目标中映射段"
 
-#: elf/dl-load.c:1320
+#: elf/dl-load.c:1326
 msgid "cannot dynamically load executable"
 msgstr "无法动态装入可执行文件"
 
-#: elf/dl-load.c:1383 elf/dl-load.c:1492
+#: elf/dl-load.c:1389 elf/dl-load.c:1498
 msgid "cannot change memory protections"
 msgstr "无法改变内存保护"
 
-#: elf/dl-load.c:1402
+#: elf/dl-load.c:1408
 msgid "cannot map zero-fill pages"
 msgstr "无法映射用零填充的页"
 
-#: elf/dl-load.c:1416
+#: elf/dl-load.c:1422
 msgid "object file has no dynamic section"
 msgstr "目标文件没有动态节"
 
-#: elf/dl-load.c:1439
+#: elf/dl-load.c:1445
 msgid "shared object cannot be dlopen()ed"
 msgstr "无法用 dlopen() 打开共享库"
 
-#: elf/dl-load.c:1452
+#: elf/dl-load.c:1458
 msgid "cannot allocate memory for program header"
 msgstr "无法为程序头分配内存"
 
-#: elf/dl-load.c:1469 elf/dl-open.c:195
+#: elf/dl-load.c:1475 elf/dl-open.c:195
 msgid "invalid caller"
 msgstr "无效的调用者"
 
-#: elf/dl-load.c:1512
+#: elf/dl-load.c:1518
 msgid "cannot enable executable stack as shared object requires"
 msgstr "无法启用共享目标需要的执行栈"
 
-#: elf/dl-load.c:1525
+#: elf/dl-load.c:1531
 msgid "cannot close file descriptor"
 msgstr "无法关闭文件描述符"
 
-#: elf/dl-load.c:1755
+#: elf/dl-load.c:1761
 msgid "file too short"
 msgstr "文件过短"
 
-#: elf/dl-load.c:1791
+#: elf/dl-load.c:1797
 msgid "invalid ELF header"
 msgstr "无效的 ELF 头"
 
-#: elf/dl-load.c:1803
+#: elf/dl-load.c:1809
 msgid "ELF file data encoding not big-endian"
 msgstr "ELF 文件数据编码不是 big-endian"
 
-#: elf/dl-load.c:1805
+#: elf/dl-load.c:1811
 msgid "ELF file data encoding not little-endian"
 msgstr "ELF 文件数据编码不是 little-endian"
 
-#: elf/dl-load.c:1809
+#: elf/dl-load.c:1815
 msgid "ELF file version ident does not match current one"
 msgstr "ELF 文件版本描述与当前不匹配"
 
-#: elf/dl-load.c:1813
+#: elf/dl-load.c:1819
 msgid "ELF file OS ABI invalid"
 msgstr "ELF 文件 OS ABI 无效"
 
-#: elf/dl-load.c:1816
+#: elf/dl-load.c:1822
 msgid "ELF file ABI version invalid"
 msgstr "ELF 文件 ABI 版本无效"
 
-#: elf/dl-load.c:1819
+#: elf/dl-load.c:1825
 msgid "nonzero padding in e_ident"
 msgstr ""
 
-#: elf/dl-load.c:1822
+#: elf/dl-load.c:1828
 msgid "internal error"
 msgstr "内部错误"
 
-#: elf/dl-load.c:1829
+#: elf/dl-load.c:1835
 msgid "ELF file version does not match current one"
 msgstr "ELF 文件版本与当前版本不匹配"
 
-#: elf/dl-load.c:1837
+#: elf/dl-load.c:1843
 msgid "only ET_DYN and ET_EXEC can be loaded"
 msgstr ""
 
-#: elf/dl-load.c:1843
+#: elf/dl-load.c:1849
 msgid "ELF file's phentsize not the expected size"
 msgstr ""
 
-#: elf/dl-load.c:2361
+#: elf/dl-load.c:2367
 msgid "wrong ELF class: ELFCLASS64"
 msgstr "错误 ELF 类: ELFCLASS64"
 
-#: elf/dl-load.c:2362
+#: elf/dl-load.c:2368
 msgid "wrong ELF class: ELFCLASS32"
 msgstr "错误 ELF 类: ELFCLASS32"
 
-#: elf/dl-load.c:2365
+#: elf/dl-load.c:2371
 msgid "cannot open shared object file"
 msgstr "无法打开共享对象文件"
 
-#: elf/dl-lookup.c:753 ports/sysdeps/mips/dl-lookup.c:771
+#: elf/dl-lookup.c:753 ports/sysdeps/mips/dl-lookup.c:770
 msgid "relocation error"
 msgstr "重定位错误"
 
-#: elf/dl-lookup.c:780 ports/sysdeps/mips/dl-lookup.c:798
+#: elf/dl-lookup.c:780 ports/sysdeps/mips/dl-lookup.c:797
 msgid "symbol lookup error"
 msgstr "符号查询错误"
 
@@ -651,41 +651,41 @@
 msgid "cannot load any more object with static TLS"
 msgstr ""
 
-#: elf/dl-open.c:599
+#: elf/dl-open.c:602
 msgid "invalid mode for dlopen()"
 msgstr "无效的 dlopen() 模式"
 
-#: elf/dl-open.c:616
+#: elf/dl-open.c:619
 msgid "no more namespaces available for dlmopen()"
 msgstr "dlmopen() 的命名空间已满"
 
-#: elf/dl-open.c:634
+#: elf/dl-open.c:637
 msgid "invalid target namespace in dlmopen()"
 msgstr "dlmopen() 中无效的目标名字空间"
 
-#: elf/dl-reloc.c:120
+#: elf/dl-reloc.c:158
 msgid "cannot allocate memory in static TLS block"
 msgstr "无法在静态 TLS 块中分配内存"
 
-#: elf/dl-reloc.c:212
+#: elf/dl-reloc.c:250
 msgid "cannot make segment writable for relocation"
 msgstr ""
 
-#: elf/dl-reloc.c:275
+#: elf/dl-reloc.c:313
 #, c-format
 msgid "%s: no PLTREL found in object %s\n"
 msgstr ""
 
-#: elf/dl-reloc.c:286
+#: elf/dl-reloc.c:324
 #, c-format
 msgid "%s: out of memory to store relocation results for %s\n"
 msgstr ""
 
-#: elf/dl-reloc.c:302
+#: elf/dl-reloc.c:340
 msgid "cannot restore segment prot after reloc"
 msgstr "重定位后无法恢复段 prot"
 
-#: elf/dl-reloc.c:331
+#: elf/dl-reloc.c:369
 msgid "cannot apply additional memory protection after relocation"
 msgstr "无法在重定位后应用额外的内存保护"
 
@@ -693,7 +693,7 @@
 msgid "RTLD_NEXT used in code not dynamically loaded"
 msgstr ""
 
-#: elf/dl-tls.c:875
+#: elf/dl-tls.c:923
 msgid "cannot create TLS data structures"
 msgstr "无法创建 TLS 数据结构"
 
@@ -948,38 +948,38 @@
 msgid "unrecognized option"
 msgstr "无法识别的选项"
 
-#: elf/ldd.bash.in:88 elf/ldd.bash.in:126
+#: elf/ldd.bash.in:88 elf/ldd.bash.in:125
 msgid "Try \\`ldd --help' for more information."
 msgstr "试用“ldd --help”以获取更多信息。"
 
-#: elf/ldd.bash.in:125
+#: elf/ldd.bash.in:124
 msgid "missing file arguments"
 msgstr "缺少文件参数"
 
 #. TRANS No such file or directory.  This is a ``file doesn't exist'' error
 #. TRANS for ordinary files that are referenced in contexts where they are
 #. TRANS expected to already exist.
-#: elf/ldd.bash.in:148 sysdeps/gnu/errlist.c:36
+#: elf/ldd.bash.in:147 sysdeps/gnu/errlist.c:36
 msgid "No such file or directory"
 msgstr "没有那个文件或目录"
 
-#: elf/ldd.bash.in:151 inet/rcmd.c:488
+#: elf/ldd.bash.in:150 inet/rcmd.c:488
 msgid "not regular file"
 msgstr "不是普通文件"
 
-#: elf/ldd.bash.in:154
+#: elf/ldd.bash.in:153
 msgid "warning: you do not have execution permission for"
 msgstr "警告: 你没有执行权限"
 
-#: elf/ldd.bash.in:183
+#: elf/ldd.bash.in:182
 msgid "\tnot a dynamic executable"
 msgstr "\t不是动态可执行文件"
 
-#: elf/ldd.bash.in:191
+#: elf/ldd.bash.in:190
 msgid "exited with unknown exit code"
 msgstr "以未知的退出码退出"
 
-#: elf/ldd.bash.in:196
+#: elf/ldd.bash.in:195
 msgid "error: you do not have read permission for"
 msgstr "错误: 你没有读权限"
 
@@ -1376,7 +1376,7 @@
 msgid "list all known coded character sets"
 msgstr "列举所有已知的字符集"
 
-#: iconv/iconv_prog.c:64 locale/programs/localedef.c:127
+#: iconv/iconv_prog.c:64 locale/programs/localedef.c:129
 msgid "Output control:"
 msgstr "输出控制："
 
@@ -1385,8 +1385,8 @@
 msgstr "从输出中忽略无效的字符"
 
 #: iconv/iconv_prog.c:66 iconv/iconvconfig.c:128
-#: locale/programs/localedef.c:120 locale/programs/localedef.c:122
-#: locale/programs/localedef.c:124 locale/programs/localedef.c:145
+#: locale/programs/localedef.c:122 locale/programs/localedef.c:124
+#: locale/programs/localedef.c:126 locale/programs/localedef.c:147
 #: malloc/memusagestat.c:56
 msgid "FILE"
 msgstr ""
@@ -1463,19 +1463,13 @@
 
 #: iconv/iconv_prog.c:791
 msgid ""
-"The following list contain all the coded character sets known.  This does\n"
+"The following list contains all the coded character sets known.  This does\n"
 "not necessarily mean that all combinations of these names can be used for\n"
 "the FROM and TO command line parameters.  One coded character set can be\n"
 "listed with several different names (aliases).\n"
 "\n"
 "  "
 msgstr ""
-"下面的列表包含所有有已知的字符编码集.这\n"
-"并不意味着这些名字的所有组合能够被使用在\n"
-"命令行参数FROM和TO中.一种已编码的字符集能\n"
-"列出几个不同的名字(别名).\n"
-"\n"
-"  "
 
 #: iconv/iconvconfig.c:109
 msgid "Create fastloading iconv module configuration file."
@@ -1485,7 +1479,7 @@
 msgid "[DIR...]"
 msgstr "[目录...]"
 
-#: iconv/iconvconfig.c:126 locale/programs/localedef.c:131
+#: iconv/iconvconfig.c:126 locale/programs/localedef.c:133
 msgid "PATH"
 msgstr ""
 
@@ -1508,7 +1502,7 @@
 msgid "Directory arguments required when using --nostdlib"
 msgstr "当使用--nostdlib时需要目录参数"
 
-#: iconv/iconvconfig.c:341 locale/programs/localedef.c:288
+#: iconv/iconvconfig.c:341 locale/programs/localedef.c:294
 #, c-format
 msgid "no output file produced because warnings were issued"
 msgstr "由于出现警告而未生成输出文件"
@@ -1645,8 +1639,8 @@
 msgid "invalid definition"
 msgstr "无效的定义"
 
-#: locale/programs/charmap.c:375 locale/programs/locfile.c:125
-#: locale/programs/locfile.c:152 locale/programs/repertoire.c:175
+#: locale/programs/charmap.c:375 locale/programs/locfile.c:131
+#: locale/programs/locfile.c:158 locale/programs/repertoire.c:175
 msgid "bad argument"
 msgstr "错误的参数"
 
@@ -1704,14 +1698,14 @@
 msgid "no symbolic name given for end of range"
 msgstr "没有为范围的结束给出符号化的名称"
 
-#: locale/programs/charmap.c:610 locale/programs/ld-address.c:602
-#: locale/programs/ld-collate.c:2767 locale/programs/ld-collate.c:3925
-#: locale/programs/ld-ctype.c:2256 locale/programs/ld-ctype.c:3007
-#: locale/programs/ld-identification.c:452
-#: locale/programs/ld-measurement.c:238 locale/programs/ld-messages.c:332
-#: locale/programs/ld-monetary.c:942 locale/programs/ld-name.c:307
-#: locale/programs/ld-numeric.c:368 locale/programs/ld-paper.c:241
-#: locale/programs/ld-telephone.c:313 locale/programs/ld-time.c:1221
+#: locale/programs/charmap.c:610 locale/programs/ld-address.c:528
+#: locale/programs/ld-collate.c:2626 locale/programs/ld-collate.c:3784
+#: locale/programs/ld-ctype.c:2159 locale/programs/ld-ctype.c:2910
+#: locale/programs/ld-identification.c:368
+#: locale/programs/ld-measurement.c:215 locale/programs/ld-messages.c:298
+#: locale/programs/ld-monetary.c:740 locale/programs/ld-name.c:264
+#: locale/programs/ld-numeric.c:326 locale/programs/ld-paper.c:214
+#: locale/programs/ld-telephone.c:278 locale/programs/ld-time.c:943
 #: locale/programs/repertoire.c:313
 #, c-format
 msgid "%1$s: definition does not end with `END %1$s'"
@@ -1731,15 +1725,15 @@
 msgid "%s: error in state machine"
 msgstr "%s：状态机出错"
 
-#: locale/programs/charmap.c:850 locale/programs/ld-address.c:618
-#: locale/programs/ld-collate.c:2764 locale/programs/ld-collate.c:4118
-#: locale/programs/ld-ctype.c:2253 locale/programs/ld-ctype.c:3024
-#: locale/programs/ld-identification.c:468
-#: locale/programs/ld-measurement.c:254 locale/programs/ld-messages.c:348
-#: locale/programs/ld-monetary.c:958 locale/programs/ld-name.c:323
-#: locale/programs/ld-numeric.c:384 locale/programs/ld-paper.c:257
-#: locale/programs/ld-telephone.c:329 locale/programs/ld-time.c:1237
-#: locale/programs/locfile.c:825 locale/programs/repertoire.c:324
+#: locale/programs/charmap.c:850 locale/programs/ld-address.c:544
+#: locale/programs/ld-collate.c:2623 locale/programs/ld-collate.c:3977
+#: locale/programs/ld-ctype.c:2156 locale/programs/ld-ctype.c:2927
+#: locale/programs/ld-identification.c:384
+#: locale/programs/ld-measurement.c:231 locale/programs/ld-messages.c:314
+#: locale/programs/ld-monetary.c:756 locale/programs/ld-name.c:280
+#: locale/programs/ld-numeric.c:342 locale/programs/ld-paper.c:230
+#: locale/programs/ld-telephone.c:294 locale/programs/ld-time.c:959
+#: locale/programs/locfile.c:1000 locale/programs/repertoire.c:324
 #, c-format
 msgid "%s: premature end of file"
 msgstr "%s：文件不完整"
@@ -1756,7 +1750,7 @@
 "same: %d vs %d"
 msgstr "字节序列开始和结束范围内的字节数目不同:%d vs %d"
 
-#: locale/programs/charmap.c:993 locale/programs/ld-collate.c:3044
+#: locale/programs/charmap.c:993 locale/programs/ld-collate.c:2903
 #: locale/programs/repertoire.c:419
 msgid "invalid names for character range"
 msgstr "无效的字符范围的名字"
@@ -1778,8 +1772,8 @@
 msgid "resulting bytes for range not representable."
 msgstr "范围的结果字节不具代表性"
 
-#: locale/programs/ld-address.c:135 locale/programs/ld-collate.c:1558
-#: locale/programs/ld-ctype.c:421 locale/programs/ld-identification.c:133
+#: locale/programs/ld-address.c:135 locale/programs/ld-collate.c:1565
+#: locale/programs/ld-ctype.c:462 locale/programs/ld-identification.c:133
 #: locale/programs/ld-measurement.c:94 locale/programs/ld-messages.c:97
 #: locale/programs/ld-monetary.c:193 locale/programs/ld-name.c:94
 #: locale/programs/ld-numeric.c:98 locale/programs/ld-paper.c:91
@@ -1842,535 +1836,535 @@
 msgid "%s: numeric country code `%d' not valid"
 msgstr "%s：数值国家编码“%d”无效"
 
-#: locale/programs/ld-address.c:510 locale/programs/ld-address.c:547
-#: locale/programs/ld-address.c:585 locale/programs/ld-ctype.c:2631
-#: locale/programs/ld-identification.c:364
-#: locale/programs/ld-measurement.c:221 locale/programs/ld-messages.c:301
-#: locale/programs/ld-monetary.c:700 locale/programs/ld-monetary.c:735
-#: locale/programs/ld-monetary.c:776 locale/programs/ld-name.c:280
-#: locale/programs/ld-numeric.c:263 locale/programs/ld-paper.c:224
-#: locale/programs/ld-telephone.c:288 locale/programs/ld-time.c:1126
-#: locale/programs/ld-time.c:1168
+#: locale/programs/ld-address.c:436 locale/programs/ld-address.c:473
+#: locale/programs/ld-address.c:511 locale/programs/ld-ctype.c:2534
+#: locale/programs/ld-identification.c:280
+#: locale/programs/ld-measurement.c:198 locale/programs/ld-messages.c:267
+#: locale/programs/ld-monetary.c:495 locale/programs/ld-monetary.c:530
+#: locale/programs/ld-monetary.c:571 locale/programs/ld-name.c:237
+#: locale/programs/ld-numeric.c:218 locale/programs/ld-paper.c:197
+#: locale/programs/ld-telephone.c:253 locale/programs/ld-time.c:848
+#: locale/programs/ld-time.c:890
 #, c-format
 msgid "%s: field `%s' declared more than once"
 msgstr "%s：多次声明域“%s”"
 
-#: locale/programs/ld-address.c:514 locale/programs/ld-address.c:552
-#: locale/programs/ld-identification.c:368 locale/programs/ld-messages.c:311
-#: locale/programs/ld-monetary.c:704 locale/programs/ld-monetary.c:739
-#: locale/programs/ld-name.c:284 locale/programs/ld-numeric.c:267
-#: locale/programs/ld-telephone.c:292 locale/programs/ld-time.c:1020
-#: locale/programs/ld-time.c:1089 locale/programs/ld-time.c:1131
+#: locale/programs/ld-address.c:440 locale/programs/ld-address.c:478
+#: locale/programs/ld-identification.c:284 locale/programs/ld-messages.c:277
+#: locale/programs/ld-monetary.c:499 locale/programs/ld-monetary.c:534
+#: locale/programs/ld-name.c:241 locale/programs/ld-numeric.c:222
+#: locale/programs/ld-telephone.c:257 locale/programs/ld-time.c:742
+#: locale/programs/ld-time.c:811 locale/programs/ld-time.c:853
 #, c-format
 msgid "%s: unknown character in field `%s'"
 msgstr "%s：域“%s”中含有未知字符"
 
-#: locale/programs/ld-address.c:599 locale/programs/ld-collate.c:3923
-#: locale/programs/ld-ctype.c:3004 locale/programs/ld-identification.c:449
-#: locale/programs/ld-measurement.c:235 locale/programs/ld-messages.c:330
-#: locale/programs/ld-monetary.c:940 locale/programs/ld-name.c:305
-#: locale/programs/ld-numeric.c:366 locale/programs/ld-paper.c:239
-#: locale/programs/ld-telephone.c:311 locale/programs/ld-time.c:1219
+#: locale/programs/ld-address.c:525 locale/programs/ld-collate.c:3782
+#: locale/programs/ld-ctype.c:2907 locale/programs/ld-identification.c:365
+#: locale/programs/ld-measurement.c:212 locale/programs/ld-messages.c:296
+#: locale/programs/ld-monetary.c:738 locale/programs/ld-name.c:262
+#: locale/programs/ld-numeric.c:324 locale/programs/ld-paper.c:212
+#: locale/programs/ld-telephone.c:276 locale/programs/ld-time.c:941
 #, c-format
 msgid "%s: incomplete `END' line"
 msgstr "%s：不完整的“END”行"
 
-#: locale/programs/ld-address.c:609 locale/programs/ld-collate.c:544
-#: locale/programs/ld-collate.c:596 locale/programs/ld-collate.c:892
-#: locale/programs/ld-collate.c:905 locale/programs/ld-collate.c:2733
-#: locale/programs/ld-collate.c:2754 locale/programs/ld-collate.c:4108
-#: locale/programs/ld-ctype.c:1985 locale/programs/ld-ctype.c:2243
-#: locale/programs/ld-ctype.c:2829 locale/programs/ld-ctype.c:3015
-#: locale/programs/ld-identification.c:459
-#: locale/programs/ld-measurement.c:245 locale/programs/ld-messages.c:339
-#: locale/programs/ld-monetary.c:949 locale/programs/ld-name.c:314
-#: locale/programs/ld-numeric.c:375 locale/programs/ld-paper.c:248
-#: locale/programs/ld-telephone.c:320 locale/programs/ld-time.c:1228
+#: locale/programs/ld-address.c:535 locale/programs/ld-collate.c:551
+#: locale/programs/ld-collate.c:603 locale/programs/ld-collate.c:899
+#: locale/programs/ld-collate.c:912 locale/programs/ld-collate.c:2592
+#: locale/programs/ld-collate.c:2613 locale/programs/ld-collate.c:3967
+#: locale/programs/ld-ctype.c:1888 locale/programs/ld-ctype.c:2146
+#: locale/programs/ld-ctype.c:2732 locale/programs/ld-ctype.c:2918
+#: locale/programs/ld-identification.c:375
+#: locale/programs/ld-measurement.c:222 locale/programs/ld-messages.c:305
+#: locale/programs/ld-monetary.c:747 locale/programs/ld-name.c:271
+#: locale/programs/ld-numeric.c:333 locale/programs/ld-paper.c:221
+#: locale/programs/ld-telephone.c:285 locale/programs/ld-time.c:950
 #, c-format
 msgid "%s: syntax error"
 msgstr "%s：语法错误"
 
-#: locale/programs/ld-collate.c:419
+#: locale/programs/ld-collate.c:426
 #, c-format
 msgid "`%.*s' already defined in charmap"
 msgstr "已经在字符映射表中定义了“%.*s”"
 
-#: locale/programs/ld-collate.c:428
+#: locale/programs/ld-collate.c:435
 #, c-format
 msgid "`%.*s' already defined in repertoire"
 msgstr "已经在指令表中定义了“%.*s”"
 
-#: locale/programs/ld-collate.c:435
+#: locale/programs/ld-collate.c:442
 #, c-format
 msgid "`%.*s' already defined as collating symbol"
 msgstr ""
 
-#: locale/programs/ld-collate.c:442
+#: locale/programs/ld-collate.c:449
 #, c-format
 msgid "`%.*s' already defined as collating element"
 msgstr ""
 
-#: locale/programs/ld-collate.c:473 locale/programs/ld-collate.c:499
+#: locale/programs/ld-collate.c:480 locale/programs/ld-collate.c:506
 #, c-format
 msgid "%s: `forward' and `backward' are mutually excluding each other"
 msgstr "%s：“forward”和“backward”是互斥的"
 
-#: locale/programs/ld-collate.c:483 locale/programs/ld-collate.c:509
-#: locale/programs/ld-collate.c:525
+#: locale/programs/ld-collate.c:490 locale/programs/ld-collate.c:516
+#: locale/programs/ld-collate.c:532
 #, c-format
 msgid "%s: `%s' mentioned more than once in definition of weight %d"
 msgstr ""
 
-#: locale/programs/ld-collate.c:581
+#: locale/programs/ld-collate.c:588
 #, c-format
 msgid "%s: too many rules; first entry only had %d"
 msgstr "%s：规则过多；第一个条目只含有 %d"
 
-#: locale/programs/ld-collate.c:617
+#: locale/programs/ld-collate.c:624
 #, c-format
 msgid "%s: not enough sorting rules"
 msgstr "%s：排序规则不足"
 
-#: locale/programs/ld-collate.c:782
+#: locale/programs/ld-collate.c:789
 #, c-format
 msgid "%s: empty weight string not allowed"
 msgstr "%s：不允许空权字符串"
 
-#: locale/programs/ld-collate.c:877
+#: locale/programs/ld-collate.c:884
 #, c-format
 msgid "%s: weights must use the same ellipsis symbol as the name"
 msgstr ""
 
-#: locale/programs/ld-collate.c:933
+#: locale/programs/ld-collate.c:940
 #, c-format
 msgid "%s: too many values"
 msgstr "%s：值过多"
 
-#: locale/programs/ld-collate.c:1053 locale/programs/ld-collate.c:1228
+#: locale/programs/ld-collate.c:1060 locale/programs/ld-collate.c:1235
 #, c-format
 msgid "order for `%.*s' already defined at %s:%Zu"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1103
+#: locale/programs/ld-collate.c:1110
 #, c-format
 msgid "%s: the start and the end symbol of a range must stand for characters"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1130
+#: locale/programs/ld-collate.c:1137
 #, c-format
 msgid ""
 "%s: byte sequences of first and last character must have the same length"
 msgstr "%s：字节序列的第一个和最后一个字符的长度必须相同"
 
-#: locale/programs/ld-collate.c:1172
+#: locale/programs/ld-collate.c:1179
 #, c-format
 msgid ""
 "%s: byte sequence of first character of range is not lower than that of the "
 "last character"
 msgstr "%s：范围的字节序列的第一个字符不小于最后一个字符"
 
-#: locale/programs/ld-collate.c:1297
+#: locale/programs/ld-collate.c:1304
 #, c-format
 msgid "%s: symbolic range ellipsis must not directly follow `order_start'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1301
+#: locale/programs/ld-collate.c:1308
 #, c-format
 msgid ""
 "%s: symbolic range ellipsis must not be directly followed by `order_end'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1321 locale/programs/ld-ctype.c:1502
+#: locale/programs/ld-collate.c:1328 locale/programs/ld-ctype.c:1405
 #, c-format
 msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "“%s”和“%.*s”是无效的符号范围名"
 
-#: locale/programs/ld-collate.c:1371 locale/programs/ld-collate.c:3859
+#: locale/programs/ld-collate.c:1378 locale/programs/ld-collate.c:3718
 #, c-format
 msgid "%s: order for `%.*s' already defined at %s:%Zu"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1380
+#: locale/programs/ld-collate.c:1387
 #, c-format
 msgid "%s: `%s' must be a character"
 msgstr "%s：“%s”必须是一个字符"
 
-#: locale/programs/ld-collate.c:1575
+#: locale/programs/ld-collate.c:1582
 #, c-format
 msgid ""
 "%s: `position' must be used for a specific level in all sections or none"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1600
+#: locale/programs/ld-collate.c:1607
 #, c-format
 msgid "symbol `%s' not defined"
 msgstr "符号“%s”未定义"
 
-#: locale/programs/ld-collate.c:1676 locale/programs/ld-collate.c:1782
+#: locale/programs/ld-collate.c:1683 locale/programs/ld-collate.c:1789
 #, c-format
 msgid "symbol `%s' has the same encoding as"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1680 locale/programs/ld-collate.c:1786
+#: locale/programs/ld-collate.c:1687 locale/programs/ld-collate.c:1793
 #, c-format
 msgid "symbol `%s'"
 msgstr "符号“%s”"
 
-#: locale/programs/ld-collate.c:1828
+#: locale/programs/ld-collate.c:1833
 #, c-format
 msgid "no definition of `UNDEFINED'"
 msgstr "没有关于“UNDEFINIED”的定义"
 
-#: locale/programs/ld-collate.c:1857
+#: locale/programs/ld-collate.c:1862
 #, c-format
 msgid "too many errors; giving up"
 msgstr "错误过多；放弃"
 
-#: locale/programs/ld-collate.c:2659 locale/programs/ld-collate.c:4047
+#: locale/programs/ld-collate.c:2518 locale/programs/ld-collate.c:3906
 #, c-format
 msgid "%s: nested conditionals not supported"
 msgstr "%s: 不支持嵌套条件"
 
-#: locale/programs/ld-collate.c:2677
+#: locale/programs/ld-collate.c:2536
 #, c-format
-msgid "%s: more then one 'else'"
-msgstr "%s: 多于一个'else'"
+msgid "%s: more than one 'else'"
+msgstr ""
 
-#: locale/programs/ld-collate.c:2852
+#: locale/programs/ld-collate.c:2711
 #, c-format
 msgid "%s: duplicate definition of `%s'"
 msgstr "%s：重复定义“%s”"
 
-#: locale/programs/ld-collate.c:2888
+#: locale/programs/ld-collate.c:2747
 #, c-format
 msgid "%s: duplicate declaration of section `%s'"
 msgstr "%s：重复声明节“%s”"
 
-#: locale/programs/ld-collate.c:3024
+#: locale/programs/ld-collate.c:2883
 #, c-format
 msgid "%s: unknown character in collating symbol name"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3153
+#: locale/programs/ld-collate.c:3012
 #, c-format
 msgid "%s: unknown character in equivalent definition name"
 msgstr "%s：等价定义名中未知的字符"
 
-#: locale/programs/ld-collate.c:3164
+#: locale/programs/ld-collate.c:3023
 #, c-format
 msgid "%s: unknown character in equivalent definition value"
 msgstr "%s：等价定义值中未知的字符"
 
-#: locale/programs/ld-collate.c:3174
+#: locale/programs/ld-collate.c:3033
 #, c-format
 msgid "%s: unknown symbol `%s' in equivalent definition"
 msgstr "%s：等价定义中未知的符号“%s”"
 
-#: locale/programs/ld-collate.c:3183
+#: locale/programs/ld-collate.c:3042
 msgid "error while adding equivalent collating symbol"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3221
+#: locale/programs/ld-collate.c:3080
 #, c-format
 msgid "duplicate definition of script `%s'"
 msgstr "重复定义脚本“%s”"
 
-#: locale/programs/ld-collate.c:3269
+#: locale/programs/ld-collate.c:3128
 #, c-format
 msgid "%s: unknown section name `%.*s'"
 msgstr "%s：未知的节名“%.*s”"
 
-#: locale/programs/ld-collate.c:3298
+#: locale/programs/ld-collate.c:3157
 #, c-format
 msgid "%s: multiple order definitions for section `%s'"
 msgstr "%s：关于“%s”节出现多个顺序定义"
 
-#: locale/programs/ld-collate.c:3326
+#: locale/programs/ld-collate.c:3185
 #, c-format
 msgid "%s: invalid number of sorting rules"
 msgstr "%s：排序规则的数量无效"
 
-#: locale/programs/ld-collate.c:3353
+#: locale/programs/ld-collate.c:3212
 #, c-format
 msgid "%s: multiple order definitions for unnamed section"
 msgstr "%s：关于未命名节出现多个顺序定义"
 
-#: locale/programs/ld-collate.c:3408 locale/programs/ld-collate.c:3538
-#: locale/programs/ld-collate.c:3901
+#: locale/programs/ld-collate.c:3267 locale/programs/ld-collate.c:3397
+#: locale/programs/ld-collate.c:3760
 #, c-format
 msgid "%s: missing `order_end' keyword"
 msgstr "%s：遗漏关键字“order_end”"
 
-#: locale/programs/ld-collate.c:3471
+#: locale/programs/ld-collate.c:3330
 #, c-format
 msgid "%s: order for collating symbol %.*s not yet defined"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3489
+#: locale/programs/ld-collate.c:3348
 #, c-format
 msgid "%s: order for collating element %.*s not yet defined"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3500
+#: locale/programs/ld-collate.c:3359
 #, c-format
 msgid "%s: cannot reorder after %.*s: symbol not known"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3552 locale/programs/ld-collate.c:3913
+#: locale/programs/ld-collate.c:3411 locale/programs/ld-collate.c:3772
 #, c-format
 msgid "%s: missing `reorder-end' keyword"
 msgstr "%s：以后关键字“reorder-end”"
 
-#: locale/programs/ld-collate.c:3586 locale/programs/ld-collate.c:3784
+#: locale/programs/ld-collate.c:3445 locale/programs/ld-collate.c:3643
 #, c-format
 msgid "%s: section `%.*s' not known"
 msgstr "%s：未知的节“%.*s”"
 
-#: locale/programs/ld-collate.c:3651
+#: locale/programs/ld-collate.c:3510
 #, c-format
 msgid "%s: bad symbol <%.*s>"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3847
+#: locale/programs/ld-collate.c:3706
 #, c-format
 msgid "%s: cannot have `%s' as end of ellipsis range"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3897
+#: locale/programs/ld-collate.c:3756
 #, c-format
 msgid "%s: empty category description not allowed"
 msgstr "%s：不允许空范畴描述"
 
-#: locale/programs/ld-collate.c:3916
+#: locale/programs/ld-collate.c:3775
 #, c-format
 msgid "%s: missing `reorder-sections-end' keyword"
 msgstr "%s：遗漏关键字“reorder-sections-end”"
 
-#: locale/programs/ld-collate.c:4080
+#: locale/programs/ld-collate.c:3939
 #, c-format
 msgid "%s: '%s' without matching 'ifdef' or 'ifndef'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:4098
+#: locale/programs/ld-collate.c:3957
 #, c-format
 msgid "%s: 'endif' without matching 'ifdef' or 'ifndef'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:440
+#: locale/programs/ld-ctype.c:481
 #, c-format
 msgid "No character set name specified in charmap"
 msgstr "字符映射表中未给出字符集名称"
 
-#: locale/programs/ld-ctype.c:469
+#: locale/programs/ld-ctype.c:510
 #, c-format
 msgid "character L'\\u%0*x' in class `%s' must be in class `%s'"
 msgstr ""
 
 # msgstr "类“%2$s”中的字符 L'\\u%0*x' 必须属于类“%3$s”"
-#: locale/programs/ld-ctype.c:484
+#: locale/programs/ld-ctype.c:525
 #, c-format
 msgid "character L'\\u%0*x' in class `%s' must not be in class `%s'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:498 locale/programs/ld-ctype.c:556
+#: locale/programs/ld-ctype.c:539 locale/programs/ld-ctype.c:597
 #, c-format
 msgid "internal error in %s, line %u"
 msgstr "在 %s 的第 %u 行出现内部错误"
 
-#: locale/programs/ld-ctype.c:527
+#: locale/programs/ld-ctype.c:568
 #, c-format
 msgid "character '%s' in class `%s' must be in class `%s'"
 msgstr "类“%2$s”中的字符“%1$s”必须属于类“%3$s”"
 
-#: locale/programs/ld-ctype.c:543
+#: locale/programs/ld-ctype.c:584
 #, c-format
 msgid "character '%s' in class `%s' must not be in class `%s'"
 msgstr "类“%2$s”中的字符“%1$s”不得属于类“%3$s”"
 
-#: locale/programs/ld-ctype.c:573 locale/programs/ld-ctype.c:611
+#: locale/programs/ld-ctype.c:614 locale/programs/ld-ctype.c:652
 #, c-format
 msgid "<SP> character not in class `%s'"
 msgstr "字符 <SP> 不在类“%s”中"
 
-#: locale/programs/ld-ctype.c:585 locale/programs/ld-ctype.c:622
+#: locale/programs/ld-ctype.c:626 locale/programs/ld-ctype.c:663
 #, c-format
 msgid "<SP> character must not be in class `%s'"
 msgstr "字符 <SP> 不能属于类“%s”"
 
-#: locale/programs/ld-ctype.c:600
+#: locale/programs/ld-ctype.c:641
 #, c-format
 msgid "character <SP> not defined in character map"
 msgstr "字符映射中未定义字符 <SP>"
 
-#: locale/programs/ld-ctype.c:736
+#: locale/programs/ld-ctype.c:777
 #, c-format
 msgid "`digit' category has not entries in groups of ten"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:785
+#: locale/programs/ld-ctype.c:826
 #, c-format
 msgid "no input digits defined and none of the standard names in the charmap"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:850
+#: locale/programs/ld-ctype.c:891
 #, c-format
 msgid "not all characters used in `outdigit' are available in the charmap"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:867
+#: locale/programs/ld-ctype.c:908
 #, c-format
 msgid "not all characters used in `outdigit' are available in the repertoire"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1270
+#: locale/programs/ld-ctype.c:1173
 #, c-format
 msgid "character class `%s' already defined"
 msgstr "字符类“%s”已定义"
 
-#: locale/programs/ld-ctype.c:1276
+#: locale/programs/ld-ctype.c:1179
 #, c-format
 msgid "implementation limit: no more than %Zd character classes allowed"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1302
+#: locale/programs/ld-ctype.c:1205
 #, c-format
 msgid "character map `%s' already defined"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1308
+#: locale/programs/ld-ctype.c:1211
 #, c-format
 msgid "implementation limit: no more than %d character maps allowed"
 msgstr "实现限制：不得多于 %d 个字符映射表"
 
-#: locale/programs/ld-ctype.c:1573 locale/programs/ld-ctype.c:1698
-#: locale/programs/ld-ctype.c:1804 locale/programs/ld-ctype.c:2494
-#: locale/programs/ld-ctype.c:3490
+#: locale/programs/ld-ctype.c:1476 locale/programs/ld-ctype.c:1601
+#: locale/programs/ld-ctype.c:1707 locale/programs/ld-ctype.c:2397
+#: locale/programs/ld-ctype.c:3393
 #, c-format
 msgid "%s: field `%s' does not contain exactly ten entries"
 msgstr "%s：域“%s”含有条目的个数不是十个"
 
-#: locale/programs/ld-ctype.c:1601 locale/programs/ld-ctype.c:2175
+#: locale/programs/ld-ctype.c:1504 locale/programs/ld-ctype.c:2078
 #, c-format
 msgid "to-value <U%0*X> of range is smaller than from-value <U%0*X>"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1728
+#: locale/programs/ld-ctype.c:1631
 msgid "start and end character sequence of range must have the same length"
 msgstr "范围的起始和终止字符序列必须具有相同的长度"
 
-#: locale/programs/ld-ctype.c:1735
+#: locale/programs/ld-ctype.c:1638
 msgid "to-value character sequence is smaller than from-value sequence"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2095 locale/programs/ld-ctype.c:2146
+#: locale/programs/ld-ctype.c:1998 locale/programs/ld-ctype.c:2049
 msgid "premature end of `translit_ignore' definition"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2101 locale/programs/ld-ctype.c:2152
-#: locale/programs/ld-ctype.c:2194
+#: locale/programs/ld-ctype.c:2004 locale/programs/ld-ctype.c:2055
+#: locale/programs/ld-ctype.c:2097
 msgid "syntax error"
 msgstr "语法错误"
 
-#: locale/programs/ld-ctype.c:2327
+#: locale/programs/ld-ctype.c:2230
 #, c-format
 msgid "%s: syntax error in definition of new character class"
 msgstr "%s：在定义新字符集合中出现语法错误"
 
-#: locale/programs/ld-ctype.c:2342
+#: locale/programs/ld-ctype.c:2245
 #, c-format
 msgid "%s: syntax error in definition of new character map"
 msgstr "%s：在新字符映射中出现语法错误"
 
-#: locale/programs/ld-ctype.c:2516
+#: locale/programs/ld-ctype.c:2419
 msgid "ellipsis range must be marked by two operands of same type"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2525
+#: locale/programs/ld-ctype.c:2428
 msgid ""
 "with symbolic name range values the absolute ellipsis `...' must not be used"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2540
+#: locale/programs/ld-ctype.c:2443
 msgid ""
 "with UCS range values one must use the hexadecimal symbolic ellipsis `..'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2554
+#: locale/programs/ld-ctype.c:2457
 msgid ""
 "with character code range values one must use the absolute ellipsis `...'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2705
+#: locale/programs/ld-ctype.c:2608
 #, c-format
 msgid "duplicated definition for mapping `%s'"
 msgstr "重复定义映射“%s”"
 
-#: locale/programs/ld-ctype.c:2791 locale/programs/ld-ctype.c:2935
+#: locale/programs/ld-ctype.c:2694 locale/programs/ld-ctype.c:2838
 #, c-format
 msgid "%s: `translit_start' section does not end with `translit_end'"
 msgstr "%s：“translit_start”节不以“translit_end”结束"
 
-#: locale/programs/ld-ctype.c:2886
+#: locale/programs/ld-ctype.c:2789
 #, c-format
 msgid "%s: duplicate `default_missing' definition"
 msgstr "%s：重复定义“default_missing”"
 
-#: locale/programs/ld-ctype.c:2891
+#: locale/programs/ld-ctype.c:2794
 msgid "previous definition was here"
 msgstr "前一个定义在这里"
 
-#: locale/programs/ld-ctype.c:2913
+#: locale/programs/ld-ctype.c:2816
 #, c-format
 msgid "%s: no representable `default_missing' definition found"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:3066 locale/programs/ld-ctype.c:3150
-#: locale/programs/ld-ctype.c:3170 locale/programs/ld-ctype.c:3191
-#: locale/programs/ld-ctype.c:3212 locale/programs/ld-ctype.c:3233
-#: locale/programs/ld-ctype.c:3254 locale/programs/ld-ctype.c:3294
-#: locale/programs/ld-ctype.c:3315 locale/programs/ld-ctype.c:3382
-#: locale/programs/ld-ctype.c:3424 locale/programs/ld-ctype.c:3449
+#: locale/programs/ld-ctype.c:2969 locale/programs/ld-ctype.c:3053
+#: locale/programs/ld-ctype.c:3073 locale/programs/ld-ctype.c:3094
+#: locale/programs/ld-ctype.c:3115 locale/programs/ld-ctype.c:3136
+#: locale/programs/ld-ctype.c:3157 locale/programs/ld-ctype.c:3197
+#: locale/programs/ld-ctype.c:3218 locale/programs/ld-ctype.c:3285
+#: locale/programs/ld-ctype.c:3327 locale/programs/ld-ctype.c:3352
 #, c-format
 msgid "%s: character `%s' not defined while needed as default value"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:3071 locale/programs/ld-ctype.c:3155
-#: locale/programs/ld-ctype.c:3175 locale/programs/ld-ctype.c:3196
-#: locale/programs/ld-ctype.c:3217 locale/programs/ld-ctype.c:3238
-#: locale/programs/ld-ctype.c:3259 locale/programs/ld-ctype.c:3299
-#: locale/programs/ld-ctype.c:3320 locale/programs/ld-ctype.c:3387
+#: locale/programs/ld-ctype.c:2974 locale/programs/ld-ctype.c:3058
+#: locale/programs/ld-ctype.c:3078 locale/programs/ld-ctype.c:3099
+#: locale/programs/ld-ctype.c:3120 locale/programs/ld-ctype.c:3141
+#: locale/programs/ld-ctype.c:3162 locale/programs/ld-ctype.c:3202
+#: locale/programs/ld-ctype.c:3223 locale/programs/ld-ctype.c:3290
 #, c-format
 msgid "%s: character `%s' in charmap not representable with one byte"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:3431 locale/programs/ld-ctype.c:3456
+#: locale/programs/ld-ctype.c:3334 locale/programs/ld-ctype.c:3359
 #, c-format
 msgid ""
 "%s: character `%s' needed as default value not representable with one byte"
 msgstr "%s：需要作为默认值的字符“%s”无法以单个字节来表示"
 
-#: locale/programs/ld-ctype.c:3512
+#: locale/programs/ld-ctype.c:3415
 #, c-format
 msgid ""
 "no output digits defined and none of the standard names in the charmap"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:3803
+#: locale/programs/ld-ctype.c:3662
 #, c-format
 msgid "%s: transliteration data from locale `%s' not available"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:3904
+#: locale/programs/ld-ctype.c:3762
 #, c-format
 msgid "%s: table for class \"%s\": %lu bytes\n"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:3973
+#: locale/programs/ld-ctype.c:3827
 #, c-format
 msgid "%s: table for map \"%s\": %lu bytes\n"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:4106
+#: locale/programs/ld-ctype.c:3956
 #, c-format
 msgid "%s: table for width: %lu bytes\n"
 msgstr ""
@@ -2380,7 +2374,7 @@
 msgid "%s: no identification for category `%s'"
 msgstr ""
 
-#: locale/programs/ld-identification.c:435
+#: locale/programs/ld-identification.c:351
 #, c-format
 msgid "%s: duplicate category version definition"
 msgstr ""
@@ -2423,22 +2417,22 @@
 msgid "%s: value for field `%s' must be in range %d...%d"
 msgstr "%s：“%s”域的值必须在 %d...%d 的范围内"
 
-#: locale/programs/ld-monetary.c:746 locale/programs/ld-numeric.c:274
+#: locale/programs/ld-monetary.c:541 locale/programs/ld-numeric.c:229
 #, c-format
 msgid "%s: value for field `%s' must be a single character"
 msgstr "%s：“%s”域的值必须是单个字符"
 
-#: locale/programs/ld-monetary.c:843 locale/programs/ld-numeric.c:318
+#: locale/programs/ld-monetary.c:638 locale/programs/ld-numeric.c:273
 #, c-format
 msgid "%s: `-1' must be last entry in `%s' field"
 msgstr "%s：“-1”必须是“%s”域中的最后一个条目"
 
-#: locale/programs/ld-monetary.c:865 locale/programs/ld-numeric.c:335
+#: locale/programs/ld-monetary.c:660 locale/programs/ld-numeric.c:290
 #, c-format
 msgid "%s: values for field `%s' must be smaller than 127"
 msgstr "%s：域“%s”的值必须小于 127"
 
-#: locale/programs/ld-monetary.c:908
+#: locale/programs/ld-monetary.c:706
 msgid "conversion rate value cannot be zero"
 msgstr "转换率的值不能为 0"
 
@@ -2515,16 +2509,16 @@
 msgid "%s: values for field `%s' must not be larger than %d"
 msgstr "%s：域“%s”的值不能大于 %d"
 
-#: locale/programs/ld-time.c:1004
+#: locale/programs/ld-time.c:726
 #, c-format
 msgid "%s: too few values for field `%s'"
 msgstr "%s：域“%s”的值过少"
 
-#: locale/programs/ld-time.c:1049
+#: locale/programs/ld-time.c:771
 msgid "extra trailing semicolon"
 msgstr "多余的终止分号"
 
-#: locale/programs/ld-time.c:1052
+#: locale/programs/ld-time.c:774
 #, c-format
 msgid "%s: too many values for field `%s'"
 msgstr "%s：域“%s”的值过多"
@@ -2635,79 +2629,87 @@
 msgid "while preparing output"
 msgstr "准备输出时"
 
-#: locale/programs/localedef.c:119
+#: locale/programs/localedef.c:121
 msgid "Input Files:"
 msgstr "输入文件："
 
-#: locale/programs/localedef.c:121
+#: locale/programs/localedef.c:123
 msgid "Symbolic character names defined in FILE"
 msgstr ""
 
-#: locale/programs/localedef.c:123
+#: locale/programs/localedef.c:125
 msgid "Source definitions are found in FILE"
 msgstr "在 FILE 中找到源定义"
 
-#: locale/programs/localedef.c:125
+#: locale/programs/localedef.c:127
 msgid "FILE contains mapping from symbolic names to UCS4 values"
 msgstr ""
 
-#: locale/programs/localedef.c:129
+#: locale/programs/localedef.c:131
 msgid "Create output even if warning messages were issued"
 msgstr "即使出现警告消息也创建输出"
 
-#: locale/programs/localedef.c:130
+#: locale/programs/localedef.c:132
 msgid "Create old-style tables"
 msgstr "创建旧风格表格"
 
-#: locale/programs/localedef.c:131
+#: locale/programs/localedef.c:133
 msgid "Optional output file prefix"
 msgstr "可选的输出文件前缀"
 
-#: locale/programs/localedef.c:132
+#: locale/programs/localedef.c:134
 msgid "Strictly conform to POSIX"
 msgstr ""
 
-#: locale/programs/localedef.c:134
+#: locale/programs/localedef.c:136
 msgid "Suppress warnings and information messages"
 msgstr "关闭警告和信息消息"
 
-#: locale/programs/localedef.c:135
+#: locale/programs/localedef.c:137
 msgid "Print more messages"
 msgstr "打印更多消息"
 
-#: locale/programs/localedef.c:136
+#: locale/programs/localedef.c:138
 msgid "Archive control:"
 msgstr "归档控制："
 
-#: locale/programs/localedef.c:138
+#: locale/programs/localedef.c:140
 msgid "Don't add new data to archive"
 msgstr "不要将新数据添加到归档文件中"
 
-#: locale/programs/localedef.c:140
+#: locale/programs/localedef.c:142
 msgid "Add locales named by parameters to archive"
 msgstr "将由参数命名的区域添加到归档文件中"
 
-#: locale/programs/localedef.c:141
+#: locale/programs/localedef.c:143
 msgid "Replace existing archive content"
 msgstr "替换现有的归档文件内容"
 
-#: locale/programs/localedef.c:143
+#: locale/programs/localedef.c:145
 msgid "Remove locales named by parameters from archive"
 msgstr "从归档文件中删除由参数命名的区域"
 
-#: locale/programs/localedef.c:144
+#: locale/programs/localedef.c:146
 msgid "List content of archive"
 msgstr "列出归档文件的内容"
 
-#: locale/programs/localedef.c:146
+#: locale/programs/localedef.c:148
 msgid "locale.alias file to consult when making archive"
 msgstr "在制作归档文件时参考 locale.alias 文件"
 
-#: locale/programs/localedef.c:151
+#: locale/programs/localedef.c:150
+msgid "Generate little-endian output"
+msgstr ""
+
+#: locale/programs/localedef.c:152
+msgid "Generate big-endian output"
+msgstr ""
+
+#: locale/programs/localedef.c:157
 msgid "Compile locale specification"
 msgstr "编译区域规范"
 
-#: locale/programs/localedef.c:154
+#: locale/programs/localedef.c:160
 msgid ""
 "NAME\n"
 "[--add-to-archive|--delete-from-archive] FILE...\n"
@@ -2717,28 +2719,28 @@
 "[--add-to-archive|--delete-from-archive] 文件...\n"
 "--list-archive [文件]"
 
-#: locale/programs/localedef.c:229
+#: locale/programs/localedef.c:235
 #, c-format
 msgid "cannot create directory for output files"
 msgstr "无法为输出文件创建目录"
 
-#: locale/programs/localedef.c:240
+#: locale/programs/localedef.c:246
 #, c-format
 msgid "FATAL: system does not define `_POSIX2_LOCALEDEF'"
 msgstr "致命错误：系统未定义“_POSIX2_LOCALEDEF”"
 
-#: locale/programs/localedef.c:254 locale/programs/localedef.c:270
-#: locale/programs/localedef.c:602 locale/programs/localedef.c:622
+#: locale/programs/localedef.c:260 locale/programs/localedef.c:276
+#: locale/programs/localedef.c:614 locale/programs/localedef.c:634
 #, c-format
 msgid "cannot open locale definition file `%s'"
 msgstr "无法打开区域定义文件“%s”"
 
-#: locale/programs/localedef.c:282
+#: locale/programs/localedef.c:288
 #, c-format
 msgid "cannot write output files to `%s'"
 msgstr "无法将输出文件写入“%s”"
 
-#: locale/programs/localedef.c:368
+#: locale/programs/localedef.c:380
 #, c-format
 msgid ""
 "System's directory for character maps : %s\n"
@@ -2747,186 +2749,186 @@
 "%s"
 msgstr ""
 
-#: locale/programs/localedef.c:570
+#: locale/programs/localedef.c:582
 #, c-format
 msgid "circular dependencies between locale definitions"
 msgstr "区域定义中的循环倚赖"
 
-#: locale/programs/localedef.c:576
+#: locale/programs/localedef.c:588
 #, c-format
 msgid "cannot add already read locale `%s' a second time"
 msgstr "无法再次添加已经读入的“%s”"
 
-#: locale/programs/locarchive.c:125 locale/programs/locarchive.c:367
+#: locale/programs/locarchive.c:133 locale/programs/locarchive.c:380
 #, c-format
 msgid "cannot create temporary file: %s"
 msgstr ""
 
-#: locale/programs/locarchive.c:155 locale/programs/locarchive.c:413
+#: locale/programs/locarchive.c:167 locale/programs/locarchive.c:430
 #, c-format
 msgid "cannot initialize archive file"
 msgstr "无法初始化归档文件"
 
-#: locale/programs/locarchive.c:162 locale/programs/locarchive.c:420
+#: locale/programs/locarchive.c:174 locale/programs/locarchive.c:437
 #, c-format
 msgid "cannot resize archive file"
 msgstr "无法改变归档文件的大小"
 
-#: locale/programs/locarchive.c:177 locale/programs/locarchive.c:435
-#: locale/programs/locarchive.c:645
+#: locale/programs/locarchive.c:189 locale/programs/locarchive.c:452
+#: locale/programs/locarchive.c:674
 #, c-format
 msgid "cannot map archive header"
 msgstr "无法映射归档文件头"
 
-#: locale/programs/locarchive.c:199
+#: locale/programs/locarchive.c:211
 #, c-format
 msgid "failed to create new locale archive"
 msgstr "无法创建新区域归档文件"
 
-#: locale/programs/locarchive.c:211
+#: locale/programs/locarchive.c:223
 #, c-format
 msgid "cannot change mode of new locale archive"
 msgstr "无法改变新归档文件的模式"
 
-#: locale/programs/locarchive.c:311
+#: locale/programs/locarchive.c:324
 #, c-format
 msgid "cannot read data from locale archive"
 msgstr ""
 
-#: locale/programs/locarchive.c:342
+#: locale/programs/locarchive.c:355
 #, c-format
 msgid "cannot map locale archive file"
 msgstr "无法映射区域归档文件"
 
-#: locale/programs/locarchive.c:443
+#: locale/programs/locarchive.c:460
 #, c-format
 msgid "cannot lock new archive"
 msgstr "无法锁定新归档文件"
 
-#: locale/programs/locarchive.c:509
+#: locale/programs/locarchive.c:529
 #, c-format
 msgid "cannot extend locale archive file"
 msgstr "无法扩展区域归档文件"
 
-#: locale/programs/locarchive.c:518
+#: locale/programs/locarchive.c:538
 #, c-format
 msgid "cannot change mode of resized locale archive"
 msgstr "无法改变过大小的区域归档文件的模式"
 
-#: locale/programs/locarchive.c:526
+#: locale/programs/locarchive.c:546
 #, c-format
 msgid "cannot rename new archive"
 msgstr "无法改变新归档文件的名称"
 
-#: locale/programs/locarchive.c:579
+#: locale/programs/locarchive.c:608
 #, c-format
 msgid "cannot open locale archive \"%s\""
 msgstr "无法打开区域归档文件“%s”"
 
-#: locale/programs/locarchive.c:584
+#: locale/programs/locarchive.c:613
 #, c-format
 msgid "cannot stat locale archive \"%s\""
 msgstr "无法对区域归档文件“%s”进行 stat() 操作"
 
-#: locale/programs/locarchive.c:603
+#: locale/programs/locarchive.c:632
 #, c-format
 msgid "cannot lock locale archive \"%s\""
 msgstr "无法锁定区域归档文件“%s”"
 
-#: locale/programs/locarchive.c:626
+#: locale/programs/locarchive.c:655
 #, c-format
 msgid "cannot read archive header"
 msgstr "无法读入归档文件头"
 
-#: locale/programs/locarchive.c:697
+#: locale/programs/locarchive.c:728
 #, c-format
 msgid "locale '%s' already exists"
 msgstr "区域“%s”已存在"
 
-#: locale/programs/locarchive.c:959 locale/programs/locarchive.c:974
-#: locale/programs/locarchive.c:986 locale/programs/locarchive.c:998
-#: locale/programs/locfile.c:343
+#: locale/programs/locarchive.c:1003 locale/programs/locarchive.c:1018
+#: locale/programs/locarchive.c:1030 locale/programs/locarchive.c:1042
+#: locale/programs/locfile.c:350
 #, c-format
 msgid "cannot add to locale archive"
 msgstr "无法添加到区域归档文件"
 
-#: locale/programs/locarchive.c:1156
+#: locale/programs/locarchive.c:1206
 #, c-format
 msgid "locale alias file `%s' not found"
 msgstr "找不到区域别名文件“%s”"
 
-#: locale/programs/locarchive.c:1306
+#: locale/programs/locarchive.c:1357
 #, c-format
 msgid "Adding %s\n"
 msgstr "正在添加 %s\n"
 
-#: locale/programs/locarchive.c:1312
+#: locale/programs/locarchive.c:1363
 #, c-format
 msgid "stat of \"%s\" failed: %s: ignored"
 msgstr "无法对“%s”运行 stat：%s：忽略"
 
-#: locale/programs/locarchive.c:1318
+#: locale/programs/locarchive.c:1369
 #, c-format
 msgid "\"%s\" is no directory; ignored"
 msgstr "“%s”不是目录；忽略"
 
-#: locale/programs/locarchive.c:1325
+#: locale/programs/locarchive.c:1376
 #, c-format
 msgid "cannot open directory \"%s\": %s: ignored"
 msgstr "无法打开目录“%s”：%s：忽略"
 
-#: locale/programs/locarchive.c:1397
+#: locale/programs/locarchive.c:1448
 #, c-format
 msgid "incomplete set of locale files in \"%s\""
 msgstr "“%s”中的区域文件不完整"
 
-#: locale/programs/locarchive.c:1461
+#: locale/programs/locarchive.c:1512
 #, c-format
 msgid "cannot read all files in \"%s\": ignored"
 msgstr "无法读入“%s”中的所有文件：忽略"
 
-#: locale/programs/locarchive.c:1531
+#: locale/programs/locarchive.c:1584
 #, c-format
 msgid "locale \"%s\" not in archive"
 msgstr "区域“%s”在归档文件中"
 
-#: locale/programs/locfile.c:131
+#: locale/programs/locfile.c:137
 #, c-format
 msgid "argument to `%s' must be a single character"
 msgstr "“%s”的参数必须是单个字符"
 
-#: locale/programs/locfile.c:251
+#: locale/programs/locfile.c:257
 msgid "syntax error: not inside a locale definition section"
 msgstr "语法错误：不在区域定义节之中"
 
-#: locale/programs/locfile.c:625
+#: locale/programs/locfile.c:800
 #, c-format
 msgid "cannot open output file `%s' for category `%s'"
 msgstr "无法为范畴“%2$s”打开输出文件“%1$s”"
 
-#: locale/programs/locfile.c:649
+#: locale/programs/locfile.c:824
 #, c-format
 msgid "failure while writing data for category `%s'"
 msgstr "为范畴“%s”写入数据失败"
 
-#: locale/programs/locfile.c:745
+#: locale/programs/locfile.c:920
 #, c-format
 msgid "cannot create output file `%s' for category `%s'"
 msgstr "无法为范畴“%2$s”创建输出文件“%1$s”"
 
-#: locale/programs/locfile.c:781
+#: locale/programs/locfile.c:956
 msgid "expecting string argument for `copy'"
 msgstr ""
 
-#: locale/programs/locfile.c:785
+#: locale/programs/locfile.c:960
 msgid "locale name should consist only of portable characters"
 msgstr "区域名称应该仅由可移植的字符组成"
 
-#: locale/programs/locfile.c:804
+#: locale/programs/locfile.c:979
 msgid "no other keyword shall be specified when `copy' is used"
 msgstr "使用“copy”时不应再使用其它关键字"
 
-#: locale/programs/locfile.c:818
+#: locale/programs/locfile.c:993
 #, c-format
 msgid "`%1$s' definition does not end with `END %1$s'"
 msgstr "对“%1$s”的定义并不以“END %1%s”结束"
@@ -2979,23 +2981,23 @@
 msgid "needs to be installed setuid `root'"
 msgstr ""
 
-#: malloc/mcheck.c:347
+#: malloc/mcheck.c:346
 msgid "memory is consistent, library is buggy\n"
 msgstr "内存不一致，库有错误\n"
 
-#: malloc/mcheck.c:350
+#: malloc/mcheck.c:349
 msgid "memory clobbered before allocated block\n"
 msgstr ""
 
-#: malloc/mcheck.c:353
+#: malloc/mcheck.c:352
 msgid "memory clobbered past end of allocated block\n"
 msgstr ""
 
-#: malloc/mcheck.c:356
+#: malloc/mcheck.c:355
 msgid "block freed twice\n"
 msgstr "块释放了两次\n"
 
-#: malloc/mcheck.c:359
+#: malloc/mcheck.c:358
 msgid "bogus mcheck_status, library is buggy\n"
 msgstr ""
 
@@ -3738,12 +3740,12 @@
 msgid "yp_update: cannot get server address\n"
 msgstr "yp_update：无法获取服务器地址\n"
 
-#: nscd/aicache.c:82 nscd/hstcache.c:494
+#: nscd/aicache.c:83 nscd/hstcache.c:494
 #, c-format
 msgid "Haven't found \"%s\" in hosts cache!"
 msgstr "无法在主机缓冲区中找到“%s”！"
 
-#: nscd/aicache.c:84 nscd/hstcache.c:496
+#: nscd/aicache.c:85 nscd/hstcache.c:496
 #, c-format
 msgid "Reloading \"%s\" in hosts cache!"
 msgstr "在主机缓冲区中重新加载“%s”！"
@@ -3995,7 +3997,7 @@
 msgid "setgroups failed"
 msgstr "setgroups 失败"
 
-#: nscd/grpcache.c:413 nscd/hstcache.c:441 nscd/initgrcache.c:419
+#: nscd/grpcache.c:413 nscd/hstcache.c:441 nscd/initgrcache.c:418
 #: nscd/pwdcache.c:391 nscd/servicescache.c:346
 #, c-format
 msgid "short write in %s: %s"
@@ -4026,22 +4028,22 @@
 msgid "no more memory for database '%s'"
 msgstr ""
 
-#: nscd/netgroupcache.c:77
+#: nscd/netgroupcache.c:126
 #, c-format
 msgid "Haven't found \"%s\" in netgroup cache!"
 msgstr ""
 
-#: nscd/netgroupcache.c:79
+#: nscd/netgroupcache.c:128
 #, c-format
 msgid "Reloading \"%s\" in netgroup cache!"
 msgstr ""
 
-#: nscd/netgroupcache.c:475
+#: nscd/netgroupcache.c:509
 #, c-format
 msgid "Haven't found \"%s (%s,%s,%s)\" in netgroup cache!"
 msgstr ""
 
-#: nscd/netgroupcache.c:478
+#: nscd/netgroupcache.c:512
 #, c-format
 msgid "Reloading \"%s (%s,%s,%s)\" in netgroup cache!"
 msgstr ""
@@ -4094,7 +4096,7 @@
 msgid "Name Service Cache Daemon."
 msgstr ""
 
-#: nscd/nscd.c:164 nss/getent.c:999 nss/makedb.c:206
+#: nscd/nscd.c:164 nss/getent.c:1003 nss/makedb.c:206
 #, c-format
 msgid "wrong number of arguments"
 msgstr "参数个数错误"
@@ -4153,6 +4155,16 @@
 msgid "secure services not implemented anymore"
 msgstr ""
 
+#: nscd/nscd.c:462
+#, c-format
+msgid ""
+"Supported tables:\n"
+"%s\n"
+"\n"
+"For bug reporting instructions, please see:\n"
+"%s.\n"
+msgstr ""
+
 #: nscd/nscd_conf.c:57
 #, c-format
 msgid "database %s is not supported"
@@ -4432,16 +4444,16 @@
 msgid "Enumeration not supported on %s\n"
 msgstr "%s 不支持枚举\n"
 
-#: nss/getent.c:913
+#: nss/getent.c:917
 #, c-format
 msgid "Unknown database name"
 msgstr "未知的数据库名"
 
-#: nss/getent.c:943
+#: nss/getent.c:947
 msgid "Supported databases:\n"
 msgstr "支持的数据库：\n"
 
-#: nss/getent.c:1009
+#: nss/getent.c:1013
 #, c-format
 msgid "Unknown database: %s\n"
 msgstr "未知的数据库：%s\n"
@@ -4877,7 +4889,7 @@
 msgstr ""
 
 #: stdio-common/psiginfo-data.h:37
-msgid "Child hat terminated abnormally and created a core file"
+msgid "Child has terminated abnormally and created a core file"
 msgstr ""
 
 #: stdio-common/psiginfo-data.h:38
@@ -5388,8 +5400,23 @@
 msgid "-Y path\t\tdirectory name to find C preprocessor (cpp)\n"
 msgstr ""
 
+#: sunrpc/rpc_main.c:1445
+#, c-format
+msgid "-5\t\tSysVr4 compatibility mode\n"
+msgstr ""
+
 #: sunrpc/rpc_main.c:1446
 #, c-format
+msgid "--help\t\tgive this help list\n"
+msgstr ""
+
+#: sunrpc/rpc_main.c:1447
+#, c-format
+msgid "--version\tprint program version\n"
+msgstr ""
+
+#: sunrpc/rpc_main.c:1449
+#, c-format
 msgid ""
 "\n"
 "For bug reporting instructions, please see:\n"
@@ -6658,71 +6685,70 @@
 msgid "cannot read header from `%s'"
 msgstr "无法从“%s”中读入头"
 
-#: timezone/zdump.c:246
+#: timezone/zdump.c:280
 msgid "lacks alphabetic at start"
 msgstr "在开头缺少字母"
 
-#: timezone/zdump.c:248
+#: timezone/zdump.c:282
 msgid "has fewer than 3 alphabetics"
 msgstr "少于3个字母"
 
-#: timezone/zdump.c:250
+#: timezone/zdump.c:284
 msgid "has more than 6 alphabetics"
 msgstr "超过6个字母"
 
-#: timezone/zdump.c:258
+#: timezone/zdump.c:292
 msgid "differs from POSIX standard"
 msgstr "与 POSIX 标准的不同"
 
-#: timezone/zdump.c:264
+#: timezone/zdump.c:298
 #, c-format
 msgid "%s: warning: zone \"%s\" abbreviation \"%s\" %s\n"
 msgstr ""
 
-#: timezone/zdump.c:273
+#: timezone/zdump.c:307
 #, c-format
 msgid ""
-"%s: usage is %s [ --version ] [ --help ] [ -v ] [ -c [loyear,]hiyear ] "
-"zonename ...\n"
+"%s: usage: %s [--version] [--help] [-{vV}] [-{ct} [lo,]hi] zonename ...\n"
 "\n"
 "Report bugs to %s.\n"
 msgstr ""
 
-#: timezone/zdump.c:340
+#: timezone/zdump.c:384
 #, c-format
 msgid "%s: wild -c argument %s\n"
 msgstr "%s： 怪异的 -c 选项 %s\n"
 
-#: timezone/zdump.c:426
-msgid "Error writing to standard output"
-msgstr "写入标准输出出错"
-
-#: timezone/zdump.c:439
+#: timezone/zdump.c:417
 #, c-format
-msgid ""
-"%s: use of -v on system with floating time_t other than float or double\n"
+msgid "%s: wild -t argument %s\n"
 msgstr ""
 
-#: timezone/zic.c:361
+#: timezone/zdump.c:506
+msgid "Error writing to standard output"
+msgstr "写入标准输出出错"
+
+#: timezone/zic.c:370
 #, c-format
 msgid "%s: Memory exhausted: %s\n"
 msgstr "%s：内存耗尽：%s\n"
 
-#: timezone/zic.c:401
+#: timezone/zic.c:410
 #, c-format
-msgid "\"%s\", line %d: %s"
-msgstr "“%s”，行 %d：%s"
+msgid "\"%s\", line %d: "
+msgstr ""
 
-#: timezone/zic.c:404
+#: timezone/zic.c:413
 #, c-format
 msgid " (rule from \"%s\", line %d)"
 msgstr ""
 
-#: timezone/zic.c:415
+#: timezone/zic.c:432
+#, c-format
 msgid "warning: "
 msgstr "警告： "
 
-#: timezone/zic.c:425
+#: timezone/zic.c:442
 #, c-format
 msgid ""
 "%s: usage is %s [ --version ] [ --help ] [ -v ] [ -l localtime ] [ -p "
@@ -6732,338 +6758,342 @@
 "Report bugs to %s.\n"
 msgstr ""
 
-#: timezone/zic.c:460
+#: timezone/zic.c:477
 msgid "wild compilation-time specification of zic_t"
 msgstr ""
 
-#: timezone/zic.c:479
+#: timezone/zic.c:496
 #, c-format
 msgid "%s: More than one -d option specified\n"
 msgstr "%s：给出了多个 -d 选项\n"
 
-#: timezone/zic.c:489
+#: timezone/zic.c:506
 #, c-format
 msgid "%s: More than one -l option specified\n"
 msgstr "%s：给出了多个 -l 选项\n"
 
-#: timezone/zic.c:499
+#: timezone/zic.c:516
 #, c-format
 msgid "%s: More than one -p option specified\n"
 msgstr "%s：给出了多个 -p 选项\n"
 
-#: timezone/zic.c:509
+#: timezone/zic.c:526
 #, c-format
 msgid "%s: More than one -y option specified\n"
 msgstr "%s：给出了多个 -y 选项\n"
 
-#: timezone/zic.c:519
+#: timezone/zic.c:536
 #, c-format
 msgid "%s: More than one -L option specified\n"
 msgstr "%s：给出了多个 -L 选项\n"
 
-#: timezone/zic.c:566
+#: timezone/zic.c:583
 msgid "link to link"
 msgstr "链接到链接"
 
-#: timezone/zic.c:629
+#: timezone/zic.c:650
 msgid "hard link failed, symbolic link used"
 msgstr "硬连接失败，使用符号连接"
 
-#: timezone/zic.c:637
+#: timezone/zic.c:660
+#, c-format
+msgid "%s: Can't read %s: %s\n"
+msgstr ""
+
+#: timezone/zic.c:668 timezone/zic.c:1533
+#, c-format
+msgid "%s: Can't create %s: %s\n"
+msgstr "%s：无法创建 %s：%s\n"
+
+#: timezone/zic.c:676 timezone/zic.c:881
+#, c-format
+msgid "%s: Error reading %s\n"
+msgstr "%s：读 %s 错误\n"
+
+#: timezone/zic.c:682 timezone/zic.c:1750
 #, c-format
-msgid "%s: Can't link from %s to %s: %s\n"
-msgstr "%s：无法从 %s 连接到 %s：%s\n"
+msgid "%s: Error writing %s\n"
+msgstr "%s：写 %s 错误\n"
 
-#: timezone/zic.c:697 timezone/zic.c:699
+#: timezone/zic.c:686
+msgid "link failed, copy used"
+msgstr ""
+
+#: timezone/zic.c:744 timezone/zic.c:746
 msgid "same rule name in multiple files"
 msgstr "多个文件中的相同规则名"
 
-#: timezone/zic.c:740
+#: timezone/zic.c:787
 msgid "unruly zone"
 msgstr ""
 
-#: timezone/zic.c:747
+#: timezone/zic.c:794
 #, c-format
 msgid "%s in ruleless zone"
 msgstr ""
 
-#: timezone/zic.c:767
+#: timezone/zic.c:814
 msgid "standard input"
 msgstr "标准输入"
 
-#: timezone/zic.c:772
+#: timezone/zic.c:819
 #, c-format
 msgid "%s: Can't open %s: %s\n"
 msgstr "%s：无法打开 %s：%s\n"
 
-#: timezone/zic.c:783
+#: timezone/zic.c:830
 msgid "line too long"
 msgstr "行过长"
 
-#: timezone/zic.c:803
+#: timezone/zic.c:850
 msgid "input line of unknown type"
 msgstr "未知类型的输入行"
 
-#: timezone/zic.c:819
+#: timezone/zic.c:866
 #, c-format
 msgid "%s: Leap line in non leap seconds file %s\n"
 msgstr ""
 
-#: timezone/zic.c:826 timezone/zic.c:1243 timezone/zic.c:1265
+#: timezone/zic.c:873 timezone/zic.c:1282 timezone/zic.c:1304
 #, c-format
 msgid "%s: panic: Invalid l_value %d\n"
 msgstr ""
 
-#: timezone/zic.c:834
-#, c-format
-msgid "%s: Error reading %s\n"
-msgstr "%s：读 %s 错误\n"
-
-#: timezone/zic.c:841
+#: timezone/zic.c:888
 #, c-format
 msgid "%s: Error closing %s: %s\n"
 msgstr "%s：关闭 %s 错误：%s\n"
 
-#: timezone/zic.c:846
+#: timezone/zic.c:893
 msgid "expected continuation line not found"
 msgstr "找不到应该出现的续行"
 
-#: timezone/zic.c:887 timezone/zic.c:2413 timezone/zic.c:2427
+#: timezone/zic.c:934 timezone/zic.c:2610 timezone/zic.c:2624
 msgid "time overflow"
 msgstr "时间溢出"
 
-#: timezone/zic.c:891
+#: timezone/zic.c:938
 msgid "24:00 not handled by pre-1998 versions of zic"
 msgstr ""
 
-#: timezone/zic.c:894
+#: timezone/zic.c:941
 msgid "values over 24 hours not handled by pre-2007 versions of zic"
 msgstr ""
 
-#: timezone/zic.c:905
+#: timezone/zic.c:952
 msgid "wrong number of fields on Rule line"
 msgstr "规则行中域的个数错误"
 
-#: timezone/zic.c:909
+#: timezone/zic.c:956
 msgid "nameless rule"
 msgstr "无名规则"
 
-#: timezone/zic.c:914
+#: timezone/zic.c:961
 msgid "invalid saved time"
 msgstr ""
 
-#: timezone/zic.c:932
+#: timezone/zic.c:978
 msgid "wrong number of fields on Zone line"
 msgstr "区域行中域的个数错误"
 
-#: timezone/zic.c:938
+#: timezone/zic.c:983
 #, c-format
 msgid "\"Zone %s\" line and -l option are mutually exclusive"
 msgstr ""
 
-#: timezone/zic.c:946
+#: timezone/zic.c:989
 #, c-format
 msgid "\"Zone %s\" line and -p option are mutually exclusive"
 msgstr ""
 
-#: timezone/zic.c:958
+#: timezone/zic.c:997
 #, c-format
 msgid "duplicate zone name %s (file \"%s\", line %d)"
 msgstr "重复的区域名 %s (文件“%s”，行 %d)"
 
-#: timezone/zic.c:972
+#: timezone/zic.c:1010
 msgid "wrong number of fields on Zone continuation line"
 msgstr ""
 
-#: timezone/zic.c:1009
-msgid "invalid UTC offset"
-msgstr "无效的 UTC 偏移量"
+#: timezone/zic.c:1047
+msgid "invalid UT offset"
+msgstr ""
 
-#: timezone/zic.c:1012
+#: timezone/zic.c:1050
 msgid "invalid abbreviation format"
 msgstr "无效的缩略格式"
 
-#: timezone/zic.c:1041
+#: timezone/zic.c:1079
 msgid ""
 "Zone continuation line end time is not after end time of previous line"
 msgstr ""
 
-#: timezone/zic.c:1066
+#: timezone/zic.c:1105
 msgid "wrong number of fields on Leap line"
 msgstr ""
 
-#: timezone/zic.c:1075
+#: timezone/zic.c:1114
 msgid "invalid leaping year"
 msgstr "无效的闰年"
 
-#: timezone/zic.c:1095 timezone/zic.c:1197
+#: timezone/zic.c:1134 timezone/zic.c:1236
 msgid "invalid month name"
 msgstr "无效的月名称"
 
-#: timezone/zic.c:1108 timezone/zic.c:1310 timezone/zic.c:1324
+#: timezone/zic.c:1147 timezone/zic.c:1349 timezone/zic.c:1363
 msgid "invalid day of month"
 msgstr "无效的日"
 
-#: timezone/zic.c:1113
+#: timezone/zic.c:1152
 msgid "time before zero"
 msgstr ""
 
-#: timezone/zic.c:1117
+#: timezone/zic.c:1156
 msgid "time too small"
 msgstr "时间太小"
 
-#: timezone/zic.c:1121
+#: timezone/zic.c:1160
 msgid "time too large"
 msgstr "时间过大"
 
-#: timezone/zic.c:1125 timezone/zic.c:1226
+#: timezone/zic.c:1164 timezone/zic.c:1265
 msgid "invalid time of day"
 msgstr "无效的时间"
 
-#: timezone/zic.c:1144
+#: timezone/zic.c:1183
 msgid "illegal CORRECTION field on Leap line"
 msgstr ""
 
-#: timezone/zic.c:1149
+#: timezone/zic.c:1188
 msgid "illegal Rolling/Stationary field on Leap line"
 msgstr ""
 
-#: timezone/zic.c:1163
+#: timezone/zic.c:1202
 msgid "wrong number of fields on Link line"
 msgstr "连接行中域的个数错误"
 
-#: timezone/zic.c:1167
+#: timezone/zic.c:1206
 msgid "blank FROM field on Link line"
 msgstr "Link 行中空白的 FROM 域"
 
-#: timezone/zic.c:1171
+#: timezone/zic.c:1210
 msgid "blank TO field on Link line"
 msgstr "Link 行中空白的 TO 域"
 
-#: timezone/zic.c:1247
+#: timezone/zic.c:1286
 msgid "invalid starting year"
 msgstr "无效的起始年份"
 
-#: timezone/zic.c:1269
+#: timezone/zic.c:1308
 msgid "invalid ending year"
 msgstr "无效的终止年份"
 
-#: timezone/zic.c:1273
+#: timezone/zic.c:1312
 msgid "starting year greater than ending year"
 msgstr "起始年份大于终止年份"
 
-#: timezone/zic.c:1280
+#: timezone/zic.c:1319
 msgid "typed single year"
 msgstr ""
 
-#: timezone/zic.c:1315
+#: timezone/zic.c:1354
 msgid "invalid weekday name"
 msgstr "无效的星期名"
 
-#: timezone/zic.c:1481
+#: timezone/zic.c:1523
 #, c-format
 msgid "%s: Can't remove %s: %s\n"
 msgstr "%s：无法删除 %s：%s\n"
 
-#: timezone/zic.c:1491
-#, c-format
-msgid "%s: Can't create %s: %s\n"
-msgstr "%s：无法创建 %s：%s\n"
+#: timezone/zic.c:2105
+msgid "no POSIX environment variable for zone"
+msgstr ""
 
-#: timezone/zic.c:1683
+#: timezone/zic.c:2111
 #, c-format
-msgid "%s: Error writing %s\n"
-msgstr "%s：写 %s 错误\n"
-
-#: timezone/zic.c:1966
-msgid "no POSIX environment variable for zone"
+msgid "%s: pre-%d clients may mishandle distant timestamps"
 msgstr ""
 
-#: timezone/zic.c:2133
+#: timezone/zic.c:2292
 msgid "can't determine time zone abbreviation to use just after until time"
 msgstr ""
 
-#: timezone/zic.c:2177
+#: timezone/zic.c:2338 timezone/zic.c:2416
+msgid "too many local time types"
+msgstr "过多的本地时间类型"
+
+#: timezone/zic.c:2374
 msgid "too many transitions?!"
 msgstr ""
 
-#: timezone/zic.c:2192
+#: timezone/zic.c:2389
 msgid "internal error - addtype called with bad isdst"
 msgstr "内部错误 - 以错误的 isdst 调用 addtype"
 
-#: timezone/zic.c:2196
+#: timezone/zic.c:2393
 msgid "internal error - addtype called with bad ttisstd"
 msgstr "内部错误 - 以错误的 ttisstd 调用 addtype"
 
-#: timezone/zic.c:2200
+#: timezone/zic.c:2397
 msgid "internal error - addtype called with bad ttisgmt"
 msgstr "内部错误 - 以错误的 ttisgmt 调用 addtype"
 
-#: timezone/zic.c:2219
-msgid "too many local time types"
-msgstr "过多的本地时间类型"
-
-#: timezone/zic.c:2223
-msgid "UTC offset out of range"
-msgstr "UTC 偏移值超出范围"
+#: timezone/zic.c:2420
+msgid "UT offset out of range"
+msgstr ""
 
-#: timezone/zic.c:2247
+#: timezone/zic.c:2444
 msgid "too many leap seconds"
 msgstr "太多润秒"
 
-#: timezone/zic.c:2253
+#: timezone/zic.c:2450
 msgid "repeated leap second moment"
 msgstr ""
 
-#: timezone/zic.c:2303
+#: timezone/zic.c:2500
 msgid "Wild result from command execution"
 msgstr ""
 
-#: timezone/zic.c:2304
+#: timezone/zic.c:2501
 #, c-format
 msgid "%s: command was '%s', result was %d\n"
 msgstr "%s：命令为“%s”，结果为 %d\n"
 
-#: timezone/zic.c:2395
+#: timezone/zic.c:2592
 msgid "Odd number of quotation marks"
 msgstr "奇数个引号"
 
-#: timezone/zic.c:2472
+#: timezone/zic.c:2669
 msgid "use of 2/29 in non leap-year"
 msgstr ""
 
-#: timezone/zic.c:2507
+#: timezone/zic.c:2704
 msgid ""
 "rule goes past start/end of month--will not work with pre-2004 versions of "
 "zic"
 msgstr ""
 
-#: timezone/zic.c:2538
+#: timezone/zic.c:2735
 msgid "time zone abbreviation lacks alphabetic at start"
 msgstr ""
 
-#: timezone/zic.c:2540
+#: timezone/zic.c:2737
 msgid "time zone abbreviation has fewer than 3 alphabetics"
 msgstr ""
 
-#: timezone/zic.c:2542
+#: timezone/zic.c:2739
 msgid "time zone abbreviation has too many alphabetics"
 msgstr ""
 
-#: timezone/zic.c:2552
+#: timezone/zic.c:2749
 msgid "time zone abbreviation differs from POSIX standard"
 msgstr ""
 
-#: timezone/zic.c:2564
+#: timezone/zic.c:2755
 msgid "too many, or too long, time zone abbreviations"
 msgstr "过多或过长的时区缩写"
 
-#: timezone/zic.c:2604
+#: timezone/zic.c:2795
 #, c-format
 msgid "%s: Can't create directory %s: %s\n"
 msgstr "%s：无法创建目录 %s：%s\n"
-
-#: timezone/zic.c:2625
-#, c-format
-msgid "%s: %d did not sign extend correctly\n"
-msgstr ""
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/libelf.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/libelf.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/libelf.po	2014-02-24 08:24:31.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/libelf.po	2014-03-24 09:42:38.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:30+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 11:41+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: ../lib/errors.h:25
 msgid "no error"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/libexif-12.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/libexif-12.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/libexif-12.po	2014-02-24 08:24:31.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/libexif-12.po	2014-03-24 09:42:38.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:31+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 11:42+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: \n"
 
 #: libexif/canon/mnote-canon-entry.c:40 libexif/fuji/mnote-fuji-entry.c:35
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/libgnutls26.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/libgnutls26.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/libgnutls26.po	2014-02-24 08:24:44.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/libgnutls26.po	2014-03-24 09:42:51.000000000 +0000
@@ -8,15 +8,15 @@
 msgstr ""
 "Project-Id-Version: libgnutls 2.8.1\n"
 "Report-Msgid-Bugs-To: bug-gnutls@gnu.org\n"
-"POT-Creation-Date: 2014-02-17 08:13+0000\n"
+"POT-Creation-Date: 2014-03-04 09:28+0000\n"
 "PO-Revision-Date: 2010-11-19 08:51+0000\n"
 "Last-Translator: Aron Xu <Unknown>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:10+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:43+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: gnutls_errors.c:54
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/libgpg-error.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/libgpg-error.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/libgpg-error.po	2014-02-24 08:24:31.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/libgpg-error.po	2014-03-24 09:42:38.000000000 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:34+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 11:45+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: src/err-sources.h:28
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/libgphoto2-2.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/libgphoto2-2.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/libgphoto2-2.po	2014-02-24 08:24:31.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/libgphoto2-2.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,11579 +0,0 @@
-# Simplified Chinese Translation.
-# Copyright � 2000-2002
-# Wang Li <charle@linux.net.cn>, 2002
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gphoto2\n"
-"Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-04-15 17:43+0200\n"
-"PO-Revision-Date: 2009-10-12 10:37+0000\n"
-"Last-Translator: Tao Wei <weitao1979@gmail.com>\n"
-"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2013-12-12 11:59+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
-
-#: camlibs/adc65/adc65.c:243
-msgid ""
-"Adc65\n"
-"Benjamin Moos <benjamin@psnw.com>"
-msgstr ""
-"Adc65\n"
-"Benjamin Moos <benjamin@psnw.com>"
-
-#: camlibs/agfa-cl20/agfa_cl20.c:534
-#, c-format
-msgid ""
-"Camera appears to not be using CompactFlash storage\n"
-"Unfortunately we do not support that at the moment :-(\n"
-msgstr ""
-
-#: camlibs/agfa-cl20/agfa_cl20.c:537
-#, c-format
-msgid "Camera has taken %d pictures, and is using CompactFlash storage.\n"
-msgstr ""
-
-#: camlibs/agfa-cl20/agfa_cl20.c:545
-msgid ""
-"agfa_cl20\n"
-"The Agfa CL20 Linux Driver People!\n"
-"     Email us at cl20@poeml.de    \n"
-" Visit us at http://cl20.poeml.de "
-msgstr ""
-"agfa_cl20\n"
-"The Agfa CL20 Linux Driver People!\n"
-"     Email us at cl20@poeml.de    \n"
-" Visit us at http://cl20.poeml.de "
-
-#: camlibs/aox/library.c:107
-#, c-format
-msgid ""
-"Your USB camera has an Aox chipset.\n"
-"Number of lo-res PICs = %i\n"
-"Number of hi-res PICs = %i\n"
-"Number of PICs = %i\n"
-msgstr ""
-"你的USB摄像机有一个Aox芯片组。\n"
-"低分辨率图片数量 = %i\n"
-"高分辨率图片数量 = %i\n"
-"图片总数量 = %i\n"
-
-#: camlibs/aox/library.c:120
-msgid ""
-"Aox generic driver\n"
-"Theodore Kilgore <kilgota@auburn.edu>\n"
-msgstr ""
-"Aox generic driver\n"
-"Theodore Kilgore <kilgota@auburn.edu>\n"
-
-#: camlibs/ax203/library.c:95
-#, c-format
-msgid "Your USB picture frame has a AX203 chipset\n"
-msgstr ""
-
-#: camlibs/ax203/library.c:104
-msgid ""
-"AX203 based picture frames come with a variety of resolutions.\n"
-"The gphoto driver for these devices allows you to download,\n"
-"upload and delete pictures from the picture frame."
-msgstr ""
-
-#: camlibs/ax203/library.c:117
-msgid ""
-"AX203 USB picture frame driver\n"
-"Hans de Goede <hdegoede@redhat.com>\n"
-"This driver allows you to download, upload and delete pictures\n"
-"from the picture frame."
-msgstr ""
-
-#: camlibs/ax203/library.c:442 camlibs/st2205/library.c:543
-msgid "Picture Frame Configuration"
-msgstr ""
-
-#: camlibs/ax203/library.c:445 camlibs/ax203/library.c:461
-#: camlibs/st2205/library.c:546 camlibs/st2205/library.c:570
-msgid "Synchronize frame data and time with PC"
-msgstr ""
-
-# camlibs/barbie/barbie.c:149
-#: camlibs/barbie/barbie.c:373
-#, c-format
-msgid ""
-"Number of pictures: %i\n"
-"Firmware Version: %s"
-msgstr ""
-"照片数量：%i\n"
-"固件版本：%s"
-
-# camlibs/barbie/barbie.c:159
-#: camlibs/barbie/barbie.c:383
-msgid ""
-"Barbie/HotWheels/WWF\n"
-"Scott Fritzinger <scottf@unr.edu>\n"
-"Andreas Meyer <ahm@spies.com>\n"
-"Pete Zaitcev <zaitcev@metabyte.com>\n"
-"\n"
-"Reverse engineering of image data by:\n"
-"Jeff Laing <jeffl@SPATIALinfo.com>\n"
-"\n"
-"Implemented using documents found on\n"
-"the web. Permission given by Vision."
-msgstr ""
-"Barbie/HotWheels/WWF\n"
-"Scott Fritzinger <scottf@unr.edu>\n"
-"Andreas Meyer <ahm@spies.com>\n"
-"Pete Zaitcev <zaitcev@metabyte.com>\n"
-"\n"
-"图像数据逆向工程由：\n"
-"Jeff Laing <jeffl@SPATIALinfo.com>\n"
-"\n"
-"根据网上找到的文档实现。由 Vision\n"
-" 授权。"
-
-# camlibs/canon/library.c:774
-#: camlibs/canon/canon.c:645
-#, c-format
-msgid "Could not create directory %s."
-msgstr "无法创建目录 %s"
-
-# camlibs/canon/library.c:774
-#: camlibs/canon/canon.c:648
-#, c-format
-msgid "Could not remove directory %s."
-msgstr "无法删除目录 %s。"
-
-#: camlibs/canon/canon.c:1211 camlibs/canon/canon.c:1590
-#: camlibs/canon/usb.c:559
-msgid "lock keys failed."
-msgstr "锁定键失败。"
-
-#: camlibs/canon/canon.c:1307 camlibs/canon/canon.c:1308
-msgid "*UNKNOWN*"
-msgstr "*未知*"
-
-#: camlibs/canon/canon.c:1491
-#, c-format
-msgid ""
-"canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
-"status %li"
-msgstr ""
-
-#: camlibs/canon/canon.c:1623
-#, c-format
-msgid ""
-"canon_int_capture_image: final canon_usb_list_all_dirs() failed with status "
-"%i"
-msgstr ""
-
-# camlibs/canon/canon.c:651
-#: camlibs/canon/canon.c:2490
-#, c-format
-msgid ""
-"Name '%s' (%li characters) too long, maximum 30 characters are allowed."
-msgstr "名称 '%s' (%li 个字符)太长，最多允许 30 个字符。"
-
-#: camlibs/canon/canon.c:2908
-#, c-format
-msgid "Lower case letters in %s not allowed."
-msgstr "%s中小写字母不被允许。"
-
-#: camlibs/canon/canon.c:3090
-#, c-format
-msgid ""
-"canon_int_list_directory: ERROR: initial message too short (%i < minimum %i)"
-msgstr "canon_int_list_directory: 错误：初始信息太短 (%i < 最小值 %i)"
-
-#: camlibs/canon/canon.c:3112
-msgid ""
-"canon_int_list_directory: Reached end of packet while examining the first "
-"dirent"
-msgstr ""
-
-#: camlibs/canon/canon.c:3197
-msgid "canon_int_list_directory: truncated directory entry encountered"
-msgstr ""
-
-# camlibs/canon/canon.c:1490
-#: camlibs/canon/canon.c:3561
-msgid "File protected."
-msgstr "文件已受到保护。"
-
-#: camlibs/canon/canon.c:3669
-msgid "Could not extract JPEG thumbnail from data: No beginning/end"
-msgstr "无法从数据中提取JPEG缩略图：没有开头/结尾"
-
-#: camlibs/canon/canon.c:3757
-msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
-msgstr "无法从数据中提取JPEG缩略图：数据不是JFIF"
-
-#: camlibs/canon/canon.h:156 camlibs/canon/canon.h:170
-#, c-format
-msgid "NULL parameter \"%s\" in %s line %i"
-msgstr ""
-
-#: camlibs/canon/canon.h:638
-#, c-format
-msgid ""
-"Don't know how to handle camera->port->type value %i aka 0x%x in %s line %i."
-msgstr ""
-
-#: camlibs/canon/crc.c:234
-#, c-format
-msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
-msgstr "严重错误：长度为 %d 的初始CRC值未知\n"
-
-#: camlibs/canon/crc.c:247
-#, c-format
-msgid "unable to guess initial CRC value\n"
-msgstr "不能推测起始CRC值\n"
-
-#: camlibs/canon/crc.c:274
-#, c-format
-msgid ""
-"warning: CRC not checked (add len %d, value 0x%04x) "
-"#########################\n"
-msgstr "警告：CRC没有检查 (add len %d, value 0x%04x) #########################\n"
-
-#: camlibs/canon/library.c:96 camlibs/canon/library.c:1621
-msgid "Compatibility Mode"
-msgstr ""
-
-#: camlibs/canon/library.c:97
-msgid "Thumbnail"
-msgstr "缩略图"
-
-#: camlibs/canon/library.c:98
-msgid "Full Image"
-msgstr "完整图像"
-
-#: camlibs/canon/library.c:122 camlibs/canon/library.c:265
-#: camlibs/ptp2/config.c:1549 camlibs/ptp2/config.c:1560
-#: camlibs/ptp2/ptp.c:4594
-msgid "Bulb"
-msgstr ""
-
-#: camlibs/canon/library.c:215
-msgid "Auto focus: one-shot"
-msgstr ""
-
-#: camlibs/canon/library.c:216
-msgid "Auto focus: AI servo"
-msgstr ""
-
-#: camlibs/canon/library.c:217
-msgid "Auto focus: AI focus"
-msgstr ""
-
-#: camlibs/canon/library.c:218
-msgid "Manual focus"
-msgstr "手动对焦"
-
-#: camlibs/canon/library.c:223
-msgid "Beep off"
-msgstr "蜂鸣关闭"
-
-#: camlibs/canon/library.c:224
-msgid "Beep on"
-msgstr "蜂鸣开启"
-
-#: camlibs/canon/library.c:229 camlibs/canon/library.c:280
-#: camlibs/ptp2/config.c:2636 camlibs/ptp2/ptp.c:4225
-msgid "Flash off"
-msgstr "闪光灯关闭"
-
-#: camlibs/canon/library.c:230
-msgid "Flash on"
-msgstr "闪光灯开启"
-
-#: camlibs/canon/library.c:231
-msgid "Flash auto"
-msgstr "闪光灯自动"
-
-#: camlibs/canon/library.c:258
-msgid "AUTO"
-msgstr ""
-
-#: camlibs/canon/library.c:259 camlibs/ptp2/config.c:1556
-#: camlibs/ptp2/ptp.c:4588
-msgid "P"
-msgstr ""
-
-#: camlibs/canon/library.c:260 camlibs/ptp2/ptp.c:4589
-msgid "Tv"
-msgstr ""
-
-#: camlibs/canon/library.c:261 camlibs/ptp2/ptp.c:4590
-msgid "Av"
-msgstr ""
-
-#: camlibs/canon/library.c:262 camlibs/ptp2/ptp.c:4591
-msgid "M"
-msgstr ""
-
-#: camlibs/canon/library.c:263
-msgid "A-DEP"
-msgstr ""
-
-#: camlibs/canon/library.c:264
-msgid "M-DEP"
-msgstr ""
-
-#: camlibs/canon/library.c:266
-msgid "Manual 2"
-msgstr ""
-
-#: camlibs/canon/library.c:267
-msgid "Far scene"
-msgstr ""
-
-#: camlibs/canon/library.c:268
-msgid "Fast shutter"
-msgstr ""
-
-#: camlibs/canon/library.c:269
-msgid "Slow shutter"
-msgstr ""
-
-#: camlibs/canon/library.c:270
-msgid "Night scene"
-msgstr ""
-
-#: camlibs/canon/library.c:271
-msgid "Gray scale"
-msgstr ""
-
-# camlibs/sierra/sierra.c:858 camlibs/sierra/sierra.c:867
-# camlibs/sierra/sierra.c:1173
-#: camlibs/canon/library.c:272 camlibs/konica/qm150.c:998
-#: camlibs/konica/qm150.c:1014 camlibs/ptp2/config.c:2657
-#: camlibs/ptp2/config.c:3350 camlibs/ptp2/ptp.c:4604 camlibs/ptp2/ptp.c:4739
-#: camlibs/ricoh/library.c:332 camlibs/sierra/olympus-desc.c:482
-#: camlibs/sierra/sierra.c:997 camlibs/sierra/sierra.c:1006
-#: camlibs/sierra/sierra.c:1312
-msgid "Sepia"
-msgstr "棕褐色"
-
-#: camlibs/canon/library.c:273 camlibs/ptp2/config.c:1568
-#: camlibs/ptp2/config.c:1732 camlibs/ptp2/config.c:2473
-#: camlibs/ptp2/config.c:2475 camlibs/ptp2/config.c:2509
-#: camlibs/ptp2/config.c:3161 camlibs/ptp2/ptp.c:4239 camlibs/ptp2/ptp.c:4435
-#: camlibs/ptp2/ptp.c:4605 camlibs/st2205/library.c:516
-#: camlibs/st2205/library.c:529
-msgid "Portrait"
-msgstr ""
-
-#: camlibs/canon/library.c:274 camlibs/ptp2/config.c:1720
-#: camlibs/ptp2/config.c:2629 camlibs/sierra/nikon-desc.c:492
-#: camlibs/sierra/olympus-desc.c:775 camlibs/sierra/olympus-desc.c:791
-msgid "Spot"
-msgstr "点"
-
-# camlibs/sierra/sierra.c:978 camlibs/sierra/sierra.c:983
-# camlibs/sierra/sierra.c:1254 camlibs/sierra/sierra.c:1450
-# camlibs/sierra/sierra.c:1453 camlibs/sierra/sierra.c:1666
-#: camlibs/canon/library.c:275 camlibs/kodak/dc210/dc210.c:231
-#: camlibs/kodak/dc210/dc210.c:245 camlibs/konica/qm150.c:1019
-#: camlibs/ptp2/config.c:2477 camlibs/ptp2/config.c:2511
-#: camlibs/ptp2/ptp.c:4241 camlibs/ptp2/ptp.c:4607 camlibs/ricoh/library.c:500
-#: camlibs/sierra/epson-desc.c:218 camlibs/sierra/nikon-desc.c:324
-#: camlibs/sierra/olympus-desc.c:637 camlibs/sierra/sierra.c:1117
-#: camlibs/sierra/sierra.c:1122 camlibs/sierra/sierra.c:1393
-#: camlibs/sierra/sierra.c:1589 camlibs/sierra/sierra.c:1592
-#: camlibs/sierra/sierra.c:1805
-msgid "Macro"
-msgstr "巨大"
-
-#: camlibs/canon/library.c:276
-msgid "BW"
-msgstr ""
-
-#: camlibs/canon/library.c:277
-msgid "PanFocus"
-msgstr ""
-
-#: camlibs/canon/library.c:278 camlibs/ptp2/config.c:3157
-#: camlibs/ptp2/config.c:3347 camlibs/ptp2/ptp.c:4431 camlibs/ptp2/ptp.c:4736
-msgid "Vivid"
-msgstr ""
-
-# camlibs/konica/library.c:800 camlibs/konica/library.c:807
-# camlibs/minolta/dimagev/dimagev.c:407 camlibs/sierra/sierra.c:856
-# camlibs/sierra/sierra.c:863 camlibs/sierra/sierra.c:917
-# camlibs/sierra/sierra.c:924 camlibs/sierra/sierra.c:979
-# camlibs/sierra/sierra.c:985 camlibs/sierra/sierra.c:1169
-# camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
-# camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
-# camlibs/sierra/sierra.c:1668
-#: camlibs/canon/library.c:279 camlibs/ptp2/config.c:1734
-#: camlibs/ptp2/config.c:3348 camlibs/ptp2/ptp.c:4610 camlibs/ptp2/ptp.c:4737
-msgid "Neutral"
-msgstr "中性"
-
-#: camlibs/canon/library.c:281
-msgid "Long shutter"
-msgstr ""
-
-#: camlibs/canon/library.c:282
-msgid "Super macro"
-msgstr ""
-
-#: camlibs/canon/library.c:283
-msgid "Foliage"
-msgstr ""
-
-#: camlibs/canon/library.c:284
-msgid "Indoor"
-msgstr ""
-
-#: camlibs/canon/library.c:285
-msgid "Fireworks"
-msgstr ""
-
-#: camlibs/canon/library.c:286
-msgid "Beach"
-msgstr ""
-
-#: camlibs/canon/library.c:287
-msgid "Underwater"
-msgstr ""
-
-#: camlibs/canon/library.c:288
-msgid "Snow"
-msgstr ""
-
-#: camlibs/canon/library.c:289
-msgid "Kids and pets"
-msgstr ""
-
-#: camlibs/canon/library.c:290
-msgid "Night snapshot"
-msgstr ""
-
-#: camlibs/canon/library.c:291
-msgid "Digital macro"
-msgstr ""
-
-#: camlibs/canon/library.c:292
-msgid "MyColors"
-msgstr ""
-
-#: camlibs/canon/library.c:293
-msgid "Photo in movie"
-msgstr ""
-
-#: camlibs/canon/library.c:299 camlibs/ptp2/config.c:1218
-#: camlibs/ptp2/config.c:2027 camlibs/ptp2/ptp.c:4200
-msgid "RAW"
-msgstr "原始的"
-
-#: camlibs/canon/library.c:301
-msgid "RAW 2"
-msgstr ""
-
-#: camlibs/canon/library.c:303 camlibs/ptp2/config.c:2035
-#: camlibs/ptp2/config.c:2037
-msgid "Small Normal JPEG"
-msgstr "小的正常 JPEG"
-
-#: camlibs/canon/library.c:305 camlibs/ptp2/config.c:2034
-#: camlibs/ptp2/config.c:2036
-msgid "Small Fine JPEG"
-msgstr "小的高质量 JPEG"
-
-#: camlibs/canon/library.c:307 camlibs/ptp2/config.c:2033
-msgid "Medium Normal JPEG"
-msgstr "中等正常 JPEG"
-
-#: camlibs/canon/library.c:309 camlibs/ptp2/config.c:2032
-msgid "Medium Fine JPEG"
-msgstr "中等高质量 JPEG"
-
-#: camlibs/canon/library.c:311 camlibs/ptp2/config.c:2031
-msgid "Large Normal JPEG"
-msgstr "大的正常 JPEG"
-
-#: camlibs/canon/library.c:313 camlibs/ptp2/config.c:2030
-msgid "Large Fine JPEG"
-msgstr "大的高质量 JPEG"
-
-#: camlibs/canon/library.c:315 camlibs/ptp2/config.c:2055
-msgid "RAW + Small Normal JPEG"
-msgstr "原始的 ＋ 小的正常 JPEG"
-
-#: camlibs/canon/library.c:317 camlibs/ptp2/config.c:2046
-msgid "RAW + Small Fine JPEG"
-msgstr "原始的 ＋ 小的高质量 JPEG"
-
-#: camlibs/canon/library.c:319 camlibs/ptp2/config.c:2052
-msgid "RAW + Medium Normal JPEG"
-msgstr ""
-
-#: camlibs/canon/library.c:321 camlibs/ptp2/config.c:2043
-msgid "RAW + Medium Fine JPEG"
-msgstr ""
-
-#: camlibs/canon/library.c:323 camlibs/ptp2/config.c:2049
-msgid "RAW + Large Normal JPEG"
-msgstr ""
-
-#: camlibs/canon/library.c:325 camlibs/ptp2/config.c:2040
-msgid "RAW + Large Fine JPEG"
-msgstr ""
-
-#: camlibs/canon/library.c:367
-msgid ""
-"This is the driver for Canon PowerShot, Digital IXUS, IXY Digital,\n"
-" and EOS Digital cameras in their native (sometimes called \"normal\")\n"
-" mode. It also supports a small number of Canon digital camcorders\n"
-" with still image capability.\n"
-"It includes code for communicating over a serial port or USB connection,\n"
-" but not (yet) over IEEE 1394 (Firewire).\n"
-"It is designed to work with over 70 models as old as the PowerShot A5\n"
-" and Pro70 of 1998 and as new as the PowerShot A510 and EOS 350D of\n"
-" 2005.\n"
-"It has not been verified against the EOS 1D or EOS 1Ds.\n"
-"For the A50, using 115200 bps may effectively be slower than using 57600\n"
-"If you experience a lot of serial transmission errors, try to have your\n"
-" computer as idle as possible (i.e. no disk activity)\n"
-msgstr ""
-"这是Canon PowerShot, Digital IXUS, IXY Digital,\n"
-" EOS Digital 照相机在本地模式（有时称为“标准模式”）\n"
-" 下的驱动程序。它也支持少量的带有静态图像功能的Canon\n"
-" 数码可携式摄像机。\n"
-"它包含了通过串口或USB连接来通信的代码，但(尚)不包括\n"
-" IEEE 1394（火线）。\n"
-"它被设计成支持从1998年的PowerShot A5和Pro70到\n"
-" 2005年的PowerShot A510和EOS 350D的70多种型号\n"
-" 的照相机。\n"
-"在EOS 1D 或 EOS 1D上没有测试过。\n"
-"对于A50，使用115200 bps实际上可能会比用57600 bps要慢\n"
-"如果你遇到太多串行传输错误，请让你的电脑尽可能的空闲\n"
-" （也就是说：磁盘空闲）\n"
-
-# camlibs/canon/library.c:165 camlibs/canon/library.c:889
-# camlibs/canon/library.c:902
-#: camlibs/canon/library.c:496
-#, c-format
-msgid "Camera unavailable: %s"
-msgstr "相机不可用：%s"
-
-# camlibs/canon/library.c:176
-#: camlibs/canon/library.c:516
-msgid "Switching Camera Off"
-msgstr "关闭相机"
-
-# camlibs/canon/library.c:232
-#: camlibs/canon/library.c:586 camlibs/canon/library.c:623
-msgid "Error capturing image"
-msgstr "捕获图像出错"
-
-# camlibs/canon/library.c:267
-#: camlibs/canon/library.c:679 camlibs/canon/library.c:1115
-#, c-format
-msgid "Could not get disk name: %s"
-msgstr "无法获取磁盘名：%s"
-
-# camlibs/canon/library.c:268
-#: camlibs/canon/library.c:680 camlibs/canon/library.c:1116
-msgid "No reason available"
-msgstr "不知缘由"
-
-# camlibs/canon/library.c:275
-#: camlibs/canon/library.c:687
-#, c-format
-msgid "Could not get disk info: %s"
-msgstr "无法获取磁盘信息：%s"
-
-#: camlibs/canon/library.c:756
-#, c-format
-msgid "Internal error #1 in get_file_func() (%s line %i)"
-msgstr "内部错误 #1 在 get_file_func() (%s line %i)"
-
-# libgphoto2/gphoto2-filesys.c:1199
-#: camlibs/canon/library.c:779
-#, c-format
-msgid "No audio file could be found for %s"
-msgstr "无法为 %s 找到音频文件"
-
-#: camlibs/canon/library.c:827 camlibs/canon/library.c:865
-#, c-format
-msgid "%s is a file type for which no thumbnail is provided"
-msgstr "%s 是一种没有提供缩略图的文件格式"
-
-# camlibs/canon/library.c:568
-#: camlibs/canon/library.c:1038
-#, c-format
-msgid ""
-"  Drive %s\n"
-"  %11s bytes total\n"
-"  %11s bytes available"
-msgstr ""
-"  驱动器 %s\n"
-"  共计 %11s 字节\n"
-"  可用 %11s 字节"
-
-# camlibs/canon/library.c:576 camlibs/canon/library.c:582
-# camlibs/canon/library.c:851 camlibs/canon/library.c:857
-#: camlibs/canon/library.c:1046 camlibs/canon/library.c:1052
-#: camlibs/canon/library.c:2010 camlibs/canon/library.c:2016
-msgid "AC adapter"
-msgstr "交流变压器"
-
-# camlibs/canon/library.c:576 camlibs/canon/library.c:582
-# camlibs/canon/library.c:851 camlibs/canon/library.c:857
-#: camlibs/canon/library.c:1046 camlibs/canon/library.c:1052
-#: camlibs/canon/library.c:2010 camlibs/canon/library.c:2016
-msgid "on battery"
-msgstr "使用电池"
-
-# camlibs/canon/library.c:578 camlibs/canon/library.c:853
-#: camlibs/canon/library.c:1048 camlibs/canon/library.c:2012
-msgid "power OK"
-msgstr "电力充足"
-
-# camlibs/canon/library.c:578 camlibs/canon/library.c:853
-#: camlibs/canon/library.c:1048 camlibs/canon/library.c:2012
-msgid "power bad"
-msgstr "电力不足"
-
-# camlibs/canon/library.c:586
-#: camlibs/canon/library.c:1056
-#, c-format
-msgid "not available: %s"
-msgstr "不可用：%s"
-
-# camlibs/canon/library.c:598
-#: camlibs/canon/library.c:1082
-#, c-format
-msgid "%s (host time %s%i seconds)"
-msgstr "%s (主机时间 %s%i 秒)"
-
-# camlibs/canon/library.c:608
-#: camlibs/canon/library.c:1092
-#, c-format
-msgid ""
-"\n"
-"Camera identification:\n"
-"  Model: %s\n"
-"  Owner: %s\n"
-"\n"
-"Power status: %s\n"
-"\n"
-"Flash disk information:\n"
-"%s\n"
-"\n"
-"Time: %s\n"
-msgstr ""
-"\n"
-"相机标识：\n"
-"  型号：%s\n"
-"  所有者：%s\n"
-"\n"
-"电源状态：%s\n"
-"\n"
-"闪存磁盘信息：\n"
-"%s\n"
-"\n"
-"时间：%s\n"
-
-# camlibs/canon/library.c:625
-#: camlibs/canon/library.c:1150
-msgid ""
-"Canon PowerShot series driver by\n"
-" Wolfgang G. Reissnegger,\n"
-" Werner Almesberger,\n"
-" Edouard Lafargue,\n"
-" Philippe Marzouk,\n"
-"A5 additions by Ole W. Saastad\n"
-"Additional enhancements by\n"
-" Holger Klemm\n"
-" Stephen H. Westin"
-msgstr ""
-"佳能 PowerShot 系列驱动程序由\n"
-" Wolfgang G. Reissnegger,\n"
-" Werner Almesberger,\n"
-" Edouard Lafargue,\n"
-" Philippe Marzouk 编写\n"
-"A5增加件由 Ole W. Saastad 编写\n"
-"额外增强由\n"
-" Holger Klemm\n"
-" Stephen H. Westin 编写"
-
-# camlibs/canon/library.c:664
-#: camlibs/canon/library.c:1194
-msgid "Error deleting file"
-msgstr "删除文件时错误"
-
-# camlibs/canon/library.c:680
-#: camlibs/canon/library.c:1210
-msgid "Error deleting associated thumbnail file"
-msgstr "删除相关缩略图文件出错"
-
-# camlibs/canon/library.c:713
-#: camlibs/canon/library.c:1342 camlibs/canon/library.c:1475
-msgid ""
-"Speeds greater than 57600 are not supported for uploading to this camera"
-msgstr "该相机不支持高于 57600 的速度的上载"
-
-# camlibs/canon/library.c:730
-#: camlibs/canon/library.c:1359 camlibs/canon/library.c:1493
-msgid "Could not get flash drive letter"
-msgstr "无法获取闪存驱动字符"
-
-# camlibs/canon/library.c:754
-#: camlibs/canon/library.c:1403 camlibs/canon/library.c:1516
-msgid ""
-"Could not upload, no free folder name available!\n"
-"999CANON folder name exists and has an AUT_9999.JPG picture in it."
-msgstr ""
-"无法上载，没有可用的空闲文件夹了！\n"
-"已有 999 个佳能文件夹名称存在而且每个文件夹中都有照片 AUT_9999.JPG。"
-
-# camlibs/canon/library.c:774
-#: camlibs/canon/library.c:1425 camlibs/canon/library.c:1536
-msgid "Could not create \\DCIM directory."
-msgstr "无法创建目录 \\DCIM。"
-
-# camlibs/canon/library.c:780
-#: camlibs/canon/library.c:1431 camlibs/canon/library.c:1542
-msgid "Could not create destination directory."
-msgstr "无法创建目标目录。"
-
-# camlibs/canon/library.c:806
-#: camlibs/canon/library.c:1591 camlibs/ptp2/config.c:5500
-#: camlibs/ptp2/config.c:5770
-msgid "Camera and Driver Configuration"
-msgstr "相机及驱动器配置"
-
-# camlibs/sierra/sierra.c:1048 camlibs/sierra/sierra.c:1510
-#: camlibs/canon/library.c:1594 camlibs/ptp2/config.c:5463
-#: camlibs/ptp2/config.c:5464 camlibs/sierra/epson-desc.c:282
-#: camlibs/sierra/nikon-desc.c:695 camlibs/sierra/nikon-desc.c:706
-#: camlibs/sierra/nikon-desc.c:717 camlibs/sierra/olympus-desc.c:1017
-#: camlibs/sierra/olympus-desc.c:1116 camlibs/sierra/olympus-desc.c:1127
-#: camlibs/sierra/olympus-desc.c:1140 camlibs/sierra/sierra.c:1187
-#: camlibs/sierra/sierra.c:1649
-msgid "Camera Settings"
-msgstr "相机设置"
-
-#: camlibs/canon/library.c:1598 camlibs/canon/library.c:2062
-#: camlibs/ptp2/config.c:5206 camlibs/ptp2/config.c:5207
-msgid "Owner Name"
-msgstr ""
-
-#: camlibs/canon/library.c:1604 camlibs/canon/library.c:2075
-msgid "Capture Size Class"
-msgstr ""
-
-#: camlibs/canon/library.c:1636 camlibs/canon/library.c:2101
-#: camlibs/ptp2/config.c:5232 camlibs/ptp2/config.c:5233
-#: camlibs/ptp2/config.c:5234 camlibs/ptp2/ptp.c:3531
-#: camlibs/sierra/olympus-desc.c:881 camlibs/sierra/olympus-desc.c:899
-msgid "ISO Speed"
-msgstr "ISO 速度"
-
-#: camlibs/canon/library.c:1662 camlibs/canon/library.c:1663
-#: camlibs/canon/library.c:1696 camlibs/canon/library.c:1697
-#: camlibs/canon/library.c:1730 camlibs/canon/library.c:1731
-#: camlibs/canon/library.c:1777 camlibs/canon/library.c:1778
-#: camlibs/canon/library.c:1810 camlibs/canon/library.c:1811
-#: camlibs/canon/library.c:1848 camlibs/canon/library.c:1849
-#: camlibs/canon/library.c:1882 camlibs/canon/library.c:1883
-#: camlibs/canon/library.c:1916 camlibs/canon/library.c:1917
-#: camlibs/canon/library.c:1950 camlibs/canon/library.c:1951
-#: camlibs/ptp2/config.c:3192 camlibs/ptp2/config.c:3480
-#: camlibs/ptp2/library.c:3248 camlibs/ptp2/library.c:3250
-#: camlibs/ptp2/ptp.c:4384 camlibs/ptp2/ptp.c:4545 camlibs/ptp2/ptp.c:4635
-msgid "Unknown"
-msgstr "未知"
-
-#: camlibs/canon/library.c:1670 camlibs/canon/library.c:2130
-msgid "Shooting mode"
-msgstr ""
-
-# camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
-#: camlibs/canon/library.c:1704 camlibs/canon/library.c:2159
-#: camlibs/ptp2/config.c:5312 camlibs/ptp2/config.c:5313
-#: camlibs/ptp2/config.c:5316 camlibs/ptp2/config.c:5317
-#: camlibs/ptp2/ptp.c:3533 camlibs/ptp2/ptp.c:4072
-msgid "Shutter Speed"
-msgstr "快门速度"
-
-# camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1283
-#: camlibs/canon/library.c:1739 camlibs/canon/library.c:2330
-#: camlibs/kodak/dc210/dc210.c:224 camlibs/kodak/dc210/dc210.c:383
-#: camlibs/konica/qm150.c:1033 camlibs/ptp2/config.c:5254
-#: camlibs/ptp2/ptp.c:3518 camlibs/ptp2/ptp.c:3544 camlibs/ricoh/library.c:501
-#: camlibs/sierra/sierra.c:1162 camlibs/sierra/sierra.c:1422
-msgid "Zoom"
-msgstr "缩放"
-
-# camlibs/sierra/sierra.c:826 camlibs/sierra/sierra.c:1146
-# camlibs/sierra/sierra.c:1361 camlibs/sierra/sierra.c:1602
-#: camlibs/canon/library.c:1751 camlibs/canon/library.c:2187
-#: camlibs/canon/library.c:2346 camlibs/ptp2/config.c:5304
-#: camlibs/ptp2/config.c:5305 camlibs/ptp2/config.c:5308
-#: camlibs/ptp2/ptp.c:3532 camlibs/ptp2/ptp.c:4071 camlibs/sierra/sierra.c:964
-#: camlibs/sierra/sierra.c:1285 camlibs/sierra/sierra.c:1500
-#: camlibs/sierra/sierra.c:1741
-msgid "Aperture"
-msgstr "光圈"
-
-#: camlibs/canon/library.c:1784 camlibs/canon/library.c:2214
-#: camlibs/ptp2/config.c:5259 camlibs/ptp2/config.c:5260
-#: camlibs/ptp2/config.c:5261 camlibs/ptp2/config.c:5263
-#: camlibs/ptp2/ptp.c:3534 camlibs/ptp2/ptp.c:3700
-#: camlibs/sierra/nikon-desc.c:459 camlibs/sierra/nikon-desc.c:482
-#: camlibs/sierra/olympus-desc.c:766
-msgid "Exposure Compensation"
-msgstr "曝光补偿"
-
-#: camlibs/canon/library.c:1817 camlibs/canon/library.c:2243
-#: camlibs/ptp2/config.c:5224 camlibs/ptp2/config.c:5225
-#: camlibs/ptp2/config.c:5228
-msgid "Image Format"
-msgstr ""
-
-# camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
-# camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/canon/library.c:1856 camlibs/canon/library.c:2271
-#: camlibs/ptp2/config.c:5288 camlibs/ptp2/config.c:5291
-#: camlibs/ptp2/ptp.c:3460 camlibs/sierra/nikon-desc.c:331
-#: camlibs/sierra/olympus-desc.c:644
-msgid "Focus Mode"
-msgstr "聚焦模式"
-
-# camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
-# camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/canon/library.c:1890 camlibs/canon/library.c:2375
-#: camlibs/ptp2/config.c:5266 camlibs/ptp2/config.c:5267
-#: camlibs/ptp2/ptp.c:3462 camlibs/ptp2/ptp.c:3513 camlibs/ptp2/ptp.c:3756
-#: camlibs/ptp2/ptp.c:3944 camlibs/sierra/sierra.c:1024
-#: camlibs/sierra/sierra.c:1325 camlibs/sierra/sierra.c:1534
-#: camlibs/sierra/sierra.c:1765
-msgid "Flash Mode"
-msgstr "闪光灯模式"
-
-# camlibs/konica/library.c:647 camlibs/konica/library.c:858
-#: camlibs/canon/library.c:1924 camlibs/canon/library.c:2300
-#: camlibs/konica/library.c:680 camlibs/konica/library.c:894
-#: camlibs/ptp2/ptp.c:3514
-msgid "Beep"
-msgstr "鸣笛"
-
-#: camlibs/canon/library.c:1961 camlibs/ptp2/config.c:5461
-msgid "Camera Actions"
-msgstr ""
-
-#: camlibs/canon/library.c:1965 camlibs/canon/library.c:2404
-#: camlibs/ptp2/config.c:5142 camlibs/ptp2/config.c:5143
-msgid "Synchronize camera date and time with PC"
-msgstr ""
-
-#: camlibs/canon/library.c:1972 camlibs/ptp2/config.c:5466
-msgid "Camera Status Information"
-msgstr ""
-
-# camlibs/sierra/sierra.c:1806
-#: camlibs/canon/library.c:1976 camlibs/ptp2/config.c:5159
-#: camlibs/ptp2/config.c:5160 camlibs/ptp2/ptp.c:3552
-msgid "Camera Model"
-msgstr "相机型号"
-
-# camlibs/konica/library.c:633 camlibs/konica/library.c:844
-# camlibs/polaroid/pdc700.c:1005 camlibs/polaroid/pdc700.c:1018
-# camlibs/polaroid/pdc700.c:1088
-#: camlibs/canon/library.c:1981 camlibs/konica/library.c:666
-#: camlibs/konica/library.c:877 camlibs/konica/qm150.c:758
-#: camlibs/polaroid/pdc700.c:1004 camlibs/polaroid/pdc700.c:1017
-#: camlibs/polaroid/pdc700.c:1087
-msgid "Date and Time"
-msgstr "日期和时间"
-
-# camlibs/canon/library.c:827
-#: camlibs/canon/library.c:1990
-msgid "Error"
-msgstr "错误"
-
-# camlibs/canon/library.c:832 camlibs/canon/library.c:859
-#: camlibs/canon/library.c:1993 camlibs/canon/library.c:2018
-msgid "Unavailable"
-msgstr "不可用"
-
-#: camlibs/canon/library.c:1997 camlibs/ptp2/config.c:5161
-#: camlibs/ptp2/ptp.c:3551
-msgid "Firmware Version"
-msgstr ""
-
-#: camlibs/canon/library.c:2022
-msgid "Power"
-msgstr ""
-
-# camlibs/canon/library.c:867
-#: camlibs/canon/library.c:2030
-msgid "Driver"
-msgstr "驱动器"
-
-# camlibs/canon/library.c:870 camlibs/canon/library.c:912
-#: camlibs/canon/library.c:2034 camlibs/canon/library.c:2418
-msgid "List all files"
-msgstr "列出所有文件"
-
-#: camlibs/canon/library.c:2040 camlibs/canon/library.c:2431
-msgid "Keep filename on upload"
-msgstr "上传时保持文件名"
-
-# camlibs/canon/library.c:165 camlibs/canon/library.c:889
-# camlibs/canon/library.c:902
-#: camlibs/canon/library.c:2066 camlibs/canon/library.c:2105
-#: camlibs/canon/library.c:2134 camlibs/canon/library.c:2163
-#: camlibs/canon/library.c:2191 camlibs/canon/library.c:2219
-#: camlibs/canon/library.c:2247 camlibs/canon/library.c:2275
-#: camlibs/canon/library.c:2304 camlibs/canon/library.c:2335
-#: camlibs/canon/library.c:2350 camlibs/canon/library.c:2379
-#: camlibs/canon/library.c:2408
-msgid "Camera unavailable"
-msgstr "相机不可用"
-
-# camlibs/canon/library.c:892
-#: camlibs/canon/library.c:2069
-msgid "Owner name changed"
-msgstr "所有者姓名已改变"
-
-# camlibs/canon/library.c:894
-#: camlibs/canon/library.c:2071
-msgid "could not change owner name"
-msgstr "无法改变所有者姓名"
-
-#: camlibs/canon/library.c:2083
-msgid "Capture size class changed"
-msgstr ""
-
-#: camlibs/canon/library.c:2090
-msgid "Invalid capture size class setting"
-msgstr ""
-
-#: camlibs/canon/library.c:2119
-msgid "Invalid ISO speed setting"
-msgstr ""
-
-#: camlibs/canon/library.c:2122
-msgid "ISO speed changed"
-msgstr ""
-
-#: camlibs/canon/library.c:2124
-msgid "Could not change ISO speed"
-msgstr ""
-
-#: camlibs/canon/library.c:2148
-msgid "Invalid shooting mode setting"
-msgstr ""
-
-#: camlibs/canon/library.c:2151
-msgid "Shooting mode changed"
-msgstr ""
-
-#: camlibs/canon/library.c:2153
-msgid "Could not change shooting mode"
-msgstr ""
-
-#: camlibs/canon/library.c:2177
-msgid "Invalid shutter speed setting"
-msgstr ""
-
-#: camlibs/canon/library.c:2180
-msgid "Shutter speed changed"
-msgstr ""
-
-#: camlibs/canon/library.c:2182
-msgid "Could not change shutter speed"
-msgstr ""
-
-#: camlibs/canon/library.c:2205 camlibs/canon/library.c:2364
-msgid "Invalid aperture setting"
-msgstr ""
-
-#: camlibs/canon/library.c:2208 camlibs/canon/library.c:2367
-msgid "Aperture changed"
-msgstr "光圈已经改变"
-
-#: camlibs/canon/library.c:2210 camlibs/canon/library.c:2369
-msgid "Could not change aperture"
-msgstr "不能改变光圈"
-
-#: camlibs/canon/library.c:2233
-msgid "Invalid exposure compensation setting"
-msgstr ""
-
-#: camlibs/canon/library.c:2236
-msgid "Exposure compensation changed"
-msgstr ""
-
-#: camlibs/canon/library.c:2238
-msgid "Could not change exposure compensation"
-msgstr ""
-
-#: camlibs/canon/library.c:2260
-msgid "Invalid image format setting"
-msgstr ""
-
-#: camlibs/canon/library.c:2264
-msgid "Image format changed"
-msgstr ""
-
-#: camlibs/canon/library.c:2266
-msgid "Could not change image format"
-msgstr ""
-
-#: camlibs/canon/library.c:2289
-msgid "Invalid focus mode setting"
-msgstr "无效的聚焦模式设置"
-
-#: camlibs/canon/library.c:2292
-msgid "Focus mode changed"
-msgstr "聚焦模式已经改变"
-
-#: camlibs/canon/library.c:2294
-msgid "Could not change focus mode"
-msgstr "不能改变聚焦模式"
-
-#: camlibs/canon/library.c:2318
-msgid "Invalid beep mode setting"
-msgstr "无效的蜂鸣模式设置"
-
-#: camlibs/canon/library.c:2321
-msgid "Beep mode changed"
-msgstr "蜂鸣模式已经改变"
-
-#: camlibs/canon/library.c:2323
-msgid "Could not change beep mode"
-msgstr "不能改变蜂鸣模式"
-
-#: camlibs/canon/library.c:2338
-msgid "Zoom level changed"
-msgstr "缩放级别已经改变"
-
-#: camlibs/canon/library.c:2340
-msgid "Could not change zoom level"
-msgstr "不能改变缩放级别"
-
-#: camlibs/canon/library.c:2393
-msgid "Invalid flash mode setting"
-msgstr "无效的闪光模式设置"
-
-#: camlibs/canon/library.c:2396
-msgid "Flash mode changed"
-msgstr "闪光模式已经改变"
-
-#: camlibs/canon/library.c:2398
-msgid "Could not change flash mode"
-msgstr "不能改变闪光模式"
-
-# camlibs/canon/library.c:905
-#: camlibs/canon/library.c:2411
-msgid "time set"
-msgstr "时间设置"
-
-# camlibs/canon/library.c:907
-#: camlibs/canon/library.c:2413
-msgid "could not set time"
-msgstr "无法设置时间"
-
-# camlibs/canon/library.c:1107
-#: camlibs/canon/library.c:2647
-#, c-format
-msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
-msgstr "给出未知端口类型 %i = 0x%x。不可能初始化。"
-
-# camlibs/canon/serial.c:625 camlibs/canon/serial.c:690
-#: camlibs/canon/serial.c:708 camlibs/canon/serial.c:773
-msgid "Battery exhausted, camera off."
-msgstr "电池没电，关闭相机。"
-
-# camlibs/canon/serial.c:628
-#: camlibs/canon/serial.c:711
-msgid "ERROR: unexpected message"
-msgstr "错误：未预期的消息"
-
-# camlibs/canon/serial.c:638
-#: camlibs/canon/serial.c:721
-msgid "ERROR: message overrun"
-msgstr "错误：过多的消息"
-
-# camlibs/canon/serial.c:667
-#: camlibs/canon/serial.c:750
-msgid "ERROR: out of sequence."
-msgstr "错误：顺序错误。"
-
-# camlibs/canon/serial.c:672
-#: camlibs/canon/serial.c:755
-msgid "ERROR: unexpected packet type."
-msgstr "错误：未预期的包类型。"
-
-# camlibs/canon/serial.c:682
-#: camlibs/canon/serial.c:765
-msgid "ERROR: message format error."
-msgstr "错误：消息格式错误。"
-
-# camlibs/canon/serial.c:694
-#: camlibs/canon/serial.c:777
-msgid "ERROR: unexpected message2."
-msgstr "错误：未预期的消息2。"
-
-# camlibs/canon/serial.c:888
-#: camlibs/canon/serial.c:994
-msgid "Uploading file..."
-msgstr "正在上载文件..."
-
-# camlibs/canon/serial.c:946 camlibs/digita/digita.c:256
-#: camlibs/canon/serial.c:1065 camlibs/digita/digita.c:259
-#: camlibs/directory/directory.c:561
-msgid "Getting file..."
-msgstr "正在获取文件..."
-
-#: camlibs/canon/serial.c:1135
-msgid ""
-"canon_serial_get_dirents: canon_serial_dialogue failed to fetch directory "
-"entries"
-msgstr ""
-
-#: camlibs/canon/serial.c:1143
-#, c-format
-msgid ""
-"canon_serial_get_dirents: Initial dirent packet too short (only %i bytes)"
-msgstr ""
-
-#: camlibs/canon/serial.c:1163
-#, c-format
-msgid "canon_serial_get_dirents: Could not allocate %i bytes of memory"
-msgstr ""
-
-#: camlibs/canon/serial.c:1183
-msgid "canon_serial_get_dirents: Failed to read another directory entry"
-msgstr ""
-
-#: camlibs/canon/serial.c:1201
-msgid "canon_serial_get_dirents: Truncated directory entry received"
-msgstr ""
-
-#: camlibs/canon/serial.c:1229
-msgid "canon_serial_get_dirents: Too many dirents, we must be looping."
-msgstr ""
-
-#: camlibs/canon/serial.c:1239
-#, c-format
-msgid "canon_serial_get_dirents: Could not resize dirent buffer to %i bytes"
-msgstr ""
-
-# camlibs/canon/serial.c:1172
-#: camlibs/canon/serial.c:1308
-msgid "Error changing speed."
-msgstr "改变速度出错。"
-
-# camlibs/canon/serial.c:1181
-#: camlibs/canon/serial.c:1317
-msgid "Resetting protocol..."
-msgstr "正在重置协议..."
-
-#: camlibs/canon/serial.c:1326
-msgid "Camera OK."
-msgstr "相机正常。"
-
-# camlibs/canon/serial.c:1203
-#: camlibs/canon/serial.c:1339
-msgid "Looking for camera ..."
-msgstr "正在寻找相机..."
-
-# camlibs/canon/serial.c:1213
-#: camlibs/canon/serial.c:1349
-msgid "Trying to contact camera..."
-msgstr "正试图与相机联络..."
-
-# camlibs/canon/serial.c:1217
-#: camlibs/canon/serial.c:1353
-msgid "Communication error 1"
-msgstr "通讯错误 1"
-
-# camlibs/canon/serial.c:1227 camlibs/canon/serial.c:1231
-# camlibs/dimera/dimera3500.c:970
-#: camlibs/canon/serial.c:1363 camlibs/canon/serial.c:1367
-#: camlibs/dimera/dimera3500.c:997
-msgid "No response from camera"
-msgstr "相机无应答"
-
-# camlibs/canon/serial.c:1235
-#: camlibs/canon/serial.c:1371
-msgid "Unrecognized response"
-msgstr "不可识别的应答"
-
-#: camlibs/canon/serial.c:1391
-#, c-format
-msgid "Detected a \"%s\" aka \"%s\""
-msgstr "检测到了一个 ”%s“ 又名 “%s”"
-
-# libgphoto2/gphoto2-result.c:46
-#: camlibs/canon/serial.c:1399
-#, c-format
-msgid "Unknown model \"%s\""
-msgstr "未知型号 \"%s\""
-
-# camlibs/canon/serial.c:1278
-#: camlibs/canon/serial.c:1420
-msgid "Bad EOT"
-msgstr "错误的 EOT"
-
-# camlibs/canon/serial.c:1284
-#: camlibs/canon/serial.c:1426
-msgid "Communication error 2"
-msgstr "通讯错误 2"
-
-# camlibs/canon/serial.c:1307
-#: camlibs/canon/serial.c:1449
-msgid "Communication error 3"
-msgstr "通讯错误 3"
-
-# camlibs/canon/serial.c:1311
-#: camlibs/canon/serial.c:1453
-msgid "Changing speed... wait..."
-msgstr "正在改变速度... 请等待..."
-
-# camlibs/canon/serial.c:1316
-#: camlibs/canon/serial.c:1458
-msgid "Error changing speed"
-msgstr "改变速度出错"
-
-#: camlibs/canon/serial.c:1469
-msgid "Error waiting for ACK during initialization, retrying"
-msgstr ""
-
-# camlibs/canon/serial.c:1334
-#: camlibs/canon/serial.c:1475
-msgid "Error waiting ACK during initialization"
-msgstr "初始化中等待 ACK 时出错"
-
-# camlibs/canon/serial.c:1338
-#: camlibs/canon/serial.c:1479
-msgid "Connected to camera"
-msgstr "已连接到相机"
-
-#: camlibs/canon/serial.c:1517
-msgid "ERROR: a fatal error condition was detected, can't continue "
-msgstr "错误：找到一个致命错误情况，无法继续 "
-
-#: camlibs/canon/serial.c:1533
-#, c-format
-msgid "ERROR: %d is too big"
-msgstr "错误：%d 太大"
-
-# camlibs/canon/serial.c:1400
-#: camlibs/canon/serial.c:1543
-msgid "Getting thumbnail..."
-msgstr "正在获取缩略图..."
-
-#: camlibs/canon/usb.c:222
-msgid "NOT RECOGNIZED"
-msgstr "没有识别"
-
-# camlibs/ricoh/library.c:242
-#: camlibs/canon/usb.c:237
-msgid "Could not establish initial contact with camera"
-msgstr "无法建立与相机的连接。"
-
-#: camlibs/canon/usb.c:243
-msgid "Camera was already active"
-msgstr "照相机已经激活"
-
-#: camlibs/canon/usb.c:246
-msgid "Camera was woken up"
-msgstr "照相机被唤醒"
-
-# libgphoto2/gphoto2-result.c:76
-#: camlibs/canon/usb.c:251
-msgid "Unknown (some kind of error)"
-msgstr "未知(某些错误)"
-
-#: camlibs/canon/usb.c:252
-#, c-format
-msgid "Initial camera response '%c' unrecognized"
-msgstr "初始相机响应 '%c' 无法识别"
-
-#: camlibs/canon/usb.c:267
-#, c-format
-msgid ""
-"Step #2 of initialization failed: (\"%s\" on read of %i). Camera not "
-"operational"
-msgstr ""
-
-#: camlibs/canon/usb.c:272
-#, c-format
-msgid ""
-"Step #2 of initialization failed! (returned %i bytes, expected %i). Camera "
-"not operational"
-msgstr ""
-
-#: camlibs/canon/usb.c:291
-#, c-format
-msgid ""
-"Step #3 of initialization failed: \"%s\" on read of %i. Camera not "
-"operational"
-msgstr ""
-
-#: camlibs/canon/usb.c:298 camlibs/canon/usb.c:325
-#, c-format
-msgid ""
-"Step #3 of initialization failed! (returned %i, expected %i). Camera not "
-"operational"
-msgstr ""
-
-#: camlibs/canon/usb.c:318
-#, c-format
-msgid ""
-"Step #3 of initialization failed: \"%s\" on write of %i. Camera not "
-"operational"
-msgstr ""
-
-#: camlibs/canon/usb.c:356 camlibs/canon/usb.c:397
-#, c-format
-msgid "Step #4 failed: \"%s\" on read of %i. Camera not operational"
-msgstr ""
-
-#: camlibs/canon/usb.c:363 camlibs/canon/usb.c:404
-#, c-format
-msgid "Step #4 failed (returned %i, expected %i). Camera not operational"
-msgstr ""
-
-# camlibs/canon/usb.c:240
-#: camlibs/canon/usb.c:512
-#, c-format
-msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
-msgstr "相机未就绪，多个“鉴别相机”请求均失败：%s"
-
-# camlibs/canon/usb.c:240
-#: camlibs/canon/usb.c:550 camlibs/canon/usb.c:566
-#, c-format
-msgid "Camera not ready, get_battery failed: %s"
-msgstr "相机未就绪，get_battery请求失败：%s"
-
-#: camlibs/canon/usb.c:631
-#, c-format
-msgid ""
-"canon_usb_lock_keys: Unexpected length returned from \"lock keys\" function "
-"(%i bytes, expected %i)"
-msgstr ""
-
-#: camlibs/canon/usb.c:653 camlibs/canon/usb.c:679 camlibs/canon/usb.c:719
-#, c-format
-msgid ""
-"canon_usb_lock_keys: Unexpected length returned (%i bytes, expected %i)"
-msgstr ""
-
-#: camlibs/canon/usb.c:762 camlibs/canon/usb.c:778
-#, c-format
-msgid ""
-"canon_usb_unlock_keys: Unexpected length returned (%i bytes, expected %i)"
-msgstr ""
-
-#: camlibs/canon/usb.c:834 camlibs/canon/usb.c:853
-#, c-format
-msgid ""
-"canon_usb_get_body_id: Unexpected data length returned (%i bytes, expected "
-"%i)"
-msgstr ""
-
-#: camlibs/canon/usb.c:915
-#, c-format
-msgid ""
-"canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, %6.3f "
-"sec \"%s\""
-msgstr ""
-
-#: camlibs/canon/usb.c:988
-#, c-format
-msgid ""
-"canon_usb_poll_interrupt_multiple: interrupt read failed after %i tries, "
-"\"%s\""
-msgstr ""
-
-#: camlibs/canon/usb.c:1173
-#, c-format
-msgid ""
-"canon_usb_capture_dialogue: bogus length 0x%04x for thumbnail size packet"
-msgstr ""
-
-#: camlibs/canon/usb.c:1190
-#, c-format
-msgid ""
-"canon_usb_capture_dialogue: bogus length 0x%04x for full image size packet"
-msgstr ""
-
-#: camlibs/canon/usb.c:1209
-msgid "canon_usb_capture_dialogue: secondary image descriptor received"
-msgstr ""
-
-#: camlibs/canon/usb.c:1236
-msgid "canon_usb_capture_dialogue: first interrupt read out of sequence"
-msgstr ""
-
-#: camlibs/canon/usb.c:1245
-msgid "canon_usb_capture_dialogue: second interrupt read out of sequence"
-msgstr ""
-
-#: camlibs/canon/usb.c:1256
-#, c-format
-msgid ""
-"canon_usb_capture_dialogue: photographic failure signaled, code = 0x%08x"
-msgstr ""
-
-#: camlibs/canon/usb.c:1276
-msgid "canon_usb_capture_dialogue: third EOS interrupt read out of sequence"
-msgstr ""
-
-#: camlibs/canon/usb.c:1315
-msgid "canon_usb_capture_dialogue: fourth EOS interrupt read out of sequence"
-msgstr ""
-
-#: camlibs/canon/usb.c:1503
-#, c-format
-msgid "canon_usb_dialogue: payload too big, won't fit into buffer (%i > %i)"
-msgstr ""
-
-#: camlibs/canon/usb.c:1610
-#, c-format
-msgid "canon_usb_dialogue: expected 0x%x bytes, but camera reports 0x%x"
-msgstr ""
-
-# camlibs/canon/usb.c:640
-#: camlibs/canon/usb.c:1776
-msgid "Receiving data..."
-msgstr "正在接收数据..."
-
-#: camlibs/canon/usb.c:2160 camlibs/canon/usb.c:2306
-#, c-format
-msgid "Out of memory: %d bytes needed."
-msgstr "内存不足：需要%d字节。"
-
-#: camlibs/canon/usb.c:2224
-msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
-msgstr ""
-
-#: camlibs/canon/usb.c:2231
-#, c-format
-msgid ""
-"Warning in canon_usb_set_file_attributes: canon_usb_dialogue returned error "
-"status 0x%08x from camera"
-msgstr ""
-
-# camlibs/canon/library.c:275
-#: camlibs/canon/usb.c:2317
-#, c-format
-msgid "Couldn't read from file \"%s\""
-msgstr "无法获取文件信息：%s"
-
-#: camlibs/canon/usb.c:2327
-#, c-format
-msgid "Out of memory: %ld bytes needed."
-msgstr "内存不足：需要%ld字节。"
-
-# camlibs/canon/serial.c:888
-#: camlibs/canon/usb.c:2360 camlibs/canon/usb.c:2371 camlibs/canon/usb.c:2407
-#: camlibs/canon/usb.c:2421 camlibs/canon/usb.c:2435
-msgid "File upload failed."
-msgstr "文件上传失败。"
-
-#: camlibs/canon/usb.c:2461
-msgid ""
-"File was too big. You may have to turn your camera off and back on before "
-"uploading more files."
-msgstr "文件太大。你可能需要将相机关闭再打开，才能上传更多文件。"
-
-#: camlibs/canon/usb.c:2508
-#, c-format
-msgid ""
-"canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
-"too long."
-msgstr ""
-
-#: camlibs/canon/usb.c:2525
-#, c-format
-msgid ""
-"canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
-"returned %i"
-msgstr ""
-
-#: camlibs/canon/usb.c:2579
-#, c-format
-msgid ""
-"canon_usb_list_all_dirs: Couldn't fit payload into buffer, '%.96s' "
-"(truncated) too long."
-msgstr ""
-
-#: camlibs/canon/usb.c:2598
-#, c-format
-msgid ""
-"canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
-"returned %i"
-msgstr ""
-
-# camlibs/canon/usb.c:871
-#: camlibs/canon/usb.c:2675
-#, c-format
-msgid "Detected a '%s'."
-msgstr "已监测到一个“%s”。"
-
-#: camlibs/canon/usb.c:2681
-#, c-format
-msgid "Name \"%s\" from camera does not match any known camera"
-msgstr ""
-
-# camlibs/dimera/dimera3500.c:347
-#: camlibs/casio/casio-qv.c:151
-#, c-format
-msgid "Image type %d not supported"
-msgstr "图像类型%d不支持"
-
-#: camlibs/casio/casio-qv.c:176 camlibs/konica/qm150.c:436
-#, c-format
-msgid "Image %s is delete protected."
-msgstr "图像 %s 不可删除。"
-
-#: camlibs/casio/casio-qv.c:189
-msgid ""
-"Driver framework written by Lutz Mueller <lutz@users.sf.net>.\n"
-"This software has QVplay's source code, written by Ken-ichi HAYASHI <xg2k-"
-"hys@asahi-net.or.jp> and Jun-ichiro \"itojun\" Itoh <itojun@itojun.org>.\n"
-"Integration of QVplay by Michael Haardt <michael@moria.de>."
-msgstr ""
-
-#: camlibs/casio/casio-qv.c:208
-#, c-format
-msgid "Battery level: %.1f Volts. Revision: %08x."
-msgstr ""
-
-# camlibs/polaroid/pdc700.c:981 camlibs/sierra/sierra.c:776
-# camlibs/sierra/sierra.c:1353
-#: camlibs/casio/casio-qv.c:266 camlibs/dimera/dimera3500.c:841
-#: camlibs/kodak/dc210/dc210.c:172 camlibs/polaroid/pdc700.c:980
-#: camlibs/sierra/sierra.c:914 camlibs/sierra/sierra.c:1492
-#: camlibs/sierra/sierra-desc.c:205 camlibs/topfield/puppy.c:537
-msgid "Camera Configuration"
-msgstr "相机配置"
-
-# camlibs/polaroid/pdc700.c:172
-#: camlibs/casio/casio-qv.c:269 camlibs/konica/qm150.c:1134
-#, c-format
-msgid "Battery"
-msgstr "电池"
-
-# camlibs/sierra/sierra.c:1083 camlibs/sierra/sierra.c:1322
-#: camlibs/casio/casio-qv.c:276
-msgid "Brightness"
-msgstr "亮度"
-
-# camlibs/sierra/sierra.c:918 camlibs/sierra/sierra.c:926
-# camlibs/sierra/sierra.c:1214
-#: camlibs/casio/casio-qv.c:278 camlibs/casio/casio-qv.c:281
-msgid "Too bright"
-msgstr "亮度过大"
-
-# camlibs/konica/konica.c:104
-#: camlibs/casio/casio-qv.c:279 camlibs/casio/casio-qv.c:282
-msgid "Too dark"
-msgstr "亮度过小"
-
-# camlibs/kodak/dc240/library.c:572
-#: camlibs/casio/casio-qv.c:280 camlibs/casio/casio-qv.c:283
-#: camlibs/kodak/dc240/library.c:553
-msgid "OK"
-msgstr "确认"
-
-#: camlibs/clicksmart310/library.c:101
-#, c-format
-msgid "Your Logitech Clicksmart 310 has %i picture in it.\n"
-msgid_plural "Your Logitech Clicksmart 310 has %i pictures in it.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: camlibs/clicksmart310/library.c:114
-msgid ""
-"There are two resolution settings, 352x288 and 176x144. Photo data \n"
-"is in JPEG format when downloaded and thus has no predetermined\n"
-"size. Therefore, the advertised maximum number of photos the\n"
-"camera can hold must be understood as an approximation.\n"
-"All gphoto2 options will work, except for the following which\n"
-"the hardware will not support:\n"
-"\tDeletion of individual or selected photos (gphoto2 -d)\n"
-"\tCapture (gphoto2 --capture or --capture-image)\n"
-"However, capture is possible using the webcam interface,\n"
-"supported by the spca50x kernel module.\n"
-"GUI access using gtkam has been tested, and works. However,\n"
-"the camera does not produce separate thumbnails. Since the images\n"
-"are in any event already small and of low resolution, the driver\n"
-"merely downloads the actual images to use as thumbnails.\n"
-"The camera can shoot in 'video clip' mode. The resulting frames\n"
-"are saved here as a succession of still photos. The user can \n"
-"animate them using (for example) ImageMagick's 'animate' function.\n"
-"For more details on the camera's functions, please consult\n"
-"libgphoto2/camlibs/clicksmart310/README.clicksmart310.\n"
-msgstr ""
-
-#: camlibs/clicksmart310/library.c:141
-msgid ""
-"Logitech Clicksmart 310 driver\n"
-"Theodore Kilgore <kilgota@auburn.edu>\n"
-msgstr ""
-
-#: camlibs/digigr8/library.c:149
-msgid ""
-"For cameras with insides from S&Q Technologies, which have the \n"
-"USB Vendor ID 0x2770 and Product ID 0x905C, 0x9050, 0x9051,\n"
-"0x9052, or 0x913D.  Photos are saved in PPM format.\n"
-"\n"
-"Some of these cameras allow software deletion of all photos.\n"
-"Others do not. No supported camera can do capture-image. All\n"
-"can do capture-preview (image captured and sent to computer).\n"
-"If delete-all does work for your camera, then capture-preview will\n"
-"have the side-effect that it also deletes what is on the camera.\n"
-"\n"
-"File uploading is not supported for these cameras. Also, none of the\n"
-"supported cameras allow deletion of individual photos by use of a\n"
-"software command.\n"
-msgstr ""
-
-#: camlibs/digigr8/library.c:168
-msgid ""
-"sq905C generic driver\n"
-"Theodore Kilgore <kilgota@auburn.edu>\n"
-msgstr ""
-
-# camlibs/dimera/dimera3500.c:347
-#: camlibs/digita/digita.c:335 camlibs/dimera/dimera3500.c:322
-msgid "Image type is not supported"
-msgstr "图像类型不支持"
-
-# camlibs/agfa/agfa.c:221 camlibs/digita/digita.c:389
-#: camlibs/digita/digita.c:393
-#, c-format
-msgid "Number of pictures: %d"
-msgstr "照片数量：%d"
-
-# camlibs/digita/digita.c:396
-#: camlibs/digita/digita.c:400
-msgid ""
-"Digita\n"
-"Johannes Erdfelt <johannes@erdfelt.com>"
-msgstr ""
-"Digita\n"
-"Johannes Erdfelt <johannes@erdfelt.com>"
-
-# camlibs/dimera/dimera3500.c:295
-#: camlibs/dimera/dimera3500.c:161
-#, c-format
-msgid ""
-"Only root folder is supported - you requested a file listing for folder '%s'."
-msgstr "仅支持根文件夹 - 您请求文件“%s”的文件列表。"
-
-# camlibs/dimera/dimera3500.c:303 camlibs/dimera/dimera3500.c:497
-#: camlibs/dimera/dimera3500.c:169 camlibs/dimera/dimera3500.c:433
-msgid "Problem getting number of images"
-msgstr "获取图像数量时出问题"
-
-# camlibs/dimera/dimera3500.c:402 camlibs/dimera/dimera3500.c:648
-#: camlibs/dimera/dimera3500.c:340 camlibs/dimera/dimera3500.c:584
-msgid "Problem getting image information"
-msgstr "获取图像信息时出问题"
-
-# camlibs/dimera/dimera3500.c:433
-#: camlibs/dimera/dimera3500.c:371
-msgid "Capture type is not supported"
-msgstr "不支持的捕捉类型"
-
-# camlibs/dimera/dimera3500.c:518
-#: camlibs/dimera/dimera3500.c:454
-#, c-format
-msgid " (battery is %d%% full)"
-msgstr " (电池 %d%% 满)"
-
-#: camlibs/dimera/dimera3500.c:458
-#, c-format
-msgid ""
-"Dimera 3500 ver. %s %d/%d %d:%d.\n"
-"%d pictures used of approximately %d (high res) or %d (low res).\n"
-"Camera features: %s, %s, %s, %s.\n"
-"Flash is %s, is %s and is %s.\n"
-"Resolution is set to %s.\n"
-"Camera is %s powered %s.\n"
-msgstr ""
-
-# camlibs/dimera/dimera3500.c:533 camlibs/konica/library.c:744
-# camlibs/konica/library.c:984
-#: camlibs/dimera/dimera3500.c:469 camlibs/dimera/dimera3500.c:855
-#: camlibs/kodak/dc210/dc210.c:257 camlibs/kodak/dc210/dc210.c:425
-#: camlibs/konica/library.c:777 camlibs/konica/library.c:1018
-#: camlibs/konica/qm150.c:848 camlibs/ptp2/config.c:1197
-#: camlibs/ptp2/config.c:3263 camlibs/ptp2/ptp.c:4208
-#: camlibs/ricoh/library.c:502 camlibs/sierra/nikon-desc.c:286
-msgid "Flash"
-msgstr "闪光灯"
-
-#: camlibs/dimera/dimera3500.c:469 camlibs/ptp2/config.c:2513
-msgid "No Flash"
-msgstr ""
-
-# camlibs/dimera/dimera3500.c:535
-#: camlibs/dimera/dimera3500.c:471
-msgid "Dual Iris"
-msgstr "双光圈"
-
-#: camlibs/dimera/dimera3500.c:471
-msgid "No Dual Iris"
-msgstr ""
-
-# camlibs/dimera/dimera3500.c:537
-#: camlibs/dimera/dimera3500.c:473
-msgid "Resolution Switch"
-msgstr "分辨率切换"
-
-#: camlibs/dimera/dimera3500.c:473
-msgid "No Resolution Switch"
-msgstr ""
-
-#: camlibs/dimera/dimera3500.c:475
-msgid "No Power Light"
-msgstr ""
-
-# camlibs/dimera/dimera3500.c:541
-#: camlibs/dimera/dimera3500.c:477
-msgid "ON"
-msgstr "开"
-
-# camlibs/dimera/dimera3500.c:541
-#: camlibs/dimera/dimera3500.c:477
-msgid "OFF"
-msgstr "关"
-
-# camlibs/dimera/dimera3500.c:543
-#: camlibs/dimera/dimera3500.c:479
-msgid "ready"
-msgstr "就绪"
-
-#: camlibs/dimera/dimera3500.c:479
-msgid "Not ready"
-msgstr ""
-
-# camlibs/dimera/dimera3500.c:545
-#: camlibs/dimera/dimera3500.c:481
-msgid "in fill mode"
-msgstr "处于填充模式"
-
-#: camlibs/dimera/dimera3500.c:481
-msgid "Not in fill mode"
-msgstr ""
-
-# camlibs/dimera/dimera3500.c:547
-#: camlibs/dimera/dimera3500.c:483
-msgid "low (320x240)"
-msgstr "低 (320x240)"
-
-# camlibs/dimera/dimera3500.c:547
-#: camlibs/dimera/dimera3500.c:483
-msgid "high (640x480)"
-msgstr "高 (640x480)"
-
-# camlibs/dimera/dimera3500.c:549
-#: camlibs/dimera/dimera3500.c:485
-msgid "externally"
-msgstr "外部"
-
-# camlibs/dimera/dimera3500.c:549
-#: camlibs/dimera/dimera3500.c:485
-msgid "internally"
-msgstr "内部"
-
-# camlibs/dimera/dimera3500.c:559
-#: camlibs/dimera/dimera3500.c:495
-msgid ""
-"* Image glitches or problems communicating are\n"
-"  often caused by a low battery.\n"
-"* Images captured remotely on this camera are stored\n"
-"  in temporary RAM and not in the flash memory card.\n"
-"* Exposure control when capturing images can be\n"
-"  configured manually or set to automatic mode.\n"
-"* Image quality is currently lower than it could be.\n"
-msgstr ""
-"* 图像干扰或通讯问题经常是由电量\n"
-"  不足导致的。\n"
-"* 该相机远程捕捉的图像是存储在临\n"
-"  时 RAM 中，而不是在闪存卡中。\n"
-"* 捕捉所有图像时的曝光控制是由捕\n"
-"  捉预览函数自动设定的。\n"
-"* 当前图像质量比可能的图像质量低。\n"
-
-# camlibs/dimera/dimera3500.c:573
-#: camlibs/dimera/dimera3500.c:509
-msgid ""
-"gPhoto2 Mustek VDC-3500/Relisys Dimera 3500\n"
-"This software was created with the\n"
-"help of proprietary information belonging\n"
-"to StarDot Technologies.\n"
-"\n"
-"Author:\n"
-"  Brian Beattie  <URL:http://www.beattie-home.net>\n"
-"Contributors:\n"
-"  Chuck Homic <chuck@vvisions.com>\n"
-"     Converting raw camera images to RGB\n"
-"  Dan Fandrich <dan@coneharvesters.com>\n"
-"     Information on protocol, raw image format,\n"
-"     gphoto2 port\n"
-msgstr ""
-"gPhoto2 Mustek VDC-3500/Relisys Dimera 3500\n"
-"该软件是在属于 StarDot\n"
-"科技的私有信息的帮助下\n"
-"编制的。\n"
-"\n"
-"作者：\n"
-"  Brian Beattie  <URL:http://www.beattie-home.net>\n"
-"贡献者：\n"
-"  Chuck Homic <chuck@vvisions.com>\n"
-"     将原始相机图像转换为 RGB 格式\n"
-"  Dan Fandrich <dan@coneharvesters.com>\n"
-"     关于协议、原始数据格式的信息。\n"
-"     移植到 gphoto2\n"
-
-# camlibs/dimera/dimera3500.c:666
-#: camlibs/dimera/dimera3500.c:602
-msgid "Problem reading image from flash"
-msgstr "从闪存读取图像出问题"
-
-# camlibs/dimera/dimera3500.c:684 camlibs/dimera/dimera3500.c:850
-# camlibs/dimera/dimera3500.c:918
-#: camlibs/dimera/dimera3500.c:620 camlibs/dimera/dimera3500.c:786
-#: camlibs/dimera/dimera3500.c:936
-msgid "Out of memory"
-msgstr "内存耗尽"
-
-# camlibs/dimera/dimera3500.c:701 camlibs/dimera/dimera3500.c:737
-# camlibs/panasonic/coolshot/library.c:375 camlibs/samsung/samsung.c:211
-#: camlibs/dimera/dimera3500.c:637 camlibs/dimera/dimera3500.c:673
-#: camlibs/konica/qm150.c:257 camlibs/panasonic/coolshot/library.c:397
-#: camlibs/ricoh/g3.c:356 camlibs/samsung/samsung.c:214
-#: camlibs/sipix/web2.c:175 camlibs/smal/ultrapocket.c:134
-#: camlibs/smal/ultrapocket.c:182
-msgid "Downloading image..."
-msgstr "正在下载图像..."
-
-# camlibs/dimera/dimera3500.c:723 camlibs/dimera/dimera3500.c:759
-#: camlibs/dimera/dimera3500.c:659 camlibs/dimera/dimera3500.c:695
-msgid "Problem downloading image"
-msgstr "下载图像出问题"
-
-# camlibs/dimera/dimera3500.c:731
-#: camlibs/dimera/dimera3500.c:667
-msgid "User canceled download"
-msgstr "用户取消下载"
-
-# camlibs/dimera/dimera3500.c:865
-#: camlibs/dimera/dimera3500.c:801
-msgid "Problem taking live image"
-msgstr "获取现场图像有问题"
-
-# camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/dimera/dimera3500.c:843 camlibs/konica/library.c:803
-#: camlibs/konica/library.c:1036 camlibs/konica/qm150.c:876
-#: camlibs/ricoh/library.c:498
-msgid "Exposure"
-msgstr "曝光"
-
-#: camlibs/dimera/dimera3500.c:846 camlibs/dimera/dimera3500.c:883
-msgid "Automatic exposure adjustment on preview"
-msgstr ""
-
-#: camlibs/dimera/dimera3500.c:850 camlibs/dimera/dimera3500.c:875
-msgid "Exposure level on preview"
-msgstr ""
-
-#: camlibs/dimera/dimera3500.c:858 camlibs/dimera/dimera3500.c:892
-msgid "Automatic flash on capture"
-msgstr ""
-
-# camlibs/dimera/dimera3500.c:937
-#: camlibs/dimera/dimera3500.c:964
-msgid "Problem opening port"
-msgstr "打开端口出问题"
-
-# camlibs/dimera/dimera3500.c:947
-#: camlibs/dimera/dimera3500.c:974
-msgid "Problem resetting camera"
-msgstr "重置相机出问题"
-
-# camlibs/dimera/dimera3500.c:957
-#: camlibs/dimera/dimera3500.c:984
-msgid "Problem setting camera communication speed"
-msgstr "设置相机通讯速度出问题"
-
-# camlibs/dimera/dimera3500.c:976
-#: camlibs/dimera/dimera3500.c:1003
-msgid "Looks like a modem, not a camera"
-msgstr "看起来象调制解调器，而不象相机"
-
-# camlibs/directory/directory.c:159
-#: camlibs/directory/directory.c:268
-#, c-format
-msgid "Listing files in '%s'..."
-msgstr "正在“%s”中列举文件..."
-
-# camlibs/directory/directory.c:228
-#: camlibs/directory/directory.c:346
-#, c-format
-msgid "Listing folders in '%s'..."
-msgstr "正在“%s”中列举文件夹..."
-
-# camlibs/directory/directory.c:195
-#: camlibs/directory/directory.c:364
-#, c-format
-msgid "Could not get information about '%s' (%m)."
-msgstr "无法获取关于“%s”(%m) 的信息。"
-
-# camlibs/directory/directory.c:269
-#: camlibs/directory/directory.c:394 camlibs/directory/directory.c:516
-#, c-format
-msgid "Could not get information about '%s' in '%s' (%m)."
-msgstr "无法从“%2$s”中获取关于“%1$s”的信息 (%3$m)。"
-
-# camlibs/directory/directory.c:340
-#: camlibs/directory/directory.c:442
-#, c-format
-msgid "Could not change time of file '%s' in '%s' (%m)."
-msgstr "无法改变“%2$s”中的文件“%1$s”的时间(%3$m)。"
-
-# camlibs/directory/directory.c:421
-#: camlibs/directory/directory.c:535
-#, c-format
-msgid "Could not open '%s'."
-msgstr "无法打开“%s”。"
-
-# camlibs/directory/directory.c:506
-#: camlibs/directory/directory.c:599
-msgid ""
-"The Directory Browse \"camera\" lets you index photos on your hard drive."
-msgstr "目录浏览“相机”允许您为您硬盘上的照片编制索引。"
-
-# camlibs/directory/directory.c:515
-#: camlibs/directory/directory.c:608
-msgid "Directory Browse Mode - written by Scott Fritzinger <scottf@unr.edu>."
-msgstr "目录浏览模式 - 由 Scott Fritzinger <scottf@unr.edu> 编制。"
-
-# camlibs/directory/directory.c:562
-#: camlibs/directory/directory.c:655
-#, c-format
-msgid "Could not delete file '%s' in folder '%s' (error code %i: %m)."
-msgstr "无法删除文件夹“%2$s”中的文件“%1$s”(错误码 %3$i：%4$m)。"
-
-#: camlibs/enigma13/enigma13.c:70
-msgid ""
-"Download program for Digital Dream Enigma 1.3. by "
-"<olivier@aixmarseille.com>, and adapted from spca50x driver.Thanks you, "
-"spca50x team, it was easy to port your driver on this cam! "
-msgstr ""
-
-# camlibs/polaroid/pdc700.c:349
-#: camlibs/fuji/fuji.c:85
-#, c-format
-msgid "The camera sent only %i byte(s), but we need at least %i."
-msgstr "相机只发送 %i 个字节，但我们至少需要 %i 个。"
-
-# camlibs/ricoh/library.c:242
-#: camlibs/fuji/fuji.c:128 camlibs/ricoh/library.c:561
-msgid "Could not contact camera."
-msgstr "无法检测到任何相机。"
-
-# camlibs/polaroid/pdc700.c:229
-#: camlibs/fuji/fuji.c:190
-#, c-format
-msgid "Received unexpected data (0x%02x, 0x%02x)."
-msgstr "收到意外的数据 (0x%02x，0x%02x)。"
-
-#: camlibs/fuji/fuji.c:216
-#, c-format
-msgid "Wrong escape sequence: expected 0x%02x, got 0x%02x."
-msgstr "错误的 ESC 序列：应为 0x%02x，得到 0x%02x。"
-
-#: camlibs/fuji/fuji.c:233
-#, c-format
-msgid "Bad data - got 0x%02x, expected 0x%02x."
-msgstr "错误的数据 - 得到 0x%02x，应为 0x%02x。"
-
-#: camlibs/fuji/fuji.c:246
-#, c-format
-msgid "Bad data - got 0x%02x, expected 0x%02x or 0x%02x."
-msgstr "错误的数据 - 得到 0x%02x，应为 0x%02x 或 0x%02x。"
-
-#: camlibs/fuji/fuji.c:253
-#, c-format
-msgid "Bad checksum - got 0x%02x, expected 0x%02x."
-msgstr "错误的校验和 - 得到 0x%02x，应为 0x%02x。"
-
-# camlibs/polaroid/pdc700.c:296
-#: camlibs/fuji/fuji.c:291 camlibs/fuji/fuji.c:730
-msgid "Camera rejected the command."
-msgstr "相机拒绝命令。"
-
-# camlibs/sierra/sierra.c:1048 camlibs/sierra/sierra.c:1510
-#: camlibs/fuji/fuji.c:300 camlibs/fuji/fuji.c:739
-msgid "Camera reset itself."
-msgstr "相机自行重置。"
-
-#: camlibs/fuji/fuji.c:304 camlibs/fuji/fuji.c:744
-#, c-format
-msgid "Camera sent unexpected byte 0x%02x."
-msgstr "相机发送了意外的字节 0x%02x。"
-
-# camlibs/konica/lowlevel.c:382 camlibs/polaroid/pdc700.c:314
-# camlibs/sierra/library.c:989
-#: camlibs/fuji/fuji.c:319 camlibs/konica/lowlevel.c:382
-#: camlibs/polaroid/pdc700.c:314 camlibs/ricoh/g3.c:350
-msgid "Downloading..."
-msgstr "正在下载..."
-
-#: camlibs/fuji/fuji.c:540
-#, c-format
-msgid "Could not allocate %i byte(s) for downloading the thumbnail."
-msgstr "无法为正在下载的缩略图分配 %i 个字节。"
-
-#: camlibs/fuji/fuji.c:574
-#, c-format
-msgid "Could not allocate %i byte(s) for downloading the picture."
-msgstr "无法为正在下载的图片分配 %i 个字节。"
-
-# camlibs/polaroid/pdc700.c:296
-#: camlibs/fuji/fuji.c:673
-#, c-format
-msgid "The camera does not accept '%s' as filename."
-msgstr "相机不接受作为文件名的“%s”。"
-
-#: camlibs/fuji/fuji.c:677
-#, c-format
-msgid "Could not initialize upload (camera responded with 0x%02x)."
-msgstr "无法初始化上载 (相机应答 0x%02x)。"
-
-# libgphoto2/gphoto2-camera.c:850
-#: camlibs/fuji/fuji.c:775
-#, c-format
-msgid "The camera does not support speed %i."
-msgstr "该相机不支持速度 %i。"
-
-#: camlibs/fuji/fuji.c:779
-#, c-format
-msgid "Could not set speed to %i (camera responded with %i)."
-msgstr "无法将速度设置为 %i (相机应答 %i)。"
-
-#: camlibs/fuji/library.c:153
-msgid ""
-"Matthew G. Martin\n"
-"Based on fujiplay by Thierry Bousch <bousch@topo.math.u-psud.fr>\n"
-msgstr ""
-"Matthew G. Martin\n"
-"基于 Thierry Bousch <bousch@topo.math.u-psud.fr> 的 fujiplay\n"
-
-# camlibs/ricoh/library.c:252
-#: camlibs/fuji/library.c:317
-#, c-format
-msgid "Bit rate %ld is not supported."
-msgstr ""
-
-#: camlibs/fuji/library.c:365
-msgid "Configuration for your FUJI camera"
-msgstr "配置您的 FUJI 相机"
-
-# camlibs/sierra/sierra.c:1581 camlibs/sierra/sierra.c:1754
-#: camlibs/fuji/library.c:370 camlibs/fuji/library.c:403
-#: camlibs/ptp2/ptp.c:3469 camlibs/ricoh/library.c:447
-#: camlibs/ricoh/library.c:449 camlibs/sierra/sierra.c:1720
-#: camlibs/sierra/sierra.c:1893
-msgid "Date & Time"
-msgstr "日期和时间"
-
-#: camlibs/fuji/library.c:385 camlibs/fuji/library.c:418
-#: camlibs/ptp2/config.c:4715
-msgid "ID"
-msgstr "ID"
-
-# frontends/command-line/actions.c:159
-#: camlibs/fuji/library.c:438
-msgid "Version: "
-msgstr "版本： "
-
-# frontends/command-line/main.c:384
-#: camlibs/fuji/library.c:444
-msgid "Model: "
-msgstr "型号： "
-
-# frontends/command-line/shell.c:779
-#: camlibs/fuji/library.c:451
-msgid "Available memory: "
-msgstr "可用的内存： "
-
-#: camlibs/gsmart300/library.c:163
-msgid ""
-"gsmart300 library \n"
-"Till Adam <till@adam-lilienthal.de>\n"
-"Jerome Lodewyck <jerome.lodewyck@ens.fr>\n"
-"Support for Mustek gSmart 300 digital cameras\n"
-"based on several other gphoto2 camlib modules and the specifications kindly "
-"provided by Mustek.\n"
-"\n"
-msgstr ""
-
-#: camlibs/gsmart300/library.c:207 camlibs/spca50x/library.c:573
-#, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
-msgstr "不支持的端口类型：%d。该驱动程序只支持 USB 照相机。\n"
-
-# libgphoto2/gphoto2-camera.c:662
-#: camlibs/gsmart300/library.c:224 camlibs/spca50x/library.c:631
-msgid "Could not reset camera.\n"
-msgstr "无法重置相机。\n"
-
-#: camlibs/gsmart300/library.c:335 camlibs/spca50x/library.c:511
-#, c-format
-msgid ""
-"Your camera only supports deleting the last file on the camera. In this "
-"case, this is file '%s'."
-msgstr ""
-
-#: camlibs/hp215/hp215.c:440
-#, c-format
-msgid ""
-"Current camera time:  %04d-%02d-%02d  %02d:%02d\n"
-"Free card memory: %d\n"
-"Images on card: %d\n"
-"Free space (Images): %d\n"
-"Battery level: %d %%."
-msgstr ""
-
-#: camlibs/hp215/hp215.c:464
-msgid ""
-"hp215\n"
-"Marcus Meissner <marcus@jet.franken.de>\n"
-"Driver to access the HP Photosmart 215 camera.\n"
-"Merged from the standalone hp215 program.\n"
-"This driver allows download of images and previews, and deletion of images.\n"
-msgstr ""
-
-#: camlibs/iclick/library.c:102
-#, c-format
-msgid ""
-"Your USB camera is an iClick 5X.\n"
-"The total number of pictures taken is %i\n"
-msgstr ""
-"您的USB照相机是iClick 5X。\n"
-"现有照片的总数是%i\n"
-
-#: camlibs/iclick/library.c:114
-msgid ""
-"Information regarding cameras with ID 0x2770:0x9153.\n"
-"\n"
-"We do not recommend the use of a GUI program to access\n"
-"this camera, unless you are just having fun or trying to\n"
-"see if you can blow a fuse.\n"
-"For production use, try\n"
-"gphoto2 -P\n"
-"from the command line.\n"
-"Note: it is not possible to download video clips.\n"
-msgstr ""
-
-#: camlibs/iclick/library.c:132
-msgid ""
-"iClick 5X driver\n"
-"Theodore Kilgore <kilgota@auburn.edu>\n"
-msgstr ""
-
-#: camlibs/jamcam/jamcam.c:284
-#, c-format
-msgid "Frames Taken     : %4d\n"
-msgstr "已用帧     : %4d\n"
-
-# camlibs/jamcam/jamcam.c:280
-#: camlibs/jamcam/jamcam.c:295
-msgid "jamcam library v"
-msgstr "jamcam 库 v"
-
-# camlibs/jamcam/library.c:336 camlibs/jd11/serial.c:455
-#: camlibs/jamcam/library.c:341 camlibs/jd11/serial.c:469
-#: camlibs/sierra/library.c:1248 camlibs/sonydscf1/sonydscf1.c:248
-msgid "Downloading data..."
-msgstr "正在下载数据..."
-
-# camlibs/jamcam/library.c:494 camlibs/jd11/serial.c:375
-#: camlibs/jamcam/library.c:501 camlibs/jd11/serial.c:375
-msgid "Downloading thumbnail..."
-msgstr "正在下载缩略图..."
-
-# camlibs/jd11/jd11.c:174
-#: camlibs/jd11/jd11.c:161
-msgid ""
-"The JD11 camera works rather well with this driver.\n"
-"An RS232 interface @ 115 kbit is required for image transfer.\n"
-"The driver allows you to get\n"
-"\n"
-"   - thumbnails (64x48 PGM format)\n"
-"   - full images (640x480 PPM format)\n"
-msgstr ""
-"JD11 相机使用该驱动程序工作得更好。\n"
-"图像传输需要一个 115 千位的 RS232 接口。\n"
-"驱动程序允许您获取\n"
-"\n"
-"   - 缩略图 (64x48 PGM 格式)\n"
-"   - 全图 (640x480 PPM 格式)\n"
-
-# camlibs/jd11/jd11.c:187
-#: camlibs/jd11/jd11.c:174
-msgid ""
-"JD11\n"
-"Marcus Meissner <marcus@jet.franken.de>\n"
-"Driver for the Jenoptik JD11 camera.\n"
-"Protocol reverse engineered using WINE and IDA."
-msgstr ""
-"JD11\n"
-"Marcus Meissner <marcus@jet.franken.de>\n"
-"Jenoptik JD11 相机驱动程序。\n"
-"使用 WINE 和 IDA 对协议进行反向工程。"
-
-# camlibs/polaroid/pdc700.c:981 camlibs/sierra/sierra.c:776
-# camlibs/sierra/sierra.c:1353
-#: camlibs/jd11/jd11.c:187
-msgid "JD11 Configuration"
-msgstr "JD11配置"
-
-# camlibs/jd11/jd11.c:202 camlibs/jd11/jd11.c:254
-#: camlibs/jd11/jd11.c:190 camlibs/jd11/jd11.c:247
-msgid "Other Settings"
-msgstr "其它设置"
-
-# camlibs/jd11/jd11.c:207 camlibs/jd11/jd11.c:255
-#: camlibs/jd11/jd11.c:195 camlibs/jd11/jd11.c:248
-msgid "Bulb Exposure Time"
-msgstr "闪光灯闪光时间"
-
-# camlibs/jd11/jd11.c:215 camlibs/jd11/jd11.c:263
-#: camlibs/jd11/jd11.c:204 camlibs/jd11/jd11.c:256
-msgid "Color Settings"
-msgstr "色彩设置"
-
-# camlibs/jd11/jd11.c:221 camlibs/jd11/jd11.c:265
-#: camlibs/jd11/jd11.c:211 camlibs/jd11/jd11.c:258
-msgid "Red"
-msgstr "红"
-
-# camlibs/jd11/jd11.c:228 camlibs/jd11/jd11.c:270
-#: camlibs/jd11/jd11.c:219 camlibs/jd11/jd11.c:263 camlibs/ptp2/config.c:1565
-msgid "Green"
-msgstr "绿"
-
-# camlibs/jd11/jd11.c:235 camlibs/jd11/jd11.c:275
-#: camlibs/jd11/jd11.c:227 camlibs/jd11/jd11.c:268
-msgid "Blue"
-msgstr "蓝"
-
-#: camlibs/jl2005a/library.c:105
-#, c-format
-msgid ""
-"This camera contains a Jeilin JL2005A chipset.\n"
-"The number of photos in it is %i. \n"
-msgstr ""
-
-#: camlibs/jl2005a/library.c:115
-msgid ""
-"This driver supports cameras with Jeilin jl2005a chip \n"
-"These cameras do not support deletion of photos, nor uploading\n"
-"of data. \n"
-"Decoding of compressed photos may or may not work well\n"
-"and does not work equally well for all supported cameras.\n"
-"If present on the camera, video clip frames are downloaded \n"
-"as consecutive still photos.\n"
-"For further details please consult libgphoto2/camlibs/README.jl2005a\n"
-msgstr ""
-
-#: camlibs/jl2005a/library.c:132
-msgid ""
-"jl2005a camera library\n"
-"Theodore Kilgore <kilgota@auburn.edu>\n"
-msgstr ""
-
-#: camlibs/jl2005c/library.c:133
-#, c-format
-msgid ""
-"This camera contains a Jeilin JL2005%c chipset.\n"
-"The number of photos in it is %i. \n"
-msgstr ""
-
-#: camlibs/jl2005c/library.c:144
-msgid ""
-"This driver supports cameras with Jeilin JL2005B or C or D  chip \n"
-"These cameras do not support deletion of photos, nor uploading\n"
-"of data. \n"
-"If present on the camera, video clip frames are downloaded \n"
-"as consecutive still photos.\n"
-"For more details please consult libgphoto2/camlibs/README.jl2005c\n"
-msgstr ""
-
-#: camlibs/jl2005c/library.c:159
-msgid ""
-"jl2005bcd camera library\n"
-"Theodore Kilgore <kilgota@auburn.edu>\n"
-msgstr ""
-
-# camlibs/kodak/dc120/dc120.c:31
-#: camlibs/kodak/dc120/dc120.c:68 camlibs/kodak/dc120/dc120.c:144
-msgid "CompactFlash Card"
-msgstr "闪存卡"
-
-# camlibs/kodak/dc120/dc120.c:364
-#: camlibs/kodak/dc120/dc120.c:367
-msgid ""
-"The Kodak DC120 camera uses the KDC file format for storing images. If you "
-"want to view the images you download from your camera, you will need to "
-"download the \"kdc2tiff\" program. It is available from "
-"http://kdc2tiff.sourceforge.net"
-msgstr ""
-"柯达 DC120 相机使用 KDC 文件格式存储图像。如果您希望浏览您从相机中下载的图像，您就需要下载程序“kdc2tiff”。该程序可以从 "
-"http://kdc2tiff.sourceforge.net 得到。"
-
-# camlibs/kodak/dc120/dc120.c:376
-#: camlibs/kodak/dc120/dc120.c:379
-msgid ""
-"Kodak DC120 Camera Library\n"
-"Scott Fritzinger <scottf@gphoto.net>\n"
-"Camera Library for the Kodak DC120 camera.\n"
-"(by popular demand)."
-msgstr ""
-"柯达 DC120 相机库\n"
-"Scott Fritzinger <scottf@gphoto.net>\n"
-"柯达 DC120 相机库。\n"
-"(它有广泛的需求)。"
-
-# camlibs/kodak/dc120/library.c:122 camlibs/kodak/dc240/library.c:318
-# camlibs/panasonic/dc1000.c:424 camlibs/panasonic/dc1580.c:552
-#: camlibs/kodak/dc120/library.c:126 camlibs/kodak/dc210/library.c:435
-#: camlibs/kodak/dc240/library.c:305 camlibs/panasonic/dc1000.c:421
-#: camlibs/panasonic/dc1580.c:546
-msgid "Getting data..."
-msgstr "正在获取数据..."
-
-# camlibs/kodak/dc120/library.c:506
-#: camlibs/kodak/dc120/library.c:526
-msgid "Waiting for completion..."
-msgstr "等待完成..."
-
-# frontends/command-line/actions.c:141
-#: camlibs/kodak/dc210/dc210.c:174
-msgid "File"
-msgstr "文件"
-
-# libgphoto2/gphoto2-result.c:45
-#: camlibs/kodak/dc210/dc210.c:177 camlibs/kodak/dc210/dc210.c:346
-msgid "File type"
-msgstr "文件类型"
-
-#: camlibs/kodak/dc210/dc210.c:179 camlibs/kodak/dc210/dc210.c:184
-#: camlibs/ptp2/config.c:1537 camlibs/ptp2/ptp.c:4566
-msgid "JPEG"
-msgstr "JPEG"
-
-#: camlibs/kodak/dc210/dc210.c:180 camlibs/kodak/dc210/dc210.c:186
-msgid "FlashPix"
-msgstr ""
-
-# camlibs/konica/library.c:684 camlibs/konica/library.c:896
-# camlibs/sierra/sierra.c:786 camlibs/sierra/sierra.c:1117
-# camlibs/sierra/sierra.c:1468 camlibs/sierra/sierra.c:1677
-#: camlibs/kodak/dc210/dc210.c:190 camlibs/kodak/dc210/dc210.c:355
-msgid "File resolution"
-msgstr "文件分辨率"
-
-# camlibs/polaroid/pdc700.c:175
-#: camlibs/kodak/dc210/dc210.c:192 camlibs/kodak/dc210/dc210.c:197
-#: camlibs/ricoh/library.c:319
-msgid "640 x 480"
-msgstr "640 x 480"
-
-#: camlibs/kodak/dc210/dc210.c:193 camlibs/kodak/dc210/dc210.c:199
-msgid "1152 x 864"
-msgstr "1152 x 864"
-
-#: camlibs/kodak/dc210/dc210.c:205 camlibs/kodak/dc210/dc210.c:368
-msgid "File compression"
-msgstr "文件压缩"
-
-#: camlibs/kodak/dc210/dc210.c:207 camlibs/kodak/dc210/dc210.c:213
-msgid "Low (best quality)"
-msgstr "低 (最佳质量)"
-
-#: camlibs/kodak/dc210/dc210.c:208 camlibs/kodak/dc210/dc210.c:215
-msgid "Medium (better quality)"
-msgstr "中 (良好质量)"
-
-#: camlibs/kodak/dc210/dc210.c:209 camlibs/kodak/dc210/dc210.c:217
-msgid "High (good quality)"
-msgstr "高 (普通质量)"
-
-# camlibs/sierra/sierra.c:826 camlibs/sierra/sierra.c:1146
-# camlibs/sierra/sierra.c:1361 camlibs/sierra/sierra.c:1602
-#: camlibs/kodak/dc210/dc210.c:221 camlibs/konica/qm150.c:1047
-#: camlibs/ptp2/config.c:5217
-msgid "Capture"
-msgstr "光圈"
-
-#: camlibs/kodak/dc210/dc210.c:235
-msgid "58 mm"
-msgstr "58 mm"
-
-#: camlibs/kodak/dc210/dc210.c:237
-msgid "51 mm"
-msgstr "51 mm"
-
-#: camlibs/kodak/dc210/dc210.c:239
-msgid "41 mm"
-msgstr "41 mm"
-
-#: camlibs/kodak/dc210/dc210.c:241
-msgid "34 mm"
-msgstr "34 mm"
-
-#: camlibs/kodak/dc210/dc210.c:243
-msgid "29 mm"
-msgstr "29 mm"
-
-#: camlibs/kodak/dc210/dc210.c:249 camlibs/kodak/dc210/dc210.c:408
-msgid "Exposure compensation"
-msgstr "曝光补偿"
-
-# camlibs/konica/library.c:749 camlibs/konica/library.c:765
-# camlibs/konica/library.c:780 camlibs/konica/library.c:783
-# camlibs/konica/library.c:993 camlibs/konica/library.c:1023
-# camlibs/sierra/sierra.c:787 camlibs/sierra/sierra.c:793
-# camlibs/sierra/sierra.c:827 camlibs/sierra/sierra.c:833
-# camlibs/sierra/sierra.c:886 camlibs/sierra/sierra.c:893
-# camlibs/sierra/sierra.c:947 camlibs/sierra/sierra.c:954
-# camlibs/sierra/sierra.c:1121 camlibs/sierra/sierra.c:1150
-# camlibs/sierra/sierra.c:1190 camlibs/sierra/sierra.c:1233
-# camlibs/sierra/sierra.c:1396 camlibs/sierra/sierra.c:1402
-# camlibs/sierra/sierra.c:1424 camlibs/sierra/sierra.c:1429
-# camlibs/sierra/sierra.c:1629 camlibs/sierra/sierra.c:1649
-#: camlibs/kodak/dc210/dc210.c:259 camlibs/kodak/dc210/dc210.c:265
-#: camlibs/konica/library.c:782 camlibs/konica/library.c:798
-#: camlibs/konica/library.c:813 camlibs/konica/library.c:816
-#: camlibs/konica/library.c:1027 camlibs/konica/library.c:1057
-#: camlibs/konica/qm150.c:853 camlibs/konica/qm150.c:871
-#: camlibs/konica/qm150.c:940 camlibs/konica/qm150.c:943
-#: camlibs/konica/qm150.c:961 camlibs/konica/qm150.c:964
-#: camlibs/konica/qm150.c:979 camlibs/konica/qm150.c:982
-#: camlibs/konica/qm150.c:999 camlibs/konica/qm150.c:1002
-#: camlibs/ptp2/config.c:1543 camlibs/ptp2/config.c:2021
-#: camlibs/ptp2/config.c:2474 camlibs/ptp2/config.c:2508
-#: camlibs/ptp2/config.c:2641 camlibs/ptp2/config.c:3020
-#: camlibs/ptp2/config.c:3168 camlibs/ptp2/config.c:3179
-#: camlibs/ptp2/config.c:3191 camlibs/ptp2/config.c:3239
-#: camlibs/ptp2/config.c:3258 camlibs/ptp2/config.c:3650
-#: camlibs/ptp2/ptp.c:4230 camlibs/ptp2/ptp.c:4238 camlibs/ptp2/ptp.c:4261
-#: camlibs/ptp2/ptp.c:4269 camlibs/ptp2/ptp.c:4469 camlibs/ptp2/ptp.c:4520
-#: camlibs/ptp2/ptp.c:4580 camlibs/ptp2/ptp.c:4587 camlibs/ptp2/ptp.c:4597
-#: camlibs/ptp2/ptp.c:4634 camlibs/ptp2/ptp.c:4651 camlibs/ptp2/ptp.c:4705
-#: camlibs/ricoh/library.c:312 camlibs/ricoh/library.c:327
-#: camlibs/ricoh/library.c:368 camlibs/sierra/epson-desc.c:151
-#: camlibs/sierra/epson-desc.c:169 camlibs/sierra/nikon-desc.c:168
-#: camlibs/sierra/nikon-desc.c:202 camlibs/sierra/nikon-desc.c:234
-#: camlibs/sierra/nikon-desc.c:252 camlibs/sierra/nikon-desc.c:282
-#: camlibs/sierra/olympus-desc.c:196 camlibs/sierra/olympus-desc.c:235
-#: camlibs/sierra/olympus-desc.c:289 camlibs/sierra/olympus-desc.c:371
-#: camlibs/sierra/olympus-desc.c:403 camlibs/sierra/olympus-desc.c:433
-#: camlibs/sierra/olympus-desc.c:457 camlibs/sierra/olympus-desc.c:498
-#: camlibs/sierra/olympus-desc.c:515 camlibs/sierra/olympus-desc.c:534
-#: camlibs/sierra/olympus-desc.c:555 camlibs/sierra/olympus-desc.c:574
-#: camlibs/sierra/olympus-desc.c:593 camlibs/sierra/olympus-desc.c:614
-#: camlibs/sierra/olympus-desc.c:638 camlibs/sierra/olympus-desc.c:873
-#: camlibs/sierra/olympus-desc.c:890 camlibs/sierra/sierra.c:925
-#: camlibs/sierra/sierra.c:931 camlibs/sierra/sierra.c:965
-#: camlibs/sierra/sierra.c:971 camlibs/sierra/sierra.c:1025
-#: camlibs/sierra/sierra.c:1032 camlibs/sierra/sierra.c:1086
-#: camlibs/sierra/sierra.c:1093 camlibs/sierra/sierra.c:1260
-#: camlibs/sierra/sierra.c:1289 camlibs/sierra/sierra.c:1329
-#: camlibs/sierra/sierra.c:1372 camlibs/sierra/sierra.c:1535
-#: camlibs/sierra/sierra.c:1541 camlibs/sierra/sierra.c:1563
-#: camlibs/sierra/sierra.c:1568 camlibs/sierra/sierra.c:1768
-#: camlibs/sierra/sierra.c:1788 camlibs/st2205/library.c:512
-#: camlibs/st2205/library.c:525
-msgid "Auto"
-msgstr "自动"
-
-# camlibs/sierra/sierra.c:887 camlibs/sierra/sierra.c:895
-# camlibs/sierra/sierra.c:1192 camlibs/sierra/sierra.c:1397
-# camlibs/sierra/sierra.c:1404 camlibs/sierra/sierra.c:1631
-#: camlibs/kodak/dc210/dc210.c:260 camlibs/kodak/dc210/dc210.c:267
-#: camlibs/sierra/epson-desc.c:152 camlibs/sierra/nikon-desc.c:235
-#: camlibs/sierra/olympus-desc.c:499 camlibs/sierra/olympus-desc.c:516
-#: camlibs/sierra/olympus-desc.c:535 camlibs/sierra/sierra.c:1026
-#: camlibs/sierra/sierra.c:1034 camlibs/sierra/sierra.c:1331
-#: camlibs/sierra/sierra.c:1536 camlibs/sierra/sierra.c:1543
-#: camlibs/sierra/sierra.c:1770
-msgid "Force"
-msgstr "强制"
-
-# frontends/command-line/actions.c:168
-#: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
-#: camlibs/ptp2/config.c:3174 camlibs/ptp2/config.c:3229
-#: camlibs/ptp2/config.c:4025 camlibs/ptp2/config.c:4030
-#: camlibs/ptp2/config.c:4044 camlibs/ptp2/config.c:4093
-#: camlibs/ptp2/config.c:4098 camlibs/ptp2/config.c:4113
-#: camlibs/ptp2/config.c:4809 camlibs/ptp2/library.c:3566
-#: camlibs/ptp2/library.c:3570 camlibs/ptp2/ptp.c:4267
-#: camlibs/ricoh/library.c:347
-msgid "None"
-msgstr "无"
-
-#: camlibs/kodak/dc210/dc210.c:273 camlibs/kodak/dc210/dc210.c:426
-msgid "Red eye flash"
-msgstr "红眼闪光灯"
-
-# camlibs/konica/library.c:649 camlibs/konica/library.c:656
-# camlibs/konica/library.c:747 camlibs/konica/library.c:756
-# camlibs/konica/library.c:989 camlibs/sierra/sierra.c:1003
-# camlibs/sierra/sierra.c:1009 camlibs/sierra/sierra.c:1272
-#: camlibs/kodak/dc210/dc210.c:275 camlibs/kodak/dc210/dc210.c:279
-#: camlibs/konica/library.c:682 camlibs/konica/library.c:689
-#: camlibs/konica/library.c:780 camlibs/konica/library.c:789
-#: camlibs/konica/library.c:1023 camlibs/konica/qm150.c:791
-#: camlibs/konica/qm150.c:795 camlibs/konica/qm150.c:805
-#: camlibs/konica/qm150.c:809 camlibs/konica/qm150.c:851
-#: camlibs/konica/qm150.c:864 camlibs/konica/qm150.c:1021
-#: camlibs/konica/qm150.c:1028 camlibs/konica/qm150.c:1035
-#: camlibs/konica/qm150.c:1042 camlibs/ptp2/config.c:1116
-#: camlibs/ptp2/config.c:1118 camlibs/ptp2/config.c:1130
-#: camlibs/ptp2/config.c:1149 camlibs/ptp2/config.c:1151
-#: camlibs/ptp2/config.c:1163 camlibs/ptp2/config.c:1303
-#: camlibs/ptp2/config.c:1309 camlibs/ptp2/config.c:1316
-#: camlibs/ptp2/config.c:3022 camlibs/ptp2/ptp.c:4148 camlibs/ptp2/ptp.c:4149
-#: camlibs/ptp2/ptp.c:4150 camlibs/ptp2/ptp.c:4471 camlibs/ptp2/ptp.c:4581
-#: camlibs/ptp2/ptp.c:4667 camlibs/ricoh/library.c:339
-#: camlibs/ricoh/library.c:370 camlibs/sierra/nikon-desc.c:305
-#: camlibs/sierra/sierra.c:1142 camlibs/sierra/sierra.c:1148
-#: camlibs/sierra/sierra.c:1411 camlibs/topfield/puppy.c:546
-#: camlibs/topfield/puppy.c:558 camlibs/topfield/puppy.c:580
-msgid "On"
-msgstr "开"
-
-# camlibs/konica/library.c:650 camlibs/konica/library.c:653
-# camlibs/konica/library.c:746 camlibs/konica/library.c:753
-# camlibs/konica/library.c:861 camlibs/konica/library.c:987
-# camlibs/sierra/sierra.c:888 camlibs/sierra/sierra.c:897
-# camlibs/sierra/sierra.c:1004 camlibs/sierra/sierra.c:1007
-# camlibs/sierra/sierra.c:1194 camlibs/sierra/sierra.c:1274
-# camlibs/sierra/sierra.c:1398 camlibs/sierra/sierra.c:1406
-# camlibs/sierra/sierra.c:1633
-#: camlibs/kodak/dc210/dc210.c:276 camlibs/kodak/dc210/dc210.c:281
-#: camlibs/kodak/dc210/dc210.c:441 camlibs/konica/library.c:683
-#: camlibs/konica/library.c:686 camlibs/konica/library.c:779
-#: camlibs/konica/library.c:786 camlibs/konica/library.c:897
-#: camlibs/konica/library.c:1021 camlibs/konica/qm150.c:792
-#: camlibs/konica/qm150.c:798 camlibs/konica/qm150.c:806
-#: camlibs/konica/qm150.c:812 camlibs/konica/qm150.c:850
-#: camlibs/konica/qm150.c:857 camlibs/konica/qm150.c:1022
-#: camlibs/konica/qm150.c:1025 camlibs/konica/qm150.c:1036
-#: camlibs/konica/qm150.c:1039 camlibs/ptp2/config.c:1117
-#: camlibs/ptp2/config.c:1118 camlibs/ptp2/config.c:1134
-#: camlibs/ptp2/config.c:1150 camlibs/ptp2/config.c:1151
-#: camlibs/ptp2/config.c:1167 camlibs/ptp2/config.c:1304
-#: camlibs/ptp2/config.c:1310 camlibs/ptp2/config.c:1315
-#: camlibs/ptp2/config.c:1626 camlibs/ptp2/config.c:1687
-#: camlibs/ptp2/config.c:1906 camlibs/ptp2/config.c:1932
-#: camlibs/ptp2/config.c:1959 camlibs/ptp2/config.c:3021
-#: camlibs/ptp2/config.c:3346 camlibs/ptp2/config.c:3457
-#: camlibs/ptp2/config.c:3649 camlibs/ptp2/config.c:3689
-#: camlibs/ptp2/config.c:3755 camlibs/ptp2/config.c:4028
-#: camlibs/ptp2/config.c:4062 camlibs/ptp2/ptp.c:4148 camlibs/ptp2/ptp.c:4149
-#: camlibs/ptp2/ptp.c:4150 camlibs/ptp2/ptp.c:4470 camlibs/ptp2/ptp.c:4579
-#: camlibs/ptp2/ptp.c:4619 camlibs/ptp2/ptp.c:4665 camlibs/ptp2/ptp.c:4730
-#: camlibs/ptp2/ptp.c:4735 camlibs/ricoh/library.c:340
-#: camlibs/ricoh/library.c:369 camlibs/ricoh/library.c:377
-#: camlibs/sierra/epson-desc.c:153 camlibs/sierra/nikon-desc.c:236
-#: camlibs/sierra/nikon-desc.c:304 camlibs/sierra/nikon-desc.c:359
-#: camlibs/sierra/olympus-desc.c:500 camlibs/sierra/olympus-desc.c:517
-#: camlibs/sierra/olympus-desc.c:536 camlibs/sierra/olympus-desc.c:658
-#: camlibs/sierra/olympus-desc.c:856 camlibs/sierra/olympus-desc.c:940
-#: camlibs/sierra/sierra.c:1027 camlibs/sierra/sierra.c:1036
-#: camlibs/sierra/sierra.c:1143 camlibs/sierra/sierra.c:1146
-#: camlibs/sierra/sierra.c:1333 camlibs/sierra/sierra.c:1413
-#: camlibs/sierra/sierra.c:1537 camlibs/sierra/sierra.c:1545
-#: camlibs/sierra/sierra.c:1772 camlibs/topfield/puppy.c:547
-#: camlibs/topfield/puppy.c:558
-msgid "Off"
-msgstr "关"
-
-#: camlibs/kodak/dc210/dc210.c:284
-msgid "Other"
-msgstr "其它"
-
-# camlibs/panasonic/dc1000.c:371 camlibs/panasonic/dc1580.c:468
-#: camlibs/kodak/dc210/dc210.c:290
-msgid "Set clock in camera"
-msgstr "设置相机时钟"
-
-# camlibs/kodak/dc240/library.c:590
-#: camlibs/kodak/dc210/dc210.c:294 camlibs/kodak/dc210/dc210.c:419
-msgid "Port speed"
-msgstr "端口速度"
-
-#: camlibs/kodak/dc210/dc210.c:304 camlibs/kodak/dc210/library.c:691
-msgid "Album name"
-msgstr "相册名称"
-
-#: camlibs/kodak/dc210/dc210.c:307
-msgid "Name to set on card when formatting."
-msgstr "格式化时在卡上设置的名称。"
-
-#: camlibs/kodak/dc210/dc210.c:309
-msgid "Format compact flash"
-msgstr "格式化闪存"
-
-#: camlibs/kodak/dc210/dc210.c:312
-msgid "Format card and set album name."
-msgstr "格式化卡片并设置相册名。"
-
-#: camlibs/kodak/dc210/dc210.c:315
-msgid "Debug"
-msgstr "调试"
-
-#: camlibs/kodak/dc210/dc210.c:333
-msgid ""
-"Execute predefined command\n"
-"with parameter values."
-msgstr ""
-"带参数值运行\n"
-"预定义命令。"
-
-#: camlibs/kodak/dc210/dc210.c:493
-#, c-format
-msgid "Pictures in camera: %d\n"
-msgstr ""
-
-#: camlibs/kodak/dc210/dc210.c:497
-#, c-format
-msgid ""
-"There is space for another\n"
-"   %d low compressed\n"
-"   %d medium compressed or\n"
-"   %d high compressed pictures\n"
-msgstr ""
-
-#: camlibs/kodak/dc210/dc210.c:501
-#, c-format
-msgid "Total pictures taken: %d\n"
-msgstr ""
-
-#: camlibs/kodak/dc210/dc210.c:505
-#, c-format
-msgid "Total flashes fired: %d\n"
-msgstr ""
-
-#: camlibs/kodak/dc210/dc210.c:509
-#, c-format
-msgid "Firmware: %d.%d\n"
-msgstr ""
-
-#: camlibs/kodak/dc210/dc210.c:514
-#, c-format
-msgid "Filetype: JPEG ("
-msgstr ""
-
-#: camlibs/kodak/dc210/dc210.c:516
-#, c-format
-msgid "Filetype: FlashPix ("
-msgstr ""
-
-#: camlibs/kodak/dc210/dc210.c:522
-#, c-format
-msgid "low compression, "
-msgstr ""
-
-#: camlibs/kodak/dc210/dc210.c:524
-#, c-format
-msgid "medium compression, "
-msgstr ""
-
-#: camlibs/kodak/dc210/dc210.c:526
-#, c-format
-msgid "high compression, "
-msgstr ""
-
-#: camlibs/kodak/dc210/dc210.c:528
-#, c-format
-msgid "unknown compression %d, "
-msgstr ""
-
-#: camlibs/kodak/dc210/dc210.c:538
-#, c-format
-msgid "unknown resolution %d)\n"
-msgstr ""
-
-#: camlibs/kodak/dc210/dc210.c:551
-#, c-format
-msgid "AC adapter is connected.\n"
-msgstr ""
-
-#: camlibs/kodak/dc210/dc210.c:553
-#, c-format
-msgid "AC adapter is not connected.\n"
-msgstr ""
-
-#: camlibs/kodak/dc210/dc210.c:557
-msgid "Time: %a, %d %b %Y %T\n"
-msgstr ""
-
-#: camlibs/kodak/dc210/dc210.c:563
-#, c-format
-msgid "Zoom: 58 mm\n"
-msgstr ""
-
-#: camlibs/kodak/dc210/dc210.c:565
-#, c-format
-msgid "Zoom: 51 mm\n"
-msgstr ""
-
-#: camlibs/kodak/dc210/dc210.c:567
-#, c-format
-msgid "Zoom: 41 mm\n"
-msgstr ""
-
-#: camlibs/kodak/dc210/dc210.c:569
-#, c-format
-msgid "Zoom: 34 mm\n"
-msgstr ""
-
-#: camlibs/kodak/dc210/dc210.c:571
-#, c-format
-msgid "Zoom: 29 mm\n"
-msgstr ""
-
-#: camlibs/kodak/dc210/dc210.c:573
-#, c-format
-msgid "Zoom: macro\n"
-msgstr ""
-
-# libgphoto2/gphoto2-result.c:46
-#: camlibs/kodak/dc210/dc210.c:575
-#, c-format
-msgid "Unknown zoom mode %d\n"
-msgstr ""
-
-#: camlibs/kodak/dc210/dc210.c:581
-#, c-format
-msgid "Exposure compensation: %s\n"
-msgstr ""
-
-#: camlibs/kodak/dc210/dc210.c:583
-#, c-format
-msgid "Exposure compensation: %d\n"
-msgstr ""
-
-#: camlibs/kodak/dc210/dc210.c:588
-#, c-format
-msgid "Flash mode: auto, "
-msgstr ""
-
-#: camlibs/kodak/dc210/dc210.c:590
-#, c-format
-msgid "Flash mode: force, "
-msgstr ""
-
-#: camlibs/kodak/dc210/dc210.c:592
-#, c-format
-msgid "Flash mode: off\n"
-msgstr ""
-
-# libgphoto2/gphoto2-result.c:46
-#: camlibs/kodak/dc210/dc210.c:594
-#, c-format
-msgid "Unknown flash mode %d, "
-msgstr ""
-
-#: camlibs/kodak/dc210/dc210.c:602
-#, c-format
-msgid "red eye flash on.\n"
-msgstr ""
-
-#: camlibs/kodak/dc210/dc210.c:605
-#, c-format
-msgid "red eye flash off.\n"
-msgstr ""
-
-#: camlibs/kodak/dc210/dc210.c:610
-#, c-format
-msgid "No card in camera.\n"
-msgstr ""
-
-#: camlibs/kodak/dc210/dc210.c:612
-#, c-format
-msgid ""
-"Card name: %s\n"
-"Free space on card: %d kB\n"
-msgstr ""
-
-#: camlibs/kodak/dc210/dc210.c:632
-msgid ""
-"This library has been tested with a Kodak DC 215 Zoom camera. It might work "
-"also with DC 200 and DC 210 cameras. If you happen to have such a camera, "
-"please send a message to koltan@gmx.de to let me know, if you have any "
-"troubles with this driver library or if everything is okay."
-msgstr ""
-"该库已经在柯达 DC 215 缩放相机上进行过测试。它可能可以在 DC200 和 DC210 上工作。如果您碰巧拥有这样的相机，请给 "
-"koltan@gmx.de 发送邮件以便让我知道您是否在使用该驱动程序时遇到了麻烦，或者一切正常。"
-
-#: camlibs/kodak/dc210/dc210.c:644
-msgid ""
-"Camera Library for the Kodak DC215 Zoom camera.\n"
-"Michael Koltan <koltan@gmx.de>\n"
-msgstr ""
-"用于柯达 DC215 缩放相机的相机库。\n"
-"Michael Koltan <koltan@gmx.de>\n"
-
-# camlibs/panasonic/dc1000.c:476 camlibs/panasonic/dc1580.c:599
-#: camlibs/kodak/dc210/library.c:343
-msgid "Waiting..."
-msgstr "正在等待..."
-
-#: camlibs/kodak/dc210/library.c:1365
-msgid "Parameter 1"
-msgstr "参数 1"
-
-#: camlibs/kodak/dc210/library.c:1369
-msgid "Parameter 2"
-msgstr "参数 2"
-
-#: camlibs/kodak/dc210/library.c:1373
-msgid "Parameter 3"
-msgstr "参数 3"
-
-# camlibs/kodak/dc240/dc240.c:182
-#: camlibs/kodak/dc240/dc240.c:181
-#, c-format
-msgid "Model: Kodak %s\n"
-msgstr "型号：柯达 %s\n"
-
-# camlibs/kodak/dc240/dc240.c:183
-#: camlibs/kodak/dc240/dc240.c:182
-#, c-format
-msgid "Firmware version: %d.%02d\n"
-msgstr "固件版本：%d.%02d\n"
-
-# camlibs/kodak/dc240/dc240.c:185
-#: camlibs/kodak/dc240/dc240.c:184
-#, c-format
-msgid "Battery status: %s, AC Adapter: %s\n"
-msgstr "电池状态：%s，交流变压器：%s\n"
-
-# camlibs/kodak/dc240/dc240.c:189
-#: camlibs/kodak/dc240/dc240.c:188
-#, c-format
-msgid "Number of pictures: %d\n"
-msgstr "照片数量：%d\n"
-
-# camlibs/kodak/dc240/dc240.c:191
-#: camlibs/kodak/dc240/dc240.c:190
-#, c-format
-msgid "Space remaining: High: %d, Medium: %d, Low: %d\n"
-msgstr "剩余空间：高：%d，中：%d，低：%d\n"
-
-# camlibs/kodak/dc240/dc240.c:195
-#: camlibs/kodak/dc240/dc240.c:194
-#, c-format
-msgid "Memory card status (%d): %s\n"
-msgstr "存储卡状态 (%d)：%s\n"
-
-# camlibs/kodak/dc240/dc240.c:199
-#: camlibs/kodak/dc240/dc240.c:198
-#, c-format
-msgid "Total pictures captured: %d, Flashes fired: %d\n"
-msgstr "捕获照片总数：%d，闪光灯闪光次数：%d\n"
-
-# camlibs/kodak/dc240/dc240.c:213
-#: camlibs/kodak/dc240/dc240.c:212
-msgid ""
-"Kodak DC240 Camera Library\n"
-"Scott Fritzinger <scottf@gphoto.net> and Hubert Figuiere "
-"<hfiguiere@teaser.fr>\n"
-"Camera Library for the Kodak DC240, DC280, DC3400 and DC5000 cameras.\n"
-"Rewritten and updated for gPhoto2."
-msgstr ""
-"柯达 DC240 相机库\n"
-"Scott Fritzinger <scottf@gphoto.net> 和 Hubert Figuiere "
-"<hfiguiere@teaser.fr>\n"
-"支持柯达 DC240, DC280, DC3400 及 DC5000 相机的相机库。\n"
-"为 gPhoto2 重写并更新。"
-
-# camlibs/kodak/dc240/library.c:575
-#: camlibs/kodak/dc240/library.c:556
-msgid "Weak"
-msgstr "弱"
-
-# camlibs/kodak/dc240/library.c:578
-#: camlibs/kodak/dc240/library.c:559
-msgid "Empty"
-msgstr "空"
-
-# camlibs/kodak/dc240/library.c:583 camlibs/kodak/dc240/library.c:598
-#: camlibs/kodak/dc240/library.c:564 camlibs/kodak/dc240/library.c:579
-#: camlibs/ptp2/ptp.c:4642
-msgid "Invalid"
-msgstr "非法"
-
-# camlibs/kodak/dc240/library.c:590
-#: camlibs/kodak/dc240/library.c:571 camlibs/ptp2/config.c:1846
-#: camlibs/ptp2/ptp.c:4575
-msgid "Not used"
-msgstr "未使用"
-
-# camlibs/kodak/dc240/library.c:593
-#: camlibs/kodak/dc240/library.c:574
-msgid "In use"
-msgstr "使用中"
-
-# camlibs/kodak/dc240/library.c:607
-#: camlibs/kodak/dc240/library.c:588
-msgid "Card is open"
-msgstr "卡已打开"
-
-# camlibs/kodak/dc240/library.c:610
-#: camlibs/kodak/dc240/library.c:589
-msgid "Card is not open"
-msgstr "卡未打开"
-
-# camlibs/kodak/dc240/library.c:614
-#: camlibs/kodak/dc240/library.c:591
-msgid "Card is not formatted"
-msgstr "卡尚未格式化"
-
-# camlibs/kodak/dc240/library.c:618
-#: camlibs/kodak/dc240/library.c:593
-msgid "No card"
-msgstr "无卡"
-
-# camlibs/kodak/dc3200/dc3200.c:38
-#: camlibs/kodak/dc3200/dc3200.c:43
-msgid ""
-"There is currently an operation in progress. This camera only supports one "
-"operation at a time. Please wait until the current operation has finished."
-msgstr "现在正有一个操作在进行。该相机在同一时刻仅支持一个操作。请等待直到当前操作完成。"
-
-# camlibs/kodak/dc3200/dc3200.c:142
-#: camlibs/kodak/dc3200/dc3200.c:146
-#, c-format
-msgid "camera inactive for > 9 seconds, re-initing.\n"
-msgstr "相机非活跃时间大于 9 秒，正在重新初始化。\n"
-
-# camlibs/kodak/dc3200/dc3200.c:431
-#: camlibs/kodak/dc3200/dc3200.c:435
-msgid ""
-"Known problems:\n"
-"\n"
-"1. If the Kodak DC3200 does not receive a command at least every 10 seconds, "
-"it will time out, and will have to be re-initialized. If you notice the "
-"camera does not respond, simply re-select the camera. This will cause it to "
-"reinitialize."
-msgstr ""
-"已知问题：\n"
-"\n"
-"1. 如果柯达 DC3200 没有在 10 "
-"秒内收到至少一个命令，它就将超时，并必须重新初始化。如果您发现相机没有应答，请重新选择相机。这将导致相机重新初始化。"
-
-# camlibs/kodak/dc3200/dc3200.c:444
-#: camlibs/kodak/dc3200/dc3200.c:448
-msgid ""
-"Kodak DC3200 Driver\n"
-"Donn Morrison <dmorriso@gulf.uvic.ca>\n"
-"\n"
-"Questions and comments appreciated."
-msgstr ""
-"柯达 DC3200 驱动程序\n"
-"Donn Morrison <dmorriso@gulf.uvic.ca>\n"
-"\n"
-"欢迎问题和评论。"
-
-#: camlibs/kodak/ez200/ez200.c:198
-#, c-format
-msgid ""
-"Your USB camera is a Kodak EZ200.\n"
-"Number of PICs = %i\n"
-msgstr ""
-"您的USB照相机是Kodak EZ200。\n"
-"照片总数=%i\n"
-
-#: camlibs/kodak/ez200/ez200.c:206
-msgid ""
-"Kodak EZ200 driver\n"
-"Bucas Jean-Francois <jfbucas@tuxfamily.org>\n"
-msgstr ""
-
-# camlibs/konica/konica.c:62
-#: camlibs/konica/konica.c:62
-msgid "Focusing error."
-msgstr "聚焦错误。"
-
-# camlibs/konica/konica.c:65
-#: camlibs/konica/konica.c:65
-msgid "Iris error."
-msgstr "光圈错误。"
-
-# camlibs/konica/konica.c:68
-#: camlibs/konica/konica.c:68
-msgid "Strobe error."
-msgstr "闪光灯。"
-
-# camlibs/konica/konica.c:71
-#: camlibs/konica/konica.c:71
-msgid "EEPROM checksum error."
-msgstr "EEPROM 校验和错误。"
-
-# camlibs/konica/konica.c:74
-#: camlibs/konica/konica.c:74
-msgid "Internal error (1)."
-msgstr "内部错误 (1)。"
-
-# camlibs/konica/konica.c:77
-#: camlibs/konica/konica.c:77
-msgid "Internal error (2)."
-msgstr "内部错误 (2)。"
-
-# camlibs/konica/konica.c:80
-#: camlibs/konica/konica.c:80
-msgid "No card present."
-msgstr "未插卡。"
-
-# camlibs/konica/konica.c:83
-#: camlibs/konica/konica.c:83
-msgid "Card not supported."
-msgstr "不支持的卡。"
-
-# camlibs/konica/konica.c:86
-#: camlibs/konica/konica.c:86
-msgid "Card removed during access."
-msgstr "访问使取出卡。"
-
-# camlibs/konica/konica.c:89
-#: camlibs/konica/konica.c:89
-msgid "Image number not valid."
-msgstr "图像数量不合法。"
-
-# camlibs/konica/konica.c:92
-#: camlibs/konica/konica.c:92
-msgid "Card can not be written."
-msgstr "无法写入卡。"
-
-# camlibs/konica/konica.c:95
-#: camlibs/konica/konica.c:95
-msgid "Card is write protected."
-msgstr "卡已写保护。"
-
-# camlibs/konica/konica.c:98
-#: camlibs/konica/konica.c:98
-msgid "No space left on card."
-msgstr "卡上没有剩余空间。"
-
-# camlibs/konica/konica.c:101
-#: camlibs/konica/konica.c:101
-msgid "Image protected."
-msgstr "图像已受到保护。"
-
-# camlibs/konica/konica.c:104
-#: camlibs/konica/konica.c:104
-msgid "Light too dark."
-msgstr "光线太暗。"
-
-# camlibs/konica/konica.c:107
-#: camlibs/konica/konica.c:107
-msgid "Autofocus error."
-msgstr "自动聚焦错误。"
-
-# camlibs/konica/konica.c:110
-#: camlibs/konica/konica.c:110
-msgid "System error."
-msgstr "系统错误。"
-
-# camlibs/konica/konica.c:113
-#: camlibs/konica/konica.c:113
-msgid "Illegal parameter."
-msgstr "非法参数。"
-
-# camlibs/konica/konica.c:116
-#: camlibs/konica/konica.c:116
-msgid "Command can not be cancelled."
-msgstr "命令不能被取消。"
-
-# camlibs/konica/konica.c:119
-#: camlibs/konica/konica.c:119
-msgid "Localization data too long."
-msgstr "本地化数据太长。"
-
-# camlibs/konica/konica.c:122
-#: camlibs/konica/konica.c:122
-msgid "Localization data corrupt."
-msgstr "本地化数据崩溃。"
-
-# camlibs/konica/konica.c:125
-#: camlibs/konica/konica.c:125
-msgid "Unsupported command."
-msgstr "不支持的命令。"
-
-# camlibs/konica/konica.c:128
-#: camlibs/konica/konica.c:128
-msgid "Other command executing."
-msgstr "正在执行其它命令。"
-
-# camlibs/konica/konica.c:131
-#: camlibs/konica/konica.c:131
-msgid "Command order error."
-msgstr "命令顺序错误。"
-
-# camlibs/konica/konica.c:134
-#: camlibs/konica/konica.c:134
-msgid "Unknown error."
-msgstr "未知的错误。"
-
-# camlibs/konica/konica.c:137
-#: camlibs/konica/konica.c:137
-#, c-format
-msgid ""
-"The camera has just sent an error that has not yet been discovered. Please "
-"report the following to %s with additional information how you got this "
-"error: (0x%x,0x%x). Thank you very much!"
-msgstr ""
-
-# camlibs/konica/library.c:142
-#: camlibs/konica/library.c:158 camlibs/pccam300/library.c:116
-msgid "Getting file list..."
-msgstr "正在获取文件列表..."
-
-# camlibs/konica/library.c:307
-#: camlibs/konica/library.c:325
-msgid "Testing different speeds..."
-msgstr "正在测试不同的速度..."
-
-# camlibs/konica/library.c:321
-#: camlibs/konica/library.c:340
-msgid ""
-"The camera could not be contacted. Please make sure it is connected to the "
-"computer and turned on."
-msgstr "无法与相机联络。请确信相机已经连接到计算机并确认相机已打开。"
-
-# libgphoto2/gphoto2-camera.c:850
-#: camlibs/konica/library.c:373
-msgid "Your camera does not support changing filenames."
-msgstr "您的相机不支持文件改名。"
-
-# camlibs/konica/library.c:405
-#: camlibs/konica/library.c:432
-#, c-format
-msgid "%i pictures could not be deleted because they are protected"
-msgstr "由于有 %i 个照片已被保护，所以无法被删除"
-
-# camlibs/konica/library.c:498
-#: camlibs/konica/library.c:532
-#, c-format
-msgid ""
-"Model: %s\n"
-"Serial Number: %s,\n"
-"Hardware Version: %i.%i\n"
-"Software Version: %i.%i\n"
-"Testing Software Version: %i.%i\n"
-"Name: %s,\n"
-"Manufacturer: %s\n"
-msgstr ""
-"型号：%s\n"
-"序列号：%s,\n"
-"硬件版本：%i.%i\n"
-"软件版本：%i.%i\n"
-"测试软件版本：%i.%i\n"
-"名称：%s,\n"
-"制造商：%s\n"
-
-# camlibs/konica/library.c:589
-#: camlibs/konica/library.c:625
-msgid ""
-"Konica library\n"
-"Lutz Mueller <lutz@users.sourceforge.net>\n"
-"Support for all Konica and several HP cameras."
-msgstr ""
-"柯尼卡库\n"
-"Lutz Mueller <lutz@users.sourceforge.net>\n"
-"支持所有柯尼卡相机和几种惠普相机。"
-
-# camlibs/konica/library.c:617
-#: camlibs/konica/library.c:650
-msgid "Getting configuration..."
-msgstr "正在获取配置..."
-
-# camlibs/konica/library.c:624
-#: camlibs/konica/library.c:657 camlibs/konica/qm150.c:749
-msgid "Konica Configuration"
-msgstr "柯尼卡配置"
-
-# camlibs/konica/library.c:629 camlibs/konica/library.c:840
-#: camlibs/konica/library.c:662 camlibs/konica/library.c:873
-#: camlibs/konica/qm150.c:754
-msgid "Persistent Settings"
-msgstr "永久设置"
-
-# camlibs/konica/library.c:659
-#: camlibs/konica/library.c:692
-msgid "Shall the camera beep when taking a picture?"
-msgstr "相机是否要在拍摄一张照片时鸣笛？"
-
-# camlibs/konica/library.c:663 camlibs/konica/library.c:871
-#: camlibs/konica/library.c:696 camlibs/konica/library.c:906
-msgid "Self Timer Time"
-msgstr "自动定时器时间"
-
-# camlibs/konica/library.c:670 camlibs/konica/library.c:879
-#: camlibs/konica/library.c:703 camlibs/konica/library.c:914
-#: camlibs/konica/qm150.c:763
-msgid "Auto Off Time"
-msgstr "自动关机时间"
-
-# camlibs/konica/library.c:677 camlibs/konica/library.c:887
-#: camlibs/konica/library.c:710 camlibs/konica/library.c:922
-msgid "Slide Show Interval"
-msgstr "幻灯片显示间隔"
-
-# camlibs/konica/library.c:684 camlibs/konica/library.c:896
-# camlibs/sierra/sierra.c:786 camlibs/sierra/sierra.c:1117
-# camlibs/sierra/sierra.c:1468 camlibs/sierra/sierra.c:1677
-#: camlibs/konica/library.c:717 camlibs/konica/library.c:931
-#: camlibs/konica/qm150.c:771 camlibs/ricoh/library.c:497
-#: camlibs/sierra/sierra.c:924 camlibs/sierra/sierra.c:1256
-#: camlibs/sierra/sierra.c:1607 camlibs/sierra/sierra.c:1816
-msgid "Resolution"
-msgstr "分辨率"
-
-# camlibs/konica/library.c:686 camlibs/konica/library.c:694
-# camlibs/konica/library.c:901
-#: camlibs/konica/library.c:719 camlibs/konica/library.c:727
-#: camlibs/konica/library.c:936
-msgid "Low (576 x 436)"
-msgstr "低 (576 x 436)"
-
-# camlibs/konica/library.c:687 camlibs/konica/library.c:697
-#: camlibs/konica/library.c:720 camlibs/konica/library.c:730
-msgid "Medium (1152 x 872)"
-msgstr "中 (1152 x 872)"
-
-# camlibs/konica/library.c:688 camlibs/konica/library.c:691
-# camlibs/konica/library.c:899
-#: camlibs/konica/library.c:721 camlibs/konica/library.c:724
-#: camlibs/konica/library.c:934
-msgid "High (1152 x 872)"
-msgstr "高 (1152 x 872)"
-
-# camlibs/konica/library.c:704 camlibs/konica/library.c:912
-#: camlibs/konica/library.c:737 camlibs/konica/library.c:947
-#: camlibs/konica/qm150.c:819
-msgid "Localization"
-msgstr "本地化"
-
-# camlibs/konica/library.c:710 camlibs/konica/library.c:915
-# camlibs/sierra/sierra.c:1544 camlibs/sierra/sierra.c:1728
-#: camlibs/konica/library.c:743 camlibs/konica/library.c:950
-#: camlibs/sierra/epson-desc.c:246 camlibs/sierra/nikon-desc.c:434
-#: camlibs/sierra/sierra.c:1683 camlibs/sierra/sierra.c:1867
-msgid "Language"
-msgstr "语言"
-
-# camlibs/konica/library.c:717 camlibs/konica/library.c:726
-# camlibs/konica/library.c:734 camlibs/konica/library.c:920
-# camlibs/konica/library.c:945 camlibs/konica/library.c:963
-#: camlibs/konica/library.c:750 camlibs/konica/library.c:759
-#: camlibs/konica/library.c:767 camlibs/konica/library.c:954
-#: camlibs/konica/library.c:979 camlibs/konica/library.c:997
-msgid "None selected"
-msgstr "未选择"
-
-# camlibs/konica/library.c:721 camlibs/konica/library.c:942
-#: camlibs/konica/library.c:754 camlibs/konica/library.c:976
-msgid "TV Output Format"
-msgstr "电视输出格式"
-
-# camlibs/konica/library.c:723 camlibs/konica/library.c:946
-#: camlibs/konica/library.c:756 camlibs/konica/library.c:980
-#: camlibs/ptp2/config.c:1703
-msgid "NTSC"
-msgstr "NTSC"
-
-# camlibs/konica/library.c:724 camlibs/konica/library.c:948
-#: camlibs/konica/library.c:757 camlibs/konica/library.c:982
-#: camlibs/ptp2/config.c:1704
-msgid "PAL"
-msgstr "PAL"
-
-# camlibs/konica/library.c:725 camlibs/konica/library.c:950
-#: camlibs/konica/library.c:758 camlibs/konica/library.c:984
-msgid "Do not display TV menu"
-msgstr "请勿显示电视菜单"
-
-# camlibs/konica/library.c:729 camlibs/konica/library.c:960
-#: camlibs/konica/library.c:762 camlibs/konica/library.c:994
-#: camlibs/konica/qm150.c:823
-msgid "Date Format"
-msgstr "日期格式"
-
-# camlibs/konica/library.c:731 camlibs/konica/library.c:964
-#: camlibs/konica/library.c:764 camlibs/konica/library.c:998
-#: camlibs/konica/qm150.c:825 camlibs/konica/qm150.c:830
-msgid "Month/Day/Year"
-msgstr "月/日/年"
-
-# camlibs/konica/library.c:732 camlibs/konica/library.c:966
-#: camlibs/konica/library.c:765 camlibs/konica/library.c:1000
-#: camlibs/konica/qm150.c:826 camlibs/konica/qm150.c:833
-msgid "Day/Month/Year"
-msgstr "日/月/年"
-
-# camlibs/konica/library.c:733 camlibs/konica/library.c:968
-#: camlibs/konica/library.c:766 camlibs/konica/library.c:1002
-#: camlibs/konica/qm150.c:827 camlibs/konica/qm150.c:836
-msgid "Year/Month/Day"
-msgstr "年/月/日"
-
-# camlibs/konica/library.c:739 camlibs/konica/library.c:980
-#: camlibs/konica/library.c:772 camlibs/konica/library.c:1014
-#: camlibs/konica/qm150.c:843
-msgid "Session-persistent Settings"
-msgstr "会话永久设置"
-
-# camlibs/konica/library.c:748 camlibs/konica/library.c:759
-# camlibs/konica/library.c:991
-#: camlibs/konica/library.c:781 camlibs/konica/library.c:792
-#: camlibs/konica/library.c:1025 camlibs/konica/qm150.c:852
-#: camlibs/konica/qm150.c:862
-msgid "On, red-eye reduction"
-msgstr "开，消红眼"
-
-# camlibs/konica/library.c:750 camlibs/konica/library.c:762
-#: camlibs/konica/library.c:783 camlibs/konica/library.c:795
-#: camlibs/konica/qm150.c:854 camlibs/konica/qm150.c:869
-msgid "Auto, red-eye reduction"
-msgstr "自动，消红眼"
-
-# camlibs/konica/library.c:777 camlibs/konica/library.c:1010
-#: camlibs/konica/library.c:810 camlibs/konica/library.c:1044
-#: camlibs/konica/qm150.c:935 camlibs/ptp2/config.c:3731
-#: camlibs/ptp2/config.c:3737
-msgid "Focus"
-msgstr "聚焦"
-
-# camlibs/konica/library.c:779 camlibs/konica/library.c:786
-# camlibs/sierra/sierra.c:1425 camlibs/sierra/sierra.c:1431
-# camlibs/sierra/sierra.c:1651
-#: camlibs/konica/library.c:812 camlibs/konica/library.c:819
-#: camlibs/sierra/epson-desc.c:170 camlibs/sierra/sierra.c:1564
-#: camlibs/sierra/sierra.c:1570 camlibs/sierra/sierra.c:1790
-msgid "Fixed"
-msgstr "固定"
-
-# camlibs/konica/library.c:793 camlibs/konica/library.c:1015
-#: camlibs/konica/library.c:826 camlibs/konica/library.c:1049
-#: camlibs/konica/qm150.c:1085
-msgid "Volatile Settings"
-msgstr "临时设定"
-
-# camlibs/konica/library.c:797 camlibs/konica/library.c:1018
-# camlibs/polaroid/pdc700.c:163
-#: camlibs/konica/library.c:830 camlibs/konica/library.c:1052
-#: camlibs/konica/qm150.c:1089 camlibs/polaroid/pdc700.c:163
-#: camlibs/ptp2/config.c:5257
-msgid "Self Timer"
-msgstr "自动定时"
-
-# camlibs/konica/library.c:803
-#: camlibs/konica/library.c:832 camlibs/konica/library.c:836
-#: camlibs/konica/library.c:1062 camlibs/konica/qm150.c:1091
-#: camlibs/konica/qm150.c:1095
-msgid "Self Timer (next picture only)"
-msgstr "自动定时 (仅用于下一张照片)"
-
-# camlibs/konica/library.c:800 camlibs/konica/library.c:807
-# camlibs/minolta/dimagev/dimagev.c:407 camlibs/sierra/sierra.c:856
-# camlibs/sierra/sierra.c:863 camlibs/sierra/sierra.c:917
-# camlibs/sierra/sierra.c:924 camlibs/sierra/sierra.c:979
-# camlibs/sierra/sierra.c:985 camlibs/sierra/sierra.c:1169
-# camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
-# camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
-# camlibs/sierra/sierra.c:1668
-#: camlibs/konica/library.c:833 camlibs/konica/library.c:840
-#: camlibs/konica/qm150.c:1092 camlibs/konica/qm150.c:1099
-#: camlibs/minolta/dimagev/dimagev.c:400 camlibs/ptp2/config.c:3156
-#: camlibs/ptp2/config.c:3169 camlibs/ptp2/config.c:3180
-#: camlibs/ptp2/config.c:3465 camlibs/ptp2/config.c:3647
-#: camlibs/ptp2/config.c:3691 camlibs/ptp2/ptp.c:4262 camlibs/ptp2/ptp.c:4270
-#: camlibs/ptp2/ptp.c:4430 camlibs/ptp2/ptp.c:4439 camlibs/ptp2/ptp.c:4553
-#: camlibs/ptp2/ptp.c:4560 camlibs/ricoh/library.c:349
-#: camlibs/sierra/epson-desc.c:219 camlibs/sierra/nikon-desc.c:253
-#: camlibs/sierra/nikon-desc.c:325 camlibs/sierra/olympus-desc.c:480
-#: camlibs/sierra/olympus-desc.c:660 camlibs/sierra/sierra.c:995
-#: camlibs/sierra/sierra.c:1002 camlibs/sierra/sierra.c:1056
-#: camlibs/sierra/sierra.c:1063 camlibs/sierra/sierra.c:1118
-#: camlibs/sierra/sierra.c:1124 camlibs/sierra/sierra.c:1308
-#: camlibs/sierra/sierra.c:1351 camlibs/sierra/sierra.c:1395
-#: camlibs/sierra/sierra.c:1590 camlibs/sierra/sierra.c:1594
-#: camlibs/sierra/sierra.c:1807
-#, c-format
-msgid "Normal"
-msgstr "普通"
-
-# camlibs/konica/library.c:1059
-#: camlibs/konica/library.c:1093
-#, c-format
-msgid "Could not find localization data at '%s'"
-msgstr "无法在“%s”找到本地化数据"
-
-# camlibs/konica/library.c:1123
-#: camlibs/konica/library.c:1159
-msgid "Localization file too long!"
-msgstr "本地化文件太大！"
-
-#: camlibs/konica/qm150.c:250
-msgid "This preview doesn't exist."
-msgstr ""
-
-#: camlibs/konica/qm150.c:282
-msgid "Data has been corrupted."
-msgstr "数据已损坏。"
-
-#: camlibs/konica/qm150.c:398
-#, c-format
-msgid "Image type %d is not supported by this camera !"
-msgstr "此照相机不支持图像类型 %d !"
-
-# camlibs/panasonic/dc1000.c:503 camlibs/panasonic/dc1580.c:625
-#: camlibs/konica/qm150.c:454
-#, c-format
-msgid "Can't delete image %s."
-msgstr "无法删除图像%s。"
-
-#: camlibs/konica/qm150.c:485
-msgid "Can't delete all images."
-msgstr "无法删除所有图像。"
-
-# camlibs/canon/serial.c:888
-#: camlibs/konica/qm150.c:517
-msgid "Uploading image..."
-msgstr "正在上传图像..."
-
-#: camlibs/konica/qm150.c:527 camlibs/konica/qm150.c:592
-msgid "Can't upload this image to the camera. An error has occurred."
-msgstr ""
-
-#: camlibs/konica/qm150.c:634
-msgid "You must be in record mode to capture images."
-msgstr ""
-
-#: camlibs/konica/qm150.c:637
-msgid ""
-"No space available to capture new images. You must delete some images."
-msgstr ""
-
-#: camlibs/konica/qm150.c:641
-msgid "Can't capture new images. Unknown error"
-msgstr ""
-
-# camlibs/canon/serial.c:1227 camlibs/canon/serial.c:1231
-# camlibs/dimera/dimera3500.c:970
-#: camlibs/konica/qm150.c:653
-msgid "No answer from the camera."
-msgstr "相机无应答"
-
-# camlibs/sierra/sierra.c:828 camlibs/sierra/sierra.c:835
-# camlibs/sierra/sierra.c:1152
-#: camlibs/konica/qm150.c:773 camlibs/konica/qm150.c:781
-#: camlibs/ptp2/config.c:3170 camlibs/ptp2/config.c:3648
-#: camlibs/ptp2/config.c:3690 camlibs/ptp2/config.c:3883
-#: camlibs/ptp2/ptp.c:4263 camlibs/ptp2/ptp.c:4679 camlibs/ptp2/ptp.c:4685
-#: camlibs/ptp2/ptp.c:4691 camlibs/sierra/nikon-desc.c:203
-#: camlibs/sierra/sierra.c:966 camlibs/sierra/sierra.c:973
-#: camlibs/sierra/sierra.c:1291
-msgid "Low"
-msgstr "低"
-
-# camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:837
-# camlibs/sierra/sierra.c:1154
-#: camlibs/konica/qm150.c:774 camlibs/konica/qm150.c:784
-#: camlibs/sierra/nikon-desc.c:204 camlibs/sierra/sierra.c:967
-#: camlibs/sierra/sierra.c:975 camlibs/sierra/sierra.c:1293
-msgid "Medium"
-msgstr "中"
-
-# camlibs/sierra/sierra.c:789 camlibs/sierra/sierra.c:797
-# camlibs/sierra/sierra.c:830 camlibs/sierra/sierra.c:839
-# camlibs/sierra/sierra.c:1125 camlibs/sierra/sierra.c:1156
-#: camlibs/konica/qm150.c:775 camlibs/konica/qm150.c:778
-#: camlibs/ptp2/config.c:3173 camlibs/ptp2/config.c:3646
-#: camlibs/ptp2/config.c:3692 camlibs/ptp2/ptp.c:4266 camlibs/ptp2/ptp.c:4681
-#: camlibs/ptp2/ptp.c:4687 camlibs/ptp2/ptp.c:4693 camlibs/sierra/sierra.c:927
-#: camlibs/sierra/sierra.c:935 camlibs/sierra/sierra.c:968
-#: camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1264
-#: camlibs/sierra/sierra.c:1295
-msgid "High"
-msgstr "高"
-
-# camlibs/polaroid/pdc700.c:162
-#: camlibs/konica/qm150.c:789 camlibs/polaroid/pdc700.c:162
-#: camlibs/ptp2/config.c:1904 camlibs/ptp2/config.c:1930
-#: camlibs/ptp2/config.c:1957 camlibs/ptp2/ptp.c:4728
-msgid "LCD"
-msgstr "LCD"
-
-#: camlibs/konica/qm150.c:803
-msgid "Icons"
-msgstr ""
-
-#: camlibs/konica/qm150.c:937 camlibs/konica/qm150.c:946
-msgid "2.0 m"
-msgstr ""
-
-#: camlibs/konica/qm150.c:938 camlibs/konica/qm150.c:949
-msgid "0.5 m"
-msgstr ""
-
-#: camlibs/konica/qm150.c:939 camlibs/konica/qm150.c:952
-msgid "0.1 m"
-msgstr ""
-
-# camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
-# camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/konica/qm150.c:957
-msgid "White balance"
-msgstr "白平衡"
-
-# camlibs/konica/library.c:650 camlibs/konica/library.c:653
-# camlibs/konica/library.c:746 camlibs/konica/library.c:753
-# camlibs/konica/library.c:861 camlibs/konica/library.c:987
-# camlibs/sierra/sierra.c:888 camlibs/sierra/sierra.c:897
-# camlibs/sierra/sierra.c:1004 camlibs/sierra/sierra.c:1007
-# camlibs/sierra/sierra.c:1194 camlibs/sierra/sierra.c:1274
-# camlibs/sierra/sierra.c:1398 camlibs/sierra/sierra.c:1406
-# camlibs/sierra/sierra.c:1633
-#: camlibs/konica/qm150.c:959 camlibs/konica/qm150.c:970
-msgid "Office"
-msgstr "办公室"
-
-# camlibs/sierra/sierra.c:948 camlibs/sierra/sierra.c:956
-# camlibs/sierra/sierra.c:1235
-#: camlibs/konica/qm150.c:960 camlibs/konica/qm150.c:967
-#: camlibs/ptp2/config.c:1194 camlibs/ptp2/config.c:3240
-#: camlibs/ptp2/config.c:3259 camlibs/ptp2/ptp.c:4205 camlibs/ptp2/ptp.c:4652
-#: camlibs/sierra/olympus-desc.c:556 camlibs/sierra/olympus-desc.c:575
-#: camlibs/sierra/olympus-desc.c:594 camlibs/sierra/olympus-desc.c:615
-msgid "Daylight"
-msgstr "日光"
-
-#: camlibs/konica/qm150.c:975 camlibs/ptp2/config.c:5310
-#: camlibs/ptp2/ptp.c:3473 camlibs/ptp2/ptp.c:3528
-msgid "Sharpness"
-msgstr ""
-
-#: camlibs/konica/qm150.c:977 camlibs/konica/qm150.c:985
-msgid "Sharp"
-msgstr ""
-
-#: camlibs/konica/qm150.c:978 camlibs/konica/qm150.c:988
-#: camlibs/ptp2/ptp.c:4611 camlibs/ptp2/ptp.c:4738
-msgid "Soft"
-msgstr ""
-
-# camlibs/sierra/sierra.c:1495 camlibs/sierra/sierra.c:1498
-# camlibs/sierra/sierra.c:1698
-#: camlibs/konica/qm150.c:993 camlibs/sierra/epson-desc.c:136
-#: camlibs/sierra/nikon-desc.c:219
-msgid "Color"
-msgstr "颜色"
-
-# camlibs/sierra/sierra.c:789 camlibs/sierra/sierra.c:797
-# camlibs/sierra/sierra.c:830 camlibs/sierra/sierra.c:839
-# camlibs/sierra/sierra.c:1125 camlibs/sierra/sierra.c:1156
-#: camlibs/konica/qm150.c:995 camlibs/konica/qm150.c:1005
-msgid "Light"
-msgstr "灯光"
-
-# camlibs/konica/library.c:647 camlibs/konica/library.c:858
-#: camlibs/konica/qm150.c:996 camlibs/konica/qm150.c:1008
-msgid "Deep"
-msgstr "深度"
-
-# camlibs/sierra/sierra.c:1496 camlibs/sierra/sierra.c:1500
-# camlibs/sierra/sierra.c:1700
-#: camlibs/konica/qm150.c:997 camlibs/konica/qm150.c:1011
-msgid "Black and White"
-msgstr "黑白"
-
-#: camlibs/konica/qm150.c:1049 camlibs/konica/qm150.c:1053
-#: camlibs/ptp2/config.c:2081
-msgid "Single"
-msgstr ""
-
-#: camlibs/konica/qm150.c:1050 camlibs/konica/qm150.c:1056
-msgid "Sequence 9"
-msgstr ""
-
-#: camlibs/konica/qm150.c:1061
-msgid "Date display"
-msgstr ""
-
-#: camlibs/konica/qm150.c:1063 camlibs/konica/qm150.c:1072
-msgid "Anywhere"
-msgstr ""
-
-# camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
-# camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/konica/qm150.c:1064 camlibs/konica/qm150.c:1070
-msgid "Play mode"
-msgstr "播放模式"
-
-# camlibs/minolta/dimagev/dimagev.c:308
-#: camlibs/konica/qm150.c:1065 camlibs/konica/qm150.c:1078
-msgid "Record mode"
-msgstr "录制模式"
-
-#: camlibs/konica/qm150.c:1066 camlibs/konica/qm150.c:1076
-msgid "Everywhere"
-msgstr ""
-
-#: camlibs/konica/qm150.c:1136 camlibs/ptp2/ptp.c:4546
-#, c-format
-msgid "AC"
-msgstr ""
-
-# camlibs/minolta/dimagev/dimagev.c:308
-#: camlibs/konica/qm150.c:1139 camlibs/minolta/dimagev/dimagev.c:301
-#: camlibs/sierra/nikon-desc.c:361
-#, c-format
-msgid "Play"
-msgstr "播放"
-
-# camlibs/minolta/dimagev/dimagev.c:308
-#: camlibs/konica/qm150.c:1141 camlibs/minolta/dimagev/dimagev.c:301
-#: camlibs/sierra/nikon-desc.c:360
-#, c-format
-msgid "Record"
-msgstr "录制"
-
-#: camlibs/konica/qm150.c:1151
-#, c-format
-msgid "DD/MM/YYYY"
-msgstr ""
-
-#: camlibs/konica/qm150.c:1156
-#, c-format
-msgid "YYYY/MM/DD"
-msgstr ""
-
-#: camlibs/konica/qm150.c:1160
-#, c-format
-msgid "MM/DD/YYYY"
-msgstr ""
-
-#: camlibs/konica/qm150.c:1164
-#, c-format
-msgid ""
-"Model: %s\n"
-"Capacity: %i Mb\n"
-"Power: %s\n"
-"Auto Off Time: %i min\n"
-"Mode: %s\n"
-"Images: %i/%i\n"
-"Date display: %s\n"
-"Date and Time: %s\n"
-msgstr ""
-
-#: camlibs/konica/qm150.c:1187
-#, c-format
-msgid ""
-"Konica Q-M150 Library\n"
-"Marcus Meissner <marcus@jet.franken.de>\n"
-"Aurelien Croc (AP2C) <programming@ap2c.com>\n"
-"http://www.ap2c.com\n"
-"Support for the french Konica Q-M150."
-msgstr ""
-
-#: camlibs/konica/qm150.c:1202
-#, c-format
-msgid ""
-"About Konica Q-M150:\n"
-"This camera does not allow any changes\n"
-"from the outside. So in the configuration, you can\n"
-"only see what it is configured on the camera\n"
-"but you can not change anything.\n"
-"\n"
-"If you have some issues with this driver, please e-mail its authors.\n"
-msgstr ""
-
-#: camlibs/largan/lmini/largan.c:228
-msgid ""
-"Largan driver\n"
-"Hubert Figuiere <hfiguiere@teaser.fr>\n"
-"\n"
-"Handles Largan Lmini camera.\n"
-msgstr ""
-"Largan 驱动程序\n"
-"Hubert Figuiere <hfiguiere@teaser.fr>\n"
-"\n"
-"Handles Largan Lmini 相机。\n"
-
-#: camlibs/lg_gsm/library.c:102
-#, c-format
-msgid ""
-"Your USB camera seems to be a LG GSM.\n"
-"Firmware: %s\n"
-"Firmware Version: %s\n"
-msgstr ""
-
-#: camlibs/lg_gsm/library.c:114
-msgid ""
-"LG GSM generic driver\n"
-"Guillaume Bedot <littletux@zarb.org>\n"
-msgstr ""
-
-#: camlibs/mars/library.c:124
-#, c-format
-msgid ""
-"Mars MR97310 camera.\n"
-"There is %i photo in it.\n"
-msgid_plural ""
-"Mars MR97310 camera.\n"
-"There are %i photos in it.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: camlibs/mars/library.c:135
-msgid ""
-"This driver supports cameras with Mars MR97310 chip (and direct\n"
-"equivalents ??Pixart PACx07??).\n"
-"These cameras do not support deletion of photos, nor uploading\n"
-"of data.\n"
-"Decoding of compressed photos may or may not work well\n"
-"and does not work equally well for all supported cameras.\n"
-"Photo data processing for Argus QuickClix is NOT SUPPORTED.\n"
-"If present on the camera, video clip frames are downloaded \n"
-"as consecutive still photos.\n"
-"For further details please consult libgphoto2/camlibs/README.\n"
-msgstr ""
-
-#: camlibs/mars/library.c:153
-msgid ""
-"Mars MR97310 camera library\n"
-"Theodore Kilgore <kilgota@auburn.edu>\n"
-msgstr ""
-
-# camlibs/minolta/dimagev/dimagev.c:272
-#: camlibs/minolta/dimagev/dimagev.c:265
-#, c-format
-msgid ""
-"Model:\t\t\tMinolta Dimage V (%s)\n"
-"Hardware Revision:\t%s\n"
-"Firmware Revision:\t%s\n"
-msgstr ""
-"型号：\t\tMinolta Dimage V (%s)\n"
-"硬件版本号：\t%s\n"
-"固件版本号：\t%s\n"
-
-# camlibs/minolta/dimagev/dimagev.c:287
-#: camlibs/minolta/dimagev/dimagev.c:280
-#, c-format
-msgid ""
-"Host Mode:\t\t%s\n"
-"Exposure Correction:\t%s\n"
-"Exposure Data:\t\t%d\n"
-"Date Valid:\t\t%s\n"
-"Date:\t\t\t%d/%02d/%02d %02d:%02d:%02d\n"
-"Self Timer Set:\t\t%s\n"
-"Quality Setting:\t%s\n"
-"Play/Record Mode:\t%s\n"
-"Card ID Valid:\t\t%s\n"
-"Card ID:\t\t%d\n"
-"Flash Mode:\t\t"
-msgstr ""
-"主机型号：\t\t%s\n"
-"曝光校正：\t\t%s\n"
-"曝光数据：\t\t%d\n"
-"有效数据：\t\t%s\n"
-"日期：\t\t\t%d/%02d/%02d %02d:%02d:%02d\n"
-"自动定时器设置:\t\t%s\n"
-"质量设定：\t\t%s\n"
-"播放/录制模式：\t\t%s\n"
-"有效卡 ID：\t\t%s\n"
-"卡 ID：\t\t\t%d\n"
-"闪光灯模式：\t\t"
-
-# camlibs/minolta/dimagev/dimagev.c:299
-#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/config.c:2527
-#: camlibs/ptp2/ptp.c:4250
-msgid "Remote"
-msgstr "远程"
-
-# camlibs/minolta/dimagev/dimagev.c:299
-#: camlibs/minolta/dimagev/dimagev.c:292
-msgid "Local"
-msgstr "本地"
-
-# camlibs/minolta/dimagev/dimagev.c:300 camlibs/minolta/dimagev/dimagev.c:302
-# camlibs/minolta/dimagev/dimagev.c:306 camlibs/minolta/dimagev/dimagev.c:309
-# frontends/command-line/gphoto2-cmd-config.c:372
-#: camlibs/minolta/dimagev/dimagev.c:293 camlibs/minolta/dimagev/dimagev.c:295
-#: camlibs/minolta/dimagev/dimagev.c:299 camlibs/minolta/dimagev/dimagev.c:302
-#: camlibs/ptp2/ptp.c:4151
-msgid "Yes"
-msgstr "是"
-
-# camlibs/minolta/dimagev/dimagev.c:300 camlibs/minolta/dimagev/dimagev.c:302
-# camlibs/minolta/dimagev/dimagev.c:306 camlibs/minolta/dimagev/dimagev.c:309
-# frontends/command-line/gphoto2-cmd-config.c:372
-#: camlibs/minolta/dimagev/dimagev.c:293 camlibs/minolta/dimagev/dimagev.c:295
-#: camlibs/minolta/dimagev/dimagev.c:299 camlibs/minolta/dimagev/dimagev.c:302
-#: camlibs/ptp2/ptp.c:4151
-msgid "No"
-msgstr "否"
-
-# camlibs/minolta/dimagev/dimagev.c:307 camlibs/sierra/sierra.c:1470
-# camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1682
-#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/ptp.c:4561
-#: camlibs/sierra/nikon-desc.c:283
-msgid "Fine"
-msgstr "精细"
-
-# camlibs/minolta/dimagev/dimagev.c:307 camlibs/sierra/sierra.c:788
-# camlibs/sierra/sierra.c:795 camlibs/sierra/sierra.c:1123
-# camlibs/sierra/sierra.c:1469 camlibs/sierra/sierra.c:1475
-# camlibs/sierra/sierra.c:1680
-#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/config.c:1731
-#: camlibs/ptp2/config.c:2655 camlibs/ptp2/ptp.c:4680 camlibs/ptp2/ptp.c:4686
-#: camlibs/ptp2/ptp.c:4692 camlibs/ptp2/ptp.c:4696 camlibs/sierra/sierra.c:926
-#: camlibs/sierra/sierra.c:933 camlibs/sierra/sierra.c:1262
-msgid "Standard"
-msgstr "标准"
-
-# camlibs/minolta/dimagev/dimagev.c:323
-#: camlibs/minolta/dimagev/dimagev.c:316
-#, c-format
-msgid "Automatic\n"
-msgstr "自动\n"
-
-# camlibs/minolta/dimagev/dimagev.c:331
-#: camlibs/minolta/dimagev/dimagev.c:324
-#, c-format
-msgid "Force Flash\n"
-msgstr "强制闪光\n"
-
-# camlibs/minolta/dimagev/dimagev.c:339
-#: camlibs/minolta/dimagev/dimagev.c:332
-#, c-format
-msgid "Prohibit Flash\n"
-msgstr "禁止闪光\n"
-
-# camlibs/minolta/dimagev/dimagev.c:347
-#: camlibs/minolta/dimagev/dimagev.c:340
-#, c-format
-msgid "Invalid Value ( %d )\n"
-msgstr "非法值 ( %d )\n"
-
-# camlibs/minolta/dimagev/dimagev.c:361
-#: camlibs/minolta/dimagev/dimagev.c:354
-#, c-format
-msgid ""
-"Battery Level:\t\t%s\n"
-"Number of Images:\t%d\n"
-"Minimum Capacity Left:\t%d\n"
-"Busy:\t\t\t%s\n"
-"Flash Charging:\t\t%s\n"
-"Lens Status:\t\t"
-msgstr ""
-"电池电量：\t\t%s\n"
-"图像数量：\t\t%d\n"
-"剩余最小容量：\t\t%d\n"
-"忙：\t\t\t%s\n"
-"闪光灯正在充电：\t%s\n"
-"镜头状态：\t\t"
-
-# camlibs/minolta/dimagev/dimagev.c:367
-#: camlibs/minolta/dimagev/dimagev.c:360
-msgid "Not Full"
-msgstr "未满"
-
-# camlibs/minolta/dimagev/dimagev.c:367 camlibs/minolta/dimagev/dimagev.c:410
-#: camlibs/minolta/dimagev/dimagev.c:360 camlibs/minolta/dimagev/dimagev.c:403
-#: camlibs/ptp2/config.c:1602 camlibs/ptp2/config.c:1656
-#: camlibs/ptp2/config.c:1709 camlibs/ptp2/ptp.c:4490 camlibs/ptp2/ptp.c:4496
-#, c-format
-msgid "Full"
-msgstr "满"
-
-# camlibs/minolta/dimagev/dimagev.c:370
-#: camlibs/minolta/dimagev/dimagev.c:363
-msgid "Busy"
-msgstr "忙"
-
-# camlibs/minolta/dimagev/dimagev.c:370
-#: camlibs/minolta/dimagev/dimagev.c:363
-msgid "Idle"
-msgstr "闲"
-
-# camlibs/minolta/dimagev/dimagev.c:371
-#: camlibs/minolta/dimagev/dimagev.c:364
-msgid "Charging"
-msgstr "正在充电"
-
-# camlibs/minolta/dimagev/dimagev.c:371
-#: camlibs/minolta/dimagev/dimagev.c:364
-msgid "Ready"
-msgstr "就绪"
-
-# camlibs/minolta/dimagev/dimagev.c:382
-#: camlibs/minolta/dimagev/dimagev.c:375
-#, c-format
-msgid "Normal\n"
-msgstr "普通\n"
-
-# camlibs/minolta/dimagev/dimagev.c:385
-#: camlibs/minolta/dimagev/dimagev.c:378
-#, c-format
-msgid "Lens direction does not match flash light\n"
-msgstr "镜头方向与闪光灯方向不匹配\n"
-
-# camlibs/minolta/dimagev/dimagev.c:388
-#: camlibs/minolta/dimagev/dimagev.c:381
-#, c-format
-msgid "Lens is not connected\n"
-msgstr "镜头未连接\n"
-
-# camlibs/minolta/dimagev/dimagev.c:391
-#: camlibs/minolta/dimagev/dimagev.c:384
-#, c-format
-msgid "Bad value for lens status %d\n"
-msgstr "错误的镜头状态值 %d\n"
-
-# camlibs/minolta/dimagev/dimagev.c:400
-#: camlibs/minolta/dimagev/dimagev.c:393
-#, c-format
-msgid "Card Status:\t\t"
-msgstr "卡状态：\t\t"
-
-# camlibs/minolta/dimagev/dimagev.c:413
-#: camlibs/minolta/dimagev/dimagev.c:406
-#, c-format
-msgid "Write-protected"
-msgstr "写保护"
-
-# camlibs/minolta/dimagev/dimagev.c:416
-#: camlibs/minolta/dimagev/dimagev.c:409
-#, c-format
-msgid "Unsuitable card"
-msgstr "不适当的卡"
-
-#: camlibs/minolta/dimagev/dimagev.c:412
-#, c-format
-msgid "Bad value for card status %d"
-msgstr ""
-
-# camlibs/minolta/dimagev/dimagev.c:438
-#: camlibs/minolta/dimagev/dimagev.c:431
-#, c-format
-msgid ""
-"Minolta Dimage V Camera Library\n"
-"%s\n"
-"Gus Hartmann <gphoto@gus-the-cat.org>\n"
-"Special thanks to Minolta for the spec."
-msgstr ""
-"Minolta Dimage V 相机库\n"
-"%s\n"
-"Gus Hartmann <gphoto@gus-the-cat.org>\n"
-"特别感谢 Minolta 提供相机规范。"
-
-# camlibs/konica/library.c:750 camlibs/konica/library.c:762
-#: camlibs/mustek/core.c:575
-msgid "FlashLight : Auto (RedEye Reduction)"
-msgstr "闪光灯：自动 (消红眼)"
-
-#: camlibs/mustek/core.c:577
-msgid "FlashLight : Auto"
-msgstr "闪光灯：自动"
-
-#: camlibs/mustek/core.c:579
-msgid "FlashLight : On (RedEye Reduction)"
-msgstr "闪光灯：开 (消红眼)"
-
-#: camlibs/mustek/core.c:581
-msgid "FlashLight : On"
-msgstr "闪光灯：开"
-
-#: camlibs/mustek/core.c:583
-msgid "FlashLight : Off"
-msgstr "闪光灯：关"
-
-#: camlibs/mustek/core.c:585
-msgid "FlashLight : undefined"
-msgstr "闪光灯：未定义"
-
-#: camlibs/mustek/mdc800.c:232
-msgid "Summary for Mustek MDC800:\n"
-msgstr "关于 Mustek MDC800 的概要：\n"
-
-# camlibs/konica/konica.c:83
-#: camlibs/mustek/mdc800.c:235
-msgid "no status reported."
-msgstr "无报告状态。"
-
-# camlibs/kodak/dc120/dc120.c:31
-#: camlibs/mustek/mdc800.c:241
-msgid "Compact Flash Card detected\n"
-msgstr "探测到闪存卡\n"
-
-# camlibs/kodak/dc120/dc120.c:31
-#: camlibs/mustek/mdc800.c:243
-msgid "No Compact Flash Card detected\n"
-msgstr "未探测到闪存卡\n"
-
-#: camlibs/mustek/mdc800.c:247
-msgid "Current Mode: Camera Mode\n"
-msgstr "当前模式：照相机模式\n"
-
-#: camlibs/mustek/mdc800.c:249
-msgid "Current Mode: Playback Mode\n"
-msgstr "当前模式：回放模式\n"
-
-#: camlibs/mustek/mdc800.c:258
-msgid "Batteries are ok."
-msgstr "电池就绪。"
-
-#: camlibs/mustek/mdc800.c:260
-msgid "Batteries are low."
-msgstr "电池低电量。"
-
-#: camlibs/mustek/mdc800.c:279
-msgid ""
-"Mustek MDC-800 gPhoto2 Library\n"
-"Henning Zabel <henning@uni-paderborn.de>\n"
-"Ported to gphoto2 by Marcus Meissner <marcus@jet.franken.de>\n"
-"Supports Serial and USB Protocol."
-msgstr ""
-"Mustek MDC-800 gPhoto2 库\n"
-"Henning Zabel <henning@uni-paderborn.de>\n"
-"由 Marcus Meissner <marcus@jet.franken.de> 移植到 gphoto2\n"
-"支持串口和 USB 协议。"
-
-# camlibs/panasonic/coolshot/coolshot.c:264
-#: camlibs/panasonic/coolshot/coolshot.c:264
-msgid "coolshot library v"
-msgstr "coolshot 库 v"
-
-# camlibs/panasonic/dc1000.c:371 camlibs/panasonic/dc1580.c:468
-#: camlibs/panasonic/dc1000.c:371 camlibs/panasonic/dc1580.c:467
-msgid "Disconnecting camera."
-msgstr "正在断开与相机的连接。"
-
-# camlibs/panasonic/dc1000.c:411
-#: camlibs/panasonic/dc1000.c:408
-#, c-format
-msgid "Downloading image %s."
-msgstr "正在下载图像 %s。"
-
-# camlibs/panasonic/dc1000.c:452 camlibs/panasonic/dc1580.c:577
-#: camlibs/panasonic/dc1000.c:449 camlibs/panasonic/dc1580.c:571
-#, c-format
-msgid "Uploading image: %s."
-msgstr "正在上载图像：%s。"
-
-# camlibs/panasonic/dc1000.c:463 camlibs/panasonic/dc1580.c:588
-#: camlibs/panasonic/dc1000.c:460 camlibs/panasonic/dc1580.c:582
-#, c-format
-msgid ""
-"File size is %ld bytes. The size of the largest file possible to upload is: "
-"%i bytes."
-msgstr ""
-
-# camlibs/panasonic/dc1000.c:476 camlibs/panasonic/dc1580.c:599
-#: camlibs/panasonic/dc1000.c:473 camlibs/panasonic/dc1580.c:593
-#: camlibs/ricoh/ricoh.c:852
-msgid "Uploading..."
-msgstr "正在上载..."
-
-# camlibs/panasonic/dc1000.c:503 camlibs/panasonic/dc1580.c:625
-#: camlibs/panasonic/dc1000.c:500 camlibs/panasonic/dc1580.c:619
-#, c-format
-msgid "Deleting image %s."
-msgstr "正在删除图像 %s。"
-
-# camlibs/panasonic/dc1000.c:516
-#: camlibs/panasonic/dc1000.c:513
-msgid ""
-"Panasonic DC1000 gPhoto library\n"
-"Mariusz Zynel <mariusz@mizar.org>\n"
-"\n"
-"Based on dc1000 program written by\n"
-"Fredrik Roubert <roubert@df.lth.se> and\n"
-"Galen Brooks <galen@nine.com>."
-msgstr ""
-"松下 DC1000 gPhoto 库\n"
-"Mariusz Zynel <mariusz@mizar.org>\n"
-"\n"
-"基于由 Fredrik Roubert <roubert@df.lth.se>\n"
-"和 Galen Brooks <galen@nine.com> 编制的\n"
-"dc1000 程序。"
-
-# camlibs/panasonic/dc1580.c:528
-#: camlibs/panasonic/dc1580.c:522
-#, c-format
-msgid "Downloading %s."
-msgstr "正在下载 %s。"
-
-#: camlibs/panasonic/dc1580.c:631
-msgid ""
-"Panasonic DC1580 gPhoto2 library\n"
-"Mariusz Zynel <mariusz@mizar.org>\n"
-"\n"
-"Based on dc1000 program written by\n"
-"Fredrik Roubert <roubert@df.lth.se> and\n"
-"Galen Brooks <galen@nine.com>."
-msgstr ""
-
-# camlibs/panasonic/l859/l859.c:505
-#: camlibs/panasonic/l859/l859.c:500
-#, c-format
-msgid "Downloading '%s'..."
-msgstr "正在下载“%s”..."
-
-#: camlibs/panasonic/l859/l859.c:581
-msgid ""
-"Panasonic PV-L859-K/PV-L779-K Palmcorder\n"
-"\n"
-"Panasonic introduced image capturing technology called PHOTOSHOT for the "
-"first time, in this series of Palmcorders.  Images are stored in JPEG format "
-"on an internal flashcard and can be transferred to a computer through the "
-"built-in serial port.  Images are saved in one of two resolutions; NORMAL is "
-"320x240 and FINE is 640x480.  The CCD device which captures the images from "
-"the lens is only 300K and thus produces only low quality pictures."
-msgstr ""
-
-# camlibs/panasonic/l859/l859.c:604
-#: camlibs/panasonic/l859/l859.c:599
-msgid ""
-"Known problems:\n"
-"\n"
-"If communications problems occur, reset the camera and restart the "
-"application.  The driver is not robust enough yet to recover from these "
-"situations, especially if a problem occurs and the camera is not properly "
-"shutdown at speeds faster than 9600."
-msgstr ""
-"已知的问题：\n"
-"\n"
-"如果通讯出现问题，重置相机并重新启动应用程序。驱动程序还没有健壮到能够从这些情况下恢复过来，特别是如果是在速度高于 9600 "
-"时出现问题而相机没有正常关闭时。"
-
-# camlibs/panasonic/l859/l859.c:618
-#: camlibs/panasonic/l859/l859.c:613
-msgid ""
-"Panasonic PV-L859-K/PV-L779-K Palmcorder Driver\n"
-"Andrew Selkirk <aselkirk@mailandnews.com>"
-msgstr ""
-"松下 PV-L859-K/PV-L779-K Palmcorder 驱动程序\n"
-"Andrew Selkirk <aselkirk@mailandnews.com>"
-
-#: camlibs/pccam300/library.c:234
-#, c-format
-msgid ""
-" Total memory is %8d bytes.\n"
-" Free memory is  %8d bytes.\n"
-" Filecount: %d"
-msgstr ""
-
-#: camlibs/pccam300/library.c:246
-msgid ""
-"Creative PC-CAM 300\n"
-" Authors: Till Adam\n"
-"<till@adam-lilienthal.de>\n"
-"and: Miah Gregory\n"
-" <mace@darksilence.net>"
-msgstr ""
-
-# camlibs/dimera/dimera3500.c:701 camlibs/dimera/dimera3500.c:737
-# camlibs/panasonic/coolshot/library.c:375 camlibs/samsung/samsung.c:211
-#: camlibs/pccam600/library.c:192
-msgid "Downloading file..."
-msgstr "正在下载文件..."
-
-#: camlibs/pccam600/library.c:254
-msgid ""
-"Creative PC-CAM600\n"
-"Author: Peter Kajberg <pbk@odense.kollegienet.dk>\n"
-msgstr ""
-
-#: camlibs/pccam600/pccam600.c:128 camlibs/pccam600/pccam600.c:157
-#, c-format
-msgid "pccam600_init:Expected > %d blocks got %d"
-msgstr ""
-
-#: camlibs/pccam600/pccam600.c:141
-#, c-format
-msgid "pccam600_get_file:got index %d but expected index > %d"
-msgstr ""
-
-#: camlibs/pccam600/pccam600.c:183
-#, c-format
-msgid "pccam600_close:return value was %d instead of %d"
-msgstr ""
-
-#: camlibs/pccam600/pccam600.c:217
-#, c-format
-msgid "pccam600_init:Expected %d blocks got %d"
-msgstr ""
-
-#: camlibs/pccam600/pccam600.c:228
-#, c-format
-msgid ""
-"pccam600 init:Unexpected error: gp_port_read returned %d instead of %d"
-msgstr ""
-
-#: camlibs/polaroid/pdc320.c:457
-msgid ""
-"Download program for several Polaroid cameras. Originally written by Peter "
-"Desnoyers <pjd@fred.cambridge.ma.us>, and adapted for gphoto2 by Nathan "
-"Stenzel <nathanstenzel@users.sourceforge.net> and Lutz Mueller "
-"<lutz@users.sf.net>.\n"
-"Polaroid 640SE testing was done by Michael Golden <naugrim@juno.com>."
-msgstr ""
-
-#: camlibs/polaroid/pdc320.c:487
-#, c-format
-msgid "Model: %x, %x, %x, %x"
-msgstr ""
-
-#: camlibs/polaroid/pdc640.c:903
-msgid ""
-"Download program for GrandTek 98x based cameras. Originally written by Chris "
-"Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller "
-"<lutz@users.sf.net>.Protocol enhancements and postprocessing  for Jenoptik "
-"JD350e by Michael Trawny <trawny99@users.sourceforge.net>.Bugfixes by Marcus "
-"Meissner <marcus@jet.franken.de>."
-msgstr ""
-
-# camlibs/polaroid/pdc700.c:159
-#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/config.c:5223
-#: camlibs/ptp2/config.c:5285 camlibs/ptp2/config.c:5411
-#: camlibs/ptp2/config.c:5424 camlibs/ptp2/ptp.c:3509
-msgid "Image Quality"
-msgstr "图像质量"
-
-# camlibs/polaroid/pdc700.c:160
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/config.c:5230
-#: camlibs/ptp2/config.c:5231 camlibs/ptp2/ptp.c:3453 camlibs/ptp2/ptp.c:3511
-msgid "Image Size"
-msgstr "图像大小"
-
-# camlibs/polaroid/pdc700.c:161
-#: camlibs/polaroid/pdc700.c:161
-msgid "Flash Setting"
-msgstr "闪光灯设置"
-
-# camlibs/polaroid/pdc700.c:164
-#: camlibs/polaroid/pdc700.c:164
-msgid "Auto Power Off (minutes)"
-msgstr "自动关机 (分钟)"
-
-# camlibs/polaroid/pdc700.c:165
-#: camlibs/polaroid/pdc700.c:165
-msgid "Information"
-msgstr "信息"
-
-# camlibs/polaroid/pdc700.c:167
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/config.c:1528
-msgid "normal"
-msgstr "普通"
-
-# camlibs/polaroid/pdc700.c:167
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/config.c:1529
-#: camlibs/sierra/sierra.c:1609 camlibs/sierra/sierra.c:1616
-#: camlibs/sierra/sierra.c:1821
-msgid "fine"
-msgstr "精细"
-
-# camlibs/polaroid/pdc700.c:167
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/config.c:1531
-#: camlibs/sierra/sierra.c:1610 camlibs/sierra/sierra.c:1618
-#: camlibs/sierra/sierra.c:1823
-msgid "superfine"
-msgstr "超精细"
-
-# camlibs/polaroid/pdc700.c:169 camlibs/sierra/sierra.c:1368
-# camlibs/sierra/sierra.c:1382 camlibs/sierra/sierra.c:1617
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1577
-#: camlibs/ptp2/config.c:3357 camlibs/sierra/epson-desc.c:116
-#: camlibs/sierra/sierra.c:1507 camlibs/sierra/sierra.c:1521
-#: camlibs/sierra/sierra.c:1756
-msgid "auto"
-msgstr "自动"
-
-# camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/config.c:1578 camlibs/sierra/nikon-desc.c:565
-#: camlibs/sierra/nikon-desc.c:570
-msgid "on"
-msgstr "开"
-
-# camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/config.c:1576 camlibs/ptp2/config.c:2064
-#: camlibs/sierra/nikon-desc.c:564 camlibs/sierra/nikon-desc.c:569
-msgid "off"
-msgstr "关"
-
-# camlibs/polaroid/pdc700.c:171
-#: camlibs/polaroid/pdc700.c:171
-msgid "play"
-msgstr "播放"
-
-# camlibs/polaroid/pdc700.c:171
-#: camlibs/polaroid/pdc700.c:171
-msgid "record"
-msgstr "录制"
-
-# camlibs/polaroid/pdc700.c:171
-#: camlibs/polaroid/pdc700.c:171
-msgid "menu"
-msgstr "菜单"
-
-# camlibs/polaroid/pdc700.c:172
-#: camlibs/polaroid/pdc700.c:172
-msgid "battery"
-msgstr "电池"
-
-# camlibs/polaroid/pdc700.c:172
-#: camlibs/polaroid/pdc700.c:172
-msgid "a/c adaptor"
-msgstr "交流变压器"
-
-# camlibs/polaroid/pdc700.c:229
-#: camlibs/polaroid/pdc700.c:229
-#, c-format
-msgid "Received unexpected header (%i)"
-msgstr "收到意外的头 (%i)"
-
-# camlibs/polaroid/pdc700.c:242
-#: camlibs/polaroid/pdc700.c:242
-msgid "Received unexpected response"
-msgstr "收到意外应答"
-
-# camlibs/polaroid/pdc700.c:263
-#: camlibs/polaroid/pdc700.c:263
-msgid "Checksum error"
-msgstr "校验和错误"
-
-# camlibs/polaroid/pdc700.c:296
-#: camlibs/polaroid/pdc700.c:296
-msgid "The camera did not accept the command."
-msgstr "相机不接受命令。"
-
-# camlibs/polaroid/pdc700.c:349
-#: camlibs/polaroid/pdc700.c:349
-#, c-format
-msgid "The camera sent more bytes than expected (%i)"
-msgstr "相机发送了比预期更多的字节 (%i)"
-
-# camlibs/polaroid/pdc700.c:451
-#: camlibs/polaroid/pdc700.c:451
-#, c-format
-msgid ""
-"Requested information about picture %i (= 0x%x), but got information about "
-"picture %i back"
-msgstr "请求关于照片 %i (= 0x%x) 的信息，但得到了关于照片 %i 的返回信息"
-
-#: camlibs/polaroid/pdc700.c:914
-#, c-format
-msgid ""
-"%i bytes of an unknown image format have been received. Please write to %s "
-"and ask for assistance."
-msgstr "已接收 %i 字节的未知格式图像。请发送邮件到 %s 寻求帮助。"
-
-#: camlibs/polaroid/pdc700.c:939
-msgid ""
-"Download program for Polaroid DC700 camera. Originally written by Ryan "
-"Lantzer <rlantzer@umr.edu> for gphoto-4.x. Adapted for gphoto2 by Lutz "
-"Mueller <lutz@users.sf.net>."
-msgstr ""
-
-# camlibs/canon/library.c:808 camlibs/polaroid/pdc700.c:983
-#: camlibs/polaroid/pdc700.c:982
-msgid "Camera"
-msgstr "相机"
-
-# camlibs/polaroid/pdc700.c:996
-#: camlibs/polaroid/pdc700.c:995
-msgid "How long will it take until the camera powers off?"
-msgstr "在相机关机前须等待多长时间？"
-
-# camlibs/polaroid/pdc700.c:999
-#: camlibs/polaroid/pdc700.c:998 camlibs/ricoh/library.c:357
-msgid "Image"
-msgstr "图像"
-
-# camlibs/polaroid/pdc700.c:1110
-#: camlibs/polaroid/pdc700.c:1109
-#, c-format
-msgid ""
-"Date: %i/%02i/%02i %02i:%02i:%02i\n"
-"Pictures taken: %i\n"
-"Free pictures: %i\n"
-"Software version: %s\n"
-"Baudrate: %s\n"
-"Memory: %i megabytes\n"
-"Camera mode: %s\n"
-"Image quality: %s\n"
-"Flash setting: %s\n"
-"Information: %s\n"
-"Timer: %s\n"
-"LCD: %s\n"
-"Auto power off: %i minutes\n"
-"Power source: %s"
-msgstr ""
-"日期：%i/%02i/%02i %02i:%02i:%02i\n"
-"拍摄照片数：%i\n"
-"免费照片数：%i\n"
-"软件版本：%s\n"
-"带宽：%s\n"
-"内存：%i 兆字节\n"
-"相机模式：%s\n"
-"图像质量：%s\n"
-"闪光灯设置：%s\n"
-"信息：%s\n"
-"计时器：%s\n"
-"LCD: %s\n"
-"自动关机：%i 分钟\n"
-"电源来源：%s"
-
-# camlibs/polaroid/pdc700.c:1229
-#: camlibs/polaroid/pdc700.c:1233
-#, c-format
-msgid "The requested port type (%i) is not supported by this driver."
-msgstr "该驱动程序不支持请求的端口类型 (%i)。"
-
-#: camlibs/ptp2/config.c:155 camlibs/ptp2/config.c:1968
-#: camlibs/ptp2/library.c:1716 camlibs/ptp2/library.c:2506
-#, c-format
-msgid "Canon enable viewfinder failed: %d"
-msgstr ""
-
-# libgphoto2/gphoto2-camera.c:850
-#: camlibs/ptp2/config.c:347 camlibs/ptp2/config.c:423
-msgid "Sorry, your Canon camera does not support Canon capture"
-msgstr "对不起, 您的Canon相机不支持Canon capture。"
-
-#: camlibs/ptp2/config.c:371 camlibs/ptp2/config.c:1979
-#: camlibs/ptp2/library.c:2381
-#, c-format
-msgid "Canon disable viewfinder failed: %d"
-msgstr ""
-
-#: camlibs/ptp2/config.c:586 camlibs/ptp2/config.c:627
-#: camlibs/ptp2/config.c:674 camlibs/ptp2/config.c:744
-#: camlibs/ptp2/config.c:782 camlibs/ptp2/config.c:856
-#: camlibs/ptp2/config.c:864 camlibs/ptp2/config.c:895
-#: camlibs/ptp2/config.c:905 camlibs/ptp2/config.c:931
-#, c-format
-msgid "Unknown value %04x"
-msgstr ""
-
-#: camlibs/ptp2/config.c:616 camlibs/ptp2/config.c:771
-#: camlibs/ptp2/config.c:806
-#, c-format
-msgid "Unknown value %04d"
-msgstr ""
-
-# camlibs/canon/serial.c:672
-#: camlibs/ptp2/config.c:961 camlibs/ptp2/config.c:978
-#: camlibs/ptp2/config.c:1099 camlibs/ptp2/config.c:1181
-#, c-format
-msgid "unexpected datatype %i"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1191 camlibs/ptp2/config.c:1546
-#: camlibs/ptp2/config.c:1559 camlibs/ptp2/config.c:1588
-#: camlibs/ptp2/config.c:1625 camlibs/ptp2/config.c:1686
-#: camlibs/ptp2/config.c:3190 camlibs/ptp2/config.c:3209
-#: camlibs/ptp2/config.c:3224 camlibs/ptp2/config.c:3264
-#: camlibs/ptp2/ptp.c:4202 camlibs/ptp2/ptp.c:4474 camlibs/ptp2/ptp.c:4598
-#: camlibs/ptp2/ptp.c:4633 camlibs/ptp2/ptp.c:4673
-#: camlibs/sierra/olympus-desc.c:639
-msgid "Manual"
-msgstr ""
-
-# camlibs/minolta/dimagev/dimagev.c:323
-#: camlibs/ptp2/config.c:1192 camlibs/ptp2/config.c:3210
-#: camlibs/ptp2/ptp.c:4203 camlibs/ptp2/ptp.c:4214
-msgid "Automatic"
-msgstr "自动"
-
-#: camlibs/ptp2/config.c:1193 camlibs/ptp2/ptp.c:4204
-msgid "One-push Automatic"
-msgstr ""
-
-# camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:958
-# camlibs/sierra/sierra.c:1237
-#: camlibs/ptp2/config.c:1195 camlibs/ptp2/config.c:3243
-#: camlibs/ptp2/config.c:3262 camlibs/ptp2/ptp.c:4206 camlibs/ptp2/ptp.c:4655
-#: camlibs/ricoh/library.c:329 camlibs/sierra/nikon-desc.c:285
-#: camlibs/sierra/olympus-desc.c:557 camlibs/sierra/olympus-desc.c:576
-#: camlibs/sierra/sierra.c:1088 camlibs/sierra/sierra.c:1097
-#: camlibs/sierra/sierra.c:1376
-msgid "Fluorescent"
-msgstr "荧光"
-
-# camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:960
-# camlibs/sierra/sierra.c:1239
-#: camlibs/ptp2/config.c:1196 camlibs/ptp2/config.c:3242
-#: camlibs/ptp2/config.c:3261 camlibs/ptp2/ptp.c:4654
-#: camlibs/sierra/olympus-desc.c:558 camlibs/sierra/olympus-desc.c:577
-#: camlibs/sierra/olympus-desc.c:595 camlibs/sierra/olympus-desc.c:616
-#: camlibs/sierra/sierra.c:1089 camlibs/sierra/sierra.c:1099
-#: camlibs/sierra/sierra.c:1378
-msgid "Tungsten"
-msgstr "钨"
-
-# camlibs/sierra/sierra.c:951 camlibs/sierra/sierra.c:963
-# camlibs/sierra/sierra.c:1241
-#: camlibs/ptp2/config.c:1198 camlibs/ptp2/config.c:3241
-#: camlibs/ptp2/config.c:3260 camlibs/ptp2/ptp.c:4209 camlibs/ptp2/ptp.c:4653
-#: camlibs/sierra/nikon-desc.c:288 camlibs/sierra/olympus-desc.c:559
-#: camlibs/sierra/olympus-desc.c:578 camlibs/sierra/olympus-desc.c:599
-#: camlibs/sierra/olympus-desc.c:622 camlibs/sierra/sierra.c:1090
-#: camlibs/sierra/sierra.c:1102 camlibs/sierra/sierra.c:1380
-msgid "Cloudy"
-msgstr "多云"
-
-#: camlibs/ptp2/config.c:1199 camlibs/ptp2/config.c:1207
-#: camlibs/ptp2/ptp.c:4210
-msgid "Shade"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1200 camlibs/ptp2/config.c:3246
-#: camlibs/ptp2/config.c:3267 camlibs/ptp2/ptp.c:3490 camlibs/ptp2/ptp.c:4066
-#: camlibs/ptp2/ptp.c:4211 camlibs/ptp2/ptp.c:4658
-msgid "Color Temperature"
-msgstr ""
-
-# camlibs/sierra/sierra.c:1552 camlibs/sierra/sierra.c:1568
-# camlibs/sierra/sierra.c:1745
-#: camlibs/ptp2/config.c:1201 camlibs/ptp2/ptp.c:4212 camlibs/ptp2/ptp.c:4656
-#: camlibs/sierra/nikon-desc.c:287 camlibs/sierra/olympus-desc.c:621
-msgid "Preset"
-msgstr "预设"
-
-#: camlibs/ptp2/config.c:1202
-msgid "Fluorescent Lamp 1"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1203
-msgid "Fluorescent Lamp 2"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1204
-msgid "Fluorescent Lamp 3"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1205
-msgid "Fluorescent Lamp 4"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1206
-msgid "Fluorescent Lamp 5"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1208
-msgid "Choose Color Temperature"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1209
-msgid "Preset Custom 1"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1210
-msgid "Preset Custom 2"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1211
-msgid "Preset Custom 3"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1212
-msgid "Preset Custom 4"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1213
-msgid "Preset Custom 5"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1219 camlibs/ptp2/config.c:3657
-#: camlibs/ptp2/config.c:3668 camlibs/ptp2/config.c:3680
-#: camlibs/ptp2/ptp.c:4199
-msgid "JPEG Fine"
-msgstr "JPEG 精细"
-
-# camlibs/konica/library.c:800 camlibs/konica/library.c:807
-# camlibs/minolta/dimagev/dimagev.c:407 camlibs/sierra/sierra.c:856
-# camlibs/sierra/sierra.c:863 camlibs/sierra/sierra.c:917
-# camlibs/sierra/sierra.c:924 camlibs/sierra/sierra.c:979
-# camlibs/sierra/sierra.c:985 camlibs/sierra/sierra.c:1169
-# camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
-# camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
-# camlibs/sierra/sierra.c:1668
-#: camlibs/ptp2/config.c:1220 camlibs/ptp2/config.c:3656
-#: camlibs/ptp2/config.c:3667 camlibs/ptp2/config.c:3679
-msgid "JPEG Normal"
-msgstr "JPEG 普通"
-
-#: camlibs/ptp2/config.c:1221
-msgid "RAW + JPEG Fine"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1222
-msgid "RAW + JPEG Normal"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1227
-msgid "Single frame"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1228 camlibs/ptp2/config.c:2084
-msgid "Continuous low speed"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1229 camlibs/ptp2/config.c:2083
-msgid "Continuous high speed"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1230
-msgid "Self-timer"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1231
-msgid "Mup Mirror up"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1526
-msgid "undefined"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1527
-msgid "economy"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1530
-msgid "lossless"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1536 camlibs/ptp2/config.c:1854
-#: camlibs/ptp2/config.c:1903 camlibs/ptp2/config.c:3208
-#: camlibs/ptp2/library.c:3575 camlibs/ptp2/library.c:3589
-#: camlibs/ptp2/ptp.c:4223 camlibs/ptp2/ptp.c:4552 camlibs/ptp2/ptp.c:4558
-#: camlibs/ptp2/ptp.c:4565 camlibs/ptp2/ptp.c:4727 camlibs/ptp2/ptp.c:4938
-msgid "Undefined"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1538 camlibs/ptp2/ptp.c:4567
-msgid "CRW"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1544 camlibs/ptp2/config.c:1557
-msgid "TV"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1545 camlibs/ptp2/config.c:1558
-msgid "AV"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1547 camlibs/ptp2/config.c:1561
-#: camlibs/ptp2/ptp.c:4592
-msgid "A_DEP"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1548 camlibs/ptp2/ptp.c:4593
-msgid "M_DEP"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1562
-msgid "DEP"
-msgstr ""
-
-# camlibs/sierra/sierra.c:1426 camlibs/sierra/sierra.c:1433
-# camlibs/sierra/sierra.c:1653
-#: camlibs/ptp2/config.c:1563 camlibs/ptp2/config.c:3163
-#: camlibs/ptp2/config.c:3185 camlibs/ptp2/config.c:3244
-#: camlibs/ptp2/ptp.c:4275 camlibs/ptp2/ptp.c:4437
-#: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1565
-#: camlibs/sierra/sierra.c:1572 camlibs/sierra/sierra.c:1792
-msgid "Custom"
-msgstr "定制"
-
-#: camlibs/ptp2/config.c:1564
-msgid "Lock"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1566 camlibs/ptp2/config.c:2479
-#: camlibs/ptp2/config.c:2498 camlibs/ptp2/ptp.c:4244
-msgid "Night Portrait"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1567 camlibs/ptp2/config.c:2478
-#: camlibs/ptp2/config.c:2512 camlibs/ptp2/ptp.c:4242 camlibs/ptp2/ptp.c:4606
-msgid "Sports"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1569 camlibs/ptp2/config.c:1733
-#: camlibs/ptp2/config.c:2476 camlibs/ptp2/config.c:2510
-#: camlibs/ptp2/config.c:3162 camlibs/ptp2/ptp.c:4240 camlibs/ptp2/ptp.c:4436
-#: camlibs/st2205/library.c:514 camlibs/st2205/library.c:527
-msgid "Landscape"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1570
-msgid "Closeup"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1571
-msgid "Flash Off"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1579
-msgid "red eye suppression"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1580
-msgid "fill in"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1581
-msgid "auto + red eye suppression"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1582
-msgid "on + red eye suppression"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1587
-msgid "iTTL"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1589 camlibs/ptp2/ptp.c:4475
-msgid "Commander"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1590
-msgid "Repeating"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1595 camlibs/ptp2/config.c:1624
-#: camlibs/ptp2/config.c:1684 camlibs/ptp2/ptp.c:4477
-msgid "TTL"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1596 camlibs/ptp2/config.c:1685
-#: camlibs/ptp2/ptp.c:4478
-msgid "Auto Aperture"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1597 camlibs/ptp2/ptp.c:4479
-msgid "Full Manual"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1693 camlibs/ptp2/config.c:3212
-#: camlibs/ptp2/ptp.c:4445
-msgid "AF-S"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1694 camlibs/ptp2/config.c:3213
-#: camlibs/ptp2/ptp.c:4446
-msgid "AF-C"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1695 camlibs/ptp2/config.c:3214
-#: camlibs/ptp2/ptp.c:4447
-msgid "AF-A"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1696 camlibs/ptp2/ptp.c:4448
-msgid "MF (fixed)"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1697 camlibs/ptp2/ptp.c:4449
-msgid "MF (selection)"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1719
-msgid "Center-weighted"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1721 camlibs/ptp2/config.c:2625
-#: camlibs/ptp2/config.c:3066 camlibs/ptp2/ptp.c:4219
-msgid "Average"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1722
-msgid "Evaluative"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1723
-msgid "Partial"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1724
-msgid "Center-weighted average"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1725
-msgid "Spot metering interlocked with AF frame"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1726
-msgid "Multi spot"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1735
-msgid "Faithful"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1736 camlibs/ptp2/ptp.c:4608 camlibs/ptp2/ptp.c:4740
-msgid "Monochrome"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1737
-msgid "User defined 1"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1738
-msgid "User defined 2"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1739
-msgid "User defined 3"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1825 camlibs/ptp2/ptp.c:4643
-msgid "Focusing Point on Center Only, Manual"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1826 camlibs/ptp2/ptp.c:4644
-msgid "Focusing Point on Center Only, Auto"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1827 camlibs/ptp2/ptp.c:4645
-msgid "Multiple Focusing Points (No Specification), Manual"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1828 camlibs/ptp2/ptp.c:4646
-msgid "Multiple Focusing Points, Auto"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1829 camlibs/ptp2/ptp.c:4647
-msgid "Multiple Focusing Points (Right)"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1830 camlibs/ptp2/ptp.c:4648
-msgid "Multiple Focusing Points (Center)"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1831 camlibs/ptp2/ptp.c:4649
-msgid "Multiple Focusing Points (Left)"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1836 camlibs/ptp2/ptp.c:4569
-msgid "Large"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1837 camlibs/ptp2/ptp.c:4570
-msgid "Medium 1"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1838 camlibs/ptp2/ptp.c:4572
-msgid "Medium 2"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1839 camlibs/ptp2/ptp.c:4573
-msgid "Medium 3"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1840 camlibs/ptp2/ptp.c:4571
-msgid "Small"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1847 camlibs/ptp2/config.c:3038
-#: camlibs/ptp2/config.c:3056 camlibs/ptp2/ptp.c:4325 camlibs/ptp2/ptp.c:4328
-#: camlibs/ptp2/ptp.c:4576
-msgid "10 seconds"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1848 camlibs/ptp2/config.c:3054
-#: camlibs/ptp2/config.c:3230 camlibs/ptp2/ptp.c:4323 camlibs/ptp2/ptp.c:4577
-msgid "2 seconds"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1855
-msgid "TFT"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1856
-msgid "PC"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1857
-msgid "TFT + PC"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1905 camlibs/ptp2/config.c:1931
-#: camlibs/ptp2/config.c:1958 camlibs/ptp2/ptp.c:4729
-msgid "Video OUT"
-msgstr ""
-
-#: camlibs/ptp2/config.c:1927 camlibs/ptp2/config.c:1941
-#: camlibs/ptp2/config.c:1960
-#, c-format
-msgid "Unknown %d"
-msgstr ""
-
-# camlibs/sierra/sierra.c:948 camlibs/sierra/sierra.c:956
-# camlibs/sierra/sierra.c:1235
-#: camlibs/ptp2/config.c:1991 camlibs/ptp2/config.c:3275
-msgid "Factory Default"
-msgstr "工厂默认值"
-
-#: camlibs/ptp2/config.c:2028
-msgid "mRAW"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2029
-msgid "sRAW"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2038
-msgid "Smaller JPEG"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2039
-msgid "Tiny JPEG"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2041
-msgid "mRAW + Large Fine JPEG"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2042
-msgid "sRAW + Large Fine JPEG"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2044
-msgid "mRAW + Medium Fine JPEG"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2045
-msgid "sRAW + Medium Fine JPEG"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2047
-msgid "mRAW + Small Fine JPEG"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2048
-msgid "sRAW + Small Fine JPEG"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2050
-msgid "mRAW + Large Normal JPEG"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2051
-msgid "sRAW + Large Normal JPEG"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2053
-msgid "mRAW + Medium Normal JPEG"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2054
-msgid "sRAW + Medium Normal JPEG"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2056
-msgid "mRAW + Small Normal JPEG"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2057
-msgid "sRAW + Small Normal JPEG"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2082 camlibs/ptp2/ptp.c:4674
-msgid "Continuous"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2085
-msgid "Timer 10 sec"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2086
-msgid "Timer 2 sec"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2087
-msgid "Single silent"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2088
-msgid "Continuous silent"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2276
-#, c-format
-msgid "%0.4fs"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2296
-#, c-format
-msgid "%d %d/%d"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2299
-#, c-format
-msgid "%d/%d"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2302
-#, c-format
-msgid "%f"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2471
-msgid "Creative"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2472
-msgid "Action"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2480 camlibs/ptp2/ptp.c:4243
-msgid "Night Landscape"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2481 camlibs/ptp2/config.c:2514
-msgid "Children"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2482
-msgid "Automatic (No Flash)"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2487
-msgid "Night landscape"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2488
-msgid "Party/Indoor"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2489
-msgid "Beach/Snow"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2490
-msgid "Sunset"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2491
-msgid "Dusk/Dawn"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2492
-msgid "Pet Portrait"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2493
-msgid "Candlelight"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2494
-msgid "Blossom"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2495
-msgid "Autumn colors"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2496
-msgid "Food"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2515
-msgid "Scene"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2516
-msgid "Effects"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2521 camlibs/ptp2/ptp.c:4245 camlibs/ptp2/ptp.c:4670
-msgid "Single Shot"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2522
-msgid "Burst"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2523 camlibs/ptp2/ptp.c:4247
-msgid "Timelapse"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2524 camlibs/ptp2/ptp.c:4248
-msgid "Continuous Low Speed"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2525 camlibs/ptp2/ptp.c:4249
-msgid "Timer"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2526 camlibs/ptp2/ptp.c:4251
-msgid "Mirror Up"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2528
-msgid "Quick Response Remote"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2529
-msgid "Delayed Remote"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2530
-msgid "Quiet Release"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2539 camlibs/ptp2/ptp.c:4253
-msgid "Centre-spot"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2540 camlibs/ptp2/ptp.c:4221 camlibs/ptp2/ptp.c:4254
-msgid "Multi-spot"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2541 camlibs/ptp2/ptp.c:4255
-msgid "Single Area"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2542 camlibs/ptp2/ptp.c:4256
-msgid "Closest Subject"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2543 camlibs/ptp2/ptp.c:4257
-msgid "Group Dynamic"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2544
-msgid "Single-area AF"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2545
-msgid "Dynamic-area AF"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2546
-msgid "Group-dyamic AF"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2547
-msgid "Dynamic-area AF with closest subject priority"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2553
-msgid "sRGB (portrait)"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2554 camlibs/ptp2/config.c:2561
-#: camlibs/ptp2/config.c:2567
-msgid "AdobeRGB"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2555
-msgid "sRGB (nature)"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2560 camlibs/ptp2/config.c:2566
-msgid "sRGB"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2608
-#, c-format
-msgid "Unknown value 0x%04x"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2615 camlibs/ptp2/ptp.c:4402
-msgid "Centre"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2616 camlibs/ptp2/ptp.c:4403
-msgid "Top"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2617 camlibs/ptp2/ptp.c:4404
-msgid "Bottom"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2618 camlibs/ptp2/ptp.c:4405
-msgid "Left"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2619 camlibs/ptp2/ptp.c:4406
-msgid "Right"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2626 camlibs/sierra/olympus-desc.c:790
-msgid "Center Weighted"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2627
-msgid "Multi Spot"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2628
-msgid "Center Spot"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2635
-msgid "Automatic Flash"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2637 camlibs/ptp2/ptp.c:4226
-msgid "Fill flash"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2638
-msgid "Red-eye automatic"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2639
-msgid "Red-eye fill"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2640 camlibs/ptp2/ptp.c:4229
-msgid "External sync"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2642 camlibs/ptp2/ptp.c:4231
-msgid "Auto Slow Sync"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2643 camlibs/ptp2/ptp.c:4232
-msgid "Rear Curtain Sync + Slow Sync"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2644 camlibs/ptp2/ptp.c:4233
-msgid "Red-eye Reduction + Slow Sync"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2645
-msgid "Front-curtain sync"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2646
-msgid "Red-eye reduction"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2647
-msgid "Red-eye reduction with slow sync"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2648
-msgid "Slow sync"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2649
-msgid "Rear-curtain with slow sync"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2650
-msgid "Rear-curtain sync"
-msgstr ""
-
-# camlibs/sierra/sierra.c:1496 camlibs/sierra/sierra.c:1500
-# camlibs/sierra/sierra.c:1700
-#: camlibs/ptp2/config.c:2656 camlibs/ricoh/library.c:331
-#: camlibs/sierra/epson-desc.c:137
-msgid "Black & White"
-msgstr "黑白"
-
-#: camlibs/ptp2/config.c:2662
-msgid "Night Vision"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2663
-msgid "Color sketch"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2664
-msgid "Miniature effect"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2665
-msgid "Selective color"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2666
-msgid "Silhouette"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2667
-msgid "High key"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2668
-msgid "Low key"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2755 camlibs/ptp2/config.c:2801
-msgid "infinite"
-msgstr ""
-
-#: camlibs/ptp2/config.c:2757 camlibs/ptp2/config.c:2765
-#: camlibs/ptp2/config.c:2805
-#, c-format
-msgid "%d mm"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3005
-msgid "Face-priority AF"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3006
-msgid "Wide-area AF"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3007
-msgid "Normal-area AF"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3008
-msgid "Subject-tracking AF"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3013
-msgid "Single-servo AF"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3014
-msgid "Full-time-servo AF"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3015 camlibs/ptp2/ptp.c:4213
-msgid "Manual Focus"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3028 camlibs/ptp2/ptp.c:4309
-msgid "AE/AF Lock"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3029 camlibs/ptp2/ptp.c:4311
-msgid "AE Lock only"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3030
-msgid "AF Lock Only"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3031 camlibs/ptp2/ptp.c:4312
-msgid "AF Lock Hold"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3032 camlibs/ptp2/ptp.c:4313
-msgid "AF On"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3033
-msgid "Flash Level Lock"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3039 camlibs/ptp2/config.c:3057
-#: camlibs/ptp2/ptp.c:4326 camlibs/ptp2/ptp.c:4329
-msgid "20 seconds"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3040 camlibs/ptp2/config.c:3148
-#: camlibs/ptp2/config.c:3702 camlibs/ptp2/ptp.c:4330
-msgid "1 minute"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3041 camlibs/ptp2/config.c:3149
-#: camlibs/ptp2/config.c:3703 camlibs/ptp2/ptp.c:4331
-msgid "5 minutes"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3042 camlibs/ptp2/config.c:3150
-#: camlibs/ptp2/config.c:3704 camlibs/ptp2/ptp.c:4332
-msgid "10 minutes"
-msgstr "10 分钟"
-
-#: camlibs/ptp2/config.c:3043 camlibs/ptp2/config.c:3055
-#: camlibs/ptp2/ptp.c:4324 camlibs/ptp2/ptp.c:4333
-msgid "5 seconds"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3048 camlibs/ptp2/ptp.c:4408
-msgid "Card"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3049
-msgid "SDRAM"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3062
-msgid "6 mm"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3063
-msgid "8 mm"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3064
-msgid "10 mm"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3065
-msgid "12 mm"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3071
-msgid "1/60"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3072
-msgid "1/30"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3073
-msgid "1/15"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3074
-msgid "1/8"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3075
-msgid "1/4"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3076
-msgid "1/2"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3077
-msgid "1"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3078 camlibs/ptp2/config.c:3753
-msgid "2"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3079 camlibs/ptp2/config.c:3751
-msgid "4"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3080
-msgid "8"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3081
-msgid "15"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3082
-msgid "30"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3087
-msgid "bulb"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3088 camlibs/ptp2/config.c:3793
-msgid "30s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3089
-msgid "25s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3090
-msgid "20s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3091 camlibs/ptp2/config.c:3792
-msgid "15s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3092
-msgid "13s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3093
-msgid "10s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3094 camlibs/ptp2/config.c:3791
-msgid "8s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3095
-msgid "6s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3096
-msgid "5s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3097 camlibs/ptp2/config.c:3790
-msgid "4s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3098
-msgid "3s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3099
-msgid "2.5s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3100 camlibs/ptp2/config.c:3789
-msgid "2s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3101
-msgid "1.6s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3102
-msgid "1.3s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3103 camlibs/ptp2/config.c:3788
-msgid "1s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3104
-msgid "1/1.3s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3105
-msgid "1/1.6s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3106 camlibs/ptp2/config.c:3787
-msgid "1/2s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3107
-msgid "1/2.5s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3108
-msgid "1/3s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3109 camlibs/ptp2/config.c:3786
-msgid "1/4s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3110
-msgid "1/5s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3111
-msgid "1/6s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3112 camlibs/ptp2/config.c:3785
-msgid "1/8s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3113
-msgid "1/10s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3114
-msgid "1/13s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3115 camlibs/ptp2/config.c:3784
-msgid "1/15s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3116
-msgid "1/20s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3117
-msgid "1/25s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3118 camlibs/ptp2/config.c:3783
-msgid "1/30s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3119
-msgid "1/40s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3120
-msgid "1/50s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3121 camlibs/ptp2/config.c:3724
-#: camlibs/ptp2/config.c:3782
-msgid "1/60s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3122 camlibs/ptp2/config.c:3723
-msgid "1/80s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3123 camlibs/ptp2/config.c:3722
-msgid "1/100s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3124 camlibs/ptp2/config.c:3721
-msgid "1/125s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3125 camlibs/ptp2/config.c:3720
-msgid "1/160s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3126 camlibs/ptp2/config.c:3719
-msgid "1/200s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3127 camlibs/ptp2/config.c:3718
-msgid "1/250s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3128
-msgid "1/320s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3129
-msgid "1/400s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3130
-msgid "1/500s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3131
-msgid "1/640s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3132
-msgid "1/800s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3133
-msgid "1/1000s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3134 camlibs/ptp2/config.c:3135
-msgid "1/1250s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3136
-msgid "1/1600s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3137
-msgid "1/2000s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3138
-msgid "1/2500s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3139
-msgid "1/3200s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3140
-msgid "1/4000s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3141
-msgid "1/5000s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3142
-msgid "1/6400s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3143
-msgid "1/8000s"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3151
-msgid "15 minutes"
-msgstr "15 分钟"
-
-#: camlibs/ptp2/config.c:3158 camlibs/ptp2/ptp.c:4432
-msgid "Sharper"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3159 camlibs/ptp2/ptp.c:4433
-msgid "Softer"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3160 camlibs/ptp2/ptp.c:4434
-msgid "Direct Print"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3171 camlibs/ptp2/config.c:3182
-#: camlibs/ptp2/ptp.c:4264 camlibs/ptp2/ptp.c:4272
-msgid "Medium Low"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3172 camlibs/ptp2/ptp.c:4265
-msgid "Medium high"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3181 camlibs/ptp2/ptp.c:4271
-msgid "Low contrast"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3183 camlibs/ptp2/ptp.c:4273
-msgid "Medium High"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3184 camlibs/ptp2/ptp.c:4274
-msgid "High control"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3193 camlibs/ptp2/ptp.c:4636
-msgid "Zone Focus (Close-up)"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3194 camlibs/ptp2/ptp.c:4637
-msgid "Zone Focus (Very Close)"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3195 camlibs/ptp2/ptp.c:4638
-msgid "Zone Focus (Close)"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3196 camlibs/ptp2/ptp.c:4639
-msgid "Zone Focus (Medium)"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3197 camlibs/ptp2/ptp.c:4640
-msgid "Zone Focus (Far)"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3198
-msgid "Zone Focus (Reserved 1)"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3199
-msgid "Zone Focus (Reserved 2)"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3200
-msgid "Zone Focus (Reserved 3)"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3201
-msgid "Zone Focus (Reserved 4)"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3211
-msgid "Automatic Macro"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3215
-msgid "Single-Servo AF"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3216
-msgid "Continuous-Servo AF"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3221
-msgid "One Shot"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3222 camlibs/ptp2/ptp.c:4671
-msgid "AI Servo"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3223 camlibs/ptp2/ptp.c:4672
-msgid "AI Focus"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3231 camlibs/ptp2/config.c:3697
-#: camlibs/ptp2/ptp.c:4316
-msgid "4 seconds"
-msgstr "4 秒"
-
-#: camlibs/ptp2/config.c:3232 camlibs/ptp2/config.c:3699
-#: camlibs/ptp2/ptp.c:4318
-msgid "8 seconds"
-msgstr "8 秒"
-
-#: camlibs/ptp2/config.c:3233
-msgid "Hold"
-msgstr ""
-
-# camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:958
-# camlibs/sierra/sierra.c:1237
-#: camlibs/ptp2/config.c:3245 camlibs/ptp2/ptp.c:4657 camlibs/ptp2/ptp.c:4663
-msgid "Fluorescent H"
-msgstr "荧光"
-
-#: camlibs/ptp2/config.c:3247 camlibs/ptp2/ptp.c:4659
-msgid "Custom Whitebalance PC-1"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3248 camlibs/ptp2/ptp.c:4660
-msgid "Custom Whitebalance PC-2"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3249 camlibs/ptp2/ptp.c:4661
-msgid "Custom Whitebalance PC-3"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3250 camlibs/ptp2/ptp.c:4662
-msgid "Missing Number"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3266
-msgid "Shadow"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3349
-msgid "Low sharpening"
-msgstr ""
-
-# camlibs/sierra/sierra.c:1496 camlibs/sierra/sierra.c:1500
-# camlibs/sierra/sierra.c:1700
-#: camlibs/ptp2/config.c:3351
-msgid "Black & white"
-msgstr "黑白"
-
-#: camlibs/ptp2/config.c:3448 camlibs/ptp2/ptp.c:4357
-msgid "AE & Flash"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3449 camlibs/ptp2/ptp.c:4358
-msgid "AE only"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3450 camlibs/ptp2/config.c:3537
-#: camlibs/ptp2/ptp.c:4359
-msgid "Flash only"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3451 camlibs/ptp2/ptp.c:4360
-msgid "WB bracketing"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3452
-msgid "ADL bracketing"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3458
-msgid "Startup"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3459
-msgid "Shutdown"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3460
-msgid "Startup and Shutdown"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3466 camlibs/ptp2/ptp.c:4440
-msgid "Moderate"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3467 camlibs/ptp2/ptp.c:4441
-msgid "Enhanced"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3473 camlibs/ptp2/ptp.c:4362
-msgid "MTR > Under"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3474 camlibs/ptp2/ptp.c:4363
-msgid "Under > MTR"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3494
-msgid "Auto sensitivity"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3495
-msgid "High sensitivity"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3496
-msgid "Medium sensitivity"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3497
-msgid "Low sensitivity"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3498
-msgid "Microphone off"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3528
-msgid "Hi 1"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3529
-msgid "Hi 2"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3534
-msgid "Flash/speed"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3535
-msgid "Flash/speed/aperture"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3536
-msgid "Flash/aperture"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3645
-msgid "Extra high"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3655 camlibs/ptp2/config.c:3666
-#: camlibs/ptp2/config.c:3678 camlibs/ptp2/ptp.c:4197
-msgid "JPEG Basic"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3658 camlibs/ptp2/config.c:3670
-#: camlibs/ptp2/config.c:3681
-msgid "NEF (Raw)"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3659 camlibs/ptp2/config.c:3671
-#: camlibs/ptp2/config.c:3682
-msgid "NEF+Basic"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3660 camlibs/ptp2/config.c:3672
-#: camlibs/ptp2/config.c:3683
-msgid "NEF+Normal"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3661 camlibs/ptp2/config.c:3673
-#: camlibs/ptp2/config.c:3684
-msgid "NEF+Fine"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3669
-msgid "TIFF (RGB)"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3698 camlibs/ptp2/ptp.c:4317
-msgid "6 seconds"
-msgstr "6 秒"
-
-#: camlibs/ptp2/config.c:3700 camlibs/ptp2/ptp.c:4319
-msgid "16 seconds"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3701 camlibs/ptp2/ptp.c:4321
-msgid "30 seconds"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3705 camlibs/ptp2/ptp.c:4320
-msgid "30 minutes"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3711
-msgid "Size Priority"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3712
-msgid "Optimal quality"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3717
-msgid "1/250s (Auto FP)"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3729 camlibs/ptp2/config.c:3736
-msgid "Release"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3730
-msgid "Release + Focus"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3742
-msgid "9 points"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3743
-msgid "21 points"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3744
-msgid "51 points"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3745
-msgid "51 points (3D)"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3750
-msgid "5 (Long)"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3752
-msgid "3 (Normal)"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3754
-msgid "1 (Short)"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3760
-msgid "Shutter/AF-ON"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3761 camlibs/ptp2/config.c:3772
-msgid "AF-ON"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3766
-msgid "AF51"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3767
-msgid "AF11"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3773
-msgid "AE/AF lock"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3774
-msgid "AE lock only"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3775
-msgid "AE lock (Reset on release)"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3776
-msgid "AE lock (Hold)"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3777
-msgid "AF lock only"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3798 camlibs/ptp2/config.c:3811
-msgid "4 fps"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3799 camlibs/ptp2/config.c:3812
-msgid "3 fps"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3800 camlibs/ptp2/config.c:3813
-msgid "2 fps"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3801 camlibs/ptp2/config.c:3814
-msgid "1 fps"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3806 camlibs/ptp2/config.c:3821
-msgid "9 fps"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3807
-msgid "8 fps"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3808
-msgid "7 fps"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3809
-msgid "6 fps"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3810
-msgid "5 fps"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3819
-msgid "11 fps"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3820
-msgid "10 fps"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3884
-msgid "50%"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3885
-msgid "100%"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3886
-msgid "75%"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3887
-msgid "25%"
-msgstr ""
-
-#: camlibs/ptp2/config.c:3888
-msgid "Unknown value"
-msgstr ""
-
-#: camlibs/ptp2/config.c:4026 camlibs/ptp2/config.c:4046
-msgid "On 1"
-msgstr ""
-
-#: camlibs/ptp2/config.c:4027 camlibs/ptp2/config.c:4050
-msgid "On 2"
-msgstr ""
-
-#: camlibs/ptp2/config.c:4029 camlibs/ptp2/config.c:4054
-msgid "Immediate"
-msgstr ""
-
-#: camlibs/ptp2/config.c:4090
-msgid "Near 1"
-msgstr ""
-
-#: camlibs/ptp2/config.c:4091
-msgid "Near 2"
-msgstr ""
-
-#: camlibs/ptp2/config.c:4092
-msgid "Near 3"
-msgstr ""
-
-#: camlibs/ptp2/config.c:4094
-msgid "Far 1"
-msgstr ""
-
-#: camlibs/ptp2/config.c:4095
-msgid "Far 2"
-msgstr ""
-
-#: camlibs/ptp2/config.c:4096
-msgid "Far 3"
-msgstr ""
-
-#: camlibs/ptp2/config.c:4115
-#, c-format
-msgid "Near %d"
-msgstr ""
-
-#: camlibs/ptp2/config.c:4116
-#, c-format
-msgid "Far %d"
-msgstr ""
-
-#: camlibs/ptp2/config.c:4464 camlibs/ptp2/library.c:1829
-#, c-format
-msgid "Nikon enable liveview failed: %x"
-msgstr ""
-
-#: camlibs/ptp2/config.c:4532
-msgid ""
-"For bulb capture to work, make sure the mode dial is switched to 'M' and set "
-"'shutterspeed' to 'bulb'."
-msgstr ""
-
-#: camlibs/ptp2/config.c:4602
-msgid "Internal RAM"
-msgstr ""
-
-#: camlibs/ptp2/config.c:4603
-msgid "Memory card"
-msgstr ""
-
-#: camlibs/ptp2/config.c:4720
-msgid "ESSID"
-msgstr ""
-
-#: camlibs/ptp2/config.c:4725
-msgid "Display"
-msgstr ""
-
-#: camlibs/ptp2/config.c:4735
-#, c-format
-msgid "Creation date: %s, Last usage date: %s"
-msgstr ""
-
-# camlibs/sierra/sierra.c:948 camlibs/sierra/sierra.c:956
-# camlibs/sierra/sierra.c:1235
-#: camlibs/ptp2/config.c:4741
-msgid "Delete"
-msgstr "删除"
-
-#: camlibs/ptp2/config.c:4810
-msgid "WEP 64-bit"
-msgstr ""
-
-#: camlibs/ptp2/config.c:4811
-msgid "WEP 128-bit"
-msgstr ""
-
-#: camlibs/ptp2/config.c:4858
-msgid "Managed"
-msgstr ""
-
-#: camlibs/ptp2/config.c:4859
-msgid "Ad-hoc"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5028
-msgid "Profile name"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5029
-msgid "WIFI ESSID"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5030
-msgid "IP address (empty for DHCP)"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5031
-msgid "Network mask"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5032
-msgid "Default gateway"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5033
-msgid "Access mode"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5034
-msgid "WIFI channel"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5035
-msgid "Encryption"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5036
-msgid "Encryption key (hex)"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5037
-msgid "Write"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5085
-msgid "List Wifi profiles"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5086
-msgid "Create Wifi profile"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5139 camlibs/ptp2/ptp.c:3714
-msgid "Focus Lock"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5140
-msgid "Bulb Mode"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5141
-msgid "UI Lock"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5144
-msgid "Drive Nikon DSLR Autofocus"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5145
-msgid "Drive Canon DSLR Autofocus"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5146
-msgid "Drive Nikon DSLR Manual focus"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5147
-msgid "Drive Canon DSLR Manual focus"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5148
-msgid "Canon EOS Zoom"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5149
-msgid "Canon EOS Zoom Position"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5150
-msgid "Canon EOS Viewfinder"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5151
-msgid "Nikon Viewfinder"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5152
-msgid "Canon EOS Remote Release"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5153
-msgid "CHDK Reboot"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5154
-msgid "CHDK Script"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5162
-msgid "PTP Version"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5163 camlibs/ptp2/ptp.c:3572
-msgid "DPOF Version"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5164 camlibs/ptp2/ptp.c:3848
-msgid "AC Power"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5165
-msgid "External Flash"
-msgstr ""
-
-# camlibs/sierra/sierra.c:1830
-#: camlibs/ptp2/config.c:5166 camlibs/ptp2/config.c:5167
-#: camlibs/ptp2/ptp.c:3451
-msgid "Battery Level"
-msgstr "电池级别"
-
-#: camlibs/ptp2/config.c:5168 camlibs/ptp2/config.c:5169
-#: camlibs/ptp2/ptp.c:3870
-msgid "Camera Orientation"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5170 camlibs/ptp2/ptp.c:4004
-msgid "Flash Open"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5171 camlibs/ptp2/ptp.c:4006
-msgid "Flash Charged"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5172 camlibs/ptp2/config.c:5173
-msgid "Lens Name"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5174
-msgid "Serial Number"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5175
-msgid "Shutter Counter"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5176
-msgid "Available Shots"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5177
-msgid "Focal Length Minimum"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5178
-msgid "Focal Length Maximum"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5179
-msgid "Maximum Aperture at Focal Length Minimum"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5180
-msgid "Maximum Aperture at Focal Length Maximum"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5181
-msgid "Low Light"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5182 camlibs/ptp2/config.c:5183
-msgid "Light Meter"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5184 camlibs/ptp2/ptp.c:3852
-msgid "AF Locked"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5185 camlibs/ptp2/ptp.c:3853
-msgid "AE Locked"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5186 camlibs/ptp2/ptp.c:3854
-msgid "FV Locked"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5191 camlibs/ptp2/config.c:5192
-#: camlibs/ptp2/config.c:5193
-msgid "Camera Date and Time"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5194 camlibs/ptp2/ptp.c:3493 camlibs/ptp2/ptp.c:3504
-msgid "Beep Mode"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5195
-msgid "Image Comment"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5196
-msgid "Enable Image Comment"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5197 camlibs/ptp2/ptp.c:3722
-msgid "LCD Off Time"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5198 camlibs/ptp2/ptp.c:3864
-msgid "Recording Media"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5199
-msgid "Quick Review Time"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5200 camlibs/ptp2/ptp.c:3962
-msgid "CSM Menu"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5201 camlibs/ptp2/ptp.c:3781
-msgid "Reverse Command Dial"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5202 camlibs/ptp2/config.c:5203
-#: camlibs/ptp2/ptp.c:3556
-msgid "Camera Output"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5204
-msgid "Movie Recording"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5205
-msgid "EVF Mode"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5208 camlibs/ptp2/ptp.c:3482
-msgid "Artist"
-msgstr ""
-
-# camlibs/sierra/sierra.c:918 camlibs/sierra/sierra.c:926
-# camlibs/sierra/sierra.c:1214
-#: camlibs/ptp2/config.c:5209 camlibs/ricoh/library.c:439
-msgid "Copyright"
-msgstr "版权"
-
-#: camlibs/ptp2/config.c:5210
-msgid "Clean Sensor"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5211
-msgid "Custom Functions Ex"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5214
-msgid "Fast Filesystem"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5215 camlibs/ptp2/config.c:5216
-msgid "Capture Target"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5226
-msgid "Image Format SD"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5227
-msgid "Image Format CF"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5229
-msgid "Image Format Ext HD"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5235 camlibs/ptp2/ptp.c:3950
-msgid "ISO Auto"
-msgstr ""
-
-# camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
-# camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/config.c:5236 camlibs/ptp2/config.c:5237
-#: camlibs/ptp2/config.c:5238
-msgid "WhiteBalance"
-msgstr "白平衡"
-
-#: camlibs/ptp2/config.c:5239
-msgid "WhiteBalance Adjust A"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5240
-msgid "WhiteBalance Adjust B"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5241
-msgid "WhiteBalance X A"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5242
-msgid "WhiteBalance X B"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5243 camlibs/ptp2/ptp.c:3566
-msgid "Photo Effect"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5244 camlibs/ptp2/ptp.c:3640
-msgid "Color Model"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5245 camlibs/ptp2/config.c:5246
-#: camlibs/ptp2/ptp.c:3652
-msgid "Color Space"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5247 camlibs/ptp2/ptp.c:3692
-msgid "Auto ISO"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5252
-msgid "Long Exp Noise Reduction"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5253
-msgid "Auto Focus Mode 2"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5255 camlibs/ptp2/config.c:5258
-#: camlibs/ptp2/ptp.c:3567
-msgid "Assist Light"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5256
-msgid "Rotation Flag"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5264 camlibs/ptp2/ptp.c:3535
-msgid "Flash Compensation"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5265 camlibs/ptp2/ptp.c:3536
-msgid "AEB Exposure Compensation"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5268
-msgid "Nikon Flash Mode"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5269 camlibs/ptp2/ptp.c:3946
-msgid "Flash Commander Mode"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5270
-msgid "Flash Commander Power"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5271 camlibs/ptp2/ptp.c:4014
-msgid "Flash Command Channel"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5272 camlibs/ptp2/ptp.c:4016
-msgid "Flash Command Self Mode"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5273 camlibs/ptp2/ptp.c:4018
-msgid "Flash Command Self Compensation"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5274 camlibs/ptp2/ptp.c:4020
-msgid "Flash Command Self Value"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5275 camlibs/ptp2/ptp.c:4022
-msgid "Flash Command A Mode"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5276 camlibs/ptp2/ptp.c:4024
-msgid "Flash Command A Compensation"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5277 camlibs/ptp2/ptp.c:4026
-msgid "Flash Command A Value"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5278 camlibs/ptp2/ptp.c:4028
-msgid "Flash Command B Mode"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5279 camlibs/ptp2/ptp.c:4030
-msgid "Flash Command B Compensation"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5280 camlibs/ptp2/ptp.c:4032
-msgid "Flash Command B Value"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5281 camlibs/ptp2/ptp.c:3942
-msgid "AF Area Illumination"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5282 camlibs/ptp2/ptp.c:3932
-msgid "AF Beep Mode"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5283 camlibs/ptp2/ptp.c:3457
-msgid "F-Number"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5284 camlibs/ptp2/ptp.c:3860
-msgid "Flexible Program"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5286 camlibs/ptp2/ptp.c:3459
-msgid "Focus Distance"
-msgstr "聚焦距离"
-
-#: camlibs/ptp2/config.c:5287 camlibs/ptp2/ptp.c:3458 camlibs/ptp2/ptp.c:3539
-msgid "Focal Length"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5290
-msgid "Focus Mode 2"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5292 camlibs/ptp2/config.c:5293
-#: camlibs/ptp2/ptp.c:3475
-msgid "Effect Mode"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5294 camlibs/ptp2/config.c:5402
-msgid "Exposure Program"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5295
-msgid "Scene Mode"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5296 camlibs/ptp2/config.c:5297
-#: camlibs/ptp2/ptp.c:3471
-msgid "Still Capture Mode"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5298
-msgid "Canon Shooting Mode"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5299
-msgid "Canon Auto Exposure Mode"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5300 camlibs/ptp2/ptp.c:3517
-msgid "Drive Mode"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5301
-msgid "Picture Style"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5302 camlibs/ptp2/ptp.c:3480
-msgid "Focus Metering Mode"
-msgstr ""
-
-# camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/ptp2/config.c:5303 camlibs/ptp2/ptp.c:3461
-msgid "Exposure Metering Mode"
-msgstr "曝光测定模式"
-
-#: camlibs/ptp2/config.c:5306
-msgid "AV Open"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5307
-msgid "AV Max"
-msgstr ""
-
-# camlibs/konica/konica.c:62
-#: camlibs/ptp2/config.c:5309 camlibs/ptp2/ptp.c:3521
-msgid "Focusing Point"
-msgstr "焦点"
-
-#: camlibs/ptp2/config.c:5311
-msgid "Capture Delay"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5315
-msgid "Shutter Speed 2"
-msgstr ""
-
-# camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1268
-#: camlibs/ptp2/config.c:5318 camlibs/ptp2/config.c:5319
-#: camlibs/ptp2/ptp.c:3519
-msgid "Metering Mode"
-msgstr "测量模式"
-
-#: camlibs/ptp2/config.c:5320 camlibs/ptp2/ptp.c:3520
-msgid "AF Distance"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5321 camlibs/ptp2/ptp.c:3682
-msgid "Focus Area Wrap"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5322
-msgid "Exposure Delay Mode"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5323 camlibs/ptp2/ptp.c:3712
-msgid "Exposure Lock"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5324
-msgid "AE-L/AF-L Mode"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5325 camlibs/ptp2/config.c:5326
-msgid "Live View AF Mode"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5327 camlibs/ptp2/ptp.c:3716
-msgid "Live View AF Focus"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5328 camlibs/ptp2/ptp.c:3736
-msgid "File Number Sequencing"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5329 camlibs/ptp2/ptp.c:3948
-msgid "Flash Sign"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5330
-msgid "Modelling Flash"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5331
-msgid "Viewfinder Grid"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5332 camlibs/ptp2/ptp.c:3940
-msgid "Image Review"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5333
-msgid "Image Rotation Flag"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5334
-msgid "Release without CF card"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5335 camlibs/ptp2/ptp.c:3956
-msgid "Flash Mode Manual Power"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5336
-msgid "Auto Focus Area"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5337 camlibs/ptp2/ptp.c:3898
-msgid "Flash Exposure Compensation"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5338 camlibs/ptp2/config.c:5339
-msgid "Bracketing"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5340
-msgid "Bracket Mode"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5341
-msgid "EV Step"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5342 camlibs/ptp2/ptp.c:3760
-msgid "Bracket Set"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5343 camlibs/ptp2/ptp.c:3764
-msgid "Bracket Order"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5344 camlibs/ptp2/ptp.c:3476
-msgid "Burst Number"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5345 camlibs/ptp2/ptp.c:3477
-msgid "Burst Interval"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5346 camlibs/ptp2/ptp.c:3730 camlibs/ptp2/ptp.c:3851
-msgid "Maximum Shots"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5349 camlibs/ptp2/config.c:5358
-#: camlibs/ptp2/ptp.c:3598
-msgid "Auto White Balance Bias"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5350 camlibs/ptp2/config.c:5359
-#: camlibs/ptp2/ptp.c:3600
-msgid "Tungsten White Balance Bias"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5351 camlibs/ptp2/config.c:5360
-#: camlibs/ptp2/ptp.c:3602
-msgid "Fluorescent White Balance Bias"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5352 camlibs/ptp2/config.c:5361
-#: camlibs/ptp2/ptp.c:3604
-msgid "Daylight White Balance Bias"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5353 camlibs/ptp2/config.c:5362
-#: camlibs/ptp2/ptp.c:3606
-msgid "Flash White Balance Bias"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5354 camlibs/ptp2/config.c:5363
-#: camlibs/ptp2/ptp.c:3608
-msgid "Cloudy White Balance Bias"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5355 camlibs/ptp2/config.c:5364
-#: camlibs/ptp2/ptp.c:3610
-msgid "Shady White Balance Bias"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5366
-msgid "White Balance Bias Preset Nr"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5367
-msgid "White Balance Bias Preset 0"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5368
-msgid "White Balance Bias Preset 1"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5369
-msgid "White Balance Bias Preset 2"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5370
-msgid "White Balance Bias Preset 3"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5371
-msgid "White Balance Bias Preset 4"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5372
-msgid "Selftimer Delay"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5373
-msgid "Center Weight Area"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5374 camlibs/ptp2/config.c:5423
-#: camlibs/ptp2/config.c:5454 camlibs/ptp2/ptp.c:3754
-msgid "Flash Shutter Speed"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5375 camlibs/ptp2/ptp.c:3952
-msgid "Remote Timeout"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5376 camlibs/ptp2/ptp.c:3900
-msgid "Optimize Image"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5377 camlibs/ptp2/ptp.c:3636
-msgid "Sharpening"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5378 camlibs/ptp2/ptp.c:3638
-msgid "Tone Compensation"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5379 camlibs/ptp2/ptp.c:3902
-msgid "Saturation"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5380 camlibs/ptp2/ptp.c:3642
-msgid "Hue Adjustment"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5381
-msgid "Auto Exposure Bracketing"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5382
-msgid "Movie Sound"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5383
-msgid "Microphone"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5384
-msgid "Reverse Indicators"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5385
-msgid "Auto Distortion Control"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5386
-msgid "Video Mode"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5396
-msgid "Meter Off Time"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5401 camlibs/ptp2/config.c:5449
-msgid "Movie Quality"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5403 camlibs/ptp2/config.c:5407
-#: camlibs/ptp2/config.c:5418 camlibs/ptp2/config.c:5443
-msgid "Minimum Shutter Speed"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5408 camlibs/ptp2/config.c:5419
-#: camlibs/ptp2/config.c:5444
-msgid "ISO Auto Hi Limit"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5409 camlibs/ptp2/config.c:5436
-#: camlibs/ptp2/config.c:5445
-msgid "Active D-Lighting"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5410 camlibs/ptp2/config.c:5435
-#: camlibs/ptp2/config.c:5446
-msgid "High ISO Noise Reduction"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5412 camlibs/ptp2/config.c:5420
-#: camlibs/ptp2/config.c:5447
-msgid "Continuous Shooting Speed Slow"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5421 camlibs/ptp2/config.c:5452
-msgid "Continuous Shooting Speed High"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5422 camlibs/ptp2/config.c:5453
-#: camlibs/ptp2/ptp.c:3752
-msgid "Flash Sync. Speed"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5425 camlibs/ptp2/ptp.c:3650
-msgid "JPEG Compression Policy"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5426
-msgid "AF-C Mode Priority"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5427
-msgid "AF-S Mode Priority"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5428
-msgid "AF Activation"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5429 camlibs/ptp2/ptp.c:3970
-msgid "Dynamic AF Area"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5430 camlibs/ptp2/ptp.c:3686
-msgid "AF Lock On"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5431 camlibs/ptp2/ptp.c:3795
-msgid "AF Area Point"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5432
-msgid "AF On Button"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5448
-msgid "Maximum continuous release"
-msgstr ""
-
-# camlibs/sierra/sierra.c:1048 camlibs/sierra/sierra.c:1510
-#: camlibs/ptp2/config.c:5467
-msgid "Image Settings"
-msgstr "图像设置"
-
-# camlibs/sierra/sierra.c:777 camlibs/sierra/sierra.c:1443
-#: camlibs/ptp2/config.c:5470 camlibs/ptp2/config.c:5471
-#: camlibs/ptp2/config.c:5472 camlibs/ptp2/config.c:5473
-#: camlibs/ptp2/config.c:5474
-msgid "Capture Settings"
-msgstr "捕捉设置"
-
-#: camlibs/ptp2/config.c:5476
-msgid "WIFI profiles"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5602 camlibs/ptp2/config.c:5858
-msgid "Other PTP Device Properties"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5618 camlibs/ptp2/config.c:5872
-#, c-format
-msgid "PTP Property 0x%04x"
-msgstr ""
-
-#: camlibs/ptp2/config.c:5816 camlibs/ptp2/config.c:5889
-#, c-format
-msgid "Sorry, the property '%s' / 0x%04x is currently ready-only."
-msgstr ""
-
-#: camlibs/ptp2/config.c:5822 camlibs/ptp2/config.c:5843
-#: camlibs/ptp2/config.c:5926
-#, c-format
-msgid "The property '%s' / 0x%04x was not set, PTP errorcode 0x%04x."
-msgstr ""
-
-#: camlibs/ptp2/config.c:5847
-#, c-format
-msgid "Parsing the value of widget '%s' / 0x%04x failed with %d!"
-msgstr ""
-
-#: camlibs/ptp2/library.c:126
-msgid "You need to specify a folder starting with /store_xxxxxxxxx/"
-msgstr ""
-
-# camlibs/ptp/library.c:90
-#: camlibs/ptp2/library.c:168
-msgid "PTP Undefined Error"
-msgstr "未定义的 PTP 错误"
-
-# camlibs/ptp/library.c:91
-#: camlibs/ptp2/library.c:169
-msgid "PTP OK!"
-msgstr "PTP OK！"
-
-# camlibs/ptp/library.c:92
-#: camlibs/ptp2/library.c:170
-msgid "PTP General Error"
-msgstr "PTP 通用错误"
-
-# camlibs/ptp/library.c:93
-#: camlibs/ptp2/library.c:171
-msgid "PTP Session Not Open"
-msgstr "PTP 会话未打开"
-
-# camlibs/ptp/library.c:94
-#: camlibs/ptp2/library.c:172
-msgid "PTP Invalid Transaction ID"
-msgstr "非法的 PTP 传输 ID"
-
-# camlibs/ptp/library.c:95
-#: camlibs/ptp2/library.c:173
-msgid "PTP Operation Not Supported"
-msgstr "不支持的 PTP 操作"
-
-# camlibs/ptp/library.c:96
-#: camlibs/ptp2/library.c:174
-msgid "PTP Parameter Not Supported"
-msgstr "不支持的 PTP 参数"
-
-# camlibs/ptp/library.c:97
-#: camlibs/ptp2/library.c:175
-msgid "PTP Incomplete Transfer"
-msgstr "未完成的 PTP 传输"
-
-# camlibs/ptp/library.c:98
-#: camlibs/ptp2/library.c:176
-msgid "PTP Invalid Storage ID"
-msgstr "非法的 PTP 存储 ID"
-
-# camlibs/ptp/library.c:99
-#: camlibs/ptp2/library.c:177
-msgid "PTP Invalid Object Handle"
-msgstr "非法的 PTP 对象句柄"
-
-# camlibs/ptp/library.c:100
-#: camlibs/ptp2/library.c:178
-msgid "PTP Device Prop Not Supported"
-msgstr "不支持的 PTP 设备属性"
-
-# camlibs/ptp/library.c:101
-#: camlibs/ptp2/library.c:179
-msgid "PTP Invalid Object Format Code"
-msgstr "非法的 PTP 对象格式代码"
-
-# camlibs/ptp/library.c:102
-#: camlibs/ptp2/library.c:180
-msgid "PTP Store Full"
-msgstr "PTP 存储已满"
-
-# camlibs/ptp/library.c:103
-#: camlibs/ptp2/library.c:181
-msgid "PTP Object Write Protected"
-msgstr "PTP 对象已写保护"
-
-# camlibs/ptp/library.c:104
-#: camlibs/ptp2/library.c:182
-msgid "PTP Store Read Only"
-msgstr "只读的 PTP 存储"
-
-# camlibs/ptp/library.c:105
-#: camlibs/ptp2/library.c:183
-msgid "PTP Access Denied"
-msgstr "PTP 访问遭拒绝"
-
-# camlibs/ptp/library.c:106
-#: camlibs/ptp2/library.c:184
-msgid "PTP No Thumbnail Present"
-msgstr "不存在 PTP 缩略图"
-
-# camlibs/ptp/library.c:107
-#: camlibs/ptp2/library.c:185
-msgid "PTP Self Test Failed"
-msgstr "PTP 自检失败"
-
-# camlibs/ptp/library.c:108
-#: camlibs/ptp2/library.c:186
-msgid "PTP Partial Deletion"
-msgstr "PTP 部分删除"
-
-# camlibs/ptp/library.c:109
-#: camlibs/ptp2/library.c:187
-msgid "PTP Store Not Available"
-msgstr "PTP 存储不可用"
-
-# camlibs/ptp/library.c:111
-#: camlibs/ptp2/library.c:189
-msgid "PTP Specification By Format Unsupported"
-msgstr "不支持的 PTP 格式规范"
-
-# camlibs/ptp/library.c:112
-#: camlibs/ptp2/library.c:190
-msgid "PTP No Valid Object Info"
-msgstr "没有合法的 PTP 对象信息"
-
-# camlibs/ptp/library.c:113
-#: camlibs/ptp2/library.c:191
-msgid "PTP Invalid Code Format"
-msgstr "非法的 PTP 代码格式"
-
-# camlibs/ptp/library.c:114
-#: camlibs/ptp2/library.c:192
-msgid "PTP Unknown Vendor Code"
-msgstr "未知的 PTP 厂家代码"
-
-# camlibs/ptp/library.c:116
-#: camlibs/ptp2/library.c:194
-msgid "PTP Capture Already Terminated"
-msgstr "PTP 捕获已终止"
-
-# camlibs/ptp/library.c:117
-#: camlibs/ptp2/library.c:195
-msgid "PTP Device Busy"
-msgstr "PTP 设备忙碌"
-
-# camlibs/ptp/library.c:118
-#: camlibs/ptp2/library.c:196
-msgid "PTP Invalid Parent Object"
-msgstr "非法的 PTP 父对象"
-
-# camlibs/ptp/library.c:119
-#: camlibs/ptp2/library.c:197
-msgid "PTP Invalid Device Prop Format"
-msgstr "非法的 PTP 设备属性格式"
-
-# camlibs/ptp/library.c:120
-#: camlibs/ptp2/library.c:198
-msgid "PTP Invalid Device Prop Value"
-msgstr "非法的 PTP 设备属性值"
-
-# camlibs/ptp/library.c:121
-#: camlibs/ptp2/library.c:199
-msgid "PTP Invalid Parameter"
-msgstr "非法的 PTP 参数"
-
-# camlibs/ptp/library.c:122
-#: camlibs/ptp2/library.c:200
-msgid "PTP Session Already Opened"
-msgstr "PTP 会话已打开"
-
-# camlibs/ptp/library.c:123
-#: camlibs/ptp2/library.c:201
-msgid "PTP Transaction Canceled"
-msgstr "PTP 传输已取消"
-
-# camlibs/ptp/library.c:125
-#: camlibs/ptp2/library.c:203
-msgid "PTP Specification Of Destination Unsupported"
-msgstr "不支持的 PTP 目标规范"
-
-# camlibs/ptp/library.c:126
-#: camlibs/ptp2/library.c:204
-msgid "PTP EK Filename Required"
-msgstr "需要 PTP EK 文件名"
-
-# camlibs/ptp/library.c:127
-#: camlibs/ptp2/library.c:205
-msgid "PTP EK Filename Conflicts"
-msgstr "PTP EK 文件名冲突"
-
-# camlibs/ptp/library.c:128
-#: camlibs/ptp2/library.c:206
-msgid "PTP EK Filename Invalid"
-msgstr "非法的 PTP EK 文件名"
-
-#: camlibs/ptp2/library.c:208
-msgid "Hardware Error"
-msgstr ""
-
-#: camlibs/ptp2/library.c:209
-msgid "Out of Focus"
-msgstr ""
-
-#: camlibs/ptp2/library.c:210
-msgid "Change Camera Mode Failed"
-msgstr ""
-
-#: camlibs/ptp2/library.c:211
-msgid "Invalid Status"
-msgstr ""
-
-#: camlibs/ptp2/library.c:212
-msgid "Set Property Not Supported"
-msgstr ""
-
-#: camlibs/ptp2/library.c:213
-msgid "Whitebalance Reset Error"
-msgstr ""
-
-#: camlibs/ptp2/library.c:214
-msgid "Dust Reference Error"
-msgstr ""
-
-#: camlibs/ptp2/library.c:215
-msgid "Shutter Speed Bulb"
-msgstr ""
-
-#: camlibs/ptp2/library.c:216
-msgid "Mirror Up Sequence"
-msgstr ""
-
-#: camlibs/ptp2/library.c:217
-msgid "Camera Mode Not Adjust FNumber"
-msgstr ""
-
-#: camlibs/ptp2/library.c:218
-msgid "Not in Liveview"
-msgstr ""
-
-#: camlibs/ptp2/library.c:219
-msgid "Mf Drive Step End"
-msgstr ""
-
-#: camlibs/ptp2/library.c:220
-msgid "Mf Drive Step Insufficiency"
-msgstr ""
-
-#: camlibs/ptp2/library.c:221
-msgid "Advanced Transfer Cancel"
-msgstr ""
-
-#: camlibs/ptp2/library.c:222
-msgid "Unknown command"
-msgstr ""
-
-#: camlibs/ptp2/library.c:223
-msgid "Operation refused"
-msgstr ""
-
-#: camlibs/ptp2/library.c:224
-msgid "Lens cover present"
-msgstr ""
-
-#: camlibs/ptp2/library.c:225
-msgid "Battery low"
-msgstr ""
-
-#: camlibs/ptp2/library.c:226
-msgid "Camera not ready"
-msgstr ""
-
-# camlibs/ptp/library.c:130
-#: camlibs/ptp2/library.c:228
-msgid "PTP I/O error"
-msgstr "PTP I/O 错误"
-
-#: camlibs/ptp2/library.c:229
-msgid "PTP Cancel request"
-msgstr ""
-
-# camlibs/ptp/library.c:131
-#: camlibs/ptp2/library.c:230
-msgid "PTP Error: bad parameter"
-msgstr "PTP 错误：错误的参数"
-
-# camlibs/ptp/library.c:132
-#: camlibs/ptp2/library.c:231
-msgid "PTP Protocol error, data expected"
-msgstr "PTP 协议错误，需要数据"
-
-# camlibs/ptp/library.c:133
-#: camlibs/ptp2/library.c:232
-msgid "PTP Protocol error, response expected"
-msgstr "PTP 协议错误，需要响应"
-
-#: camlibs/ptp2/library.c:233
-msgid "PTP Timeout"
-msgstr ""
-
-#: camlibs/ptp2/library.c:1621
-#, c-format
-msgid ""
-"PTP2 driver\n"
-"(c) 2001-2005 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
-"(c) 2003-%d by Marcus Meissner <marcus@jet.franken.de>.\n"
-"This driver supports cameras that support PTP or PictBridge(tm), and\n"
-"Media Players that support the Media Transfer Protocol (MTP).\n"
-"\n"
-"Enjoy!"
-msgstr ""
-
-#: camlibs/ptp2/library.c:1724
-#, c-format
-msgid "Canon get viewfinder image failed: %d"
-msgstr ""
-
-#: camlibs/ptp2/library.c:1806
-msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
-msgstr ""
-
-#: camlibs/ptp2/library.c:1814
-msgid "Sorry, your Nikon camera does not support LiveView mode"
-msgstr ""
-
-#: camlibs/ptp2/library.c:1851 camlibs/ptp2/library.c:1867
-msgid ""
-"Sorry, your Nikon camera does not seem to return a JPEG image in LiveView "
-"mode"
-msgstr ""
-
-#: camlibs/ptp2/library.c:1889 camlibs/ptp2/library.c:2050
-#, c-format
-msgid "Nikon disable liveview failed: %x"
-msgstr ""
-
-#: camlibs/ptp2/library.c:2019
-msgid "Sorry, your camera does not support Nikon capture"
-msgstr ""
-
-#: camlibs/ptp2/library.c:2057
-#, c-format
-msgid "Nikon disable liveview ended: %x"
-msgstr ""
-
-#: camlibs/ptp2/library.c:2161
-msgid "Sorry, your Canon camera does not support Canon EOS Capture"
-msgstr ""
-
-#: camlibs/ptp2/library.c:2175 camlibs/ptp2/library.c:2179
-#, c-format
-msgid "Canon EOS Capture failed: %x"
-msgstr ""
-
-#: camlibs/ptp2/library.c:2184
-msgid "Canon EOS Capture failed to release: Perhaps no focus?"
-msgstr ""
-
-#: camlibs/ptp2/library.c:2188
-msgid "Canon EOS Capture failed to release: Perhaps no more memory on card?"
-msgstr ""
-
-#: camlibs/ptp2/library.c:2192
-#, c-format
-msgid "Canon EOS Capture failed to release: Unknown error %d, please report."
-msgstr ""
-
-#: camlibs/ptp2/library.c:2202 camlibs/ptp2/library.c:2872
-#, c-format
-msgid "Canon EOS Get Changes failed: 0x%04x"
-msgstr ""
-
-#: camlibs/ptp2/library.c:2328
-msgid "Sorry, your Canon camera does not support Canon Capture initiation"
-msgstr ""
-
-#: camlibs/ptp2/library.c:2339
-msgid "Sorry, initializing your camera did not work. Please report this."
-msgstr ""
-
-#: camlibs/ptp2/library.c:2390 camlibs/ptp2/library.c:2401
-#: camlibs/ptp2/library.c:2416
-#, c-format
-msgid "Canon Capture failed: 0x%04x"
-msgstr ""
-
-#: camlibs/ptp2/library.c:2582
-msgid "Sorry, your camera does not support generic capture"
-msgstr ""
-
-#: camlibs/ptp2/library.c:2662
-#, c-format
-msgid "No event received, error %x."
-msgstr ""
-
-#: camlibs/ptp2/library.c:3246
-msgid "read only"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3247
-msgid "readwrite"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3382 camlibs/sierra/sierra.c:1951
-#, c-format
-msgid "Manufacturer: %s\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3384
-#, c-format
-msgid "Model: %s\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3386
-#, c-format
-msgid "  Version: %s\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3389
-#, c-format
-msgid "  Serial Number: %s\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3393
-#, c-format
-msgid "Vendor Extension ID: 0x%x (%d.%d)\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3400
-#, c-format
-msgid "Vendor Extension Description: %s\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3405
-#, c-format
-msgid "PTP Standard Version: %d.%d\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3412
-#, c-format
-msgid "Functional Mode: 0x%04x\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3417
-#, c-format
-msgid ""
-"\n"
-"Capture Formats: "
-msgstr ""
-
-#: camlibs/ptp2/library.c:3431
-#, c-format
-msgid "Display Formats: "
-msgstr ""
-
-#: camlibs/ptp2/library.c:3447
-#, c-format
-msgid "Supported MTP Object Properties:\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3463
-#, c-format
-msgid " PTP error %04x on query"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3480
-#, c-format
-msgid ""
-"\n"
-"Device Capabilities:\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3484
-#, c-format
-msgid "\tFile Download, "
-msgstr ""
-
-#: camlibs/ptp2/library.c:3487
-#, c-format
-msgid "File Deletion, "
-msgstr ""
-
-#: camlibs/ptp2/library.c:3489
-#, c-format
-msgid "No File Deletion, "
-msgstr ""
-
-#: camlibs/ptp2/library.c:3493
-#, c-format
-msgid "File Upload\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3495
-#, c-format
-msgid "No File Upload\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3500
-#, c-format
-msgid "\tGeneric Image Capture, "
-msgstr ""
-
-#: camlibs/ptp2/library.c:3502
-#, c-format
-msgid "\tNo Image Capture, "
-msgstr ""
-
-#: camlibs/ptp2/library.c:3505
-#, c-format
-msgid "Open Capture, "
-msgstr ""
-
-#: camlibs/ptp2/library.c:3507
-#, c-format
-msgid "No Open Capture, "
-msgstr ""
-
-#: camlibs/ptp2/library.c:3513
-#, c-format
-msgid "Canon Capture\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3517
-#, c-format
-msgid "Canon EOS Capture\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3521
-#, c-format
-msgid "Nikon Capture\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3523
-#, c-format
-msgid "No vendor specific capture\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3532
-#, c-format
-msgid "\tNikon Wifi support\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3538
-#, c-format
-msgid "\tCanon Wifi support\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3549
-#, c-format
-msgid ""
-"\n"
-"Storage Devices Summary:\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3565
-#, c-format
-msgid "\tStorageDescription: %s\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3569
-#, c-format
-msgid "\tVolumeLabel: %s\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3576
-msgid "Builtin ROM"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3577
-msgid "Removable ROM"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3578
-msgid "Builtin RAM"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3579
-msgid "Removable RAM (memory card)"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3581 camlibs/ptp2/library.c:3594
-#: camlibs/ptp2/library.c:3606
-#, c-format
-msgid "Unknown: 0x%04x\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3585
-#, c-format
-msgid "\tStorage Type: %s\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3590
-msgid "Generic Flat"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3591
-msgid "Generic Hierarchical"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3592
-msgid "Digital Camera Layout (DCIM)"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3598
-#, c-format
-msgid "\tFilesystemtype: %s\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3602
-msgid "Read-Write"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3603
-msgid "Read-Only"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3604
-msgid "Read Only with Object deletion"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3610
-#, c-format
-msgid "\tAccess Capability: %s\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3612
-#, c-format
-msgid "\tMaximum Capability: %llu (%lu MB)\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3617
-#, c-format
-msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3622
-#, c-format
-msgid "\tFree Space (Images): %d\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3630
-#, c-format
-msgid ""
-"\n"
-"Device Property Summary:\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3656
-#, c-format
-msgid " not read out.\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3729
-#, c-format
-msgid " error %x on query."
-msgstr ""
-
-#: camlibs/ptp2/library.c:4678 camlibs/ptp2/library.c:4682
-#, c-format
-msgid "File '%s/%s' does not exist."
-msgstr ""
-
-#: camlibs/ptp2/library.c:4688
-msgid "Metadata only supported for MTP devices."
-msgstr ""
-
-#: camlibs/ptp2/library.c:4877
-msgid "Device does not support setting object protection."
-msgstr ""
-
-#: camlibs/ptp2/library.c:4882
-#, c-format
-msgid "Device failed to set object protection to %d, error 0x%04x."
-msgstr ""
-
-# camlibs/canon/library.c:176
-#: camlibs/ptp2/library.c:5620
-msgid "Initializing Camera"
-msgstr "初始化相机"
-
-#: camlibs/ptp2/library.c:5811
-#, c-format
-msgid ""
-"Currently, PTP is only implemented for USB and PTP/IP cameras currently, "
-"port type %x"
-msgstr ""
-
-# camlibs/ptp/library.c:90
-#: camlibs/ptp2/ptp.c:3389
-msgid "PTP: Undefined Error"
-msgstr "PTP: 未定义的错误"
-
-#: camlibs/ptp2/ptp.c:3390
-msgid "PTP: OK!"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3391
-msgid "PTP: General Error"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3392
-msgid "PTP: Session Not Open"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3393
-msgid "PTP: Invalid Transaction ID"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3394
-msgid "PTP: Operation Not Supported"
-msgstr ""
-
-# camlibs/ptp/library.c:96
-#: camlibs/ptp2/ptp.c:3395
-msgid "PTP: Parameter Not Supported"
-msgstr "PTP: 不支持的参数"
-
-# camlibs/ptp/library.c:97
-#: camlibs/ptp2/ptp.c:3396
-msgid "PTP: Incomplete Transfer"
-msgstr "PTP: 未完成的传输"
-
-# camlibs/ptp/library.c:98
-#: camlibs/ptp2/ptp.c:3397
-msgid "PTP: Invalid Storage ID"
-msgstr "PTP: 非法的存储 ID"
-
-# camlibs/ptp/library.c:99
-#: camlibs/ptp2/ptp.c:3398
-msgid "PTP: Invalid Object Handle"
-msgstr "PTP: 非法的对象句柄"
-
-# camlibs/ptp/library.c:100
-#: camlibs/ptp2/ptp.c:3399
-msgid "PTP: Device Prop Not Supported"
-msgstr "PTP: 不支持的设备属性"
-
-# camlibs/ptp/library.c:101
-#: camlibs/ptp2/ptp.c:3400
-msgid "PTP: Invalid Object Format Code"
-msgstr "PTP: 非法的对象格式代码"
-
-# camlibs/ptp/library.c:102
-#: camlibs/ptp2/ptp.c:3401
-msgid "PTP: Store Full"
-msgstr "PTP: 存储已满"
-
-# camlibs/ptp/library.c:103
-#: camlibs/ptp2/ptp.c:3402
-msgid "PTP: Object Write Protected"
-msgstr "PTP: 对象写入保护"
-
-# camlibs/ptp/library.c:104
-#: camlibs/ptp2/ptp.c:3403
-msgid "PTP: Store Read Only"
-msgstr "PTP: 只读的存储"
-
-# camlibs/ptp/library.c:105
-#: camlibs/ptp2/ptp.c:3404
-msgid "PTP: Access Denied"
-msgstr "PTP: 访问遭拒绝"
-
-# camlibs/ptp/library.c:106
-#: camlibs/ptp2/ptp.c:3405
-msgid "PTP: No Thumbnail Present"
-msgstr "PTP: 缩略图不存在"
-
-# camlibs/ptp/library.c:107
-#: camlibs/ptp2/ptp.c:3406
-msgid "PTP: Self Test Failed"
-msgstr "PTP: 自检失败"
-
-# camlibs/ptp/library.c:108
-#: camlibs/ptp2/ptp.c:3407
-msgid "PTP: Partial Deletion"
-msgstr "PTP: 部分删除"
-
-# camlibs/ptp/library.c:109
-#: camlibs/ptp2/ptp.c:3408
-msgid "PTP: Store Not Available"
-msgstr "PTP: 存储不可用"
-
-# camlibs/ptp/library.c:111
-#: camlibs/ptp2/ptp.c:3410
-msgid "PTP: Specification By Format Unsupported"
-msgstr "PTP: 不支持的格式规范"
-
-# camlibs/ptp/library.c:112
-#: camlibs/ptp2/ptp.c:3411
-msgid "PTP: No Valid Object Info"
-msgstr "PTP: 没有合法的对象信息"
-
-# camlibs/ptp/library.c:113
-#: camlibs/ptp2/ptp.c:3412
-msgid "PTP: Invalid Code Format"
-msgstr "PTP: 非法的代码格式"
-
-# camlibs/ptp/library.c:114
-#: camlibs/ptp2/ptp.c:3413
-msgid "PTP: Unknown Vendor Code"
-msgstr "PTP: 未知的厂家代码"
-
-# camlibs/ptp/library.c:116
-#: camlibs/ptp2/ptp.c:3415
-msgid "PTP: Capture Already Terminated"
-msgstr "PTP: 捕获已终止"
-
-# camlibs/ptp/library.c:117
-#: camlibs/ptp2/ptp.c:3416
-msgid "PTP: Device Busy"
-msgstr "PTP: 设备忙碌"
-
-#: camlibs/ptp2/ptp.c:3417
-msgid "PTP: Invalid Parent Object"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3418
-msgid "PTP: Invalid Device Prop Format"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3419
-msgid "PTP: Invalid Device Prop Value"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3420
-msgid "PTP: Invalid Parameter"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3421
-msgid "PTP: Session Already Opened"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3422
-msgid "PTP: Transaction Canceled"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3424
-msgid "PTP: Specification Of Destination Unsupported"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3425
-msgid "PTP: EK Filename Required"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3426
-msgid "PTP: EK Filename Conflicts"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3427
-msgid "PTP: EK Filename Invalid"
-msgstr ""
-
-# camlibs/ptp/library.c:130
-#: camlibs/ptp2/ptp.c:3429
-msgid "PTP: I/O error"
-msgstr "PTP: I/O 错误"
-
-# camlibs/ptp/library.c:131
-#: camlibs/ptp2/ptp.c:3430
-msgid "PTP: Error: bad parameter"
-msgstr "PTP: 错误：错误的参数"
-
-# camlibs/ptp/library.c:132
-#: camlibs/ptp2/ptp.c:3431
-msgid "PTP: Protocol error, data expected"
-msgstr "PTP: 协议错误，需要数据"
-
-# camlibs/ptp/library.c:133
-#: camlibs/ptp2/ptp.c:3432
-msgid "PTP: Protocol error, response expected"
-msgstr "PTP: 协议错误，需要响应"
-
-# camlibs/ptp/library.c:90
-#: camlibs/ptp2/ptp.c:3450
-msgid "Undefined PTP Property"
-msgstr "PTP: 未定义的属性"
-
-# frontends/command-line/gphoto2-cmd-capture.c:218
-# libgphoto2/gphoto2-result.c:51
-#: camlibs/ptp2/ptp.c:3452
-msgid "Functional Mode"
-msgstr "操作模式"
-
-#: camlibs/ptp2/ptp.c:3454
-msgid "Compression Setting"
-msgstr "压缩设置"
-
-# camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
-# camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/ptp.c:3455 camlibs/ptp2/ptp.c:3522
-#: camlibs/sierra/epson-desc.c:176 camlibs/sierra/nikon-desc.c:293
-#: camlibs/sierra/olympus-desc.c:564 camlibs/sierra/olympus-desc.c:583
-#: camlibs/sierra/olympus-desc.c:604 camlibs/sierra/olympus-desc.c:628
-#: camlibs/sierra/sierra.c:1085 camlibs/sierra/sierra.c:1368
-#: camlibs/sierra/sierra.c:1562 camlibs/sierra/sierra.c:1785
-msgid "White Balance"
-msgstr "白平衡"
-
-#: camlibs/ptp2/ptp.c:3456
-msgid "RGB Gain"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3463
-msgid "Exposure Time"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3464
-msgid "Exposure Program Mode"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3466
-msgid "Exposure Index (film speed ISO)"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3468
-msgid "Exposure Bias Compensation"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3470
-msgid "Pre-Capture Delay"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3472 camlibs/ptp2/ptp.c:3526
-msgid "Contrast"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3474 camlibs/sierra/nikon-desc.c:553
-#: camlibs/sierra/nikon-desc.c:576
-msgid "Digital Zoom"
-msgstr "数字缩放"
-
-#: camlibs/ptp2/ptp.c:3478
-msgid "Timelapse Number"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3479
-msgid "Timelapse Interval"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3481
-msgid "Upload URL"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3483
-msgid "Copyright Info"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3492
-msgid "Date Time Stamp Format"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3494
-msgid "Video Out"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3495
-msgid "Power Saving"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3496
-msgid "UI Language"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3505
-msgid "Battery Type"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3506
-msgid "Battery Mode"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3507
-msgid "UILockType"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3508
-msgid "Camera Mode"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3510
-msgid "Full View File Format"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3512
-msgid "Self Time"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3515 camlibs/ptp2/ptp.c:3648
-msgid "Shooting Mode"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3516
-msgid "Image Mode"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3523
-msgid "Slow Shutter Setting"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3524
-msgid "AF Mode"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3525
-msgid "Image Stabilization"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3527
-msgid "Color Gain"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3529
-msgid "Sensitivity"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3530
-msgid "Parameter Set"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3537
-msgid "Av Open"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3538
-msgid "Av Max"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3540 camlibs/ptp2/ptp.c:3564
-msgid "Focal Length Tele"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3541
-msgid "Focal Length Wide"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3542
-msgid "Focal Length Denominator"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3543
-msgid "Capture Transfer Mode"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3545
-msgid "Name Prefix"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3546
-msgid "Size Quality Mode"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3547
-msgid "Supported Thumb Size"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3548
-msgid "Size of Output Data from Camera"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3549
-msgid "Size of Input Data to Camera"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3550
-msgid "Remote API Version"
-msgstr ""
-
-# camlibs/canon/serial.c:1190
-#: camlibs/ptp2/ptp.c:3553
-msgid "Camera Owner"
-msgstr "相机所有者。"
-
-#: camlibs/ptp2/ptp.c:3554
-msgid "UNIX Time"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3555
-msgid "Camera Body ID"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3557
-msgid "Disp Av"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3558
-msgid "Av Open Apex"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3559
-msgid "Digital Zoom Magnification"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3560
-msgid "Ml Spot Position"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3561
-msgid "Disp Av Max"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3562
-msgid "Av Max Apex"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3563
-msgid "EZoom Start Position"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3565
-msgid "EZoom Size of Tele"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3568
-msgid "Flash Quantity Count"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3569
-msgid "Rotation Angle"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3570
-msgid "Rotation Scene"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3571
-msgid "Event Emulate Mode"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3573
-msgid "Type of Slideshow"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3574
-msgid "Average Filesizes"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3575
-msgid "Model ID"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3584
-msgid "Shooting Bank"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3586
-msgid "Shooting Bank Name A"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3588
-msgid "Shooting Bank Name B"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3590
-msgid "Shooting Bank Name C"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3592
-msgid "Shooting Bank Name D"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3594
-msgid "Reset Bank 0"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3596
-msgid "Raw Compression"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3612
-msgid "White Balance Colour Temperature"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3614
-msgid "White Balance Preset Number"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3616
-msgid "White Balance Preset Name 0"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3618
-msgid "White Balance Preset Name 1"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3620
-msgid "White Balance Preset Name 2"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3622
-msgid "White Balance Preset Name 3"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3624
-msgid "White Balance Preset Name 4"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3626
-msgid "White Balance Preset Value 0"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3628
-msgid "White Balance Preset Value 1"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3630
-msgid "White Balance Preset Value 2"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3632
-msgid "White Balance Preset Value 3"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3634
-msgid "White Balance Preset Value 4"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3644
-msgid "Lens Focal Length (Non CPU)"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3646
-msgid "Lens Maximum Aperture (Non CPU)"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3654
-msgid "Auto DX Crop"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3658
-msgid "Menu Bank Name A"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3660
-msgid "Menu Bank Name B"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3662
-msgid "Menu Bank Name C"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3664
-msgid "Menu Bank Name D"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3666
-msgid "Reset Menu Bank"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3684
-msgid "Vertical AF On"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3688
-msgid "Focus Area Zone"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3690
-msgid "Enable Copyright"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3694
-msgid "Exposure ISO Step"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3696
-msgid "Exposure Step"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3698
-msgid "Exposure Compensation (EV)"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3702
-msgid "Centre Weight Area"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3704
-msgid "Exposure Base Matrix"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3706
-msgid "Exposure Base Center"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3708
-msgid "Exposure Base Spot"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3710
-msgid "Live View AF Area"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3718
-msgid "Auto Meter Off Time"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3720
-msgid "Self Timer Delay"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3724
-msgid "Img Conf Time"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3726
-msgid "Angle Level"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3728
-msgid "Shooting Speed"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3732
-msgid "Exposure delay mode"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3734
-msgid "Long Exposure Noise Reduction"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3742
-msgid "LCD Illumination"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3744
-msgid "High ISO noise reduction"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3746
-msgid "On screen tips"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3748
-msgid "Artist Name"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3750
-msgid "Copyright Information"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3758
-msgid "Modeling Flash"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3762
-msgid "Manual Mode Bracketing"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3766
-msgid "Auto Bracket Selection"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3767
-msgid "NIKON Auto Bracketing Set"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3769
-msgid "Center Button Shooting Mode"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3771
-msgid "Center Button Playback Mode"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3773
-msgid "Multiselector"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3775
-msgid "Photo Info. Playback"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3777
-msgid "Assign Func. Button"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3779
-msgid "Customise Command Dials"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3783
-msgid "Aperture Setting"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3785
-msgid "Menus and Playback"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3787
-msgid "Buttons and Dials"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3789
-msgid "No CF Card Release"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3791
-msgid "Center Button Zoom Ratio"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3793
-msgid "Function Button 2"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3797
-msgid "Normal AF On"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3799
-msgid "Image Comment String"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3801
-msgid "Image Comment Enable"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3803
-msgid "Image Rotation"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3805
-msgid "Manual Set Lens Number"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3807
-msgid "Movie Screen Size"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3809
-msgid "Movie Voice"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3811
-msgid "Bracketing Enable"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3813
-msgid "Exposure Bracketing Step"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3815
-msgid "Exposure Bracketing Program"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3817
-msgid "Auto Exposure Bracket Count"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3818
-msgid "White Balance Bracket Step"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3819
-msgid "White Balance Bracket Program"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3821
-msgid "Lens ID"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3823
-msgid "Lens Sort"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3825
-msgid "Lens Type"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3827
-msgid "Min. Focal Length"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3829
-msgid "Max. Focal Length"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3831
-msgid "Max. Aperture at Min. Focal Length"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3833
-msgid "Max. Aperture at Max. Focal Length"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3835
-msgid "Finder ISO Display"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3837
-msgid "Auto Off Photo"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3839
-msgid "Auto Off Menu"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3841
-msgid "Auto Off Info"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3843
-msgid "Self Timer Shot Number"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3845
-msgid "Vignette Control"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3847
-msgid "Nikon Exposure Time"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3849
-msgid "Warning Status"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3856
-msgid "AF LCD Top Mode 2"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3858
-msgid "Active AF Sensor"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3862
-msgid "Exposure Meter"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3866
-msgid "USB Speed"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3868
-msgid "CCD Serial Number"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3872
-msgid "Group PTN Type"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3874
-msgid "FNumber Lock"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3876
-msgid "Exposure Aperture Lock"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3878
-msgid "TV Lock Setting"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3880
-msgid "AV Lock Setting"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3882
-msgid "Illum Setting"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3884
-msgid "Focus Point Bright"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3886
-msgid "External Flash Attached"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3888
-msgid "External Flash Status"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3890
-msgid "External Flash Sort"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3892 camlibs/ptp2/ptp.c:3896
-msgid "External Flash Mode"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3894
-msgid "External Flash Compensation"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3904
-msgid "BW Filler Effect"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3906
-msgid "BW Sharpness"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3908
-msgid "BW Contrast"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3910
-msgid "BW Setting Type"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3912
-msgid "Slot 2 Save Mode"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3914
-msgid "Raw Bit Mode"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3916
-msgid "ISO Auto Time"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3918
-msgid "Flourescent Type"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3920
-msgid "Tune Colour Temperature"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3922
-msgid "Tune Preset 0"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3924
-msgid "Tune Preset 1"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3926
-msgid "Tune Preset 2"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3928
-msgid "Tune Preset 3"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3930
-msgid "Tune Preset 4"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3934
-msgid "Autofocus Mode"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3936
-msgid "AF Assist Lamp"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3938
-msgid "Auto ISO P/A/DVP Setting"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3954
-msgid "Viewfinder Grid Display"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3958
-msgid "Flash Mode Commander Power"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3960
-msgid "Auto FP"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3964
-msgid "Warning Display"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3966
-msgid "Battery Cell Kind"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3968
-msgid "ISO Auto High Limit"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3972
-msgid "Continuous Speed High"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3974
-msgid "Info Disp Setting"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3976
-msgid "Preview Button"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3978
-msgid "Preview Button 2"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3980
-msgid "AEAF Lock Button 2"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3982
-msgid "Indicator Display"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3984
-msgid "Cell Kind Priority"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3986
-msgid "Bracketing Frames and Steps"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3988
-msgid "Live View Mode"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3990
-msgid "Live View Drive Mode"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3992
-msgid "Live View Status"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3994
-msgid "Live View Image Zoom Ratio"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3996
-msgid "Live View Prohibit Condition"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:3998
-msgid "Exposure Display Status"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4000
-msgid "Exposure Indicate Status"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4002
-msgid "Exposure Indicate Lightup"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4008
-msgid "Flash MRepeat Value"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4010
-msgid "Flash MRepeat Count"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4012
-msgid "Flash MRepeat Interval"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4034
-msgid "Active Pic Ctrl Item"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4036
-msgid "Change Pic Ctrl Item"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4043
-msgid "Secure Time"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4044
-msgid "Device Certificate"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4045
-msgid "Revocation Info"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4047
-msgid "Synchronization Partner"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4049
-msgid "Friendly Device Name"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4050
-msgid "Volume Level"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4051
-msgid "Device Icon"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4052
-msgid "Session Initiator Info"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4053
-msgid "Perceived Device Type"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4054
-msgid "Playback Rate"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4055
-msgid "Playback Object"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4057
-msgid "Playback Container Index"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4058
-msgid "Playback Position"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4059
-msgid "PlaysForSure ID"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4067
-msgid "Quality"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4068
-msgid "Release Mode"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4069
-msgid "Focus Areas"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4070
-msgid "AE Lock"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4173 camlibs/ptp2/ptp.c:4179 camlibs/ptp2/ptp.c:4180
-#: camlibs/ptp2/ptp.c:4187
-#, c-format
-msgid "%.1f stops"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4181
-#, c-format
-msgid "%.0f mm"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4198
-msgid "JPEG Norm"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4201
-msgid "RAW + JPEG Basic"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4207 camlibs/ricoh/library.c:330
-#: camlibs/sierra/nikon-desc.c:284
-msgid "Incandescent"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4215
-msgid "Automatic Macro (close-up)"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4220
-msgid "Center Weighted Average"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4222
-msgid "Center-spot"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4224
-msgid "Automatic flash"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4227
-msgid "Automatic Red-eye Reduction"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4228
-msgid "Red-eye fill flash"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4246
-msgid "Power Wind"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4252
-msgid "Timer + Remote"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4310
-msgid "AF Lock only"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4314
-msgid "Flash Lock"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4365
-msgid "Reset focus point to center"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4366
-msgid "Highlight active focus point"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4367
-msgid "Unused"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4409
-msgid "SDRam"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4411
-msgid "USB 1.1"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4412
-msgid "USB 2.0"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4424
-msgid "LCD Backlight"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4425
-msgid "LCD Backlight and Info Display"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4483
-msgid "1 min"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4484
-msgid "5 mins"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4485
-msgid "10 mins"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4486
-msgid "15 mins"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4521
-msgid "Dark on light"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4522
-msgid "Light on dark"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4547
-msgid "Lithium Ion"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4548
-msgid "Nickel hydride"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4549
-msgid "Nickel cadmium"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4550
-msgid "Alkalium manganese"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4554
-msgid "Warning Level 1"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4555
-msgid "Emergency"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4556
-msgid "Warning Level 0"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4559
-msgid "Economy"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4562
-msgid "Lossless"
-msgstr ""
-
-# camlibs/sierra/sierra.c:1471 camlibs/sierra/sierra.c:1479
-# camlibs/sierra/sierra.c:1684
-#: camlibs/ptp2/ptp.c:4563
-msgid "SuperFine"
-msgstr "超精细"
-
-#: camlibs/ptp2/ptp.c:4582
-msgid "Red Eye Suppression"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4583
-msgid "Low Speed Synchronization"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4584
-msgid "Auto + Red Eye Suppression"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4585
-msgid "On + Red Eye Suppression"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4599
-msgid "Distant View"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4600
-msgid "High-Speed Shutter"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4601
-msgid "Low-Speed Shutter"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4602 camlibs/ptp2/ptp.c:4666
-msgid "Night View"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4603
-msgid "Grayscale"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4609
-msgid "Pan Focus"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4613
-msgid "Single-Frame Shooting"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4614
-msgid "Continuous Shooting"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4615
-msgid "Timer (Single) Shooting"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4616
-msgid "Continuous Low-speed Shooting"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4617
-msgid "Continuous High-speed Shooting"
-msgstr ""
-
-# camlibs/sierra/sierra.c:1026 camlibs/sierra/sierra.c:1032
-#: camlibs/ptp2/ptp.c:4620 camlibs/ricoh/library.c:378
-#: camlibs/sierra/sierra.c:1165 camlibs/sierra/sierra.c:1171
-msgid "2x"
-msgstr "2x"
-
-#: camlibs/ptp2/ptp.c:4621 camlibs/ricoh/library.c:380
-msgid "4x"
-msgstr "4x"
-
-#: camlibs/ptp2/ptp.c:4622
-msgid "Smooth"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4624
-msgid "Center-weighted Metering"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4625
-msgid "Spot Metering"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4626
-msgid "Average Metering"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4627
-msgid "Evaluative Metering"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4628
-msgid "Partial Metering"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4629
-msgid "Center-weighted Average Metering"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4630
-msgid "Spot Metering Interlocked with AF Frame"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4631
-msgid "Multi-Spot Metering"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4668
-msgid "Low-speed shutter function not available"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4678 camlibs/ptp2/ptp.c:4684 camlibs/ptp2/ptp.c:4690
-msgid "Low 2"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4682 camlibs/ptp2/ptp.c:4688 camlibs/ptp2/ptp.c:4694
-msgid "High 2"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4697
-msgid "Upper 1"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4698
-msgid "Upper 2"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4700
-msgid "Standard Development Parameters"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4701
-msgid "Development Parameters 1"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4702
-msgid "Development Parameters 2"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4703
-msgid "Development Parameters 3"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4732
-msgid "MlSpotPosCenter"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4733
-msgid "MlSpotPosAfLink"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4837
-msgid "Media Card"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4838
-msgid "Media Card Group"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4839
-msgid "Encounter"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4840
-msgid "Encounter Box"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4841
-msgid "M4A"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4842
-msgid "Firmware"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4843
-msgid "Windows Image Format"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4844
-msgid "Undefined Audio"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4848
-msgid "Audible.com Codec"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4850
-msgid "Samsung Playlist"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4851
-msgid "Undefined Video"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4856
-msgid "Undefined Collection"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4857
-msgid "Abstract Multimedia Album"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4858
-msgid "Abstract Image Album"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4859
-msgid "Abstract Audio Album"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4860
-msgid "Abstract Video Album"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4861
-msgid "Abstract Audio Video Playlist"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4862
-msgid "Abstract Contact Group"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4863
-msgid "Abstract Message Folder"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4864
-msgid "Abstract Chaptered Production"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4865
-msgid "Abstract Audio Playlist"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4866
-msgid "Abstract Video Playlist"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4867
-msgid "Abstract Mediacast"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4868
-msgid "WPL Playlist"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4869
-msgid "M3U Playlist"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4870
-msgid "MPL Playlist"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4871
-msgid "ASX Playlist"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4872
-msgid "PLS Playlist"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4873
-msgid "Undefined Document"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4874
-msgid "Abstract Document"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4875
-msgid "XMLDocument"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4876
-msgid "Microsoft Word Document"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4877
-msgid "MHT Compiled HTML Document"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4878
-msgid "Microsoft Excel Spreadsheet (.xls)"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4879
-msgid "Microsoft Powerpoint (.ppt)"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4880
-msgid "Undefined Message"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4881
-msgid "Abstract Message"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4882
-msgid "Undefined Contact"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4883
-msgid "Abstract Contact"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4884
-msgid "vCard2"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4885
-msgid "vCard3"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4886
-msgid "Undefined Calendar Item"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4887
-msgid "Abstract Calendar Item"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4888
-msgid "vCalendar1"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4889
-msgid "vCalendar2"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4890
-msgid "Undefined Windows Executable"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4891
-msgid "Media Cast"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4892
-msgid "Section"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4931
-#, c-format
-msgid "Unknown(%04x)"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4939
-msgid "get device info"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4940
-msgid "Open session"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4941
-msgid "Close session"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4942
-msgid "Get storage IDs"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4943
-msgid "Get storage info"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4944
-msgid "Get number of objects"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4945
-msgid "Get object handles"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4946
-msgid "Get object info"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4947
-msgid "Get object"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4948
-msgid "Get thumbnail"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4949
-msgid "Delete object"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4950
-msgid "Send object info"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4951
-msgid "Send object"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4952
-msgid "Initiate capture"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4953
-msgid "Format storage"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4954
-msgid "Reset device"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4955
-msgid "Self test device"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4956
-msgid "Set object protection"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4957
-msgid "Power down device"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4958
-msgid "Get device property description"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4959
-msgid "Get device property value"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4960
-msgid "Set device property value"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4961
-msgid "Reset device property value"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4962
-msgid "Terminate open capture"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4963
-msgid "Move object"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4964
-msgid "Copy object"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4965
-msgid "Get partial object"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4966
-msgid "Initiate open capture"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4973
-msgid "Get object properties supported"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4974
-msgid "Get object property description"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4975
-msgid "Get object property value"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4976
-msgid "Set object property value"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4977
-msgid "Get object property list"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4978
-msgid "Set object property list"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4979
-msgid "Get interdependent property description"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4980
-msgid "Send object property list"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4981
-msgid "Get object references"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4982
-msgid "Set object references"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4983
-msgid "Update device firmware"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4984
-msgid "Skip to next position in playlist"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4987
-msgid "Get secure time challenge"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4988
-msgid "Get secure time response"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4989
-msgid "Set license response"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4990
-msgid "Get sync list"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4991
-msgid "Send meter challenge query"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4992
-msgid "Get meter challenge"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4993
-msgid "Get meter response"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4994
-msgid "Clean data store"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4995
-msgid "Get license state"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4996
-msgid "Send WMDRM-PD Command"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:4997
-msgid "Send WMDRM-PD Request"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:5000
-msgid "Report Added/Deleted Items"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:5001
-msgid "Report Acquired Items"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:5002
-msgid "Get transferable playlist types"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:5005
-msgid "Send WMDRM-PD Application Request"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:5006
-msgid "Get WMDRM-PD Application Response"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:5007
-msgid "Enable trusted file operations"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:5008
-msgid "Disable trusted file operations"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:5009
-msgid "End trusted application session"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:5012
-msgid "Open Media Session"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:5013
-msgid "Close Media Session"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:5014
-msgid "Get Next Data Block"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:5015
-msgid "Set Current Time Position"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:5018
-msgid "Send Registration Request"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:5019
-msgid "Get Registration Response"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:5020
-msgid "Get Proximity Challenge"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:5021
-msgid "Send Proximity Response"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:5022
-msgid "Send WMDRM-ND License Request"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:5023
-msgid "Get WMDRM-ND License Response"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:5026
-msgid "Process WFC Object"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:5049
-#, c-format
-msgid "Unknown (%04x)"
-msgstr "未知 (%04x)"
-
-#: camlibs/ricoh/g3.c:352
-msgid "Downloading movie..."
-msgstr "正在下载电影..."
-
-#: camlibs/ricoh/g3.c:358
-msgid "Downloading audio..."
-msgstr "正在下载音频..."
-
-#: camlibs/ricoh/g3.c:373
-msgid "Downloading EXIF data..."
-msgstr "正在下载 EXIF 数据..."
-
-#: camlibs/ricoh/g3.c:375 camlibs/ricoh/g3.c:394
-#, c-format
-msgid "No EXIF data available for %s."
-msgstr "没有 %s 可用的 EXIF 数据。"
-
-#: camlibs/ricoh/g3.c:481
-msgid "Could not delete file."
-msgstr "无法删除文件。"
-
-#: camlibs/ricoh/g3.c:509
-msgid "Could not remove directory."
-msgstr "不能移除目录。"
-
-#: camlibs/ricoh/g3.c:537
-msgid "Could not create directory."
-msgstr "不能创建目录。"
-
-#: camlibs/ricoh/g3.c:556
-#, c-format
-msgid "Version: %s\n"
-msgstr "版本：%s\n"
-
-#: camlibs/ricoh/g3.c:561
-#, c-format
-msgid "RTC Status: %d\n"
-msgstr "RTC 状态：%d\n"
-
-#: camlibs/ricoh/g3.c:567
-#, c-format
-msgid "Camera time: %s %s\n"
-msgstr "相机时间：%s %s\n"
-
-#: camlibs/ricoh/g3.c:573 camlibs/sierra/sierra.c:1953
-#, c-format
-msgid "Camera ID: %s\n"
-msgstr "相机标识：%s\n"
-
-#: camlibs/ricoh/g3.c:579
-#, c-format
-msgid "No SD Card inserted.\n"
-msgstr "没有插入 SD 卡。\n"
-
-#: camlibs/ricoh/g3.c:582
-#, c-format
-msgid "SD Card ID: %s\n"
-msgstr "SD 卡标识：%s\n"
-
-#: camlibs/ricoh/g3.c:590
-#, c-format
-msgid "Photos on camera: %d\n"
-msgstr "相机的相片：%d\n"
-
-#: camlibs/ricoh/g3.c:596
-#, c-format
-msgid "SD memory: %d MB total, %d MB free.\n"
-msgstr "SD 内存：总共 %d MB，剩余 %d MB。\n"
-
-#: camlibs/ricoh/g3.c:603
-#, c-format
-msgid "Internal memory: %d MB total, %d MB free.\n"
-msgstr ""
-
-#: camlibs/ricoh/g3.c:613
-msgid ""
-"Ricoh Caplio G3.\n"
-"Marcus Meissner <marcus@jet.franken.de>\n"
-"Reverse engineered using USB Snoopy, looking\n"
-"at the firmware update image and wild guessing.\n"
-msgstr ""
-
-#: camlibs/ricoh/library.c:216
-msgid ""
-"Ricoh / Philips driver by\n"
-"Lutz Mueller <lutz@users.sourceforge.net>,\n"
-"Martin Fischer <martin.fischer@inka.de>,\n"
-"based on Bob Paauwe's driver\n"
-msgstr ""
-"尼康 / 菲力浦驱动程序由\n"
-"Lutz Mueller <lutz@users.sourceforge.net>,\n"
-"Martin Fischer <martin.fischer@inka.de>,\n"
-"根据 Bob Paauwe 的驱动程序编制\n"
-
-#: camlibs/ricoh/library.c:250
-#, c-format
-msgid "unknown (0x%02x)"
-msgstr "未知 (0x%02x)"
-
-# camlibs/ricoh/library.c:177
-#: camlibs/ricoh/library.c:253
-#, c-format
-msgid ""
-"Model: %s\n"
-"Memory: %d byte(s) of %d available"
-msgstr ""
-"型号：%s\n"
-"内存：%d(字节)/%d 可用"
-
-#: camlibs/ricoh/library.c:303
-msgid "-2.0"
-msgstr "-2.0"
-
-#: camlibs/ricoh/library.c:304
-msgid "-1.5"
-msgstr "-1.5"
-
-#: camlibs/ricoh/library.c:305
-msgid "-1.0"
-msgstr "-1.0"
-
-#: camlibs/ricoh/library.c:306
-msgid "-0.5"
-msgstr "-0.5"
-
-#: camlibs/ricoh/library.c:307
-msgid "0.0"
-msgstr "0.0"
-
-#: camlibs/ricoh/library.c:308
-msgid "0.5"
-msgstr "0.5"
-
-#: camlibs/ricoh/library.c:309
-msgid "1.0"
-msgstr "1.0"
-
-#: camlibs/ricoh/library.c:310
-msgid "1.5"
-msgstr "1.5"
-
-#: camlibs/ricoh/library.c:311
-msgid "2.0"
-msgstr "2.0"
-
-#: camlibs/ricoh/library.c:320
-msgid "1280 x 960"
-msgstr "1280 x 960"
-
-# camlibs/dimera/dimera3500.c:684 camlibs/dimera/dimera3500.c:850
-# camlibs/dimera/dimera3500.c:918
-#: camlibs/ricoh/library.c:328
-msgid "Outdoor"
-msgstr "户外"
-
-#: camlibs/ricoh/library.c:348
-msgid "Maximal"
-msgstr "最大的"
-
-# camlibs/polaroid/pdc700.c:167
-#: camlibs/ricoh/library.c:350
-msgid "Minimal"
-msgstr "最小的"
-
-# camlibs/canon/library.c:576 camlibs/canon/library.c:582
-# camlibs/canon/library.c:851 camlibs/canon/library.c:857
-#: camlibs/ricoh/library.c:358
-msgid "Character"
-msgstr "人物"
-
-#: camlibs/ricoh/library.c:359
-msgid "Sound"
-msgstr "音效"
-
-# camlibs/polaroid/pdc700.c:160
-#: camlibs/ricoh/library.c:360
-msgid "Image & Sound"
-msgstr "图像和音效"
-
-#: camlibs/ricoh/library.c:361
-msgid "Character & Sound"
-msgstr "人物和音效"
-
-#: camlibs/ricoh/library.c:379
-msgid "3x"
-msgstr "3x"
-
-# camlibs/sierra/sierra.c:1027 camlibs/sierra/sierra.c:1038
-#: camlibs/ricoh/library.c:381
-msgid "5x"
-msgstr "5x"
-
-# camlibs/sierra/sierra.c:1025 camlibs/sierra/sierra.c:1035
-#: camlibs/ricoh/library.c:382
-msgid "6x"
-msgstr "6x"
-
-#: camlibs/ricoh/library.c:383
-msgid "7x"
-msgstr "7x"
-
-#: camlibs/ricoh/library.c:384
-msgid "8x"
-msgstr "8x"
-
-#: camlibs/ricoh/library.c:385
-msgid "9x"
-msgstr "9x"
-
-# camlibs/polaroid/pdc700.c:981 camlibs/sierra/sierra.c:776
-# camlibs/sierra/sierra.c:1353
-#: camlibs/ricoh/library.c:432
-msgid "Configuration"
-msgstr "配置"
-
-# camlibs/polaroid/pdc700.c:167
-#: camlibs/ricoh/library.c:435
-msgid "General"
-msgstr "普通"
-
-#: camlibs/ricoh/library.c:441
-msgid "Copyright (max. 20 characters)"
-msgstr "版权 (最多 20 个字符)"
-
-# camlibs/sierra/sierra.c:777 camlibs/sierra/sierra.c:1443
-#: camlibs/ricoh/library.c:455
-msgid "Pictures"
-msgstr "照片"
-
-# camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
-# camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ricoh/library.c:499
-msgid "White level"
-msgstr "白平衡"
-
-# camlibs/minolta/dimagev/dimagev.c:308
-#: camlibs/ricoh/library.c:503
-msgid "Record Mode"
-msgstr "录制模式"
-
-#: camlibs/ricoh/library.c:504
-msgid "Compression"
-msgstr "压缩"
-
-# camlibs/ricoh/library.c:252
-#: camlibs/ricoh/library.c:571
-#, c-format
-msgid "Speed %i is not supported!"
-msgstr "不支持速度 %i！"
-
-#: camlibs/ricoh/ricoh.c:66
-#, c-format
-msgid "Expected %i, got %i. Please report this error to %s."
-msgstr "需要 %i 字节，得到 %i。请将此错误报告到 %s。"
-
-#: camlibs/ricoh/ricoh.c:75
-#, c-format
-msgid "Expected %i bytes, got %i. Please report this error to %s."
-msgstr "需要 %i 字节，得到 %i。请将此错误报告到 %s。"
-
-#: camlibs/ricoh/ricoh.c:177 camlibs/ricoh/ricoh.c:191
-#, c-format
-msgid "We expected 0x%x but received 0x%x. Please contact %s."
-msgstr "我们希望得到 0x%x 但收到 0x%x。请联系 %s。"
-
-#: camlibs/ricoh/ricoh.c:220
-#, c-format
-msgid "Bad characters (0x%x, 0x%x). Please contact %s."
-msgstr "错误的字符 (0x%x，0x%x)。请联系 %s。"
-
-#: camlibs/ricoh/ricoh.c:261 camlibs/ricoh/ricoh.c:336
-#, c-format
-msgid "Camera busy. If the problem persists, please contact %s."
-msgstr "相机忙。如果问题总是存在，请联系 %s。"
-
-#: camlibs/ricoh/ricoh.c:296
-#, c-format
-msgid "Timeout even after 2 retries. Please contact %s."
-msgstr "两次重试后仍然超时。请联系 %s。"
-
-#: camlibs/ricoh/ricoh.c:312
-#, c-format
-msgid "Communication error even after 2 retries. Please contact %s."
-msgstr "两次重试后仍然通讯错误。请联系 %s。"
-
-#: camlibs/ricoh/ricoh.c:350
-#, c-format
-msgid "Camera is in wrong mode. Please contact %s."
-msgstr "相机处于错误的模式。请联系 %s。"
-
-#: camlibs/ricoh/ricoh.c:359
-#, c-format
-msgid "Camera did not accept the parameters. Please contact %s."
-msgstr "相机无法接收参数。请联系 %s。"
-
-#: camlibs/ricoh/ricoh.c:365
-#, c-format
-msgid "An unknown error occurred. Please contact %s."
-msgstr "遇到未知的错误。请联系 <%s。"
-
-#: camlibs/ricoh/ricoh.c:831
-#, c-format
-msgid ""
-"The filename's length must not exceed 12 characters ('%s' has %i characters)."
-msgstr "文件名的长度不能超过 12 个字符 (“%s” 含有 %i 个字符)。"
-
-# camlibs/samsung/samsung.c:244
-#: camlibs/samsung/samsung.c:243
-msgid ""
-"The Samsung digimax 800k driver has been written by James McKenzie "
-"<james@fishsoup.dhs.org> for gphoto. Lutz Mueller "
-"<lutz@users.sourceforge.net> ported it to gphoto2. Marcus Meissner "
-"<marcus@jet.franken.de> fixed and enhanced the port."
-msgstr ""
-"三星 digimax 800k 驱动程序是由 James McKenzie <james@fishsoup.dhs.org> 为 gphoto "
-"编写的。Lutz Mueller <lutz@users.sourceforge.net> 将它移植到 gphoto2。Marcus Meissner "
-"<marcus@jet.franken.de> 修正并增强了移植后的版本。"
-
-# camlibs/dimera/dimera3500.c:537
-#: camlibs/sierra/epson-desc.c:85 camlibs/sierra/nikon-desc.c:92
-#: camlibs/sierra/nikon-desc.c:126 camlibs/sierra/olympus-desc.c:106
-#: camlibs/sierra/olympus-desc.c:136 camlibs/sierra/olympus-desc.c:165
-msgid "Resolution plus Size"
-msgstr "分辨率加尺寸"
-
-# camlibs/konica/library.c:633 camlibs/konica/library.c:844
-# camlibs/polaroid/pdc700.c:1005 camlibs/polaroid/pdc700.c:1018
-# camlibs/polaroid/pdc700.c:1088
-#: camlibs/sierra/epson-desc.c:103 camlibs/sierra/nikon-desc.c:144
-#: camlibs/sierra/olympus-desc.c:183
-msgid "Date and time (GMT)"
-msgstr "日期和时间 (GMT)"
-
-#: camlibs/sierra/epson-desc.c:127 camlibs/sierra/nikon-desc.c:210
-#: camlibs/sierra/olympus-desc.c:392 camlibs/sierra/olympus-desc.c:424
-#: camlibs/sierra/olympus-desc.c:448 camlibs/sierra/olympus-desc.c:472
-msgid "Aperture Settings"
-msgstr ""
-
-# camlibs/sierra/sierra.c:855 camlibs/sierra/sierra.c:1165
-# camlibs/sierra/sierra.c:1494 camlibs/sierra/sierra.c:1695
-#: camlibs/sierra/epson-desc.c:142 camlibs/sierra/nikon-desc.c:225
-#: camlibs/sierra/sierra.c:994 camlibs/sierra/sierra.c:1304
-#: camlibs/sierra/sierra.c:1633 camlibs/sierra/sierra.c:1834
-msgid "Color Mode"
-msgstr "彩色模式"
-
-# camlibs/sierra/sierra.c:889 camlibs/sierra/sierra.c:899
-# camlibs/sierra/sierra.c:1196 camlibs/sierra/sierra.c:1399
-# camlibs/sierra/sierra.c:1408 camlibs/sierra/sierra.c:1635
-#: camlibs/sierra/epson-desc.c:154 camlibs/sierra/sierra.c:1028
-#: camlibs/sierra/sierra.c:1038 camlibs/sierra/sierra.c:1335
-#: camlibs/sierra/sierra.c:1538 camlibs/sierra/sierra.c:1547
-#: camlibs/sierra/sierra.c:1774
-msgid "Red-eye Reduction"
-msgstr "消红眼"
-
-# camlibs/sierra/sierra.c:890 camlibs/sierra/sierra.c:901
-# camlibs/sierra/sierra.c:1198 camlibs/sierra/sierra.c:1400
-# camlibs/sierra/sierra.c:1410 camlibs/sierra/sierra.c:1637
-#: camlibs/sierra/epson-desc.c:155 camlibs/sierra/sierra.c:1029
-#: camlibs/sierra/sierra.c:1040 camlibs/sierra/sierra.c:1337
-#: camlibs/sierra/sierra.c:1539 camlibs/sierra/sierra.c:1549
-#: camlibs/sierra/sierra.c:1776
-msgid "Slow Sync"
-msgstr "慢同步"
-
-# camlibs/polaroid/pdc700.c:161
-#: camlibs/sierra/epson-desc.c:160 camlibs/sierra/nikon-desc.c:243
-#: camlibs/sierra/olympus-desc.c:506 camlibs/sierra/olympus-desc.c:525
-#: camlibs/sierra/olympus-desc.c:546
-msgid "Flash Settings"
-msgstr "闪光灯设置"
-
-#: camlibs/sierra/epson-desc.c:193 camlibs/sierra/olympus-desc.c:709
-msgid "Host power save (seconds)"
-msgstr ""
-
-#: camlibs/sierra/epson-desc.c:209 camlibs/sierra/olympus-desc.c:694
-msgid "Camera power save (seconds)"
-msgstr "相机节能 (秒)"
-
-# camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
-# camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
-#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1116
-#: camlibs/sierra/sierra.c:1389 camlibs/sierra/sierra.c:1588
-#: camlibs/sierra/sierra.c:1801
-msgid "Lens Mode"
-msgstr "镜头模式"
-
-# camlibs/sierra/sierra.c:1545 camlibs/sierra/sierra.c:1554
-# camlibs/sierra/sierra.c:1731
-#: camlibs/sierra/epson-desc.c:233 camlibs/sierra/sierra.c:1684
-#: camlibs/sierra/sierra.c:1693 camlibs/sierra/sierra.c:1870
-msgid "Korean"
-msgstr "韩语"
-
-# camlibs/sierra/sierra.c:1546 camlibs/sierra/sierra.c:1556
-# camlibs/sierra/sierra.c:1733
-#: camlibs/sierra/epson-desc.c:234 camlibs/sierra/nikon-desc.c:419
-#: camlibs/sierra/sierra.c:1685 camlibs/sierra/sierra.c:1695
-#: camlibs/sierra/sierra.c:1872
-msgid "English"
-msgstr "英语"
-
-# camlibs/sierra/sierra.c:1547 camlibs/sierra/sierra.c:1558
-# camlibs/sierra/sierra.c:1735
-#: camlibs/sierra/epson-desc.c:235 camlibs/sierra/nikon-desc.c:420
-#: camlibs/sierra/sierra.c:1686 camlibs/sierra/sierra.c:1697
-#: camlibs/sierra/sierra.c:1874
-msgid "French"
-msgstr "法语"
-
-# camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1560
-# camlibs/sierra/sierra.c:1737
-#: camlibs/sierra/epson-desc.c:236 camlibs/sierra/nikon-desc.c:421
-#: camlibs/sierra/sierra.c:1687 camlibs/sierra/sierra.c:1699
-#: camlibs/sierra/sierra.c:1876
-msgid "German"
-msgstr "德语"
-
-# camlibs/sierra/sierra.c:1549 camlibs/sierra/sierra.c:1562
-# camlibs/sierra/sierra.c:1739
-#: camlibs/sierra/epson-desc.c:237 camlibs/sierra/sierra.c:1688
-#: camlibs/sierra/sierra.c:1701 camlibs/sierra/sierra.c:1878
-msgid "Italian"
-msgstr "意大利语"
-
-# camlibs/sierra/sierra.c:1550 camlibs/sierra/sierra.c:1564
-# camlibs/sierra/sierra.c:1741
-#: camlibs/sierra/epson-desc.c:238 camlibs/sierra/sierra.c:1689
-#: camlibs/sierra/sierra.c:1703 camlibs/sierra/sierra.c:1880
-msgid "Japanese"
-msgstr "日语"
-
-# camlibs/sierra/sierra.c:1551 camlibs/sierra/sierra.c:1566
-# camlibs/sierra/sierra.c:1743
-#: camlibs/sierra/epson-desc.c:239 camlibs/sierra/sierra.c:1690
-#: camlibs/sierra/sierra.c:1705 camlibs/sierra/sierra.c:1882
-msgid "Spanish"
-msgstr "西班牙语"
-
-# camlibs/sierra/sierra.c:1552 camlibs/sierra/sierra.c:1568
-# camlibs/sierra/sierra.c:1745
-#: camlibs/sierra/epson-desc.c:240 camlibs/sierra/sierra.c:1691
-#: camlibs/sierra/sierra.c:1707 camlibs/sierra/sierra.c:1884
-msgid "Portugese"
-msgstr "葡萄牙语"
-
-# camlibs/sierra/sierra.c:777 camlibs/sierra/sierra.c:1443
-#: camlibs/sierra/epson-desc.c:278 camlibs/sierra/nikon-desc.c:691
-#: camlibs/sierra/nikon-desc.c:702 camlibs/sierra/nikon-desc.c:713
-#: camlibs/sierra/olympus-desc.c:1013 camlibs/sierra/olympus-desc.c:1112
-#: camlibs/sierra/olympus-desc.c:1123 camlibs/sierra/olympus-desc.c:1133
-#: camlibs/sierra/sierra.c:915 camlibs/sierra/sierra.c:1582
-msgid "Picture Settings"
-msgstr "照片设置"
-
-#: camlibs/sierra/epson-desc.c:289
-msgid ""
-"Some notes about Epson cameras:\n"
-"- Some parameters are not controllable remotely:\n"
-"  * zoom\n"
-"  * focus\n"
-"  * custom white balance setup\n"
-"- Configuration has been reverse-engineered with\n"
-"  a PhotoPC 3000z, if your camera acts differently\n"
-"  please send a mail to the gphoto developer mailing list (in English)\n"
-msgstr ""
-
-# camlibs/konica/konica.c:80
-#: camlibs/sierra/library.c:147 camlibs/sierra/library.c:1373
-msgid "No memory card present"
-msgstr "未插内存卡"
-
-# camlibs/sierra/library.c:285
-#: camlibs/sierra/library.c:298
-msgid "Cannot retrieve the battery capacity"
-msgstr "无法检索电池容量"
-
-# camlibs/sierra/library.c:291
-#: camlibs/sierra/library.c:306
-#, c-format
-msgid ""
-"The battery level of the camera is too low (%d%%). The operation is aborted."
-msgstr "相机电量太低 (%d%%)。操作取消。"
-
-# camlibs/sierra/library.c:315
-#: camlibs/sierra/library.c:330
-msgid "Cannot retrieve the available memory left"
-msgstr "无法检索剩余可用内存"
-
-#: camlibs/sierra/library.c:385
-msgid "Camera refused 3 times to keep a connection open."
-msgstr "相机三次拒绝保持连接打开的请求。"
-
-# camlibs/sierra/library.c:502
-#: camlibs/sierra/library.c:610
-#, c-format
-msgid "The first byte received (0x%x) is not valid."
-msgstr "接收的第一个字节 (0x%x) 非法。"
-
-#: camlibs/sierra/library.c:732
-#, c-format
-msgid ""
-"Transmission of packet timed out even after %i retries. Please contact %s."
-msgstr "在 %i 次重试后包传输仍然超时。请联系 %s。"
-
-#: camlibs/sierra/library.c:766 camlibs/sierra/library.c:790
-msgid "Could not transmit packet even after several retries."
-msgstr "在几次重试后仍不能传输包。"
-
-#: camlibs/sierra/library.c:781
-#, c-format
-msgid "Packet was rejected by camera. Please contact %s."
-msgstr ""
-
-#: camlibs/sierra/library.c:808
-#, c-format
-msgid "Could not transmit packet (error code %i). Please contact %s."
-msgstr "无法传输包 (错误码 %i)。请联系 %s。"
-
-# camlibs/sierra/library.c:620
-#: camlibs/sierra/library.c:899
-msgid "Transmission timed out even after 2 retries. Giving up..."
-msgstr "在两次重试后传输仍然超时。放弃..."
-
-#: camlibs/sierra/library.c:918
-#, c-format
-msgid "Got unexpected result 0x%x. Please contact %s."
-msgstr "得到意外的结果 0x%x。请联系 %s。"
-
-#: camlibs/sierra/library.c:1017
-#, c-format
-msgid "Received unexpected answer (%i). Please contact %s."
-msgstr "收到意外的应答 (%i)。请联系 %s。"
-
-#: camlibs/sierra/library.c:1079
-#, c-format
-msgid "Could not get register %i. Please contact %s."
-msgstr "无法读取寄存器 %i。请联系 %s。"
-
-#: camlibs/sierra/library.c:1099 camlibs/sierra/library.c:1119
-msgid "Too many retries failed."
-msgstr "重试失败过多。"
-
-# camlibs/sierra/library.c:923
-#: camlibs/sierra/library.c:1159
-msgid "Sending data..."
-msgstr "正在发送数据..."
-
-#: camlibs/sierra/library.c:1218
-#, c-format
-msgid ""
-"recursive calls are not supported by the sierra driver! Please contact %s."
-msgstr "Sierra 驱动程序不支持递归调用！请联系 %s。"
-
-#: camlibs/sierra/library.c:1273
-#, c-format
-msgid "Could not get string register %i. Please contact %s."
-msgstr "无法读取字符串寄存器 %i。请联系 %s。"
-
-#: camlibs/sierra/library.c:1504
-#, c-format
-msgid "Expected 32 bytes, got %i. Please contact %s."
-msgstr "需要 32 字节，得到 %i。请连线 %s。"
-
-# camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
-#: camlibs/sierra/nikon-desc.c:162 camlibs/sierra/olympus-desc.c:361
-msgid "Shutter Speed microseconds (0 auto)"
-msgstr "快门速度 (微秒，0 表示自动)"
-
-# camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
-#: camlibs/sierra/nikon-desc.c:193 camlibs/sierra/olympus-desc.c:229
-#: camlibs/sierra/olympus-desc.c:283 camlibs/sierra/olympus-desc.c:343
-msgid "Shutter Speed (in seconds)"
-msgstr "快门速度 (秒)"
-
-#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/olympus-desc.c:481
-msgid "B/W"
-msgstr "黑/白"
-
-#: camlibs/sierra/nikon-desc.c:237 camlibs/sierra/olympus-desc.c:501
-#: camlibs/sierra/olympus-desc.c:518 camlibs/sierra/olympus-desc.c:537
-msgid "Anti-redeye"
-msgstr "防红眼"
-
-#: camlibs/sierra/nikon-desc.c:238
-msgid "Slow-sync"
-msgstr ""
-
-# camlibs/sierra/sierra.c:920 camlibs/sierra/sierra.c:930
-# camlibs/sierra/sierra.c:1218
-#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/sierra.c:1059
-#: camlibs/sierra/sierra.c:1069 camlibs/sierra/sierra.c:1357
-msgid "Contrast+"
-msgstr "对比度+"
-
-# camlibs/sierra/sierra.c:921 camlibs/sierra/sierra.c:932
-# camlibs/sierra/sierra.c:1220
-#: camlibs/sierra/nikon-desc.c:255 camlibs/sierra/sierra.c:1060
-#: camlibs/sierra/sierra.c:1071 camlibs/sierra/sierra.c:1359
-msgid "Contrast-"
-msgstr "对比度-"
-
-#: camlibs/sierra/nikon-desc.c:256
-msgid "Brightness+"
-msgstr "亮度+"
-
-#: camlibs/sierra/nikon-desc.c:257
-msgid "Brightness-"
-msgstr "亮度-"
-
-#: camlibs/sierra/nikon-desc.c:262
-msgid "Image Adjustment"
-msgstr "图像调整"
-
-#: camlibs/sierra/nikon-desc.c:306
-msgid "Blink"
-msgstr "闪烁"
-
-# camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
-# camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
-#: camlibs/sierra/nikon-desc.c:311
-msgid "LED Mode"
-msgstr "LED 模式"
-
-#: camlibs/sierra/nikon-desc.c:326
-msgid "Infinity"
-msgstr "无穷"
-
-#: camlibs/sierra/nikon-desc.c:362
-msgid "Preview Thumbnail"
-msgstr "上个缩略图"
-
-#: camlibs/sierra/nikon-desc.c:363
-msgid "Next"
-msgstr "下一个"
-
-#: camlibs/sierra/nikon-desc.c:364
-msgid "Previous"
-msgstr "上一个"
-
-# frontends/command-line/gphoto2-cmd-capture.c:218
-# libgphoto2/gphoto2-result.c:51
-#: camlibs/sierra/nikon-desc.c:378
-msgid "Operation Mode"
-msgstr "操作模式"
-
-# camlibs/sierra/sierra.c:1083 camlibs/sierra/sierra.c:1322
-#: camlibs/sierra/nikon-desc.c:392 camlibs/sierra/olympus-desc.c:680
-#: camlibs/sierra/sierra.c:1222 camlibs/sierra/sierra.c:1461
-msgid "LCD Brightness"
-msgstr "LCD 亮度"
-
-# camlibs/sierra/sierra.c:1093 camlibs/sierra/sierra.c:1331
-#: camlibs/sierra/nikon-desc.c:407 camlibs/sierra/olympus-desc.c:722
-msgid "LCD Auto Shut Off (seconds)"
-msgstr "LCD 自动关闭 (秒)"
-
-#: camlibs/sierra/nikon-desc.c:491
-msgid "Center-Weighted"
-msgstr ""
-
-#: camlibs/sierra/nikon-desc.c:493 camlibs/sierra/olympus-desc.c:776
-#: camlibs/sierra/olympus-desc.c:793
-msgid "Matrix"
-msgstr "矩阵"
-
-#: camlibs/sierra/nikon-desc.c:494
-msgid "Spot-AF"
-msgstr ""
-
-# camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/sierra/nikon-desc.c:499 camlibs/sierra/olympus-desc.c:781
-#: camlibs/sierra/olympus-desc.c:799
-msgid "Exposure Metering"
-msgstr "曝光测定"
-
-#: camlibs/sierra/nikon-desc.c:517 camlibs/sierra/olympus-desc.c:815
-#: camlibs/sierra/olympus-desc.c:831 camlibs/sierra/olympus-desc.c:847
-msgid "Zoom (in millimeters)"
-msgstr "缩放 (毫米)"
-
-#: camlibs/sierra/nikon-desc.c:543
-msgid "none"
-msgstr "无"
-
-#: camlibs/sierra/nikon-desc.c:546
-msgid "AE-lock"
-msgstr ""
-
-#: camlibs/sierra/nikon-desc.c:547
-msgid "Fisheye"
-msgstr "鱼眼"
-
-#: camlibs/sierra/nikon-desc.c:548
-msgid "Wide"
-msgstr ""
-
-#: camlibs/sierra/nikon-desc.c:558
-msgid "Misc exposure/lens settings"
-msgstr ""
-
-#: camlibs/sierra/nikon-desc.c:581
-msgid "Auto exposure lock"
-msgstr "自动曝光锁"
-
-#: camlibs/sierra/nikon-desc.c:724
-msgid ""
-"Nikon Coolpix 880:\n"
-"    Camera configuration (or preferences):\n"
-"\n"
-"        The optical zoom does not properly\n"
-"        function.\n"
-"\n"
-"        Not all configuration settings\n"
-"        can be properly read or written, for\n"
-"        example, the fine tuned setting of\n"
-"        white balance, and the language settings.\n"
-"\n"
-"        Put the camera in 'M' mode in order to\n"
-"        to set the shutter speed.\n"
-msgstr ""
-"尼康 Coolpix 880：\n"
-"    相机配置 (或首选项)：\n"
-"\n"
-"        光学缩放尚未正常\n"
-"        工作。\n"
-"\n"
-"\n"
-"        不是所有的配置信息\n"
-"        都能够正确读入或写出，\n"
-"        例如，微调白平衡，\n"
-"        和语言设置。\n"
-"\n"
-"        将相机设置为 'M' 模式\n"
-"        以便设置快门速度。\n"
-
-#: camlibs/sierra/nikon-desc.c:743
-msgid ""
-"Nikon Coolpix 995:\n"
-"    Camera configuration (preferences) for this\n"
-"    camera are incomplete, contact the gphoto\n"
-"    developer mailing list\n"
-"    if you would like to contribute to this\n"
-"    driver.\n"
-"\n"
-"    The download should function correctly.\n"
-msgstr ""
-
-#: camlibs/sierra/olympus-desc.c:483
-msgid "White board"
-msgstr "白板"
-
-#: camlibs/sierra/olympus-desc.c:484
-msgid "Black board"
-msgstr "黑板"
-
-#: camlibs/sierra/olympus-desc.c:489
-msgid "Color or Function Mode"
-msgstr "颜色或功能模式"
-
-#: camlibs/sierra/olympus-desc.c:519 camlibs/sierra/olympus-desc.c:538
-msgid "Slow"
-msgstr "慢"
-
-#: camlibs/sierra/olympus-desc.c:540
-msgid "Anti-redeye Fill"
-msgstr "防红眼填充"
-
-#: camlibs/sierra/olympus-desc.c:596
-msgid "Fluorescent-1-home-6700K"
-msgstr "Fluorescent-1-home-6700K"
-
-#: camlibs/sierra/olympus-desc.c:597
-msgid "Fluorescent-2-desk-5000K"
-msgstr "Fluorescent-2-desk-5000K"
-
-#: camlibs/sierra/olympus-desc.c:598
-msgid "Fluorescent-3-office-4200K"
-msgstr "Fluorescent-3-office-4200K"
-
-#: camlibs/sierra/olympus-desc.c:617
-msgid "Flourescent-1-home-6700K"
-msgstr "Flourescent-1-home-6700K"
-
-#: camlibs/sierra/olympus-desc.c:618
-msgid "Flourescent-2-desk-5000K"
-msgstr "Flourescent-2-desk-5000K"
-
-#: camlibs/sierra/olympus-desc.c:619
-msgid "Flourescent-3-office-4200K"
-msgstr "Flourescent-3-office-4200K"
-
-#: camlibs/sierra/olympus-desc.c:620
-msgid "Dusk"
-msgstr ""
-
-#: camlibs/sierra/olympus-desc.c:659
-msgid "Monitor"
-msgstr "监视器"
-
-# camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
-# camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
-#: camlibs/sierra/olympus-desc.c:665
-msgid "LCD Mode"
-msgstr "LCD 模式"
-
-#: camlibs/sierra/olympus-desc.c:792
-msgid "ESP"
-msgstr "ESP"
-
-#: camlibs/sierra/olympus-desc.c:864
-msgid "Digital zoom"
-msgstr "数字缩放"
-
-#: camlibs/sierra/olympus-desc.c:915 camlibs/sierra/olympus-desc.c:931
-msgid "Focus position"
-msgstr "聚焦位置"
-
-# camlibs/konica/library.c:729 camlibs/konica/library.c:960
-#: camlibs/sierra/olympus-desc.c:948
-msgid "Time format"
-msgstr "时间格式"
-
-#: camlibs/sierra/olympus-desc.c:1147
-msgid ""
-"Some notes about Olympus cameras:\n"
-"(1) Camera Configuration:\n"
-"    A zero value will take the default one (auto).\n"
-"(2) Olympus C-3040Z (and possibly also the C-2040Z\n"
-"    and others) have a USB PC Control mode. To switch\n"
-"    into 'USB PC control mode', turn on the camera, open\n"
-"    the memory card access door and then press and\n"
-"    hold both of the menu and LCD buttons until the\n"
-"    camera control menu appears. Set it to ON.\n"
-"(3) If you switch the 'LCD mode' to 'Monitor' or\n"
-"    'Normal', don't forget to switch it back to 'Off'\n"
-"    before disconnecting. Otherwise you can't use\n"
-"    the camera buttons. If you end up in this\n"
-"    state, you should reconnect the camera to the\n"
-"    PC, then switch LCD to 'Off'."
-msgstr ""
-
-#: camlibs/sierra/olympus-desc.c:1166
-msgid ""
-"Olympus 750 Ultra Zoom:\n"
-"(1) Olympus 750UZ has a USB PC Control mode. To switch\n"
-"    into 'USB PC control mode', turn on the camera, open\n"
-"    the memory card access door and then press and\n"
-"    hold both the 'OK' and 'quickview' buttons until the\n"
-"    camera control menu appears. Set it to control mode.\n"
-"(2) If you switch the 'LCD mode' to 'Monitor' or\n"
-"    'Normal', don't forget to switch it back to 'Off'\n"
-"    before disconnecting. Otherwise you can't use\n"
-"    the camera buttons. If you end up in this\n"
-"    state, you should reconnect the camera to the\n"
-"    PC, then switch LCD to 'Off'."
-msgstr ""
-
-#: camlibs/sierra/olympus-desc.c:1182
-msgid ""
-"Default sierra driver:\n"
-"\n"
-"    This is the default sierra driver, it\n"
-"    should be capable of supporting the download\n"
-"    and browsing of pictures on your camera.\n"
-"\n"
-"    Camera configuration (or preferences)\n"
-"    settings are based on the Olympus 3040,\n"
-"    and are likely incomplete. If you verify\n"
-"    that the configuration settings are\n"
-"    complete for your camera, or can contribute\n"
-"    code to support complete configuration,\n"
-"    please contact the developer mailing list.\n"
-msgstr ""
-
-# camlibs/sierra/sierra.c:635
-#: camlibs/sierra/sierra.c:772 camlibs/soundvision/soundvision.c:411
-msgid "The file to be uploaded has a null length"
-msgstr "要上载的文件具有空长度"
-
-# camlibs/sierra/sierra.c:649
-#: camlibs/sierra/sierra.c:786
-msgid "Not enough memory available on the memory card"
-msgstr "内存卡上没有足够的内存"
-
-# camlibs/sierra/sierra.c:656
-#: camlibs/sierra/sierra.c:793
-msgid "Cannot retrieve the name of the folder containing the pictures"
-msgstr "无法检索含有照片的文件夹名称"
-
-# camlibs/sierra/sierra.c:663
-#: camlibs/sierra/sierra.c:800
-#, c-format
-msgid "Upload is supported into the '%s' folder only"
-msgstr "只支持上载到文件夹“%s”"
-
-# camlibs/sierra/sierra.c:790 camlibs/sierra/sierra.c:799
-# camlibs/sierra/sierra.c:1127
-#: camlibs/sierra/sierra.c:928 camlibs/sierra/sierra.c:937
-#: camlibs/sierra/sierra.c:1266
-msgid "Best"
-msgstr "最佳"
-
-# camlibs/sierra/sierra.c:802 camlibs/sierra/sierra.c:842
-# camlibs/sierra/sierra.c:874 camlibs/sierra/sierra.c:904
-# camlibs/sierra/sierra.c:935 camlibs/sierra/sierra.c:966
-# camlibs/sierra/sierra.c:990 camlibs/sierra/sierra.c:1012
-# camlibs/sierra/sierra.c:1041 camlibs/sierra/sierra.c:1385
-# camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1436
-# camlibs/sierra/sierra.c:1458 camlibs/sierra/sierra.c:1484
-# camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1571
-#: camlibs/sierra/sierra.c:940 camlibs/sierra/sierra.c:980
-#: camlibs/sierra/sierra.c:1013 camlibs/sierra/sierra.c:1043
-#: camlibs/sierra/sierra.c:1074 camlibs/sierra/sierra.c:1105
-#: camlibs/sierra/sierra.c:1129 camlibs/sierra/sierra.c:1151
-#: camlibs/sierra/sierra.c:1180 camlibs/sierra/sierra.c:1524
-#: camlibs/sierra/sierra.c:1552 camlibs/sierra/sierra.c:1575
-#: camlibs/sierra/sierra.c:1597 camlibs/sierra/sierra.c:1623
-#: camlibs/sierra/sierra.c:1642 camlibs/sierra/sierra.c:1710
-#, c-format
-msgid "%i (unknown)"
-msgstr "%i (未知)"
-
-# camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
-#: camlibs/sierra/sierra.c:952 camlibs/sierra/sierra.c:1276
-msgid "Shutter Speed (microseconds, 0 auto)"
-msgstr "快门速度 (微秒，0 表示自动)"
-
-# camlibs/sierra/sierra.c:857 camlibs/sierra/sierra.c:865
-# camlibs/sierra/sierra.c:1171
-#: camlibs/sierra/sierra.c:996 camlibs/sierra/sierra.c:1004
-#: camlibs/sierra/sierra.c:1310
-msgid "Black/White"
-msgstr "黑白"
-
-# camlibs/sierra/sierra.c:859 camlibs/sierra/sierra.c:869
-# camlibs/sierra/sierra.c:1175
-#: camlibs/sierra/sierra.c:998 camlibs/sierra/sierra.c:1008
-#: camlibs/sierra/sierra.c:1314
-msgid "White Board"
-msgstr "白板"
-
-# camlibs/sierra/sierra.c:860 camlibs/sierra/sierra.c:871
-# camlibs/sierra/sierra.c:1177
-#: camlibs/sierra/sierra.c:999 camlibs/sierra/sierra.c:1010
-#: camlibs/sierra/sierra.c:1316
-msgid "Black Board"
-msgstr "黑板"
-
-# camlibs/sierra/sierra.c:915 camlibs/sierra/sierra.c:1208
-#: camlibs/sierra/sierra.c:1054 camlibs/sierra/sierra.c:1347
-msgid "Brightness/Contrast"
-msgstr "亮度/对比度"
-
-# camlibs/sierra/sierra.c:918 camlibs/sierra/sierra.c:926
-# camlibs/sierra/sierra.c:1214
-#: camlibs/sierra/sierra.c:1057 camlibs/sierra/sierra.c:1065
-#: camlibs/sierra/sierra.c:1353
-msgid "Bright+"
-msgstr "亮度+"
-
-# camlibs/sierra/sierra.c:919 camlibs/sierra/sierra.c:928
-# camlibs/sierra/sierra.c:1216
-#: camlibs/sierra/sierra.c:1058 camlibs/sierra/sierra.c:1067
-#: camlibs/sierra/sierra.c:1355
-msgid "Bright-"
-msgstr "亮度-"
-
-# camlibs/sierra/sierra.c:948 camlibs/sierra/sierra.c:956
-# camlibs/sierra/sierra.c:1235
-#: camlibs/sierra/sierra.c:1087 camlibs/sierra/sierra.c:1095
-#: camlibs/sierra/sierra.c:1374
-msgid "Skylight"
-msgstr "日光"
-
-# camlibs/sierra/sierra.c:980 camlibs/sierra/sierra.c:987
-# camlibs/sierra/sierra.c:1258
-#: camlibs/sierra/sierra.c:1119 camlibs/sierra/sierra.c:1126
-#: camlibs/sierra/sierra.c:1397
-msgid "Infinity/Fish-eye"
-msgstr "无限/鱼眼"
-
-# camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1268
-#: camlibs/sierra/sierra.c:1140 camlibs/sierra/sierra.c:1407
-msgid "Spot Metering Mode"
-msgstr "场景测量模式"
-
-# camlibs/sierra/sierra.c:1024 camlibs/sierra/sierra.c:1030
-#: camlibs/sierra/sierra.c:1163 camlibs/sierra/sierra.c:1169
-msgid "1x"
-msgstr "1x"
-
-# camlibs/sierra/sierra.c:1025 camlibs/sierra/sierra.c:1035
-#: camlibs/sierra/sierra.c:1164 camlibs/sierra/sierra.c:1174
-msgid "1.6x"
-msgstr "1.6x"
-
-# camlibs/sierra/sierra.c:1027 camlibs/sierra/sierra.c:1038
-#: camlibs/sierra/sierra.c:1166 camlibs/sierra/sierra.c:1177
-msgid "2.5x"
-msgstr "2.5x"
-
-# camlibs/sierra/sierra.c:1055 camlibs/sierra/sierra.c:1302
-# camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1709
-#: camlibs/sierra/sierra.c:1194 camlibs/sierra/sierra.c:1441
-#: camlibs/sierra/sierra.c:1656 camlibs/sierra/sierra.c:1848
-msgid "Auto Off (host) (in seconds)"
-msgstr "自动关机 (连接) (秒)"
-
-# camlibs/sierra/sierra.c:1057 camlibs/sierra/sierra.c:1519
-#: camlibs/sierra/sierra.c:1196 camlibs/sierra/sierra.c:1658
-msgid ""
-"How long will it take until the camera powers off when connected to the "
-"computer?"
-msgstr "在相机连接到计算机以后，须等待多长时间再自动关机？"
-
-# camlibs/sierra/sierra.c:1069 camlibs/sierra/sierra.c:1312
-# camlibs/sierra/sierra.c:1531 camlibs/sierra/sierra.c:1719
-#: camlibs/sierra/sierra.c:1208 camlibs/sierra/sierra.c:1451
-#: camlibs/sierra/sierra.c:1670 camlibs/sierra/sierra.c:1858
-msgid "Auto Off (field) (in seconds)"
-msgstr "自动关机 (未连接) (秒)"
-
-# camlibs/sierra/sierra.c:1071 camlibs/sierra/sierra.c:1533
-#: camlibs/sierra/sierra.c:1210 camlibs/sierra/sierra.c:1672
-msgid ""
-"How long will it take until the camera powers off when not connected to the "
-"computer?"
-msgstr "在未连接到计算机时，须等待多长时间再自动关机？"
-
-# camlibs/sierra/sierra.c:1093 camlibs/sierra/sierra.c:1331
-#: camlibs/sierra/sierra.c:1232 camlibs/sierra/sierra.c:1470
-msgid "LCD Auto Off (in seconds)"
-msgstr "LCD 自动关闭 (以秒为单位)"
-
-# camlibs/sierra/sierra.c:1355
-#: camlibs/sierra/sierra.c:1494
-msgid "Shot Settings"
-msgstr "拍摄设置"
-
-# camlibs/sierra/sierra.c:1362 camlibs/sierra/sierra.c:1370
-# camlibs/sierra/sierra.c:1605
-#: camlibs/sierra/sierra.c:1501 camlibs/sierra/sierra.c:1509
-#: camlibs/sierra/sierra.c:1744
-msgid "F2"
-msgstr "F2"
-
-# camlibs/sierra/sierra.c:1363 camlibs/sierra/sierra.c:1372
-# camlibs/sierra/sierra.c:1607
-#: camlibs/sierra/sierra.c:1502 camlibs/sierra/sierra.c:1511
-#: camlibs/sierra/sierra.c:1746
-msgid "F2.3"
-msgstr "F2.3"
-
-# camlibs/sierra/sierra.c:1364 camlibs/sierra/sierra.c:1374
-# camlibs/sierra/sierra.c:1609
-#: camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1513
-#: camlibs/sierra/sierra.c:1748
-msgid "F2.8"
-msgstr "F2.8"
-
-# camlibs/sierra/sierra.c:1365 camlibs/sierra/sierra.c:1376
-# camlibs/sierra/sierra.c:1611
-#: camlibs/sierra/sierra.c:1504 camlibs/sierra/sierra.c:1515
-#: camlibs/sierra/sierra.c:1750
-msgid "F4"
-msgstr "F4"
-
-# camlibs/sierra/sierra.c:1366 camlibs/sierra/sierra.c:1378
-# camlibs/sierra/sierra.c:1613
-#: camlibs/sierra/sierra.c:1505 camlibs/sierra/sierra.c:1517
-#: camlibs/sierra/sierra.c:1752
-msgid "F5.6"
-msgstr "F5.6"
-
-# camlibs/sierra/sierra.c:1367 camlibs/sierra/sierra.c:1380
-# camlibs/sierra/sierra.c:1615
-#: camlibs/sierra/sierra.c:1506 camlibs/sierra/sierra.c:1519
-#: camlibs/sierra/sierra.c:1754
-msgid "F8"
-msgstr "F8"
-
-#: camlibs/sierra/sierra.c:1608 camlibs/sierra/sierra.c:1614
-#: camlibs/sierra/sierra.c:1819
-msgid "standard"
-msgstr "标准"
-
-# camlibs/sierra/sierra.c:1472 camlibs/sierra/sierra.c:1481
-# camlibs/sierra/sierra.c:1686
-#: camlibs/sierra/sierra.c:1611 camlibs/sierra/sierra.c:1620
-#: camlibs/sierra/sierra.c:1825
-msgid "HyPict"
-msgstr "合成照片"
-
-# camlibs/sierra/sierra.c:1495 camlibs/sierra/sierra.c:1498
-# camlibs/sierra/sierra.c:1698
-#: camlibs/sierra/sierra.c:1634 camlibs/sierra/sierra.c:1637
-#: camlibs/sierra/sierra.c:1837
-msgid "color"
-msgstr "彩色"
-
-# camlibs/sierra/sierra.c:1496 camlibs/sierra/sierra.c:1500
-# camlibs/sierra/sierra.c:1700
-#: camlibs/sierra/sierra.c:1635 camlibs/sierra/sierra.c:1639
-#: camlibs/sierra/sierra.c:1839
-msgid "black & white"
-msgstr "黑白"
-
-#: camlibs/sierra/sierra.c:1941
-msgid "Note: no memory card present, some values may be invalid\n"
-msgstr "注意：没有内存卡，有些值可能是无效的\n"
-
-#: camlibs/sierra/sierra.c:1949
-#, c-format
-msgid "Camera Model: %s\n"
-msgstr "相机模型：%s\n"
-
-#: camlibs/sierra/sierra.c:1955
-#, c-format
-msgid "Serial Number: %s\n"
-msgstr "序列号：%s\n"
-
-#: camlibs/sierra/sierra.c:1957
-#, c-format
-msgid "Software Rev.: %s\n"
-msgstr "软件版本：%s\n"
-
-#: camlibs/sierra/sierra.c:1962 camlibs/sierra/sierra.c:1965
-#, c-format
-msgid "Frames Taken: %i\n"
-msgstr ""
-
-#: camlibs/sierra/sierra.c:1968
-#, c-format
-msgid "Frames Left: %i\n"
-msgstr ""
-
-#: camlibs/sierra/sierra.c:1970
-#, c-format
-msgid "Battery Life: %i\n"
-msgstr "电池寿命：%i\n"
-
-#: camlibs/sierra/sierra.c:1972
-#, c-format
-msgid "Memory Left: %i bytes\n"
-msgstr "剩余内存：%i 字节\n"
-
-#: camlibs/sierra/sierra.c:1977
-#, c-format
-msgid "Date: %s"
-msgstr "日期：%s"
-
-#: camlibs/sierra/sierra.c:2037
-msgid "No camera manual available.\n"
-msgstr "没有可用的相机手册。\n"
-
-#: camlibs/sierra/sierra.c:2044
-#, c-format
-msgid ""
-"Some notes about Epson cameras:\n"
-"- Some parameters are not controllable remotely:\n"
-"  * zoom\n"
-"  * focus\n"
-"  * custom white balance setup\n"
-"- Configuration has been reverse-engineered with\n"
-"  a PhotoPC 3000z, if your camera acts differently\n"
-"  please send a mail to %s (in English)\n"
-msgstr ""
-"关于爱普生相机的一些事项：\n"
-"- 有些参数无法远程控制：\n"
-"  * 缩放\n"
-"  * 聚焦\n"
-"  * 自定义白平衡设置\n"
-"- 配置是通过对 PhotoPC 3000z 进行反向工程\n"
-"  而得到的。如果您的相机与此不同，请向 \n"
-"  %s 发送电子邮件 (用英语)\n"
-
-#: camlibs/sierra/sierra.c:2056
-msgid ""
-"Some notes about Olympus cameras (and others?):\n"
-"(1) Camera Configuration:\n"
-"    A value of 0 will take the default one (auto).\n"
-"(2) Olympus C-3040Z (and possibly also the C-2040Z\n"
-"    and others) have a USB PC Control mode. To switch\n"
-"    to this mode, turn on the camera, open\n"
-"    the memory card access door and then press and\n"
-"    hold both of the menu and LCD buttons until the\n"
-"    camera control menu appears. Set it to ON.\n"
-"(3) If you switch the 'LCD mode' to 'Monitor' or\n"
-"    'Normal', don't forget to switch it back to 'Off'\n"
-"    before disconnecting. Otherwise you cannot use\n"
-"    the camera's buttons. If you end up in this\n"
-"    state, you should reconnect the camera to the\n"
-"    PC and switch LCD to 'Off'."
-msgstr ""
-
-#: camlibs/sierra/sierra.c:2083
-msgid ""
-"sierra SPARClite library\n"
-"Scott Fritzinger <scottf@unr.edu>\n"
-"Support for sierra-based digital cameras\n"
-"including Olympus, Nikon, Epson, and Pentax.\n"
-"\n"
-"Thanks to Data Engines (www.dataengines.com)\n"
-"for the use of their Olympus C-3030Z for USB\n"
-"support implementation."
-msgstr ""
-
-# camlibs/sierra/sierra.c:802 camlibs/sierra/sierra.c:842
-# camlibs/sierra/sierra.c:874 camlibs/sierra/sierra.c:904
-# camlibs/sierra/sierra.c:935 camlibs/sierra/sierra.c:966
-# camlibs/sierra/sierra.c:990 camlibs/sierra/sierra.c:1012
-# camlibs/sierra/sierra.c:1041 camlibs/sierra/sierra.c:1385
-# camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1436
-# camlibs/sierra/sierra.c:1458 camlibs/sierra/sierra.c:1484
-# camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1571
-#: camlibs/sierra/sierra-desc.c:186
-#, c-format
-msgid "%lld (unknown)"
-msgstr "%lld (未知)"
-
-#: camlibs/sipix/blink.c:872
-msgid ""
-"Sipix StyleCam Blink Driver\n"
-"Vincent Sanders <vince@kyllikki.org>\n"
-"Marcus Meissner <marcus@jet.franken.de>.\n"
-msgstr ""
-"Sipix StyleCam Blink 驱动程序\n"
-"Vincent Sanders <vince@kyllikki.org>\n"
-"Marcus Meissner <marcus@jet.franken.de>.\n"
-
-# camlibs/canon/usb.c:215
-#: camlibs/sipix/blink.c:993 camlibs/stv0674/stv0674.c:256
-msgid "Could not apply USB settings"
-msgstr "无法应用 USB 设置"
-
-#: camlibs/sipix/web2.c:629
-msgid ""
-"SiPix Web2\n"
-"Marcus Meissner <marcus@jet.franken.de>\n"
-"Driver for accessing the SiPix Web2 camera."
-msgstr ""
-"SiPix Web2\n"
-"Marcus Meissner <marcus@jet.franken.de>\n"
-"用于访问 SiPix Web2 相机的驱动程序。"
-
-#: camlibs/smal/smal.c:167
-msgid ""
-"Smal Ultrapocket\n"
-"Lee Benfield <lee@benf.org>\n"
-"Driver for accessing the Smal Ultrapocket camera, and OEM versions (slimshot)"
-msgstr ""
-
-#: camlibs/sonix/library.c:120
-#, c-format
-msgid ""
-"Sonix camera.\n"
-"There is %i photo in it.\n"
-msgid_plural ""
-"Sonix camera.\n"
-"There are %i photos in it.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: camlibs/sonix/library.c:131
-msgid ""
-"This driver supports some cameras that use the Sonix sn9c2028 chip.\n"
-"The following operations are supported:\n"
-"   - thumbnails for a GUI frontend\n"
-"   - full images in PPM format\n"
-"   - delete all images\n"
-"   - delete last image (not all of the Sonix cameras can do this)\n"
-"   - image capture to camera (\t\tditto\t\t)\n"
-"If present on the camera, video clip frames are downloaded \n"
-"as consecutive still photos or as AVI files, depending on the model.\n"
-"Thumbnails for AVIs are still photos made from the first frame.\n"
-"A single image cannot be deleted unless it is the last one.\n"
-msgstr ""
-
-#: camlibs/sonix/library.c:149
-msgid ""
-"Sonix camera library\n"
-"Theodore Kilgore <kilgota@auburn.edu>\n"
-msgstr ""
-
-# camlibs/sonydscf1/sonydscf1.c:133
-#: camlibs/sonydscf1/sonydscf1.c:562
-msgid ""
-"Sony DSC-F1 Digital Camera Support\n"
-"M. Adam Kendall <joker@penguinpub.com>\n"
-"Based on the chotplay CLI interface from\n"
-"Ken-ichi Hayashi\n"
-"Gphoto2 port by Bart van Leeuwen <bart@netage.nl>"
-msgstr ""
-"索尼 DSC-F1 数码相机支持\n"
-"M. Adam Kendall <joker@penguinpub.com>\n"
-"基于 chotplay CLI 界面。该界面来自于\n"
-"Ken-ichi Hayashi\n"
-"由 Bart van Leeuwen <bart@netage.nl> 移植到 gphoto2"
-
-# camlibs/sonydscf55/camera.c:91
-#: camlibs/sonydscf55/camera.c:102
-msgid ""
-"Sony DSC-F55/505 gPhoto library\n"
-"Supports Sony MSAC-SR1 and Memory Stick used by DCR-PC100\n"
-"Originally written by Mark Davies <mdavies@dial.pipex.com>\n"
-"gPhoto2 port by Raymond Penners <raymond@dotsphinx.com>"
-msgstr ""
-"索尼 DSC-F55/505 gPhoto 库\n"
-"支持 索尼 MSAC-SR1 和 DCR-PC100 使用的存储体\n"
-"最初由 Mark Davies <mdavies@dial.pipex.com> 编写\n"
-"由 Raymond Penners <raymond@dotsphinx.com> 移植到 gphoto2"
-
-#: camlibs/soundvision/soundvision.c:317
-#, c-format
-msgid ""
-"Firmware Revision: %8s\n"
-"Pictures:     %i\n"
-"Memory Total: %ikB\n"
-"Memory Free:  %ikB\n"
-msgstr ""
-
-#: camlibs/soundvision/soundvision.c:325
-#, c-format
-msgid "Firmware Revision: %8s"
-msgstr "固件版本：%8s"
-
-# camlibs/agfa/agfa.c:228
-#: camlibs/soundvision/soundvision.c:333
-msgid ""
-"Soundvision Driver\n"
-"Vince Weaver <vince@deater.net>\n"
-msgstr ""
-"Soundvision 驱动程序\n"
-"Vince Weaver <vince@deater.net>\n"
-
-#: camlibs/spca50x/library.c:269
-#, c-format
-msgid ""
-"FLASH:\n"
-" Files: %d\n"
-msgstr ""
-
-#: camlibs/spca50x/library.c:278
-#, c-format
-msgid ""
-"SDRAM:\n"
-" Files: %d\n"
-"  Images: %4d\n"
-"  Movies: %4d\n"
-"Space used: %8d\n"
-"Space free: %8d\n"
-msgstr ""
-"SDRAM：\n"
-" 文件：%d\n"
-"  图像：%4d\n"
-"  电影：%4d\n"
-"使用的空间：%8d\n"
-"剩余的空间：%8d\n"
-
-#: camlibs/spca50x/library.c:294
-msgid "spca50x library v"
-msgstr ""
-
-#: camlibs/sq905/library.c:128
-#, c-format
-msgid ""
-"Your USB camera has a S&Q chipset.\n"
-"The total number of pictures taken is %i\n"
-"Some of these could be clips containing\n"
-"several frames\n"
-msgstr ""
-
-#: camlibs/sq905/library.c:142
-msgid ""
-"For cameras with S&Q Technologies chip.\n"
-"Should work with gtkam. Photos will be saved in PPM format.\n"
-"\n"
-"All known S&Q cameras have two resolution settings. What\n"
-"those are, will depend on your particular camera.\n"
-"A few of these cameras allow deletion of all photos. Most do not.\n"
-"Uploading of data to the camera is not supported.\n"
-"The photo compression mode found on many of the S&Q\n"
-"cameras is supported, to some extent.\n"
-"If present on the camera, video clips are seen as subfolders.\n"
-"Gtkam will download these separately. When clips are present\n"
-"on the camera, there is a little triangle before the name of\n"
-"the camera. If no folders are listed, click on the little \n"
-"triangle to make them appear. Click on a folder to enter it\n"
-"and see the frames in it, or to download them. The frames will\n"
-"be downloaded as separate photos, with special names which\n"
-"specify from which clip they came. Thus, you may freely \n"
-"choose to save clip frames in separate directories. or not.\n"
-msgstr ""
-
-#: camlibs/sq905/library.c:170
-msgid ""
-"sq905 generic driver\n"
-"Theodore Kilgore <kilgota@auburn.edu>\n"
-msgstr ""
-
-#: camlibs/st2205/library.c:81
-#, c-format
-msgid "Your USB picture frame has a ST2205 chipset\n"
-msgstr ""
-
-#: camlibs/st2205/library.c:90
-msgid ""
-"ST2205 based picture frames come with a variety of resolutions.\n"
-"The gphoto driver for these devices allows you to download,\n"
-"upload and delete pictures from the picture frame."
-msgstr ""
-
-#: camlibs/st2205/library.c:103
-msgid ""
-"ST2205 USB picture frame driver\n"
-"Hans de Goede <hdegoede@redhat.com>\n"
-"This driver allows you to download, upload and delete pictures\n"
-"from the picture frame."
-msgstr ""
-
-#: camlibs/st2205/library.c:550 camlibs/st2205/library.c:574
-msgid "Orientation"
-msgstr ""
-
-#: camlibs/stv0674/stv0674.c:203
-msgid ""
-"STV0674\n"
-"Vincent Sanders <vince@kyllikki.org>\n"
-"Driver for cameras using the STV0674 processor ASIC.\n"
-"Protocol reverse engineered using SnoopyPro\n"
-msgstr ""
-
-# camlibs/stv0680/library.c:356 camlibs/stv0680/library.c:390
-#: camlibs/stv0680/library.c:360 camlibs/stv0680/library.c:394
-msgid "Bad exposure (not enough light probably)"
-msgstr "曝光失败 (可能是没有充足的光线)"
-
-#: camlibs/stv0680/library.c:524
-msgid "Information on STV0680-based camera:\n"
-msgstr ""
-
-# camlibs/stv0680/library.c:525
-#: camlibs/stv0680/library.c:529
-#, c-format
-msgid "Firmware Revision: %d.%d\n"
-msgstr "固件版本：%d.%d\n"
-
-# camlibs/stv0680/library.c:529
-#: camlibs/stv0680/library.c:533
-#, c-format
-msgid "ASIC Revision: %d.%d\n"
-msgstr "专用集成电路版本：%d.%d\n"
-
-# camlibs/stv0680/library.c:533
-#: camlibs/stv0680/library.c:537
-#, c-format
-msgid "Sensor ID: %d.%d\n"
-msgstr "感应器 ID：%d.%d\n"
-
-#: camlibs/stv0680/library.c:543
-#, c-format
-msgid "Camera is configured for lights flickering by %dHz.\n"
-msgstr ""
-
-# camlibs/stv0680/library.c:542
-#: camlibs/stv0680/library.c:546
-#, c-format
-msgid "Memory in camera: %d Mbit.\n"
-msgstr "相机内置内存：%d 兆位。\n"
-
-# camlibs/stv0680/library.c:546
-#: camlibs/stv0680/library.c:550
-msgid "Camera supports Thumbnails.\n"
-msgstr "相机支持缩略图。\n"
-
-# camlibs/stv0680/library.c:548
-#: camlibs/stv0680/library.c:552
-msgid "Camera supports Video.\n"
-msgstr "相机支持视频。\n"
-
-# camlibs/stv0680/library.c:551
-#: camlibs/stv0680/library.c:555
-msgid "Camera pictures are monochrome.\n"
-msgstr "相机照片为黑白照片。\n"
-
-# camlibs/stv0680/library.c:553
-#: camlibs/stv0680/library.c:557
-msgid "Camera has memory.\n"
-msgstr "相机有内存。\n"
-
-# camlibs/stv0680/library.c:555
-#: camlibs/stv0680/library.c:559
-msgid "Camera supports videoformats: "
-msgstr "相机支持的视频格式： "
-
-# camlibs/stv0680/library.c:561
-#: camlibs/stv0680/library.c:565
-#, c-format
-msgid "Vendor ID: %02x%02x\n"
-msgstr "厂家 ID：%02x%02x\n"
-
-# camlibs/stv0680/library.c:565
-#: camlibs/stv0680/library.c:569
-#, c-format
-msgid "Product ID: %02x%02x\n"
-msgstr "产品 ID：%02x%02x\n"
-
-# camlibs/stv0680/library.c:572
-#: camlibs/stv0680/library.c:576
-#, c-format
-msgid "Number of Images: %d\n"
-msgstr "图像数量：%d\n"
-
-# camlibs/stv0680/library.c:575
-#: camlibs/stv0680/library.c:579
-#, c-format
-msgid "Maximum number of Images: %d\n"
-msgstr "最大图像数量：%d\n"
-
-# camlibs/stv0680/library.c:578
-#: camlibs/stv0680/library.c:582
-#, c-format
-msgid "Image width: %d\n"
-msgstr "图像宽度：%d\n"
-
-# camlibs/stv0680/library.c:581
-#: camlibs/stv0680/library.c:585
-#, c-format
-msgid "Image height: %d\n"
-msgstr "图像高度：%d\n"
-
-# camlibs/stv0680/library.c:584
-#: camlibs/stv0680/library.c:588
-#, c-format
-msgid "Image size: %d\n"
-msgstr "图像大小：%d\n"
-
-# camlibs/stv0680/library.c:588
-#: camlibs/stv0680/library.c:592
-#, c-format
-msgid "Thumbnail width: %d\n"
-msgstr "缩略图宽度：%d\n"
-
-# camlibs/stv0680/library.c:589
-#: camlibs/stv0680/library.c:593
-#, c-format
-msgid "Thumbnail height: %d\n"
-msgstr "缩略图高度：%d\n"
-
-# camlibs/stv0680/library.c:590
-#: camlibs/stv0680/library.c:594
-#, c-format
-msgid "Thumbnail size: %d\n"
-msgstr "缩略图大小：%d\n"
-
-# camlibs/stv0680/stv0680.c:258
-#: camlibs/stv0680/stv0680.c:272
-msgid ""
-"STV0680\n"
-"Adam Harrison <adam@antispin.org>\n"
-"Driver for cameras using the STV0680 processor ASIC.\n"
-"Protocol reverse engineered using CommLite Beta 5\n"
-"Carsten Weinholz <c.weinholz@netcologne.de>\n"
-"Extended for Aiptek PenCam and other STM USB Dual-mode cameras."
-msgstr ""
-"STV0680\n"
-"Adam Harrison <adam@antispin.org>\n"
-"使用 STV0680 处理器专用芯片的相机驱动程序。\n"
-"使用 CommLite Beta 5 对协议进行反向工程\n"
-"Carsten Weinholz <c.weinholz@netcologne.de>\n"
-"为 Aiptek PenCam 和其它 STM USB 双模式相机进行了扩展。"
-
-# camlibs/konica/library.c:617
-#: camlibs/sx330z/library.c:139
-#, c-format
-msgid "Getting information on %i files..."
-msgstr "正在获取第 %i 个文件的信息..."
-
-#: camlibs/sx330z/library.c:243
-msgid ""
-"(Traveler) SX330z Library (And other Aldi-cams).\n"
-"Even other Vendors like Jenoptik, Skanhex, Maginon should work.\n"
-"Please send bugreports and comments.\n"
-"Dominik Kuhlen <kinimod@users.sourceforge.net>\n"
-msgstr ""
-
-#: camlibs/sx330z/library.c:286
-msgid "sx330z is USB only"
-msgstr "sx330z 只支持 USB"
-
-#: camlibs/topfield/puppy.c:540
-msgid "Driver Settings"
-msgstr ""
-
-#: camlibs/topfield/puppy.c:544
-msgid "Turbo mode"
-msgstr ""
-
-#: camlibs/topfield/puppy.c:599
-msgid ""
-"Topfield TF5000PVR\n"
-"Marcus Meissner <marcus@jet.franken.de>\n"
-"Library to download / upload files from a Topfield PVR.\n"
-"Ported from puppy (c) Peter Urbanec <toppy at urbanec.net>\n"
-msgstr ""
-
-#: camlibs/topfield/puppy.c:646
-#, c-format
-msgid "Downloading %s..."
-msgstr ""
-
-#: camlibs/toshiba/pdrm11/library.c:120
-msgid ""
-"Toshiba\n"
-"David Hogue <david@jawa.gotdns.org>\n"
-"Toshiba pdr-m11 driver.\n"
-msgstr ""
-"东芝\n"
-"David Hogue <david@jawa.gotdns.org>\n"
-"东芝 pdr-m11 驱动。\n"
-
-#: libgphoto2/gphoto2-abilities-list.c:201
-msgid "Internal error looking for camlibs. (path names too long?)"
-msgstr "寻找 camlibs 时出现内部错误。(路径名称是否太长？)"
-
-# libgphoto2/gphoto2-abilities-list.c:260
-#: libgphoto2/gphoto2-abilities-list.c:215
-#, c-format
-msgid "Loading camera drivers from '%s'..."
-msgstr "正在从“%s”装入相机驱动程序..."
-
-# libgphoto2/gphoto2-abilities-list.c:622
-#: libgphoto2/gphoto2-abilities-list.c:633
-#, c-format
-msgid "Could not find any driver for '%s'"
-msgstr "无法为“%s”找到任何驱动程序"
-
-# libgphoto2/gphoto2-camera.c:81
-#: libgphoto2/gphoto2-camera.c:81
-#, c-format
-msgid "An error occurred in the io-library ('%s'): %s"
-msgstr "io-库 (“%s”) 中出现错误：%s"
-
-# libgphoto2/gphoto2-camera.c:85
-#: libgphoto2/gphoto2-camera.c:85
-msgid "No additional information available."
-msgstr "没有可用的附加信息。"
-
-# libgphoto2/gphoto2-camera.c:662
-#: libgphoto2/gphoto2-camera.c:696
-msgid "Could not detect any camera"
-msgstr "无法检测到任何相机"
-
-#: libgphoto2/gphoto2-camera.c:714
-#, c-format
-msgid "Could not detect any camera at port %s"
-msgstr ""
-
-#: libgphoto2/gphoto2-camera.c:735
-msgid "You have to set the port prior to initialization of the camera."
-msgstr "您不得不在相机初始化之前设置端口。"
-
-# libgphoto2/gphoto2-camera.c:710
-#: libgphoto2/gphoto2-camera.c:760
-#, c-format
-msgid "Could not load required camera driver '%s' (%s)."
-msgstr "无法装入必须的相机驱动程序“%s”(%s)。"
-
-# libgphoto2/gphoto2-camera.c:728
-#: libgphoto2/gphoto2-camera.c:773
-#, c-format
-msgid "Camera driver '%s' is missing the 'camera_init' function."
-msgstr "相机驱动程序“%s”缺少“camera_init”函数。"
-
-# libgphoto2/gphoto2-camera.c:786
-#: libgphoto2/gphoto2-camera.c:826
-msgid "This camera does not offer any configuration options."
-msgstr "该相机不提供任何配置选项。"
-
-# libgphoto2/gphoto2-camera.c:818
-#: libgphoto2/gphoto2-camera.c:859
-msgid "This camera does not support setting configuration options."
-msgstr "该相机不支持设置配置选项。"
-
-# libgphoto2/gphoto2-camera.c:850
-#: libgphoto2/gphoto2-camera.c:891
-msgid "This camera does not support summaries."
-msgstr "该相机不支持概要。"
-
-# libgphoto2/gphoto2-camera.c:881
-#: libgphoto2/gphoto2-camera.c:922
-msgid "This camera does not offer a manual."
-msgstr "该相机不提供手册。"
-
-# libgphoto2/gphoto2-camera.c:912
-#: libgphoto2/gphoto2-camera.c:954
-msgid "This camera does not provide information about the driver."
-msgstr "该相机不提供关于驱动程序的信息。"
-
-# libgphoto2/gphoto2-camera.c:946
-#: libgphoto2/gphoto2-camera.c:988
-msgid "This camera can not capture."
-msgstr "该相机不能视频捕捉。"
-
-# libgphoto2/gphoto2-camera.c:979
-#: libgphoto2/gphoto2-camera.c:1022
-msgid "This camera can not capture previews."
-msgstr "该相机不能预览视频捕捉。"
-
-# libgphoto2/gphoto2-filesys.c:214
-#: libgphoto2/gphoto2-filesys.c:306
-#, c-format
-msgid "The path '%s' is not absolute."
-msgstr "路径“%s”不是绝对路径。"
-
-# libgphoto2/gphoto2-filesys.c:970
-#: libgphoto2/gphoto2-filesys.c:1133
-#, c-format
-msgid ""
-"You have been trying to delete '%s' from folder '%s', but the filesystem "
-"does not support deletion of files."
-msgstr "您试图从文件夹“%2$s”中删除“%1$s”，但文件系统不支持删除文件。"
-
-#: libgphoto2/gphoto2-filesys.c:1142
-#, c-format
-msgid "Deleting '%s' from folder '%s'..."
-msgstr "正在删除 '%s' 从文件夹 '%s'..."
-
-#: libgphoto2/gphoto2-filesys.c:1270
-#, c-format
-msgid ""
-"There are still subfolders in folder '%s/%s' that you are trying to remove."
-msgstr "仍然有子文件夹在您要移除的文件夹 '%s/%s'。"
-
-#: libgphoto2/gphoto2-filesys.c:1275
-#, c-format
-msgid ""
-"There are still files in folder '%s/%s' that you are trying to remove."
-msgstr "仍然有文件在您要移除的文件夹 '%s/%s'。"
-
-# libgphoto2/gphoto2-filesys.c:1117
-#: libgphoto2/gphoto2-filesys.c:1311
-msgid "The filesystem does not support upload of files."
-msgstr "文件系统不支持上载文件。"
-
-#: libgphoto2/gphoto2-filesys.c:1364
-#, c-format
-msgid ""
-"Folder '%s' only contains %i files, but you requested a file with number %i."
-msgstr "文件夹 '%s' 只包含 %i 文件，但您需要一个文件，它的编号是 %i。"
-
-# libgphoto2/gphoto2-filesys.c:1199
-#: libgphoto2/gphoto2-filesys.c:1412
-#, c-format
-msgid "File '%s' could not be found in folder '%s'."
-msgstr "在文件夹“%2$s”中无法找到文件“%1$s”。"
-
-# libgphoto2/gphoto2-filesys.c:1282
-#: libgphoto2/gphoto2-filesys.c:1529
-#, c-format
-msgid "Could not find file '%s'."
-msgstr "无法找到文件“%s”。"
-
-# libgphoto2/gphoto2-filesys.c:1407
-#: libgphoto2/gphoto2-filesys.c:1655
-msgid "The filesystem doesn't support getting files"
-msgstr "文件系统不支持获取文件"
-
-# libgphoto2/gphoto2-filesys.c:1442 libgphoto2/gphoto2-filesys.c:1764
-#: libgphoto2/gphoto2-filesys.c:1688 libgphoto2/gphoto2-filesys.c:2189
-#: libgphoto2/gphoto2-filesys.c:2347
-#, c-format
-msgid "Unknown file type %i."
-msgstr "未知的文件类型 %i。"
-
-# libgphoto2/gphoto2-filesys.c:1446
-#: libgphoto2/gphoto2-filesys.c:1692
-#, c-format
-msgid "Downloading '%s' from folder '%s'..."
-msgstr "正在从文件夹“%2$s”下载“%1$s”..."
-
-# libgphoto2/gphoto2-filesys.c:1656
-#: libgphoto2/gphoto2-filesys.c:1947
-msgid "The filesystem doesn't support getting file information"
-msgstr "文件系统不支持获取文件信息"
-
-# libgphoto2/gphoto2-filesys.c:1867
-#: libgphoto2/gphoto2-filesys.c:2457
-msgid "The filesystem doesn't support setting file information"
-msgstr "文件系统不支持设置文件信息"
-
-# libgphoto2/gphoto2-filesys.c:1890
-#: libgphoto2/gphoto2-filesys.c:2479
-msgid "Read-only file attributes like width and height can not be changed."
-msgstr "无法改变像宽度和高度这样的只读文件属性。"
-
-#: libgphoto2/gphoto2-filesys.c:2562
-msgid "The filesystem doesn't support getting storage information"
-msgstr "这个文件系统不支持获得存储信息"
-
-# libgphoto2/gphoto2-result.c:44
-#: libgphoto2/gphoto2-result.c:47
-msgid "Corrupted data"
-msgstr "已毁坏的数据"
-
-# libgphoto2/gphoto2-result.c:45
-#: libgphoto2/gphoto2-result.c:48
-msgid "File exists"
-msgstr "文件存在"
-
-# libgphoto2/gphoto2-result.c:46
-#: libgphoto2/gphoto2-result.c:49
-msgid "Unknown model"
-msgstr "未知型号"
-
-# libgphoto2/gphoto2-result.c:47
-#: libgphoto2/gphoto2-result.c:50
-msgid "Directory not found"
-msgstr "找不到目录"
-
-# libgphoto2/gphoto2-result.c:48
-#: libgphoto2/gphoto2-result.c:51
-msgid "File not found"
-msgstr "找不到文件"
-
-# libgphoto2/gphoto2-result.c:49
-#: libgphoto2/gphoto2-result.c:52
-msgid "Directory exists"
-msgstr "目录存在"
-
-#: libgphoto2/gphoto2-result.c:53
-msgid "I/O in progress"
-msgstr "I/O 正在进行"
-
-# libgphoto2/gphoto2-result.c:50
-#: libgphoto2/gphoto2-result.c:54
-msgid "Path not absolute"
-msgstr "路径不是绝对路径"
-
-# frontends/command-line/gphoto2-cmd-capture.c:218
-# libgphoto2/gphoto2-result.c:51
-#: libgphoto2/gphoto2-result.c:55
-msgid "Operation cancelled"
-msgstr "操作已取消"
-
-#: libgphoto2/gphoto2-result.c:56
-msgid "Camera could not complete operation"
-msgstr "相机不能完全操作"
-
-#: libgphoto2/gphoto2-result.c:57
-msgid "OS error in camera communication"
-msgstr "在和相机通讯时出现了 OS 错误"
-
-#: libgphoto2/gphoto2-result.c:58
-msgid "Not enough free space"
-msgstr ""
-
-# libgphoto2/gphoto2-result.c:76
-#: libgphoto2/gphoto2-result.c:83
-msgid "Unknown camera library error"
-msgstr "未知的相机库错误"
-
-# libgphoto2/gphoto2-result.c:82
-#: libgphoto2/gphoto2-result.c:89
-msgid "Unknown error"
-msgstr "未知的错误"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/libgphoto2_port-0.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/libgphoto2_port-0.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/libgphoto2_port-0.po	2014-02-24 08:24:31.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/libgphoto2_port-0.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,607 +0,0 @@
-# Simplified Chinese Translation.
-# Copyright �2000-2002 Scott Fritzinger <scottf@unr.edu> et al.
-# Wang Li <charles@linux.net.cn>, 2002
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: libgphoto2_port\n"
-"Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-03-31 00:03+0200\n"
-"PO-Revision-Date: 2010-03-24 09:33+0000\n"
-"Last-Translator: Jianle Ma <Unknown>\n"
-"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2013-12-12 11:59+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
-
-#: libgphoto2_port/gphoto2-port-info-list.c:214
-#, c-format
-msgid "Called for filename '%s'."
-msgstr ""
-
-#: libgphoto2_port/gphoto2-port-info-list.c:219
-#, c-format
-msgid "Could not load '%s': '%s'."
-msgstr "无法装入'%s': '%s'。"
-
-#: libgphoto2_port/gphoto2-port-info-list.c:227
-#, c-format
-msgid "Could not find some functions in '%s': '%s'."
-msgstr "在'%s': '%s'中无法找到函数。"
-
-#: libgphoto2_port/gphoto2-port-info-list.c:239
-#, c-format
-msgid "'%s' already loaded"
-msgstr "'%s' 已装入"
-
-#: libgphoto2_port/gphoto2-port-info-list.c:248
-#, c-format
-msgid "Could not load port driver list: '%s'."
-msgstr "无法装入端口驱动表'%s'。"
-
-#: libgphoto2_port/gphoto2-port-info-list.c:255
-#, c-format
-msgid "Loaded '%s' ('%s') from '%s'."
-msgstr "从 '%3$s' 加载了 '%1$s' （'%2$s'）"
-
-#: libgphoto2_port/gphoto2-port-info-list.c:287
-#, c-format
-msgid "Using ltdl to load io-drivers from '%s'..."
-msgstr ""
-
-#: libgphoto2_port/gphoto2-port-info-list.c:314
-#, c-format
-msgid "Counting entry (%i available)..."
-msgid_plural "Counting entries (%i available)..."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libgphoto2_port/gphoto2-port-info-list.c:326
-#, c-format
-msgid "%i regular entry available."
-msgid_plural "%i regular entries available."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libgphoto2_port/gphoto2-port-info-list.c:359
-#, c-format
-msgid "Looking for path '%s' (%i entry available)..."
-msgid_plural "Looking for path '%s' (%i entries available)..."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libgphoto2_port/gphoto2-port-info-list.c:373
-#, c-format
-msgid "Starting regex search for '%s'..."
-msgstr "正在为 '%s' 开始正则表达式搜索..."
-
-#: libgphoto2_port/gphoto2-port-info-list.c:381
-#, c-format
-msgid "Trying '%s'..."
-msgstr ""
-
-#: libgphoto2_port/gphoto2-port-info-list.c:402
-msgid "regcomp failed"
-msgstr ""
-
-#: libgphoto2_port/gphoto2-port-info-list.c:413
-#, c-format
-msgid "re_match failed (%i)"
-msgstr "再匹配失败 (%i)(_M)"
-
-#: libgphoto2_port/gphoto2-port-info-list.c:421
-msgid "regexec failed"
-msgstr ""
-
-#: libgphoto2_port/gphoto2-port-info-list.c:427
-msgid "Generic Port"
-msgstr "通用端口"
-
-#: libgphoto2_port/gphoto2-port-info-list.c:451
-#, c-format
-msgid "Looking up entry '%s'..."
-msgstr ""
-
-#: libgphoto2_port/gphoto2-port-info-list.c:481
-#, c-format
-msgid "Getting info of entry %i (%i available)..."
-msgstr ""
-
-#: libgphoto2_port/gphoto2-port-result.c:58
-msgid "No error"
-msgstr "无错误"
-
-#: libgphoto2_port/gphoto2-port-result.c:60
-msgid "Unspecified error"
-msgstr "未指明的错误"
-
-#: libgphoto2_port/gphoto2-port-result.c:62
-msgid "I/O problem"
-msgstr "I/O 问题"
-
-#: libgphoto2_port/gphoto2-port-result.c:64
-msgid "Bad parameters"
-msgstr "错误的参数"
-
-#: libgphoto2_port/gphoto2-port-result.c:66
-msgid "Unsupported operation"
-msgstr "不支持的操作"
-
-#: libgphoto2_port/gphoto2-port-result.c:68
-msgid "Fixed limit exceeded"
-msgstr ""
-
-#: libgphoto2_port/gphoto2-port-result.c:70
-msgid "Timeout reading from or writing to the port"
-msgstr "读取或写入端口超时"
-
-#: libgphoto2_port/gphoto2-port-result.c:72
-msgid "Serial port not supported"
-msgstr "不支持串口"
-
-#: libgphoto2_port/gphoto2-port-result.c:74
-msgid "USB port not supported"
-msgstr "不支持 USB 接口"
-
-#: libgphoto2_port/gphoto2-port-result.c:76
-msgid "Unknown port"
-msgstr "未知端口"
-
-#: libgphoto2_port/gphoto2-port-result.c:78
-msgid "Out of memory"
-msgstr "内存耗尽"
-
-#: libgphoto2_port/gphoto2-port-result.c:80
-msgid "Error loading a library"
-msgstr "装入库出错"
-
-#: libgphoto2_port/gphoto2-port-result.c:82
-msgid "Error initializing the port"
-msgstr "初始化端口出错"
-
-#: libgphoto2_port/gphoto2-port-result.c:84
-msgid "Error reading from the port"
-msgstr "读端口出错"
-
-#: libgphoto2_port/gphoto2-port-result.c:86
-msgid "Error writing to the port"
-msgstr "写端口出错"
-
-#: libgphoto2_port/gphoto2-port-result.c:88
-msgid "Error updating the port settings"
-msgstr "更新端口设置出错"
-
-#: libgphoto2_port/gphoto2-port-result.c:90
-msgid "Error setting the serial port speed"
-msgstr "设置串口速度出错"
-
-#: libgphoto2_port/gphoto2-port-result.c:92
-msgid "Error clearing a halt condition on the USB port"
-msgstr "清除 USB 端口的一个中止条件出错"
-
-#: libgphoto2_port/gphoto2-port-result.c:94
-msgid "Could not find the requested device on the USB port"
-msgstr "无法在 USB 端口找到请求的设备"
-
-#: libgphoto2_port/gphoto2-port-result.c:96
-msgid "Could not claim the USB device"
-msgstr "无法请求 USB 设备"
-
-#: libgphoto2_port/gphoto2-port-result.c:98
-msgid "Could not lock the device"
-msgstr "无法锁定设备"
-
-#: libgphoto2_port/gphoto2-port-result.c:100
-msgid "libhal error"
-msgstr ""
-
-#: libgphoto2_port/gphoto2-port-result.c:102
-msgid "Unknown error"
-msgstr "未知的错误"
-
-#: libgphoto2_port/gphoto2-port.c:56
-#, c-format
-msgid "The operation '%s' is not supported by this device"
-msgstr "该设备不支持操作‘%s’"
-
-#: libgphoto2_port/gphoto2-port.c:57
-msgid "The port has not yet been initialized"
-msgstr "端口尚未初始化"
-
-#: libgphoto2_port/gphoto2-port.c:88
-msgid "Creating new device..."
-msgstr ""
-
-#: libgphoto2_port/gphoto2-port.c:166
-#, c-format
-msgid "Could not load '%s' ('%s')."
-msgstr ""
-
-#: libgphoto2_port/gphoto2-port.c:176
-#, c-format
-msgid "Could not find 'gp_port_library_operations' in '%s' ('%s')"
-msgstr ""
-
-#: libgphoto2_port/gphoto2-port.c:266
-#, c-format
-msgid "Opening %s port..."
-msgstr ""
-
-#: libgphoto2_port/gphoto2-port.c:288
-msgid "Closing port..."
-msgstr ""
-
-#: libgphoto2_port/gphoto2-port.c:310
-msgid "Freeing port..."
-msgstr ""
-
-#: libgphoto2_port/gphoto2-port.c:358
-#, c-format
-msgid "Writing %i=0x%x byte to port..."
-msgid_plural "Writing %i=0x%x bytes to port..."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libgphoto2_port/gphoto2-port.c:373
-#, c-format
-msgid "Could only write %i out of %i byte"
-msgid_plural "Could only write %i out of %i bytes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: libgphoto2_port/gphoto2-port.c:398
-#, c-format
-msgid "Reading %i=0x%x byte from port..."
-msgid_plural "Reading %i=0x%x bytes from port..."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libgphoto2_port/gphoto2-port.c:412 libgphoto2_port/gphoto2-port.c:453
-#: libgphoto2_port/gphoto2-port.c:493 libgphoto2_port/gphoto2-port.c:929
-#: libgphoto2_port/gphoto2-port.c:1012 libgphoto2_port/gphoto2-port.c:1097
-#, c-format
-msgid "Could only read %i out of %i byte"
-msgid_plural "Could only read %i out of %i bytes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: libgphoto2_port/gphoto2-port.c:439
-#, c-format
-msgid "Reading %i=0x%x byte from interrupt endpoint..."
-msgid_plural "Reading %i=0x%x bytes from interrupt endpoint..."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libgphoto2_port/gphoto2-port.c:505
-#, c-format
-msgid "Reading %i=0x%x byte from interrupt endpoint (fast)..."
-msgid_plural "Reading %i=0x%x bytes from interrupt endpoint (fast)..."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libgphoto2_port/gphoto2-port.c:533
-#, c-format
-msgid "Setting timeout to %i millisecond..."
-msgid_plural "Setting timeout to %i milliseconds..."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libgphoto2_port/gphoto2-port.c:571
-msgid "Getting timeout..."
-msgstr ""
-
-#: libgphoto2_port/gphoto2-port.c:575
-#, c-format
-msgid "Current timeout: %i milliseconds"
-msgstr ""
-
-#: libgphoto2_port/gphoto2-port.c:597
-msgid "Setting settings..."
-msgstr ""
-
-#: libgphoto2_port/gphoto2-port.c:658
-#, c-format
-msgid "Getting level of pin %i..."
-msgstr ""
-
-#: libgphoto2_port/gphoto2-port.c:667
-#, c-format
-msgid "Level of pin %i: %i"
-msgstr ""
-
-#: libgphoto2_port/gphoto2-port.c:693
-msgid "low"
-msgstr ""
-
-#: libgphoto2_port/gphoto2-port.c:694
-msgid "high"
-msgstr ""
-
-#: libgphoto2_port/gphoto2-port.c:720
-#, c-format
-msgid "Setting pin %i (%s: '%s') to '%s'..."
-msgstr ""
-
-#: libgphoto2_port/gphoto2-port.c:748
-#, c-format
-msgid "Sending break (%i millisecond)..."
-msgid_plural "Sending break (%i milliseconds)..."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libgphoto2_port/gphoto2-port.c:776
-msgid "Flushing port..."
-msgstr ""
-
-#: libgphoto2_port/gphoto2-port.c:850
-msgid "Clear halt..."
-msgstr "清除中止..."
-
-#: libgphoto2_port/gphoto2-port.c:881
-#, c-format
-msgid "Writing message (request=0x%x value=0x%x index=0x%x size=%i=0x%x)..."
-msgstr ""
-
-#: libgphoto2_port/gphoto2-port.c:916
-#, c-format
-msgid "Reading message (request=0x%x value=0x%x index=0x%x size=%i=0x%x)..."
-msgstr ""
-
-#: libgphoto2_port/gphoto2-port.c:1231
-msgid "No error description available"
-msgstr "没有可用的错误描述"
-
-#: serial/unix.c:239
-#, c-format
-msgid "Could not lock device '%s'"
-msgstr "无法锁定设备‘%s’"
-
-#: serial/unix.c:249 usbdiskdirect/linux.c:94 usbscsi/linux.c:95
-#, c-format
-msgid "Device '%s' is locked by pid %d"
-msgstr "设备‘%s’已经被进行号为 %d 的进程锁定"
-
-#: serial/unix.c:252 usbdiskdirect/linux.c:97 usbscsi/linux.c:98
-#, c-format
-msgid "Device '%s' could not be locked (dev_lock returned %d)"
-msgstr "无法锁定设备‘%s’(dev_lock 返回 %d)"
-
-#: serial/unix.c:286
-#, c-format
-msgid "Device '%s' could not be unlocked."
-msgstr "无法解锁设备‘%s’。"
-
-#: serial/unix.c:298 usbdiskdirect/linux.c:126 usbscsi/linux.c:127
-#, c-format
-msgid "Device '%s' could not be unlocked as it is locked by pid %d."
-msgstr "由于设备‘%s’已被进程号为 %d 的进程锁定，所以无法锁定。"
-
-#: serial/unix.c:302 usbdiskdirect/linux.c:130 usbscsi/linux.c:131
-#, c-format
-msgid "Device '%s' could not be unlocked (dev_unlock returned %d)"
-msgstr "无法解锁设备‘%s’(dev_unlock 返回 %d)"
-
-#: serial/unix.c:383
-#, c-format
-msgid "Serial Port %i"
-msgstr "串口 %i"
-
-#: serial/unix.c:474 usbdiskdirect/linux.c:285 usbscsi/linux.c:287
-#, c-format
-msgid "Failed to open '%s' (%m)."
-msgstr "打开‘%s’(%m)失败。"
-
-#: serial/unix.c:492 usbdiskdirect/linux.c:299 usbscsi/linux.c:301
-#, c-format
-msgid "Could not close '%s' (%m)."
-msgstr "无法关闭‘%s’(%m)。"
-
-#: serial/unix.c:546
-#, c-format
-msgid "Could not write to port (%m)"
-msgstr "无法写端口 (%m)"
-
-#: serial/unix.c:623
-msgid "Parity error."
-msgstr "奇偶错误。"
-
-#: serial/unix.c:627
-#, c-format
-msgid "Unexpected parity response sequence 0xff 0x%02x."
-msgstr "意外的奇偶应答序列 0xff 0x%02x。"
-
-#: serial/unix.c:670
-#, c-format
-msgid "Unknown pin %i."
-msgstr "未知插脚 %i。"
-
-#: serial/unix.c:692
-#, c-format
-msgid "Could not get level of pin %i (%m)."
-msgstr "无法获取插脚 %i 的级别 (%m)。"
-
-#: serial/unix.c:727
-#, c-format
-msgid "Could not set level of pin %i to %i (%m)."
-msgstr "无法将插脚 %i 的级别设置为 %i (%m)。"
-
-#: serial/unix.c:752
-#, c-format
-msgid "Could not flush '%s' (%m)."
-msgstr "无法刷新‘%s’(%m)。"
-
-#: serial/unix.c:865
-#, c-format
-msgid "Could not set the baudrate to %d"
-msgstr "无法设置将波特率设置为 %d"
-
-#: usb/libusb.c:248
-#, c-format
-msgid "Could not open USB device (%m)."
-msgstr "无法打开 USB 设备 (%m)。"
-
-#: usb/libusb.c:260 libusb1/libusb1.c:305
-msgid "Camera is already in use."
-msgstr ""
-
-#: usb/libusb.c:265
-#, c-format
-msgid "Device has driver '%s' attached, detaching it now."
-msgstr ""
-
-#: usb/libusb.c:268
-#, c-format
-msgid "Could not detach kernel driver '%s' of camera device."
-msgstr ""
-
-#: usb/libusb.c:273 libusb1/libusb1.c:321
-msgid "Could not query kernel driver of device."
-msgstr ""
-
-#: usb/libusb.c:281
-#, c-format
-msgid ""
-"Could not claim interface %d (%m). Make sure no other program or kernel "
-"module (such as %s) is using the device and you have read/write access to "
-"the device."
-msgstr ""
-
-#: usb/libusb.c:299
-#, c-format
-msgid "Could not release interface %d (%m)."
-msgstr "无法释放界面 %d (%m)。"
-
-#: usb/libusb.c:312
-#, c-format
-msgid "Could not reset USB port (%m)."
-msgstr ""
-
-#: usb/libusb.c:339
-#, c-format
-msgid "Could not close USB port (%m)."
-msgstr "无法关闭 USB 端口 (%m)。"
-
-#: usb/libusb.c:590
-#, c-format
-msgid "Could not set config %d/%d (%m)"
-msgstr "无法设定配置 %d/%d (%m)"
-
-#: usb/libusb.c:623
-#, c-format
-msgid "Could not set altsetting from %d to %d (%m)"
-msgstr ""
-
-#: usb/libusb.c:715 libusb1/libusb1.c:765
-#, c-format
-msgid "The supplied vendor or product id (0x%x,0x%x) is not valid."
-msgstr "给出的供应商或产品 id (0x%x、0x%x) 不合法。"
-
-#: usb/libusb.c:751 libusb1/libusb1.c:804
-#, c-format
-msgid ""
-"USB device (vendor 0x%x, product 0x%x) is a mass storage device, and might "
-"not function with gphoto2. Reference: %s"
-msgstr ""
-
-#: usb/libusb.c:794 libusb1/libusb1.c:836
-#, c-format
-msgid ""
-"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
-"is connected to the computer."
-msgstr "无法找到 USB 设备 (供应商 0x%x、产品 0x%x)。确信该设备已连接到计算机。"
-
-#: usb/libusb.c:1092 libusb1/libusb1.c:1130
-#, c-format
-msgid ""
-"Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make "
-"sure this device is connected to the computer."
-msgstr "无法找到 USB 设备 (类 0x%x、子类 0x%x、协议 0x%x)。确信该设备已连接到计算机。"
-
-#: libusb1/libusb1.c:296
-#, c-format
-msgid "Could not open USB device (%s)."
-msgstr ""
-
-#: libusb1/libusb1.c:311
-#, c-format
-msgid "Device has a kernel driver attached (%d), detaching it now."
-msgstr ""
-
-#: libusb1/libusb1.c:314
-msgid "Could not detach kernel driver of camera device."
-msgstr ""
-
-#: libusb1/libusb1.c:329
-#, c-format
-msgid ""
-"Could not claim interface %d (%s). Make sure no other program or kernel "
-"module (such as %s) is using the device and you have read/write access to "
-"the device."
-msgstr ""
-
-#: libusb1/libusb1.c:351
-#, c-format
-msgid "Could not release interface %d (%s)."
-msgstr ""
-
-#: libusb1/libusb1.c:366
-#, c-format
-msgid "Could not reset USB port (%s)."
-msgstr ""
-
-#: libusb1/libusb1.c:377
-msgid "Could not reattach kernel driver of camera device."
-msgstr ""
-
-#: libusb1/libusb1.c:628
-#, c-format
-msgid "Could not set config %d/%d (%s)"
-msgstr ""
-
-#: libusb1/libusb1.c:667
-#, c-format
-msgid "Could not set altsetting from %d to %d (%s)"
-msgstr ""
-
-#: disk/disk.c:179 disk/disk.c:237 disk/disk.c:286 disk/disk.c:318
-#: disk/disk.c:341
-#, c-format
-msgid "Media '%s'"
-msgstr ""
-
-#: disk/disk.c:180
-msgid "(unknown)"
-msgstr ""
-
-#: usbdiskdirect/linux.c:230
-#, c-format
-msgid "USB Mass Storage direct IO"
-msgstr ""
-
-#: usbdiskdirect/linux.c:324
-#, c-format
-msgid "Could not seek to offset: %x on '%s' (%m)."
-msgstr ""
-
-#: usbdiskdirect/linux.c:347
-#, c-format
-msgid "Could not write to '%s' (%m)."
-msgstr ""
-
-#: usbdiskdirect/linux.c:369
-#, c-format
-msgid "Could not read from '%s' (%m)."
-msgstr ""
-
-#: usbscsi/linux.c:232
-#, c-format
-msgid "USB Mass Storage raw SCSI"
-msgstr ""
-
-#: usbscsi/linux.c:345
-#, c-format
-msgid "Could not send scsi command to: '%s' (%m)."
-msgstr ""
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/libgsf.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/libgsf.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/libgsf.po	2014-02-24 08:24:31.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/libgsf.po	2014-03-24 09:42:38.000000000 +0000
@@ -17,8 +17,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:35+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 11:47+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: ../gsf/gsf-blob.c:114
 #, c-format
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/libidn.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/libidn.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/libidn.po	2014-02-24 08:24:31.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/libidn.po	2014-03-24 09:42:38.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:36+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 11:47+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: lib/strerror-idna.c:82 lib/strerror-pr29.c:66 lib/strerror-punycode.c:66
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/libvirt.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/libvirt.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/libvirt.po	2014-02-24 08:24:40.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/libvirt.po	2014-03-24 09:42:48.000000000 +0000
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: libvirt\n"
 "Report-Msgid-Bugs-To: libvir-list@redhat.com\n"
-"POT-Creation-Date: 2014-01-16 17:11+0800\n"
+"POT-Creation-Date: 2014-03-02 22:25+0800\n"
 "PO-Revision-Date: 2014-02-14 14:25+0000\n"
 "Last-Translator: Leah Liu <Unknown>\n"
 "Language-Team: Chinese (China) "
@@ -23,69 +23,69 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:44+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:08+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
-#: daemon/libvirtd-config.c:58 daemon/libvirtd-config.c:77
+#: daemon/libvirtd.c:590 daemon/libvirtd.c:609
 #, c-format
 msgid "failed to allocate memory for %s config list"
 msgstr "为 %s 配置列表分配内存失败"
 
-#: daemon/libvirtd-config.c:84 daemon/libvirtd-config.c:105
+#: daemon/libvirtd.c:614 daemon/libvirtd.c:637
 #, c-format
 msgid "remoteReadConfigFile: %s: %s: must be a string or list of strings"
 msgstr "remoteReadConfigFile: %s: %s: 必须是一个或者一组字符串"
 
-#: daemon/libvirtd-config.c:122 src/locking/lock_daemon_config.c:46
+#: daemon/libvirtd.c:653
 #, c-format
 msgid "remoteReadConfigFile: %s: %s: invalid type: got %s; expected %s"
 msgstr "remoteReadConfigFile: %s: %s: 无效类型：得到 %s，应为 %s"
 
-#: daemon/libvirtd-config.c:182
+#: daemon/libvirtd.c:714
 #, c-format
 msgid "remoteReadConfigFile: %s: %s: unsupported auth %s"
 msgstr "remoteReadConfigFile: %s: %s: 不支持的认证 %s"
 
-#: daemon/libvirtd.c:223
+#: daemon/libvirtd.c:226
 #, c-format
 msgid "%s: error: unable to determine if daemon is running: %s\n"
 msgstr "%s：错误：无法确定守护进程是否正在运行：%s\n"
 
-#: daemon/libvirtd.c:229 src/locking/lock_daemon.c:356
+#: daemon/libvirtd.c:256
 #, c-format
 msgid ""
 "%s: error: %s. Check /var/log/messages or run without --daemon for more "
 "info.\n"
 msgstr "%s：错误：%s。查看 /var/log/messages 或者运行不带 --daemon 的命令查看更多信息。\n"
 
-#: daemon/libvirtd.c:472 daemon/libvirtd.c:477
+#: daemon/libvirtd.c:446 daemon/libvirtd.c:451
 #, c-format
 msgid "Failed to parse mode '%s'"
 msgstr "解析模式 '%s' 失败"
 
-#: daemon/libvirtd.c:586
+#: daemon/libvirtd.c:595
 msgid "This libvirtd build does not support TLS"
 msgstr "这个 libvirtd 构建不支持 TLS"
 
-#: daemon/libvirtd.c:767
+#: daemon/libvirtd.c:1100
 msgid "additional privileges are required"
 msgstr "需要额外特权"
 
-#: daemon/libvirtd.c:773
+#: daemon/libvirtd.c:1106
 msgid "failed to set reduced privileges"
 msgstr "设置降级的特权失败"
 
-#: daemon/libvirtd.c:911
+#: daemon/libvirtd.c:1157
 msgid "Driver state initialization failed"
 msgstr "驱动器状态初始化失败"
 
-#: daemon/libvirtd.c:1018
+#: daemon/libvirtd.c:1027
 #, c-format
 msgid "Unable to migrate %s to %s"
 msgstr "无法将 %s 迁移到 %s"
 
-#: daemon/libvirtd.c:1040
+#: daemon/libvirtd.c:1049
 #, c-format
 msgid ""
 "\n"
@@ -105,7 +105,7 @@
 "libvirt management daemon:\n"
 msgstr ""
 
-#: daemon/libvirtd.c:1059
+#: daemon/libvirtd.c:1068
 #, c-format
 msgid ""
 "\n"
@@ -128,7 +128,7 @@
 "\n"
 msgstr ""
 
-#: daemon/libvirtd.c:1086
+#: daemon/libvirtd.c:1095
 msgid ""
 "\n"
 "  Default paths:\n"
@@ -166,616 +166,588 @@
 "      $XDG_RUNTIME_DIR/libvirt/libvirtd.pid\n"
 "\n"
 
-#: daemon/libvirtd.c:1142 daemon/libvirtd.c:1156
-#: src/locking/lock_daemon.c:1177 src/locking/sanlock_helper.c:76
-#: src/lxc/lxc_controller.c:2287 src/security/virt-aa-helper.c:1186
-#: src/storage/parthelper.c:77 src/util/iohelper.c:236 src/util/iohelper.c:242
+#: daemon/libvirtd.c:1290 src/lxc/lxc_controller.c:1541
+#: src/security/virt-aa-helper.c:1164 src/storage/parthelper.c:75
+#: src/util/iohelper.c:227 src/util/iohelper.c:234
 #, c-format
 msgid "%s: initialization failed\n"
 msgstr "%s：初始化失败\n"
 
-#: daemon/libvirtd.c:1150
+#: daemon/libvirtd.c:1159
 #, c-format
 msgid "%s: cannot identify driver directory\n"
 msgstr "%s：无法识别驱动器目录\n"
 
-#: daemon/libvirtd.c:1160
+#: daemon/libvirtd.c:1169
 #, c-format
 msgid "%s: expected driver directory '%s' is missing\n"
 msgstr "%s：缺少所需驱动器目录 '%s'\n"
 
-#: daemon/libvirtd.c:1202
+#: daemon/libvirtd.c:1327
 msgid "Invalid value for timeout"
 msgstr "超时值无效"
 
-#: daemon/libvirtd.c:1210 daemon/libvirtd.c:1218 daemon/libvirtd.c:1330
-#: src/locking/lock_daemon.c:1415
+#: daemon/libvirtd.c:1335 daemon/libvirtd.c:1343
 msgid "Can't allocate memory"
 msgstr "无法分配内存"
 
-#: daemon/libvirtd.c:1245 src/locking/lock_daemon.c:1230
+#: daemon/libvirtd.c:1364
 msgid "Can't create initial configuration"
 msgstr "无法生成初始配置"
 
-#: daemon/libvirtd.c:1254 src/locking/lock_daemon.c:1239
+#: daemon/libvirtd.c:1373
 msgid "Can't determine config path"
 msgstr "无法确定配置路径"
 
-#: daemon/libvirtd.c:1264 src/locking/lock_daemon.c:1249
+#: daemon/libvirtd.c:1273 src/locking/lock_daemon.c:1294
 #, c-format
 msgid "Can't load config file: %s: %s"
 msgstr "无法载入配置文件：%s：%s"
 
-#: daemon/libvirtd.c:1267 src/locking/lock_daemon.c:1252
+#: daemon/libvirtd.c:1276 src/locking/lock_daemon.c:1297
 #, c-format
 msgid "Can't load config file: %s"
 msgstr "无法载入配置文件：%s"
 
-#: daemon/libvirtd.c:1273
+#: daemon/libvirtd.c:1282
 msgid "Exiting due to failure to migrate profile"
 msgstr "因迁移侧写失败而退出"
 
-#: daemon/libvirtd.c:1279
+#: daemon/libvirtd.c:1387
 #, c-format
 msgid "invalid host UUID: %s"
 msgstr "无效主机 UUID：%s"
 
-#: daemon/libvirtd.c:1284 src/locking/lock_daemon.c:1257
+#: daemon/libvirtd.c:1392
 msgid "Can't initialize logging"
 msgstr "无法初始化日志"
 
-#: daemon/libvirtd.c:1289
+#: daemon/libvirtd.c:1298
 msgid "Can't initialize access manager"
 msgstr "无法初始化访问管理器"
 
-#: daemon/libvirtd.c:1296 src/locking/lock_daemon.c:1264
+#: daemon/libvirtd.c:1399
 msgid "Can't determine pid file path."
 msgstr "无法确定 pid 文件路径。"
 
-#: daemon/libvirtd.c:1305 src/locking/lock_daemon.c:1271
+#: daemon/libvirtd.c:1407
 msgid "Can't determine socket paths"
 msgstr "无法确定插槽路径"
 
-#: daemon/libvirtd.c:1315 src/locking/lock_daemon.c:1281
+#: daemon/libvirtd.c:1415
 #, c-format
 msgid "cannot change to root directory: %s"
 msgstr "无法更改到根目录：%s"
 
-#: daemon/libvirtd.c:1321 src/locking/lock_daemon.c:1287
+#: daemon/libvirtd.c:1421
 #, c-format
 msgid "Failed to fork as daemon: %s"
 msgstr "用 fork 作为守护进程失败：%s"
 
-#: daemon/libvirtd.c:1337 src/locking/lock_daemon.c:1299
+#: daemon/libvirtd.c:1434
 msgid "Can't determine user directory"
 msgstr "无法确定用户目录"
 
-#: daemon/libvirtd.c:1348 src/locking/lock_daemon.c:1311
+#: daemon/libvirtd.c:1448
 #, c-format
 msgid "unable to create rundir %s: %s"
 msgstr "无法生成 rundir %s：%s"
 
-#: daemon/qemu_dispatch.h:38 daemon/qemu_dispatch.h:102 daemon/remote.c:869
-#: daemon/remote.c:1064 daemon/remote.c:1114 daemon/remote.c:1174
-#: daemon/remote.c:1227 daemon/remote.c:1287 daemon/remote.c:1342
-#: daemon/remote.c:1405 daemon/remote.c:1456 daemon/remote.c:1502
-#: daemon/remote.c:1559 daemon/remote.c:1601 daemon/remote.c:1664
-#: daemon/remote.c:1704 daemon/remote.c:1756 daemon/remote.c:1838
-#: daemon/remote.c:1893 daemon/remote.c:1942 daemon/remote.c:2005
-#: daemon/remote.c:2068 daemon/remote.c:2132 daemon/remote.c:2204
-#: daemon/remote.c:2273 daemon/remote.c:2315 daemon/remote.c:3107
-#: daemon/remote.c:3157 daemon/remote.c:3198 daemon/remote.c:3276
-#: daemon/remote.c:3313 daemon/remote.c:3346 daemon/remote.c:3395
-#: daemon/remote.c:3441 daemon/remote.c:3482 daemon/remote.c:3533
-#: daemon/remote.c:3591 daemon/remote.c:3645 daemon/remote.c:3694
-#: daemon/remote.c:3741 daemon/remote.c:3781 daemon/remote.c:3826
-#: daemon/remote.c:3888 daemon/remote.c:3960 daemon/remote.c:4021
-#: daemon/remote.c:4087 daemon/remote.c:4156 daemon/remote.c:4216
-#: daemon/remote.c:4280 daemon/remote.c:4339 daemon/remote.c:4398
-#: daemon/remote.c:4457 daemon/remote.c:4516 daemon/remote.c:4576
-#: daemon/remote.c:4634 daemon/remote.c:4680 daemon/remote.c:4731
-#: daemon/remote.c:4785 daemon/remote.c:4842 daemon/remote.c:4903
-#: daemon/remote.c:4973 daemon/remote.c:5034 daemon/remote.c:5092
-#: daemon/remote.c:5143 daemon/remote.c:5198 daemon/remote.c:5247
-#: daemon/remote.c:5300 daemon/remote.c:5374 daemon/remote_dispatch.h:143
-#: daemon/remote_dispatch.h:213 daemon/remote_dispatch.h:347
-#: daemon/remote_dispatch.h:397 daemon/remote_dispatch.h:448
-#: daemon/remote_dispatch.h:498 daemon/remote_dispatch.h:568
-#: daemon/remote_dispatch.h:616 daemon/remote_dispatch.h:667
-#: daemon/remote_dispatch.h:719 daemon/remote_dispatch.h:767
-#: daemon/remote_dispatch.h:818 daemon/remote_dispatch.h:866
-#: daemon/remote_dispatch.h:914 daemon/remote_dispatch.h:1118
-#: daemon/remote_dispatch.h:1180 daemon/remote_dispatch.h:1242
-#: daemon/remote_dispatch.h:1304 daemon/remote_dispatch.h:1366
-#: daemon/remote_dispatch.h:1428 daemon/remote_dispatch.h:1490
-#: daemon/remote_dispatch.h:1552 daemon/remote_dispatch.h:1614
-#: daemon/remote_dispatch.h:1676 daemon/remote_dispatch.h:1779
-#: daemon/remote_dispatch.h:1827 daemon/remote_dispatch.h:1875
-#: daemon/remote_dispatch.h:1923 daemon/remote_dispatch.h:1971
-#: daemon/remote_dispatch.h:2019 daemon/remote_dispatch.h:2067
-#: daemon/remote_dispatch.h:2115 daemon/remote_dispatch.h:2163
-#: daemon/remote_dispatch.h:2211 daemon/remote_dispatch.h:2302
-#: daemon/remote_dispatch.h:2354 daemon/remote_dispatch.h:2406
-#: daemon/remote_dispatch.h:2461 daemon/remote_dispatch.h:2518
-#: daemon/remote_dispatch.h:2571 daemon/remote_dispatch.h:2648
-#: daemon/remote_dispatch.h:2704 daemon/remote_dispatch.h:2760
-#: daemon/remote_dispatch.h:2815 daemon/remote_dispatch.h:2894
-#: daemon/remote_dispatch.h:2946 daemon/remote_dispatch.h:3022
-#: daemon/remote_dispatch.h:3077 daemon/remote_dispatch.h:3151
-#: daemon/remote_dispatch.h:3201 daemon/remote_dispatch.h:3253
-#: daemon/remote_dispatch.h:3305 daemon/remote_dispatch.h:3357
-#: daemon/remote_dispatch.h:3410 daemon/remote_dispatch.h:3467
-#: daemon/remote_dispatch.h:3545 daemon/remote_dispatch.h:3647
-#: daemon/remote_dispatch.h:3771 daemon/remote_dispatch.h:3827
-#: daemon/remote_dispatch.h:3909 daemon/remote_dispatch.h:3998
-#: daemon/remote_dispatch.h:4054 daemon/remote_dispatch.h:4133
-#: daemon/remote_dispatch.h:4213 daemon/remote_dispatch.h:4445
-#: daemon/remote_dispatch.h:4501 daemon/remote_dispatch.h:4557
-#: daemon/remote_dispatch.h:4613 daemon/remote_dispatch.h:4666
-#: daemon/remote_dispatch.h:4721 daemon/remote_dispatch.h:4784
-#: daemon/remote_dispatch.h:4840 daemon/remote_dispatch.h:4896
-#: daemon/remote_dispatch.h:4973 daemon/remote_dispatch.h:5025
-#: daemon/remote_dispatch.h:5077 daemon/remote_dispatch.h:5127
-#: daemon/remote_dispatch.h:5179 daemon/remote_dispatch.h:5364
-#: daemon/remote_dispatch.h:5419 daemon/remote_dispatch.h:5518
-#: daemon/remote_dispatch.h:5574 daemon/remote_dispatch.h:5630
-#: daemon/remote_dispatch.h:5824 daemon/remote_dispatch.h:5901
-#: daemon/remote_dispatch.h:5995 daemon/remote_dispatch.h:6047
-#: daemon/remote_dispatch.h:6100 daemon/remote_dispatch.h:6157
-#: daemon/remote_dispatch.h:6230 daemon/remote_dispatch.h:6342
-#: daemon/remote_dispatch.h:6394 daemon/remote_dispatch.h:6446
-#: daemon/remote_dispatch.h:6498 daemon/remote_dispatch.h:6550
-#: daemon/remote_dispatch.h:6602 daemon/remote_dispatch.h:6653
-#: daemon/remote_dispatch.h:6700 daemon/remote_dispatch.h:6749
-#: daemon/remote_dispatch.h:6802 daemon/remote_dispatch.h:6859
-#: daemon/remote_dispatch.h:6912 daemon/remote_dispatch.h:6965
-#: daemon/remote_dispatch.h:7014 daemon/remote_dispatch.h:7068
-#: daemon/remote_dispatch.h:7145 daemon/remote_dispatch.h:7197
-#: daemon/remote_dispatch.h:7249 daemon/remote_dispatch.h:7303
-#: daemon/remote_dispatch.h:7364 daemon/remote_dispatch.h:7425
-#: daemon/remote_dispatch.h:7485 daemon/remote_dispatch.h:7540
-#: daemon/remote_dispatch.h:7595 daemon/remote_dispatch.h:7651
-#: daemon/remote_dispatch.h:7710 daemon/remote_dispatch.h:7765
-#: daemon/remote_dispatch.h:7823 daemon/remote_dispatch.h:7884
-#: daemon/remote_dispatch.h:7945 daemon/remote_dispatch.h:8004
-#: daemon/remote_dispatch.h:8056 daemon/remote_dispatch.h:8108
-#: daemon/remote_dispatch.h:8160 daemon/remote_dispatch.h:8215
-#: daemon/remote_dispatch.h:8273 daemon/remote_dispatch.h:8329
-#: daemon/remote_dispatch.h:8390 daemon/remote_dispatch.h:8454
-#: daemon/remote_dispatch.h:8516 daemon/remote_dispatch.h:8578
-#: daemon/remote_dispatch.h:8662 daemon/remote_dispatch.h:8735
-#: daemon/remote_dispatch.h:8803 daemon/remote_dispatch.h:8861
-#: daemon/remote_dispatch.h:8918 daemon/remote_dispatch.h:8976
-#: daemon/remote_dispatch.h:9028 daemon/remote_dispatch.h:9080
-#: daemon/remote_dispatch.h:9132 daemon/remote_dispatch.h:9183
-#: daemon/remote_dispatch.h:9229 daemon/remote_dispatch.h:9275
-#: daemon/remote_dispatch.h:9322 daemon/remote_dispatch.h:9376
-#: daemon/remote_dispatch.h:9426 daemon/remote_dispatch.h:9481
-#: daemon/remote_dispatch.h:9537 daemon/remote_dispatch.h:9592
-#: daemon/remote_dispatch.h:9644 daemon/remote_dispatch.h:9694
-#: daemon/remote_dispatch.h:9746 daemon/remote_dispatch.h:9800
-#: daemon/remote_dispatch.h:9852 daemon/remote_dispatch.h:9902
-#: daemon/remote_dispatch.h:9957 daemon/remote_dispatch.h:10013
-#: daemon/remote_dispatch.h:10069 daemon/remote_dispatch.h:10125
-#: daemon/remote_dispatch.h:10181 daemon/remote_dispatch.h:10236
-#: daemon/remote_dispatch.h:10288 daemon/remote_dispatch.h:10338
-#: daemon/remote_dispatch.h:10390 daemon/remote_dispatch.h:10442
-#: daemon/remote_dispatch.h:10496 daemon/remote_dispatch.h:10546
-#: daemon/remote_dispatch.h:10599 daemon/remote_dispatch.h:10653
-#: daemon/remote_dispatch.h:10730 daemon/remote_dispatch.h:10786
-#: daemon/remote_dispatch.h:10853 daemon/remote_dispatch.h:10905
-#: daemon/remote_dispatch.h:10958 daemon/remote_dispatch.h:11011
-#: daemon/remote_dispatch.h:11063 daemon/remote_dispatch.h:11117
-#: daemon/remote_dispatch.h:11221 daemon/remote_dispatch.h:11269
-#: daemon/remote_dispatch.h:11392 daemon/remote_dispatch.h:11457
-#: daemon/remote_dispatch.h:11508 daemon/remote_dispatch.h:11561
-#: daemon/remote_dispatch.h:11610 daemon/remote_dispatch.h:11663
-#: daemon/remote_dispatch.h:11718 daemon/remote_dispatch.h:11770
-#: daemon/remote_dispatch.h:11820 daemon/remote_dispatch.h:11874
-#: daemon/remote_dispatch.h:11949 daemon/remote_dispatch.h:12004
-#: daemon/remote_dispatch.h:12056 daemon/remote_dispatch.h:12106
-#: daemon/remote_dispatch.h:12158 daemon/remote_dispatch.h:12210
-#: daemon/remote_dispatch.h:12262 daemon/remote_dispatch.h:12316
-#: daemon/remote_dispatch.h:12368 daemon/remote_dispatch.h:12418
-#: daemon/remote_dispatch.h:12470 daemon/remote_dispatch.h:12525
-#: daemon/remote_dispatch.h:12581 daemon/remote_dispatch.h:12640
-#: daemon/remote_dispatch.h:12696 daemon/remote_dispatch.h:12752
-#: daemon/remote_dispatch.h:12830 daemon/remote_dispatch.h:12897
-#: daemon/remote_dispatch.h:12949 daemon/remote_dispatch.h:13002
-#: daemon/remote_dispatch.h:13060 daemon/remote_dispatch.h:13113
-#: daemon/remote_dispatch.h:13165 daemon/remote_dispatch.h:13217
-#: daemon/remote_dispatch.h:13272 daemon/remote_dispatch.h:13331
-#: daemon/remote_dispatch.h:13391 daemon/remote_dispatch.h:13445
-#: daemon/remote_dispatch.h:13516 daemon/remote_dispatch.h:13574
-#: daemon/remote_dispatch.h:13630 daemon/remote_dispatch.h:13685
-#: daemon/remote_dispatch.h:13738 daemon/remote_dispatch.h:13795
-#: daemon/remote_dispatch.h:13845 daemon/remote_dispatch.h:13899
-#: daemon/remote_dispatch.h:13967 daemon/remote_dispatch.h:14019
-#: src/rpc/virnetserverclient.c:1551
+#: daemon/qemu_dispatch.h:36 daemon/remote.c:663 daemon/remote.c:873
+#: daemon/remote.c:927 daemon/remote.c:982 daemon/remote.c:1046
+#: daemon/remote.c:1104 daemon/remote.c:1174 daemon/remote.c:1227
+#: daemon/remote.c:1274 daemon/remote.c:1320 daemon/remote.c:1391
+#: daemon/remote.c:1477 daemon/remote.c:1534 daemon/remote.c:1585
+#: daemon/remote.c:1649 daemon/remote.c:1715 daemon/remote.c:1793
+#: daemon/remote.c:1868 daemon/remote.c:1910 daemon/remote.c:2670
+#: daemon/remote.c:2723 daemon/remote.c:2764 daemon/remote.c:2842
+#: daemon/remote.c:2879 daemon/remote.c:2912 daemon/remote.c:2961
+#: daemon/remote.c:3007 daemon/remote.c:3048 daemon/remote.c:3099
+#: daemon/remote.c:3159 daemon/remote.c:3213 daemon/remote.c:3262
+#: daemon/remote.c:3310 daemon/remote.c:3350 daemon/remote_dispatch.h:163
+#: daemon/remote_dispatch.h:213 daemon/remote_dispatch.h:261
+#: daemon/remote_dispatch.h:313 daemon/remote_dispatch.h:365
+#: daemon/remote_dispatch.h:417 daemon/remote_dispatch.h:470
+#: daemon/remote_dispatch.h:547 daemon/remote_dispatch.h:601
+#: daemon/remote_dispatch.h:656 daemon/remote_dispatch.h:735
+#: daemon/remote_dispatch.h:787 daemon/remote_dispatch.h:841
+#: daemon/remote_dispatch.h:896 daemon/remote_dispatch.h:948
+#: daemon/remote_dispatch.h:998 daemon/remote_dispatch.h:1050
+#: daemon/remote_dispatch.h:1102 daemon/remote_dispatch.h:1154
+#: daemon/remote_dispatch.h:1293 daemon/remote_dispatch.h:1371
+#: daemon/remote_dispatch.h:1473 daemon/remote_dispatch.h:1531
+#: daemon/remote_dispatch.h:1591 daemon/remote_dispatch.h:1658
+#: daemon/remote_dispatch.h:1714 daemon/remote_dispatch.h:1792
+#: daemon/remote_dispatch.h:2002 daemon/remote_dispatch.h:2058
+#: daemon/remote_dispatch.h:2114 daemon/remote_dispatch.h:2170
+#: daemon/remote_dispatch.h:2223 daemon/remote_dispatch.h:2278
+#: daemon/remote_dispatch.h:2341 daemon/remote_dispatch.h:2397
+#: daemon/remote_dispatch.h:2453 daemon/remote_dispatch.h:2508
+#: daemon/remote_dispatch.h:2560 daemon/remote_dispatch.h:2612
+#: daemon/remote_dispatch.h:2662 daemon/remote_dispatch.h:2714
+#: daemon/remote_dispatch.h:2856 daemon/remote_dispatch.h:2911
+#: daemon/remote_dispatch.h:2988 daemon/remote_dispatch.h:3044
+#: daemon/remote_dispatch.h:3194 daemon/remote_dispatch.h:3271
+#: daemon/remote_dispatch.h:3343 daemon/remote_dispatch.h:3396
+#: daemon/remote_dispatch.h:3453 daemon/remote_dispatch.h:3544
+#: daemon/remote_dispatch.h:3596 daemon/remote_dispatch.h:3648
+#: daemon/remote_dispatch.h:3700 daemon/remote_dispatch.h:3751
+#: daemon/remote_dispatch.h:3798 daemon/remote_dispatch.h:3847
+#: daemon/remote_dispatch.h:3900 daemon/remote_dispatch.h:3957
+#: daemon/remote_dispatch.h:4010 daemon/remote_dispatch.h:4063
+#: daemon/remote_dispatch.h:4112 daemon/remote_dispatch.h:4166
+#: daemon/remote_dispatch.h:4248 daemon/remote_dispatch.h:4300
+#: daemon/remote_dispatch.h:4354 daemon/remote_dispatch.h:4416
+#: daemon/remote_dispatch.h:4477 daemon/remote_dispatch.h:4532
+#: daemon/remote_dispatch.h:4587 daemon/remote_dispatch.h:4643
+#: daemon/remote_dispatch.h:4705 daemon/remote_dispatch.h:4767
+#: daemon/remote_dispatch.h:4827 daemon/remote_dispatch.h:4879
+#: daemon/remote_dispatch.h:4931 daemon/remote_dispatch.h:4986
+#: daemon/remote_dispatch.h:5044 daemon/remote_dispatch.h:5100
+#: daemon/remote_dispatch.h:5161 daemon/remote_dispatch.h:5225
+#: daemon/remote_dispatch.h:5287 daemon/remote_dispatch.h:5362
+#: daemon/remote_dispatch.h:5432 daemon/remote_dispatch.h:5490
+#: daemon/remote_dispatch.h:5547 daemon/remote_dispatch.h:5605
+#: daemon/remote_dispatch.h:5657 daemon/remote_dispatch.h:5709
+#: daemon/remote_dispatch.h:5761 daemon/remote_dispatch.h:5815
+#: daemon/remote_dispatch.h:5865 daemon/remote_dispatch.h:5916
+#: daemon/remote_dispatch.h:5966 daemon/remote_dispatch.h:6014
+#: daemon/remote_dispatch.h:6062 daemon/remote_dispatch.h:6113
+#: daemon/remote_dispatch.h:6165 daemon/remote_dispatch.h:6213
+#: daemon/remote_dispatch.h:6266 daemon/remote_dispatch.h:6314
+#: daemon/remote_dispatch.h:6361 daemon/remote_dispatch.h:6407
+#: daemon/remote_dispatch.h:6453 daemon/remote_dispatch.h:6500
+#: daemon/remote_dispatch.h:6554 daemon/remote_dispatch.h:6604
+#: daemon/remote_dispatch.h:6659 daemon/remote_dispatch.h:6715
+#: daemon/remote_dispatch.h:6770 daemon/remote_dispatch.h:6822
+#: daemon/remote_dispatch.h:6872 daemon/remote_dispatch.h:6924
+#: daemon/remote_dispatch.h:6974 daemon/remote_dispatch.h:7038
+#: daemon/remote_dispatch.h:7102 daemon/remote_dispatch.h:7166
+#: daemon/remote_dispatch.h:7230 daemon/remote_dispatch.h:7294
+#: daemon/remote_dispatch.h:7358 daemon/remote_dispatch.h:7422
+#: daemon/remote_dispatch.h:7486 daemon/remote_dispatch.h:7550
+#: daemon/remote_dispatch.h:7612 daemon/remote_dispatch.h:7666
+#: daemon/remote_dispatch.h:7718 daemon/remote_dispatch.h:7768
+#: daemon/remote_dispatch.h:7823 daemon/remote_dispatch.h:7879
+#: daemon/remote_dispatch.h:7935 daemon/remote_dispatch.h:7991
+#: daemon/remote_dispatch.h:8047 daemon/remote_dispatch.h:8102
+#: daemon/remote_dispatch.h:8154 daemon/remote_dispatch.h:8204
+#: daemon/remote_dispatch.h:8256 daemon/remote_dispatch.h:8310
+#: daemon/remote_dispatch.h:8360 daemon/remote_dispatch.h:8412
+#: daemon/remote_dispatch.h:8489 daemon/remote_dispatch.h:8545
+#: daemon/remote_dispatch.h:8614 daemon/remote_dispatch.h:8667
+#: daemon/remote_dispatch.h:8720 daemon/remote_dispatch.h:8772
+#: daemon/remote_dispatch.h:8826 daemon/remote_dispatch.h:8910
+#: daemon/remote_dispatch.h:8958 daemon/remote_dispatch.h:9059
+#: daemon/remote_dispatch.h:9126 daemon/remote_dispatch.h:9175
+#: daemon/remote_dispatch.h:9222 daemon/remote_dispatch.h:9270
+#: daemon/remote_dispatch.h:9318 daemon/remote_dispatch.h:9366
+#: daemon/remote_dispatch.h:9414 daemon/remote_dispatch.h:9462
+#: daemon/remote_dispatch.h:9510 daemon/remote_dispatch.h:9558
+#: daemon/remote_dispatch.h:9606 daemon/remote_dispatch.h:9654
+#: daemon/remote_dispatch.h:9704 daemon/remote_dispatch.h:9757
+#: daemon/remote_dispatch.h:9812 daemon/remote_dispatch.h:9864
+#: daemon/remote_dispatch.h:9914 daemon/remote_dispatch.h:9989
+#: daemon/remote_dispatch.h:10064 daemon/remote_dispatch.h:10119
+#: daemon/remote_dispatch.h:10171 daemon/remote_dispatch.h:10221
+#: daemon/remote_dispatch.h:10273 daemon/remote_dispatch.h:10325
+#: daemon/remote_dispatch.h:10377 daemon/remote_dispatch.h:10431
+#: daemon/remote_dispatch.h:10483 daemon/remote_dispatch.h:10533
+#: daemon/remote_dispatch.h:10585 daemon/remote_dispatch.h:10640
+#: daemon/remote_dispatch.h:10696 daemon/remote_dispatch.h:10755
+#: daemon/remote_dispatch.h:10811 daemon/remote_dispatch.h:10867
+#: daemon/remote_dispatch.h:10923 daemon/remote_dispatch.h:10992
+#: daemon/remote_dispatch.h:11044 daemon/remote_dispatch.h:11097
+#: daemon/remote_dispatch.h:11155 daemon/remote_dispatch.h:11208
+#: daemon/remote_dispatch.h:11260 daemon/remote_dispatch.h:11312
+#: daemon/remote_dispatch.h:11367 daemon/remote_dispatch.h:11426
+#: daemon/remote_dispatch.h:11486 daemon/remote_dispatch.h:11540
+#: daemon/remote_dispatch.h:11611 daemon/remote_dispatch.h:11669
+#: daemon/remote_dispatch.h:11725 daemon/remote_dispatch.h:11780
+#: daemon/remote_dispatch.h:11833 daemon/remote_dispatch.h:11890
+#: daemon/remote_dispatch.h:11942 daemon/remote_dispatch.h:12010
 msgid "connection not open"
 msgstr "连接未打开"
 
-#: daemon/remote.c:61 src/remote/remote_driver.c:60
+#: daemon/remote.c:63 src/remote/remote_driver.c:57
 #, c-format
 msgid "conversion from hyper to %s overflowed"
 msgstr "从 hyper 转换为 %s 溢出"
 
-#: daemon/remote.c:776 src/locking/lock_daemon.c:786
-#: src/util/virnetdevmacvlan.c:80
+#: daemon/remote.c:1036 src/locking/lock_daemon.c:786
+#: src/util/virnetdevmacvlan.c:80 src/util/virnetdevveth.c:47
 msgid "unable to init mutex"
 msgstr ""
 
-#: daemon/remote.c:805
+#: daemon/remote.c:599
 msgid "connection already open"
 msgstr "连接已经打开"
 
-#: daemon/remote.c:811
+#: daemon/remote.c:605
 msgid "keepalive support is required to connect"
 msgstr "连接需要 keepalive 支持"
 
-#: daemon/remote.c:947 daemon/remote.c:1032 src/remote/remote_driver.c:1568
-#: src/remote/remote_driver.c:1653
+#: daemon/remote.c:747 daemon/remote.c:837 src/remote/remote_driver.c:1336
+#: src/remote/remote_driver.c:1415
 #, c-format
 msgid "unknown parameter type: %d"
 msgstr "未知参数类型：%d"
 
-#: daemon/remote.c:983 daemon/remote.c:1069 daemon/remote.c:1179
-#: daemon/remote.c:1351 daemon/remote.c:1949 daemon/remote.c:2012
-#: daemon/remote.c:2075 daemon/remote.c:2139 daemon/remote.c:2211
-#: daemon/remote.c:2320 daemon/remote.c:3833 daemon/remote.c:3893
-#: daemon/remote.c:4583
+#: daemon/remote.c:783 daemon/remote.c:878 daemon/remote.c:932
+#: daemon/remote.c:1113 daemon/remote.c:1592 daemon/remote.c:1656
+#: daemon/remote.c:1722 daemon/remote.c:1800 daemon/remote.c:1915
 msgid "nparams too large"
 msgstr "nparmas 过大"
 
-#: daemon/remote.c:996 src/remote/remote_driver.c:1616
+#: daemon/remote.c:798 src/remote/remote_driver.c:1376
 #, c-format
 msgid "Parameter %s too big for destination"
 msgstr "对于目的地来说参数 %s 太大"
 
-#: daemon/remote.c:1125 src/remote/remote_driver.c:1406
-#: src/remote/remote_driver.c:1420 src/remote/remote_driver.c:1469
+#: daemon/remote.c:1382 src/remote/remote_driver.c:1572
+#: src/remote/remote_driver.c:1586 src/remote/remote_driver.c:1635
 #, c-format
 msgid "Too many domains '%d' for limit '%d'"
 msgstr ""
 
-#: daemon/remote.c:1233
+#: daemon/remote.c:988
 msgid "maxStats > REMOTE_DOMAIN_MEMORY_STATS_MAX"
 msgstr "maxStats > REMOTE_DOMAIN_MEMORY_STATS_MAX"
 
-#: daemon/remote.c:1300 daemon/remote.c:1417
+#: daemon/remote.c:1059 daemon/remote.c:1186
 msgid "size > maximum buffer size"
 msgstr "大小 > 最大缓冲大小"
 
-#: daemon/remote.c:1526
+#: daemon/remote.c:1783
 msgid "failed to copy security label"
 msgstr "复制安全标签失败"
 
-#: daemon/remote.c:1609
+#: daemon/remote.c:1328
 msgid "ncpumaps > REMOTE_VCPUINFO_MAX"
 msgstr "ncpumaps > REMOTE_VCPUINFO_MAX"
 
-#: daemon/remote.c:1615 daemon/remote.c:1770
+#: daemon/remote.c:1334 daemon/remote.c:1405
 msgid "maxinfo * maplen > REMOTE_CPUMAPS_MAX"
 msgstr "maxinfo * maplen > REMOTE_CPUMAPS_MAX"
 
-#: daemon/remote.c:1764
+#: daemon/remote.c:1399
 msgid "maxinfo > REMOTE_VCPUINFO_MAX"
 msgstr "maxinfo > REMOTE_VCPUINFO_MAX"
 
-#: daemon/remote.c:2448
+#: daemon/remote.c:2047
 msgid "client tried invalid SASL init request"
 msgstr "客户端尝试无效 SASL 初始化请求"
 
-#: daemon/remote.c:2496 daemon/remote.c:2645 daemon/remote.c:2743
-#: daemon/remote.c:2759 daemon/remote.c:2773 daemon/remote.c:2787
-#: daemon/remote.c:2907 daemon/remote.c:3052 daemon/remote.c:3081
-#: src/util/virerror.c:985
+#: daemon/remote.c:2093 daemon/remote.c:2245 daemon/remote.c:2343
+#: daemon/remote.c:2359 daemon/remote.c:2373 daemon/remote.c:2387
+#: daemon/remote.c:2478 daemon/remote.c:2615 daemon/remote.c:2644
+#: src/util/virterror.c:1020
 msgid "authentication failed"
 msgstr "验证失败"
 
-#: daemon/remote.c:2523
+#: daemon/remote.c:2120
 #, c-format
 msgid "negotiated SSF %d was not strong enough"
 msgstr "协商 SSF %d 不够强大"
 
-#: daemon/remote.c:2576 daemon/remote.c:2674
+#: daemon/remote.c:2176 daemon/remote.c:2274
 msgid "client tried invalid SASL start request"
 msgstr "客户端尝试无效 SASL 启动请求"
 
-#: daemon/remote.c:2594
+#: daemon/remote.c:2194
 #, c-format
 msgid "sasl start reply data too long %d"
 msgstr "sasl 启动回应数据过长 %d"
 
-#: daemon/remote.c:2691
+#: daemon/remote.c:2291
 #, c-format
 msgid "sasl step reply data too long %d"
 msgstr "sasl 步骤回应数据过长 %d"
 
-#: daemon/remote.c:2830 daemon/remote.c:2959
+#: daemon/remote.c:2430 daemon/remote.c:2527
 msgid "client tried invalid PolicyKit init request"
 msgstr "客户端尝试无效 PolicyKit 初始请求"
 
-#: daemon/remote.c:2876
+#: daemon/remote.c:3133
 #, c-format
 msgid "Policy kit denied action %s from pid %lld, uid %d: %s"
 msgstr "拒绝 %s from pid %lld, uid %d: %s"
 
-#: daemon/remote.c:2903
+#: daemon/remote.c:3160
 msgid "authentication cancelled by user"
 msgstr "用户取消认证动作"
 
-#: daemon/remote.c:2905
+#: daemon/remote.c:3162
 #, c-format
 msgid "polkit: %s"
 msgstr ""
 
-#: daemon/remote.c:2965
+#: daemon/remote.c:2532
 msgid "cannot get peer socket identity"
 msgstr "无法获得同级套接字身份"
 
-#: daemon/remote.c:2981
+#: daemon/remote.c:2546
 #, c-format
 msgid "Failed to lookup policy kit caller: %s"
 msgstr "检查策略套件调用程序失败：%s"
 
-#: daemon/remote.c:2988
+#: daemon/remote.c:2553
 #, c-format
 msgid "Failed to create polkit action %s"
 msgstr "生成 polkit 动作 %s 失败"
 
-#: daemon/remote.c:2998
+#: daemon/remote.c:2563
 #, c-format
 msgid "Failed to create polkit context %s"
 msgstr "生成 polkit 上下文 %s 失败"
 
-#: daemon/remote.c:3016
+#: daemon/remote.c:2581
 #, c-format
 msgid "Policy kit failed to check authorization %d %s"
 msgstr "策略套件无法检查验证 %d %s"
 
-#: daemon/remote.c:3030
+#: daemon/remote.c:3287
 #, c-format
 msgid "Policy kit denied action %s from pid %lld, uid %d, result: %s"
 msgstr "拒绝 %s from pid %lld, uid %d, result: %s"
 
-#: daemon/remote.c:3079
+#: daemon/remote.c:2642
 msgid "client tried unsupported PolicyKit init request"
 msgstr "客户端尝试不支持的 PolicyKit 初始请求"
 
-#: daemon/remote.c:3164 daemon/remote.c:3359
-#, c-format
-msgid "domain event %d already registered"
-msgstr "已注册域事件 %d"
-
-#: daemon/remote.c:3205 daemon/remote.c:3409
+#: daemon/remote.c:2771 daemon/remote.c:2975
 #, c-format
 msgid "domain event %d not registered"
 msgstr "尚未注册域事件 %d"
 
-#: daemon/remote.c:3354 daemon/remote.c:3403
+#: daemon/remote.c:2920 daemon/remote.c:2969
 #, c-format
 msgid "unsupported event ID %d"
 msgstr "不支持的事件 ID %d"
 
-#: daemon/remote.c:3897
+#: daemon/remote.c:3863
+#, c-format
+msgid "domain event callback %d not registered"
+msgstr ""
+
+#: daemon/remote.c:4355
 msgid "ncpus too large"
 msgstr "ncpus 太大"
 
-#: daemon/remote.c:3969
+#: daemon/remote.c:4427
 msgid "maxerrors too large"
 msgstr "maxerrors 太大"
 
-#: daemon/remote.c:4035 daemon/remote.c:4104 src/remote/remote_driver.c:6042
-#: src/remote/remote_driver.c:6109
+#: daemon/remote.c:4493 daemon/remote.c:4562 src/remote/remote_driver.c:6552
+#: src/remote/remote_driver.c:6619
 #, c-format
 msgid "Too many domain snapshots '%d' for limit '%d'"
 msgstr ""
 
-#: daemon/remote.c:4167 src/remote/remote_driver.c:3443
+#: daemon/remote.c:4625 src/remote/remote_driver.c:3609
 #, c-format
 msgid "Too many storage pools '%d' for limit '%d'"
 msgstr ""
 
-#: daemon/remote.c:4230 src/remote/remote_driver.c:3510
+#: daemon/remote.c:4688 src/remote/remote_driver.c:3676
 #, c-format
 msgid "Too many storage volumes '%d' for limit '%d'"
 msgstr ""
 
-#: daemon/remote.c:4291 src/remote/remote_driver.c:2879
+#: daemon/remote.c:4749 src/remote/remote_driver.c:3045
 #, c-format
 msgid "Too many networks '%d' for limit '%d'"
 msgstr ""
 
-#: daemon/remote.c:4350 src/remote/remote_driver.c:3041
+#: daemon/remote.c:4808 src/remote/remote_driver.c:3207
 #, c-format
 msgid "Too many interfaces '%d' for limit '%d'"
 msgstr ""
 
-#: daemon/remote.c:4409 src/remote/remote_driver.c:3107
+#: daemon/remote.c:4867 src/remote/remote_driver.c:3273
 #, c-format
 msgid "Too many node devices '%d' for limit '%d'"
 msgstr ""
 
-#: daemon/remote.c:4468 src/remote/remote_driver.c:3173
+#: daemon/remote.c:4926 src/remote/remote_driver.c:3339
 #, c-format
 msgid "Too many network filters '%d' for limit '%d'"
 msgstr ""
 
-#: daemon/remote.c:4527 src/remote/remote_driver.c:3239
+#: daemon/remote.c:4985 src/remote/remote_driver.c:3405
 #, c-format
 msgid "Too many secrets '%d' for limit '%d'"
 msgstr ""
 
-#: daemon/remote.c:4744 src/remote/remote_driver.c:6296
+#: daemon/remote.c:5202 src/remote/remote_driver.c:6806
 #, c-format
 msgid "Too many job stats '%d' for limit '%d'"
 msgstr ""
 
-#: daemon/remote.c:4791 daemon/remote.c:4848 daemon/remote.c:4909
-#: daemon/remote.c:4979 daemon/remote.c:5040 daemon/remote.c:5098
-#: src/remote/remote_driver.c:6343 src/remote/remote_driver.c:6409
-#: src/remote/remote_driver.c:6491 src/remote/remote_driver.c:6577
-#: src/remote/remote_driver.c:6649 src/remote/remote_driver.c:6721
+#: daemon/remote.c:5249 daemon/remote.c:5306 daemon/remote.c:5367
+#: daemon/remote.c:5437 daemon/remote.c:5498 daemon/remote.c:5556
+#: src/remote/remote_driver.c:6853 src/remote/remote_driver.c:6919
+#: src/remote/remote_driver.c:7001 src/remote/remote_driver.c:7087
+#: src/remote/remote_driver.c:7159 src/remote/remote_driver.c:7231
 #, c-format
 msgid "Too many migration parameters '%d' for limit '%d'"
 msgstr ""
 
-#: daemon/remote.c:5155
+#: daemon/remote.c:5613
 #, c-format
 msgid "Too many CPU models '%d' for limit '%d'"
 msgstr ""
 
-#: daemon/remote.c:5312
+#: daemon/remote.c:5770
 #, c-format
 msgid "unsupported network event ID %d"
 msgstr ""
 
-#: daemon/remote.c:5386
+#: daemon/remote.c:5844
 #, c-format
 msgid "network event callback %d not registered"
 msgstr ""
 
-#: daemon/remote_dispatch.h:1124
+#: daemon/remote_dispatch.h:1167
 msgid "maxnames > REMOTE_DOMAIN_LIST_MAX"
 msgstr ""
 
-#: daemon/remote_dispatch.h:1186 daemon/remote_dispatch.h:1434
+#: daemon/remote_dispatch.h:1229 daemon/remote_dispatch.h:1477
 msgid "maxnames > REMOTE_INTERFACE_LIST_MAX"
 msgstr ""
 
-#: daemon/remote_dispatch.h:1248 daemon/remote_dispatch.h:1496
+#: daemon/remote_dispatch.h:1291 daemon/remote_dispatch.h:1539
 msgid "maxnames > REMOTE_NETWORK_LIST_MAX"
 msgstr ""
 
-#: daemon/remote_dispatch.h:1310 daemon/remote_dispatch.h:1682
+#: daemon/remote_dispatch.h:1353 daemon/remote_dispatch.h:1725
 msgid "maxnames > REMOTE_STORAGE_POOL_LIST_MAX"
 msgstr ""
 
-#: daemon/remote_dispatch.h:1372
+#: daemon/remote_dispatch.h:1415
 msgid "maxids > REMOTE_DOMAIN_LIST_MAX"
 msgstr ""
 
-#: daemon/remote_dispatch.h:1558
+#: daemon/remote_dispatch.h:1601
 msgid "maxnames > REMOTE_NWFILTER_LIST_MAX"
 msgstr ""
 
-#: daemon/remote_dispatch.h:1620
+#: daemon/remote_dispatch.h:1663
 msgid "maxuuids > REMOTE_SECRET_LIST_MAX"
 msgstr ""
 
-#: daemon/remote_dispatch.h:8668 daemon/remote_dispatch.h:8741
+#: daemon/remote_dispatch.h:8711 daemon/remote_dispatch.h:8784
 msgid "maxnames > REMOTE_DOMAIN_SNAPSHOT_LIST_MAX"
 msgstr ""
 
-#: daemon/remote_dispatch.h:10792
+#: daemon/remote_dispatch.h:8551
 msgid "maxnames > REMOTE_NODE_DEVICE_CAPS_LIST_MAX"
 msgstr "maxnames > REMOTE_NODE_DEVICE_CAPS_LIST_MAX"
 
-#: daemon/remote_dispatch.h:11123
+#: daemon/remote_dispatch.h:8832
 msgid "maxcells > REMOTE_NODE_MAX_CELLS"
 msgstr "maxcells > REMOTE_NODE_MAX_CELLS"
 
-#: daemon/remote_dispatch.h:11398
+#: daemon/remote_dispatch.h:11441
 msgid "maxnames > REMOTE_NODE_DEVICE_LIST_MAX"
 msgstr ""
 
-#: daemon/remote_dispatch.h:12836
+#: daemon/remote_dispatch.h:12879
 msgid "maxnames > REMOTE_STORAGE_VOL_LIST_MAX"
 msgstr ""
 
-#: daemon/stream.c:233
+#: daemon/stream.c:237
 msgid "stream had unexpected termination"
 msgstr "意外终止流"
 
-#: daemon/stream.c:236
+#: daemon/stream.c:240
 msgid "stream had I/O failure"
 msgstr "流出现 I/O 失败"
 
-#: daemon/stream.c:615
+#: daemon/stream.c:622
 msgid "stream aborted at client request"
 msgstr "根据客户端要求中断流"
 
-#: daemon/stream.c:619
+#: daemon/stream.c:626
 #, c-format
 msgid "stream aborted with unexpected status %d"
 msgstr "由于意外状态 %d 中断流"
 
-#: gnulib/lib/gai_strerror.c:57
+#: gnulib/lib/gai_strerror.c:60
 msgid "Address family for hostname not supported"
 msgstr "不支持主机名的地址范围"
 
-#: gnulib/lib/gai_strerror.c:58
+#: gnulib/lib/gai_strerror.c:61
 msgid "Temporary failure in name resolution"
 msgstr "名称解析暂时不可用"
 
-#: gnulib/lib/gai_strerror.c:59
+#: gnulib/lib/gai_strerror.c:62
 msgid "Bad value for ai_flags"
 msgstr "错误 ai_flags 值"
 
-#: gnulib/lib/gai_strerror.c:60
+#: gnulib/lib/gai_strerror.c:63
 msgid "Non-recoverable failure in name resolution"
 msgstr "解析名称时出现不可恢复的错误"
 
-#: gnulib/lib/gai_strerror.c:61
+#: gnulib/lib/gai_strerror.c:64
 msgid "ai_family not supported"
 msgstr "不支持 ai_family"
 
-#: gnulib/lib/gai_strerror.c:62
+#: gnulib/lib/gai_strerror.c:65
 msgid "Memory allocation failure"
 msgstr "内存分配失败"
 
-#: gnulib/lib/gai_strerror.c:63
+#: gnulib/lib/gai_strerror.c:66
 msgid "No address associated with hostname"
 msgstr "没有与主机名关联的地址"
 
-#: gnulib/lib/gai_strerror.c:64
+#: gnulib/lib/gai_strerror.c:67
 msgid "Name or service not known"
 msgstr "未知名称或者服务"
 
-#: gnulib/lib/gai_strerror.c:65
+#: gnulib/lib/gai_strerror.c:68
 msgid "Servname not supported for ai_socktype"
 msgstr "ai_socktype 不支持的服务名称"
 
-#: gnulib/lib/gai_strerror.c:66
+#: gnulib/lib/gai_strerror.c:69
 msgid "ai_socktype not supported"
 msgstr "不支持 ai_socktype"
 
-#: gnulib/lib/gai_strerror.c:67
+#: gnulib/lib/gai_strerror.c:70
 msgid "System error"
 msgstr "系统错误"
 
-#: gnulib/lib/gai_strerror.c:68
+#: gnulib/lib/gai_strerror.c:71
 msgid "Argument buffer too small"
 msgstr "变量缓冲太小"
 
-#: gnulib/lib/gai_strerror.c:70
+#: gnulib/lib/gai_strerror.c:73
 msgid "Processing request in progress"
 msgstr "正在处理请求"
 
-#: gnulib/lib/gai_strerror.c:71
+#: gnulib/lib/gai_strerror.c:74
 msgid "Request canceled"
 msgstr "已取消的请求"
 
-#: gnulib/lib/gai_strerror.c:72
+#: gnulib/lib/gai_strerror.c:75
 msgid "Request not canceled"
 msgstr "未取消的请求"
 
-#: gnulib/lib/gai_strerror.c:73
+#: gnulib/lib/gai_strerror.c:76
 msgid "All requests done"
 msgstr "完成所有请求"
 
-#: gnulib/lib/gai_strerror.c:74
+#: gnulib/lib/gai_strerror.c:77
 msgid "Interrupted by a signal"
 msgstr "由信号中断"
 
-#: gnulib/lib/gai_strerror.c:75
+#: gnulib/lib/gai_strerror.c:78
 msgid "Parameter string not correctly encoded"
 msgstr "参数字符串没有正确编码"
 
-#: gnulib/lib/gai_strerror.c:87 src/esx/esx_vi.c:4472
-#: src/hyperv/hyperv_wmi.c:323 src/rpc/virnetclientprogram.c:184
-#: src/rpc/virnetclientstream.c:197
+#: gnulib/lib/gai_strerror.c:90 src/esx/esx_vi.c:4031
+#: src/hyperv/hyperv_wmi.c:325 src/rpc/virnetclientprogram.c:183
+#: src/rpc/virnetclientstream.c:218
 msgid "Unknown error"
 msgstr "未知错误"
 
@@ -878,16 +850,156 @@
 msgid "Cannot find security driver '%s'"
 msgstr "无法找到安全驱动程序 '%s'"
 
-#: src/conf/capabilities.c:1009
+#: src/storage/storage_backend_scsi.c:524
+#: src/storage/storage_backend_scsi.c:566
+#, c-format
+msgid "Failed to opendir path '%s'"
+msgstr "打开目录路径 '%s' 失败"
+
+#: src/bhyve/bhyve_command.c:70 src/util/vircgroup.c:483
+#: src/util/virstoragefile.c:1210
+#, c-format
+msgid "Unable to open '%s'"
+msgstr "无法打开 '%s'"
+
+#: src/bhyve/bhyve_command.c:76 src/util/virnetdevtap.c:63
+msgid "Unable to query tap interface name"
+msgstr ""
+
+#: src/bhyve/bhyve_command.c:98
+msgid "Unable to iterate over TAP devices"
+msgstr ""
+
+#: src/bhyve/bhyve_command.c:117
+msgid "domain should have one and only one net defined"
+msgstr ""
+
+#: src/qemu/qemu_command.c:226
+#, c-format
+msgid "Network type %d is not supported"
+msgstr "不支持网络类型 %d"
+
+#: src/bhyve/bhyve_command.c:190 src/bhyve/bhyve_command.c:298
+msgid "domain should have one and only one disk defined"
+msgstr ""
+
+#: src/bhyve/bhyve_command.c:198
+msgid "unsupported disk bus type"
+msgstr ""
+
+#: src/bhyve/bhyve_command.c:204 src/bhyve/bhyve_command.c:306
+msgid "unsupported disk device"
+msgstr ""
+
+#: src/bhyve/bhyve_command.c:210 src/bhyve/bhyve_command.c:312
+msgid "unsupported disk type"
+msgstr ""
+
+#: src/bhyve/bhyve_driver.c:126 src/lxc/lxc_driver.c:135
+#: src/libxl/libxl_driver.c:94 src/qemu/qemu_driver.c:220
+#: src/test/test_driver.c:496
+#, c-format
+msgid "no domain with matching uuid '%s' (%s)"
+msgstr ""
+
+#: src/bhyve/bhyve_driver.c:156
+#, c-format
+msgid "Unexpected bhyve URI path '%s', try bhyve:///system"
+msgstr ""
+
+#: src/bhyve/bhyve_driver.c:163
+msgid "bhyve state driver is not active"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:2600
+#, c-format
+msgid "Unknown release: %s"
+msgstr "未知发布：%s"
+
+#: src/lxc/lxc_driver.c:508
+msgid "Cannot undefine transient domain"
+msgstr "无法取消定义瞬时域"
+
+#: src/lxc/lxc_driver.c:267 src/lxc/lxc_driver.c:321 src/lxc/lxc_driver.c:346
+#: src/lxc/lxc_driver.c:370 src/lxc/lxc_driver.c:502 src/lxc/lxc_driver.c:559
+#: src/lxc/lxc_driver.c:625 src/lxc/lxc_driver.c:652 src/lxc/lxc_driver.c:681
+#: src/lxc/lxc_driver.c:706 src/lxc/lxc_driver.c:738 src/lxc/lxc_driver.c:802
+#: src/lxc/lxc_driver.c:903 src/lxc/lxc_driver.c:1008
+#: src/lxc/lxc_driver.c:1993 src/lxc/lxc_driver.c:2251
+#: src/lxc/lxc_driver.c:3409 src/lxc/lxc_driver.c:3464
+#: src/lxc/lxc_driver.c:3491 src/lxc/lxc_driver.c:3659
+#: src/lxc/lxc_driver.c:3724 src/libxl/libxl_driver.c:1342
+#: src/libxl/libxl_driver.c:1400 src/libxl/libxl_driver.c:1456
+#: src/libxl/libxl_driver.c:1502 src/libxl/libxl_driver.c:1545
+#: src/libxl/libxl_driver.c:1600 src/libxl/libxl_driver.c:1939
+#: src/libxl/libxl_driver.c:2037 src/libxl/libxl_driver.c:2127
+#: src/libxl/libxl_driver.c:2173 src/libxl/libxl_driver.c:2207
+#: src/libxl/libxl_driver.c:2705 src/libxl/libxl_driver.c:3447
+#: src/libxl/libxl_driver.c:3475 src/vmware/vmware_driver.c:595
+#, c-format
+msgid "No domain with matching uuid '%s'"
+msgstr "没有匹配 uuid '%s' 的域"
+
+#: src/qemu/qemu_driver.c:1169 src/qemu/qemu_driver.c:8403
+#: src/qemu/qemu_driver.c:8664
+#, c-format
+msgid "no domain with matching name '%s'"
+msgstr "没有与名称 '%s' 匹配的域"
+
+#: src/lxc/lxc_driver.c:2005 src/libxl/libxl_driver.c:2711
+#: src/vmware/vmware_driver.c:601
+msgid "Domain is already running"
+msgstr "域已经运行"
+
+#: src/lxc/lxc_container.c:459
+#, c-format
+msgid "Failed to mkdir %s"
+msgstr "新建文件夹 %s 失败"
+
+#: src/lxc/lxc_driver.c:1830
+#, c-format
+msgid "Failed to open '%s'"
+msgstr "打开 '%s' 失败"
+
+#: src/bhyve/bhyve_process.c:79
+msgid "Failed to build pidfile path"
+msgstr ""
+
+#: src/bhyve/bhyve_process.c:86
+#, c-format
+msgid "Cannot remove state PID file %s"
+msgstr ""
+
+#: src/bhyve/bhyve_process.c:122
+#, c-format
+msgid "Guest failed to load: %d"
+msgstr ""
+
+#: src/qemu/qemu_process.c:3156
+#, c-format
+msgid "Domain %s didn't show up"
+msgstr "未显示域 %s"
+
+#: src/bhyve/bhyve_process.c:178
+#, c-format
+msgid "Invalid PID %d for VM"
+msgstr ""
+
+#: src/bhyve/bhyve_process.c:211
+#, c-format
+msgid "Guest failed to stop: %d"
+msgstr ""
+
+#: src/conf/capabilities.c:1017
 #, c-format
 msgid "Cpu '%u' in node '%zu' is out of range of the provided bitmap"
 msgstr ""
 
-#: src/conf/cpu_conf.c:191
+#: src/conf/cpu_conf.c:132
 msgid "XML does not contain expected 'cpu' element"
 msgstr "XML 不包含应有的 ‘cpu’ 元素"
 
-#: src/conf/cpu_conf.c:202
+#: src/conf/cpu_conf.c:145
 msgid ""
 "'arch' element element cannot be used inside 'cpu' element with 'match' "
 "attribute'"
@@ -902,20 +1014,20 @@
 msgid "Invalid mode attribute '%s'"
 msgstr "无效属性模式 '%s'"
 
-#: src/conf/cpu_conf.c:253
+#: src/conf/cpu_conf.c:169
 msgid "Invalid match attribute for CPU specification"
 msgstr "CPU 技术参数中无效的 match 属性"
 
-#: src/conf/cpu_conf.c:264
+#: src/conf/cpu_conf.c:179
 msgid "Missing CPU architecture"
 msgstr "缺少 CPU 架构"
 
-#: src/conf/cpu_conf.c:269 src/conf/domain_conf.c:11885
+#: src/conf/cpu_conf.c:269 src/conf/domain_conf.c:12075
 #, c-format
 msgid "Unknown architecture %s"
 msgstr ""
 
-#: src/conf/cpu_conf.c:279 src/cpu/cpu_powerpc.c:221 src/cpu/cpu_x86.c:943
+#: src/conf/cpu_conf.c:187 src/cpu/cpu_x86.c:949
 msgid "Missing CPU model name"
 msgstr "缺少 CPU 型号名"
 
@@ -932,56 +1044,56 @@
 msgid "vendor id is invalid"
 msgstr "销售商 id 无效"
 
-#: src/conf/cpu_conf.c:318
+#: src/conf/cpu_conf.c:194
 msgid "CPU vendor specified without CPU model"
 msgstr "指定 CPU 销售商但没有 CPU 型号"
 
-#: src/conf/cpu_conf.c:330
+#: src/conf/cpu_conf.c:206
 msgid "Missing 'sockets' attribute in CPU topology"
 msgstr "CPU 拓扑中缺少 ‘socket’ 属性"
 
-#: src/conf/cpu_conf.c:339
+#: src/conf/cpu_conf.c:215
 msgid "Missing 'cores' attribute in CPU topology"
 msgstr "CPU 拓扑中缺少 ‘cores’ 属性"
 
-#: src/conf/cpu_conf.c:348
+#: src/conf/cpu_conf.c:224
 msgid "Missing 'threads' attribute in CPU topology"
 msgstr "CPU 拓扑中缺少 ‘threads’ 属性"
 
-#: src/conf/cpu_conf.c:355
+#: src/conf/cpu_conf.c:231
 msgid "Invalid CPU topology"
 msgstr "无效 CPU 拓扑"
 
-#: src/conf/cpu_conf.c:366 src/conf/cpu_conf.c:581
+#: src/conf/cpu_conf.c:243 src/conf/cpu_conf.c:433
 msgid "Non-empty feature list specified without CPU model"
 msgstr "未指定 CPU 型号的非空功能列表"
 
-#: src/conf/cpu_conf.c:395
+#: src/conf/cpu_conf.c:270
 msgid "Invalid CPU feature policy"
 msgstr "无效 CPU 特性策略"
 
-#: src/conf/cpu_conf.c:405
+#: src/conf/cpu_conf.c:280
 msgid "Invalid CPU feature name"
 msgstr "无效 CPU 特性名称"
 
-#: src/conf/cpu_conf.c:412 src/conf/cpu_conf.c:678
+#: src/conf/cpu_conf.c:287 src/conf/cpu_conf.c:502
 #, c-format
 msgid "CPU feature `%s' specified more than once"
 msgstr "指定一次以上 CPU 特性 `%s'"
 
-#: src/conf/cpu_conf.c:428
+#: src/conf/cpu_conf.c:303
 msgid "NUMA topology defined without NUMA cells"
 msgstr "未定义 NUMA 单元的 NUMA 拓扑"
 
-#: src/conf/cpu_conf.c:446
+#: src/conf/cpu_conf.c:322
 msgid "Missing 'cpus' attribute in NUMA cell"
 msgstr "NUMA 单元中缺少 'cpus' 属性"
 
-#: src/conf/cpu_conf.c:460
+#: src/conf/cpu_conf.c:339
 msgid "Missing 'memory' attribute in NUMA cell"
 msgstr "NUMA 单元中缺少 'memory' 属性"
 
-#: src/conf/cpu_conf.c:467
+#: src/conf/cpu_conf.c:346
 msgid "Invalid 'memory' attribute in NUMA cell"
 msgstr "NUMA 单元中的 'memory' 属性无效"
 
@@ -990,7 +1102,7 @@
 msgid "Unexpected CPU mode %d"
 msgstr "意外的 CPU 模式 %d"
 
-#: src/conf/cpu_conf.c:536
+#: src/conf/cpu_conf.c:400
 #, c-format
 msgid "Unexpected CPU match policy %d"
 msgstr "意外 CPU match 策略 %d"
@@ -1000,20 +1112,20 @@
 msgid "Unexpected CPU fallback value: %d"
 msgstr "意外的 CPU 返回值：%d"
 
-#: src/conf/cpu_conf.c:624 src/cpu/cpu_x86.c:685
+#: src/conf/cpu_conf.c:457 src/cpu/cpu_x86.c:669
 msgid "Missing CPU feature name"
 msgstr "缺少 CPU 特性名称"
 
-#: src/conf/cpu_conf.c:634
+#: src/conf/cpu_conf.c:467
 #, c-format
 msgid "Unexpected CPU feature policy %d"
 msgstr "意外 CPU 特性策略 %d"
 
-#: src/conf/cpu_conf.c:726
+#: src/conf/cpu_conf.c:539
 msgid "Target CPU does not match source"
 msgstr "目标 CPU 与源不符"
 
-#: src/conf/cpu_conf.c:732
+#: src/conf/cpu_conf.c:545
 #, c-format
 msgid "Target CPU type %s does not match source %s"
 msgstr "目标 CPU 类型 %s 与源 %s 不符"
@@ -1023,17 +1135,17 @@
 msgid "Target CPU mode %s does not match source %s"
 msgstr "目标 CPU 模式 %s 与源 %s 不符"
 
-#: src/conf/cpu_conf.c:748
+#: src/conf/cpu_conf.c:553
 #, c-format
 msgid "Target CPU arch %s does not match source %s"
 msgstr "目标 CPU 架构 %s 与源 %s 不符"
 
-#: src/conf/cpu_conf.c:756
+#: src/conf/cpu_conf.c:560
 #, c-format
 msgid "Target CPU model %s does not match source %s"
 msgstr "目标 CPU 型号 %s 与源 %s 不符"
 
-#: src/conf/cpu_conf.c:763
+#: src/conf/cpu_conf.c:567
 #, c-format
 msgid "Target CPU vendor %s does not match source %s"
 msgstr "目标 CPU 销售商 %s 与源 %s 不符"
@@ -1043,2871 +1155,2931 @@
 msgid "Target CPU vendor id %s does not match source %s"
 msgstr ""
 
-#: src/conf/cpu_conf.c:777
+#: src/conf/cpu_conf.c:574
 #, c-format
 msgid "Target CPU sockets %d does not match source %d"
 msgstr "目标 CPU 插槽 %d 与源 %d 不符"
 
-#: src/conf/cpu_conf.c:784
+#: src/conf/cpu_conf.c:581
 #, c-format
 msgid "Target CPU cores %d does not match source %d"
 msgstr "目标 CPU  core %d 与源 %d 不符"
 
-#: src/conf/cpu_conf.c:791
+#: src/conf/cpu_conf.c:588
 #, c-format
 msgid "Target CPU threads %d does not match source %d"
 msgstr "目标 CPU 线程 %d 与源 %d 不符"
 
-#: src/conf/cpu_conf.c:798
+#: src/conf/cpu_conf.c:595
 #, c-format
 msgid "Target CPU feature count %zu does not match source %zu"
 msgstr "目标 CPU 功能计数 %zu 与源 %zu 不符"
 
-#: src/conf/cpu_conf.c:806
+#: src/conf/cpu_conf.c:603
 #, c-format
 msgid "Target CPU feature %s does not match source %s"
 msgstr "目标 CPU 功能 %s 与源 %s 不匹配"
 
-#: src/conf/cpu_conf.c:813
+#: src/conf/cpu_conf.c:610
 #, c-format
 msgid "Target CPU feature policy %s does not match source %s"
 msgstr "目标 CPU 功能策略 %s 与源 %s 不匹配"
 
-#: src/conf/device_conf.c:68
+#: src/conf/domain_conf.c:1942
 msgid "Cannot parse <address> 'domain' attribute"
 msgstr "无法解析 <地址> 'domain' 属性"
 
-#: src/conf/device_conf.c:75 src/conf/domain_conf.c:3170
-#: src/conf/domain_conf.c:3224 src/conf/domain_conf.c:3365
+#: src/conf/domain_conf.c:1949 src/conf/domain_conf.c:2016
+#: src/conf/domain_conf.c:2068 src/conf/domain_conf.c:2158
 msgid "Cannot parse <address> 'bus' attribute"
 msgstr "无法解析 <地址> 'bus' 属性"
 
-#: src/conf/device_conf.c:82 src/conf/domain_conf.c:3324
+#: src/conf/domain_conf.c:1956 src/conf/domain_conf.c:2117
 msgid "Cannot parse <address> 'slot' attribute"
 msgstr "无法解析 <地址> 'slot' 属性"
 
-#: src/conf/device_conf.c:89
+#: src/conf/domain_conf.c:1963
 msgid "Cannot parse <address> 'function' attribute"
 msgstr "无法解析 <地址> 'function' 属性"
 
-#: src/conf/device_conf.c:96
+#: src/conf/domain_conf.c:1970
 #, c-format
 msgid "Unknown value '%s' for <address> 'multifunction' attribute"
 msgstr "<address> 'multifunction' 属性的未知值 '%s'"
 
-#: src/conf/device_conf.c:103
+#: src/conf/domain_conf.c:1977
 msgid "Insufficient specification for PCI address"
 msgstr "PCI 地址没有足够的说明"
 
-#: src/conf/domain_conf.c:923
+#: src/conf/domain_conf.c:643
 #, c-format
 msgid "could not parse weight %s"
 msgstr "无法解析加权 %s"
 
-#: src/conf/domain_conf.c:936
+#: src/conf/domain_conf.c:947
+#, c-format
+msgid "could not parse read bytes sec %s"
+msgstr ""
+
+#: src/conf/domain_conf.c:956
+#, c-format
+msgid "could not parse write bytes sec %s"
+msgstr ""
+
+#: src/conf/domain_conf.c:965
+#, c-format
+msgid "could not parse read iops sec %s"
+msgstr ""
+
+#: src/conf/domain_conf.c:974
+#, c-format
+msgid "could not parse write iops sec %s"
+msgstr ""
+
+#: src/conf/domain_conf.c:656
 msgid "missing per-device path"
 msgstr "缺少逐个设备路径"
 
-#: src/conf/domain_conf.c:2234 src/xen/xm_internal.c:985
+#: src/conf/domain_conf.c:12060 src/xen/xm_internal.c:1116
 #, c-format
 msgid "domain '%s' is already defined with uuid %s"
 msgstr "已使用 uuid %s 定义域名 '%s'"
 
-#: src/conf/domain_conf.c:2243
+#: src/conf/domain_conf.c:2312
 #, c-format
 msgid "domain '%s' is already active"
 msgstr ""
 
-#: src/conf/domain_conf.c:2249
+#: src/conf/domain_conf.c:2318
 #, c-format
 msgid "domain '%s' is already being started"
 msgstr ""
 
-#: src/conf/domain_conf.c:2265
+#: src/conf/domain_conf.c:12083
 #, c-format
 msgid "domain '%s' already exists with uuid %s"
 msgstr "使用 uuid %s 的域 '%s' 已存在"
 
-#: src/conf/domain_conf.c:2392 src/lxc/lxc_driver.c:2562
-#: src/lxc/lxc_driver.c:2636 src/libxl/libxl_driver.c:4000
-#: src/openvz/openvz_driver.c:1981 src/qemu/qemu_driver.c:1686
-#: src/qemu/qemu_driver.c:1698 src/qemu/qemu_driver.c:1770
-#: src/qemu/qemu_driver.c:1871 src/qemu/qemu_driver.c:1986
-#: src/qemu/qemu_driver.c:2035 src/qemu/qemu_driver.c:2122
-#: src/qemu/qemu_driver.c:2387 src/qemu/qemu_driver.c:2398
-#: src/qemu/qemu_driver.c:2462 src/qemu/qemu_driver.c:2605
-#: src/qemu/qemu_driver.c:3203 src/qemu/qemu_driver.c:3261
-#: src/qemu/qemu_driver.c:3538 src/qemu/qemu_driver.c:3646
-#: src/qemu/qemu_driver.c:3731 src/qemu/qemu_driver.c:3796
-#: src/qemu/qemu_driver.c:3873 src/qemu/qemu_driver.c:4944
-#: src/qemu/qemu_driver.c:5710 src/qemu/qemu_driver.c:8974
-#: src/qemu/qemu_driver.c:9036 src/qemu/qemu_driver.c:9112
-#: src/qemu/qemu_driver.c:9265 src/qemu/qemu_driver.c:9612
-#: src/qemu/qemu_driver.c:9734 src/qemu/qemu_driver.c:11059
-#: src/qemu/qemu_driver.c:11098 src/qemu/qemu_driver.c:11232
-#: src/qemu/qemu_driver.c:11289 src/qemu/qemu_driver.c:11339
-#: src/qemu/qemu_driver.c:11394 src/qemu/qemu_driver.c:11453
-#: src/qemu/qemu_driver.c:11765 src/qemu/qemu_driver.c:12331
-#: src/qemu/qemu_driver.c:13744 src/qemu/qemu_driver.c:13753
-#: src/qemu/qemu_driver.c:13901 src/qemu/qemu_driver.c:13982
-#: src/qemu/qemu_driver.c:14091 src/qemu/qemu_driver.c:14231
-#: src/qemu/qemu_driver.c:14259 src/qemu/qemu_driver.c:14349
-#: src/qemu/qemu_driver.c:14460 src/qemu/qemu_driver.c:14679
-#: src/qemu/qemu_driver.c:14806 src/qemu/qemu_driver.c:15193
-#: src/qemu/qemu_driver.c:15544 src/qemu/qemu_driver.c:15603
-#: src/qemu/qemu_driver.c:15651 src/qemu/qemu_driver.c:15691
-#: src/qemu/qemu_driver.c:15762 src/qemu/qemu_driver.c:15784
-#: src/qemu/qemu_driver.c:15834 src/qemu/qemu_driver.c:15856
-#: src/qemu/qemu_migration.c:2080 src/qemu/qemu_migration.c:4070
-#: src/test/test_driver.c:6392 src/uml/uml_driver.c:2561
-#: src/xen/xen_driver.c:2636 src/xen/xm_internal.c:675
+#: src/lxc/lxc_driver.c:2820 src/lxc/lxc_driver.c:3020
+#: src/lxc/lxc_driver.c:3147 src/lxc/lxc_driver.c:3296
+#: src/lxc/lxc_driver.c:3787 src/qemu/qemu_driver.c:1401
+#: src/qemu/qemu_driver.c:1420 src/qemu/qemu_driver.c:1472
+#: src/qemu/qemu_driver.c:1529 src/qemu/qemu_driver.c:1585
+#: src/qemu/qemu_driver.c:1638 src/qemu/qemu_driver.c:1708
+#: src/qemu/qemu_driver.c:1840 src/qemu/qemu_driver.c:1951
+#: src/qemu/qemu_driver.c:1962 src/qemu/qemu_driver.c:2033
+#: src/qemu/qemu_driver.c:2194 src/qemu/qemu_driver.c:2696
+#: src/qemu/qemu_driver.c:2755 src/qemu/qemu_driver.c:2968
+#: src/qemu/qemu_driver.c:3079 src/qemu/qemu_driver.c:3170
+#: src/qemu/qemu_driver.c:3322 src/qemu/qemu_driver.c:3603
+#: src/qemu/qemu_driver.c:4438 src/qemu/qemu_driver.c:6043
+#: src/qemu/qemu_driver.c:6262 src/qemu/qemu_driver.c:6470
+#: src/qemu/qemu_driver.c:6632 src/qemu/qemu_driver.c:6949
+#: src/qemu/qemu_driver.c:7220 src/qemu/qemu_driver.c:7363
+#: src/qemu/qemu_driver.c:7428 src/qemu/qemu_driver.c:7451
+#: src/qemu/qemu_driver.c:7513 src/qemu/qemu_driver.c:7541
+#: src/qemu/qemu_driver.c:7726 src/qemu/qemu_driver.c:7796
+#: src/qemu/qemu_driver.c:7913 src/qemu/qemu_driver.c:8460
+#: src/qemu/qemu_driver.c:8940 src/qemu/qemu_driver.c:8975
+#: src/qemu/qemu_driver.c:9037 src/qemu/qemu_driver.c:9095
+#: src/qemu/qemu_driver.c:9204 src/qemu/qemu_driver.c:9482
+#: src/qemu/qemu_driver.c:10716 src/qemu/qemu_driver.c:10725
+#: src/qemu/qemu_driver.c:10864 src/qemu/qemu_driver.c:10970
+#: src/qemu/qemu_driver.c:10984 src/qemu/qemu_driver.c:11070
+#: src/qemu/qemu_driver.c:11165 src/qemu/qemu_driver.c:11324
+#: src/qemu/qemu_migration.c:2323 src/uml/uml_driver.c:2395
+#: src/xen/xen_driver.c:2132 src/xen/xen_hypervisor.c:1159
+#: src/xen/xen_hypervisor.c:1240 src/xen/xen_hypervisor.c:1359
+#: src/xen/xm_internal.c:715
 msgid "domain is not running"
 msgstr "域没有在运行"
 
-#: src/conf/domain_conf.c:2399
+#: src/conf/domain_conf.c:2468
 msgid "transient domains do not have any persistent config"
 msgstr ""
 
-#: src/conf/domain_conf.c:2405
+#: src/conf/domain_conf.c:2474
 msgid "Get persistent config failed"
 msgstr "获取永久配置失败"
 
-#: src/conf/domain_conf.c:2773
+#: src/conf/domain_conf.c:2842
 #, c-format
 msgid "Multiple '%s' controllers with index '%d'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2797
+#: src/conf/domain_conf.c:2866
 msgid "hypervisor type must be specified"
 msgstr ""
 
-#: src/conf/domain_conf.c:2804
+#: src/conf/domain_conf.c:7311
 msgid "init binary must be specified"
 msgstr "必须指定起始二进制代码"
 
-#: src/conf/domain_conf.c:2831
+#: src/conf/domain_conf.c:7542
 msgid "Only the first console can be a serial port"
 msgstr "只有第一个控制台可以使串口"
 
-#: src/conf/domain_conf.c:3054
+#: src/conf/domain_conf.c:2956
+#, c-format
+msgid "timer %s doesn't support setting of timer tickpolicy"
+msgstr ""
+
+#: src/conf/domain_conf.c:2968
+msgid ""
+"setting of timer catchup policies is only supported with tickpolicy='catchup'"
+msgstr ""
+
+#: src/conf/domain_conf.c:2976
+#, c-format
+msgid "timer %s doesn't support setting of timer frequency"
+msgstr ""
+
+#: src/conf/domain_conf.c:2984
+#, c-format
+msgid "timer %s doesn't support setting of timer mode"
+msgstr ""
+
+#: src/conf/domain_conf.c:2995
+#, c-format
+msgid "timer %s doesn't support setting of timer track"
+msgstr ""
+
+#: src/conf/domain_conf.c:11073
 #, c-format
 msgid "unexpected rom bar value %d"
 msgstr "意外的 rom bar 值 %d"
 
-#: src/conf/domain_conf.c:3137
+#: src/conf/domain_conf.c:1914
 #, c-format
 msgid "unknown address type '%d'"
 msgstr "未知地址类型 '%d'"
 
-#: src/conf/domain_conf.c:3163 src/conf/domain_conf.c:3217
-#: src/conf/domain_conf.c:3317
+#: src/conf/domain_conf.c:2009 src/conf/domain_conf.c:2061
+#: src/conf/domain_conf.c:2110
 msgid "Cannot parse <address> 'controller' attribute"
 msgstr "无法解析 <地址> 'controller' 属性"
 
-#: src/conf/domain_conf.c:3177
+#: src/conf/domain_conf.c:3302
 msgid "Cannot parse <address> 'target' attribute"
 msgstr "无法解析 <address> 'target' 属性"
 
-#: src/conf/domain_conf.c:3184
+#: src/conf/domain_conf.c:2023
 msgid "Cannot parse <address> 'unit' attribute"
 msgstr "无法解析 <地址> 'unit' 属性"
 
-#: src/conf/domain_conf.c:3231 src/conf/domain_conf.c:3355
+#: src/conf/domain_conf.c:2075 src/conf/domain_conf.c:2148
 msgid "Cannot parse <address> 'port' attribute"
 msgstr "无法解析 <地址> 'port' 属性"
 
-#: src/conf/domain_conf.c:3263
+#: src/conf/domain_conf.c:3388
 msgid "Cannot parse <address> 'cssid' attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:3269
+#: src/conf/domain_conf.c:3394
 msgid "Cannot parse <address> 'ssid' attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:3275
+#: src/conf/domain_conf.c:3400
 msgid "Cannot parse <address> 'devno' attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:3280
+#: src/conf/domain_conf.c:3405
 #, c-format
 msgid ""
 "Invalid specification for virtio ccw address: cssid='%s' ssid='%s' devno='%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:3288
+#: src/conf/domain_conf.c:3413
 msgid "Invalid partial specification for virtio ccw address"
 msgstr ""
 
-#: src/conf/domain_conf.c:3390
+#: src/conf/domain_conf.c:3515
 msgid "Cannot parse <address> 'reg' attribute"
 msgstr "无法解析 <address> 'reg' 属性"
 
-#: src/conf/domain_conf.c:3418
+#: src/conf/domain_conf.c:2184
 msgid "Cannot parse <master> 'startport' attribute"
 msgstr "无法解析 <master> 'startport' 属性"
 
-#: src/conf/domain_conf.c:3441
+#: src/conf/domain_conf.c:2311
 msgid "missing boot order attribute"
 msgstr "缺少引导顺序属性"
 
-#: src/conf/domain_conf.c:3446
+#: src/conf/domain_conf.c:2316
 #, c-format
 msgid "incorrect boot order '%s', expecting positive integer"
 msgstr "错误的引导顺序 '%s‘，应为正整数。"
 
-#: src/conf/domain_conf.c:3454
+#: src/conf/domain_conf.c:3579
 #, c-format
 msgid "boot order '%s' used for more than one device"
 msgstr ""
 
-#: src/conf/domain_conf.c:3487
+#: src/conf/domain_conf.c:3612
 msgid "Cannot parse <address> 'iobase' attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:3494
+#: src/conf/domain_conf.c:3619
 msgid "Cannot parse <address> 'irq' attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:3570
+#: src/conf/domain_conf.c:5979
 #, c-format
 msgid "unknown rom bar value '%s'"
 msgstr "未知 rom bar 值 '%s'"
 
-#: src/conf/domain_conf.c:3586
+#: src/conf/domain_conf.c:2247
 #, c-format
 msgid "unknown address type '%s'"
 msgstr "未知地址类型 '%s'"
 
-#: src/conf/domain_conf.c:3591
+#: src/conf/domain_conf.c:2252
 msgid "No type specified for device address"
 msgstr "没有指定设备地址类型"
 
-#: src/conf/domain_conf.c:3644
+#: src/conf/domain_conf.c:2286
 msgid "Unknown device address type"
 msgstr "未知设备地址类型"
 
-#: src/conf/domain_conf.c:3691
+#: src/conf/domain_conf.c:3816
 #, c-format
 msgid "Unknown startup policy '%s'"
 msgstr "未知启动策略 '%s'"
 
-#: src/conf/domain_conf.c:3721
+#: src/conf/domain_conf.c:5719
 #, c-format
 msgid "cannot parse vendor id %s"
 msgstr "无法解析零售商 id %s"
 
-#: src/conf/domain_conf.c:3728
+#: src/conf/domain_conf.c:5726
 msgid "usb vendor needs id"
 msgstr "usb 零售商需要 id"
 
-#: src/conf/domain_conf.c:3739
+#: src/conf/domain_conf.c:5737
 #, c-format
 msgid "cannot parse product %s"
 msgstr "无法解析产品 %s"
 
-#: src/conf/domain_conf.c:3747
+#: src/conf/domain_conf.c:5745
 msgid "usb product needs id"
 msgstr "usb 产品需要 id"
 
-#: src/conf/domain_conf.c:3758
+#: src/conf/domain_conf.c:5756
 #, c-format
 msgid "cannot parse bus %s"
 msgstr "无法解析总线 %s"
 
-#: src/conf/domain_conf.c:3765
+#: src/conf/domain_conf.c:5763
 msgid "usb address needs bus id"
 msgstr "usb 地址需要总线 id"
 
-#: src/conf/domain_conf.c:3774
+#: src/conf/domain_conf.c:5772
 #, c-format
 msgid "cannot parse device %s"
 msgstr "无法解析设备 %s"
 
-#: src/conf/domain_conf.c:3782
+#: src/conf/domain_conf.c:5780
 msgid "usb address needs device id"
 msgstr "usb 地址需要设备 id"
 
-#: src/conf/domain_conf.c:3787
+#: src/conf/domain_conf.c:5785
 #, c-format
 msgid "unknown usb source type '%s'"
 msgstr "未知 usb 源类型 '%s'"
 
-#: src/conf/domain_conf.c:3797
+#: src/conf/domain_conf.c:5795
 msgid "vendor cannot be 0."
 msgstr "零售商不可为 0。"
 
-#: src/conf/domain_conf.c:3803
+#: src/conf/domain_conf.c:5801
 msgid "missing vendor"
 msgstr "缺少经销商"
 
-#: src/conf/domain_conf.c:3808
+#: src/conf/domain_conf.c:5806
 msgid "missing product"
 msgstr "缺少产品"
 
-#: src/conf/domain_conf.c:3842
+#: src/conf/domain_conf.c:5840
 #, c-format
 msgid "unsupported element '%s' of 'origstates'"
 msgstr "不支持 'origstates' 的元素 '%s'"
 
-#: src/conf/domain_conf.c:3878 src/conf/domain_conf.c:5664
-#: src/conf/domain_conf.c:6568
+#: src/conf/domain_conf.c:2970 src/conf/domain_conf.c:3553
+#: src/conf/domain_conf.c:5876
 #, c-format
 msgid "Unable to parse devaddr parameter '%s'"
 msgstr "无法解析设备地址参数 '%s'"
 
-#: src/conf/domain_conf.c:3891
+#: src/conf/domain_conf.c:5889
 #, c-format
 msgid "unknown pci source type '%s'"
 msgstr "未知 pci 源类型 '%s'"
 
-#: src/conf/domain_conf.c:3919
+#: src/conf/domain_conf.c:4044
 msgid "more than one source addresses is specified for scsi hostdev"
 msgstr ""
 
-#: src/conf/domain_conf.c:3928
+#: src/conf/domain_conf.c:4053
 msgid ""
 "'bus', 'target', and 'unit' must be specified for scsi hostdev source address"
 msgstr ""
 
-#: src/conf/domain_conf.c:3935
+#: src/conf/domain_conf.c:4060
 #, c-format
 msgid "cannot parse bus '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:3941
+#: src/conf/domain_conf.c:4066
 #, c-format
 msgid "cannot parse target '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:3947
+#: src/conf/domain_conf.c:4072
 #, c-format
 msgid "cannot parse unit '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:3955
+#: src/conf/domain_conf.c:4080
 msgid "more than one adapters is specified for scsi hostdev source"
 msgstr ""
 
-#: src/conf/domain_conf.c:3962
+#: src/conf/domain_conf.c:4087
 msgid "'adapter' must be specified for scsi hostdev source"
 msgstr ""
 
-#: src/conf/domain_conf.c:3969
+#: src/conf/domain_conf.c:4094
 #, c-format
 msgid "unsupported element '%s' of scsi hostdev source"
 msgstr ""
 
-#: src/conf/domain_conf.c:3979
+#: src/conf/domain_conf.c:4104
 msgid "'adapter' and 'address' must be specified for scsi hostdev source"
 msgstr ""
 
-#: src/conf/domain_conf.c:4165 src/conf/domain_conf.c:4269
+#: src/conf/domain_conf.c:4290 src/conf/domain_conf.c:4394
 #, c-format
 msgid "unknown host device source address type '%s'"
 msgstr "未知主机设备源地址类型 '%s'"
 
-#: src/conf/domain_conf.c:4171 src/conf/domain_conf.c:4275
+#: src/conf/domain_conf.c:4296 src/conf/domain_conf.c:4400
 msgid "missing source address type"
 msgstr "缺少源地址类型"
 
-#: src/conf/domain_conf.c:4177 src/conf/domain_conf.c:4281
+#: src/conf/domain_conf.c:4302 src/conf/domain_conf.c:4406
 msgid "Missing <source> element in hostdev device"
 msgstr "在 hostdev 设备中缺少 <source> 元素"
 
-#: src/conf/domain_conf.c:4184
+#: src/conf/domain_conf.c:4309
 msgid "Setting startupPolicy is only allowed for USB devices"
 msgstr "只允许为 USB 设备设定 startupPolicy"
 
-#: src/conf/domain_conf.c:4193
+#: src/conf/domain_conf.c:4318
 msgid "sgio is only supported for scsi host device"
 msgstr ""
 
-#: src/conf/domain_conf.c:4200
+#: src/conf/domain_conf.c:4325
 #, c-format
 msgid "unknown sgio mode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:4215
+#: src/conf/domain_conf.c:4340
 #, c-format
 msgid "Unknown PCI device <driver name='%s'/> has been specified"
 msgstr ""
 
-#: src/conf/domain_conf.c:4235 src/conf/domain_conf.c:4312
+#: src/conf/domain_conf.c:4360 src/conf/domain_conf.c:4437
 #, c-format
 msgid "address type='%s' not supported in hostdev interfaces"
 msgstr "hostdev 接口不支持地址类型 '%s'"
 
-#: src/conf/domain_conf.c:4290
+#: src/conf/domain_conf.c:4415
 msgid "Missing <block> element in hostdev storage device"
 msgstr ""
 
-#: src/conf/domain_conf.c:4298
+#: src/conf/domain_conf.c:4423
 msgid "Missing <char> element in hostdev character device"
 msgstr ""
 
-#: src/conf/domain_conf.c:4306
+#: src/conf/domain_conf.c:4431
 msgid "Missing <interface> element in hostdev net device"
 msgstr ""
 
-#: src/conf/domain_conf.c:4365
+#: src/conf/domain_conf.c:4490
 #, c-format
 msgid "Unknown disk name '%s' and no address specified"
 msgstr "未知磁盘名称 '%s' 且未指定地址"
 
-#: src/conf/domain_conf.c:4452
+#: src/conf/domain_conf.c:6143
 msgid "invalid security type"
 msgstr "无效安全性类型 %s"
 
-#: src/conf/domain_conf.c:4466 src/conf/domain_conf.c:4693
+#: src/conf/domain_conf.c:6155
 #, c-format
 msgid "invalid security relabel value %s"
 msgstr "无效安全重新标记值 %s"
 
-#: src/conf/domain_conf.c:4474
+#: src/conf/domain_conf.c:6163
 msgid "dynamic label type must use resource relabeling"
 msgstr "动态标签类型必须使用资源重新标记"
 
-#: src/conf/domain_conf.c:4480
+#: src/conf/domain_conf.c:4605
 msgid "resource relabeling is not compatible with 'none' label type"
 msgstr "资源重新标记与 'none' 标签类型不兼容"
 
-#: src/conf/domain_conf.c:4512
+#: src/conf/domain_conf.c:6182
 msgid "security label is missing"
 msgstr "缺少安全性标签"
 
-#: src/conf/domain_conf.c:4527
+#: src/conf/domain_conf.c:6196
 msgid "security imagelabel is missing"
 msgstr "缺少安全性映像标签"
 
-#: src/conf/domain_conf.c:4604
+#: src/conf/domain_conf.c:4729
 msgid "missing security model in domain seclabel"
 msgstr "域 seclabel 中缺少安全模式"
 
-#: src/conf/domain_conf.c:4614
+#: src/conf/domain_conf.c:4739
 msgid "missing security model when using multiple labels"
 msgstr "使用多重标签时缺少安全型号"
 
-#: src/conf/domain_conf.c:4680
+#: src/conf/domain_conf.c:4805
 msgid "label overrides require relabeling to be enabled at the domain level"
 msgstr "标签覆盖要求在域级别启用重新标记"
 
-#: src/conf/domain_conf.c:4717
+#: src/conf/domain_conf.c:4842
 #, c-format
 msgid "Cannot specify a label if relabelling is turned off. model=%s"
 msgstr "如果关闭重新标记功能则无法指定标签。model=%s"
 
-#: src/conf/domain_conf.c:4774
+#: src/conf/domain_conf.c:2468
 msgid "Missing 'key' element for lease"
 msgstr "租约缺少 'key' 元素"
 
-#: src/conf/domain_conf.c:4779
+#: src/conf/domain_conf.c:2473
 msgid "Missing 'target' element for lease"
 msgstr "租约缺少 'target' 元素"
 
-#: src/conf/domain_conf.c:4786
+#: src/conf/domain_conf.c:2480
 #, c-format
 msgid "Malformed lease target offset %s"
 msgstr "有缺陷的租约目标补偿 %s"
 
-#: src/conf/domain_conf.c:4834
+#: src/conf/domain_conf.c:4959
 msgid "'pool' and 'volume' must be specified together for 'pool' type source"
 msgstr ""
 
-#: src/conf/domain_conf.c:4842
+#: src/conf/domain_conf.c:4967
 #, c-format
 msgid "unknown source mode '%s' for volume type disk"
 msgstr ""
 
-#: src/conf/domain_conf.c:4888
+#: src/conf/domain_conf.c:5013
 msgid "missing network source protocol type"
 msgstr ""
 
-#: src/conf/domain_conf.c:4894
+#: src/conf/domain_conf.c:2590
 #, c-format
 msgid "unknown protocol type '%s'"
 msgstr "未知协议类型 '%s'"
 
-#: src/conf/domain_conf.c:4901
+#: src/conf/domain_conf.c:2597
 msgid "missing name for disk source"
 msgstr "缺少磁盘源名称"
 
-#: src/conf/domain_conf.c:4917
+#: src/conf/domain_conf.c:5042
 #, c-format
 msgid "unknown protocol transport type '%s'"
 msgstr "未知协议传输类型 '%s'"
 
-#: src/conf/domain_conf.c:4928
+#: src/conf/domain_conf.c:5053
 msgid "missing socket for unix transport"
 msgstr "缺少用于 unix 传输的插槽"
 
-#: src/conf/domain_conf.c:4935
+#: src/conf/domain_conf.c:5060
 #, c-format
 msgid "transport '%s' does not support socket attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:4946
+#: src/conf/domain_conf.c:2615
 msgid "missing name for host"
 msgstr "缺少主机名称"
 
-#: src/conf/domain_conf.c:4965 src/conf/domain_conf.c:14669
+#: src/conf/domain_conf.c:2630 src/conf/domain_conf.c:9800
 #, c-format
 msgid "unexpected disk type %s"
 msgstr "意外的磁盘类型 %s"
 
-#: src/conf/domain_conf.c:5062
+#: src/conf/domain_conf.c:2554
 #, c-format
 msgid "unknown disk type '%s'"
 msgstr "未知磁盘类型 '%s'"
 
-#: src/conf/domain_conf.c:5114
+#: src/conf/domain_conf.c:5239
 msgid "invalid geometry settings (cyls)"
 msgstr "无效几何设置（磁道数）"
 
-#: src/conf/domain_conf.c:5120
+#: src/conf/domain_conf.c:5245
 msgid "invalid geometry settings (heads)"
 msgstr "无效几何设置（磁头）"
 
-#: src/conf/domain_conf.c:5126
+#: src/conf/domain_conf.c:5251
 msgid "invalid geometry settings (secs)"
 msgstr "无效几何设置（扇区）"
 
-#: src/conf/domain_conf.c:5134
+#: src/conf/domain_conf.c:5259
 #, c-format
 msgid "invalid translation value '%s'"
 msgstr "无效转换值 '%s'"
 
-#: src/conf/domain_conf.c:5146
+#: src/conf/domain_conf.c:5271
 #, c-format
 msgid "invalid logical block size '%s'"
 msgstr "无效逻辑块大小 '%s'"
 
-#: src/conf/domain_conf.c:5156
+#: src/conf/domain_conf.c:5281
 #, c-format
 msgid "invalid physical block size '%s'"
 msgstr "无效物理块大小 '%s'"
 
-#: src/conf/domain_conf.c:5184
+#: src/conf/domain_conf.c:5309
 msgid "mirror requires file name"
 msgstr "镜像需要文件名"
 
-#: src/conf/domain_conf.c:5197
+#: src/conf/domain_conf.c:2666
 msgid "missing username for auth"
 msgstr "认证缺少用户名"
 
-#: src/conf/domain_conf.c:5209
+#: src/conf/domain_conf.c:2678
 msgid "missing type for secret"
 msgstr "缺少保密类型"
 
-#: src/conf/domain_conf.c:5216
+#: src/conf/domain_conf.c:2684
 #, c-format
 msgid "invalid secret type %s"
 msgstr "无效保密类型 %s"
 
-#: src/conf/domain_conf.c:5226
+#: src/conf/domain_conf.c:5351
 msgid "only one of uuid and usage can be specified"
 msgstr "只能指定 uuid 和 usage 中的一个"
 
-#: src/conf/domain_conf.c:5232
+#: src/conf/domain_conf.c:5357
 msgid "either uuid or usage should be specified for a secret"
 msgstr "应为 secret 指定 uuid 或者 usage"
 
-#: src/conf/domain_conf.c:5242
+#: src/conf/domain_conf.c:2702
 #, c-format
 msgid "malformed uuid %s"
 msgstr "有缺陷的 uuid %s"
 
-#: src/conf/domain_conf.c:5296
+#: src/conf/domain_conf.c:2756
 msgid "total and read/write bytes_sec cannot be set at the same time"
 msgstr "无法在同时设置读取/写入 bytes_sec"
 
-#: src/conf/domain_conf.c:5306
+#: src/conf/domain_conf.c:2766
 msgid "total and read/write iops_sec cannot be set at the same time"
 msgstr "无法同时设置总的和读取/写入 iops_sec"
 
-#: src/conf/domain_conf.c:5341
+#: src/conf/domain_conf.c:5466
 msgid "disk vendor is more than 8 characters"
 msgstr "磁盘零售商不得超过 8 个字符"
 
-#: src/conf/domain_conf.c:5347
+#: src/conf/domain_conf.c:5472
 msgid "disk vendor is not printable string"
 msgstr "磁盘零售商不是可打印字符"
 
-#: src/conf/domain_conf.c:5356
+#: src/conf/domain_conf.c:5481
 msgid "disk product is more than 16 characters"
 msgstr "磁盘产品不得超过 16 个字符"
 
-#: src/conf/domain_conf.c:5362
+#: src/conf/domain_conf.c:5487
 msgid "disk product is not printable string"
 msgstr "磁盘产品不是可打印字符"
 
-#: src/conf/domain_conf.c:5374
+#: src/conf/domain_conf.c:5499
 #, c-format
 msgid "invalid secret type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:5383
+#: src/conf/domain_conf.c:2802
 #, c-format
 msgid "unknown disk device '%s'"
 msgstr "未知磁盘设备 '%s'"
 
-#: src/conf/domain_conf.c:5434
+#: src/conf/domain_conf.c:2828
 #, c-format
 msgid "Invalid floppy device name: %s"
 msgstr "无效软盘设备名称：%s"
 
-#: src/conf/domain_conf.c:5450
+#: src/conf/domain_conf.c:2843
 #, c-format
 msgid "Invalid harddisk device name: %s"
 msgstr "无效硬盘设备名称：%s"
 
-#: src/conf/domain_conf.c:5458 src/conf/snapshot_conf.c:125
+#: src/conf/domain_conf.c:2851 src/conf/domain_conf.c:12255
 #, c-format
 msgid "unknown disk snapshot setting '%s'"
 msgstr "未知磁盘快照设置 '%s'"
 
-#: src/conf/domain_conf.c:5469
+#: src/conf/domain_conf.c:5594
 msgid "rawio or sgio can be used only with device='lun'"
 msgstr ""
 
-#: src/conf/domain_conf.c:5482
+#: src/conf/domain_conf.c:5607
 #, c-format
 msgid "unknown disk rawio setting '%s'"
 msgstr "未知磁盘 rawio 设置 '%s'"
 
-#: src/conf/domain_conf.c:5491
+#: src/conf/domain_conf.c:5616
 #, c-format
 msgid "unknown disk sgio mode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:5499
+#: src/conf/domain_conf.c:2862
 #, c-format
 msgid "unknown disk bus type '%s'"
 msgstr "未知磁盘总线类型 '%s'"
 
-#: src/conf/domain_conf.c:5524
+#: src/conf/domain_conf.c:5649
 #, c-format
 msgid "unknown disk tray status '%s'"
 msgstr "未知磁盘托盘状态 '%s'"
 
-#: src/conf/domain_conf.c:5531
+#: src/conf/domain_conf.c:5656
 msgid "tray is only valid for cdrom and floppy"
 msgstr "托盘只能在光驱盒软盘中使用"
 
-#: src/conf/domain_conf.c:5543
+#: src/conf/domain_conf.c:5668
 #, c-format
 msgid "unknown disk removable status '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:5549
+#: src/conf/domain_conf.c:5674
 msgid "removable is only valid for usb disks"
 msgstr ""
 
-#: src/conf/domain_conf.c:5561
+#: src/conf/domain_conf.c:2887
 #, c-format
 msgid "Invalid bus type '%s' for floppy disk"
 msgstr "软盘的无效总线类型 '%s'"
 
-#: src/conf/domain_conf.c:5567
+#: src/conf/domain_conf.c:2893
 #, c-format
 msgid "Invalid bus type '%s' for disk"
 msgstr "软盘的无效总线类型 '%s'"
 
-#: src/conf/domain_conf.c:5574
+#: src/conf/domain_conf.c:2900
 #, c-format
 msgid "unknown disk cache mode '%s'"
 msgstr "未知磁盘缓存模式类型 '%s'"
 
-#: src/conf/domain_conf.c:5581
+#: src/conf/domain_conf.c:2907
 #, c-format
 msgid "unknown disk error policy '%s'"
 msgstr "未知磁盘错误策略 '%s'"
 
-#: src/conf/domain_conf.c:5590
+#: src/conf/domain_conf.c:2916
 #, c-format
 msgid "unknown disk read error policy '%s'"
 msgstr "未知磁盘读取错误策略 '%s'"
 
-#: src/conf/domain_conf.c:5599
+#: src/conf/domain_conf.c:2925
 #, c-format
 msgid "unknown disk io mode '%s'"
 msgstr "未知磁盘 io 模式 '%s'"
 
-#: src/conf/domain_conf.c:5609
+#: src/conf/domain_conf.c:2933
 msgid "disk ioeventfd mode supported only for virtio bus"
 msgstr "只有 virtio 总线支持磁盘 ioeventfd 模式"
 
-#: src/conf/domain_conf.c:5616
+#: src/conf/domain_conf.c:2941
 #, c-format
 msgid "unknown disk ioeventfd mode '%s'"
 msgstr "未知磁盘 ioeventfd 模式 '%s'"
 
-#: src/conf/domain_conf.c:5626
+#: src/conf/domain_conf.c:2951
 msgid "disk event_idx mode supported only for virtio bus"
 msgstr "只有 virtio 总线支持 event_idx 模式"
 
-#: src/conf/domain_conf.c:5634
+#: src/conf/domain_conf.c:2959
 #, c-format
 msgid "unknown disk event_idx mode '%s'"
 msgstr "未知磁盘 event_idx 模式 '%s'"
 
-#: src/conf/domain_conf.c:5645
+#: src/conf/domain_conf.c:5770
 #, c-format
 msgid "unknown disk copy_on_read mode '%s'"
 msgstr "未知磁盘 copy_on_read 模式 '%s'"
 
-#: src/conf/domain_conf.c:5655
+#: src/conf/domain_conf.c:5780
 #, c-format
 msgid "unknown disk discard mode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:5680
+#: src/conf/domain_conf.c:2985
 #, c-format
 msgid "unknown startupPolicy value '%s'"
 msgstr "未知 startupPolicy 值 '%s'"
 
-#: src/conf/domain_conf.c:5687
+#: src/conf/domain_conf.c:5812
 #, c-format
 msgid "Setting disk %s is not allowed for disk of network type"
 msgstr ""
 
-#: src/conf/domain_conf.c:5697
+#: src/conf/domain_conf.c:5822
 msgid "Setting disk 'requisite' is allowed only for cdrom or floppy"
 msgstr ""
 
-#: src/conf/domain_conf.c:5730 src/conf/domain_conf.c:6160
+#: src/conf/domain_conf.c:5855 src/conf/domain_conf.c:6285
 #, c-format
 msgid "unknown driver format value '%s'"
 msgstr "未知驱动器格式值 '%s'"
 
-#: src/conf/domain_conf.c:5740
+#: src/conf/domain_conf.c:5865
 #, c-format
 msgid "unknown mirror format value '%s'"
 msgstr "未知镜像格式值 '%s'"
 
-#: src/conf/domain_conf.c:5823
+#: src/conf/domain_conf.c:5948
 #, c-format
 msgid "could not parse element %s"
 msgstr "无法解析元素 %s"
 
-#: src/conf/domain_conf.c:5827
+#: src/conf/domain_conf.c:5952
 #, c-format
 msgid "missing element %s"
 msgstr "缺少元素 %s"
 
-#: src/conf/domain_conf.c:5891
+#: src/conf/domain_conf.c:3110
 #, c-format
 msgid "Unknown controller type '%s'"
 msgstr "未知控制器类型 '%s'"
 
-#: src/conf/domain_conf.c:5901
+#: src/conf/domain_conf.c:3119
 #, c-format
 msgid "Cannot parse controller index %s"
 msgstr "无法解析控制器索引 %s"
 
-#: src/conf/domain_conf.c:5910
+#: src/conf/domain_conf.c:3128
 #, c-format
 msgid "Unknown model type '%s'"
 msgstr "位置型号类型 '%s'"
 
-#: src/conf/domain_conf.c:5928
+#: src/conf/domain_conf.c:6053
 #, c-format
 msgid "Malformed 'queues' value '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:5943
+#: src/conf/domain_conf.c:3146
 #, c-format
 msgid "Invalid ports: %s"
 msgstr "无效端口：%s"
 
-#: src/conf/domain_conf.c:5958
+#: src/conf/domain_conf.c:3161
 #, c-format
 msgid "Invalid vectors: %s"
 msgstr "无效矢量：%s"
 
-#: src/conf/domain_conf.c:5997
+#: src/conf/domain_conf.c:6122
 msgid "pci-root and pcie-root controllers should not have an address"
 msgstr ""
 
-#: src/conf/domain_conf.c:6003
+#: src/conf/domain_conf.c:6128
 msgid "pci-root and pcie-root controllers should have index 0"
 msgstr ""
 
-#: src/conf/domain_conf.c:6029
+#: src/conf/domain_conf.c:3179
 msgid "Controllers must use the 'pci' address type"
 msgstr "控制器必须使用 ‘pci’ 地址类型"
 
-#: src/conf/domain_conf.c:6085
+#: src/conf/domain_conf.c:3219
 #, c-format
 msgid "unknown filesystem type '%s'"
 msgstr "未知文件系统类型 '%s'"
 
-#: src/conf/domain_conf.c:6096
+#: src/conf/domain_conf.c:3230
 #, c-format
 msgid "unknown accessmode '%s'"
 msgstr "未知访问模式 '%s'"
 
-#: src/conf/domain_conf.c:6152
+#: src/conf/domain_conf.c:3266
 #, c-format
 msgid "unknown fs driver type '%s'"
 msgstr "未知 fs 驱动器类型 '%s'"
 
-#: src/conf/domain_conf.c:6168
+#: src/conf/domain_conf.c:6293
 #, c-format
 msgid "unknown filesystem write policy '%s'"
 msgstr "未知文件系统写入策略 '%s'"
 
-#: src/conf/domain_conf.c:6191
+#: src/conf/domain_conf.c:6316
 msgid "missing 'usage' attribute for RAM filesystem"
 msgstr "RAM 文件系统缺少 'usage' 属性"
 
-#: src/conf/domain_conf.c:6196
+#: src/conf/domain_conf.c:6321
 #, c-format
 msgid "cannot parse usage '%s' for RAM filesystem"
 msgstr "无法为 RAM 文件系统解析 usage '%s'"
 
-#: src/conf/domain_conf.c:6258
+#: src/conf/domain_conf.c:3328
 msgid "missing type attribute in interface's <actual> element"
 msgstr "接口的 <actual> 元素缺少 type 属性"
 
-#: src/conf/domain_conf.c:6263
+#: src/conf/domain_conf.c:3333
 #, c-format
 msgid "unknown type '%s' in interface's <actual> element"
 msgstr "接口的 <actual> 元素缺少 type 类型 '%s'"
 
-#: src/conf/domain_conf.c:6271
+#: src/conf/domain_conf.c:3340
 #, c-format
 msgid "unsupported type '%s' in interface's <actual> element"
 msgstr "不支持接口 <actual> 元素中的类型 '%s'"
 
-#: src/conf/domain_conf.c:6292
+#: src/conf/domain_conf.c:6417
 #, c-format
 msgid ""
 "<virtualport> element unsupported for type='%s' in interface's <actual> "
 "element"
 msgstr "<virtualport> 元素不支持接口 <actual> 元素中的 type='%s'"
 
-#: src/conf/domain_conf.c:6306
+#: src/conf/domain_conf.c:6431
 #, c-format
 msgid "Unknown mode '%s' in interface <actual> element"
 msgstr "接口 <actual> 元素中的未知模式 '%s'"
 
-#: src/conf/domain_conf.c:6337
+#: src/conf/domain_conf.c:6462
 #, c-format
 msgid "Unable to parse class id '%s'"
 msgstr "无法解析 class id '%s'"
 
-#: src/conf/domain_conf.c:6421
+#: src/conf/domain_conf.c:3438
 #, c-format
 msgid "unknown interface type '%s'"
 msgstr "未知接口类型 '%s'"
 
-#: src/conf/domain_conf.c:6472
+#: src/conf/domain_conf.c:6597
 #, c-format
 msgid "<virtualport> element unsupported for <interface type='%s'>"
 msgstr "不支持 <interface type='%s'> 的 <virtualport> 元素"
 
-#: src/conf/domain_conf.c:6514
+#: src/conf/domain_conf.c:6639
 msgid ""
 "Invalid specification of multiple <filterref>s in a single <interface>"
 msgstr "单一 <interface> 中有多个 <filterref> 的无效说明"
 
-#: src/conf/domain_conf.c:6550 src/qemu/qemu_command.c:10560
+#: src/conf/domain_conf.c:3541 src/qemu/qemu_command.c:6158
 #, c-format
 msgid "unable to parse mac address '%s'"
 msgstr "无法解析 mac 地址 '%s'"
 
-#: src/conf/domain_conf.c:6556
+#: src/conf/domain_conf.c:6681
 #, c-format
 msgid "expected unicast mac address, found multicast '%s'"
 msgstr "意外单播 mac 地址，找到多播 '%s'"
 
-#: src/conf/domain_conf.c:6589
+#: src/conf/domain_conf.c:3568
 msgid "Network interfaces must use 'pci' address type"
 msgstr "网络接口必须使用 ‘pci’ 地址类型"
 
-#: src/conf/domain_conf.c:6597
+#: src/conf/domain_conf.c:3576
 msgid ""
 "No <source> 'network' attribute specified with <interface type='network'/>"
 msgstr "没有使用 <interface type='network'/> 指定 <source>‘networking’属性"
 
-#: src/conf/domain_conf.c:6623
+#: src/conf/domain_conf.c:3608
 msgid ""
 "No <source> 'bridge' attribute specified with <interface type='bridge'/>"
 msgstr "没有<source> <interface type='bridge'/> 指定的 'bridge' 属性"
 
-#: src/conf/domain_conf.c:6640
+#: src/conf/domain_conf.c:3628
 msgid "No <source> 'port' attribute specified with socket interface"
 msgstr "没有使用套接字接口指定 <source>‘port’属性"
 
-#: src/conf/domain_conf.c:6646
+#: src/conf/domain_conf.c:3633
 msgid "Cannot parse <source> 'port' attribute with socket interface"
 msgstr "无法使用套接自接口解析 <source> 'port' 属性"
 
-#: src/conf/domain_conf.c:6655
+#: src/conf/domain_conf.c:3641
 msgid "No <source> 'address' attribute specified with socket interface"
 msgstr "没有使用套接自接口指定的 <source> 'address' 属性"
 
-#: src/conf/domain_conf.c:6668
+#: src/conf/domain_conf.c:3653
 msgid ""
 "No <source> 'name' attribute specified with <interface type='internal'/>"
 msgstr "没有指定为 <interface type='internal'/> 的 <source> 'name' 属性"
 
-#: src/conf/domain_conf.c:6679
+#: src/conf/domain_conf.c:3663
 msgid "No <source> 'dev' attribute specified with <interface type='direct'/>"
 msgstr "没有使用 <interface type='direct'/> 指定 <source> 'dev' 属性"
 
-#: src/conf/domain_conf.c:6688
+#: src/conf/domain_conf.c:6813
 msgid "Unknown mode has been specified"
 msgstr "已指定未知模式"
 
-#: src/conf/domain_conf.c:6748
+#: src/conf/domain_conf.c:3709
 msgid "Model name contains invalid characters"
 msgstr "模块名称中含有无效字符"
 
-#: src/conf/domain_conf.c:6762
+#: src/conf/domain_conf.c:3723
 #, c-format
 msgid "Unknown interface <driver name='%s'> has been specified"
 msgstr "已指定未知接口 <driver name='%s'>"
 
-#: src/conf/domain_conf.c:6774
+#: src/conf/domain_conf.c:3735
 #, c-format
 msgid "Unknown interface <driver txmode='%s'> has been specified"
 msgstr "已指定未知接口 <driver txmode='%s'>"
 
-#: src/conf/domain_conf.c:6785
+#: src/conf/domain_conf.c:3746
 #, c-format
 msgid "unknown interface ioeventfd mode '%s'"
 msgstr "未知接口 ioeventfd 模式 '%s'"
 
-#: src/conf/domain_conf.c:6795
+#: src/conf/domain_conf.c:3756
 #, c-format
 msgid "unknown interface event_idx mode '%s'"
 msgstr "未知接口 event_idx 模式 '%s'"
 
-#: src/conf/domain_conf.c:6805
+#: src/conf/domain_conf.c:6930
 #, c-format
 msgid "'queues' attribute must be positive number: %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:6817
+#: src/conf/domain_conf.c:3768
 #, c-format
 msgid "unknown interface link state '%s'"
 msgstr "未知接口链接状态 '%s'"
 
-#: src/conf/domain_conf.c:6843
+#: src/conf/domain_conf.c:3794
 msgid "sndbuf must be a positive integer"
 msgstr "sndbuf 必须是一个正整数"
 
-#: src/conf/domain_conf.c:6887
+#: src/conf/domain_conf.c:3842
 #, c-format
 msgid "target type must be specified for %s device"
 msgstr "必须为 %s 设备指定目标类型"
 
-#: src/conf/domain_conf.c:6955
+#: src/conf/domain_conf.c:7080
 #, c-format
 msgid "unknown target type '%s' specified for character device"
 msgstr "为字符设备制定的未知目标类型 '%s'"
 
-#: src/conf/domain_conf.c:6972
+#: src/conf/domain_conf.c:3928
 msgid "guestfwd channel does not define a target address"
 msgstr "guestfwd 频道没有定义目标地址"
 
-#: src/conf/domain_conf.c:6982
+#: src/conf/domain_conf.c:3943
 msgid "guestfwd channel only supports IPv4 addresses"
 msgstr "guestfwd 频道只支持 IPv2 地址"
 
-#: src/conf/domain_conf.c:6989
+#: src/conf/domain_conf.c:3950
 msgid "guestfwd channel does not define a target port"
 msgstr "guestfwd 频道没有定义目标端口"
 
-#: src/conf/domain_conf.c:6996 src/conf/domain_conf.c:7020
-#: src/conf/storage_conf.c:633
+#: src/conf/domain_conf.c:3957 src/conf/domain_conf.c:3981
+#: src/conf/storage_conf.c:439
 #, c-format
 msgid "Invalid port number: %s"
 msgstr "无效端口号：%s"
 
-#: src/conf/domain_conf.c:7094
+#: src/conf/domain_conf.c:4053
 #, c-format
 msgid "Unknown source mode '%s'"
 msgstr "未知的来源模式类型 '%s'"
 
-#: src/conf/domain_conf.c:7150 src/conf/domain_conf.c:7232
+#: src/conf/domain_conf.c:4086 src/conf/domain_conf.c:4169
 msgid "Missing source path attribute for char device"
 msgstr "缺少字符设备的源路径属性"
 
-#: src/conf/domain_conf.c:7162 src/conf/domain_conf.c:7180
+#: src/conf/domain_conf.c:4104 src/conf/domain_conf.c:4121
 msgid "Missing source host attribute for char device"
 msgstr "缺少字符设备的源主机属性"
 
-#: src/conf/domain_conf.c:7168 src/conf/domain_conf.c:7186
-#: src/conf/domain_conf.c:7211
+#: src/conf/domain_conf.c:4109 src/conf/domain_conf.c:4126
+#: src/conf/domain_conf.c:4151
 msgid "Missing source service attribute for char device"
 msgstr "缺少字符设备的源服务属性"
 
-#: src/conf/domain_conf.c:7202
+#: src/conf/domain_conf.c:4142
 #, c-format
 msgid "Unknown protocol '%s'"
 msgstr "未知的协议 '%s'"
 
-#: src/conf/domain_conf.c:7333 src/conf/domain_conf.c:7483
+#: src/conf/domain_conf.c:7379
+msgid "Missing source channel attribute for char device"
+msgstr ""
+
+#: src/conf/domain_conf.c:7384
+msgid "Invalid character in source channel for char device"
+msgstr ""
+
+#: src/conf/domain_conf.c:4272 src/conf/domain_conf.c:4416
 #, c-format
 msgid "unknown type presented to host for character device: %s"
 msgstr "主机中出现字符设备的未知类型：%s"
 
-#: src/conf/domain_conf.c:7341
+#: src/conf/domain_conf.c:4280
 #, c-format
 msgid "unknown character device type: %s"
 msgstr "未知字符设备类型：%s"
 
-#: src/conf/domain_conf.c:7369
+#: src/conf/domain_conf.c:4309
 msgid "spicevmc device type only supports virtio"
 msgstr "spicevmc 设备类型只支持 virtio"
 
-#: src/conf/domain_conf.c:7385 src/qemu/qemu_command.c:9705
+#: src/conf/domain_conf.c:7535 src/qemu/qemu_command.c:9759
 msgid "usb-serial requires address of usb type"
 msgstr ""
 
-#: src/conf/domain_conf.c:7416
+#: src/conf/domain_conf.c:4349
 msgid "missing smartcard device mode"
 msgstr "缺少智能卡设备类型"
 
-#: src/conf/domain_conf.c:7421
+#: src/conf/domain_conf.c:4354
 #, c-format
 msgid "unknown smartcard device mode: %s"
 msgstr "未知智能卡设备类型：%s"
 
-#: src/conf/domain_conf.c:7438 src/conf/domain_conf.c:7467
+#: src/conf/domain_conf.c:4371 src/conf/domain_conf.c:4400
 msgid "host-certificates mode needs exactly three certificates"
 msgstr "主机认证模式需要三个证书"
 
-#: src/conf/domain_conf.c:7458
+#: src/conf/domain_conf.c:4391
 #, c-format
 msgid "expecting absolute path: %s"
 msgstr "需要绝对路径：%s"
 
-#: src/conf/domain_conf.c:7477
+#: src/conf/domain_conf.c:4410
 msgid "passthrough mode requires a character device type attribute"
 msgstr "绕行模式需要字符设备类型属性"
 
-#: src/conf/domain_conf.c:7502
+#: src/conf/domain_conf.c:4434
 msgid "unknown smartcard mode"
 msgstr "未知智能卡模式"
 
-#: src/conf/domain_conf.c:7511
+#: src/conf/domain_conf.c:4443
 msgid "Controllers must use the 'ccid' address type"
 msgstr "控制器无法使用 ‘ccid’ 地址类型"
 
-#: src/conf/domain_conf.c:7559
+#: src/conf/domain_conf.c:7709
 #, c-format
 msgid "Unknown TPM frontend model '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:7572
+#: src/conf/domain_conf.c:7722
 msgid "only one TPM backend is supported"
 msgstr ""
 
-#: src/conf/domain_conf.c:7578
+#: src/conf/domain_conf.c:7728
 msgid "missing TPM device backend"
 msgstr ""
 
-#: src/conf/domain_conf.c:7584
+#: src/conf/domain_conf.c:7734
 msgid "missing TPM device backend type"
 msgstr ""
 
-#: src/conf/domain_conf.c:7590
+#: src/conf/domain_conf.c:7740
 #, c-format
 msgid "Unknown TPM backend type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:7644
+#: src/conf/domain_conf.c:4479
 msgid "missing input device type"
 msgstr "缺少输入设备类型"
 
-#: src/conf/domain_conf.c:7650
+#: src/conf/domain_conf.c:4485
 #, c-format
 msgid "unknown input device type '%s'"
 msgstr "未知输入设备类型 '%s'"
 
-#: src/conf/domain_conf.c:7657
+#: src/conf/domain_conf.c:4492
 #, c-format
 msgid "unknown input bus type '%s'"
 msgstr "未知输入总线类型 '%s'"
 
-#: src/conf/domain_conf.c:7665
+#: src/conf/domain_conf.c:4500
 #, c-format
 msgid "ps2 bus does not support %s input device"
 msgstr "ps2 总线不支持 %s 输入设备"
 
-#: src/conf/domain_conf.c:7671 src/conf/domain_conf.c:7678
+#: src/conf/domain_conf.c:4506 src/conf/domain_conf.c:4513
 #, c-format
 msgid "unsupported input bus %s"
 msgstr "不支持的输入总线 %s"
 
-#: src/conf/domain_conf.c:7683
+#: src/conf/domain_conf.c:4518
 #, c-format
 msgid "xen bus does not support %s input device"
 msgstr "xen 总线不支持 %s 输入设备"
 
-#: src/conf/domain_conf.c:7706 src/conf/domain_conf.c:9378
+#: src/conf/domain_conf.c:4541 src/conf/domain_conf.c:6084
 msgid "Invalid address for a USB device"
 msgstr "USB 设备的无效地址"
 
-#: src/conf/domain_conf.c:7737
+#: src/conf/domain_conf.c:4574
 msgid "missing hub device type"
 msgstr "缺少集线器设备类型"
 
-#: src/conf/domain_conf.c:7743
+#: src/conf/domain_conf.c:4580
 #, c-format
 msgid "unknown hub device type '%s'"
 msgstr "未知集线器设备类型 '%s'"
 
-#: src/conf/domain_conf.c:7786
+#: src/conf/domain_conf.c:4625
 msgid "missing timer name"
 msgstr "缺少计时器名称"
 
-#: src/conf/domain_conf.c:7791
+#: src/conf/domain_conf.c:4630
 #, c-format
 msgid "unknown timer name '%s'"
 msgstr "未知计时器名称 '%s'"
 
-#: src/conf/domain_conf.c:7803
+#: src/conf/domain_conf.c:4642
 #, c-format
 msgid "unknown timer present value '%s'"
 msgstr "未知计时器当前值 '%s'"
 
-#: src/conf/domain_conf.c:7813
+#: src/conf/domain_conf.c:4652
 #, c-format
 msgid "unknown timer tickpolicy '%s'"
 msgstr "未知计时器 tickpolicy '%s'"
 
-#: src/conf/domain_conf.c:7823
+#: src/conf/domain_conf.c:4662
 #, c-format
 msgid "unknown timer track '%s'"
 msgstr "位置计时器跟踪 ‘%s’"
 
-#: src/conf/domain_conf.c:7833
+#: src/conf/domain_conf.c:4672
 msgid "invalid timer frequency"
 msgstr "无效计时器频率"
 
-#: src/conf/domain_conf.c:7842
+#: src/conf/domain_conf.c:4681
 #, c-format
 msgid "unknown timer mode '%s'"
 msgstr "未知计时器模式 ‘%s’"
 
-#: src/conf/domain_conf.c:7855
+#: src/conf/domain_conf.c:4694
 msgid "invalid catchup threshold"
 msgstr "无效 catchup 临界值"
 
-#: src/conf/domain_conf.c:7864
+#: src/conf/domain_conf.c:4703
 msgid "invalid catchup slew"
 msgstr "无效 catchup 回转"
 
-#: src/conf/domain_conf.c:7873
+#: src/conf/domain_conf.c:4712
 msgid "invalid catchup limit"
 msgstr "无效 catchup 极限"
 
-#: src/conf/domain_conf.c:7926
+#: src/conf/domain_conf.c:4765
 #, c-format
 msgid "cannot parse password validity time '%s', expect YYYY-MM-DDTHH:MM:SS"
 msgstr "无法解析密码有效时间 ‘%s’，应为 YYYY-MM-DDTHH:MM:SS"
 
-#: src/conf/domain_conf.c:7945
+#: src/conf/domain_conf.c:4784
 #, c-format
 msgid "unknown connected value %s"
 msgstr "未知的连接值 %s"
 
-#: src/conf/domain_conf.c:7956
+#: src/conf/domain_conf.c:4795
 msgid "VNC supports connected='keep' only"
 msgstr "VNC 只支持 connected='keep'"
 
-#: src/conf/domain_conf.c:7980
+#: src/conf/domain_conf.c:4817
 msgid "graphics listen type must be specified"
 msgstr "必须指定图形侦听类型"
 
-#: src/conf/domain_conf.c:7986
+#: src/conf/domain_conf.c:4823
 #, c-format
 msgid "unknown graphics listen type '%s'"
 msgstr "未知图形侦听类型 '%s'"
 
-#: src/conf/domain_conf.c:8006
+#: src/conf/domain_conf.c:4843
 msgid "network attribute not allowed when listen type is not network"
 msgstr "侦听类型不是 network 时不允许使用 network 属性"
 
-#: src/conf/domain_conf.c:8017
+#: src/conf/domain_conf.c:8172
 #, c-format
 msgid "Invalid fromConfig value: %s"
 msgstr "无效 fromConfig 值：%s"
 
-#: src/conf/domain_conf.c:8058
+#: src/conf/domain_conf.c:4885
 msgid "missing graphics device type"
 msgstr "缺少图形设备类型"
 
-#: src/conf/domain_conf.c:8064
+#: src/conf/domain_conf.c:4891
 #, c-format
 msgid "unknown graphics device type '%s'"
 msgstr "未知图形设备类型 '%s'"
 
-#: src/conf/domain_conf.c:8129
+#: src/conf/domain_conf.c:4958
 #, c-format
 msgid ""
 "graphics listen attribute %s must match address attribute of first listen "
 "element (found %s)"
 msgstr "图形侦听属性 %s 必须与第一个侦听元素的地址属性匹配（找到 %s）"
 
-#: src/conf/domain_conf.c:8147
+#: src/conf/domain_conf.c:4974
 #, c-format
 msgid "cannot parse vnc port %s"
 msgstr "无法解析 vnc 端口 %s"
 
-#: src/conf/domain_conf.c:8177
+#: src/conf/domain_conf.c:8332
 #, c-format
 msgid "cannot parse vnc WebSocket port %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8190 src/qemu/qemu_command.c:11354
+#: src/conf/domain_conf.c:8345 src/qemu/qemu_command.c:11409
 #, c-format
 msgid "unknown vnc display sharing policy '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:8215 src/conf/domain_conf.c:8282
+#: src/conf/domain_conf.c:5015 src/conf/domain_conf.c:5076
 #, c-format
 msgid "unknown fullscreen value '%s'"
 msgstr "未知全屏值 '%s'"
 
-#: src/conf/domain_conf.c:8234
+#: src/conf/domain_conf.c:5033
 #, c-format
 msgid "cannot parse rdp port %s"
 msgstr "无法解析 rdp 端口 %s"
 
-#: src/conf/domain_conf.c:8303
+#: src/conf/domain_conf.c:5094
 #, c-format
 msgid "cannot parse spice port %s"
 msgstr "无法解析 spice 端口 %s"
 
-#: src/conf/domain_conf.c:8316
+#: src/conf/domain_conf.c:5107
 #, c-format
 msgid "cannot parse spice tlsPort %s"
 msgstr "无法解析 spice tls 端口 %s"
 
-#: src/conf/domain_conf.c:8336
+#: src/conf/domain_conf.c:8491
 #, c-format
 msgid "unknown default spice channel mode %s"
 msgstr "未知默认 spice 通道模式 %s"
 
-#: src/conf/domain_conf.c:8372
+#: src/conf/domain_conf.c:5144
 msgid "spice channel missing name/mode"
 msgstr "spice 通道缺少名称/型号"
 
-#: src/conf/domain_conf.c:8380
+#: src/conf/domain_conf.c:5152
 #, c-format
 msgid "unknown spice channel name %s"
 msgstr "未知 spice 通道名称 %s"
 
-#: src/conf/domain_conf.c:8388
+#: src/conf/domain_conf.c:5160
 #, c-format
 msgid "unknown spice channel mode %s"
 msgstr "未知 spice 通道模式 %s"
 
-#: src/conf/domain_conf.c:8404
+#: src/conf/domain_conf.c:5176
 msgid "spice image missing compression"
 msgstr "spice 映像没有压缩"
 
-#: src/conf/domain_conf.c:8411
+#: src/conf/domain_conf.c:5183
 #, c-format
 msgid "unknown spice image compression %s"
 msgstr "未知 spice 映像压缩 %s"
 
-#: src/conf/domain_conf.c:8425
+#: src/conf/domain_conf.c:5197
 msgid "spice jpeg missing compression"
 msgstr "spice jpeg 缺少压缩"
 
-#: src/conf/domain_conf.c:8432
+#: src/conf/domain_conf.c:5204
 #, c-format
 msgid "unknown spice jpeg compression %s"
 msgstr "未知 spice jpeg 压缩 %s"
 
-#: src/conf/domain_conf.c:8446
+#: src/conf/domain_conf.c:5218
 msgid "spice zlib missing compression"
 msgstr "spice zlib 缺少压缩"
 
-#: src/conf/domain_conf.c:8453
+#: src/conf/domain_conf.c:5225
 #, c-format
 msgid "unknown spice zlib compression %s"
 msgstr "未知 spice zlib 压缩 %s"
 
-#: src/conf/domain_conf.c:8467
+#: src/conf/domain_conf.c:5239
 msgid "spice playback missing compression"
 msgstr "spice 回放缺少压缩"
 
-#: src/conf/domain_conf.c:8474
+#: src/conf/domain_conf.c:5246
 msgid "unknown spice playback compression"
 msgstr "未知 spice 回放压缩"
 
-#: src/conf/domain_conf.c:8488
+#: src/conf/domain_conf.c:5260
 msgid "spice streaming missing mode"
 msgstr "spice 流缺少模式"
 
-#: src/conf/domain_conf.c:8494
+#: src/conf/domain_conf.c:5266
 msgid "unknown spice streaming mode"
 msgstr "未知 spice 流模式"
 
-#: src/conf/domain_conf.c:8508
+#: src/conf/domain_conf.c:5280
 msgid "spice clipboard missing copypaste"
 msgstr "spice 剪切板缺少 copypaste"
 
-#: src/conf/domain_conf.c:8515
+#: src/conf/domain_conf.c:5287
 #, c-format
 msgid "unknown copypaste value '%s'"
 msgstr "未知 copypasta 值 '%s'"
 
-#: src/conf/domain_conf.c:8528
+#: src/conf/domain_conf.c:8683
+msgid "spice filetransfer missing enable"
+msgstr ""
+
+#: src/conf/domain_conf.c:8690
+#, c-format
+msgid "unknown enable value '%s'"
+msgstr ""
+
+#: src/conf/domain_conf.c:8703
 msgid "spice mouse missing mode"
 msgstr "spice 鼠标缺少模式"
 
-#: src/conf/domain_conf.c:8534
+#: src/conf/domain_conf.c:8709
 #, c-format
 msgid "unknown mouse mode value '%s'"
 msgstr "未知鼠标模式值 '%s'"
 
-#: src/conf/domain_conf.c:8575
+#: src/conf/domain_conf.c:8750
 #, c-format
 msgid "unknown codec type '%s'"
 msgstr "未知编解码器类型 '%s'"
 
-#: src/conf/domain_conf.c:8608
+#: src/conf/domain_conf.c:5330
 #, c-format
 msgid "unknown sound model '%s'"
 msgstr "未知声音模式类型 '%s'"
 
-#: src/conf/domain_conf.c:8675
+#: src/conf/domain_conf.c:5366
 msgid "watchdog must contain model name"
 msgstr "计时器必须包含模型名称"
 
-#: src/conf/domain_conf.c:8681
+#: src/conf/domain_conf.c:5372
 #, c-format
 msgid "unknown watchdog model '%s'"
 msgstr "未知监视器模型 '%s'"
 
-#: src/conf/domain_conf.c:8692
+#: src/conf/domain_conf.c:5383
 #, c-format
 msgid "unknown watchdog action '%s'"
 msgstr "未知监视器动作 '%s'"
 
-#: src/conf/domain_conf.c:8730
+#: src/conf/domain_conf.c:8905
 msgid "missing RNG device model"
 msgstr ""
 
-#: src/conf/domain_conf.c:8735
+#: src/conf/domain_conf.c:8910
 #, c-format
 msgid "unknown RNG model '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:8743
+#: src/conf/domain_conf.c:8918
 msgid "invalid RNG rate bytes value"
 msgstr ""
 
-#: src/conf/domain_conf.c:8750
+#: src/conf/domain_conf.c:8925
 msgid "invalid RNG rate period value"
 msgstr ""
 
-#: src/conf/domain_conf.c:8759
+#: src/conf/domain_conf.c:8934
 msgid "only one RNG backend is supported"
 msgstr ""
 
-#: src/conf/domain_conf.c:8765
+#: src/conf/domain_conf.c:8940
 msgid "missing RNG device backend model"
 msgstr ""
 
-#: src/conf/domain_conf.c:8771
+#: src/conf/domain_conf.c:8946
 #, c-format
 msgid "unknown RNG backend model '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:8782
+#: src/conf/domain_conf.c:8957
 #, c-format
 msgid "file '%s' is not a supported random source"
 msgstr ""
 
-#: src/conf/domain_conf.c:8791
+#: src/conf/domain_conf.c:8966
 msgid "missing EGD backend type"
 msgstr ""
 
-#: src/conf/domain_conf.c:8801
+#: src/conf/domain_conf.c:8976
 #, c-format
 msgid "unknown backend type '%s' for egd"
 msgstr ""
 
-#: src/conf/domain_conf.c:8849
+#: src/conf/domain_conf.c:5419
 msgid "balloon memory must contain model name"
 msgstr "balloon 内存必须包含型号名"
 
-#: src/conf/domain_conf.c:8855
+#: src/conf/domain_conf.c:5424
 #, c-format
 msgid "unknown memory balloon model '%s'"
 msgstr "未知内存 balloon 型号 ‘%s’"
 
-#: src/conf/domain_conf.c:8862
+#: src/conf/domain_conf.c:9037
 msgid "invalid statistics collection period"
 msgstr ""
 
-#: src/conf/domain_conf.c:8912
+#: src/conf/domain_conf.c:5451
 msgid "XML does not contain expected 'sysinfo' element"
 msgstr "XML 不包含应有的 ‘sysinfo’ 元素"
 
-#: src/conf/domain_conf.c:8922
+#: src/conf/domain_conf.c:5463
 msgid "sysinfo must contain a type attribute"
 msgstr "sysinfo 必须包含 type 属性"
 
-#: src/conf/domain_conf.c:8927
+#: src/conf/domain_conf.c:5468
 #, c-format
 msgid "unknown sysinfo type '%s'"
 msgstr "未知 sysinfo type '%s'"
 
-#: src/conf/domain_conf.c:8958
+#: src/conf/domain_conf.c:9133
 msgid "Invalid BIOS 'date' format"
 msgstr ""
 
-#: src/conf/domain_conf.c:8980
+#: src/conf/domain_conf.c:9155
 msgid "malformed <sysinfo> uuid element"
 msgstr ""
 
-#: src/conf/domain_conf.c:8987
+#: src/conf/domain_conf.c:7889
 msgid "UUID mismatch between <uuid> and <sysinfo>"
 msgstr "<uuid> 和 <sysinfo> 的 UUID 不匹配"
 
-#: src/conf/domain_conf.c:9163
+#: src/conf/domain_conf.c:5646
 #, c-format
 msgid "unknown video model '%s'"
 msgstr "未知视频模型 '%s'"
 
-#: src/conf/domain_conf.c:9169
+#: src/conf/domain_conf.c:5652
 msgid "missing video model and cannot determine default"
 msgstr "缺少视频模式且无法确定默认模式"
 
-#: src/conf/domain_conf.c:9177
+#: src/conf/domain_conf.c:9352
 msgid "ram attribute only supported for type of qxl"
 msgstr ""
 
-#: src/conf/domain_conf.c:9182 src/conf/domain_conf.c:9192
+#: src/conf/domain_conf.c:5660
 #, c-format
 msgid "cannot parse video ram '%s'"
 msgstr "无法解析显存 '%s'"
 
-#: src/conf/domain_conf.c:9202
+#: src/conf/domain_conf.c:5670
 #, c-format
 msgid "cannot parse video heads '%s'"
 msgstr "无法解析影像头 '%s'"
 
-#: src/conf/domain_conf.c:9249
+#: src/conf/domain_conf.c:5921
 #, c-format
 msgid "unknown hostdev mode '%s'"
 msgstr "未知 hostdev 模式 '%s'"
 
-#: src/conf/domain_conf.c:9269
+#: src/conf/domain_conf.c:9444
 #, c-format
 msgid "Unexpected hostdev mode %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:9286
+#: src/conf/domain_conf.c:6003
 msgid "PCI host devices must use 'pci' address type"
 msgstr "PCI 主机设备必须使用 ‘pci’ 地址类型"
 
-#: src/conf/domain_conf.c:9295
+#: src/conf/domain_conf.c:9470
 msgid "SCSI host devices must have address specified"
 msgstr "SCSI 主机设备必须制定地址参数"
 
-#: src/conf/domain_conf.c:9337
+#: src/conf/domain_conf.c:6039
 #, c-format
 msgid "unknown redirdev bus '%s'"
 msgstr "未知 redirdev 总线 '%s'"
 
-#: src/conf/domain_conf.c:9348
+#: src/conf/domain_conf.c:6050
 #, c-format
 msgid "unknown redirdev character device type '%s'"
 msgstr "未知 redirdev 字符设备类型 '%s'"
 
-#: src/conf/domain_conf.c:9353
+#: src/conf/domain_conf.c:6055
 msgid "missing type in redirdev"
 msgstr "redirdev 中缺少类型"
 
-#: src/conf/domain_conf.c:9429
+#: src/conf/domain_conf.c:9604
 #, c-format
 msgid "Incorrect USB version format %s"
 msgstr "错误的 USB 版本格式 %s"
 
-#: src/conf/domain_conf.c:9439
+#: src/conf/domain_conf.c:9614
 #, c-format
 msgid "Cannot parse USB version %s"
 msgstr "无法解析 USB 版本 %s"
 
-#: src/conf/domain_conf.c:9472
+#: src/conf/domain_conf.c:9647
 #, c-format
 msgid "Cannot parse USB Class code %s"
 msgstr "无法解析 USB 等级代码 %s"
 
-#: src/conf/domain_conf.c:9478
+#: src/conf/domain_conf.c:9653
 #, c-format
 msgid "Invalid USB Class code %s"
 msgstr "无效 USB 等级代码 %s"
 
-#: src/conf/domain_conf.c:9489
+#: src/conf/domain_conf.c:9664
 #, c-format
 msgid "Cannot parse USB vendor ID %s"
 msgstr "无法解析 USB 零售商 ID %s"
 
-#: src/conf/domain_conf.c:9500
+#: src/conf/domain_conf.c:9675
 #, c-format
 msgid "Cannot parse USB product ID %s"
 msgstr "无法解析 USB 产品 %s"
 
-#: src/conf/domain_conf.c:9525
+#: src/conf/domain_conf.c:9700
 msgid "Invalid allow value, either 'yes' or 'no'"
 msgstr "无效允许值，只能为 ‘yes’ 或者 ‘no'"
 
-#: src/conf/domain_conf.c:9530
+#: src/conf/domain_conf.c:9705
 msgid "Missing allow attribute for USB redirection filter"
 msgstr "缺少 USB 重定向过滤器属性"
 
-#: src/conf/domain_conf.c:9603
+#: src/conf/domain_conf.c:9778
 #, c-format
 msgid "unknown %s action: %s"
 msgstr "未知 %s 动作：%s"
 
-#: src/conf/domain_conf.c:9623
+#: src/conf/domain_conf.c:9798
 #, c-format
 msgid "unknown PM state value %s"
 msgstr "未知 PM 状态值 %s"
 
-#: src/conf/domain_conf.c:9646
+#: src/conf/domain_conf.c:6243 tools/virsh.c:12067
 msgid "(device_definition)"
 msgstr "(device_definition)"
 
-#: src/conf/domain_conf.c:9664
+#: src/conf/domain_conf.c:9839
 #, c-format
 msgid "unknown device type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:10560
+#: src/conf/domain_conf.c:6653
 msgid "unknown virt type"
 msgstr "未知 virt 类型"
 
-#: src/conf/domain_conf.c:10571
+#: src/conf/domain_conf.c:6664
 #, c-format
 msgid "no emulator for domain %s os type %s on architecture %s"
 msgstr "在构架 %s 中没有用于域 %s os 类型 %s 的模拟器"
 
-#: src/conf/domain_conf.c:10597
+#: src/conf/domain_conf.c:6692
 msgid "cannot count boot devices"
 msgstr "无法统计引导设备"
 
-#: src/conf/domain_conf.c:10608
+#: src/conf/domain_conf.c:6703
 msgid ""
 "per-device boot elements cannot be used together with os/boot elements"
 msgstr "每个设备的 boot 元素无法与 os/boot 元素联合使用"
 
-#: src/conf/domain_conf.c:10618
+#: src/conf/domain_conf.c:6713
 msgid "missing boot device"
 msgstr "缺少引导设备"
 
-#: src/conf/domain_conf.c:10623
+#: src/conf/domain_conf.c:6718
 #, c-format
 msgid "unknown boot device '%s'"
 msgstr "未知引导设备 '%s'"
 
-#: src/conf/domain_conf.c:10656
+#: src/conf/domain_conf.c:6746
 msgid "need at least one serial port for useserial"
 msgstr "useserial 至少需要一个串口"
 
-#: src/conf/domain_conf.c:10674
+#: src/conf/domain_conf.c:10835
 msgid "invalid value for rebootTimeout, must be in range [-1,65535]"
 msgstr "rebootTimeout 的无效值，必须在范围 [-1,65535] 中"
 
-#: src/conf/domain_conf.c:10738
+#: src/conf/domain_conf.c:10899
 msgid "You must map the root user of container"
 msgstr ""
 
-#: src/conf/domain_conf.c:10799
+#: src/conf/domain_conf.c:10960
 msgid "vcpu id must be an unsigned integer or -1"
 msgstr "vcpu if 必须是一个未分配的整数或者 -1"
 
-#: src/conf/domain_conf.c:10803
+#: src/conf/domain_conf.c:10964
 msgid "vcpu id value -1 is not allowed for vcpupin"
 msgstr "vcpupin 中不能使用 vcpu id 值 -1"
 
-#: src/conf/domain_conf.c:10810
+#: src/conf/domain_conf.c:6797
 msgid "vcpu id must be less than maxvcpus"
 msgstr "vcpu id 必须小于 maxvcpus"
 
-#: src/conf/domain_conf.c:10830
+#: src/conf/domain_conf.c:6819
 msgid "missing cpuset for vcpupin"
 msgstr "vcpupin  缺少 cpuset"
 
-#: src/conf/domain_conf.c:10945
+#: src/conf/domain_conf.c:11135
 msgid "missing resource partition attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:11021
+#: src/conf/domain_conf.c:6863
 msgid "missing domain type attribute"
 msgstr "缺少域类型属性"
 
-#: src/conf/domain_conf.c:11027
+#: src/conf/domain_conf.c:6869
 #, c-format
 msgid "invalid domain type %s"
 msgstr "无效域类型 %s"
 
-#: src/conf/domain_conf.c:11035
+#: src/conf/domain_conf.c:6877
 #, c-format
 msgid "unexpected domain type %s, expecting %s"
 msgstr "意外的域类型 %s，应为 %s"
 
-#: src/conf/domain_conf.c:11060
+#: src/conf/domain_conf.c:6902
 #, c-format
 msgid "unexpected domain type %s, expecting one of these: %s"
 msgstr "意外的域类型 %s，应为以下类型之一：%s"
 
-#: src/conf/domain_conf.c:11084 src/conf/network_conf.c:1972
-#: src/conf/secret_conf.c:190 src/openvz/openvz_conf.c:1077
-#: src/xenxs/xen_xm.c:216
+#: src/conf/domain_conf.c:6926 src/conf/network_conf.c:848
+#: src/conf/secret_conf.c:180 src/openvz/openvz_conf.c:971
 msgid "Failed to generate UUID"
 msgstr "生成 UUID 失败"
 
-#: src/conf/domain_conf.c:11091 src/conf/network_conf.c:1979
-#: src/conf/nwfilter_conf.c:2565 src/conf/secret_conf.c:196
-#: src/conf/storage_conf.c:910
+#: src/conf/domain_conf.c:6933 src/conf/domain_conf.c:7882
+#: src/conf/network_conf.c:855 src/conf/nwfilter_conf.c:2448
+#: src/conf/secret_conf.c:186 src/conf/storage_conf.c:670
 msgid "malformed uuid element"
 msgstr "畸形的 uuid 元素"
 
-#: src/conf/domain_conf.c:11101
+#: src/conf/domain_conf.c:11291
 msgid "Domain title can't contain newlines"
 msgstr "域标题不能包含换行符"
 
-#: src/conf/domain_conf.c:11126
+#: src/conf/domain_conf.c:11316
 #, c-format
 msgid "Invalid memory core dump attribute value '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:11138
+#: src/conf/domain_conf.c:11328
 #, c-format
 msgid "current memory '%lluk' exceeds maximum '%lluk'"
 msgstr "当前内存 '%lluk' 已超过最大值 '%lluk'"
 
-#: src/conf/domain_conf.c:11167
+#: src/conf/domain_conf.c:6965
 msgid "cannot extract blkiotune nodes"
 msgstr "无法提取 blkiotune 节点"
 
-#: src/conf/domain_conf.c:11183
+#: src/conf/domain_conf.c:11373
 #, c-format
-msgid "duplicate device weight path '%s'"
-msgstr "重复的设备加权路径 '%s'"
+msgid "duplicate blkio device path '%s'"
+msgstr ""
 
-#: src/conf/domain_conf.c:11211
+#: src/conf/domain_conf.c:7009
 msgid "maximum vcpus must be an integer"
 msgstr "最大 vcpus 必须是一个整数"
 
-#: src/conf/domain_conf.c:11219
+#: src/conf/domain_conf.c:11409
 #, c-format
 msgid "invalid maximum number of vCPUs '%lu'"
 msgstr ""
 
-#: src/conf/domain_conf.c:11227
+#: src/conf/domain_conf.c:7025
 msgid "current vcpus must be an integer"
 msgstr "当前 vcpus 必须是一个整数"
 
-#: src/conf/domain_conf.c:11235
+#: src/conf/domain_conf.c:11425
 #, c-format
 msgid "invalid current number of vCPUs '%lu'"
 msgstr ""
 
-#: src/conf/domain_conf.c:11241
+#: src/conf/domain_conf.c:7039
 #, c-format
 msgid "maxvcpus must not be less than current vcpus (%d < %lu)"
 msgstr "maxvcpus 一定不能小于当前 vcpus (%d < %lu)"
 
-#: src/conf/domain_conf.c:11253
+#: src/conf/domain_conf.c:11443
 #, c-format
 msgid "Unsupported CPU placement mode '%s'"
 msgstr "不支持的 CPU 定位模式 '%s'"
 
-#: src/conf/domain_conf.c:11276
+#: src/conf/domain_conf.c:11466
 msgid "can't parse cputune shares value"
 msgstr ""
 
-#: src/conf/domain_conf.c:11283
+#: src/conf/domain_conf.c:11473
 msgid "can't parse cputune period value"
 msgstr ""
 
-#: src/conf/domain_conf.c:11290
+#: src/conf/domain_conf.c:11480
 msgid "Value of cputune period must be in range [1000, 1000000]"
 msgstr ""
 
-#: src/conf/domain_conf.c:11298
+#: src/conf/domain_conf.c:11488
 msgid "can't parse cputune quota value"
 msgstr ""
 
-#: src/conf/domain_conf.c:11306
+#: src/conf/domain_conf.c:11496
 msgid "Value of cputune quota must be in range [1000, 18446744073709551]"
 msgstr ""
 
-#: src/conf/domain_conf.c:11314
+#: src/conf/domain_conf.c:11504
 msgid "can't parse cputune emulator period value"
 msgstr ""
 
-#: src/conf/domain_conf.c:11322
+#: src/conf/domain_conf.c:11512
 msgid "Value of cputune emulator_period must be in range [1000, 1000000]"
 msgstr ""
 
-#: src/conf/domain_conf.c:11330
+#: src/conf/domain_conf.c:11520
 msgid "can't parse cputune emulator quota value"
 msgstr ""
 
-#: src/conf/domain_conf.c:11338
+#: src/conf/domain_conf.c:11528
 msgid ""
 "Value of cputune emulator_quota must be in range [1000, 18446744073709551]"
 msgstr ""
 
-#: src/conf/domain_conf.c:11351
+#: src/conf/domain_conf.c:7080
 msgid "vcpupin nodes must be less than maxvcpus"
 msgstr "vcpupin 节点必须小于 maxvcpus"
 
-#: src/conf/domain_conf.c:11366
+#: src/conf/domain_conf.c:7095
 msgid "duplicate vcpupin for same vcpu"
 msgstr "同一 vcpu 的重复 vcpupin"
 
-#: src/conf/domain_conf.c:11413
+#: src/conf/domain_conf.c:11603
 msgid "cannot extract emulatorpin nodes"
 msgstr "无法提取 emulatorpin 节点"
 
-#: src/conf/domain_conf.c:11425
+#: src/conf/domain_conf.c:11615
 msgid "only one emulatorpin is supported"
 msgstr "只支持一种 emulatorpin"
 
-#: src/conf/domain_conf.c:11444
+#: src/conf/domain_conf.c:7107
 msgid "cannot extract numatune nodes"
 msgstr "无法提取 numatune 节点"
 
-#: src/conf/domain_conf.c:11450
+#: src/conf/domain_conf.c:11640
 msgid "only one numatune is supported"
 msgstr "只支持一种 numatune"
 
-#: src/conf/domain_conf.c:11469
+#: src/conf/domain_conf.c:7137
 #, c-format
 msgid "Unsupported NUMA memory tuning mode '%s'"
 msgstr "不支持的 NUMA 内存调试模式 '%s'"
 
-#: src/conf/domain_conf.c:11498
+#: src/conf/domain_conf.c:11688
 #, c-format
 msgid "Unsupported memory placement mode '%s'"
 msgstr "不支持的内存定位模式 '%s'"
 
-#: src/conf/domain_conf.c:11520
+#: src/conf/domain_conf.c:11710
 msgid "nodeset for NUMA memory tuning must be set if 'placement' is 'static'"
 msgstr "如果 'placement' 是 'static' 则必须设定 NUMA 内存调试的 nodeset"
 
-#: src/conf/domain_conf.c:11541
+#: src/conf/domain_conf.c:11731
 #, c-format
 msgid "unsupported XML element %s"
 msgstr "不支持的 XML元素 %s"
 
-#: src/conf/domain_conf.c:11561
+#: src/conf/domain_conf.c:11751
 msgid "cannot extract resource nodes"
 msgstr ""
 
-#: src/conf/domain_conf.c:11567
+#: src/conf/domain_conf.c:11757
 msgid "only one resource element is supported"
 msgstr ""
 
-#: src/conf/domain_conf.c:11583
+#: src/conf/domain_conf.c:11773
 #, c-format
 msgid "unexpected feature '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:11593
+#: src/conf/domain_conf.c:11783
 #, c-format
 msgid "unknown value for attribute eoi: '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:11616
+#: src/conf/domain_conf.c:11806
 #, c-format
 msgid "unknown state attribute '%s' of feature '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:11644
+#: src/conf/domain_conf.c:11834
 #, c-format
 msgid "unsupported HyperV Enlightenment feature: %s"
 msgstr "不支持的 HyperV 加强功能：%s"
 
-#: src/conf/domain_conf.c:11656 src/conf/domain_conf.c:11677
+#: src/conf/domain_conf.c:11846 src/conf/domain_conf.c:11867
 #, c-format
 msgid "missing 'state' attribute for HyperV Enlightenment feature '%s'"
 msgstr "HyperV 加强功能 '%s' 中缺少 'state' 属性"
 
-#: src/conf/domain_conf.c:11664 src/conf/domain_conf.c:11685
+#: src/conf/domain_conf.c:11854 src/conf/domain_conf.c:11875
 #, c-format
 msgid "invalid value of state argument for HyperV Enlightenment feature '%s'"
 msgstr "HyperV 加强功能 '%s' 中状态参数无效值"
 
-#: src/conf/domain_conf.c:11696
+#: src/conf/domain_conf.c:11886
 msgid "invalid HyperV spinlock retry count"
 msgstr ""
 
-#: src/conf/domain_conf.c:11702
+#: src/conf/domain_conf.c:11892
 msgid "HyperV spinlock retry count must be at least 4095"
 msgstr "HyperV spinlock 重试计数必须不少于 4095"
 
-#: src/conf/domain_conf.c:11759
+#: src/conf/domain_conf.c:7184
 #, c-format
 msgid "unknown clock offset '%s'"
 msgstr "未知时钟补偿 '%s'"
 
-#: src/conf/domain_conf.c:11775
+#: src/conf/domain_conf.c:11965
 #, c-format
 msgid "unknown clock adjustment '%s'"
 msgstr "未知时钟调整 '%s'"
 
-#: src/conf/domain_conf.c:11803
+#: src/conf/domain_conf.c:11993
 #, c-format
 msgid "unknown clock basis '%s'"
 msgstr "未知时钟基点 '%s'"
 
-#: src/conf/domain_conf.c:11816
+#: src/conf/domain_conf.c:7202
 msgid "missing 'timezone' attribute for clock with offset='timezone'"
 msgstr "使用 offset='timezone' 的时钟缺少 ‘timezone’ 属性"
 
-#: src/conf/domain_conf.c:11827
+#: src/conf/domain_conf.c:12017
 msgid "invalid basedate"
 msgstr "无效基日"
 
-#: src/conf/domain_conf.c:11858
+#: src/conf/domain_conf.c:7235
 msgid "no OS type"
 msgstr "没有操作系统类型"
 
-#: src/conf/domain_conf.c:11893
+#: src/conf/domain_conf.c:12083
 #, c-format
 msgid "No guest options available for arch '%s'"
 msgstr "没有架构（arch）%s 可以使用的虚拟机选项"
 
-#: src/conf/domain_conf.c:11902
+#: src/conf/domain_conf.c:12092
 #, c-format
 msgid "No os type '%s' available for arch '%s'"
 msgstr "没有架构（arch）%s 可以使用的操作系统类型 '%s'"
 
-#: src/conf/domain_conf.c:11913 src/xenxs/xen_xm.c:293
+#: src/conf/domain_conf.c:7270 src/xenxs/xen_xm.c:259
 #, c-format
 msgid "no supported architecture for os type '%s'"
 msgstr "os 类型 '%s' 不支持的构架"
 
-#: src/conf/domain_conf.c:11952
+#: src/conf/domain_conf.c:12142
 msgid "No data supplied for <initarg> element"
 msgstr "没有 <initarg> 元素的数据"
 
-#: src/conf/domain_conf.c:12025 src/conf/domain_conf.c:12034
+#: src/conf/domain_conf.c:12215 src/conf/domain_conf.c:12224
 msgid "Can't add another USB controller: USB is disabled for this domain"
 msgstr "无法添加另一个 USB 控制器：这个域禁用 USB"
 
-#: src/conf/domain_conf.c:12051
+#: src/conf/domain_conf.c:12241
 msgid "No master USB controller specified"
 msgstr ""
 
-#: src/conf/domain_conf.c:12058
+#: src/conf/domain_conf.c:7380
 msgid "cannot extract device leases"
 msgstr "无法提取设备租约"
 
-#: src/conf/domain_conf.c:12194
+#: src/conf/domain_conf.c:7505
 msgid "cannot extract console devices"
 msgstr "无法提取控制台设备"
 
-#: src/conf/domain_conf.c:12272
+#: src/conf/domain_conf.c:12462
 msgid "Can't add USB input device. USB bus is disabled"
 msgstr "无法添加 USB 输入设备。已禁用 USB 总线。"
 
-#: src/conf/domain_conf.c:12370
+#: src/conf/domain_conf.c:12557
 msgid "Only one primary video device is supported"
 msgstr ""
 
-#: src/conf/domain_conf.c:12396
+#: src/conf/domain_conf.c:7735
 msgid "cannot determine default video type"
 msgstr "无法确定默认视频类型"
 
-#: src/conf/domain_conf.c:12426
+#: src/conf/domain_conf.c:12613
 msgid "Can't add host USB device: USB is disabled in this host"
 msgstr "无法添加主机 USB 设备：这台主机禁用了 USB"
 
-#: src/conf/domain_conf.c:12445
+#: src/conf/domain_conf.c:7772
 msgid "only a single watchdog device is supported"
 msgstr "只支持单一监视器设备"
 
-#: src/conf/domain_conf.c:12465
+#: src/conf/domain_conf.c:7792
 msgid "only a single memory balloon device is supported"
 msgstr "只支持单一内存 balloon 设备"
 
-#: src/conf/domain_conf.c:12484
+#: src/conf/domain_conf.c:12671
 msgid "only a single RNG device is supported"
 msgstr ""
 
-#: src/conf/domain_conf.c:12501
+#: src/conf/domain_conf.c:12688
 msgid "only a single TPM device is supported"
 msgstr ""
 
-#: src/conf/domain_conf.c:12517
+#: src/conf/domain_conf.c:12704
 msgid "only a single nvram device is supported"
 msgstr ""
 
-#: src/conf/domain_conf.c:12542
+#: src/conf/domain_conf.c:12729
 msgid "Can't add USB hub: USB is disabled for this domain"
 msgstr "无法添加 USB 集线器：这个域禁用了 USB"
 
-#: src/conf/domain_conf.c:12566
+#: src/conf/domain_conf.c:12753
 msgid "Can't add redirected USB device: USB is disabled for this domain"
 msgstr "无法添加重新定向的 USB 设备：这个域禁用了 USB"
 
-#: src/conf/domain_conf.c:12581
+#: src/conf/domain_conf.c:12768
 msgid "only one set of redirection filter rule is supported"
 msgstr "只支持一组重定向过滤器"
 
-#: src/conf/domain_conf.c:12602
+#: src/conf/domain_conf.c:12789
 msgid "only a single panic device is supported"
 msgstr ""
 
-#: src/conf/domain_conf.c:12644
+#: src/conf/domain_conf.c:12831
 msgid "uid and gid should be mapped both"
 msgstr ""
 
-#: src/conf/domain_conf.c:12662
+#: src/conf/domain_conf.c:12849
 msgid "Maximum CPUs greater than topology limit"
 msgstr "CPUs 最大值超过拓扑限制"
 
-#: src/conf/domain_conf.c:12668
+#: src/conf/domain_conf.c:7864
 msgid "Number of CPUs in <numa> exceeds the <vcpu> count"
 msgstr "<numa> 中的 CPUs 数超过 <vcpu> 计数"
 
-#: src/conf/domain_conf.c:12690
+#: src/conf/domain_conf.c:7901
 #, c-format
 msgid "unknown smbios mode '%s'"
 msgstr "未知 smbios 模式 ‘%s’"
 
-#: src/conf/domain_conf.c:12755
+#: src/conf/domain_conf.c:7963
 msgid "no domain config"
 msgstr "节点域配置"
 
-#: src/conf/domain_conf.c:12769
+#: src/conf/domain_conf.c:7977
 msgid "missing domain state"
 msgstr "缺失域状态"
 
-#: src/conf/domain_conf.c:12774
+#: src/conf/domain_conf.c:7982
 #, c-format
 msgid "invalid domain state '%s'"
 msgstr "无效的域状态 '%s'"
 
-#: src/conf/domain_conf.c:12783
+#: src/conf/domain_conf.c:7991
 #, c-format
 msgid "invalid domain state reason '%s'"
 msgstr "无效域状态原因 '%s'"
 
-#: src/conf/domain_conf.c:12794
+#: src/conf/domain_conf.c:8002
 msgid "invalid pid"
 msgstr "无效 pid"
 
-#: src/conf/domain_conf.c:12808
+#: src/conf/domain_conf.c:8016
 #, c-format
 msgid "Unknown taint flag %s"
 msgstr "未知 taint 标签 %s"
 
-#: src/conf/domain_conf.c:12843 src/security/virt-aa-helper.c:654
-#: tools/virsh-domain-monitor.c:98 tools/virsh-domain-monitor.c:531
-#: tools/virsh-domain-monitor.c:638 tools/virsh-domain-monitor.c:760
-#: tools/virsh-domain.c:2396 tools/virsh-domain.c:3034
-#: tools/virsh-domain.c:5317 tools/virsh-domain.c:9109
-#: tools/virsh-domain.c:9279 tools/virsh-domain.c:9346
-#: tools/virsh-domain.c:9828 tools/virsh-domain.c:9931
+#: src/conf/domain_conf.c:8050 src/security/virt-aa-helper.c:641
+#: tools/virsh.c:1369 tools/virsh.c:1516 tools/virsh.c:1725
+#: tools/virsh.c:11753 tools/virsh.c:11821 tools/virsh.c:12061
+#: tools/virsh.c:12551 tools/virsh.c:13024
 msgid "(domain_definition)"
 msgstr "(domain_definition)"
 
-#: src/conf/domain_conf.c:12889
+#: src/conf/domain_conf.c:8087
 #, c-format
 msgid "unexpected root element <%s>, expecting <domain>"
 msgstr "意外的 root 元素 <%s>，应为 <domain>"
 
-#: src/conf/domain_conf.c:12924
+#: src/conf/domain_conf.c:8120
 #, c-format
 msgid "unexpected root element <%s>, expecting <domstatus>"
 msgstr "意外的 root 元素 <%s>，应为 <domstatus>"
 
-#: src/conf/domain_conf.c:12973
+#: src/conf/domain_conf.c:8168
 #, c-format
 msgid "Target timer %s does not match source %s"
 msgstr "目标计时器 %s 与源计时器 %s 不匹配"
 
-#: src/conf/domain_conf.c:12981
+#: src/conf/domain_conf.c:8176
 #, c-format
 msgid "Target timer presence %d does not match source %d"
 msgstr "目标计时器显示 %d 与源 %d 不匹配"
 
-#: src/conf/domain_conf.c:12989
+#: src/conf/domain_conf.c:8184
 #, c-format
 msgid "Target TSC frequency %lu does not match source %lu"
 msgstr "目标 TSC 频率 %lu 与源 %lu 不匹配"
 
-#: src/conf/domain_conf.c:12996
+#: src/conf/domain_conf.c:8191
 #, c-format
 msgid "Target TSC mode %s does not match source %s"
 msgstr "目标 TSC 模式 %s 与源 %s 不匹配"
 
-#: src/conf/domain_conf.c:13013
+#: src/conf/domain_conf.c:8212
 #, c-format
 msgid "Target device address type %s does not match source %s"
 msgstr "目标设备地址类型 %s 与源 %s 不匹配"
 
-#: src/conf/domain_conf.c:13026
+#: src/conf/domain_conf.c:8225
 #, c-format
 msgid ""
 "Target device PCI address %04x:%02x:%02x.%02x does not match source "
 "%04x:%02x:%02x.%02x"
 msgstr "目标设备 PCI 地址 %04x:%02x:%02x.%02x 与源 %04x:%02x:%02x.%02x 不匹配"
 
-#: src/conf/domain_conf.c:13041
+#: src/conf/domain_conf.c:8239
 #, c-format
 msgid "Target device drive address %d:%d:%d does not match source %d:%d:%d"
 msgstr "目标设备驱动地址 %d:%d:%d 与源 %d:%d:%d 不匹配"
 
-#: src/conf/domain_conf.c:13056
+#: src/conf/domain_conf.c:8253
 #, c-format
 msgid ""
 "Target device virtio serial address %d:%d:%d does not match source %d:%d:%d"
 msgstr "目标设备 virtio 串口地址 %d:%d:%d 与源 %d:%d:%d 不匹配"
 
-#: src/conf/domain_conf.c:13070
+#: src/conf/domain_conf.c:8266
 #, c-format
 msgid "Target device ccid address %d:%d does not match source %d:%d"
 msgstr "目标设备 ccid 地址 %d:%d 与源 %d:%d 不匹配"
 
-#: src/conf/domain_conf.c:13084
+#: src/conf/domain_conf.c:13271
 #, c-format
 msgid "Target device isa address %d:%d does not match source %d:%d"
 msgstr ""
 
-#: src/conf/domain_conf.c:13105
+#: src/conf/domain_conf.c:8290
 #, c-format
 msgid "Target disk device %s does not match source %s"
 msgstr "目标磁盘设备 %s 与源 %s 不匹配"
 
-#: src/conf/domain_conf.c:13113
+#: src/conf/domain_conf.c:8298
 #, c-format
 msgid "Target disk bus %s does not match source %s"
 msgstr "目标磁盘总线 %s 与源 %s 不匹配"
 
-#: src/conf/domain_conf.c:13121
+#: src/conf/domain_conf.c:8306
 #, c-format
 msgid "Target disk %s does not match source %s"
 msgstr "目标磁盘 %s 与源 %s 不匹配"
 
-#: src/conf/domain_conf.c:13128
+#: src/conf/domain_conf.c:8313
 #, c-format
 msgid "Target disk serial %s does not match source %s"
 msgstr "目标磁盘串口 %s 与源 %s 不匹配"
 
-#: src/conf/domain_conf.c:13135
+#: src/conf/domain_conf.c:8320
 msgid "Target disk access mode does not match source"
 msgstr "目标磁盘访问模式与源不匹配"
 
-#: src/conf/domain_conf.c:13152
+#: src/conf/domain_conf.c:8341
 #, c-format
 msgid "Target controller type %s does not match source %s"
 msgstr "目标控制器类型 %s 与源 %s 不匹配"
 
-#: src/conf/domain_conf.c:13160
+#: src/conf/domain_conf.c:8349
 #, c-format
 msgid "Target controller index %d does not match source %d"
 msgstr "目标控制器索引 %d 与源 %d 不匹配"
 
-#: src/conf/domain_conf.c:13167
+#: src/conf/domain_conf.c:8356
 #, c-format
 msgid "Target controller model %d does not match source %d"
 msgstr "目标控制器型号 %d 与源 %d 不匹配"
 
-#: src/conf/domain_conf.c:13175
+#: src/conf/domain_conf.c:8364
 #, c-format
 msgid "Target controller ports %d does not match source %d"
 msgstr "目标控制器端口 %d 与源 %d 不匹配"
 
-#: src/conf/domain_conf.c:13182
+#: src/conf/domain_conf.c:8371
 #, c-format
 msgid "Target controller vectors %d does not match source %d"
 msgstr "目标控制器矢量 %d 与源 %d 不匹配"
 
-#: src/conf/domain_conf.c:13201
+#: src/conf/domain_conf.c:8394
 #, c-format
 msgid "Target filesystem guest target %s does not match source %s"
 msgstr "目标文件系统虚拟机目标 %s 与源 %s 不匹配"
 
-#: src/conf/domain_conf.c:13208
+#: src/conf/domain_conf.c:8401
 msgid "Target filesystem access mode does not match source"
 msgstr "目标文件系统访问模式与源不匹配"
 
-#: src/conf/domain_conf.c:13228
+#: src/conf/domain_conf.c:13415
 #, c-format
 msgid "Target network card mac %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:13237
+#: src/conf/domain_conf.c:8433
 #, c-format
 msgid "Target network card model %s does not match source %s"
 msgstr "目标网卡型号 %s 与源 %s 不匹配"
 
-#: src/conf/domain_conf.c:13255
+#: src/conf/domain_conf.c:8455
 #, c-format
 msgid "Target input device type %s does not match source %s"
 msgstr "目标输入设备类型 %s 与源 %s 不匹配"
 
-#: src/conf/domain_conf.c:13263
+#: src/conf/domain_conf.c:8463
 #, c-format
 msgid "Target input device bus %s does not match source %s"
 msgstr "目标输入设备总线 %s 与源 %s 不匹配"
 
-#: src/conf/domain_conf.c:13282
+#: src/conf/domain_conf.c:8486
 #, c-format
 msgid "Target sound card model %s does not match source %s"
 msgstr "目标声卡型号 %s 与源 %s 不匹配"
 
-#: src/conf/domain_conf.c:13301
+#: src/conf/domain_conf.c:8509
 #, c-format
 msgid "Target video card model %s does not match source %s"
 msgstr "目标显卡型号 %s 与源 %s 不匹配"
 
-#: src/conf/domain_conf.c:13309
+#: src/conf/domain_conf.c:13496
 #, c-format
 msgid "Target video card ram %u does not match source %u"
 msgstr ""
 
-#: src/conf/domain_conf.c:13316
+#: src/conf/domain_conf.c:8517
 #, c-format
 msgid "Target video card vram %u does not match source %u"
 msgstr "目标显卡 vram %u 与源 %u 不匹配"
 
-#: src/conf/domain_conf.c:13323
+#: src/conf/domain_conf.c:8524
 #, c-format
 msgid "Target video card heads %u does not match source %u"
 msgstr "目标显卡标头 %u 与源 %u 不匹配"
 
-#: src/conf/domain_conf.c:13331
+#: src/conf/domain_conf.c:8532
 msgid "Target video card acceleration does not match source"
 msgstr "目标显卡加速与源不匹配"
 
-#: src/conf/domain_conf.c:13338
+#: src/conf/domain_conf.c:8539
 #, c-format
 msgid "Target video card 2d accel %u does not match source %u"
 msgstr "目标显卡 2d 加速 %u 与源 %u 不匹配"
 
-#: src/conf/domain_conf.c:13345
+#: src/conf/domain_conf.c:8546
 #, c-format
 msgid "Target video card 3d accel %u does not match source %u"
 msgstr "目标显卡 3d 加速 %u 与源 %u 不匹配"
 
-#: src/conf/domain_conf.c:13364
+#: src/conf/domain_conf.c:8569
 #, c-format
 msgid "Target host device mode %s does not match source %s"
 msgstr "目标主机设备型号 %s 与源 %s 不匹配"
 
-#: src/conf/domain_conf.c:13373
+#: src/conf/domain_conf.c:8578
 #, c-format
 msgid "Target host device subsystem %s does not match source %s"
 msgstr "目标主机设备子系统 %s 与源 %s 不匹配"
 
-#: src/conf/domain_conf.c:13403
+#: src/conf/domain_conf.c:8617 src/conf/domain_conf.c:8639
 #, c-format
 msgid "Target serial port %d does not match source %d"
 msgstr "目标串口 %d 与源 %d 不匹配"
 
-#: src/conf/domain_conf.c:13421
+#: src/conf/domain_conf.c:13608
 #, c-format
 msgid "Target parallel port %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:13439
+#: src/conf/domain_conf.c:8661
 #, c-format
 msgid "Target channel type %s does not match source %s"
 msgstr "目标通道类型 %s 与源 %s 不匹配"
 
-#: src/conf/domain_conf.c:13449
+#: src/conf/domain_conf.c:8671
 #, c-format
 msgid "Target channel name %s does not match source %s"
 msgstr "目标通道名称 %s 与源 %s 不匹配"
 
-#: src/conf/domain_conf.c:13458
+#: src/conf/domain_conf.c:13645
 msgid ""
 "Changing device type to/from spicevmc would change default target channel "
 "name"
 msgstr "将设备类型改为（/或者改变）spicevmc 会更改默认目标通道名称"
 
-#: src/conf/domain_conf.c:13469
+#: src/conf/domain_conf.c:8682
 #, c-format
 msgid "Target channel addr %s does not match source %s"
 msgstr "目标通道地址 %s 与源 %s 不匹配"
 
-#: src/conf/domain_conf.c:13491
+#: src/conf/domain_conf.c:8708
 #, c-format
 msgid "Target console type %s does not match source %s"
 msgstr "目标控制台类型 %s 与源 %s 不匹配"
 
-#: src/conf/domain_conf.c:13510
+#: src/conf/domain_conf.c:8731
 #, c-format
 msgid "Target watchdog model %s does not match source %s"
 msgstr "目标监控程序型号 %s 与源 %s 不匹配"
 
-#: src/conf/domain_conf.c:13529
+#: src/conf/domain_conf.c:8754
 #, c-format
 msgid "Target balloon model %s does not match source %s"
 msgstr "目标布尔值型号 %s 与源 %s 不匹配"
 
-#: src/conf/domain_conf.c:13551
+#: src/conf/domain_conf.c:13738
 #, c-format
 msgid "Target domain RNG device count '%d' does not match source count '%d'"
 msgstr ""
 
-#: src/conf/domain_conf.c:13559
+#: src/conf/domain_conf.c:13746
 #, c-format
 msgid "Target RNG model '%s' does not match source '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:13578
+#: src/conf/domain_conf.c:8777
 #, c-format
 msgid "Target hub device type %s does not match source %s"
 msgstr "目标集线设备类型 %s 与源 %s 不匹配"
 
-#: src/conf/domain_conf.c:13598
+#: src/conf/domain_conf.c:13785
 #, c-format
 msgid ""
 "Target USB redirection filter rule count %zu does not match source %zu"
 msgstr "目标 USB 重定向过滤器郭泽计数 %zu 与源 %zu 不映射"
 
-#: src/conf/domain_conf.c:13609
+#: src/conf/domain_conf.c:13796
 msgid "Target USB Class code does not match source"
 msgstr "目标 USB 等级模式与源不匹配"
 
-#: src/conf/domain_conf.c:13615
+#: src/conf/domain_conf.c:13802
 msgid "Target USB vendor ID does not match source"
 msgstr "目标 USB 销售商 ID 与源 不符"
 
-#: src/conf/domain_conf.c:13621
+#: src/conf/domain_conf.c:13808
 msgid "Target USB product ID does not match source"
 msgstr "目标 USB 产品 ID 与源不符"
 
-#: src/conf/domain_conf.c:13627
+#: src/conf/domain_conf.c:13814
 msgid "Target USB version does not match source"
 msgstr "目标 USB 版本与源不匹配"
 
-#: src/conf/domain_conf.c:13633
+#: src/conf/domain_conf.c:13820
 #, c-format
 msgid "Target USB allow '%s' does not match source '%s'"
 msgstr "目标USB 允许 '%s' 与源 '%s' 不匹配"
 
-#: src/conf/domain_conf.c:13653
+#: src/conf/domain_conf.c:13840
 #, c-format
 msgid "State of feature '%s' differs: source: '%s', destination: '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:13665
+#: src/conf/domain_conf.c:13852
 #, c-format
 msgid "State of APIC EOI differs: source: '%s', destination: '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:13680
+#: src/conf/domain_conf.c:13867
 #, c-format
 msgid ""
 "State of HyperV enlightenment feature '%s' differs: source: '%s', "
 "destination: '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:13695
+#: src/conf/domain_conf.c:13882
 #, c-format
 msgid "HyperV spinlock retry count differs: source: '%u', destination: '%u'"
 msgstr ""
 
-#: src/conf/domain_conf.c:13721
+#: src/conf/domain_conf.c:13908
 #, c-format
 msgid ""
 "Target domain panic device count '%d' does not match source count '%d'"
 msgstr ""
 
-#: src/conf/domain_conf.c:13743
+#: src/conf/domain_conf.c:8805
 #, c-format
 msgid "Target domain virt type %s does not match source %s"
 msgstr "目标域 virt 类型 %s 与源 %s 不匹配"
 
-#: src/conf/domain_conf.c:13755
+#: src/conf/domain_conf.c:8817
 #, c-format
 msgid "Target domain uuid %s does not match source %s"
 msgstr "目标域 uuid %s 与源 %s 不匹配"
 
-#: src/conf/domain_conf.c:13766
+#: src/conf/domain_conf.c:13953
 #, c-format
 msgid "Target domain name '%s' does not match source '%s'"
 msgstr "目标域名 '%s' 与源 '%s' 不映射"
 
-#: src/conf/domain_conf.c:13773
+#: src/conf/domain_conf.c:13960
 #, c-format
 msgid "Target domain max memory %lld does not match source %lld"
 msgstr "目标域最大内存 %lld 与源 %lld 不匹配"
 
-#: src/conf/domain_conf.c:13779
+#: src/conf/domain_conf.c:13966
 #, c-format
 msgid "Target domain current memory %lld does not match source %lld"
 msgstr "目标域当前内存 %lld 与源 %lld 不匹配"
 
-#: src/conf/domain_conf.c:13785
+#: src/conf/domain_conf.c:13972
 #, c-format
 msgid "Target domain huge page backing %d does not match source %d"
 msgstr "目标域大页面支持 %d 与源 %d 不匹配"
 
-#: src/conf/domain_conf.c:13793
+#: src/conf/domain_conf.c:13980
 #, c-format
 msgid "Target domain vCPU count %d does not match source %d"
 msgstr "目标域 vCPU 计数 %d 与源 %d 不映射"
 
-#: src/conf/domain_conf.c:13799
+#: src/conf/domain_conf.c:13986
 #, c-format
 msgid "Target domain vCPU max %d does not match source %d"
 msgstr "目标域 vCPU 最大 %d 与源 %d 不映射"
 
-#: src/conf/domain_conf.c:13806 src/conf/domain_conf.c:13819
+#: src/conf/domain_conf.c:8857 src/conf/domain_conf.c:8869
 #, c-format
 msgid "Target domain OS type %s does not match source %s"
 msgstr "目标域 OS 类型 %s 与源 %s 不匹配"
 
-#: src/conf/domain_conf.c:13812
+#: src/conf/domain_conf.c:8863
 #, c-format
 msgid "Target domain architecture %s does not match source %s"
 msgstr "目标域架构 %s 与源 %s 不匹配"
 
-#: src/conf/domain_conf.c:13826
+#: src/conf/domain_conf.c:8876
 #, c-format
 msgid "Target domain SMBIOS mode %s does not match source %s"
 msgstr "目标域 SMBIOS 模式 %s 与源 %s 不匹配"
 
-#: src/conf/domain_conf.c:13837
+#: src/conf/domain_conf.c:8891
 msgid "Target domain timers do not match source"
 msgstr "目标域计时器与源不匹配"
 
-#: src/conf/domain_conf.c:13855
+#: src/conf/domain_conf.c:14042
 #, c-format
 msgid "Target domain disk count %zu does not match source %zu"
 msgstr "目标域磁盘计数 %zu 与源 %zu 不匹配"
 
-#: src/conf/domain_conf.c:13866
+#: src/conf/domain_conf.c:14053
 #, c-format
 msgid "Target domain controller count %zu does not match source %zu"
 msgstr "目标域控制器计数 %zu 与源 %zu 不映射"
 
-#: src/conf/domain_conf.c:13879
+#: src/conf/domain_conf.c:14066
 #, c-format
 msgid "Target domain filesystem count %zu does not match source %zu"
 msgstr "目标域文件系统计数 %zu 与源 %zu 不匹配"
 
-#: src/conf/domain_conf.c:13891
+#: src/conf/domain_conf.c:14078
 #, c-format
 msgid "Target domain net card count %zu does not match source %zu"
 msgstr "目标域网卡计数 %zu 与源 %zu 不匹配"
 
-#: src/conf/domain_conf.c:13903
+#: src/conf/domain_conf.c:14090
 #, c-format
 msgid "Target domain input device count %zu does not match source %zu"
 msgstr "目标域输入设备计数 %zu 与源 %zu 不匹配"
 
-#: src/conf/domain_conf.c:13915
+#: src/conf/domain_conf.c:14102
 #, c-format
 msgid "Target domain sound card count %zu does not match source %zu"
 msgstr "目标域声卡计数 %zu 与源 %zu 不匹配"
 
-#: src/conf/domain_conf.c:13927
+#: src/conf/domain_conf.c:14114
 #, c-format
 msgid "Target domain video card count %zu does not match source %zu"
 msgstr "目标域显卡计数 %zu 与源 %zu 不匹配"
 
-#: src/conf/domain_conf.c:13939
+#: src/conf/domain_conf.c:14126
 #, c-format
 msgid "Target domain host device count %zu does not match source %zu"
 msgstr "目标域主机设备计数 %zu 与源 %zu 不匹配"
 
-#: src/conf/domain_conf.c:13952
+#: src/conf/domain_conf.c:14139
 #, c-format
 msgid "Target domain smartcard count %zu does not match source %zu"
 msgstr "目标域智能卡计数 %zu 与源 %zu 不匹配"
 
-#: src/conf/domain_conf.c:13965
+#: src/conf/domain_conf.c:14152
 #, c-format
 msgid "Target domain serial port count %zu does not match source %zu"
 msgstr "目标域串口计数 %zu 与源 %zu 不匹配"
 
-#: src/conf/domain_conf.c:13978
+#: src/conf/domain_conf.c:14165
 #, c-format
 msgid "Target domain parallel port count %zu does not match source %zu"
 msgstr "目标域并口计数 %zu 与源 %zu 不匹配"
 
-#: src/conf/domain_conf.c:13991
+#: src/conf/domain_conf.c:14178
 #, c-format
 msgid "Target domain channel count %zu does not match source %zu"
 msgstr "目标域通道计数 %zu 与源 %zu 不匹配"
 
-#: src/conf/domain_conf.c:14004
+#: src/conf/domain_conf.c:14191
 #, c-format
 msgid "Target domain console count %zu does not match source %zu"
 msgstr "目标域控制台器计数 %zu 与源 %zu 不映射"
 
-#: src/conf/domain_conf.c:14017
+#: src/conf/domain_conf.c:14204
 #, c-format
 msgid "Target domain hub device count %zu does not match source %zu"
 msgstr "目标域集线设备计数 %zu 与源 %zu 不匹配"
 
-#: src/conf/domain_conf.c:14030
+#: src/conf/domain_conf.c:14217
 #, c-format
 msgid ""
 "Target domain USB redirection filter count %d does not match source %d"
 msgstr "目标域 USB 重定向过滤器计数 %d 与源 %d 不匹配"
 
-#: src/conf/domain_conf.c:14044
+#: src/conf/domain_conf.c:9064
 #, c-format
 msgid "Target domain watchdog count %d does not match source %d"
 msgstr "目标域监控程序计数 %d 与源 %d 不匹配"
 
-#: src/conf/domain_conf.c:14057
+#: src/conf/domain_conf.c:9076
 #, c-format
 msgid "Target domain memory balloon count %d does not match source %d"
 msgstr "目标域内存布尔计数 %d 与源 %d 不匹配"
 
-#: src/conf/domain_conf.c:14402
+#: src/conf/domain_conf.c:14589
 #, c-format
 msgid "unexpected %s action: %d"
 msgstr "意外 %s 动作：%d"
 
-#: src/conf/domain_conf.c:14720
+#: src/conf/domain_conf.c:9685
 #, c-format
 msgid "unexpected disk type %d"
 msgstr "意外的磁盘类型 %d"
 
-#: src/conf/domain_conf.c:14725
+#: src/conf/domain_conf.c:9690
 #, c-format
 msgid "unexpected disk device %d"
 msgstr "意外的磁盘设备 %d"
 
-#: src/conf/domain_conf.c:14730
+#: src/conf/domain_conf.c:9695
 #, c-format
 msgid "unexpected disk bus %d"
 msgstr "意外的磁盘总线 %d"
 
-#: src/conf/domain_conf.c:14735
+#: src/conf/domain_conf.c:9700
 #, c-format
 msgid "unexpected disk cache mode %d"
 msgstr "意外的磁盘缓存模式 %d"
 
-#: src/conf/domain_conf.c:14740
+#: src/conf/domain_conf.c:9705
 #, c-format
 msgid "unexpected disk io mode %d"
 msgstr "意外的磁盘 io 模式 %d"
 
-#: src/conf/domain_conf.c:14745
+#: src/conf/domain_conf.c:14932
 #, c-format
 msgid "Unexpected disk sgio mode '%d'"
 msgstr ""
 
-#: src/conf/domain_conf.c:14941
+#: src/conf/domain_conf.c:9897
 #, c-format
 msgid "unexpected controller type %d"
 msgstr "意外的控制器类型 %d"
 
-#: src/conf/domain_conf.c:14950
+#: src/conf/domain_conf.c:9906
 #, c-format
 msgid "unexpected model type %d"
 msgstr "意外的型号类型 %d"
 
-#: src/conf/domain_conf.c:15036
+#: src/conf/domain_conf.c:9958
 #, c-format
 msgid "unexpected filesystem type %d"
 msgstr "意外的文件系统类型 %d"
 
-#: src/conf/domain_conf.c:15042
+#: src/conf/domain_conf.c:9964
 #, c-format
 msgid "unexpected accessmode %d"
 msgstr "意外的访问模式 %d"
 
-#: src/conf/domain_conf.c:15127
+#: src/conf/domain_conf.c:15314
 #, c-format
 msgid "unexpected pci hostdev driver name type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:15173
+#: src/conf/domain_conf.c:15360
 msgid "PCI address Formatting failed"
 msgstr "PCI 地址格式化失败"
 
-#: src/conf/domain_conf.c:15200 src/conf/domain_conf.c:15233
-#: src/conf/domain_conf.c:16482 src/conf/domain_conf.c:16491
-#: src/qemu/qemu_hotplug.c:3363
+#: src/conf/domain_conf.c:11016
 #, c-format
 msgid "unexpected hostdev type %d"
 msgstr "意外的 hostdev 类型 %d"
 
-#: src/conf/domain_conf.c:15257 src/conf/domain_conf.c:15330
-#: src/conf/domain_conf.c:16266
-#, c-format
-msgid "unexpected net type %d"
-msgstr "意外的网络类型 %d"
-
-#: src/conf/domain_conf.c:15284
+#: src/conf/domain_conf.c:10056
 #, c-format
 msgid "unexpected source mode %d"
 msgstr "意外的源模式 %d"
 
-#: src/conf/domain_conf.c:15304
+#: src/conf/domain_conf.c:15490
+#, c-format
+msgid "unexpected actual net type %s"
+msgstr ""
+
+#: src/conf/domain_conf.c:10028 src/conf/domain_conf.c:10091
+#: src/conf/domain_conf.c:10822
+#, c-format
+msgid "unexpected net type %d"
+msgstr "意外的网络类型 %d"
+
+#: src/conf/domain_conf.c:15562
 #, c-format
-msgid "unexpected net type %s"
-msgstr "意外的网络类型 %s"
+msgid "unexpected actual net type %d"
+msgstr ""
 
-#: src/conf/domain_conf.c:15495
+#: src/conf/domain_conf.c:10251
 #, c-format
 msgid "unexpected char type %d"
 msgstr "意外的字符类型 %d"
 
-#: src/conf/domain_conf.c:15597
+#: src/conf/domain_conf.c:10352
 #, c-format
 msgid "unexpected char device type %d"
 msgstr "意外的 char 设备类型 %d"
 
-#: src/conf/domain_conf.c:15616
+#: src/conf/domain_conf.c:10371
 msgid "Could not format channel target type"
 msgstr "无法格式化通道目标类型"
 
-#: src/conf/domain_conf.c:15626
+#: src/conf/domain_conf.c:10381
 msgid "Unable to format guestfwd port"
 msgstr "无法格式化 guestfwd 端口"
 
-#: src/conf/domain_conf.c:15703 src/conf/domain_conf.c:15734
-#: src/qemu/qemu_command.c:8780
+#: src/conf/domain_conf.c:10441 src/conf/domain_conf.c:10472
+#: src/qemu/qemu_command.c:4553
 #, c-format
 msgid "unexpected smartcard type %d"
 msgstr "意外的智能卡类型 %d"
 
-#: src/conf/domain_conf.c:15751
+#: src/conf/domain_conf.c:16022
 #, c-format
 msgid "unexpected codec type %d"
 msgstr "意外的编码解码类型 %d"
 
-#: src/conf/domain_conf.c:15804 src/xenxs/xen_sxpr.c:2112
+#: src/conf/domain_conf.c:10490 src/xenxs/xen_sxpr.c:1978
 #, c-format
 msgid "unexpected sound model %d"
 msgstr "意外声音模型 %d"
 
-#: src/conf/domain_conf.c:15847
+#: src/conf/domain_conf.c:10518
 #, c-format
 msgid "unexpected memballoon model %d"
 msgstr "意外的内存 balloon 型号 %d"
 
-#: src/conf/domain_conf.c:15912
+#: src/conf/domain_conf.c:10558
 #, c-format
 msgid "unexpected watchdog model %d"
 msgstr "意外监视器模型 %d"
 
-#: src/conf/domain_conf.c:15918
+#: src/conf/domain_conf.c:10564
 #, c-format
 msgid "unexpected watchdog action %d"
 msgstr "意外监视器动作 %d"
 
-#: src/conf/domain_conf.c:16038
+#: src/conf/domain_conf.c:10605
 #, c-format
 msgid "unexpected video model %d"
 msgstr "意外视频模型 %d"
 
-#: src/conf/domain_conf.c:16079 src/xenxs/xen_sxpr.c:2149
+#: src/conf/domain_conf.c:10642 src/xenxs/xen_sxpr.c:2006
 #, c-format
 msgid "unexpected input type %d"
 msgstr "意外输入类型 %d"
 
-#: src/conf/domain_conf.c:16084
+#: src/conf/domain_conf.c:10647
 #, c-format
 msgid "unexpected input bus type %d"
 msgstr "意外输入总线类型 %d"
 
-#: src/conf/domain_conf.c:16112
+#: src/conf/domain_conf.c:10675
 #, c-format
 msgid "unexpected timer name %d"
 msgstr "意外的计时器名称 %d"
 
-#: src/conf/domain_conf.c:16128
+#: src/conf/domain_conf.c:10691
 #, c-format
 msgid "unexpected timer tickpolicy %d"
 msgstr "意外的计时器 tickpolicy %d"
 
-#: src/conf/domain_conf.c:16142
+#: src/conf/domain_conf.c:10705
 #, c-format
 msgid "unexpected timer track %d"
 msgstr "意外的计时器跟踪 %d"
 
-#: src/conf/domain_conf.c:16160
+#: src/conf/domain_conf.c:10723
 #, c-format
 msgid "unexpected timer mode %d"
 msgstr "意外的计时器模式 %d"
 
-#: src/conf/domain_conf.c:16473 src/conf/domain_conf.c:16498
+#: src/conf/domain_conf.c:11007
 #, c-format
 msgid "unexpected hostdev mode %d"
 msgstr "意外的 hostdev 模式 %d"
 
-#: src/conf/domain_conf.c:16606
+#: src/conf/domain_conf.c:11113
 #, c-format
 msgid "unexpected hub type %d"
 msgstr "意外的集线器类型 %d"
 
-#: src/conf/domain_conf.c:16698
+#: src/conf/domain_conf.c:11165
 #, c-format
 msgid "unexpected domain type %d"
 msgstr "意外的域类型 %d"
 
-#: src/conf/domain_conf.c:16883
+#: src/conf/domain_conf.c:11298
 msgid "failed to format cpuset for vcpupin"
 msgstr "为 vcpupin 格式化 cpuset 失败"
 
-#: src/conf/domain_conf.c:16897
+#: src/conf/domain_conf.c:17191
 msgid "failed to format cpuset for emulator"
 msgstr "为模拟程序格式化 cpuset 失败"
 
-#: src/conf/domain_conf.c:16926
+#: src/conf/domain_conf.c:11320
 msgid "failed to format nodeset for NUMA memory tuning"
 msgstr "为 NUMA 内存调试格式化 nodeset 失败"
 
-#: src/conf/domain_conf.c:16995
+#: src/conf/domain_conf.c:11378
 #, c-format
 msgid "unexpected boot device type %d"
 msgstr "意外的引导设备类型 %d"
 
-#: src/conf/domain_conf.c:17029
+#: src/conf/domain_conf.c:11406
 #, c-format
 msgid "unexpected smbios mode %d"
 msgstr "意外的 smbios 模式 %d"
 
-#: src/conf/domain_conf.c:17071
+#: src/conf/domain_conf.c:17365
 #, c-format
 msgid "unexpected feature %zu"
 msgstr ""
 
-#: src/conf/domain_conf.c:17092
+#: src/conf/domain_conf.c:17386
 #, c-format
 msgid "Unexpected state of feature '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:17509
+#: src/conf/domain_conf.c:17812
 msgid "Device configuration is not compatible: Domain has no USB bus support"
 msgstr "失败配置不兼容：域不支持 USB 总线"
 
-#: src/conf/domain_conf.c:17531 src/conf/network_conf.c:2832
-#: src/conf/nwfilter_conf.c:2719 src/util/virdnsmasq.c:547
+#: src/conf/domain_conf.c:11705 src/conf/network_conf.c:1408
+#: src/conf/nwfilter_conf.c:2601 src/util/dnsmasq.c:529
 #, c-format
 msgid "cannot create config directory '%s'"
 msgstr "无法生成配置目录 '%s'"
 
-#: src/conf/domain_conf.c:17670
+#: src/conf/domain_conf.c:11850
 #, c-format
 msgid "unexpected domain %s already exists"
 msgstr "意外目标 %s 已存在"
 
-#: src/conf/domain_conf.c:17710 src/conf/network_conf.c:3050
-#: src/conf/network_conf.c:3083 src/conf/nwfilter_conf.c:3093
-#: src/conf/storage_conf.c:1854
+#: src/conf/domain_conf.c:11890 src/conf/network_conf.c:1508
+#: src/conf/nwfilter_conf.c:2915 src/conf/storage_conf.c:1486
 #, c-format
 msgid "Failed to open dir '%s'"
 msgstr "打开目录 '%s' 失败"
 
-#: src/conf/domain_conf.c:17780
+#: src/conf/domain_conf.c:11954
 #, c-format
 msgid "cannot remove config %s"
 msgstr "无法为删除配置 %s"
 
-#: src/conf/domain_conf.c:18135
+#: src/conf/domain_conf.c:18455
 #, c-format
 msgid "unable to visit backing chain file %s"
 msgstr "无法访问后端链文件 %s"
 
-#: src/conf/domain_conf.c:18236
+#: src/conf/domain_conf.c:13347
 #, c-format
 msgid "invalid domain state: %d"
 msgstr "无效域状态：%d"
 
-#: src/conf/domain_conf.c:18683
+#: src/conf/domain_conf.c:19011
 #, c-format
 msgid "Copying definition of '%d' type is not implemented yet."
 msgstr "还没有采用复制 '%d' 类型定义的方法"
 
-#: src/conf/domain_conf.c:18965
+#: src/conf/domain_conf.c:19293
 #, c-format
 msgid "no device found with alias %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:19057 src/conf/domain_conf.c:19139
+#: src/conf/domain_conf.c:19385 src/conf/domain_conf.c:19467
 msgid "unknown metadata type"
 msgstr "未知元数据类型"
 
-#: src/conf/domain_conf.c:19064
+#: src/conf/domain_conf.c:19392
 msgid "Requested metadata element is not present"
 msgstr "所需元数据元素未出现"
 
-#: src/conf/domain_conf.c:19104
+#: src/conf/domain_conf.c:19432
 msgid "(metadata_xml)"
 msgstr ""
 
-#: src/conf/domain_event.c:401
+#: src/conf/domain_event.c:400
 #, c-format
 msgid "Class %s must derive from virDomainEvent"
 msgstr ""
 
-#: src/conf/interface_conf.c:122
+#: src/conf/interface_conf.c:126
 msgid "interface has no name"
 msgstr "接口无名称"
 
-#: src/conf/interface_conf.c:138
+#: src/conf/interface_conf.c:142
 msgid "interface mtu value is improper"
 msgstr "接口 mtu 值不恰当"
 
-#: src/conf/interface_conf.c:162
+#: src/conf/interface_conf.c:166
 #, c-format
 msgid "unknown interface startmode %s"
 msgstr "未知的网络接口起始模式 %s"
 
-#: src/conf/interface_conf.c:194
+#: src/conf/interface_conf.c:198
 #, c-format
 msgid "unknown bonding mode %s"
 msgstr "未知的绑定模式类型 %s"
 
-#: src/conf/interface_conf.c:215
+#: src/conf/interface_conf.c:219
 #, c-format
 msgid "unknown mii bonding carrier %s"
 msgstr "未知 mii 绑定载体 %s"
 
-#: src/conf/interface_conf.c:238
+#: src/conf/interface_conf.c:242
 #, c-format
 msgid "unknown arp bonding validate %s"
 msgstr "未知 arp 绑定确认 %s"
 
-#: src/conf/interface_conf.c:264
+#: src/conf/interface_conf.c:268
 #, c-format
 msgid "unknown dhcp peerdns value %s"
 msgstr "未知 dhcp peerdns 值 %s"
 
-#: src/conf/interface_conf.c:290
+#: src/conf/interface_conf.c:294
 msgid "Invalid ip address prefix value"
 msgstr "无效的 MAC 地址前缀"
 
-#: src/conf/interface_conf.c:436
+#: src/conf/interface_conf.c:454
 msgid "protocol misses the family attribute"
 msgstr "协议缺少 family 属性"
 
-#: src/conf/interface_conf.c:455
+#: src/conf/interface_conf.c:473
 #, c-format
 msgid "unsupported protocol family '%s'"
 msgstr "不支持的协议 family %s"
 
-#: src/conf/interface_conf.c:530
+#: src/conf/interface_conf.c:547
 msgid "bond has no interfaces"
 msgstr "绑定未指定网络接口"
 
-#: src/conf/interface_conf.c:577
+#: src/conf/interface_conf.c:596
 msgid "bond interface miimon freq missing or invalid"
 msgstr "绑定接口 miimon freq 缺失或者无效"
 
-#: src/conf/interface_conf.c:585
+#: src/conf/interface_conf.c:604
 msgid "bond interface miimon downdelay invalid"
 msgstr "绑定接口 miimon downdelay 无效"
 
-#: src/conf/interface_conf.c:593
+#: src/conf/interface_conf.c:613
 msgid "bond interface miimon updelay invalid"
 msgstr "绑定接口 miimon updelay 无效"
 
-#: src/conf/interface_conf.c:609
+#: src/conf/interface_conf.c:632
 msgid "bond interface arpmon interval missing or invalid"
 msgstr "绑定接口 arpmon interval 缺失或者无效"
 
-#: src/conf/interface_conf.c:617
+#: src/conf/interface_conf.c:641
 msgid "bond interface arpmon target missing"
 msgstr "绑定接口 arpmon 目标缺失"
 
-#: src/conf/interface_conf.c:635
+#: src/conf/interface_conf.c:662
 msgid "vlan interface misses the tag attribute"
 msgstr "vlan 接口缺少 tag 属性"
 
-#: src/conf/interface_conf.c:643
+#: src/conf/interface_conf.c:670
 msgid "vlan interface misses name attribute"
 msgstr "vlan 接口缺少 name 属性"
 
-#: src/conf/interface_conf.c:660
+#: src/conf/interface_conf.c:687
 msgid "interface misses the type attribute"
 msgstr "网络接口类型属性缺失"
 
-#: src/conf/interface_conf.c:666
+#: src/conf/interface_conf.c:693
 #, c-format
 msgid "unknown interface type %s"
 msgstr "未知的网络接口类型 %s"
 
-#: src/conf/interface_conf.c:685
+#: src/conf/interface_conf.c:714
 #, c-format
 msgid "interface has unsupported type '%s'"
 msgstr "接口中有不支持的类型 %s"
 
-#: src/conf/interface_conf.c:722
+#: src/conf/interface_conf.c:751
 msgid "bridge interface misses the bridge element"
 msgstr "bridge 接口缺少 bridge 元素"
 
-#: src/conf/interface_conf.c:734
+#: src/conf/interface_conf.c:763
 #, c-format
 msgid "bridge interface stp should be on or off got %s"
 msgstr "应该打开或者关闭桥接接口获得 %s"
 
-#: src/conf/interface_conf.c:765
+#: src/conf/interface_conf.c:793
 msgid "bond interface misses the bond element"
 msgstr "绑定接口缺少绑定元素"
 
-#: src/conf/interface_conf.c:786
+#: src/conf/interface_conf.c:814
 msgid "vlan interface misses the vlan element"
 msgstr "vlan 接口缺少 vlan 元素"
 
-#: src/conf/interface_conf.c:814
+#: src/conf/interface_conf.c:842
 #, c-format
 msgid "unexpected root element <%s>, expecting <interface>"
 msgstr "意外的 root 元素 <%s>，应为 <interface>"
 
-#: src/conf/interface_conf.c:841
+#: src/conf/interface_conf.c:869
 msgid "(interface_definition)"
 msgstr "(interface_definition)"
 
-#: src/conf/interface_conf.c:924
+#: src/conf/interface_conf.c:950
 msgid "bond arp monitoring has no target"
 msgstr "绑定 arp 监视没有目标"
 
-#: src/conf/interface_conf.c:953
+#: src/conf/interface_conf.c:978
 msgid "vlan misses the tag name"
 msgstr "vlan 缺少标签名"
 
-#: src/conf/interface_conf.c:1036
+#: src/conf/interface_conf.c:1060
 msgid "virInterfaceDefFormat unknown startmode"
 msgstr "virInterfaceDefFormat 未知启动模式"
 
-#: src/conf/interface_conf.c:1051
+#: src/conf/interface_conf.c:1074
 msgid "virInterfaceDefFormat NULL def"
 msgstr "virInterfaceDefFormat NULL def"
 
-#: src/conf/interface_conf.c:1057
+#: src/conf/interface_conf.c:1080
 msgid "virInterfaceDefFormat missing interface name"
 msgstr "virInterfaceDefFormat 缺少接口名称"
 
-#: src/conf/interface_conf.c:1063
+#: src/conf/interface_conf.c:1086
 #, c-format
 msgid "unexpected interface type %d"
 msgstr "意外接口类型 %d"
 
-#: src/conf/interface_conf.c:1264 src/conf/network_conf.c:360
-#: src/conf/node_device_conf.c:184 src/conf/nwfilter_conf.c:3027
-#: src/conf/storage_conf.c:1779 src/libxl/libxl_driver.c:840
-#: src/parallels/parallels_driver.c:894 src/qemu/qemu_driver.c:585
-#: src/remote/remote_driver.c:943 src/test/test_driver.c:719
-#: src/test/test_driver.c:1421 src/xen/xen_driver.c:448
+#: src/conf/domain_conf.c:1543 src/conf/interface_conf.c:1288
+#: src/conf/network_conf.c:227 src/conf/node_device_conf.c:195
+#: src/conf/nwfilter_conf.c:2844 src/conf/storage_conf.c:1409
+#: src/libxl/libxl_driver.c:880 src/openvz/openvz_conf.c:474
+#: src/qemu/qemu_driver.c:420 src/remote/remote_driver.c:778
+#: src/rpc/virnetclientstream.c:151 src/rpc/virnetserver.c:377
+#: src/test/test_driver.c:526 src/test/test_driver.c:766
+#: src/xen/xen_driver.c:321
 msgid "cannot initialize mutex"
-msgstr "无法初始化互斥"
+msgstr "无法初始化 mutex"
 
-#: src/conf/netdev_bandwidth_conf.c:44 src/conf/netdev_bandwidth_conf.c:128
+#: src/conf/netdev_bandwidth_conf.c:46 src/conf/netdev_bandwidth_conf.c:113
 msgid "invalid argument supplied"
 msgstr "提供的参数无效"
 
@@ -3939,11 +4111,11 @@
 msgid "could not convert bandwidth floor value '%s'"
 msgstr "无法转换带宽 floor 值 '%s'"
 
-#: src/conf/netdev_bandwidth_conf.c:139
+#: src/conf/netdev_bandwidth_conf.c:122
 msgid "Only one child <inbound> element allowed"
 msgstr "只允许一个子 <inbound> 元素"
 
-#: src/conf/netdev_bandwidth_conf.c:147
+#: src/conf/netdev_bandwidth_conf.c:130
 msgid "Only one child <outbound> element allowed"
 msgstr "只允许一个子 <outbound> 元素"
 
@@ -4017,35 +4189,35 @@
 msgid "missing required virtualport type"
 msgstr "缺少所需虚拟端口类型"
 
-#: src/conf/netdev_vport_profile_conf.c:81
+#: src/conf/netdev_vport_profile_conf.c:94
 msgid "cannot parse value of managerid parameter"
 msgstr "无法解析 managerid 参数值"
 
-#: src/conf/netdev_vport_profile_conf.c:86
+#: src/conf/netdev_vport_profile_conf.c:100
 msgid "value of managerid out of range"
 msgstr "managerid 值超出范围"
 
-#: src/conf/netdev_vport_profile_conf.c:98
+#: src/conf/netdev_vport_profile_conf.c:108
 msgid "cannot parse value of typeid parameter"
 msgstr "无法解析 typeid 参数值"
 
-#: src/conf/netdev_vport_profile_conf.c:103
+#: src/conf/netdev_vport_profile_conf.c:114
 msgid "value for typeid out of range"
 msgstr "typeid 值超出范围"
 
-#: src/conf/netdev_vport_profile_conf.c:115
+#: src/conf/netdev_vport_profile_conf.c:122
 msgid "cannot parse value of typeidversion parameter"
 msgstr "无法解析 typeidversion 参数值"
 
-#: src/conf/netdev_vport_profile_conf.c:120
+#: src/conf/netdev_vport_profile_conf.c:128
 msgid "value of typeidversion out of range"
 msgstr "typeidversion 值超出范围"
 
-#: src/conf/netdev_vport_profile_conf.c:130
+#: src/conf/netdev_vport_profile_conf.c:138
 msgid "cannot parse instanceid parameter as a uuid"
 msgstr "无法将 instanceid 参数解析为 uuid"
 
-#: src/conf/netdev_vport_profile_conf.c:139
+#: src/conf/netdev_vport_profile_conf.c:165
 msgid "profileid parameter too long"
 msgstr "profileid 参数过长"
 
@@ -4053,8 +4225,7 @@
 msgid "cannot parse interfaceid parameter as a uuid"
 msgstr "无法将 interfaceid 参数解析为 uuid"
 
-#: src/conf/netdev_vport_profile_conf.c:159
-#: src/util/virnetdevvportprofile.c:159
+#: src/conf/netdev_vport_profile_conf.c:144
 msgid "cannot generate a random uuid for instanceid"
 msgstr "无法为 instanceid 生成随机 uuid"
 
@@ -4063,711 +4234,716 @@
 msgid "cannot generate a random uuid for interfaceid"
 msgstr "无法为 interfaceid 生成随机 uuid"
 
-#: src/conf/network_conf.c:307
+#: src/conf/network_conf.c:329
 #, c-format
 msgid "cannot save persistent config of transient network '%s'"
 msgstr "无法永久更改临时网络 '%s' 的配置"
 
-#: src/conf/network_conf.c:318
+#: src/conf/network_conf.c:340
 #, c-format
 msgid "cannot save live config of inactive network '%s'"
 msgstr "无法保存不活跃网络 '%s' 的实时配置"
 
-#: src/conf/network_conf.c:488
+#: src/conf/network_conf.c:510
 msgid "NULL NetworkDef"
 msgstr "NULL NetworkDef"
 
-#: src/conf/network_conf.c:522
+#: src/conf/network_conf.c:544
 msgid "network is not running"
 msgstr "网络未运行"
 
-#: src/conf/network_conf.c:529
+#: src/conf/network_conf.c:551
 msgid "cannot change persistent config of a transient network"
 msgstr "无法更改临时域的永久配置"
 
-#: src/conf/network_conf.c:636
+#: src/conf/network_conf.c:658
 #, c-format
 msgid "Missing 'start' attribute in dhcp range for network '%s'"
 msgstr "网络 '%s' 的 dhcp 范围缺少 ’start‘ 属性"
 
-#: src/conf/network_conf.c:645
+#: src/conf/network_conf.c:667
 #, c-format
 msgid "Missing 'end' attribute in dhcp range for network '%s'"
 msgstr "网络 '%s' 的 dhcp 范围缺少 ’end‘ 属性"
 
-#: src/conf/network_conf.c:655
+#: src/conf/network_conf.c:390
 #, c-format
 msgid "Invalid dhcp range '%s' to '%s' in network '%s'"
 msgstr "网络 '%s' 中有无效 dhcp 范围 '%s' 到 '%s'"
 
-#: src/conf/network_conf.c:684
+#: src/conf/network_conf.c:706
 #, c-format
 msgid ""
 "Invalid to specify MAC address '%s' in network '%s' IPv6 static host "
 "definition"
 msgstr "在网络'%s' IPv6 静态主机定义中指定 MAC 地址 '%s' 无效"
 
-#: src/conf/network_conf.c:691
+#: src/conf/network_conf.c:416
 #, c-format
 msgid "Cannot parse MAC address '%s' in network '%s'"
 msgstr "无法解析网络 '%s' 中的 MAC 地址 '%s'"
 
-#: src/conf/network_conf.c:697
+#: src/conf/network_conf.c:719
 #, c-format
 msgid "expected unicast mac address, found multicast '%s' in network '%s'"
 msgstr "应为单播 mac 地址，但在网络 '%s' 中找到多播 '%s'"
 
-#: src/conf/network_conf.c:709
+#: src/conf/network_conf.c:731
 #, c-format
 msgid "Invalid character '%c' in id '%s' of network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:717
+#: src/conf/network_conf.c:739
 #, c-format
 msgid "Cannot use host name '%s' in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:725
+#: src/conf/network_conf.c:747
 #, c-format
 msgid "Invalid IP address in static host definition for network '%s'"
 msgstr "网络 '%s' 的静态主机定义中缺少 IP地址"
 
-#: src/conf/network_conf.c:735
+#: src/conf/network_conf.c:757
 #, c-format
 msgid ""
 "At least one of name, mac, or ip attribute must be specified for static host "
 "definition in network '%s' "
 msgstr "网络 '%s' 静态主机定义中至少需要指定name，mac 或者 ip 属性。 "
 
-#: src/conf/network_conf.c:747
+#: src/conf/network_conf.c:769
 #, c-format
 msgid ""
 "Static host definition in IPv6 network '%s' must have id or name attribute"
 msgstr ""
 
-#: src/conf/network_conf.c:754
+#: src/conf/network_conf.c:776
 #, c-format
 msgid ""
 "Static host definition in IPv4 network '%s' must have mac or name attribute"
 msgstr "IPv4 网络 '%s' 中的静态主机定义必须含有 mac 或者 name 属性"
 
-#: src/conf/network_conf.c:761
+#: src/conf/network_conf.c:440
 #, c-format
 msgid "Missing IP address in static host definition for network '%s'"
 msgstr "静态主机定义中缺少网络 '%s' 的 IP地址"
 
-#: src/conf/network_conf.c:862
+#: src/conf/network_conf.c:884
 #, c-format
 msgid "Missing IP address in network '%s' DNS HOST record"
 msgstr "网络 '%s' DNS HOST 记录中缺少 IP 地址"
 
-#: src/conf/network_conf.c:869
+#: src/conf/network_conf.c:891
 #, c-format
 msgid "Invalid IP address in network '%s' DNS HOST record"
 msgstr "网络 '%s' DNS HOST 记录中的无效 IP 地址"
 
-#: src/conf/network_conf.c:886 src/conf/network_conf.c:895
+#: src/conf/network_conf.c:908 src/conf/network_conf.c:917
 #, c-format
 msgid "Missing hostname in network '%s' DNS HOST record"
 msgstr "网络 '%s' DNS HOST 记录中缺少主机名"
 
-#: src/conf/network_conf.c:902
+#: src/conf/network_conf.c:924
 #, c-format
 msgid "Missing ip and hostname in network '%s' DNS HOST record"
 msgstr "网络 '%s' DNS HOST 记录中缺少 ip 和主机名"
 
-#: src/conf/network_conf.c:923
+#: src/conf/network_conf.c:945
 #, c-format
 msgid "Missing required service attribute in DNS SRV record of network %s"
 msgstr ""
 
-#: src/conf/network_conf.c:929
+#: src/conf/network_conf.c:951
 #, c-format
 msgid "Service name '%s' in network %s is too long, limit is %d bytes"
 msgstr "网络 %s 中的服务名称 '%s' 太长，最多为 %d 字节。"
 
-#: src/conf/network_conf.c:936
+#: src/conf/network_conf.c:958
 #, c-format
 msgid ""
 "Missing required protocol attribute in dns srv record '%s' of network %s"
 msgstr "网络 %s 的 dns srv 记录 '%s' 中缺少所需 protocol 属性"
 
-#: src/conf/network_conf.c:946
+#: src/conf/network_conf.c:968
 #, c-format
 msgid "Invalid protocol attribute value '%s' in DNS SRV record of network %s"
 msgstr ""
 
-#: src/conf/network_conf.c:961
+#: src/conf/network_conf.c:983
 #, c-format
 msgid "Missing or invalid port attribute in network %s"
 msgstr "网络 %s 中缺少或者无效的 port 属性"
 
-#: src/conf/network_conf.c:969
+#: src/conf/network_conf.c:991
 #, c-format
 msgid "Missing or invalid priority attribute in network %s"
 msgstr "网络 %s 中缺少或者无效的 priority 属性"
 
-#: src/conf/network_conf.c:977
+#: src/conf/network_conf.c:999
 #, c-format
 msgid "Missing or invalid weight attribute in network %s"
 msgstr "网络 %s 中缺少或者无效的 weight 属性"
 
-#: src/conf/network_conf.c:987
+#: src/conf/network_conf.c:1009
 #, c-format
 msgid ""
 "Missing required service attribute or protocol in DNS SRV record of network "
 "%s"
 msgstr "网络 %s 的 DNS SRV 记录中缺少所需 service 或者 protocol 属性"
 
-#: src/conf/network_conf.c:1006
+#: src/conf/network_conf.c:1028
 #, c-format
 msgid "missing required name attribute in DNS TXT record of network %s"
 msgstr "网络 %s 的 DNS TXT 记录中缺少所需 name 属性"
 
-#: src/conf/network_conf.c:1012
+#: src/conf/network_conf.c:1034
 #, c-format
 msgid "prohibited space character in DNS TXT record name '%s' of network %s"
 msgstr "网络 %s 的 DNS TXT 记录名称  '%s' 中禁止使用空格字符"
 
-#: src/conf/network_conf.c:1018
+#: src/conf/network_conf.c:1040
 #, c-format
 msgid ""
 "missing required value attribute in DNS TXT record named '%s' of network %s"
 msgstr "名为 '%s' 的网络 %s 的 DNS TXT 记录中缺少所需 value 属性"
 
-#: src/conf/network_conf.c:1025
+#: src/conf/network_conf.c:1047
 #, c-format
 msgid "Missing required name or value in DNS TXT record of network %s"
 msgstr "网络 %s 的 DNS TXT 记录中缺少所需 name 或者 value"
 
-#: src/conf/network_conf.c:1060
+#: src/conf/network_conf.c:1082
 #, c-format
 msgid "Invalid dns forwardPlainNames setting '%s' in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:1070
+#: src/conf/network_conf.c:1092
 #, c-format
 msgid "invalid <forwarder> element found in <dns> of network %s"
 msgstr ""
 
-#: src/conf/network_conf.c:1082
+#: src/conf/network_conf.c:1104
 #, c-format
 msgid "Invalid forwarder IP address '%s' in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:1094
+#: src/conf/network_conf.c:1116
 #, c-format
 msgid "invalid <host> element found in <dns> of network %s"
 msgstr "在网络 %s 的 <dns> 中找到无效  <host> 元素"
 
-#: src/conf/network_conf.c:1114
+#: src/conf/network_conf.c:1136
 #, c-format
 msgid "invalid <srv> element found in <dns> of network %s"
 msgstr "在网络 %s 的 <dns> 中找到无效  <srv> 元素"
 
-#: src/conf/network_conf.c:1134
+#: src/conf/network_conf.c:1156
 #, c-format
 msgid "invalid <txt> element found in <dns> of network %s"
 msgstr "在网络 %s 的 <dns> 中找到无效  <txt> 元素"
 
-#: src/conf/network_conf.c:1188
+#: src/conf/network_conf.c:1210
 #, c-format
 msgid "Missing required address attribute in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:1194
+#: src/conf/network_conf.c:1216
 #, c-format
 msgid "Invalid address '%s' in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:1203
+#: src/conf/network_conf.c:1225
 #, c-format
 msgid "Invalid netmask '%s' in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:1211
+#: src/conf/network_conf.c:1233
 #, c-format
 msgid ""
 "Invalid ULong value specified for prefix in definition of network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:1225
+#: src/conf/network_conf.c:1247
 #, c-format
 msgid "%s family specified for non-IPv4 address '%s' in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:1232
+#: src/conf/network_conf.c:1254
 #, c-format
 msgid ""
 "Invalid netmask '%s' for address '%s' in network '%s' (both must be IPv4)"
 msgstr ""
 
-#: src/conf/network_conf.c:1239
+#: src/conf/network_conf.c:1261
 #, c-format
 msgid "Network '%s' IP address cannot have both a prefix and a netmask"
 msgstr ""
 
-#: src/conf/network_conf.c:1245
+#: src/conf/network_conf.c:1267
 #, c-format
 msgid "Invalid IPv4 prefix '%lu' in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:1252
+#: src/conf/network_conf.c:1274
 #, c-format
 msgid "Family 'ipv6' specified for non-IPv6 address '%s' in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:1258
+#: src/conf/network_conf.c:1280
 #, c-format
 msgid "netmask not allowed for IPv6 address '%s' in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:1264
+#: src/conf/network_conf.c:1286
 #, c-format
 msgid "Invalid IPv6 prefix '%lu' in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:1270
+#: src/conf/network_conf.c:1292
 #, c-format
 msgid "Unrecognized family '%s' in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:1287
+#: src/conf/network_conf.c:1309
 #, c-format
 msgid "Unsupported <tftp> element in an IPv6 element in network '%s'"
 msgstr "在网络 '%s' 的 IPv6 元素中不支持  <tftp> 元素"
 
-#: src/conf/network_conf.c:1343
+#: src/conf/network_conf.c:1365
 #, c-format
 msgid "Invalid prefix specified in route definition of network '%s'"
 msgstr "网络 '%s' 路由定义中指定的无效前缀"
 
-#: src/conf/network_conf.c:1353
+#: src/conf/network_conf.c:1375
 #, c-format
 msgid "Invalid metric specified in route definition of network '%s'"
 msgstr "网络 '%s' 路由定义中指定的无效度量标准"
 
-#: src/conf/network_conf.c:1362
+#: src/conf/network_conf.c:1384
 #, c-format
 msgid "Invalid metric value, must be > 0 in route definition of network '%s'"
 msgstr "无效度量值，在网络 '%s' 路由定义中必须大于 0。"
 
-#: src/conf/network_conf.c:1374
+#: src/conf/network_conf.c:1396
 #, c-format
 msgid ""
 "Missing required address attribute in route definition of network '%s'"
 msgstr "网络 '%s' 路由定义中缺少所需地址属性"
 
-#: src/conf/network_conf.c:1382
+#: src/conf/network_conf.c:1404
 #, c-format
 msgid ""
 "Missing required gateway attribute in route definition of network '%s'"
 msgstr "网络 '%s' 路由定义中缺少所需网关属性"
 
-#: src/conf/network_conf.c:1390
+#: src/conf/network_conf.c:1412
 #, c-format
 msgid "Bad network address '%s' in route definition of network '%s'"
 msgstr "网络 '%s' 路由定义中的坏网络地址 '%s'"
 
-#: src/conf/network_conf.c:1398
+#: src/conf/network_conf.c:1420
 #, c-format
 msgid "Bad gateway address '%s' in route definition of network '%s'"
 msgstr "网络 '%s' 路由定义中的坏网关地址 '%s'"
 
-#: src/conf/network_conf.c:1410
+#: src/conf/network_conf.c:1432
 #, c-format
 msgid ""
 "No family specified for non-IPv4 address '%s' in route definition of network "
 "'%s'"
 msgstr "网络 '%s' 路由定义中没有为非 IPv4 地址 '%s' 指定产品线"
 
-#: src/conf/network_conf.c:1412
+#: src/conf/network_conf.c:1434
 #, c-format
 msgid ""
 "IPv4 family specified for non-IPv4 address '%s' in route definition of "
 "network '%s'"
 msgstr "网络 '%s' 路由定义中没有为非 IPv4 地址 '%s' 指定 IPv4 产品线"
 
-#: src/conf/network_conf.c:1420
+#: src/conf/network_conf.c:1442
 #, c-format
 msgid ""
 "No family specified for non-IPv4 gateway '%s' in route definition of network "
 "'%s'"
 msgstr "网络 '%s' 路由定义中没有为非 IPv4 网关 '%s' 指定产品线"
 
-#: src/conf/network_conf.c:1422
+#: src/conf/network_conf.c:1444
 #, c-format
 msgid ""
 "IPv4 family specified for non-IPv4 gateway '%s' in route definition of "
 "network '%s'"
 msgstr "网络 '%s' 路由定义中没有为非 IPv4 网关 '%s' 指定 IPv4 产品线"
 
-#: src/conf/network_conf.c:1430
+#: src/conf/network_conf.c:1452
 #, c-format
 msgid "Bad netmask address '%s' in route definition of network '%s'"
 msgstr "网络 '%s' 路由定义中的坏子网掩码地址 '%s'"
 
-#: src/conf/network_conf.c:1437
+#: src/conf/network_conf.c:1459
 #, c-format
 msgid ""
 "Network '%s' has invalid netmask '%s' for address '%s' (both must be IPv4)"
 msgstr "网络 '%s'中包含地址 '%s' 的无效子网掩码 '%s'（二者必须都为 IPv4）"
 
-#: src/conf/network_conf.c:1445
+#: src/conf/network_conf.c:1467
 #, c-format
 msgid "Route definition '%s' cannot have both a prefix and a netmask"
 msgstr "路由定义 '%s' 不能同时有前缀和子网掩码"
 
-#: src/conf/network_conf.c:1453
+#: src/conf/network_conf.c:1475
 #, c-format
 msgid ""
 "Invalid prefix %u specified in route definition of network '%s', must be 0 - "
 "32"
 msgstr "网络 '%u' 路由定义中的无效前缀 %s，必须为 0-32"
 
-#: src/conf/network_conf.c:1462
+#: src/conf/network_conf.c:1484
 #, c-format
 msgid ""
 "ipv6 family specified for non-IPv6 address '%s' in route definition of "
 "network '%s'"
 msgstr "网络 '%s' 路由定义中没有为非 IPv6 网关 '%s' 指定 IPv6 产品线"
 
-#: src/conf/network_conf.c:1469
+#: src/conf/network_conf.c:1491
 #, c-format
 msgid ""
 "Specifying netmask invalid for IPv6 address '%s' in route definition of "
 "network '%s'"
 msgstr "网络 '%s' 路由定义中为 IPv6 地址 '%s' 指定子网掩码无效"
 
-#: src/conf/network_conf.c:1476
+#: src/conf/network_conf.c:1498
 #, c-format
 msgid ""
 "ipv6 specified for non-IPv6 gateway address '%s' in route definition of "
 "network '%s'"
 msgstr "网络 '%s' 路由定义中没有为非 IPv6 网关 '%s' 指定 ipv6"
 
-#: src/conf/network_conf.c:1483
+#: src/conf/network_conf.c:1505
 #, c-format
 msgid ""
 "Invalid prefix %u specified in route definition of network '%s', must be 0 - "
 "128"
 msgstr "网络 '%u' 路由定义中的无效前缀 %s，必须为 0-128"
 
-#: src/conf/network_conf.c:1491
+#: src/conf/network_conf.c:1513
 #, c-format
 msgid "Unrecognized family '%s' in route definition of network'%s'"
 msgstr "网络 '%s' 路由定义中无法识别的产品线  '%s'"
 
-#: src/conf/network_conf.c:1501
+#: src/conf/network_conf.c:1523
 #, c-format
 msgid ""
 "error converting address '%s' with netmask '%s' to network-address in route "
 "definition of network '%s'"
 msgstr "将地址  '%s' 使用子网掩码  '%s' 转换为网络  '%s' 路由定义中的网络地址时出错"
 
-#: src/conf/network_conf.c:1511
+#: src/conf/network_conf.c:1533
 #, c-format
 msgid ""
 "error converting address '%s' with prefix %u to network-address in route "
 "definition of network '%s'"
 msgstr "将地址  '%s' 使用前缀 %u 转换为网络 '%s' 路由定义中的网络地址时出错"
 
-#: src/conf/network_conf.c:1520
+#: src/conf/network_conf.c:1542
 #, c-format
 msgid ""
 "address '%s' in route definition of network '%s' is not a network address"
 msgstr "网络 '%s' 路由定义中路由定义地址 '%s' 不是网络地址"
 
-#: src/conf/network_conf.c:1565
+#: src/conf/network_conf.c:1587
 msgid "Missing required name attribute in portgroup"
 msgstr "portgroup 中缺少所需 name 属性"
 
-#: src/conf/network_conf.c:1617
+#: src/conf/network_conf.c:1639
 #, c-format
 msgid ""
 "The <nat> element can only be used when <forward> 'mode' is 'nat' in network "
 "%s"
 msgstr ""
 
-#: src/conf/network_conf.c:1626 src/conf/network_conf.c:1771
+#: src/conf/network_conf.c:1648 src/conf/network_conf.c:1793
 #, c-format
 msgid "invalid <address> element found in <forward> of network %s"
 msgstr "在网络 %s 的 <dns> 中找到无效  <addressee> 元素"
 
-#: src/conf/network_conf.c:1631
+#: src/conf/network_conf.c:1653
 #, c-format
 msgid ""
 "Only one <address> element is allowed in <nat> in <forward> in network %s"
 msgstr ""
 
-#: src/conf/network_conf.c:1638
+#: src/conf/network_conf.c:1660
 #, c-format
 msgid ""
 "missing 'start' attribute in <address> element in <nat> in <forward> in "
 "network %s"
 msgstr ""
 
-#: src/conf/network_conf.c:1645
+#: src/conf/network_conf.c:1667
 #, c-format
 msgid ""
 "missing 'end' attribute in <address> element in <nat> in <forward> in "
 "network %s"
 msgstr ""
 
-#: src/conf/network_conf.c:1653
+#: src/conf/network_conf.c:1675
 #, c-format
 msgid "Bad ipv4 start address '%s' in <nat> in <forward> in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:1660
+#: src/conf/network_conf.c:1682
 #, c-format
 msgid "Bad ipv4 end address '%s' in <nat> in <forward> in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:1669
+#: src/conf/network_conf.c:1691
 #, c-format
 msgid "invalid <port> element found in <forward> of network %s"
 msgstr ""
 
-#: src/conf/network_conf.c:1674
+#: src/conf/network_conf.c:1696
 #, c-format
 msgid ""
 "Only one <port> element is allowed in <nat> in <forward> in network %s"
 msgstr ""
 
-#: src/conf/network_conf.c:1682
+#: src/conf/network_conf.c:1704
 #, c-format
 msgid ""
 "Missing or invalid 'start' attribute in <port> in <nat> in <forward> in "
 "network %s"
 msgstr ""
 
-#: src/conf/network_conf.c:1690
+#: src/conf/network_conf.c:1712
 #, c-format
 msgid ""
 "Missing or invalid 'end' attribute in <port> in <nat> in <forward> in "
 "network %s"
 msgstr ""
 
-#: src/conf/network_conf.c:1732
+#: src/conf/network_conf.c:955
 #, c-format
 msgid "unknown forwarding type '%s'"
 msgstr "未知转发类型 '%s'"
 
-#: src/conf/network_conf.c:1751
+#: src/conf/network_conf.c:1773
 #, c-format
 msgid "Unknown forward <driver name='%s'/> in network %s"
 msgstr ""
 
-#: src/conf/network_conf.c:1763
+#: src/conf/network_conf.c:1785
 #, c-format
 msgid "invalid <interface> element found in <forward> of network %s"
 msgstr "在网络 %s 的 <dns> 中找到无效  <interface> 元素"
 
-#: src/conf/network_conf.c:1779
+#: src/conf/network_conf.c:1801
 #, c-format
 msgid "invalid <pf> element found in <forward> of network %s"
 msgstr "在网络 %s 的 <dns> 中找到无效  <pf> 元素"
 
-#: src/conf/network_conf.c:1787
+#: src/conf/network_conf.c:1809
 #, c-format
 msgid "invalid <nat> element found in <forward> of network %s"
 msgstr ""
 
-#: src/conf/network_conf.c:1792
+#: src/conf/network_conf.c:1814
 #, c-format
 msgid "Only one <nat> element is allowed in <forward> of network %s"
 msgstr ""
 
-#: src/conf/network_conf.c:1804
+#: src/conf/network_conf.c:1826
 #, c-format
 msgid ""
 "<address>, <interface>, and <pf> elements in <forward> of network %s are "
 "mutually exclusive"
 msgstr "在网络 %s 的 <dns> 中的 <address>、<inteface> 和  <txt> 元素互不兼容"
 
-#: src/conf/network_conf.c:1813
+#: src/conf/network_conf.c:1835
 #, c-format
 msgid ""
 "the <forward> 'dev' attribute cannot be used when <address> or <pf> sub-"
 "elements are present in network %s"
 msgstr "网络 %s 中有 <address> 或者 <pf> 子元素时不能使用 <forward> 'dev' 属性"
 
-#: src/conf/network_conf.c:1835
+#: src/conf/network_conf.c:1857
 #, c-format
 msgid ""
 "Missing required dev attribute in <forward> <interface> element of network %s"
 msgstr "网络 %s 的 <forward> <interface> 元素中缺少所需 dev 属性"
 
-#: src/conf/network_conf.c:1847
+#: src/conf/network_conf.c:1869
 #, c-format
 msgid ""
 "<forward dev='%s'> must match first <interface dev='%s'/> in network %s"
 msgstr "网络 %s 中 <forward dev='%s'> must match first <interface dev='%s'/>"
 
-#: src/conf/network_conf.c:1870
+#: src/conf/network_conf.c:1892
 #, c-format
 msgid "missing address type in network %s"
 msgstr "网络 %s 中缺少地址类型"
 
-#: src/conf/network_conf.c:1877
+#: src/conf/network_conf.c:1899
 #, c-format
 msgid "unknown address type '%s' in network %s"
 msgstr "网络 %s 中的未知地址类型 '%s'"
 
-#: src/conf/network_conf.c:1894
+#: src/conf/network_conf.c:1916
 #, c-format
 msgid "unsupported address type '%s' in network %s"
 msgstr "网络 %s 中不支持的磁盘地址类型 '%s'"
 
-#: src/conf/network_conf.c:1904
+#: src/conf/network_conf.c:1926
 #, c-format
 msgid "Only one <pf> element is allowed in <forward> of network %s"
 msgstr "在网络 %s 的 <forward> 中找到无效  <pf> 元素"
 
-#: src/conf/network_conf.c:1914
+#: src/conf/network_conf.c:1936
 #, c-format
 msgid "Missing required dev attribute in <pf> element of network '%s'"
 msgstr "网络 '%s' <pf> 元素中缺少所需 dev 属性"
 
-#: src/conf/network_conf.c:1995
+#: src/conf/network_conf.c:2017
 #, c-format
 msgid "Invalid ipv6 setting '%s' in network '%s'"
 msgstr "网络 '%s' 中的无效 ipv6 设置 '%s'"
 
-#: src/conf/network_conf.c:2025
+#: src/conf/network_conf.c:879
 #, c-format
 msgid "Invalid bridge mac address '%s' in network '%s'"
 msgstr "网络 '%s' 中的无效桥接 mac 地址 '%s'"
 
-#: src/conf/network_conf.c:2032
+#: src/conf/network_conf.c:2054
 #, c-format
 msgid "Invalid multicast bridge mac address '%s' in network '%s'"
 msgstr "网络 '%s' 中的无效多播桥接 mac 地址 '%s'"
 
-#: src/conf/network_conf.c:2148
+#: src/conf/network_conf.c:2170
 #, c-format
 msgid "unreachable static route gateway '%s' specified for network '%s'"
 msgstr "为网络 '%s' 指定的无法到达的静态路由网关 '%s'"
 
-#: src/conf/network_conf.c:2177
+#: src/conf/network_conf.c:1027
 #, c-format
 msgid "%s forwarding requested, but no IP address provided for network '%s'"
 msgstr "%s 转发请求，但没有为网络 '%s' 提供 IP地址"
 
-#: src/conf/network_conf.c:2185
+#: src/conf/network_conf.c:1034
 #, c-format
 msgid ""
 "multiple forwarding interfaces specified for network '%s', only one is "
 "supported"
 msgstr "为网络 '%s' 指定了多个转发接口，但只支持一个。"
 
-#: src/conf/network_conf.c:2198
+#: src/conf/network_conf.c:2220
 #, c-format
 msgid "bridge name not allowed in %s mode (network '%s')"
 msgstr "%s 模式（网络 '%s'）中不允许使用桥接名"
 
-#: src/conf/network_conf.c:2207
+#: src/conf/network_conf.c:1054
 #, c-format
 msgid ""
 "bridge delay/stp options only allowed in route, nat, and isolated mode, not "
 "in %s (network '%s')"
 msgstr "只能在路由、nat 以及孤立模式中，而不能在 %s（网络 '%s'）中使用桥接 delay/stop 选项"
 
-#: src/conf/network_conf.c:2214
+#: src/conf/network_conf.c:2236
 #, c-format
 msgid ""
 "A network with forward mode='%s' can specify a bridge name or a forward dev, "
 "but not both (network '%s')"
 msgstr "采用 forward mode='%s' 的网络可以指定桥接名称或者转发设备，但不能两个都指定（网络 '%s'）"
 
-#: src/conf/network_conf.c:2246
+#: src/conf/network_conf.c:1084
 msgid "(network_definition)"
 msgstr "(network_definition)"
 
-#: src/conf/network_conf.c:2273
+#: src/conf/network_conf.c:1111
 #, c-format
 msgid "unexpected root element <%s>, expecting <network>"
 msgstr "意外的 root 元素 <%s>，应为 <network>"
 
-#: src/conf/network_conf.c:2616
+#: src/conf/network_conf.c:2332
+#, c-format
+msgid "Unknown forwardPlainNames type %d in network"
+msgstr ""
+
+#: src/conf/network_conf.c:1298
 #, c-format
 msgid "Unknown forward type %d in network '%s'"
 msgstr "未知转发类型 %d 在网络 '%s' 中"
 
-#: src/conf/network_conf.c:2645
+#: src/conf/network_conf.c:2673
 #, c-format
 msgid "unexpected hostdev driver name type %d "
 msgstr ""
 
-#: src/conf/network_conf.c:2903
+#: src/conf/network_conf.c:2941
 msgid "(network status)"
 msgstr "（网络状态）"
 
-#: src/conf/network_conf.c:2908
+#: src/conf/network_conf.c:2946
 msgid "Could not find any 'network' element in status file"
 msgstr ""
 
-#: src/conf/network_conf.c:2919 src/conf/network_conf.c:3003
+#: src/conf/network_conf.c:1462
 #, c-format
 msgid "Network config filename '%s' does not match network name '%s'"
 msgstr "网络配置文件 '%s' 与网络名称 '%s' 不匹配"
 
-#: src/conf/network_conf.c:2947
+#: src/conf/network_conf.c:2985
 #, c-format
 msgid "Malformed 'floor_sum' attribute: %s"
 msgstr "畸形的 'floor_sum' 属性 %s"
 
-#: src/conf/network_conf.c:3130 src/util/virdnsmasq.c:268
+#: src/conf/network_conf.c:1555 src/util/dnsmasq.c:266
 #, c-format
 msgid "cannot remove config file '%s'"
 msgstr "无法删除配置文件 '%s'"
 
-#: src/conf/network_conf.c:3193
+#: src/conf/network_conf.c:1624
 #, c-format
 msgid "Bridge generation exceeded max id %d"
 msgstr "桥接生成超过最大 id %d"
 
-#: src/conf/network_conf.c:3211
+#: src/conf/network_conf.c:1642
 #, c-format
 msgid "bridge name '%s' already in use."
 msgstr "桥接名称 '%s' 已在使用。"
 
-#: src/conf/network_conf.c:3245
+#: src/conf/network_conf.c:3308
 #, c-format
 msgid "can't update '%s' section of network '%s'"
 msgstr "无法更新网络 '%s' 的 '%s' 部分"
 
-#: src/conf/network_conf.c:3252
+#: src/conf/network_conf.c:3315
 #, c-format
 msgid "unrecognized network update command code %d"
 msgstr "未识别的网络设备命令代码 %d"
 
-#: src/conf/network_conf.c:3262
+#: src/conf/network_conf.c:3325
 #, c-format
 msgid "unexpected element <%s>, expecting <%s>, while updating network '%s'"
 msgstr "更新网络 '%s' 时的意外元素 <%s>，应为 <%s>。"
 
-#: src/conf/network_conf.c:3317
+#: src/conf/network_conf.c:3380
 #, c-format
 msgid ""
 "couldn't update dhcp host entry - no <ip> element found at index %d in "
 "network '%s'"
 msgstr "无法在网络 '%d' 中更新索引 %s 中的 dhcp host 条目 - no <ip> 元素"
 
-#: src/conf/network_conf.c:3340
+#: src/conf/network_conf.c:3403
 #, c-format
 msgid ""
 "couldn't update dhcp host entry - no <ip> element found in network '%s'"
 msgstr "无法更新在网络 '%s' 中找到的 dhcp host 条目 - no <ip> 元素"
 
-#: src/conf/network_conf.c:3388
+#: src/conf/network_conf.c:3451
 #, c-format
 msgid ""
 "couldn't locate an existing dhcp host entry with \"mac='%s'\" in network '%s'"
 msgstr "无法在网络 '%s' 中使用 \"mac='%s\" 定位现有 dhcp host 条目"
 
-#: src/conf/network_conf.c:3416
+#: src/conf/network_conf.c:3479
 #, c-format
 msgid ""
 "there is an existing dhcp host entry in network '%s' that matches \"<host "
@@ -4775,239 +4951,239 @@
 msgstr ""
 "网络 '%s' 中现有的与 \"<host mac='%s' name='%s' ip='%s'/>\" 匹配的 dhcp host 条目"
 
-#: src/conf/network_conf.c:3447
+#: src/conf/network_conf.c:3510
 #, c-format
 msgid "couldn't locate a matching dhcp host entry in network '%s'"
 msgstr "无法在网络 '%s' 中定位匹配的 dhcp host 条目"
 
-#: src/conf/network_conf.c:3493
+#: src/conf/network_conf.c:3556
 msgid "dhcp ranges cannot be modified, only added or deleted"
 msgstr "无法修改 dhcp 范围，只能添加或者删除。"
 
-#: src/conf/network_conf.c:3517
+#: src/conf/network_conf.c:3580
 #, c-format
 msgid ""
 "there is an existing dhcp range entry in network '%s' that matches \"<range "
 "start='%s' end='%s'/>\""
 msgstr "网络 '%s' 中有符合 \"<range start='%s' end='%s'/>\" 的 dhcp 范围"
 
-#: src/conf/network_conf.c:3536
+#: src/conf/network_conf.c:3599
 #, c-format
 msgid "couldn't locate a matching dhcp range entry in network '%s'"
 msgstr "无法在网络 '%s' 中定位匹配的 dhcp range 条目"
 
-#: src/conf/network_conf.c:3586
+#: src/conf/network_conf.c:3649
 msgid "forward interface entries cannot be modified, only added or deleted"
 msgstr "无法修改转发接口条目，只能添加或者删除。"
 
-#: src/conf/network_conf.c:3595
+#: src/conf/network_conf.c:3658
 msgid "missing dev attribute in <interface> element"
 msgstr "<interface> 元素缺少 dev 属性"
 
-#: src/conf/network_conf.c:3612
+#: src/conf/network_conf.c:3675
 #, c-format
 msgid ""
 "there is an existing interface entry in network '%s' that matches "
 "\"<interface dev='%s'>\""
 msgstr "网络 '%s' 中现有的与 \"<interface dev='%s'>\" 匹配的接口条目"
 
-#: src/conf/network_conf.c:3629
+#: src/conf/network_conf.c:3692
 #, c-format
 msgid ""
 "couldn't find an interface entry in network '%s' matching <interface "
 "dev='%s'>"
 msgstr "网络 '%s' 中未找到符合 <interface dev='%s'> 的 interface 条目"
 
-#: src/conf/network_conf.c:3638
+#: src/conf/network_conf.c:3701
 #, c-format
 msgid ""
 "unable to delete interface '%s' in network '%s'. It is currently being used  "
 "by %d domains."
 msgstr "无法删除网络  '%s' 中的 interface  '%s'。目前它正在被 %d 域使用。"
 
-#: src/conf/network_conf.c:3705
+#: src/conf/network_conf.c:3768
 #, c-format
 msgid ""
 "couldn't find a portgroup entry in network '%s' matching <portgroup "
 "name='%s'>"
 msgstr "网络 '%s' 中未找到符合 <portgroup name='%s'> 的 portgroup 条目"
 
-#: src/conf/network_conf.c:3713
+#: src/conf/network_conf.c:3776
 #, c-format
 msgid ""
 "there is an existing portgroup entry in network '%s' that matches "
 "\"<portgroup name='%s'>\""
 msgstr "网络 '%s' 中现有的与 \"<Portgroup name='%s' >\" 匹配的 dhcp portgroup 条目"
 
-#: src/conf/network_conf.c:3727
+#: src/conf/network_conf.c:3790
 #, c-format
 msgid ""
 "a different portgroup entry in network '%s' is already set as the default. "
 "Only one default is allowed."
 msgstr "网络  '%s' 中的不同 portgroup 条目已被设定为默认。只允许有一个默认条目。"
 
-#: src/conf/network_conf.c:3787
+#: src/conf/network_conf.c:3850
 msgid "DNS HOST records cannot be modified, only added or deleted"
 msgstr "不能修改 DNS HOST 记录，只能添加或者删除。"
 
-#: src/conf/network_conf.c:3820
+#: src/conf/network_conf.c:3883
 #, c-format
 msgid ""
 "there is already at least one DNS HOST record with a matching field in "
 "network %s"
 msgstr "在网络 %s 中至少有一个匹配字段的 DNS HOST 记录"
 
-#: src/conf/network_conf.c:3835
+#: src/conf/network_conf.c:3898
 #, c-format
 msgid "couldn't locate a matching DNS HOST record in network %s"
 msgstr "无法在网络 '%s' 中定位匹配的 DNS HOST 记录"
 
-#: src/conf/network_conf.c:3841
+#: src/conf/network_conf.c:3904
 #, c-format
 msgid "multiple matching DNS HOST records were found in network %s"
 msgstr "在网络 %s 中找到多个匹配的 DNS HOST 记录"
 
-#: src/conf/network_conf.c:3881
+#: src/conf/network_conf.c:3944
 msgid "DNS SRV records cannot be modified, only added or deleted"
 msgstr "不能修改 DNS SRV 记录，只能添加或者删除。"
 
-#: src/conf/network_conf.c:3906
+#: src/conf/network_conf.c:3969
 #, c-format
 msgid ""
 "there is already at least one DNS SRV record matching all specified fields "
 "in network %s"
 msgstr "在网络 %s 中至少有一个 DNS SRV 记录匹配所有指定的字段"
 
-#: src/conf/network_conf.c:3921
+#: src/conf/network_conf.c:3984
 #, c-format
 msgid "couldn't locate a matching DNS SRV record in network %s"
 msgstr "无法在网络 %s 中定位匹配的 DNS SRV 记录"
 
-#: src/conf/network_conf.c:3927
+#: src/conf/network_conf.c:3990
 #, c-format
 msgid ""
 "multiple DNS SRV records matching all specified fields were found in network "
 "%s"
 msgstr "在网络 %s 中找到多个匹配的 DNS SRV 记录"
 
-#: src/conf/network_conf.c:3965
+#: src/conf/network_conf.c:4028
 msgid "DNS TXT records cannot be modified, only added or deleted"
 msgstr "不能修改 DNS TXT 记录，只能添加或者删除。"
 
-#: src/conf/network_conf.c:3985
+#: src/conf/network_conf.c:4048
 #, c-format
 msgid "there is already a DNS TXT record with name '%s' in network %s"
 msgstr "在网络 %s 中至少有一个名为 '%s' 的 DNS TXT 记录"
 
-#: src/conf/network_conf.c:4000
+#: src/conf/network_conf.c:4063
 #, c-format
 msgid "couldn't locate a matching DNS TXT record in network %s"
 msgstr "无法在网络 %s 中定位匹配的 DNS TXT 记录"
 
-#: src/conf/network_conf.c:4032
+#: src/conf/network_conf.c:4095
 msgid "network_update_xml"
 msgstr "network_update_xml"
 
-#: src/conf/network_conf.c:4082
+#: src/conf/network_conf.c:4145
 msgid "can't update unrecognized section of network"
 msgstr "无法更新网络未识别的部分"
 
-#: src/conf/network_conf.c:4204
+#: src/conf/network_conf.c:1697
 #, c-format
 msgid "network '%s' is already defined with uuid %s"
 msgstr "已使用 uuid %s 定义网络 '%s'"
 
-#: src/conf/network_conf.c:4213
+#: src/conf/network_conf.c:1706
 #, c-format
 msgid "network is already active as '%s'"
 msgstr "已将网络激活为 '%s'"
 
-#: src/conf/network_conf.c:4227
+#: src/conf/network_conf.c:1720
 #, c-format
 msgid "network '%s' already exists with uuid %s"
 msgstr "网络 '%s' 已有 uuid %s"
 
-#: src/conf/node_device_conf.c:579
+#: src/conf/node_device_conf.c:564
 #, c-format
 msgid "no block device path supplied for '%s'"
 msgstr "没有为 '%s' 提供块设备路径"
 
-#: src/conf/node_device_conf.c:599
+#: src/conf/node_device_conf.c:584
 #, c-format
 msgid "missing storage capability type for '%s'"
 msgstr "缺少 '%s' 的存储能力类型"
 
-#: src/conf/node_device_conf.c:621
+#: src/conf/node_device_conf.c:606
 #, c-format
 msgid "no removable media size supplied for '%s'"
 msgstr "没有用于 '%s' 的可移动介质大小"
 
-#: src/conf/node_device_conf.c:622
+#: src/conf/node_device_conf.c:607
 #, c-format
 msgid "invalid removable media size supplied for '%s'"
 msgstr "为 '%s' 提供的无效可移动介质大小"
 
-#: src/conf/node_device_conf.c:632
+#: src/conf/node_device_conf.c:617
 #, c-format
 msgid "unknown storage capability type '%s' for '%s'"
 msgstr "用于 '%s' 的未知存储能力类型 '%s'"
 
-#: src/conf/node_device_conf.c:644
+#: src/conf/node_device_conf.c:629
 #, c-format
 msgid "no size supplied for '%s'"
 msgstr "没有为 '%s' 提供大小"
 
-#: src/conf/node_device_conf.c:645
+#: src/conf/node_device_conf.c:630
 #, c-format
 msgid "invalid size supplied for '%s'"
 msgstr "为 '%s' 提供的无效大小"
 
-#: src/conf/node_device_conf.c:671 src/conf/node_device_conf.c:749
+#: src/conf/node_device_conf.c:656 src/conf/node_device_conf.c:732
 #, c-format
 msgid "no SCSI host ID supplied for '%s'"
 msgstr "没有为 '%s' 提供 SCSI 主机 ID"
 
-#: src/conf/node_device_conf.c:672 src/conf/node_device_conf.c:750
+#: src/conf/node_device_conf.c:657 src/conf/node_device_conf.c:733
 #, c-format
 msgid "invalid SCSI host ID supplied for '%s'"
 msgstr "'%s' 的无效 SCSI 主机 ID"
 
-#: src/conf/node_device_conf.c:677
+#: src/conf/node_device_conf.c:662
 #, c-format
 msgid "no SCSI bus ID supplied for '%s'"
 msgstr "没有为 '%s' 提供 SCSI 总线 ID"
 
-#: src/conf/node_device_conf.c:678
+#: src/conf/node_device_conf.c:663
 #, c-format
 msgid "invalid SCSI bus ID supplied for '%s'"
 msgstr "'%s' 的无效 SCSI 总线 ID"
 
-#: src/conf/node_device_conf.c:683
+#: src/conf/node_device_conf.c:668
 #, c-format
 msgid "no SCSI target ID supplied for '%s'"
 msgstr "没有为 '%s' 提供 SCSI 目标 ID"
 
-#: src/conf/node_device_conf.c:684
+#: src/conf/node_device_conf.c:669
 #, c-format
 msgid "invalid SCSI target ID supplied for '%s'"
 msgstr "'%s' 的无效 SCSI 目标 ID"
 
-#: src/conf/node_device_conf.c:689
+#: src/conf/node_device_conf.c:674
 #, c-format
 msgid "no SCSI LUN ID supplied for '%s'"
 msgstr "没有为 '%s' 提供 SCSI LUN ID"
 
-#: src/conf/node_device_conf.c:690
+#: src/conf/node_device_conf.c:675
 #, c-format
 msgid "invalid SCSI LUN ID supplied for '%s'"
 msgstr "'%s' 的无效 SCSI LUN ID"
 
-#: src/conf/node_device_conf.c:717
+#: src/conf/node_device_conf.c:702
 #, c-format
 msgid "no target name supplied for '%s'"
 msgstr "没有为 '%s' 提供目标名称"
 
-#: src/conf/node_device_conf.c:763
+#: src/conf/node_device_conf.c:746
 #, c-format
 msgid "missing SCSI host capability type for '%s'"
 msgstr "缺少 '%s' 的 SCSI 主机功能类型"
@@ -5022,97 +5198,97 @@
 msgid "no WWPN supplied for '%s', and auto-generation failed"
 msgstr "'%s' 没有 WWPN，且自动生成失败。"
 
-#: src/conf/node_device_conf.c:809
+#: src/conf/node_device_conf.c:784
 #, c-format
 msgid "unknown SCSI host capability type '%s' for '%s'"
 msgstr "用于 '%s' 的未知 SCSI 主机功能类型 '%s'"
 
-#: src/conf/node_device_conf.c:843
+#: src/conf/node_device_conf.c:818
 #, c-format
 msgid "no network interface supplied for '%s'"
 msgstr "没有为 '%s' 提供网络接口"
 
-#: src/conf/node_device_conf.c:858
+#: src/conf/node_device_conf.c:833
 #, c-format
 msgid "invalid network type supplied for '%s'"
 msgstr "'%s' 的无效网络类型"
 
-#: src/conf/node_device_conf.c:885
+#: src/conf/node_device_conf.c:860
 #, c-format
 msgid "no USB interface number supplied for '%s'"
 msgstr "没有为 '%s' 提供 USB 接口号"
 
-#: src/conf/node_device_conf.c:886
+#: src/conf/node_device_conf.c:861
 #, c-format
 msgid "invalid USB interface number supplied for '%s'"
 msgstr "'%s' 的无效 USB 网络接口号"
 
-#: src/conf/node_device_conf.c:891
+#: src/conf/node_device_conf.c:866
 #, c-format
 msgid "no USB interface class supplied for '%s'"
 msgstr "没有为 '%s' 提供 USB 接口类型"
 
-#: src/conf/node_device_conf.c:892
+#: src/conf/node_device_conf.c:867
 #, c-format
 msgid "invalid USB interface class supplied for '%s'"
 msgstr "'%s' 的无效 USB 接口类型"
 
-#: src/conf/node_device_conf.c:897
+#: src/conf/node_device_conf.c:872
 #, c-format
 msgid "no USB interface subclass supplied for '%s'"
 msgstr "没有为 '%s' 提供 USB 接口亚类"
 
-#: src/conf/node_device_conf.c:898
+#: src/conf/node_device_conf.c:873
 #, c-format
 msgid "invalid USB interface subclass supplied for '%s'"
 msgstr "'%s' 的无效 USB 接口亚类"
 
-#: src/conf/node_device_conf.c:903
+#: src/conf/node_device_conf.c:878
 #, c-format
 msgid "no USB interface protocol supplied for '%s'"
 msgstr "没有为 '%s' 提供 USB 接口协议"
 
-#: src/conf/node_device_conf.c:904
+#: src/conf/node_device_conf.c:879
 #, c-format
 msgid "invalid USB interface protocol supplied for '%s'"
 msgstr "'%s' 的无效 USB 接口协议"
 
-#: src/conf/node_device_conf.c:952
+#: src/conf/node_device_conf.c:927
 #, c-format
 msgid "no USB bus number supplied for '%s'"
 msgstr "没有为 '%s' 提供 USB 总线号"
 
-#: src/conf/node_device_conf.c:953
+#: src/conf/node_device_conf.c:928
 #, c-format
 msgid "invalid USB bus number supplied for '%s'"
 msgstr "'%s' 的无效 USB 总线号"
 
-#: src/conf/node_device_conf.c:958
+#: src/conf/node_device_conf.c:933
 #, c-format
 msgid "no USB device number supplied for '%s'"
 msgstr "没有为 '%s' 提供 USB 设备号"
 
-#: src/conf/node_device_conf.c:959
+#: src/conf/node_device_conf.c:934
 #, c-format
 msgid "invalid USB device number supplied for '%s'"
 msgstr "'%s' 的无效 USB 设备号"
 
-#: src/conf/node_device_conf.c:964
+#: src/conf/node_device_conf.c:939
 #, c-format
 msgid "no USB vendor ID supplied for '%s'"
 msgstr "没有为 '%s' 提供 USB 经销商 ID"
 
-#: src/conf/node_device_conf.c:965
+#: src/conf/node_device_conf.c:940
 #, c-format
 msgid "invalid USB vendor ID supplied for '%s'"
 msgstr "'%s' 的无效 USB 经销商 ID"
 
-#: src/conf/node_device_conf.c:970
+#: src/conf/node_device_conf.c:945
 #, c-format
 msgid "no USB product ID supplied for '%s'"
 msgstr "没有为 '%s' 提供 USB 产品 ID"
 
-#: src/conf/node_device_conf.c:971
+#: src/conf/node_device_conf.c:946
 #, c-format
 msgid "invalid USB product ID supplied for '%s'"
 msgstr "'%s' 的无效 USB 产品 ID"
@@ -5126,242 +5302,242 @@
 msgid "invalid iommuGroup number attribute '%s'"
 msgstr "无效 iommuGroup 数属性 '%s'"
 
-#: src/conf/node_device_conf.c:1054
+#: src/conf/node_device_conf.c:972
 #, c-format
 msgid "no PCI domain ID supplied for '%s'"
 msgstr "没有为 '%s' 提供 PCI 域 ID"
 
-#: src/conf/node_device_conf.c:1055
+#: src/conf/node_device_conf.c:973
 #, c-format
 msgid "invalid PCI domain ID supplied for '%s'"
 msgstr "'%s' 的无效 PCI 域 ID"
 
-#: src/conf/node_device_conf.c:1060
+#: src/conf/node_device_conf.c:978
 #, c-format
 msgid "no PCI bus ID supplied for '%s'"
 msgstr "没有为 '%s' 提供 PCI 总线 ID"
 
-#: src/conf/node_device_conf.c:1061
+#: src/conf/node_device_conf.c:979
 #, c-format
 msgid "invalid PCI bus ID supplied for '%s'"
 msgstr "'%s' 的无效 PCI 总线 ID"
 
-#: src/conf/node_device_conf.c:1066
+#: src/conf/node_device_conf.c:984
 #, c-format
 msgid "no PCI slot ID supplied for '%s'"
 msgstr "没有为 '%s' 提供 PCI 插槽 ID"
 
-#: src/conf/node_device_conf.c:1067
+#: src/conf/node_device_conf.c:985
 #, c-format
 msgid "invalid PCI slot ID supplied for '%s'"
 msgstr "'%s' 的无效 PCI 插槽 ID"
 
-#: src/conf/node_device_conf.c:1072
+#: src/conf/node_device_conf.c:990
 #, c-format
 msgid "no PCI function ID supplied for '%s'"
 msgstr "没有为 '%s' 提供 PCI 功能 ID"
 
-#: src/conf/node_device_conf.c:1073
+#: src/conf/node_device_conf.c:991
 #, c-format
 msgid "invalid PCI function ID supplied for '%s'"
 msgstr "'%s' 的无效 PCI 功能 ID"
 
-#: src/conf/node_device_conf.c:1078
+#: src/conf/node_device_conf.c:996
 #, c-format
 msgid "no PCI vendor ID supplied for '%s'"
 msgstr "没有为 '%s' 提供 PCI 经销商 ID"
 
-#: src/conf/node_device_conf.c:1079
+#: src/conf/node_device_conf.c:997
 #, c-format
 msgid "invalid PCI vendor ID supplied for '%s'"
 msgstr "'%s' 的无效 PCI 经销商 ID"
 
-#: src/conf/node_device_conf.c:1084
+#: src/conf/node_device_conf.c:1002
 #, c-format
 msgid "no PCI product ID supplied for '%s'"
 msgstr "没有为 '%s' 提供 PCI 产品 ID"
 
-#: src/conf/node_device_conf.c:1085
+#: src/conf/node_device_conf.c:1003
 #, c-format
 msgid "invalid PCI product ID supplied for '%s'"
 msgstr "'%s' 的无效 PCI 产品 ID"
 
-#: src/conf/node_device_conf.c:1125
+#: src/conf/node_device_conf.c:1037
 #, c-format
 msgid "no system UUID supplied for '%s'"
 msgstr "没有为 '%s' 系统 UUID"
 
-#: src/conf/node_device_conf.c:1131
+#: src/conf/node_device_conf.c:1043
 #, c-format
 msgid "malformed uuid element for '%s'"
 msgstr "'%s' 的畸形 uuid 元素"
 
-#: src/conf/node_device_conf.c:1164
+#: src/conf/node_device_conf.c:1077
 msgid "missing capability type"
 msgstr "缺少能力类型"
 
-#: src/conf/node_device_conf.c:1170
+#: src/conf/node_device_conf.c:1083
 #, c-format
 msgid "unknown capability type '%s'"
 msgstr "未知能力类型 '%s'"
 
-#: src/conf/node_device_conf.c:1210
+#: src/conf/node_device_conf.c:1120
 #, c-format
 msgid "unknown capability type '%d' for '%s'"
 msgstr "未知能力类型 '%d'，用于 '%s'"
 
-#: src/conf/node_device_conf.c:1263
+#: src/conf/node_device_conf.c:1176
 #, c-format
 msgid "no device capabilities for '%s'"
 msgstr "'%s' 没有设备容量"
 
-#: src/conf/node_device_conf.c:1301
+#: src/conf/node_device_conf.c:1210
 #, c-format
 msgid "unexpected root element <%s> expecting <device>"
 msgstr "意外的 root 元素 <%s>，应为 <device>"
 
-#: src/conf/node_device_conf.c:1330
+#: src/conf/node_device_conf.c:1238
 msgid "(node_device_definition)"
 msgstr "(node_device_definition)"
 
-#: src/conf/node_device_conf.c:1384
+#: src/conf/node_device_conf.c:1285
 msgid "Device is not a fibre channel HBA"
 msgstr "设备不是光纤 HBA"
 
-#: src/conf/node_device_conf.c:1409
+#: src/conf/node_device_conf.c:1314
 #, c-format
 msgid "Could not find parent device for '%s'"
 msgstr "无法找到 '%s' 的上级设备"
 
-#: src/conf/node_device_conf.c:1429
+#: src/conf/node_device_conf.c:1334
 #, c-format
 msgid "Parent device %s is not capable of vport operations"
 msgstr "上级设备 %s 不能执行 vport 操作"
 
-#: src/conf/nwfilter_conf.c:991
+#: src/conf/nwfilter_conf.c:996
 msgid "ipset name is too long"
 msgstr "ipset 名称太长"
 
-#: src/conf/nwfilter_conf.c:997
+#: src/conf/nwfilter_conf.c:1002
 msgid "ipset name contains invalid characters"
 msgstr "ipset 名称包含无效字符"
 
-#: src/conf/nwfilter_conf.c:1029
+#: src/conf/nwfilter_conf.c:1034
 msgid "malformed ipset flags"
 msgstr "畸形 ipset 标签"
 
-#: src/conf/nwfilter_conf.c:2018
+#: src/conf/nwfilter_conf.c:1914
 #, c-format
 msgid "%s has illegal value %s"
 msgstr "%s 有非法值 %s"
 
-#: src/conf/nwfilter_conf.c:2051 src/conf/nwfilter_conf.c:2317
+#: src/conf/nwfilter_conf.c:1949 src/conf/nwfilter_conf.c:2194
 msgid "rule node requires action attribute"
 msgstr "rule 节点需要 action 属性"
 
-#: src/conf/nwfilter_conf.c:2324
+#: src/conf/nwfilter_conf.c:2201
 msgid "unknown rule action attribute value"
 msgstr "未知 rule action 属性值"
 
-#: src/conf/nwfilter_conf.c:2331
+#: src/conf/nwfilter_conf.c:2208
 msgid "rule node requires direction attribute"
 msgstr "rule 节点需要 direction 属性"
 
-#: src/conf/nwfilter_conf.c:2338
+#: src/conf/nwfilter_conf.c:2215
 msgid "unknown rule direction attribute value"
 msgstr "未知 rule direction 属性值"
 
-#: src/conf/nwfilter_conf.c:2413
+#: src/conf/nwfilter_conf.c:2292
 #, c-format
 msgid "Name of chain is longer than %u characters"
 msgstr "链名称长度超过 %u 个字符"
 
-#: src/conf/nwfilter_conf.c:2421
+#: src/conf/nwfilter_conf.c:2300
 msgid "Chain name contains invalid characters"
 msgstr "链名称包含无效字符"
 
-#: src/conf/nwfilter_conf.c:2459
+#: src/conf/nwfilter_conf.c:2337
 #, c-format
 msgid ""
 "Invalid chain name '%s'. Please use a chain name called '%s' or any of the "
 "following prefixes: "
 msgstr "无效链名称 '%s'。请使用 '%s' 作为链名称，或者使用以下任何一个前缀： "
 
-#: src/conf/nwfilter_conf.c:2505
+#: src/conf/nwfilter_conf.c:2385
 msgid "filter has no name"
 msgstr "过滤器没有名称"
 
-#: src/conf/nwfilter_conf.c:2513
+#: src/conf/nwfilter_conf.c:2393
 #, c-format
 msgid "Could not parse chain priority '%s'"
 msgstr "无法解析链优先权 '%s'"
 
-#: src/conf/nwfilter_conf.c:2520
+#: src/conf/nwfilter_conf.c:2400
 #, c-format
 msgid "Priority '%d' is outside valid range of [%d,%d]"
 msgstr "优先权 '%d' 在有效范围 [%d,%d] 之外"
 
-#: src/conf/nwfilter_conf.c:2559 src/conf/storage_conf.c:904
-#: src/storage/storage_backend.c:456
+#: src/conf/nwfilter_conf.c:2442 src/conf/storage_conf.c:664
+#: src/storage/storage_backend.c:431
 msgid "unable to generate uuid"
 msgstr "无法生成 uuid"
 
-#: src/conf/nwfilter_conf.c:2625
+#: src/conf/nwfilter_conf.c:2505
 msgid "unknown root element for nw filter"
 msgstr "nw 过滤器的未知 root 元素"
 
-#: src/conf/nwfilter_conf.c:2650
+#: src/conf/nwfilter_conf.c:2655
 msgid "(nwfilter_definition)"
 msgstr "(nwfilter_definition)"
 
-#: src/conf/nwfilter_conf.c:2978
+#: src/conf/nwfilter_conf.c:2801
 #, c-format
 msgid "filter with same UUID but different name ('%s') already exists"
 msgstr "以存在使用同一 UUID 但不同名称（'%s'）的过滤器"
 
-#: src/conf/nwfilter_conf.c:2989
+#: src/conf/nwfilter_conf.c:2812
 msgid "filter would introduce a loop"
 msgstr "过滤器不能引进回路"
 
-#: src/conf/nwfilter_conf.c:3061
+#: src/conf/nwfilter_conf.c:2880
 #, c-format
 msgid "network filter config filename '%s' does not match name '%s'"
 msgstr "网络过滤器配置文件名 '%s' 与名称 '%s' 不匹配"
 
-#: src/conf/nwfilter_conf.c:3136 src/conf/storage_conf.c:1905
+#: src/conf/nwfilter_conf.c:2957 src/conf/storage_conf.c:1536
 #, c-format
 msgid "cannot create config directory %s"
 msgstr "无法生成配置目录 %s"
 
-#: src/conf/nwfilter_conf.c:3149 src/conf/storage_conf.c:1924
+#: src/conf/nwfilter_conf.c:2970 src/conf/storage_conf.c:1555
 msgid "failed to generate XML"
 msgstr "创建 XML 失败"
 
-#: src/conf/nwfilter_conf.c:3168 src/conf/storage_conf.c:1942
+#: src/conf/nwfilter_conf.c:2986 src/conf/storage_conf.c:1569
 #, c-format
 msgid "no config file for %s"
 msgstr "%s 没有配置文件"
 
-#: src/conf/nwfilter_conf.c:3174 src/conf/storage_conf.c:1948
+#: src/conf/nwfilter_conf.c:2992 src/conf/storage_conf.c:1575
 #, c-format
 msgid "cannot remove config for %s"
 msgstr "无法为 %s 删除配置"
 
-#: src/conf/nwfilter_conf.c:3249
+#: src/conf/nwfilter_conf.c:3065
 #, c-format
 msgid "formatter for %s %s reported error"
 msgstr "%s%s 的格式化程序报错"
 
-#: src/conf/nwfilter_params.c:110
+#: src/conf/nwfilter_params.c:114
 msgid "Variable value contains invalid character"
 msgstr "变量值包含无效字符"
 
-#: src/conf/nwfilter_params.c:346 src/conf/nwfilter_params.c:597
+#: src/conf/nwfilter_params.c:321 src/conf/nwfilter_params.c:462
 #, c-format
 msgid "Could not find value for variable '%s'"
 msgstr "无法找到变量 '%s' 值"
 
-#: src/conf/nwfilter_params.c:371
+#: src/conf/nwfilter_params.c:333
 msgid ""
 "Cardinality of list items must be the same for processing them in parallel"
 msgstr "列表项目基数必须与平行处理的进程数相同"
@@ -5385,22 +5561,22 @@
 msgid "Could not get iterator index for (internal) iterator ID %u"
 msgstr "无法为（内置）迭代器 ID %u 获得迭代器索引"
 
-#: src/conf/nwfilter_params.c:589
+#: src/conf/nwfilter_params.c:454
 #, c-format
 msgid "Could not find variable '%s' in iterator"
 msgstr "无法在迭代器中找到变量 '%s'"
 
-#: src/conf/nwfilter_params.c:605
+#: src/conf/nwfilter_params.c:470
 #, c-format
 msgid "Could not get nth (%u) value of variable '%s'"
 msgstr "nth（%u）值不在变量 '%s' 中"
 
-#: src/conf/nwfilter_params.c:751
+#: src/conf/nwfilter_params.c:619
 #, c-format
 msgid "Could not put variable '%s' into hashmap"
 msgstr "无法将变量 '%s' 放到哈希表中"
 
-#: src/conf/nwfilter_params.c:898
+#: src/conf/nwfilter_params.c:746
 msgid "missing filter parameter table"
 msgstr "缺少过滤器参数表"
 
@@ -5426,53 +5602,53 @@
 msgid "could not find event callback %d for deletion"
 msgstr ""
 
-#: src/conf/object_event.c:402
+#: src/conf/domain_event.c:377
 msgid "event callback already tracked"
 msgstr "已跟踪事件回叫"
 
-#: src/conf/object_event.c:579
+#: src/conf/domain_event.c:621
 msgid "unable to initialize state mutex"
 msgstr "无法启动状态互斥"
 
-#: src/conf/object_event.c:626
+#: src/conf/object_event.c:624
 #, c-format
 msgid "Class %s must derive from virObjectEvent"
 msgstr ""
 
-#: src/conf/object_event.c:884
+#: src/conf/domain_event.c:644
 msgid "could not initialize domain event timer"
 msgstr "无法启动域时间计时器"
 
-#: src/conf/object_event.c:974
+#: src/conf/object_event.c:977
 #, c-format
 msgid "event callback function %p not registered"
 msgstr ""
 
-#: src/conf/object_event.c:1022
+#: src/conf/object_event.c:1025
 #, c-format
 msgid "event callback id %d not registered"
 msgstr ""
 
-#: src/conf/secret_conf.c:64 src/conf/secret_conf.c:125
-#: src/conf/secret_conf.c:253 src/conf/secret_conf.c:284
+#: src/conf/secret_conf.c:61 src/conf/secret_conf.c:113
+#: src/conf/secret_conf.c:243 src/conf/secret_conf.c:267
 #, c-format
 msgid "unexpected secret usage type %d"
 msgstr "意外 secret 用法类型 %d"
 
-#: src/conf/secret_conf.c:80
+#: src/conf/secret_conf.c:77
 msgid "unknown secret usage type"
 msgstr "未知 secret 用法类型"
 
-#: src/conf/secret_conf.c:86
+#: src/conf/secret_conf.c:83
 #, c-format
 msgid "unknown secret usage type %s"
 msgstr "未知 secret 用法类型 %s"
 
-#: src/conf/secret_conf.c:100
+#: src/conf/secret_conf.c:97
 msgid "volume usage specified, but volume path is missing"
 msgstr "指定卷用量，但缺少卷路径"
 
-#: src/conf/secret_conf.c:109
+#: src/conf/secret_conf.c:106
 msgid "Ceph usage specified, but name is missing"
 msgstr "已制定 Ceph 用法，但缺少名称。"
 
@@ -5480,177 +5656,180 @@
 msgid "iSCSI usage specified, but target is missing"
 msgstr ""
 
-#: src/conf/secret_conf.c:142
+#: src/conf/secret_conf.c:130
 #, c-format
 msgid "unexpected root element <%s>, expecting <secret>"
 msgstr "意外的 root 元素 <%s>，应为 <secret>"
 
-#: src/conf/secret_conf.c:166
+#: src/conf/secret_conf.c:156
 msgid "invalid value of 'ephemeral'"
 msgstr "无效 'ephemeral' 值"
 
-#: src/conf/secret_conf.c:180
+#: src/conf/secret_conf.c:170
 msgid "invalid value of 'private'"
 msgstr "无效的 'private' 值"
 
-#: src/conf/secret_conf.c:224
+#: src/conf/secret_conf.c:214
 msgid "(definition_of_secret)"
 msgstr "(definition_of_secret)"
 
-#: src/conf/snapshot_conf.c:116
+#: src/conf/domain_conf.c:12246
 msgid "missing name from disk snapshot element"
 msgstr "磁盘快照元素缺少名称"
 
-#: src/conf/snapshot_conf.c:161
+#: src/conf/snapshot_conf.c:137
+#, c-format
+msgid "unknown disk snapshot type '%s'"
+msgstr ""
+
+#: src/conf/snapshot_conf.c:167
 #, c-format
 msgid "unknown disk snapshot driver '%s'"
 msgstr "未知磁盘快照驱动程序 '%s'"
 
-#: src/conf/snapshot_conf.c:215
+#: src/conf/domain_conf.c:12328
 msgid "a redefined snapshot must have a name"
 msgstr "重新定义的快照必须有名称"
 
-#: src/conf/snapshot_conf.c:228
+#: src/conf/domain_conf.c:12347
 msgid "missing creationTime from existing snapshot"
 msgstr "现有快照缺少生成快照的时间"
 
-#: src/conf/snapshot_conf.c:240
+#: src/conf/domain_conf.c:12359
 msgid "missing state from existing snapshot"
 msgstr "现有快照中缺少状态"
 
-#: src/conf/snapshot_conf.c:246
+#: src/conf/domain_conf.c:12365
 #, c-format
 msgid "Invalid state '%s' in domain snapshot XML"
 msgstr "域快照 XML 中的无效状态 '%s‘"
 
-#: src/conf/snapshot_conf.c:263 src/conf/snapshot_conf.c:443
+#: src/conf/domain_conf.c:12380 src/conf/domain_conf.c:12471
 msgid "missing domain in snapshot"
 msgstr "快照中缺少域"
 
-#: src/conf/snapshot_conf.c:286
+#: src/conf/snapshot_conf.c:293
 #, c-format
 msgid "unknown memory snapshot setting '%s'"
 msgstr "未知内存快照设置 '%s'"
 
-#: src/conf/snapshot_conf.c:293
+#: src/conf/snapshot_conf.c:300
 #, c-format
 msgid "memory filename '%s' requires external snapshot"
 msgstr "内存文件名 '%s' 要求使用外部快照"
 
-#: src/conf/snapshot_conf.c:300
+#: src/conf/snapshot_conf.c:307
 msgid "external memory snapshots require a filename"
 msgstr "外部内存快照需要一个文件名称"
 
-#: src/conf/snapshot_conf.c:313
+#: src/conf/snapshot_conf.c:320
 msgid "memory state cannot be saved with offline or disk-only snapshot"
 msgstr ""
 
-#: src/conf/snapshot_conf.c:333
+#: src/conf/domain_conf.c:12413
 msgid "unable to handle disk requests in snapshot"
 msgstr "无法处理快照中的磁盘请求"
 
-#: src/conf/snapshot_conf.c:340
+#: src/conf/domain_conf.c:12420
 msgid "Could not find 'active' element"
 msgstr "无法找到 ‘active’ 元素"
 
-#: src/conf/snapshot_conf.c:372
+#: src/conf/domain_conf.c:12318
 msgid "domainsnapshot"
 msgstr "域快照"
 
-#: src/conf/snapshot_conf.c:401 tools/virsh-snapshot.c:785
-#: tools/virsh-snapshot.c:828 tools/virsh-snapshot.c:946
-#: tools/virsh-snapshot.c:1639
+#: src/conf/domain_conf.c:12307 tools/virsh.c:14325 tools/virsh.c:14652
 msgid "(domain_snapshot)"
 msgstr "(domain_snapshot)"
 
-#: src/conf/snapshot_conf.c:449
+#: src/conf/domain_conf.c:12477
 msgid "too many disk snapshot requests for domain"
 msgstr "该域的磁盘快照请求过多"
 
-#: src/conf/snapshot_conf.c:470
+#: src/conf/domain_conf.c:12500
 #, c-format
 msgid "no disk named '%s'"
 msgstr "没有名为 '%s' 的磁盘"
 
-#: src/conf/snapshot_conf.c:476
+#: src/conf/domain_conf.c:12507
 #, c-format
 msgid "disk '%s' specified twice"
 msgstr "两次指定磁盘 '%s'"
 
-#: src/conf/snapshot_conf.c:499
+#: src/conf/domain_conf.c:12521
 #, c-format
 msgid "disk '%s' must use snapshot mode '%s'"
 msgstr "磁盘 '%s' 必须使用快照模式 '%s'"
 
-#: src/conf/snapshot_conf.c:506
+#: src/conf/domain_conf.c:12528
 #, c-format
 msgid "file '%s' for disk '%s' requires use of external snapshot mode"
 msgstr "磁盘 '%s' 的文件 '%s' 要求使用外部快照模式"
 
-#: src/conf/snapshot_conf.c:556
+#: src/conf/snapshot_conf.c:562
 #, c-format
 msgid "cannot generate external snapshot name for disk '%s' on a '%s' device"
 msgstr ""
 
-#: src/conf/snapshot_conf.c:564
+#: src/conf/domain_conf.c:12582
 #, c-format
 msgid "cannot generate external snapshot name for disk '%s' without source"
 msgstr "无法为没有源的磁盘 '%s' 生产外部快照名"
 
-#: src/conf/snapshot_conf.c:571
+#: src/conf/domain_conf.c:12589
 #, c-format
 msgid ""
 "source for disk '%s' is not a regular file; refusing to generate external "
 "snapshot name"
 msgstr "磁盘 '%s' 的源不是常规文件；拒绝生产外部快照名"
 
-#: src/conf/snapshot_conf.c:585
+#: src/conf/domain_conf.c:12603
 msgid "integer overflow"
 msgstr "数据类型溢出"
 
-#: src/conf/snapshot_conf.c:733
+#: src/conf/domain_conf.c:12736
 #, c-format
 msgid "unexpected domain snapshot %s already exists"
 msgstr "意外域快照 %s 已存在。"
 
-#: src/conf/snapshot_conf.c:1159
+#: src/qemu/qemu_driver.c:9643
 #, c-format
 msgid "cannot set snapshot %s as its own parent"
 msgstr "无法将快照 %s 设定为其自身上级"
 
-#: src/conf/snapshot_conf.c:1166
+#: src/qemu/qemu_driver.c:9650
 #, c-format
 msgid "parent %s for snapshot %s not found"
 msgstr "未找到快照 %s 的上级 %s"
 
-#: src/conf/snapshot_conf.c:1173
+#: src/qemu/qemu_driver.c:9657
 #, c-format
 msgid "parent %s would create cycle to %s"
 msgstr "上级 %s 无法生成 %s 循环"
 
-#: src/conf/snapshot_conf.c:1191
+#: src/conf/snapshot_conf.c:1198
 #, c-format
 msgid "disk-only flag for snapshot %s requires disk-snapshot state"
 msgstr ""
 
-#: src/conf/snapshot_conf.c:1201
+#: src/qemu/qemu_driver.c:9675
 #, c-format
 msgid "definition for snapshot %s must use uuid %s"
 msgstr "快照 %s 的定义必须使用 uuid %s"
 
-#: src/conf/snapshot_conf.c:1213
+#: src/qemu/qemu_driver.c:9686
 #, c-format
 msgid ""
 "cannot change between online and offline snapshot state in snapshot %s"
 msgstr "无法在快照 %s 中更改在线好离线快照状态"
 
-#: src/conf/snapshot_conf.c:1222
+#: src/qemu/qemu_driver.c:9694
 #, c-format
 msgid ""
 "cannot change between disk snapshot and system checkpoint in snapshot %s"
 msgstr "无法在快照 %s 中更改磁盘快照好系统检查点"
 
-#: src/conf/storage_conf.c:294
+#: src/conf/storage_conf.c:226 src/storage/storage_backend.c:998
 #, c-format
 msgid "missing backend for pool type %d"
 msgstr "缺少池类型 %d 后端"
@@ -5667,7 +5846,7 @@
 msgid "invalid auth secret uuid"
 msgstr "无效的 auth 秘密 uuid"
 
-#: src/conf/storage_conf.c:531
+#: src/conf/storage_conf.c:483
 #, c-format
 msgid "unknown auth type '%s'"
 msgstr "未知 auth 类型 '%s'"
@@ -5680,7 +5859,7 @@
 msgid "element 'name' is mandatory for RBD pool"
 msgstr "RBD 池中元素 'name' 是强制元素"
 
-#: src/conf/storage_conf.c:605
+#: src/conf/storage_conf.c:427
 #, c-format
 msgid "unknown pool format type %s"
 msgstr "未知池格式类型 %s"
@@ -5689,7 +5868,7 @@
 msgid "missing storage pool host name"
 msgstr "缺少存储池主机名"
 
-#: src/conf/storage_conf.c:659
+#: src/conf/storage_conf.c:464
 msgid "missing storage pool source device path"
 msgstr "缺少存储池源设备路径"
 
@@ -5704,23 +5883,23 @@
 "adapter 'type'"
 msgstr ""
 
-#: src/conf/storage_conf.c:749
+#: src/conf/storage_conf.c:516
 msgid "(storage_source_specification)"
 msgstr "(storage_source_specification)"
 
-#: src/conf/storage_conf.c:758
+#: src/conf/storage_conf.c:528
 msgid "root element was not source"
 msgstr "root 元素不是源"
 
-#: src/conf/storage_conf.c:810
+#: src/conf/storage_conf.c:578
 msgid "malformed octal mode"
 msgstr "畸形的八进制模式"
 
-#: src/conf/storage_conf.c:824
+#: src/conf/storage_conf.c:589
 msgid "malformed owner element"
 msgstr "畸形的拥有者元素"
 
-#: src/conf/storage_conf.c:838
+#: src/conf/storage_conf.c:600
 msgid "malformed group element"
 msgstr "畸形的组群元素"
 
@@ -5728,21 +5907,21 @@
 msgid "storage pool missing type attribute"
 msgstr "存储池缺少 type 属性"
 
-#: src/conf/storage_conf.c:875 src/storage/storage_driver.c:503
-#: src/test/test_driver.c:4730
+#: src/conf/storage_conf.c:632 src/storage/storage_driver.c:454
+#: src/test/test_driver.c:4060
 #, c-format
 msgid "unknown storage pool type %s"
 msgstr "未知存储池类型 %s"
 
-#: src/conf/storage_conf.c:896
+#: src/conf/storage_conf.c:656
 msgid "missing pool source name element"
 msgstr "缺少池源名称元素"
 
-#: src/conf/storage_conf.c:918
+#: src/conf/storage_conf.c:680
 msgid "missing storage pool source host name"
 msgstr "缺少存储池源主机名称"
 
-#: src/conf/storage_conf.c:926
+#: src/conf/storage_conf.c:688
 msgid "missing storage pool source path"
 msgstr "缺少存储池源路径"
 
@@ -5754,15 +5933,15 @@
 msgid "'wwnn' and 'wwpn' must be specified for adapter type 'fchost'"
 msgstr ""
 
-#: src/conf/storage_conf.c:962
+#: src/conf/storage_conf.c:706
 msgid "missing storage pool source adapter name"
 msgstr "缺少存储池源适配器名称"
 
-#: src/conf/storage_conf.c:972
+#: src/conf/storage_conf.c:715
 msgid "missing storage pool source device name"
 msgstr "缺少存储池源设备名"
 
-#: src/conf/storage_conf.c:988
+#: src/conf/storage_conf.c:722
 msgid "missing storage pool target path"
 msgstr "缺少存储池目标路径"
 
@@ -5771,24 +5950,24 @@
 msgid "unexpected root element <%s>, expecting <pool>"
 msgstr "错误的 root 元素 <%s>，应为 <pool>"
 
-#: src/conf/storage_conf.c:1049
+#: src/conf/storage_conf.c:775
 msgid "(storage_pool_definition)"
 msgstr "(storage_pool_definition)"
 
-#: src/conf/storage_conf.c:1143
+#: src/conf/storage_conf.c:850
 #, c-format
 msgid "unknown pool format number %d"
 msgstr "不支持的池格式号 %d"
 
-#: src/conf/storage_conf.c:1197 src/conf/storage_conf.c:1985
+#: src/conf/storage_conf.c:891 src/conf/storage_conf.c:1613
 msgid "unexpected pool type"
 msgstr "意外的池类型"
 
-#: src/conf/storage_conf.c:1261
+#: src/conf/storage_conf.c:995
 msgid "malformed capacity element"
 msgstr "畸形容量元素"
 
-#: src/conf/storage_conf.c:1297
+#: src/conf/storage_conf.c:1031
 msgid "missing volume name element"
 msgstr "缺少卷名称元素"
 
@@ -5797,11 +5976,11 @@
 msgid "unknown volume type '%s'"
 msgstr ""
 
-#: src/conf/storage_conf.c:1318
+#: src/conf/storage_conf.c:1042
 msgid "missing capacity element"
 msgstr "缺少容量元素"
 
-#: src/conf/storage_conf.c:1344 src/conf/storage_conf.c:1374
+#: src/conf/storage_conf.c:1071 src/conf/storage_conf.c:1102
 #, c-format
 msgid "unknown volume format type %s"
 msgstr "未知卷格式类型 %s"
@@ -5820,84 +5999,84 @@
 msgid "unexpected root element <%s>, expecting <volume>"
 msgstr "错误的 root 元素 <%s>，应为 <volume>"
 
-#: src/conf/storage_conf.c:1476
+#: src/conf/storage_conf.c:1156
 msgid "(storage_volume_definition)"
 msgstr "(storage_volume_definition)"
 
-#: src/conf/storage_conf.c:1525
+#: src/conf/storage_conf.c:1192
 #, c-format
 msgid "unknown volume format number %d"
 msgstr "未知卷格式号 %d"
 
-#: src/conf/storage_conf.c:1813
+#: src/conf/storage_conf.c:1443
 #, c-format
 msgid "Storage pool config filename '%s' does not match pool name '%s'"
 msgstr "存储池配置文件名 '%s' 与池名称 '%s' 不匹配"
 
-#: src/conf/storage_conf.c:2036
+#: src/conf/storage_conf.c:1664
 #, c-format
 msgid "pool '%s' is already defined with uuid %s"
 msgstr "已存在使用  uuid %s 定义的池 '%s'"
 
-#: src/conf/storage_conf.c:2045
+#: src/conf/storage_conf.c:1673
 #, c-format
 msgid "pool is already active as '%s'"
 msgstr "已将池激活为 ‘%s’"
 
-#: src/conf/storage_conf.c:2059
+#: src/conf/storage_conf.c:1687
 #, c-format
 msgid "pool '%s' already exists with uuid %s"
 msgstr "池 ‘%s’ 已存在 uuid %s"
 
-#: src/conf/storage_conf.c:2151
+#: src/conf/storage_conf.c:1763
 #, c-format
 msgid "Storage source conflict with pool: '%s'"
 msgstr "存储资源与池冲突：'%s'"
 
-#: src/conf/storage_encryption_conf.c:89
+#: src/conf/storage_encryption_conf.c:92
 msgid "unknown volume encryption secret type"
 msgstr "未知加密 secret 类型"
 
-#: src/conf/storage_encryption_conf.c:95
+#: src/conf/storage_encryption_conf.c:98
 #, c-format
 msgid "unknown volume encryption secret type %s"
 msgstr "未知加密 secret 类型 %s"
 
-#: src/conf/storage_encryption_conf.c:107
+#: src/conf/storage_encryption_conf.c:110
 #, c-format
 msgid "malformed volume encryption uuid '%s'"
 msgstr "畸形卷加密 uuid '%s'"
 
-#: src/conf/storage_encryption_conf.c:114
+#: src/conf/storage_encryption_conf.c:117
 msgid "missing volume encryption uuid"
 msgstr "缺少卷加密 uuid"
 
-#: src/conf/storage_encryption_conf.c:142
+#: src/conf/storage_encryption_conf.c:146
 msgid "unknown volume encryption format"
 msgstr "未知卷加密格式"
 
-#: src/conf/storage_encryption_conf.c:148
+#: src/conf/storage_encryption_conf.c:152
 #, c-format
 msgid "unknown volume encryption format type %s"
 msgstr "未知卷加密格式类型 %s"
 
-#: src/conf/storage_encryption_conf.c:186
+#: src/conf/storage_encryption_conf.c:192
 msgid "unknown root element for volume encryption information"
 msgstr "未知卷加密信息的根元素"
 
-#: src/conf/storage_encryption_conf.c:216
+#: src/conf/storage_encryption_conf.c:222
 msgid "unexpected volume encryption secret type"
 msgstr "意外卷加密 secret 类型"
 
-#: src/conf/storage_encryption_conf.c:236
+#: src/conf/storage_encryption_conf.c:242
 msgid "unexpected encryption format"
 msgstr "意外加密格式"
 
-#: src/conf/storage_encryption_conf.c:263
+#: src/conf/storage_encryption_conf.c:269
 msgid "Cannot open /dev/urandom"
 msgstr "无法打开 /dev/urandom"
 
-#: src/conf/storage_encryption_conf.c:274
+#: src/conf/storage_encryption_conf.c:280
 msgid "Cannot read from /dev/urandom"
 msgstr "无法读取 /dev/urandom"
 
@@ -5921,85 +6100,84 @@
 msgid "Unable to init device stream mutex"
 msgstr ""
 
-#: src/conf/virchrdev.c:358 src/conf/virchrdev.c:420 src/vmx/vmx.c:2087
-#: src/vmx/vmx.c:2282
+#: src/vmx/vmx.c:2054 src/vmx/vmx.c:2229
 #, c-format
 msgid "Unsupported device type '%s'"
 msgstr "不支持的设备类型 '%s'"
 
-#: src/cpu/cpu.c:62 src/cpu/cpu_map.c:91
+#: src/cpu/cpu.c:54 src/cpu/cpu_map.c:90
 msgid "undefined hardware architecture"
 msgstr "未定义的硬件架构"
 
-#: src/cpu/cpu.c:89 src/cpu/cpu.c:318
+#: src/cpu/cpu.c:81 src/cpu/cpu.c:309
 msgid "(CPU_definition)"
 msgstr "(CPU_definition)"
 
-#: src/cpu/cpu.c:98
+#: src/cpu/cpu.c:90
 msgid "no CPU model specified"
 msgstr "没有指定任何 CPU 型号"
 
-#: src/cpu/cpu.c:126
+#: src/cpu/cpu.c:118
 #, c-format
 msgid "cannot compare CPUs of %s architecture"
 msgstr "无法比较 %s 架构的 CPU"
 
-#: src/cpu/cpu.c:154 src/cpu/cpu.c:387
+#: src/cpu/cpu.c:146 src/cpu/cpu.c:379
 msgid "nonzero nmodels doesn't match with NULL models"
 msgstr "非零 nmodels 与 NULL 模型不匹配"
 
-#: src/cpu/cpu.c:160
+#: src/cpu/cpu.c:152
 msgid "invalid CPU definition"
 msgstr "无效 CPU 定义"
 
-#: src/cpu/cpu.c:169
+#: src/cpu/cpu.c:161
 #, c-format
 msgid "cannot decode CPU data for %s architecture"
 msgstr "无法为 %s 架构解码 CPU 数据"
 
-#: src/cpu/cpu.c:200
+#: src/cpu/cpu.c:192
 #, c-format
 msgid "cannot encode CPU data for %s architecture"
 msgstr "无法为 %s 架构编码 CPU 数据"
 
-#: src/cpu/cpu.c:225
+#: src/cpu/cpu.c:218
 #, c-format
 msgid "cannot free CPU data for %s architecture"
 msgstr "无法为 %s 架构释放 CPU 数据"
 
-#: src/cpu/cpu.c:246
+#: src/cpu/cpu.c:239
 #, c-format
 msgid "cannot get node CPU data for %s architecture"
 msgstr "无法为 %s 获得节点 CPU 数据"
 
-#: src/cpu/cpu.c:270
+#: src/cpu/cpu.c:262
 #, c-format
 msgid "cannot compute guest CPU data for %s architecture"
 msgstr "无法为 %s 计算虚拟机 CPU 数据"
 
-#: src/cpu/cpu.c:305
+#: src/cpu/cpu.c:296
 msgid "nonzero ncpus doesn't match with NULL xmlCPUs"
 msgstr "非零 ncpus 与 NULL xmlCPU 不匹配"
 
-#: src/cpu/cpu.c:310 src/cpu/cpu.c:381
+#: src/cpu/cpu.c:301 src/cpu/cpu.c:373
 msgid "No CPUs given"
 msgstr "没有给出任何 CPU"
 
-#: src/cpu/cpu.c:376
+#: src/cpu/cpu.c:368
 msgid "nonzero ncpus doesn't match with NULL cpus"
 msgstr "非零 ncpus 与 NULL cpus 不匹配"
 
-#: src/cpu/cpu.c:396
+#: src/cpu/cpu.c:388
 #, c-format
 msgid "cannot compute baseline CPU of %s architecture"
 msgstr "无法为 %s 架构计算基准 CPU"
 
-#: src/cpu/cpu.c:418
+#: src/cpu/cpu.c:410
 #, c-format
 msgid "cannot update guest CPU data for %s architecture"
 msgstr "无法为 %s 架构更新虚拟机 CPU 数据"
 
-#: src/cpu/cpu.c:439
+#: src/cpu/cpu.c:433
 #, c-format
 msgid "cannot check guest CPU data for %s architecture"
 msgstr "无法为 %s 架构检查虚拟机 CPU 数据"
@@ -6025,51 +6203,50 @@
 msgstr ""
 
 #: src/cpu/cpu_generic.c:129 src/cpu/cpu_powerpc.c:476
-#: src/cpu/cpu_powerpc.c:580 src/cpu/cpu_x86.c:1505
+#: src/cpu/cpu_powerpc.c:580 src/cpu/cpu_x86.c:1509
 #, c-format
 msgid "CPU model %s is not supported by hypervisor"
 msgstr "Hypervisor 不支持 CPU 型号 %s"
 
-#: src/cpu/cpu_generic.c:151
+#: src/cpu/cpu_generic.c:158
 #, c-format
 msgid "CPUs have incompatible architectures: '%s' != '%s'"
 msgstr "CPU 有不兼容的架构：'%s' != '%s'"
 
-#: src/cpu/cpu_generic.c:159
+#: src/cpu/cpu_generic.c:165
 #, c-format
 msgid "CPU models don't match: '%s' != '%s'"
 msgstr "CPU 型号不匹配：'%s' != '%s'"
 
-#: src/cpu/cpu_map.c:97
+#: src/cpu/cpu_map.c:96
 msgid "no callback provided"
 msgstr "没有提供任何回叫"
 
-#: src/cpu/cpu_map.c:103
+#: src/cpu/cpu_map.c:102
 #, c-format
 msgid "cannot parse CPU map file: %s"
 msgstr "无法解析 CPU 映射文件：%s"
 
-#: src/cpu/cpu_map.c:121
+#: src/cpu/cpu_map.c:120
 #, c-format
 msgid "cannot find CPU map for %s architecture"
 msgstr "无法为 %s 架构找到 CPU 映射文件"
 
-#: src/cpu/cpu_map.c:128
+#: src/cpu/cpu_map.c:127
 #, c-format
 msgid "cannot parse CPU map for %s architecture"
 msgstr "无法为 %s 架构解析 CPU 映射文件"
 
-#: src/cpu/cpu_powerpc.c:155 src/cpu/cpu_powerpc.c:574 src/cpu/cpu_x86.c:809
-#: src/cpu/cpu_x86.c:856
+#: src/cpu/cpu_x86.c:812 src/cpu/cpu_x86.c:862
 #, c-format
 msgid "Unknown CPU model %s"
 msgstr "未知 CPU 型号 %s"
 
-#: src/cpu/cpu_powerpc.c:182 src/cpu/cpu_x86.c:515
+#: src/cpu/cpu_x86.c:548
 msgid "Missing CPU vendor name"
 msgstr "缺少 CPU 供应商名称"
 
-#: src/cpu/cpu_powerpc.c:188 src/cpu/cpu_x86.c:521
+#: src/cpu/cpu_x86.c:554
 #, c-format
 msgid "CPU vendor %s already defined"
 msgstr "已定义 CPU 供应商 %s"
@@ -6079,12 +6256,12 @@
 msgid "CPU model %s already defined"
 msgstr ""
 
-#: src/cpu/cpu_powerpc.c:235 src/cpu/cpu_x86.c:979
+#: src/cpu/cpu_x86.c:985
 #, c-format
 msgid "Invalid vendor element in CPU model %s"
 msgstr "CPU 型号 %s 中的无效供应商元素"
 
-#: src/cpu/cpu_powerpc.c:242 src/cpu/cpu_x86.c:986
+#: src/cpu/cpu_x86.c:992
 #, c-format
 msgid "Unknown vendor %s referenced by CPU model %s"
 msgstr "CPU 型号 %s 参考的供应商 %s 是未知的"
@@ -6094,12 +6271,12 @@
 msgid "Missing or invalid PVR value in CPU model %s"
 msgstr ""
 
-#: src/cpu/cpu_powerpc.c:377 src/cpu/cpu_x86.c:1314
+#: src/cpu/cpu_powerpc.c:377 src/cpu/cpu_x86.c:1344
 #, c-format
 msgid "CPU arch %s does not match host arch"
 msgstr "CPU 架构 %s 与主机架构不匹配"
 
-#: src/cpu/cpu_powerpc.c:395 src/cpu/cpu_x86.c:1330
+#: src/cpu/cpu_powerpc.c:395 src/cpu/cpu_x86.c:1360
 #, c-format
 msgid "host CPU vendor does not match required CPU vendor %s"
 msgstr "主机 CPU 销售商与所需 CPU 销售商 %s 不匹配"
@@ -6114,40 +6291,40 @@
 msgid "Cannot find CPU model with PVR 0x%08x"
 msgstr ""
 
-#: src/cpu/cpu_powerpc.c:550 src/cpu/cpu_x86.c:2032
+#: src/cpu/cpu_powerpc.c:550 src/cpu/cpu_x86.c:2063
 #, c-format
 msgid "Unexpected CPU mode: %d"
 msgstr "意外的 CPU 模式：%d"
 
-#: src/cpu/cpu_powerpc.c:590 src/cpu/cpu_x86.c:1903
+#: src/cpu/cpu_x86.c:1644
 msgid "CPUs are incompatible"
 msgstr "CPU 不兼容"
 
-#: src/cpu/cpu_powerpc.c:599 src/cpu/cpu_x86.c:1856 src/cpu/cpu_x86.c:1886
+#: src/cpu/cpu_x86.c:1597 src/cpu/cpu_x86.c:1627
 #, c-format
 msgid "Unknown CPU vendor %s"
 msgstr "未知 CPU 供应商 %s"
 
-#: src/cpu/cpu_powerpc.c:606 src/cpu/cpu_x86.c:1869
+#: src/cpu/cpu_x86.c:1610
 #, c-format
 msgid "CPU vendor %s of model %s differs from vendor %s"
 msgstr "型号 %s 的 CPU 供应商 %s 不同于供应商 %s"
 
-#: src/cpu/cpu_powerpc.c:615 src/cpu/cpu_x86.c:1891
+#: src/cpu/cpu_x86.c:1632
 msgid "CPU vendors do not match"
 msgstr "CPU 供应商不匹配"
 
-#: src/cpu/cpu_x86.c:528
+#: src/cpu/cpu_x86.c:561
 #, c-format
 msgid "Missing vendor string for CPU vendor %s"
 msgstr "CPU 供应商 %s 中缺少供应商字符串"
 
-#: src/cpu/cpu_x86.c:534
+#: src/cpu/cpu_x86.c:566
 #, c-format
 msgid "Invalid CPU vendor string '%s'"
 msgstr "无效 CPU 供应商字符串 '%s'"
 
-#: src/cpu/cpu_x86.c:691 src/cpu/cpu_x86.c:1101
+#: src/cpu/cpu_x86.c:675
 #, c-format
 msgid "CPU feature %s already defined"
 msgstr "已定义 CPU 特性 %s"
@@ -6157,117 +6334,112 @@
 msgid "Invalid cpuid[%zu] in %s feature"
 msgstr ""
 
-#: src/cpu/cpu_x86.c:830 src/cpu/cpu_x86.c:868 src/cpu/cpu_x86.c:1949
+#: src/cpu/cpu_x86.c:833 src/cpu/cpu_x86.c:874 src/cpu/cpu_x86.c:1693
 #, c-format
 msgid "Unknown CPU feature %s"
 msgstr "未知 CPU 特性 %s"
 
-#: src/cpu/cpu_x86.c:954
+#: src/cpu/cpu_x86.c:960
 #, c-format
 msgid "Missing ancestor's name in CPU model %s"
 msgstr "CPU 型号 %s 中缺少上一代产品名称"
 
-#: src/cpu/cpu_x86.c:961
+#: src/cpu/cpu_x86.c:967
 #, c-format
 msgid "Ancestor model %s not found for CPU model %s"
 msgstr "没有找到 CPU 型号 %s 的上一代型号 %s"
 
-#: src/cpu/cpu_x86.c:1002
+#: src/cpu/cpu_x86.c:1008
 #, c-format
 msgid "Missing feature name for CPU model %s"
 msgstr "缺少 CPU 型号 %s 的特性名称"
 
-#: src/cpu/cpu_x86.c:1008
+#: src/cpu/cpu_x86.c:1014
 #, c-format
 msgid "Feature %s required by CPU model %s not found"
 msgstr "未找到 CPU 型号 %s 需要的 %s 特性"
 
-#: src/cpu/cpu_x86.c:1217
+#: src/cpu/cpu_x86.c:1247
 msgid "CPU data"
 msgstr ""
 
-#: src/cpu/cpu_x86.c:1219
+#: src/cpu/cpu_x86.c:1249
 msgid "cannot parse CPU data"
 msgstr ""
 
-#: src/cpu/cpu_x86.c:1227
+#: src/cpu/cpu_x86.c:1257
 msgid "no x86 CPU data found"
 msgstr ""
 
-#: src/cpu/cpu_x86.c:1235
+#: src/cpu/cpu_x86.c:1265
 #, c-format
 msgid "failed to parse cpuid[%zu]"
 msgstr ""
 
-#: src/cpu/cpu_x86.c:1349
+#: src/cpu/cpu_x86.c:1379
 msgid "Host CPU provides forbidden features"
 msgstr "主机 CPU 提供被禁止的功能"
 
-#: src/cpu/cpu_x86.c:1363
+#: src/cpu/cpu_x86.c:1393
 msgid "Host CPU does not provide required features"
 msgstr "主机 CPU 不提供所需功能"
 
-#: src/cpu/cpu_x86.c:1385
+#: src/cpu/cpu_x86.c:1415
 msgid "Host CPU does not strictly match guest CPU: Extra features"
 msgstr "主机 CPU 没有严格与虚拟机 CPU匹配：有额外功能"
 
-#: src/cpu/cpu_x86.c:1465
-#, c-format
-msgid "%s not a known CPU model"
-msgstr ""
-
-#: src/cpu/cpu_x86.c:1564
+#: src/cpu/cpu_x86.c:1346
 msgid "Cannot find suitable CPU model for given data"
 msgstr "无法为给定数据找到合适的 CPU 型号"
 
-#: src/cpu/cpu_x86.c:1685
+#: src/cpu/cpu_x86.c:1441
 #, c-format
 msgid "CPU vendor %s not found"
 msgstr "没有找到 CPU 供应商 %s"
 
-#: src/driver.c:79
+#: src/driver.c:64
 #, c-format
 msgid "failed to load module %s %s"
 msgstr "载入模块 %s %s 失败"
 
-#: src/driver.c:89
+#: src/driver.c:74
 #, c-format
 msgid "Missing module registration symbol %s"
 msgstr "缺少模块注册符号 %s"
 
-#: src/driver.c:94
+#: src/driver.c:79
 #, c-format
 msgid "Failed module registration %s"
 msgstr "失败的模块注册 %s"
 
-#: src/esx/esx_driver.c:217
+#: src/esx/esx_driver.c:215
 #, c-format
 msgid ""
 "File name '%s' doesn't have expected format "
 "'/vmfs/volumes/<datastore>/<path>'"
 msgstr "文件名 '%s' 没有使用预期的格式 '/vmfs/volumes/<datastore>/<path>'"
 
-#: src/esx/esx_driver.c:232
+#: src/esx/esx_driver.c:230
 #, c-format
 msgid "File name '%s' refers to non-existing datastore '%s'"
 msgstr "文件名 '%s' 参考的是不存在的数据存储 '%s'"
 
-#: src/esx/esx_driver.c:252 src/esx/esx_driver.c:355
+#: src/esx/esx_driver.c:252 src/esx/esx_driver.c:354
 #, c-format
 msgid "Could not handle file name '%s'"
 msgstr "无法处理文件名 '%s'"
 
-#: src/esx/esx_driver.c:410
+#: src/esx/esx_driver.c:409
 #, c-format
 msgid "Could not lookup controller model for '%s'"
 msgstr "无法为 '%s'  查找控制器型号"
 
-#: src/esx/esx_driver.c:428
+#: src/esx/esx_driver.c:427
 #, c-format
 msgid "Found unexpected controller model '%s' for disk '%s'"
 msgstr "为磁盘 '%s'  找到意外的控制器型号 '%s'"
 
-#: src/esx/esx_driver.c:493
+#: src/esx/esx_driver.c:498
 #, c-format
 msgid ""
 "Bit 29 (Long Mode) of HostSystem property 'hardware.cpuFeature[].edx' with "
@@ -6276,357 +6448,351 @@
 "主机系统属性 'hardware.cpuFeature[].edx'  的字节 29（长模式）值 '%s'  中有意外值 '%c' ，应为 '0' 或者 "
 "'1'。"
 
-#: src/esx/esx_driver.c:654 src/esx/esx_driver.c:4394
-#: src/esx/esx_driver.c:4487 src/esx/esx_network_driver.c:256
-#: src/esx/esx_network_driver.c:635 src/esx/esx_storage_backend_vmfs.c:577
-#: src/esx/esx_util.c:53 src/esx/esx_util.c:234 src/esx/esx_vi.c:55
-#: src/esx/esx_vi.c:386 src/esx/esx_vi.c:458 src/esx/esx_vi.c:800
-#: src/esx/esx_vi.c:1238 src/esx/esx_vi.c:1442 src/esx/esx_vi.c:1478
-#: src/esx/esx_vi.c:1494 src/esx/esx_vi.c:1517 src/esx/esx_vi.c:1557
-#: src/esx/esx_vi.c:1586 src/esx/esx_vi.c:1619 src/esx/esx_vi.c:1674
-#: src/esx/esx_vi.c:1699 src/esx/esx_vi.c:1755 src/esx/esx_vi.c:2002
-#: src/esx/esx_vi.c:2207 src/esx/esx_vi.c:2233 src/esx/esx_vi.c:2269
-#: src/esx/esx_vi.c:2303 src/esx/esx_vi.c:2340 src/esx/esx_vi.c:2445
-#: src/esx/esx_vi.c:2614 src/esx/esx_vi.c:2659 src/esx/esx_vi.c:2724
-#: src/esx/esx_vi.c:2779 src/esx/esx_vi.c:2914 src/esx/esx_vi.c:2982
-#: src/esx/esx_vi.c:3070 src/esx/esx_vi.c:3136 src/esx/esx_vi.c:3185
-#: src/esx/esx_vi.c:3293 src/esx/esx_vi.c:3349 src/esx/esx_vi.c:3446
-#: src/esx/esx_vi.c:3646 src/esx/esx_vi.c:3758 src/esx/esx_vi.c:3814
-#: src/esx/esx_vi.c:3871 src/esx/esx_vi.c:3922 src/esx/esx_vi.c:3966
-#: src/esx/esx_vi.c:4015 src/esx/esx_vi.c:4064 src/esx/esx_vi.c:4108
-#: src/esx/esx_vi.c:4160 src/esx/esx_vi.c:4222 src/esx/esx_vi.c:4341
-#: src/esx/esx_vi.c:4778 src/esx/esx_vi.c:4873 src/esx/esx_vi.c:5005
-#: src/esx/esx_vi.c:5085 src/esx/esx_vi_methods.c:44
-#: src/esx/esx_vi_methods.c:240 src/esx/esx_vi_types.c:47
-#: src/esx/esx_vi_types.c:106 src/esx/esx_vi_types.c:200
-#: src/esx/esx_vi_types.c:251 src/esx/esx_vi_types.c:293
-#: src/esx/esx_vi_types.c:347 src/esx/esx_vi_types.c:619
-#: src/esx/esx_vi_types.c:638 src/esx/esx_vi_types.c:718
-#: src/esx/esx_vi_types.c:946 src/esx/esx_vi_types.c:1017
-#: src/esx/esx_vi_types.c:1232 src/esx/esx_vi_types.c:1265
-#: src/esx/esx_vi_types.c:1286 src/esx/esx_vi_types.c:1310
-#: src/esx/esx_vi_types.c:1485 src/esx/esx_vi_types.c:1525
-#: src/esx/esx_vi_types.c:1659 src/esx/esx_vi_types.c:1725
-#: src/esx/esx_vi_types.c:1755 src/hyperv/hyperv_util.c:45
-#: src/hyperv/hyperv_wmi.c:129 src/hyperv/hyperv_wmi.c:623
-#: src/hyperv/hyperv_wmi.c:658 src/vmx/vmx.c:1799 src/vmx/vmx.c:1872
-#: src/vmx/vmx.c:1987 src/vmx/vmx.c:2341 src/vmx/vmx.c:2457 src/vmx/vmx.c:2675
-#: src/vmx/vmx.c:2864 src/vmx/vmx.c:2966 src/vmx/vmx.c:3352 src/vmx/vmx.c:3529
+#: src/esx/esx_driver.c:685 src/esx/esx_driver.c:4439
+#: src/esx/esx_driver.c:4532 src/esx/esx_storage_driver.c:669
+#: src/esx/esx_util.c:56 src/esx/esx_util.c:275 src/esx/esx_vi.c:355
+#: src/esx/esx_vi.c:401 src/esx/esx_vi.c:640 src/esx/esx_vi.c:1112
+#: src/esx/esx_vi.c:1317 src/esx/esx_vi.c:1353 src/esx/esx_vi.c:1369
+#: src/esx/esx_vi.c:1392 src/esx/esx_vi.c:1432 src/esx/esx_vi.c:1461
+#: src/esx/esx_vi.c:1495 src/esx/esx_vi.c:1550 src/esx/esx_vi.c:1576
+#: src/esx/esx_vi.c:1622 src/esx/esx_vi.c:1650 src/esx/esx_vi.c:1889
+#: src/esx/esx_vi.c:2065 src/esx/esx_vi.c:2091 src/esx/esx_vi.c:2127
+#: src/esx/esx_vi.c:2161 src/esx/esx_vi.c:2198 src/esx/esx_vi.c:2303
+#: src/esx/esx_vi.c:2480 src/esx/esx_vi.c:2525 src/esx/esx_vi.c:2590
+#: src/esx/esx_vi.c:2644 src/esx/esx_vi.c:2779 src/esx/esx_vi.c:2847
+#: src/esx/esx_vi.c:2934 src/esx/esx_vi.c:3000 src/esx/esx_vi.c:3049
+#: src/esx/esx_vi.c:3157 src/esx/esx_vi.c:3213 src/esx/esx_vi.c:3310
+#: src/esx/esx_vi.c:3507 src/esx/esx_vi.c:3615 src/esx/esx_vi.c:3673
+#: src/esx/esx_vi.c:3730 src/esx/esx_vi.c:3785 src/esx/esx_vi.c:3902
+#: src/esx/esx_vi.c:4232 src/esx/esx_vi.c:4312 src/esx/esx_vi_methods.c:44
+#: src/esx/esx_vi_methods.c:240 src/esx/esx_vi_types.c:102
+#: src/esx/esx_vi_types.c:196 src/esx/esx_vi_types.c:243
+#: src/esx/esx_vi_types.c:285 src/esx/esx_vi_types.c:338
+#: src/esx/esx_vi_types.c:608 src/esx/esx_vi_types.c:669
+#: src/esx/esx_vi_types.c:885 src/esx/esx_vi_types.c:952
+#: src/esx/esx_vi_types.c:1173 src/esx/esx_vi_types.c:1213
+#: src/esx/esx_vi_types.c:1243 src/esx/esx_vi_types.c:1377
+#: src/esx/esx_vi_types.c:1417 src/esx/esx_vi_types.c:1551
+#: src/esx/esx_vi_types.c:1617 src/esx/esx_vi_types.c:1647
+#: src/hyperv/hyperv_util.c:48 src/hyperv/hyperv_wmi.c:129
+#: src/hyperv/hyperv_wmi.c:627 src/hyperv/hyperv_wmi.c:662 src/vmx/vmx.c:1763
+#: src/vmx/vmx.c:1838 src/vmx/vmx.c:1946 src/vmx/vmx.c:2303 src/vmx/vmx.c:2524
+#: src/vmx/vmx.c:2725 src/vmx/vmx.c:2829 src/vmx/vmx.c:3212 src/vmx/vmx.c:3262
+#: src/vmx/vmx.c:3352 src/vmx/vmx.c:3436
 msgid "Invalid argument"
 msgstr "无效参数"
 
-#: src/esx/esx_driver.c:669 src/esx/esx_driver.c:790
-#: src/hyperv/hyperv_driver.c:147 src/phyp/phyp_driver.c:933
-#: src/xenapi/xenapi_driver.c:143
+#: src/esx/esx_driver.c:704 src/esx/esx_driver.c:834
+#: src/hyperv/hyperv_driver.c:153 src/phyp/phyp_driver.c:1013
+#: src/xenapi/xenapi_driver.c:145
 msgid "Username request failed"
 msgstr "用户名请求失败"
 
-#: src/esx/esx_driver.c:677 src/esx/esx_driver.c:798
-#: src/hyperv/hyperv_driver.c:155 src/phyp/phyp_driver.c:1014
-#: src/xenapi/xenapi_driver.c:152
+#: src/esx/esx_driver.c:712 src/esx/esx_driver.c:842
+#: src/hyperv/hyperv_driver.c:161 src/phyp/phyp_driver.c:1094
+#: src/xenapi/xenapi_driver.c:154
 msgid "Password request failed"
 msgstr "密码请求失败"
 
-#: src/esx/esx_driver.c:707
+#: src/esx/esx_driver.c:743
 #, c-format
 msgid "%s is neither an ESX 3.5, 4.x nor 5.x host"
 msgstr "%s 既不是 ESX 3.5、4.x，也不是 5.x 主机"
 
-#: src/esx/esx_driver.c:714
+#: src/esx/esx_driver.c:750
 #, c-format
 msgid "%s isn't a GSX 2.0 host"
 msgstr "%s 不是 GSX 2.0 主机"
 
-#: src/esx/esx_driver.c:774
+#: src/esx/esx_driver.c:815
 msgid "Path has to specify the datacenter and compute resource"
 msgstr "路径中必须指定数据中心和计算资源"
 
-#: src/esx/esx_driver.c:826
+#: src/esx/esx_driver.c:871
 #, c-format
 msgid "%s is neither a vCenter 2.5, 4.x nor 5.x server"
 msgstr "%s 既不是 vCenter 2.5、4.x，也不是 5.x 服务器"
 
-#: src/esx/esx_driver.c:936 src/hyperv/hyperv_driver.c:100
+#: src/esx/esx_driver.c:981 src/hyperv/hyperv_driver.c:100
 #, c-format
 msgid ""
 "Transport '%s' in URI scheme is not supported, try again without the "
 "transport part"
 msgstr "不支持 URI 方案中的传输 '%s'，请去掉传输部分，然后再试一次。"
 
-#: src/esx/esx_driver.c:950 src/hyperv/hyperv_driver.c:108
+#: src/esx/esx_driver.c:995 src/hyperv/hyperv_driver.c:108
 msgid "URI is missing the server part"
 msgstr "URI 中缺少服务器部分"
 
-#: src/esx/esx_driver.c:957 src/hyperv/hyperv_driver.c:115
+#: src/esx/esx_driver.c:1002 src/hyperv/hyperv_driver.c:115
 msgid "Missing or invalid auth pointer"
 msgstr "缺少 auth 指示器或者指示器无效"
 
-#: src/esx/esx_driver.c:1010
+#: src/esx/esx_driver.c:1061
 msgid "This host is not managed by a vCenter"
 msgstr "这台主机不是由 vCenter 管理"
 
-#: src/esx/esx_driver.c:1017
+#: src/esx/esx_driver.c:1068
 #, c-format
 msgid "vCenter IP address %s too big for destination"
 msgstr "vCenter IP 地址 %s 对目标服务器来说太大"
 
-#: src/esx/esx_driver.c:1030
+#: src/esx/esx_driver.c:1081
 #, c-format
 msgid ""
 "This host is managed by a vCenter with IP address %s, but a mismachting "
 "vCenter '%s' (%s) has been specified"
 msgstr "这台主机是有 IP 地址为 %s 的 vCenter 管理，但指定的是不匹配的 vCenter '%s'（%s）"
 
-#: src/esx/esx_driver.c:1188 src/vbox/vbox_MSCOMGlue.c:437
+#: src/esx/esx_driver.c:1247 src/vbox/vbox_MSCOMGlue.c:434
 #, c-format
 msgid "Could not parse version number from '%s'"
 msgstr "无法从 '%s' 中解析版本号"
 
-#: src/esx/esx_driver.c:1248
+#: src/esx/esx_driver.c:1313
 msgid "Missing or empty 'hostName' property"
 msgstr "缺少 'hostName' 属性或者该属性为空"
 
-#: src/esx/esx_driver.c:1386
+#: src/esx/esx_driver.c:1463
 #, c-format
 msgid "CPU Model %s too long for destination"
 msgstr "CPU 型号 %s 对目标服务器来说太长"
 
-#: src/esx/esx_driver.c:1475
+#: src/esx/esx_driver.c:1552
 #, c-format
 msgid "Failed to parse positive integer from '%s'"
 msgstr "从 '%s' 中解析正整数失败"
 
-#: src/esx/esx_driver.c:1576 src/hyperv/hyperv_driver.c:460
+#: src/esx/esx_driver.c:1653 src/hyperv/hyperv_driver.c:474
 #, c-format
 msgid "No domain with ID %d"
 msgstr "没有 ID 为 %d 的域"
 
-#: src/esx/esx_driver.c:1664
+#: src/esx/esx_driver.c:1741
 #, c-format
 msgid "No domain with name '%s'"
 msgstr "没有名为 '%s' 的域"
 
-#: src/esx/esx_driver.c:1722 src/esx/esx_driver.c:1837
-#: src/esx/esx_driver.c:1888 src/esx/esx_driver.c:1944
+#: src/esx/esx_driver.c:1799 src/esx/esx_driver.c:1912
+#: src/esx/esx_driver.c:1957 src/esx/esx_driver.c:2013
 msgid "Domain is not powered on"
 msgstr "没有打开域"
 
-#: src/esx/esx_driver.c:1735
+#: src/esx/esx_driver.c:1812
 #, c-format
 msgid "Could not suspend domain: %s"
 msgstr "无法挂起域：%s"
 
-#: src/esx/esx_driver.c:1779
+#: src/esx/esx_driver.c:1856
 msgid "Domain is not suspended"
 msgstr "没有挂起域"
 
-#: src/esx/esx_driver.c:1793
+#: src/esx/esx_driver.c:1870
 #, c-format
 msgid "Could not resume domain: %s"
 msgstr "无法恢复域：%s"
 
-#: src/esx/esx_driver.c:1957
+#: src/esx/esx_driver.c:2026
 #, c-format
 msgid "Could not destroy domain: %s"
 msgstr "无法删除域：%s"
 
-#: src/esx/esx_driver.c:2024
+#: src/esx/esx_driver.c:2097
 #, c-format
 msgid "Got invalid memory size %d"
 msgstr "得到无效内存大小 %d"
 
-#: src/esx/esx_driver.c:2073 src/esx/esx_driver.c:2980
+#: src/esx/esx_driver.c:2146 src/esx/esx_driver.c:3063
 msgid "Domain is not powered off"
 msgstr "没有关闭域"
 
-#: src/esx/esx_driver.c:2097
+#: src/esx/esx_driver.c:2170
 #, c-format
 msgid "Could not set max-memory to %lu kilobytes: %s"
 msgstr "无法将最大内存设定为 %lu kb：%s"
 
-#: src/esx/esx_driver.c:2154
+#: src/esx/esx_driver.c:2227
 #, c-format
 msgid "Could not set memory to %lu kilobytes: %s"
 msgstr "无法将内存设定为 %lu kb：%s"
 
-#: src/esx/esx_driver.c:2390 src/esx/esx_driver.c:2400
+#: src/esx/esx_driver.c:2463 src/esx/esx_driver.c:2473
 #, c-format
 msgid "QueryPerf returned object with unexpected type '%s'"
 msgstr "QueryPerf 返回包含意外类型 '%s' 的对象"
 
-#: src/esx/esx_driver.c:2517 src/esx/esx_driver.c:2601
-#: src/phyp/phyp_driver.c:1366 src/phyp/phyp_driver.c:3610
-#: src/vbox/vbox_tmpl.c:2125 src/vbox/vbox_tmpl.c:2183
-#: src/xenapi/xenapi_driver.c:1141 src/xenapi/xenapi_driver.c:1313
+#: src/esx/esx_driver.c:2590 src/esx/esx_driver.c:2674
+#: src/phyp/phyp_driver.c:1447 src/phyp/phyp_driver.c:3720
+#: src/vbox/vbox_tmpl.c:2081 src/vbox/vbox_tmpl.c:2139
+#: src/xenapi/xenapi_driver.c:1118 src/xenapi/xenapi_driver.c:1288
 #, c-format
 msgid "unsupported flags: (0x%x)"
 msgstr "不支持的标签：(0x%x)"
 
-#: src/esx/esx_driver.c:2523
+#: src/esx/esx_driver.c:2596
 msgid "Requested number of virtual CPUs must at least be 1"
 msgstr "请求的虚拟 CPU 数至少为 1"
 
-#: src/esx/esx_driver.c:2539
+#: src/esx/esx_driver.c:2612
 #, c-format
 msgid ""
 "Requested number of virtual CPUs is greater than max allowable number of "
 "virtual CPUs for the domain: %d > %d"
 msgstr "请求的虚拟 CPU 数超过该域最多可允许的虚拟 CPU 数：%d > %d"
 
-#: src/esx/esx_driver.c:2566
+#: src/esx/esx_driver.c:2639
 #, c-format
 msgid "Could not set number of virtual CPUs to %d: %s"
 msgstr "无法将虚拟 CPU 数设定为 %d：%s"
 
-#: src/esx/esx_driver.c:2784 src/esx/esx_driver.c:2827
-#: src/vmware/vmware_driver.c:981
+#: src/esx/esx_driver.c:2867 src/esx/esx_driver.c:2910
 #, c-format
 msgid "Unsupported config format '%s'"
 msgstr "不支持的配置格式 '%s'"
 
-#: src/esx/esx_driver.c:2994
+#: src/esx/esx_driver.c:3077
 #, c-format
 msgid "Could not start domain: %s"
 msgstr "无法启动域：%s"
 
-#: src/esx/esx_driver.c:3079
+#: src/esx/esx_driver.c:3161
 msgid "Domain already exists, editing existing domains is not supported yet"
 msgstr "域已存在，还不支持编辑已存在的域。"
 
-#: src/esx/esx_driver.c:3115 src/vmware/vmware_conf.c:401
+#: src/esx/esx_driver.c:3197 src/vmware/vmware_conf.c:365
 msgid ""
 "Domain XML doesn't contain any disks, cannot deduce datastore and path for "
 "VMX file"
 msgstr "域 XML 不包含任何磁盘，无法为 VMX 文件推导出数据存储和路径"
 
-#: src/esx/esx_driver.c:3130 src/vmware/vmware_conf.c:416
+#: src/esx/esx_driver.c:3212 src/vmware/vmware_conf.c:380
 msgid ""
 "Domain XML doesn't contain any file-based harddisks, cannot deduce datastore "
 "and path for VMX file"
 msgstr "域 XML 不包含任何基于文件的硬盘，无法为 VMX 文件推导出数据中心和路径"
 
-#: src/esx/esx_driver.c:3137 src/vmware/vmware_conf.c:423
+#: src/esx/esx_driver.c:3219 src/vmware/vmware_conf.c:387
 msgid ""
 "First file-based harddisk has no source, cannot deduce datastore and path "
 "for VMX file"
 msgstr "第一个基于文件的硬盘没有源，无法为 VMX 文件推导出数据中心和路径"
 
-#: src/esx/esx_driver.c:3149 src/vmware/vmware_conf.c:434
+#: src/esx/esx_driver.c:3231 src/vmware/vmware_conf.c:398
 #, c-format
 msgid "Expecting source '%s' of first file-based harddisk to be a VMDK image"
 msgstr "第一个基于文件的硬盘的源 '%s' 应为 VMDK 映像"
 
-#: src/esx/esx_driver.c:3215
+#: src/esx/esx_driver.c:3301
 #, c-format
 msgid "Could not define domain: %s"
 msgstr "无法定义域：%s"
 
-#: src/esx/esx_driver.c:3290
+#: src/esx/esx_driver.c:3376
 msgid "Domain is not suspended or powered off"
 msgstr "没有挂起或者关闭域"
 
-#: src/esx/esx_driver.c:3433
+#: src/esx/esx_driver.c:3521
 msgid ""
 "Cannot enable general autostart option without affecting other domains"
 msgstr "无法在不影响其他域的前提下启用常规 autostart 选项"
 
-#: src/esx/esx_driver.c:3636
+#: src/esx/esx_driver.c:3724
 #, c-format
 msgid "Shares level has unknown value %d"
 msgstr "共享等级有未知值 %d"
 
-#: src/esx/esx_driver.c:3715
+#: src/esx/esx_driver.c:3794
 #, c-format
 msgid "Could not set reservation to %lld MHz, expecting positive value"
 msgstr "无法将 reservation 设定为 %lld MHz，这里需要一个整正数值。"
 
-#: src/esx/esx_driver.c:3728
+#: src/esx/esx_driver.c:3808
 #, c-format
 msgid ""
 "Could not set limit to %lld MHz, expecting positive value or -1 (unlimited)"
 msgstr "无法将 limit 设定为 %lld MHz，这里需要正数或者 -1 (无限)"
 
-#: src/esx/esx_driver.c:3768
+#: src/esx/esx_driver.c:3848
 #, c-format
 msgid ""
 "Could not set shares to %d, expecting positive value or -1 (low), -2 "
 "(normal) or -3 (high)"
 msgstr "无法将 shares 设定为 %d，这里需要正数值，或者 -1 (低)，-2 (中)，-3 (高)。"
 
-#: src/esx/esx_driver.c:3788
+#: src/esx/esx_driver.c:3872
 #, c-format
 msgid "Could not change scheduler parameters: %s"
 msgstr "无法更改调度程序参数：%s"
 
-#: src/esx/esx_driver.c:3873
+#: src/esx/esx_driver.c:3958
 msgid "Migration not possible without a vCenter"
 msgstr "没有 vCenter 则不可能迁移"
 
-#: src/esx/esx_driver.c:3879
+#: src/esx/esx_driver.c:3964
 msgid "Renaming domains on migration not supported"
 msgstr "不支持在迁移时重命名域"
 
-#: src/esx/esx_driver.c:3893
+#: src/esx/esx_driver.c:3982
 msgid "Only vpxmigr:// migration URIs are supported"
 msgstr "只支持 vpxmigr:// migration URI"
 
-#: src/esx/esx_driver.c:3899
+#: src/esx/esx_driver.c:3988
 msgid "Migration source and destination have to refer to the same vCenter"
 msgstr "迁移源和目标位置必须参考同一 vCenter"
 
-#: src/esx/esx_driver.c:3909
+#: src/esx/esx_driver.c:3998
 msgid "Migration URI has to specify resource pool and host system"
 msgstr "迁移 URI 必须指定源池和主机系统"
 
-#: src/esx/esx_driver.c:3944
+#: src/esx/esx_driver.c:4033
 #, c-format
 msgid "Could not migrate domain, validation reported a problem: %s"
 msgstr "无法迁移域，确认时出错：%s"
 
-#: src/esx/esx_driver.c:3948
+#: src/esx/esx_driver.c:4037
 msgid "Could not migrate domain, validation reported a problem"
 msgstr "无法迁移域，确认时出错。"
 
-#: src/esx/esx_driver.c:3970
+#: src/esx/esx_driver.c:4059
 #, c-format
 msgid "Could not migrate domain, migration task finished with an error: %s"
 msgstr "无法迁移域，迁移任务完成时出错：%s"
 
-#: src/esx/esx_driver.c:4045
+#: src/esx/esx_driver.c:4134
 msgid "Could not retrieve memory usage of resource pool"
 msgstr "无法为资源池检索内存用量"
 
-#: src/esx/esx_driver.c:4232 src/vbox/vbox_tmpl.c:5976
+#: src/esx/esx_driver.c:4278 src/vbox/vbox_tmpl.c:5888
 msgid "disk snapshots not supported yet"
 msgstr "还不支持磁盘快照"
 
-#: src/esx/esx_driver.c:4249
+#: src/esx/esx_driver.c:4295
 #, c-format
 msgid "Snapshot '%s' already exists"
 msgstr "快照 '%s' 已存在"
 
-#: src/esx/esx_driver.c:4266
+#: src/esx/esx_driver.c:4311
 #, c-format
 msgid "Could not create snapshot: %s"
 msgstr "无法生成快照：%s"
 
-#: src/esx/esx_driver.c:4610 src/qemu/qemu_driver.c:13095
-#: src/test/test_driver.c:6713 src/vbox/vbox_tmpl.c:6417
+#: src/esx/esx_driver.c:4655 src/qemu/qemu_driver.c:10098
+#: src/vbox/vbox_tmpl.c:6333
 #, c-format
 msgid "snapshot '%s' does not have a parent"
 msgstr "快照 '%s' 没有上级快照"
 
-#: src/esx/esx_driver.c:4758
+#: src/esx/esx_driver.c:4734
 #, c-format
 msgid "Could not revert to snapshot '%s': %s"
 msgstr "无法转换为快照 '%s': %s"
 
-#: src/esx/esx_driver.c:4824
+#: src/esx/esx_driver.c:4800
 #, c-format
 msgid "Could not delete snapshot '%s': %s"
 msgstr "无法删除快照 '%s': %s"
 
-#: src/esx/esx_driver.c:4895
+#: src/esx/esx_driver.c:4871
 #, c-format
 msgid "Could not change memory parameters: %s"
 msgstr "无法更改内存参数：%s"
@@ -6722,12 +6888,11 @@
 msgid "iSCSI storage pool does not support volume wiping"
 msgstr "iSCSI 存储池不支持卷擦除"
 
-#: src/esx/esx_storage_backend_vmfs.c:98
-#: src/esx/esx_storage_backend_vmfs.c:511
+#: src/esx/esx_storage_driver.c:88 src/esx/esx_storage_driver.c:569
 msgid "DatastoreInfo has unexpected type"
 msgstr "DatastoreInfo 有意外类型"
 
-#: src/esx/esx_storage_backend_vmfs.c:499
+#: src/esx/esx_storage_driver.c:557
 #, c-format
 msgid "Datastore has unexpected type '%s'"
 msgstr "Datastore 有意外类型 '%s'"
@@ -6737,54 +6902,50 @@
 "QueryVirtualDiskUuid not available, cannot lookup storage volume by UUID"
 msgstr "QueryVirtualDiskUuid 不可用，无法根据 UUID 查找存储卷。"
 
-#: src/esx/esx_storage_backend_vmfs.c:880
-#: src/esx/esx_storage_backend_vmfs.c:1106
+#: src/esx/esx_storage_driver.c:999 src/esx/esx_storage_driver.c:1233
 msgid "Creating non-file volumes is not supported"
 msgstr "不支持生成非文件卷"
 
-#: src/esx/esx_storage_backend_vmfs.c:889
-#: src/esx/esx_storage_backend_vmfs.c:1115
+#: src/esx/esx_storage_driver.c:1008 src/esx/esx_storage_driver.c:1242
 #, c-format
 msgid "Volume name '%s' doesn't have expected format '<directory>/<file>'"
 msgstr "卷名称 '%s' 未使用应有格式 '<directory>/<file>'"
 
-#: src/esx/esx_storage_backend_vmfs.c:896
-#: src/esx/esx_storage_backend_vmfs.c:1122
+#: src/esx/esx_storage_driver.c:1015 src/esx/esx_storage_driver.c:1249
 #, c-format
 msgid "Volume name '%s' has unsupported suffix, expecting '.vmdk'"
 msgstr "卷名称 '%s' 包含不支持的前缀，应为 '.vmdk'"
 
-#: src/esx/esx_storage_backend_vmfs.c:970
+#: src/esx/esx_storage_driver.c:1095
 msgid "Unsupported capacity-to-allocation relation"
 msgstr "不支持的 capacity-to-allocation 关系"
 
-#: src/esx/esx_storage_backend_vmfs.c:998
+#: src/esx/esx_storage_driver.c:1121
 #, c-format
 msgid "Could not create volume: %s"
 msgstr "无法生成卷：%s"
 
-#: src/esx/esx_storage_backend_vmfs.c:1024
-#: src/esx/esx_storage_backend_vmfs.c:1216
+#: src/esx/esx_storage_driver.c:1149 src/esx/esx_storage_driver.c:1351
 #, c-format
 msgid "Creation of %s volumes is not supported"
 msgstr "不支持生成 %s 卷"
 
-#: src/esx/esx_storage_backend_vmfs.c:1190
+#: src/esx/esx_storage_driver.c:1323
 #, c-format
 msgid "Could not copy volume: %s"
 msgstr "无法复制卷：%s"
 
-#: src/esx/esx_storage_backend_vmfs.c:1271
+#: src/esx/esx_storage_driver.c:1411
 #, c-format
 msgid "Could not delete volume: %s"
 msgstr "无法删除卷：%s"
 
-#: src/esx/esx_storage_backend_vmfs.c:1314
+#: src/esx/esx_storage_driver.c:1460
 #, c-format
 msgid "Could not wipe volume: %s"
 msgstr "无法擦除卷：%s"
 
-#: src/esx/esx_storage_backend_vmfs.c:1442
+#: src/esx/esx_storage_driver.c:1595
 #, c-format
 msgid "File '%s' has unknown type"
 msgstr "文件 ‘%s’ 包含未知类型"
@@ -6794,7 +6955,7 @@
 msgid "Could not find storage pool with uuid '%s'"
 msgstr "无法找到 uuid 为 '%s' 的存储池"
 
-#: src/esx/esx_storage_driver.c:317
+#: src/esx/esx_storage_driver.c:607
 msgid "Cannot deactivate storage pool autostart"
 msgstr "无法取消存储池自动启动"
 
@@ -6808,32 +6969,32 @@
 msgid "Could not find storage volume with key '%s'"
 msgstr "无法找到使用密钥 '%s' 的 存储卷"
 
-#: src/esx/esx_util.c:72 src/hyperv/hyperv_util.c:64
+#: src/esx/esx_util.c:91 src/hyperv/hyperv_util.c:83
 #, c-format
 msgid ""
 "Query parameter 'transport' has unexpected value '%s' (should be http|https)"
 msgstr "查询参数 'transport' 包含意外值 ‘%s’ (应为 http|https)"
 
-#: src/esx/esx_util.c:86
+#: src/esx/esx_util.c:109
 #, c-format
 msgid ""
 "Query parameter 'no_verify' has unexpected value '%s' (should be 0 or 1)"
 msgstr "查询参数 'no_verify' 包含意外值 '%s' (应为 0 或者 1)"
 
-#: src/esx/esx_util.c:96
+#: src/esx/esx_util.c:119
 #, c-format
 msgid ""
 "Query parameter 'auto_answer' has unexpected value '%s' (should be 0 or 1)"
 msgstr "查询参数 'auto_answer' 包含意外值 '%s' (应为 0 或者 1)"
 
-#: src/esx/esx_util.c:122
+#: src/esx/esx_util.c:145
 #, c-format
 msgid ""
 "Query parameter 'proxy' contains unexpected type '%s' (should be "
 "(http|socks(|4|4a|5))"
 msgstr "查询参数 ‘proxy’ 包含意外值 '%s' (应为 (http|socks(|4|4a|5))"
 
-#: src/esx/esx_util.c:136
+#: src/esx/esx_util.c:163
 msgid "Query parameter 'proxy' doesn't contain a hostname"
 msgstr "查询参数 ‘proxy’ 不包含主机名"
 
@@ -6843,78 +7004,78 @@
 "Query parameter 'proxy' has unexpected port value '%s' (should be [1..65535])"
 msgstr "查询参数 ‘proxy’ 包含意外端口值 '%s' (应为 [1...65535] )"
 
-#: src/esx/esx_util.c:246
+#: src/esx/esx_util.c:287
 #, c-format
 msgid ""
 "Datastore path '%s' doesn't have expected format '[<datastore>] <path>'"
 msgstr "Datastore 路径 ‘%s’ 不包含应有的格式 '[<datastore>] <path>'"
 
-#: src/esx/esx_util.c:326
+#: src/esx/esx_util.c:370
 #, c-format
 msgid "IP address lookup for host '%s' failed: %s"
 msgstr "为主机 ‘%s’ 查询 IP 地址失败：%s"
 
-#: src/esx/esx_util.c:333
+#: src/esx/esx_util.c:377
 #, c-format
 msgid "No IP address for host '%s' found: %s"
 msgstr "没有找到主机 '%s' 的 IP 地址：%s"
 
-#: src/esx/esx_util.c:343
+#: src/esx/esx_util.c:387
 #, c-format
 msgid "Formatting IP address for host '%s' failed: %s"
 msgstr "为主机 '%s' 格式化 IP 地址失败：%s"
 
-#: src/esx/esx_util.c:363 src/esx/esx_vi.c:2507 src/hyperv/hyperv_driver.c:889
-#: src/hyperv/hyperv_wmi.c:629 src/vmx/vmx.c:724
+#: src/esx/esx_util.c:407 src/esx/esx_vi.c:2369 src/hyperv/hyperv_driver.c:909
+#: src/hyperv/hyperv_wmi.c:633 src/vmx/vmx.c:697
 #, c-format
 msgid "Could not parse UUID from string '%s'"
 msgstr "无法从字符串 '%s' 解析 UUID"
 
-#: src/esx/esx_vi.c:254
+#: src/esx/esx_vi.c:226
 #, c-format
 msgid "curl_easy_perform() returned an error: %s (%d) : %s"
 msgstr "curl_easy_perform() 返回一个错误：%s (%d) : %s"
 
-#: src/esx/esx_vi.c:264
+#: src/esx/esx_vi.c:236
 #, c-format
 msgid ""
 "curl_easy_getinfo(CURLINFO_RESPONSE_CODE) returned an error: %s (%d) : %s"
 msgstr "curl_easy_getinfo(CURLINFO_RESPONSE_CODE) 返回一个错误：%s (%d) : %s"
 
-#: src/esx/esx_vi.c:272
+#: src/esx/esx_vi.c:244
 msgid ""
 "curl_easy_getinfo(CURLINFO_RESPONSE_CODE) returned a negative response code"
 msgstr "curl_easy_getinfo(CURLINFO_RESPONSE_CODE) 返回消极响应代码"
 
-#: src/esx/esx_vi.c:284
+#: src/esx/esx_vi.c:256
 #, c-format
 msgid ""
 "curl_easy_getinfo(CURLINFO_REDIRECT_URL) returned an error: %s (%d) : %s"
 msgstr "curl_easy_getinfo(CURLINFO_REDIRECT_URL) 返回一个错误：%s (%d) : %s"
 
-#: src/esx/esx_vi.c:290
+#: src/esx/esx_vi.c:262
 #, c-format
 msgid "The server redirects from '%s' to '%s'"
 msgstr "从 '%s' 重新指向 '%s' 的服务器"
 
-#: src/esx/esx_vi.c:295
+#: src/esx/esx_vi.c:267
 #, c-format
 msgid "The server redirects from '%s'"
 msgstr "从 '%s' 重新指向的服务器"
 
-#: src/esx/esx_vi.c:308 src/esx/esx_vi_methods.c:165
+#: src/esx/esx_vi.c:280 src/esx/esx_vi_methods.c:165
 msgid "Invalid call"
 msgstr "无效调用"
 
-#: src/esx/esx_vi.c:316
+#: src/esx/esx_vi.c:288
 msgid "Could not initialize CURL"
 msgstr "无法初始化 CURL"
 
-#: src/esx/esx_vi.c:335
+#: src/esx/esx_vi.c:307
 msgid "Could not build CURL header list"
 msgstr "无法构建 CURL 表头列表"
 
-#: src/esx/esx_vi.c:370
+#: src/esx/esx_vi.c:341
 msgid "Could not initialize CURL mutex"
 msgstr "无法初始化 CURL 互斥"
 
@@ -6922,55 +7083,55 @@
 msgid "Download length it too large"
 msgstr "下载时间太长"
 
-#: src/esx/esx_vi.c:425
+#: src/esx/esx_vi.c:374
 #, c-format
 msgid "HTTP response code %d for download from '%s'"
 msgstr "用来下载的 HTTP 响应代码 %d 来自 '%s'"
 
-#: src/esx/esx_vi.c:478
+#: src/esx/esx_vi.c:420
 #, c-format
 msgid "HTTP response code %d for upload to '%s'"
 msgstr "用来上传的 HTTP 响应代码 %d 来自 '%s'"
 
-#: src/esx/esx_vi.c:513
+#: src/esx/esx_vi.c:455
 #, c-format
 msgid "Trying to lock unknown SharedCURL lock %d"
 msgstr "尝试锁定未知共享的 CURL 锁 %d"
 
-#: src/esx/esx_vi.c:541
+#: src/esx/esx_vi.c:483
 #, c-format
 msgid "Trying to unlock unknown SharedCURL lock %d"
 msgstr "尝试解锁未知共享的 CURL 锁 %d"
 
-#: src/esx/esx_vi.c:558
+#: src/esx/esx_vi.c:500
 msgid "Trying to free SharedCURL object that is still in use"
 msgstr "尝试释放仍在使用的共享 CURL 对象"
 
-#: src/esx/esx_vi.c:578
+#: src/esx/esx_vi.c:520
 msgid "Cannot share uninitialized CURL handle"
 msgstr "无法共享未初始化的 CURL 句柄"
 
-#: src/esx/esx_vi.c:584
+#: src/esx/esx_vi.c:526
 msgid "Cannot share CURL handle that is already shared"
 msgstr "无法共享已经被共享的 CURL 句柄"
 
-#: src/esx/esx_vi.c:593
+#: src/esx/esx_vi.c:535
 msgid "Could not initialize CURL (share)"
 msgstr "无法初始化 CURL（share）"
 
-#: src/esx/esx_vi.c:610
+#: src/esx/esx_vi.c:552
 msgid "Could not initialize a CURL (share) mutex"
 msgstr "无法初始化 CURL（share）互斥"
 
-#: src/esx/esx_vi.c:633
+#: src/esx/esx_vi.c:571
 msgid "Cannot unshare uninitialized CURL handle"
 msgstr "无法取消共享未初始化的 CRUL 句柄"
 
-#: src/esx/esx_vi.c:639
+#: src/esx/esx_vi.c:577
 msgid "Cannot unshare CURL handle that is not shared"
 msgstr "无法取消共享没有被共享的 CURL 句柄"
 
-#: src/esx/esx_vi.c:644
+#: src/esx/esx_vi.c:582
 msgid "CURL (share) mismatch"
 msgstr "CULR（share）不匹配"
 
@@ -7003,291 +7164,290 @@
 msgid "CURL (multi) mismatch"
 msgstr "CURL（multi）不匹配"
 
-#: src/esx/esx_vi.c:818
+#: src/esx/esx_vi.c:660
 msgid "Could not initialize session mutex"
 msgstr "无法初始化回话互斥"
 
-#: src/esx/esx_vi.c:844
+#: src/esx/esx_vi.c:690
 #, c-format
 msgid ""
 "Expecting VI API major/minor version '2.5', '4.x' or '5.x' but found '%s'"
 msgstr "应为 VI API 主要/次要版本 '2.5'、'4.x' 或者 '5.x'，但找到的是 '%s'。"
 
-#: src/esx/esx_vi.c:854
+#: src/esx/esx_vi.c:700
 #, c-format
 msgid "Expecting GSX major/minor version '2.0' but found '%s'"
 msgstr "应为 GSX 主要/次要版本 '2.0'，但找到的是 '%s'。"
 
-#: src/esx/esx_vi.c:876
+#: src/esx/esx_vi.c:726
 #, c-format
 msgid ""
 "Expecting ESX major/minor version '3.5', '4.x' or '5.x' but found '%s'"
 msgstr "应为 ESX 主要/次要版本 '3.5'、'4.x' 或者 '5.x'，但找到的是 '%s'。"
 
-#: src/esx/esx_vi.c:898
+#: src/esx/esx_vi.c:752
 #, c-format
 msgid ""
 "Expecting VPX major/minor version '2.5', '4.x' or '5.x' but found '%s'"
 msgstr "应为 VPX 主要/次要版本 '2.5'、'4.x' 或者 '5.x'，但找到的是 '%s'。"
 
-#: src/esx/esx_vi.c:905
+#: src/esx/esx_vi.c:759
 #, c-format
 msgid ""
 "Expecting product 'gsx' or 'esx' or 'embeddedEsx' or 'vpx' but found '%s'"
 msgstr "应为产品 'gsx'、'esx' 或者 'embeddedEsx'，但找到的是 '%s'。"
 
-#: src/esx/esx_vi.c:912
+#: src/esx/esx_vi.c:766
 #, c-format
 msgid "Expecting VI API type 'HostAgent' or 'VirtualCenter' but found '%s'"
 msgstr "应为 VI API 类型 'HostAgent' 或者 'VirtualCenter'，但找到的是 '%s'。"
 
-#: src/esx/esx_vi.c:962 src/esx/esx_vi.c:1116 src/esx/esx_vi.c:1206
+#: src/esx/esx_vi.c:820 src/esx/esx_vi.c:986 src/esx/esx_vi.c:1080
 msgid "Could not retrieve resource pool"
 msgstr "无法检索源池"
 
-#: src/esx/esx_vi.c:1002
+#: src/esx/esx_vi.c:872
 #, c-format
 msgid "Path '%s' does not specify a datacenter"
 msgstr "路径 '%s' 没有指定数据中心"
 
-#: src/esx/esx_vi.c:1046
+#: src/esx/esx_vi.c:916
 #, c-format
 msgid "Could not find datacenter specified in '%s'"
 msgstr "无法找到在 '%s' 中指定的数据中心"
 
-#: src/esx/esx_vi.c:1060
+#: src/esx/esx_vi.c:930
 #, c-format
 msgid "Path '%s' does not specify a compute resource"
 msgstr "路径 '%s' 没有指定计算资源"
 
-#: src/esx/esx_vi.c:1109
+#: src/esx/esx_vi.c:979
 #, c-format
 msgid "Could not find compute resource specified in '%s'"
 msgstr "无法找到在 '%s' 中指定的计算资源"
 
-#: src/esx/esx_vi.c:1132
+#: src/esx/esx_vi.c:1002
 #, c-format
 msgid "Path '%s' does not specify a host system"
 msgstr "路径 '%s' 没有指定主机系统"
 
-#: src/esx/esx_vi.c:1143
+#: src/esx/esx_vi.c:1013
 #, c-format
 msgid "Path '%s' ends with an excess item"
 msgstr "路径 '%s' 结尾使用额外项目"
 
-#: src/esx/esx_vi.c:1159
+#: src/esx/esx_vi.c:1033
 #, c-format
 msgid "Could not find host system specified in '%s'"
 msgstr "无法找到在 '%s' 中指定的主机系统"
 
-#: src/esx/esx_vi.c:1272
+#: src/esx/esx_vi.c:1145
 msgid "(esx execute response)"
 msgstr "(esx execute response)"
 
-#: src/esx/esx_vi.c:1290
+#: src/esx/esx_vi.c:1163
 #, c-format
 msgid ""
 "HTTP response code %d for call to '%s'. Fault is unknown, XPath evaluation "
 "failed"
 msgstr "%d 是调用 '%s' 的 HTTP 响应代码。未知错误，XPath 评估失败。"
 
-#: src/esx/esx_vi.c:1298
+#: src/esx/esx_vi.c:1171
 #, c-format
 msgid ""
 "HTTP response code %d for call to '%s'. Fault is unknown, deserialization "
 "failed"
 msgstr "%d 是调用 '%s' 的 HTTP 响应代码。未知错误，deserialization 评估失败。"
 
-#: src/esx/esx_vi.c:1305
+#: src/esx/esx_vi.c:1178
 #, c-format
 msgid "HTTP response code %d for call to '%s'. Fault: %s - %s"
 msgstr "%d 是调用 '%s' 的 HTTP 响应代码。错误：%s-%s"
 
-#: src/esx/esx_vi.c:1325
+#: src/esx/esx_vi.c:1200
 #, c-format
 msgid "XPath evaluation of response for call to '%s' failed"
 msgstr "用来调用 '%s' 的响应的 XPath 评估失败"
 
-#: src/esx/esx_vi.c:1337 src/esx/esx_vi.c:1352
+#: src/esx/esx_vi.c:1212 src/esx/esx_vi.c:1227
 #, c-format
 msgid "Call to '%s' returned an empty result, expecting a non-empty result"
 msgstr "调用 '%s'，返回空结果，应为非空结果。"
 
-#: src/esx/esx_vi.c:1342 src/esx/esx_vi.c:1363
+#: src/esx/esx_vi.c:1217 src/esx/esx_vi.c:1238
 #, c-format
 msgid "Call to '%s' returned a list, expecting exactly one item"
 msgstr "调用 '%s' 返回一个列表，只应有一个项目。"
 
-#: src/esx/esx_vi.c:1377
+#: src/esx/esx_vi.c:1252
 #, c-format
 msgid "Call to '%s' returned something, expecting an empty result"
 msgstr "调用 '%s' 返回结果，应为空结果。"
 
-#: src/esx/esx_vi.c:1386
+#: src/esx/esx_vi.c:1261
 msgid "Invalid argument (occurrence)"
 msgstr "无效参数（occurrence）"
 
-#: src/esx/esx_vi.c:1392
+#: src/esx/esx_vi.c:1267
 #, c-format
 msgid "HTTP response code %d for call to '%s'"
 msgstr "%d 是调用 '%s' 的 HTTP 响应代码"
 
-#: src/esx/esx_vi.c:1450 src/esx/esx_vi_types.c:933
+#: src/esx/esx_vi.c:1325 src/esx/esx_vi_types.c:870
 #, c-format
 msgid "Expecting type '%s' but found '%s'"
 msgstr "应为类型 '%s'，但找到的是 '%s'。"
 
-#: src/esx/esx_vi.c:1464 src/esx/esx_vi.c:1536 src/esx/esx_vi_types.c:366
-#: src/esx/esx_vi_types.c:1063
+#: src/esx/esx_vi.c:1339 src/esx/esx_vi.c:1411 src/esx/esx_vi_types.c:357
+#: src/esx/esx_vi_types.c:1004
 #, c-format
 msgid "Unknown value '%s' for %s"
 msgstr "%s 的未知值 '%s'"
 
-#: src/esx/esx_vi.c:1629
+#: src/esx/esx_vi.c:1505
 #, c-format
 msgid "Expecting type to begin with 'ArrayOf' but found '%s'"
 msgstr "应为以 'ArrayOf' 开始的类型，但找到的是 '%s'。"
 
-#: src/esx/esx_vi.c:1638 src/esx/esx_vi.c:1710 src/esx/esx_vi_types.c:307
+#: src/esx/esx_vi.c:1514 src/esx/esx_vi.c:1587 src/esx/esx_vi_types.c:299
 #, c-format
 msgid "Wrong XML element type %d"
 msgstr "错误的 XML 元素类型 %d"
 
-#: src/esx/esx_vi.c:1900
+#: src/esx/esx_vi.c:1789
 msgid "Invalid call, no mutex"
 msgstr "无效调用，无互斥。"
 
-#: src/esx/esx_vi.c:1907
+#: src/esx/esx_vi.c:1796
 msgid "Invalid call, no session"
 msgstr "无效调用，无会话。"
 
-#: src/esx/esx_vi.c:1966
+#: src/esx/esx_vi.c:1855
 msgid "Key of the current session differs from the key at last login"
 msgstr "当前会话密钥与上次登录时的密钥不同"
 
-#: src/esx/esx_vi.c:2021 src/esx/esx_vi.c:2033 src/esx/esx_vi.c:2047
-#: src/esx/esx_vi.c:2056
+#: src/esx/esx_vi.c:1908 src/esx/esx_vi.c:1920 src/esx/esx_vi.c:1934
 #, c-format
 msgid "Invalid lookup of '%s' from '%s'"
 msgstr "'%s' 中的无效查找 '%s'"
 
-#: src/esx/esx_vi.c:2062
+#: src/esx/esx_vi.c:1940
 #, c-format
 msgid "Invalid lookup from '%s'"
 msgstr "'%s' 中的无效查找"
 
-#: src/esx/esx_vi.c:2103
+#: src/esx/esx_vi.c:1971
 #, c-format
 msgid "Could not lookup '%s' from '%s'"
 msgstr "无法在 '%s' 中查找 '%s'"
 
-#: src/esx/esx_vi.c:2109
+#: src/esx/esx_vi.c:1977
 #, c-format
 msgid "Could not lookup '%s' list from '%s'"
 msgstr "无法在 '%s' 中查找 '%s' 列表"
 
-#: src/esx/esx_vi.c:2115
+#: src/esx/esx_vi.c:1983
 msgid "Invalid occurrence value"
 msgstr "无效 occurrence 值"
 
-#: src/esx/esx_vi.c:2169
+#: src/esx/esx_vi.c:2027
 #, c-format
 msgid "Missing '%s' property while looking for ManagedEntityStatus"
 msgstr "查找 ManagedEntityStatus 时缺少 '%s' 属性"
 
-#: src/esx/esx_vi.c:2192
+#: src/esx/esx_vi.c:2050
 msgid "Missing 'runtime.powerState' property"
 msgstr "缺少 'runtime.powerState' 属性"
 
-#: src/esx/esx_vi.c:2253 src/esx/esx_vi.c:2286 src/esx/esx_vi.c:2322
-#: src/esx/esx_vi.c:2358
+#: src/esx/esx_vi.c:2111 src/esx/esx_vi.c:2144 src/esx/esx_vi.c:2180
+#: src/esx/esx_vi.c:2216
 #, c-format
 msgid "Missing '%s' property"
 msgstr "缺少 '%s' 属性"
 
-#: src/esx/esx_vi.c:2429
+#: src/esx/esx_vi.c:2287
 msgid "ObjectContent does not reference a virtual machine"
 msgstr "ObjectContent 不能参考虚拟机"
 
-#: src/esx/esx_vi.c:2437
+#: src/esx/esx_vi.c:2295
 #, c-format
 msgid "Could not parse positive integer from '%s'"
 msgstr "无法从 '%s' 中解析正整数"
 
-#: src/esx/esx_vi.c:2463
+#: src/esx/esx_vi.c:2325
 msgid "Domain name contains invalid escape sequence"
 msgstr "郁闷包含无效换码顺序"
 
-#: src/esx/esx_vi.c:2473
+#: src/esx/esx_vi.c:2335
 msgid "Could not get name of virtual machine"
 msgstr "无法获得虚拟机名称"
 
-#: src/esx/esx_vi.c:2501
+#: src/esx/esx_vi.c:2363
 msgid "Could not get UUID of virtual machine"
 msgstr "无法获得虚拟机 UUID"
 
-#: src/esx/esx_vi.c:2642
+#: src/esx/esx_vi.c:2508
 #, c-format
 msgid "Could not find snapshot with name '%s'"
 msgstr "无法找到名为 '%s' 的快照"
 
-#: src/esx/esx_vi.c:2677
+#: src/esx/esx_vi.c:2543
 #, c-format
 msgid "Could not find domain snapshot with internal name '%s'"
 msgstr "无法找到内部名为 '%s' 的域快照"
 
-#: src/esx/esx_vi.c:2743
+#: src/esx/esx_vi.c:2608
 #, c-format
 msgid "Could not find domain with UUID '%s'"
 msgstr "无法找到 UUID 为 '%s' 的域"
 
-#: src/esx/esx_vi.c:2818
+#: src/esx/esx_vi.c:2683
 #, c-format
 msgid "Could not find domain with name '%s'"
 msgstr "无法找到名为 '%s' 的域"
 
-#: src/esx/esx_vi.c:2871
+#: src/esx/esx_vi.c:2736
 msgid "Other tasks are pending for this domain"
 msgstr "其他因这个域而等待处理的任务"
 
-#: src/esx/esx_vi.c:2952
+#: src/esx/esx_vi.c:2817
 #, c-format
 msgid "Could not find datastore with name '%s'"
 msgstr "无法找到名为 '%s' 的数据存储"
 
-#: src/esx/esx_vi.c:3039
+#: src/esx/esx_vi.c:2904
 #, c-format
 msgid "Could not find datastore containing absolute path '%s'"
 msgstr "无法找到包含绝对路径 '%s' 的数据存储"
 
-#: src/esx/esx_vi.c:3110
+#: src/esx/esx_vi.c:2974
 msgid "Could not lookup datastore host mount"
 msgstr "无法找到数据存储主机挂载"
 
-#: src/esx/esx_vi.c:3386
+#: src/esx/esx_vi.c:3250
 msgid "Domain has no current snapshot"
 msgstr "域没有当前快照"
 
-#: src/esx/esx_vi.c:3393
+#: src/esx/esx_vi.c:3257
 msgid "Could not lookup root snapshot list"
 msgstr "无法找到 root 快照列表"
 
-#: src/esx/esx_vi.c:3477
+#: src/esx/esx_vi.c:3345
 #, c-format
 msgid "Datastore path '%s' doesn't reference a file"
 msgstr "Datastore 路径 ‘%s’ 不参考文件"
 
-#: src/esx/esx_vi.c:3567 src/esx/esx_vi.c:3717
+#: src/esx/esx_vi.c:3432
 #, c-format
 msgid "Could not search in datastore '%s': %s"
 msgstr "无法在 datastore '%s' 中搜索：%s"
 
-#: src/esx/esx_vi.c:3586
+#: src/esx/esx_vi.c:3451
 #, c-format
 msgid "No storage volume with key or path '%s'"
 msgstr "没有使用密钥或路径 ’%s‘ 的存储卷"
 
-#: src/esx/esx_vi.c:3846
+#: src/esx/esx_vi.c:3705
 msgid "Could not retrieve the AutoStartDefaults object"
 msgstr "无法检索 AutoStartDefaults 对象"
 
@@ -7306,47 +7466,47 @@
 msgid "Could not find HostVirtualSwitch with name '%s'"
 msgstr "无法找到名为 '%s' 的 HostVirtualSwitch"
 
-#: src/esx/esx_vi.c:4258 src/esx/esx_vi.c:4292
+#: src/esx/esx_vi.c:3821 src/esx/esx_vi.c:3855
 #, c-format
 msgid ""
 "Pending question blocks virtual machine execution, question is '%s', no "
 "possible answers"
 msgstr "等待处理的问题阻碍虚拟机执行，问题为 '%s'，没有可能的答案。"
 
-#: src/esx/esx_vi.c:4266
+#: src/esx/esx_vi.c:3829
 #, c-format
 msgid ""
 "Pending question blocks virtual machine execution, question is '%s', "
 "possible answers are %s, but no default answer is specified"
 msgstr "等待处理的问题阻碍虚拟机执行，问题为 '%s'，答案为 %s，但没有指定默认答案。"
 
-#: src/esx/esx_vi.c:4287
+#: src/esx/esx_vi.c:3850
 #, c-format
 msgid ""
 "Pending question blocks virtual machine execution, question is '%s', "
 "possible answers are %s"
 msgstr "等待处理的问题阻碍虚拟机执行，问题为 '%s'，可能的答案为 %s。"
 
-#: src/esx/esx_vi.c:4402
+#: src/esx/esx_vi.c:3957
 msgid ""
 "Cancelable task is blocked by an unanswered question but cancellation failed"
 msgstr "可取消的任务被一个没有回答的问题阻碍，但取消操作失败。"
 
-#: src/esx/esx_vi.c:4407
+#: src/esx/esx_vi.c:3962
 msgid "Non-cancelable task is blocked by an unanswered question"
 msgstr "非不可取消的任务被一个没有回答的问题阻碍。"
 
-#: src/esx/esx_vi.c:4538
+#: src/esx/esx_vi.c:4099
 #, c-format
 msgid "HostCpuIdInfo register '%s' has an unexpected length"
 msgstr "HostCpuIdInfo 注册 '%s' 的长度不对"
 
-#: src/esx/esx_vi.c:4552
+#: src/esx/esx_vi.c:4113
 #, c-format
 msgid "HostCpuIdInfo register '%s' has an unexpected format"
 msgstr "HostCpuIdInfo 注册 '%s' 的格式不对"
 
-#: src/esx/esx_vi.c:4605
+#: src/esx/esx_vi.c:4164
 msgid "Unexpected product version"
 msgstr "意外的产品版本"
 
@@ -7363,12 +7523,12 @@
 msgid "Target not found"
 msgstr "未找到目标"
 
-#: src/esx/esx_vi.c:5091
+#: src/esx/esx_vi.c:4318
 #, c-format
 msgid "Missing 'name' property in %s lookup"
 msgstr "在 %s 查找中缺少 'name' 属性"
 
-#: src/esx/esx_vi.c:5125
+#: src/esx/esx_vi.c:4351
 #, c-format
 msgid "Could not find %s with name '%s'"
 msgstr "无法找到名为 '%s' 的 %s"
@@ -7378,7 +7538,7 @@
 msgid "Could not find %s"
 msgstr "无法找到 %s"
 
-#: src/esx/esx_vi_types.c:89 src/esx/esx_vi_types.c:778
+#: src/esx/esx_vi_types.c:85 src/esx/esx_vi_types.c:730
 #, c-format
 msgid "%s object has invalid dynamic type"
 msgstr "%s 对象有一个无效动态类型"
@@ -7388,230 +7548,228 @@
 msgid "Call to %s for unexpected type '%s', expected '%s'"
 msgstr "为意外类型 '%s' 调用 %s，应为  '%s'。"
 
-#: src/esx/esx_vi_types.c:359
+#: src/esx/esx_vi_types.c:350
 #, c-format
 msgid "XML node doesn't contain text, expecting an %s value"
 msgstr "XML 节点不包含稳步，应为 %s 值"
 
-#: src/esx/esx_vi_types.c:373
+#: src/esx/esx_vi_types.c:364
 #, c-format
 msgid "Value '%s' is not representable as %s"
 msgstr "值 '%s' 不能作为 %s 使用"
 
-#: src/esx/esx_vi_types.c:498 src/esx/esx_vi_types.c:761
+#: src/esx/esx_vi_types.c:489 src/esx/esx_vi_types.c:713
 #, c-format
 msgid "%s object is missing the required '%s' property"
 msgstr "%s 对象缺少所需 '%s' 属性"
 
-#: src/esx/esx_vi_types.c:555 src/esx/esx_vi_types.c:701
+#: src/esx/esx_vi_types.c:215 src/esx/esx_vi_types.c:228
+#: src/esx/esx_vi_types.c:546 src/esx/esx_vi_types.c:652
 #, c-format
 msgid "Call to %s for unexpected type '%s'"
 msgstr "为意外类型 '%s' 调用 %s"
 
-#: src/esx/esx_vi_types.c:736
+#: src/esx/esx_vi_types.c:688
 #, c-format
 msgid "Unknown value '%s' for %s 'type' property"
 msgstr "%s 'type' 属性的未知值 '%s'"
 
-#: src/esx/esx_vi_types.c:963 src/esx/esx_vi_types.c:1029
+#: src/esx/esx_vi_types.c:902 src/esx/esx_vi_types.c:964
 msgid "Could not copy an XML node"
 msgstr "无法复制 XML 节点"
 
-#: src/esx/esx_vi_types.c:1040
+#: src/esx/esx_vi_types.c:975
 msgid "AnyType is missing 'type' property"
 msgstr "'type' 属性中缺少 AnyType"
 
-#: src/esx/esx_vi_types.c:1048
+#: src/esx/esx_vi_types.c:983
 #, c-format
 msgid "Unknown value '%s' for AnyType 'type' property"
 msgstr "AnyType 'type' 属性的未知值 '%s'"
 
-#: src/esx/esx_vi_types.c:1071
+#: src/esx/esx_vi_types.c:1012
 #, c-format
 msgid "Value '%s' is out of %s range"
 msgstr "值 '%s' 在 %s 范围之外"
 
-#: src/esx/esx_vi_types.c:1087
+#: src/esx/esx_vi_types.c:1028
 #, c-format
 msgid "Unknown value '%s' for xsd:boolean"
 msgstr "xsd:boolean 的未知值 '%s'"
 
-#: src/esx/esx_vi_types.c:1498
+#: src/esx/esx_vi_types.c:1390
 msgid "XML node doesn't contain text, expecting an xsd:dateTime value"
 msgstr "XML 节点不包含稳步，应为 xsd:dateTime 值"
 
-#: src/esx/esx_vi_types.c:1531
+#: src/esx/esx_vi_types.c:1423
 #, c-format
 msgid "xsd:dateTime value '%s' too long for destination"
 msgstr "xsd:dateTime 值 '%s' 对目标系统来说太长"
 
-#: src/esx/esx_vi_types.c:1553 src/esx/esx_vi_types.c:1563
-#: src/esx/esx_vi_types.c:1576 src/esx/esx_vi_types.c:1590
+#: src/esx/esx_vi_types.c:1445 src/esx/esx_vi_types.c:1455
+#: src/esx/esx_vi_types.c:1468 src/esx/esx_vi_types.c:1482
 #, c-format
 msgid "xsd:dateTime value '%s' has unexpected format"
 msgstr "xsd:dateTime 值 '%s' 使用意外的格式"
 
-#: src/esx/esx_vi_types.c:1673
+#: src/esx/esx_vi_types.c:1565
 msgid "MethodFault is missing 'type' property"
 msgstr "MethodFault 缺少 'type' 属性"
 
-#: src/esx/esx_vi_types.c:1768
+#: src/esx/esx_vi_types.c:1660
 msgid "ManagedObjectReference is missing 'type' property"
 msgstr "ManagedObjectReference 缺少 'type' 属性"
 
-#: src/esx/esx_vi_types.c:1846
+#: src/esx/esx_vi_types.c:679 src/esx/esx_vi_types.c:1738
 #, c-format
 msgid "%s is missing 'type' property"
 msgstr "%s 缺少 'type' 属性"
 
-#: src/fdstream.c:96 src/fdstream.c:133 src/fdstream.c:215 src/fdstream.c:377
-#: src/fdstream.c:429
+#: src/fdstream.c:75 src/fdstream.c:111 src/fdstream.c:192 src/fdstream.c:302
+#: src/fdstream.c:354
 msgid "stream is not open"
 msgstr "流没有打开"
 
-#: src/fdstream.c:103 src/fdstream.c:140
+#: src/fdstream.c:82 src/fdstream.c:118
 msgid "stream does not have a callback registered"
 msgstr "流没有注册的 callback"
 
-#: src/fdstream.c:222
+#: src/fdstream.c:199
 msgid "stream already has a callback registered"
 msgstr "流已有注册的 callback"
 
-#: src/fdstream.c:232
+#: src/fdstream.c:209
 msgid "cannot register file watch on stream"
 msgstr "无法在流中注册文件关注"
 
-#: src/fdstream.c:311
+#: src/fdstream.c:256
 #, c-format
 msgid "I/O helper exited with status %d"
 msgstr "退出 I/O 帮助程序，状态为 %d。"
 
-#: src/fdstream.c:315
+#: src/fdstream.c:260
 msgid "I/O helper exited abnormally"
 msgstr "I/O 帮助程序正常退出"
 
-#: src/fdstream.c:371
+#: src/fdstream.c:296
 msgid "Too many bytes to write to stream"
 msgstr "要写入流中的字节太多"
 
-#: src/fdstream.c:386 src/fdstream.c:405
+#: src/fdstream.c:311 src/fdstream.c:330
 msgid "cannot write to stream"
 msgstr "无法写入流"
 
-#: src/fdstream.c:423
+#: src/fdstream.c:348
 msgid "Too many bytes to read from stream"
 msgstr "要从流中读取的字节太多"
 
-#: src/fdstream.c:455
+#: src/fdstream.c:380
 msgid "cannot read from stream"
 msgstr "无法从读取流"
 
-#: src/fdstream.c:501 src/locking/lock_daemon.c:142
-#: src/locking/lock_daemon.c:185 src/qemu/qemu_capabilities.c:2823
-#: src/util/vireventpoll.c:682 src/util/virnodesuspend.c:66
-#: src/util/virobject.c:221
+#: src/fdstream.c:428 src/rpc/virnetsocket.c:139 src/util/event_poll.c:671
 msgid "Unable to initialize mutex"
 msgstr "无法初始化互斥"
 
-#: src/fdstream.c:531
+#: src/fdstream.c:458
 msgid "Unable to open UNIX socket"
 msgstr "无法打开 UNIX  插槽"
 
-#: src/fdstream.c:574
+#: src/fdstream.c:501
 msgid "UNIX domain sockets are not supported on this platform"
 msgstr "这个平台不支持 UNIX 域插槽"
 
-#: src/fdstream.c:604
+#: src/fdstream.c:529
 #, c-format
 msgid "Unable to open stream for '%s'"
 msgstr "无法为 '%s' 打开流"
 
-#: src/fdstream.c:611
+#: src/fdstream.c:536
 #, c-format
 msgid "Unable to access stream for '%s'"
 msgstr "无法为 '%s' 访问流"
 
-#: src/fdstream.c:619 src/util/iohelper.c:65
+#: src/fdstream.c:544 src/util/iohelper.c:63
 #, c-format
 msgid "Unable to seek %s to %llu"
 msgstr "无法寻求 %s 到 %llu"
 
-#: src/fdstream.c:636
+#: src/fdstream.c:561
 #, c-format
 msgid "%s: Cannot request read and write flags together"
 msgstr "%s：无法同时请求 read 和 write 标签"
 
-#: src/fdstream.c:643 src/lxc/lxc_process.c:1157
+#: src/fdstream.c:568 src/lxc/lxc_driver.c:1837
 msgid "Unable to create pipe"
 msgstr "无法创建管道"
 
-#: src/fdstream.c:695
+#: src/fdstream.c:619
 #, c-format
 msgid "Attempt to create %s without specifying mode"
 msgstr "尝试在不指定模式的情况下创建 %s"
 
-#: src/hyperv/hyperv_driver.c:165
+#: src/hyperv/hyperv_driver.c:171
 msgid "Could not create openwsman client"
 msgstr "无法创建 openwsman 客户端"
 
-#: src/hyperv/hyperv_driver.c:171
+#: src/hyperv/hyperv_driver.c:177
 msgid "Could not initialize openwsman transport"
 msgstr "无法初始化 openwsman 传送"
 
-#: src/hyperv/hyperv_driver.c:192
+#: src/hyperv/hyperv_driver.c:198
 #, c-format
 msgid "%s is not a Hyper-V server"
 msgstr "%s 不是 Hyper-V 服务器"
 
-#: src/hyperv/hyperv_driver.c:249 src/hyperv/hyperv_driver.c:286
-#: src/hyperv/hyperv_driver.c:305
+#: src/hyperv/hyperv_driver.c:258 src/hyperv/hyperv_driver.c:300
+#: src/hyperv/hyperv_driver.c:319
 #, c-format
 msgid "Could not lookup %s"
 msgstr "无法查找 %s"
 
-#: src/hyperv/hyperv_driver.c:332
+#: src/hyperv/hyperv_driver.c:346
 #, c-format
 msgid "CPU model %s too long for destination"
 msgstr "CPU 型号 %s 对于目标服务器来说太长"
 
-#: src/hyperv/hyperv_driver.c:496 src/hyperv/hyperv_wmi.c:675
+#: src/hyperv/hyperv_driver.c:510 src/hyperv/hyperv_wmi.c:679
 #, c-format
 msgid "No domain with UUID %s"
 msgstr "没有 UUID 为 %s 的域"
 
-#: src/hyperv/hyperv_driver.c:529
+#: src/hyperv/hyperv_driver.c:543
 #, c-format
 msgid "No domain with name %s"
 msgstr "没有名为 %s 的域"
 
-#: src/hyperv/hyperv_driver.c:557
+#: src/hyperv/hyperv_driver.c:571
 msgid "Domain is not active"
 msgstr "域不活跃"
 
-#: src/hyperv/hyperv_driver.c:586
+#: src/hyperv/hyperv_driver.c:600
 msgid "Domain is not paused"
 msgstr "域没有暂停"
 
-#: src/hyperv/hyperv_driver.c:618 src/hyperv/hyperv_driver.c:1155
+#: src/hyperv/hyperv_driver.c:632 src/hyperv/hyperv_driver.c:1193
 msgid "Domain is not active or is in state transition"
 msgstr "域不活跃或者处于状态转换中"
 
-#: src/hyperv/hyperv_driver.c:689 src/hyperv/hyperv_driver.c:710
-#: src/hyperv/hyperv_driver.c:732 src/hyperv/hyperv_driver.c:829
-#: src/hyperv/hyperv_driver.c:850 src/hyperv/hyperv_driver.c:872
+#: src/hyperv/hyperv_driver.c:707 src/hyperv/hyperv_driver.c:728
+#: src/hyperv/hyperv_driver.c:750 src/hyperv/hyperv_driver.c:849
+#: src/hyperv/hyperv_driver.c:870 src/hyperv/hyperv_driver.c:892
 #, c-format
 msgid "Could not lookup %s for domain %s"
 msgstr "无法为渔 %s 查找 %s"
 
-#: src/hyperv/hyperv_driver.c:1032
+#: src/hyperv/hyperv_driver.c:1070
 msgid "Domain is already active or is in state transition"
 msgstr "域已激活或者处于状态转换中"
 
-#: src/hyperv/hyperv_driver.c:1210
+#: src/hyperv/hyperv_driver.c:1248
 msgid "Domain has no managed save image"
 msgstr "域没有管理的保存映像"
 
-#: src/hyperv/hyperv_driver.c:1404
+#: src/hyperv/hyperv_driver.c:1308
 #, c-format
 msgid "openwsman error: %s"
 msgstr "openwsman 错误：%s"
@@ -7637,7 +7795,7 @@
 "SOAP fault during %s: code '%s', subcode '%s', reason '%s', detail '%s'"
 msgstr "%s 过程中的 SOAP 错误：代码 '%s'，子代码 '%s'，理由 '%s'，详情 '%s'"
 
-#: src/hyperv/hyperv_wmi.c:144 src/hyperv/hyperv_wmi.c:422
+#: src/hyperv/hyperv_wmi.c:144 src/hyperv/hyperv_wmi.c:426
 msgid "Could not initialize options"
 msgstr "无法初始化选项"
 
@@ -7661,111 +7819,111 @@
 msgid "Could not deserialize pull response item"
 msgstr "无法反序列化 pull 响应项目"
 
-#: src/hyperv/hyperv_wmi.c:256 src/hyperv/hyperv_wmi.c:297
+#: src/hyperv/hyperv_wmi.c:258 src/hyperv/hyperv_wmi.c:299
 msgid "Could not free deserialized data"
 msgstr "无法释放反序列化的数据"
 
-#: src/hyperv/hyperv_wmi.c:317
+#: src/hyperv/hyperv_wmi.c:319
 msgid "Completed with no error"
 msgstr "完成且没有错误"
 
-#: src/hyperv/hyperv_wmi.c:320 src/hyperv/hyperv_wmi.c:356
+#: src/hyperv/hyperv_wmi.c:322 src/hyperv/hyperv_wmi.c:358
 msgid "Not supported"
 msgstr "尚不支持"
 
-#: src/hyperv/hyperv_wmi.c:326
+#: src/hyperv/hyperv_wmi.c:328
 msgid "Cannot complete within timeout period"
 msgstr "无法在超时限制时间内完成"
 
-#: src/hyperv/hyperv_wmi.c:329 src/hyperv/hyperv_wmi.c:350
+#: src/hyperv/hyperv_wmi.c:331 src/hyperv/hyperv_wmi.c:352
 msgid "Failed"
 msgstr "已失败"
 
-#: src/hyperv/hyperv_wmi.c:332 src/hyperv/hyperv_wmi.c:365
+#: src/hyperv/hyperv_wmi.c:334 src/hyperv/hyperv_wmi.c:367
 msgid "Invalid parameter"
 msgstr "无效参数"
 
-#: src/hyperv/hyperv_wmi.c:335
+#: src/hyperv/hyperv_wmi.c:337
 msgid "In use"
 msgstr "使用者"
 
-#: src/hyperv/hyperv_wmi.c:338
+#: src/hyperv/hyperv_wmi.c:340
 msgid "Transition started"
 msgstr "传输开始"
 
-#: src/hyperv/hyperv_wmi.c:341
+#: src/hyperv/hyperv_wmi.c:343
 msgid "Invalid state transition"
 msgstr "无效状态转换"
 
-#: src/hyperv/hyperv_wmi.c:344
+#: src/hyperv/hyperv_wmi.c:346
 msgid "Timeout parameter not supported"
 msgstr "还不支持 timeout 参数"
 
-#: src/hyperv/hyperv_wmi.c:347
+#: src/hyperv/hyperv_wmi.c:349
 msgid "Busy"
 msgstr "忙碌"
 
-#: src/hyperv/hyperv_wmi.c:353
+#: src/hyperv/hyperv_wmi.c:355
 msgid "Access denied"
 msgstr "访问被拒绝"
 
-#: src/hyperv/hyperv_wmi.c:359
+#: src/hyperv/hyperv_wmi.c:361
 msgid "Status is unknown"
 msgstr "未知状态"
 
-#: src/hyperv/hyperv_wmi.c:362
+#: src/hyperv/hyperv_wmi.c:364
 msgid "Timeout"
 msgstr "超时"
 
-#: src/hyperv/hyperv_wmi.c:368
+#: src/hyperv/hyperv_wmi.c:370
 msgid "System is in use"
 msgstr "系统使用中"
 
-#: src/hyperv/hyperv_wmi.c:371
+#: src/hyperv/hyperv_wmi.c:373
 msgid "Invalid state for this operation"
 msgstr "这个操作的无效状态"
 
-#: src/hyperv/hyperv_wmi.c:374
+#: src/hyperv/hyperv_wmi.c:376
 msgid "Incorrect data type"
 msgstr "无效数据类型"
 
-#: src/hyperv/hyperv_wmi.c:377
+#: src/hyperv/hyperv_wmi.c:379
 msgid "System is not available"
 msgstr "系统不可用"
 
-#: src/hyperv/hyperv_wmi.c:380 tools/virsh.c:2202 tools/virsh.c:2247
-#: tools/virsh.c:2793 tools/virsh.c:2799 tools/virsh-domain.c:4615
-#: tools/virsh-domain.c:6250 tools/virsh-pool.c:1319 tools/virsh-pool.c:1413
-#: tools/virsh-snapshot.c:447 tools/virsh-volume.c:1548
+#: src/hyperv/hyperv_wmi.c:382 tools/virsh.c:3006 tools/virsh.c:9228
+#: tools/virsh.c:9315 tools/virsh.c:10697 tools/virsh.c:13296
+#: tools/virsh.c:13835 tools/virsh.c:13978 tools/virsh.c:16897
+#: tools/virsh.c:17006 tools/virsh.c:17421 tools/virsh.c:17427
 msgid "Out of memory"
 msgstr "内存溢出"
 
-#: src/hyperv/hyperv_wmi.c:383
+#: src/hyperv/hyperv_wmi.c:385
 msgid "Unknown return code"
 msgstr "未知的返回代码"
 
-#: src/hyperv/hyperv_wmi.c:442 src/hyperv/hyperv_wmi.c:459
-#: src/hyperv/hyperv_wmi.c:476
+#: src/hyperv/hyperv_wmi.c:446 src/hyperv/hyperv_wmi.c:463
+#: src/hyperv/hyperv_wmi.c:480
 #, c-format
 msgid "Could not lookup %s for %s invocation"
 msgstr "无法为 %s 调用查找 %s"
 
-#: src/hyperv/hyperv_wmi.c:449
+#: src/hyperv/hyperv_wmi.c:453
 #, c-format
 msgid "Could not parse return code from '%s'"
 msgstr "无法解析 '%s' 的返回代码"
 
-#: src/hyperv/hyperv_wmi.c:501
+#: src/hyperv/hyperv_wmi.c:505
 #, c-format
 msgid "Concrete job for %s invocation is in error state"
 msgstr "%s 调用的具体任务处于 error 状态"
 
-#: src/hyperv/hyperv_wmi.c:507
+#: src/hyperv/hyperv_wmi.c:511
 #, c-format
 msgid "Concrete job for %s invocation is in unknown state"
 msgstr "%s 调用的具体任务处于 unknown 状态"
 
-#: src/hyperv/hyperv_wmi.c:514
+#: src/hyperv/hyperv_wmi.c:518
 #, c-format
 msgid "Invocation of %s returned an error: %s (%d)"
 msgstr "%s 调用返回一个出错信息：%s（%d）"
@@ -7782,25 +7940,17 @@
 msgid "failed to re-init netcf"
 msgstr ""
 
-#: src/interface/interface_backend_netcf.c:229
-#: src/interface/interface_backend_netcf.c:347
-#: src/interface/interface_backend_netcf.c:443
-#: src/interface/interface_backend_netcf.c:626
-#: src/interface/interface_backend_netcf.c:720
+#: src/interface/netcf_driver.c:110 src/interface/netcf_driver.c:280
 #, c-format
 msgid "couldn't find interface named '%s': %s%s%s"
 msgstr "无法找到名为 '%s' 的接口：%s%s%s"
 
-#: src/interface/interface_backend_netcf.c:234
-#: src/interface/interface_backend_netcf.c:725
-#: src/interface/interface_backend_udev.c:493
-#: src/interface/interface_backend_udev.c:1018
-#: src/interface/interface_backend_udev.c:1150
+#: src/interface/netcf_driver.c:115 src/interface/netcf_driver.c:285
 #, c-format
 msgid "couldn't find interface named '%s'"
 msgstr "无法找到名为 '%s' 的接口"
 
-#: src/interface/interface_backend_netcf.c:253
+#: src/interface/netcf_driver.c:556
 #, c-format
 msgid "failed to get status of interface %s: %s%s%s"
 msgstr "获取接口 %s 状态失败：%s%s%s"
@@ -7812,35 +7962,31 @@
 msgid "failed to get number of host interfaces: %s%s%s"
 msgstr "获取主机接口数失败：%s%s%s"
 
-#: src/interface/interface_backend_netcf.c:331
-#: src/interface/interface_backend_netcf.c:422
-#: src/interface/interface_backend_netcf.c:609
+#: src/interface/netcf_driver.c:214
 #, c-format
 msgid "failed to list host interfaces: %s%s%s"
 msgstr "列出主机接口失败：%s%s%s"
 
-#: src/interface/interface_backend_netcf.c:761
+#: src/interface/netcf_driver.c:313
 #, c-format
 msgid "couldn't find interface with MAC address '%s': %s%s%s"
 msgstr "无法找到 MAC 地址为 '%s' 的接口：%s%s%s"
 
-#: src/interface/interface_backend_netcf.c:768
-#: src/interface/interface_backend_udev.c:546
+#: src/interface/netcf_driver.c:320
 #, c-format
 msgid "couldn't find interface with MAC address '%s'"
 msgstr "无法找到 MAC 地址为 '%s' 的接口"
 
-#: src/interface/interface_backend_netcf.c:774
+#: src/interface/netcf_driver.c:326
 msgid "multiple interfaces with matching MAC address"
 msgstr "与 MAC 地址匹配的多个接口"
 
-#: src/interface/interface_backend_netcf.c:822
-#: src/interface/interface_backend_netcf.c:885
+#: src/interface/netcf_driver.c:366 src/interface/netcf_driver.c:423
 #, c-format
 msgid "could not get interface XML description: %s%s%s"
 msgstr "无法获得接口 XML 描述：%s%s%s"
 
-#: src/interface/interface_backend_netcf.c:927
+#: src/interface/netcf_driver.c:457
 #, c-format
 msgid "failed to undefine interface %s: %s%s%s"
 msgstr "无法取消定义接口 %s：%s%s%s"
@@ -7849,7 +7995,7 @@
 msgid "interface is already running"
 msgstr ""
 
-#: src/interface/interface_backend_netcf.c:980
+#: src/interface/netcf_driver.c:491
 #, c-format
 msgid "failed to create (start) interface %s: %s%s%s"
 msgstr "生成（启动）接口 %s 失败：%s%s%s"
@@ -7858,22 +8004,22 @@
 msgid "interface is not running"
 msgstr ""
 
-#: src/interface/interface_backend_netcf.c:1033
+#: src/interface/netcf_driver.c:525
 #, c-format
 msgid "failed to destroy (stop) interface %s: %s%s%s"
 msgstr "销毁（停止）接口 %s 失败：%s%s%s"
 
-#: src/interface/interface_backend_netcf.c:1098
+#: src/interface/netcf_driver.c:585
 #, c-format
 msgid "failed to begin transaction: %s%s%s"
 msgstr "开始传输失败：%s%s%s"
 
-#: src/interface/interface_backend_netcf.c:1124
+#: src/interface/netcf_driver.c:608
 #, c-format
 msgid "failed to commit transaction: %s%s%s"
 msgstr "提交传输失败：%s%s%s"
 
-#: src/interface/interface_backend_netcf.c:1150
+#: src/interface/netcf_driver.c:631
 #, c-format
 msgid "failed to rollback transaction: %s%s%s"
 msgstr "撤销传输失败：%s%s%s"
@@ -8075,378 +8221,382 @@
 msgid "read only access prevents %s"
 msgstr ""
 
-#: src/libvirt.c:363
-msgid "libvirt.so is not safe to use from setuid programs"
-msgstr ""
-
-#: src/libvirt.c:548 src/libvirt.c:576 src/libvirt.c:604 src/libvirt.c:632
-#: src/libvirt.c:660 src/libvirt.c:688 src/libvirt.c:718 src/libvirt.c:747
+#: src/libvirt.c:586 src/libvirt.c:619 src/libvirt.c:652 src/libvirt.c:685
+#: src/libvirt.c:718 src/libvirt.c:751 src/libvirt.c:787 src/libvirt.c:827
 #, c-format
 msgid "Too many drivers, cannot register %s"
 msgstr "驱动程序过多，无法注册 %s"
 
-#: src/libvirt.c:789
+#: src/libvirt.c:376
+msgid "libvirt.so is not safe to use from setuid programs"
+msgstr ""
+
+#: src/libvirt.c:747
 #, c-format
 msgid "Initialization of %s state driver failed: %s"
 msgstr "%s 的初始化状态驱动器失败：%s"
 
-#: src/libvirt.c:791
+#: src/libvirt.c:749
 msgid "Unknown problem"
 msgstr "未知问题"
 
-#: src/libvirt.c:985
+#: src/libvirt.c:1002
 msgid "Expected a list for 'uri_aliases' config parameter"
 msgstr "应为 'uri_aliases' 配置参数列表"
 
-#: src/libvirt.c:997
+#: src/libvirt.c:1014
 msgid "Expected a string for 'uri_aliases' config parameter list entry"
 msgstr "应为 'uri_aliases' 配置参数列表条目字符串"
 
-#: src/libvirt.c:1003
+#: src/libvirt.c:1020
 #, c-format
 msgid ""
 "Malformed 'uri_aliases' config entry '%s', expected 'alias=uri://host/path'"
 msgstr "畸形的 'uri_aliases' 配置条目 '%s'，应为 'alias=uri://host/path'。"
 
-#: src/libvirt.c:1011
+#: src/libvirt.c:969
 #, c-format
 msgid ""
 "Malformed 'uri_aliases' config entry '%s', aliases may only contain 'a-Z, 0-"
 "9, _, -'"
 msgstr "畸形的 'uri_aliases' 配置条目 '%s'，aliases 只能包含 'a-Z, 0-9, _, -'。"
 
-#: src/libvirt.c:1063
+#: src/libvirt.c:1021
 msgid "Expected a string for 'uri_default' config parameter"
 msgstr "应为 'uri_default' 配置参数字符串"
 
-#: src/libvirt.c:1098
+#: src/libvirt.c:1056
 msgid "An explicit URI must be provided when setuid"
 msgstr ""
 
-#: src/libvirt.c:1182
+#: src/libvirt.c:1189
 #, c-format
 msgid "libvirt was built without the '%s' driver"
 msgstr "在没有 '%s' 驱动程序的情况下构建 libvirt"
 
-#: src/libvirt.c:2135 src/libvirt.c:10828 src/libvirt.c:12563
-#: src/libvirt.c:15173 src/libvirt.c:16720
+#: src/libvirt.c:2091 src/libvirt.c:10858 src/libvirt.c:12593
+#: src/libvirt.c:15205 src/libvirt.c:16752
 #, c-format
 msgid "uuidstr in %s must be a valid UUID"
 msgstr "%s 中的 uuidstr 必须是有效 UUID"
 
-#: src/libvirt.c:2580 src/libvirt.c:2671
+#: src/libvirt.c:2482 src/libvirt.c:2576
 msgid "could not build absolute output file path"
 msgstr "无法构建绝对输出文件路径"
 
-#: src/libvirt.c:2659 src/libvirt.c:2786 src/libvirt.c:2927
+#: src/libvirt.c:2565 src/libvirt.c:2709 src/libvirt.c:2863
+#: src/libvirt.c:16017 src/libvirt.c:16846
 msgid "running and paused flags are mutually exclusive"
 msgstr "运行中和暂停的标签彼此互斥"
 
-#: src/libvirt.c:2721 src/libvirt.c:2798 src/libvirt.c:2863 src/libvirt.c:2939
+#: src/libvirt.c:2635 src/libvirt.c:2720 src/libvirt.c:2791 src/libvirt.c:2874
 msgid "could not build absolute input file path"
 msgstr "无法构建绝对输入文件路径"
 
-#: src/libvirt.c:2852
+#: src/libvirt.c:2780
 msgid "virDomainSaveImageGetXMLDesc with secure flag"
 msgstr "有安全标签的 virDomainSaveImageGetXMLDesc"
 
-#: src/libvirt.c:3003
+#: src/libvirt.c:2946
 msgid "crash and live flags are mutually exclusive"
 msgstr "crash 和 live 标签彼此互斥"
 
-#: src/libvirt.c:3009
+#: src/libvirt.c:2952
 msgid "crash and reset flags are mutually exclusive"
 msgstr "crash 和 reset 标签彼此互斥"
 
-#: src/libvirt.c:3015
+#: src/libvirt.c:2958
 msgid "live and reset flags are mutually exclusive"
 msgstr "live 和 reset 标签彼此互斥"
 
-#: src/libvirt.c:3026
+#: src/libvirt.c:2969
 msgid "could not build absolute core file path"
 msgstr "无法构建绝对 core 文件路径"
 
-#: src/libvirt.c:3086 src/libvirt.c:19196 src/libvirt.c:19260
+#: src/libvirt.c:3042 src/libvirt.c:19229 src/libvirt.c:19293
 #, c-format
 msgid "stream in %s must match connection of domain '%s'"
 msgstr ""
 
-#: src/libvirt.c:3485
+#: src/libvirt.c:3444
 #, c-format
 msgid "result too large: %llu"
 msgstr "结果太大：%llu"
 
-#: src/libvirt.c:3723
+#: src/libvirt.c:3603
 #, c-format
 msgid "string parameter name '%.*s' too long"
 msgstr "字符串参数名称 '%.*s' 太长"
 
-#: src/libvirt.c:3732
+#: src/libvirt.c:3613
 #, c-format
 msgid "NULL string parameter '%s'"
 msgstr "NULL 字符串参数 '%s'"
 
-#: src/libvirt.c:3738
+#: src/libvirt.c:3620
 #, c-format
 msgid "string parameter '%s' unsupported"
 msgstr "不支持字符串参数 '%s'"
 
-#: src/libvirt.c:3861 src/libvirt.c:4105 src/libvirt.c:7633 src/libvirt.c:9406
-#: src/libvirt.c:9613 src/libvirt.c:9743 src/libvirt.c:10097
-#: src/libvirt.c:20159
+#: src/libvirt.c:3820 src/libvirt.c:4064 src/libvirt.c:7602 src/libvirt.c:9437
+#: src/libvirt.c:9643 src/libvirt.c:9773 src/libvirt.c:10127
+#: src/libvirt.c:20193
 #, c-format
 msgid "flags 'affect live' and 'affect config' in %s are mutually exclusive"
 msgstr "%s 中的 'affect live' 和 'affect config' 标签彼此互斥"
 
-#: src/libvirt.c:4292
+#: src/libvirt.c:4092
 msgid "virDomainGetXMLDesc with secure flag"
 msgstr "带安全标志的 virDomainGetXMLDesc"
 
-#: src/libvirt.c:4471
+#: src/libvirt.c:4278
 msgid "domainMigratePrepare did not set uri"
 msgstr "domainMigratePrepare 没有设定 uri"
 
-#: src/libvirt.c:4594 src/qemu/qemu_migration.c:3570
+#: src/libvirt.c:4390 src/qemu/qemu_migration.c:1944
 msgid "domainMigratePrepare2 did not set uri"
 msgstr "domainMigratePrepare2 没有设定 uri"
 
-#: src/libvirt.c:4795 src/qemu/qemu_migration.c:3776
+#: src/libvirt.c:4588 src/libvirt.c:4843 src/qemu/qemu_migration.c:3662
+#: src/qemu/qemu_migration.c:3909
+msgid "finish step ignored that migration was cancelled"
+msgstr ""
+
+#: src/libvirt.c:4536 src/qemu/qemu_migration.c:2082
 msgid "domainMigratePrepare3 did not set uri"
 msgstr "domainMigratePrepare3 没有设定 uri"
 
-#: src/libvirt.c:5010
+#: src/libvirt.c:4980
 #, c-format
 msgid "unable to parse server from dconnuri in %s"
 msgstr "无法为 %s 中的 dconnuri 解析服务器"
 
-#: src/libvirt.c:5032 src/libvirt.c:5126 src/libvirt.c:5550 src/libvirt.c:5562
-#: src/libvirt.c:5736 src/libvirt.c:5749
+#: src/libvirt.c:4712 src/libvirt.c:4784 src/libvirt.c:5164 src/libvirt.c:5176
 msgid "Unable to change target guest XML during migration"
 msgstr "无法在迁移过程中更改目标虚拟机 XML"
 
-#: src/libvirt.c:5038
+#: src/libvirt.c:4717
 msgid "Unable to override peer2peer migration URI"
 msgstr "无法覆盖点对点迁移 URI"
 
-#: src/libvirt.c:5245 src/libvirt.c:5471 src/libvirt.c:5648 src/libvirt.c:5865
-#: src/libvirt.c:6022 src/libvirt.c:6131
+#: src/libvirt.c:5214 src/libvirt.c:5440 src/libvirt.c:5617 src/libvirt.c:5834
+#: src/libvirt.c:5991 src/libvirt.c:6100
 #, c-format
 msgid ""
 "flags 'shared disk' and 'shared incremental' in %s are mutually exclusive"
 msgstr ""
 
-#: src/libvirt.c:5255 src/libvirt.c:5481 src/libvirt.c:5664 src/libvirt.c:5875
+#: src/libvirt.c:5224 src/libvirt.c:5450 src/libvirt.c:5633 src/libvirt.c:5844
 msgid "offline migration is not supported by the source host"
 msgstr "源主机不支持离线迁移"
 
-#: src/libvirt.c:5262 src/libvirt.c:5488 src/libvirt.c:5671
-#: src/qemu/qemu_migration.c:3993
+#: src/libvirt.c:5231 src/libvirt.c:5457 src/libvirt.c:5640
+#: src/qemu/qemu_migration.c:4050
 msgid "offline migration is not supported by the destination host"
 msgstr "目的地主机不支持离线迁移"
 
-#: src/libvirt.c:5302 src/libvirt.c:5525 src/libvirt.c:5686
+#: src/libvirt.c:4938 src/libvirt.c:5139
 msgid "cannot enforce change protection"
 msgstr "无法加强更改保护"
 
-#: src/libvirt.c:5308 src/libvirt.c:5531
+#: src/libvirt.c:4944 src/libvirt.c:5145
 msgid "cannot perform tunnelled migration without using peer2peer flag"
 msgstr "无法在不使用 peer2peer 标签的情况下执行隧道迁移"
 
-#: src/libvirt.c:5655
+#: src/libvirt.c:5624
 msgid "use virDomainMigrateToURI3 for peer-to-peer migration"
 msgstr "使用 virDomainMigrateToURI3 进行点对点迁移"
 
-#: src/libvirt.c:5706 src/qemu/qemu_migration.c:3986
+#: src/libvirt.c:5675 src/qemu/qemu_migration.c:4043
 msgid ""
 "Migration APIs with extensible parameters are not supported but extended "
 "parameters were passed"
 msgstr "不支持使用可扩展参数迁移 APIs，但可传递可扩展的参数。"
 
-#: src/libvirt.c:5902 src/libvirt.c:6050
+#: src/libvirt.c:5871 src/libvirt.c:6019
 msgid "direct migration is not supported by the connection driver"
 msgstr "连接驱动程序不支持直接迁移"
 
-#: src/libvirt.c:6155
+#: src/libvirt.c:6124
 msgid "Peer-to-peer migration is not supported by the connection driver"
 msgstr "连接驱动程序不支持点对点迁移"
 
-#: src/libvirt.c:6173
+#: src/libvirt.c:6142
 msgid ""
 "Peer-to-peer migration with extensible parameters is not supported but "
 "extended parameters were passed"
 msgstr "不支持使用可扩展参数的点对点迁移，但可传递可扩展的参数。"
 
-#: src/libvirt.c:6183
+#: src/libvirt.c:6152
 msgid "Direct migration is not supported by the connection driver"
 msgstr "连接驱动程序不支持直接迁移"
 
-#: src/libvirt.c:6190
+#: src/libvirt.c:6159
 msgid "Direct migration does not support extensible parameters"
 msgstr "直接迁移不支持可扩展参数"
 
-#: src/libvirt.c:6441 src/libvirt.c:6587 src/libvirt.c:6870
+#: src/libvirt.c:6410 src/libvirt.c:6556 src/libvirt.c:6839
 #, c-format
 msgid "conn in %s must match stream connection"
 msgstr "%s 中的 conn 必须与流连接匹配"
 
-#: src/libvirt.c:7171
+#: src/libvirt.c:7140
 #, c-format
 msgid "cpuNum in %s only accepts %d as a negative value"
 msgstr "%s 中的 cpuNum 只接受负数 %d"
 
-#: src/libvirt.c:7258
+#: src/libvirt.c:7227
 #, c-format
 msgid "cellNum in %s only accepts %d as a negative value"
 msgstr "%s 中的 cellNum 只接受负数 %d"
 
-#: src/libvirt.c:7811 src/libvirt.c:7950
+#: src/libvirt.c:7782 src/libvirt.c:7923
 #, c-format
 msgid "size in %s must not exceed %zu"
 msgstr "%s 中的大小必须超过 %zu"
 
-#: src/libvirt.c:8397
+#: src/libvirt.c:8370
 #, c-format
 msgid "flags in %s must include VIR_MEMORY_VIRTUAL or VIR_MEMORY_PHYSICAL"
 msgstr "%s 中的标签必须包括 VIR_MEMORY_VIRTUAL 或者 VIR_MEMORY_PHYSICAL"
 
-#: src/libvirt.c:9141
+#: src/libvirt.c:9168
 #, c-format
 msgid "nkeycodes in %s must be <= %d"
 msgstr ""
 
-#: src/libvirt.c:9333
+#: src/libvirt.c:9360
 #, c-format
 msgid ""
 "flags 'VIR_DOMAIN_VCPU_MAXIMUM' and 'VIR_DOMAIN_VCPU_GUEST' in '%s' are "
 "mutually exclusive"
 msgstr "'%s' 中的标签 'VIR_DOMAIN_VCPU_MAXIMUM' 和 'VIR_DOMAIN_VCPU_GUEST' 为互斥"
 
-#: src/libvirt.c:9342 src/libvirt.c:9469 src/libvirt.c:9541
+#: src/libvirt.c:9369 src/libvirt.c:9499 src/libvirt.c:9571
 #, c-format
 msgid "input too large: %u"
 msgstr "输入太大：%u"
 
-#: src/libvirt.c:9604 src/libvirt.c:9816
+#: src/libvirt.c:9634 src/libvirt.c:9846
 #, c-format
 msgid "input too large: %d * %d"
 msgstr "输入太大：%d * %d"
 
-#: src/libvirt.c:10019
+#: src/libvirt.c:10049
 #, c-format
 msgid "metadata title in %s can't contain newlines"
 msgstr "%s 中的元数据标题不能包含换行符"
 
-#: src/libvirt.c:13667 src/libvirt.c:13733
+#: src/libvirt.c:13698 src/libvirt.c:13764
 #, c-format
 msgid "stream in %s must match connection of volume '%s'"
 msgstr ""
 
-#: src/libvirt.c:14108
+#: src/libvirt.c:14140
 #, c-format
 msgid "capacity in %s cannot be zero without 'delta' or 'shrink' flags set"
 msgstr "不设定 'delta' 或者 'shrink' 标签 %s 中的容量不能为 0"
 
-#: src/libvirt.c:15917
+#: src/libvirt.c:14269
 msgid "data sources cannot be used for non-blocking streams"
 msgstr "不能为非块流使用数据源"
 
-#: src/libvirt.c:16010
+#: src/libvirt.c:14371
 msgid "data sinks cannot be used for non-blocking streams"
 msgstr "不能为非块流使用数据漏"
 
-#: src/libvirt.c:17622
+#: src/libvirt.c:17655
 #, c-format
 msgid "domain '%s' in %s must match connection"
 msgstr ""
 
-#: src/libvirt.c:17631 src/libvirt.c:17751
+#: src/libvirt.c:17664 src/libvirt.c:17784
 #, c-format
 msgid "eventID in %s must be less than %d"
 msgstr "%s 中的 eventID 不得小于 %d"
 
-#: src/libvirt.c:17741
+#: src/libvirt.c:17774
 #, c-format
 msgid "network '%s' in %s must match connection"
 msgstr ""
 
-#: src/libvirt.c:17857 src/libvirt.c:19008
+#: src/libvirt.c:17890 src/libvirt.c:19041
 #, c-format
 msgid "running and paused flags in %s are mutually exclusive"
 msgstr "%s 运行中和暂停的标签彼此互斥"
 
-#: src/libvirt.c:18152
+#: src/libvirt.c:18185
 #, c-format
 msgid "use of 'current' flag in %s requires 'redefine' flag"
 msgstr "%s 中使用的 'current' 标签需要 'redefine' 标签"
 
-#: src/libvirt.c:18160
+#: src/libvirt.c:18193
 #, c-format
 msgid "'redefine' and 'no metadata' flags in %s are mutually exclusive"
 msgstr "%s 中的 'redefine' 和 'no metadata' 标签互斥"
 
-#: src/libvirt.c:18168
+#: src/libvirt.c:18201
 #, c-format
 msgid "'redefine' and 'halt' flags in %s are mutually exclusive"
 msgstr "%s 中的 'redefine' 和 'halt' 标签互斥"
 
-#: src/libvirt.c:18218
+#: src/libvirt.c:16354
 msgid "virDomainSnapshotGetXMLDesc with secure flag"
 msgstr "使用 secure 标签的 virDomainSnapshotGetXMLDesc"
 
-#: src/libvirt.c:19070
+#: src/libvirt.c:19103
 #, c-format
 msgid "children and children_only flags in %s are mutually exclusive"
 msgstr "%s 中的 children 和 children_only 标签互斥"
 
-#: src/libvirt.c:19626
+#: src/libvirt.c:19660
 #, c-format
 msgid "use of flags in %s requires a copy job"
 msgstr "在 %s 中使用标签需要复制任务"
 
-#: src/libvirt.c:19789
+#: src/libvirt.c:17318
 #, c-format
 msgid "Unable to access file descriptor %d"
 msgstr "服务访问文件描述符 %d"
 
-#: src/libvirt.c:19795
+#: src/libvirt.c:19829
 #, c-format
 msgid "fd %d in %s must be a socket"
 msgstr "%d 中的 fd %s 必须是一个插槽"
 
-#: src/libvirt.c:19805
+#: src/libvirt.c:19839
 msgid "fd passing is not supported by this connection"
 msgstr ""
 
-#: src/libvirt.c:19957
+#: src/libvirt.c:19991
 msgid "A close callback is already registered"
 msgstr "已注册 close 回叫"
 
-#: src/libvirt.c:20010
+#: src/libvirt.c:20044
 msgid "A different callback was requested"
 msgstr "需要不同的回叫"
 
-#: src/libvirt.c:20284
+#: src/libvirt.c:20318
 #, c-format
 msgid "ncpus in %s must be 1 when start_cpu is -1"
 msgstr "start_cpu 为 -1时 %s 中的 ncpus 必须为 1"
 
-#: src/libvirt.c:20299
+#: src/libvirt.c:20333
 #, c-format
 msgid "input too large: %u * %u"
 msgstr "输入太大：%u * %u"
 
-#: src/libvirt-lxc.c:208 src/security/security_selinux.c:742
-#: src/security/security_selinux.c:849
+#: src/security/security_selinux.c:302 src/security/security_selinux.c:370
 #, c-format
 msgid "unable to get PID %d security context"
 msgstr "无法获取 PID %d 安全上下文"
 
-#: src/libvirt-lxc.c:215 src/security/security_selinux.c:856
+#: src/security/security_selinux.c:377
 #, c-format
 msgid "security label exceeds maximum length: %d"
 msgstr "安全标签超过最大长度：%d"
 
-#: src/libvirt-lxc.c:227 src/security/security_selinux.c:870
+#: src/security/security_selinux.c:390
 msgid "error calling security_getenforce()"
 msgstr "调用 security_getenforce() 失败"
 
@@ -8530,20 +8680,20 @@
 msgid "Cannot set ownerUUID data in JSON document"
 msgstr ""
 
-#: src/locking/lock_daemon.c:969
+#: src/locking/lock_daemon.c:1007
 msgid "Missing magic data in JSON document"
 msgstr ""
 
-#: src/locking/lock_daemon.c:1069
+#: src/locking/lock_daemon.c:1113
 #, c-format
 msgid "Unable to save state file %s"
 msgstr ""
 
-#: src/locking/lock_daemon.c:1076
+#: src/locking/lock_daemon.c:1120
 msgid "Unable to restart self"
 msgstr ""
 
-#: src/locking/lock_daemon.c:1094
+#: src/locking/lock_daemon.c:1138
 #, c-format
 msgid ""
 "\n"
@@ -8561,7 +8711,7 @@
 "libvirt lock management daemon:\n"
 msgstr ""
 
-#: src/locking/lock_daemon.c:1110
+#: src/locking/lock_daemon.c:1154
 #, c-format
 msgid ""
 "\n"
@@ -8578,7 +8728,7 @@
 "\n"
 msgstr ""
 
-#: src/locking/lock_daemon.c:1127
+#: src/locking/lock_daemon.c:1171
 msgid ""
 "\n"
 "  Default paths:\n"
@@ -8594,6 +8744,10 @@
 "\n"
 msgstr ""
 
+#: src/locking/lock_daemon.c:1324
+msgid "Can't determine restart state file path"
+msgstr ""
+
 #: src/locking/lock_daemon_dispatch.c:57
 #: src/locking/lock_daemon_dispatch.c:115
 #: src/locking/lock_daemon_dispatch.c:164
@@ -8636,7 +8790,7 @@
 msgid "lock owner details have already been registered"
 msgstr ""
 
-#: src/locking/lock_driver_lockd.c:106 src/locking/lock_driver_sanlock.c:106
+#: src/locking/lock_driver_sanlock.c:95
 #, c-format
 msgid "Unable to access config file %s"
 msgstr "无法访问配置文件 %s"
@@ -8688,12 +8842,12 @@
 msgid "Missing path or lockspace for lease resource"
 msgstr ""
 
-#: src/locking/lock_driver_lockd.c:704 src/locking/lock_driver_sanlock.c:905
+#: src/locking/lock_driver_sanlock.c:689
 msgid ""
 "Read/write, exclusive access, disks were present, but no leases specified"
 msgstr "读/写，独家访问，显示磁盘，但没有指定租赁。"
 
-#: src/locking/lock_driver_sanlock.c:207 src/locking/lock_driver_sanlock.c:216
+#: src/locking/lock_driver_sanlock.c:163
 #, c-format
 msgid "Lockspace path '%s' exceeded %d characters"
 msgstr "锁空间路径 '%s'超过 %d 个字符"
@@ -8705,45 +8859,42 @@
 "directory"
 msgstr "无法生成锁空间 %s：上级目录不存在或者不是一个目录"
 
-#: src/locking/lock_driver_sanlock.c:247 src/locking/lock_driver_sanlock.c:670
-#: src/util/virlockspace.c:274
+#: src/locking/lock_driver_sanlock.c:177 src/locking/lock_driver_sanlock.c:550
 #, c-format
 msgid "Unable to create lockspace %s"
 msgstr "无法生成锁空间 %s"
 
-#: src/locking/lock_driver_sanlock.c:257 src/locking/lock_driver_sanlock.c:312
-#: src/locking/lock_driver_sanlock.c:680 src/storage/storage_backend.c:294
-#: src/util/virfile.c:1814 src/util/virfile.c:2108
+#: src/storage/storage_backend.c:281 src/util/util.c:764 src/util/util.c:807
 #, c-format
 msgid "cannot chown '%s' to (%u, %u)"
 msgstr "无法将 '%s' chown 为 (%u, %u)"
 
-#: src/locking/lock_driver_sanlock.c:267 src/locking/lock_driver_sanlock.c:690
+#: src/locking/lock_driver_sanlock.c:186 src/locking/lock_driver_sanlock.c:559
 #, c-format
 msgid "Unable to query sector size %s: error %d"
 msgstr "无法查询扇区大小 %s：错误 %d"
 
-#: src/locking/lock_driver_sanlock.c:271 src/locking/lock_driver_sanlock.c:694
+#: src/locking/lock_driver_sanlock.c:190 src/locking/lock_driver_sanlock.c:563
 #, c-format
 msgid "Unable to query sector size %s"
 msgstr "无法查询扇区大小 %s"
 
-#: src/locking/lock_driver_sanlock.c:281
+#: src/locking/lock_driver_sanlock.c:200
 #, c-format
 msgid "Unable to allocate lockspace %s"
 msgstr "无法分配锁空间 %s"
 
-#: src/locking/lock_driver_sanlock.c:288
+#: src/locking/lock_driver_sanlock.c:207
 #, c-format
 msgid "Unable to save lockspace %s"
 msgstr "无法保存锁空间 %s"
 
-#: src/locking/lock_driver_sanlock.c:296
+#: src/locking/lock_driver_sanlock.c:215
 #, c-format
 msgid "Unable to initialize lockspace %s: error %d"
 msgstr "无法初始化锁空间 %s: 错误 %d"
 
-#: src/locking/lock_driver_sanlock.c:300
+#: src/locking/lock_driver_sanlock.c:219
 #, c-format
 msgid "Unable to initialize lockspace %s"
 msgstr "无法初始化锁空间 %s"
@@ -8753,191 +8904,184 @@
 msgid "cannot chmod '%s' to 0660"
 msgstr "无法使用 chmod 命令将 '%s' 改为 0660"
 
-#: src/locking/lock_driver_sanlock.c:356
+#: src/locking/lock_driver_sanlock.c:236
 #, c-format
 msgid "Unable to add lockspace %s: error %d"
 msgstr "无法添加锁空间 %s：错误 %d"
 
-#: src/locking/lock_driver_sanlock.c:360
+#: src/locking/lock_driver_sanlock.c:240
 #, c-format
 msgid "Unable to add lockspace %s"
 msgstr "无法软件锁空间 %s"
 
-#: src/locking/lock_driver_sanlock.c:414
+#: src/locking/lock_driver_sanlock.c:292
 msgid "Automatic disk lease mode enabled, but no host ID is set"
 msgstr "已弃用自动磁盘租赁模式但未设定主机 ID"
 
-#: src/locking/lock_driver_sanlock.c:456
+#: src/locking/lock_driver_sanlock.c:334
 msgid "Sanlock plugin is not initialized"
 msgstr "未初始化 Sanlock 插件"
 
-#: src/locking/lock_driver_sanlock.c:462
+#: src/locking/lock_driver_sanlock.c:340
 #, c-format
 msgid "Unsupported object type %d"
 msgstr "不支持的对象类型 %d"
 
-#: src/locking/lock_driver_sanlock.c:479 src/locking/lock_driver_sanlock.c:914
-#, c-format
-msgid "Domain name '%s' exceeded %d characters"
-msgstr "域名 '%s' 超过 %d 个字符"
-
-#: src/locking/lock_driver_sanlock.c:527
+#: src/locking/lock_driver_sanlock.c:405
 msgid "String length too small to store md5 checksum"
 msgstr "字符串太短无法保存 md5 checksum"
 
-#: src/locking/lock_driver_sanlock.c:533
+#: src/locking/lock_driver_sanlock.c:411
 msgid "Unable to compute md5 checksum"
 msgstr "无法计算 md5 checksum"
 
-#: src/locking/lock_driver_sanlock.c:563
+#: src/locking/lock_driver_sanlock.c:441
 #, c-format
 msgid "Resource name '%s' exceeds %d characters"
 msgstr "资源名 '%s' 超过 %d 个字符"
 
-#: src/locking/lock_driver_sanlock.c:572 src/locking/lock_driver_sanlock.c:632
+#: src/locking/lock_driver_sanlock.c:450 src/locking/lock_driver_sanlock.c:512
 #, c-format
 msgid "Lease path '%s' exceeds %d characters"
 msgstr "租赁路径 '%s' 超过 %d 个字符"
 
-#: src/locking/lock_driver_sanlock.c:581 src/locking/lock_driver_sanlock.c:641
+#: src/locking/lock_driver_sanlock.c:459 src/locking/lock_driver_sanlock.c:521
 #, c-format
 msgid "Resource lockspace '%s' exceeds %d characters"
 msgstr "资源锁空间 '%s' 超过 %d 个字符"
 
-#: src/locking/lock_driver_sanlock.c:615
+#: src/locking/lock_driver_sanlock.c:492
 msgid "Unexpected lock parameters for disk resource"
 msgstr "无法为磁盘资源锁定参数"
 
-#: src/locking/lock_driver_sanlock.c:704
+#: src/locking/lock_driver_sanlock.c:573
 #, c-format
 msgid "Unable to allocate lease %s"
 msgstr "无法分配租赁 %s"
 
-#: src/locking/lock_driver_sanlock.c:711
+#: src/locking/lock_driver_sanlock.c:580
 #, c-format
 msgid "Unable to save lease %s"
 msgstr "无法解析租赁 %s"
 
-#: src/locking/lock_driver_sanlock.c:719
+#: src/locking/lock_driver_sanlock.c:588
 #, c-format
 msgid "Unable to initialize lease %s: error %d"
 msgstr "无法初始化租赁 %s: 错误 %d"
 
-#: src/locking/lock_driver_sanlock.c:723
+#: src/locking/lock_driver_sanlock.c:592
 #, c-format
 msgid "Unable to initialize lease %s"
 msgstr "无法初始化租赁 %s"
 
-#: src/locking/lock_driver_sanlock.c:754
+#: src/locking/lock_driver_sanlock.c:623
 #, c-format
 msgid "Too many resources %d for object"
 msgstr "对象有太多资源 %d"
 
-#: src/locking/lock_driver_sanlock.c:809
+#: src/locking/lock_driver_sanlock.c:806
 #, c-format
 msgid "Failure action %s is not supported by sanlock"
 msgstr "sanlock 不支持动作 %s"
 
-#: src/locking/lock_driver_sanlock.c:839
+#: src/locking/lock_driver_sanlock.c:836
 #, c-format
 msgid "Sanlock helper path is longer than %d: '%s'"
 msgstr "Sanlock 帮助程序路径不得超过 %d：'%s'"
 
-#: src/locking/lock_driver_sanlock.c:845
+#: src/locking/lock_driver_sanlock.c:842
 #, c-format
 msgid "Sanlock helper arguments are longer than %d: '%s'"
 msgstr "Sanlock 帮助程序参数不得超过 %d：'%s'"
 
-#: src/locking/lock_driver_sanlock.c:854
+#: src/locking/lock_driver_sanlock.c:851
 #, c-format
 msgid "Failed to register lock failure action: error %d"
 msgstr "注册锁定失败动作失败：错误 %d"
 
-#: src/locking/lock_driver_sanlock.c:858
+#: src/locking/lock_driver_sanlock.c:855
 msgid "Failed to register lock failure action"
 msgstr "注册锁定失败动作失败"
 
-#: src/locking/lock_driver_sanlock.c:878
+#: src/locking/lock_driver_sanlock.c:875
 msgid "sanlock is too old to support lock failure action"
 msgstr "sanlock 太旧不支持锁定失败动作"
 
-#: src/locking/lock_driver_sanlock.c:925
+#: src/locking/lock_driver_sanlock.c:711
 #, c-format
 msgid "Unable to parse lock state %s: error %d"
 msgstr "无法解析锁状态 %s：错误 %d"
 
-#: src/locking/lock_driver_sanlock.c:929
+#: src/locking/lock_driver_sanlock.c:715
 #, c-format
 msgid "Unable to parse lock state %s"
 msgstr "无法解析锁状态 %s"
 
-#: src/locking/lock_driver_sanlock.c:950
+#: src/locking/lock_driver_sanlock.c:736
 #, c-format
 msgid "Failed to open socket to sanlock daemon: error %d"
 msgstr "为 sanlock 守护进程打开插槽失败：错误 %d"
 
-#: src/locking/lock_driver_sanlock.c:954
+#: src/locking/lock_driver_sanlock.c:740
 msgid "Failed to open socket to sanlock daemon"
 msgstr "为 sanlock 守护进程打开插槽失败"
 
-#: src/locking/lock_driver_sanlock.c:974
+#: src/locking/lock_driver_sanlock.c:751
 #, c-format
 msgid "Failed to acquire lock: error %d"
 msgstr "请求锁失败：错误 %d"
 
-#: src/locking/lock_driver_sanlock.c:977
+#: src/locking/lock_driver_sanlock.c:754
 msgid "Failed to acquire lock"
 msgstr "请求锁失败"
 
-#: src/locking/lock_driver_sanlock.c:998
+#: src/locking/lock_driver_sanlock.c:775
 #, c-format
 msgid "Failed to restrict process: error %d"
 msgstr "限制进程失败：错误 %d"
 
-#: src/locking/lock_driver_sanlock.c:1001
+#: src/locking/lock_driver_sanlock.c:778
 msgid "Failed to restrict process"
 msgstr "限制进程失败"
 
-#: src/locking/lock_driver_sanlock.c:1047
-#: src/locking/lock_driver_sanlock.c:1091
+#: src/locking/lock_driver_sanlock.c:824 src/locking/lock_driver_sanlock.c:867
 #, c-format
 msgid "Failed to inquire lock: error %d"
 msgstr "查询锁失败：错误 %d"
 
-#: src/locking/lock_driver_sanlock.c:1050
-#: src/locking/lock_driver_sanlock.c:1094
+#: src/locking/lock_driver_sanlock.c:827 src/locking/lock_driver_sanlock.c:870
 msgid "Failed to inquire lock"
 msgstr "查询锁失败"
 
-#: src/locking/lock_driver_sanlock.c:1062
+#: src/locking/lock_driver_sanlock.c:838
 #, c-format
 msgid "Failed to release lock: error %d"
 msgstr "释放锁失败：错误 %d"
 
-#: src/locking/lock_driver_sanlock.c:1065
+#: src/locking/lock_driver_sanlock.c:841
 msgid "Failed to release lock"
 msgstr "释放锁失败"
 
-#: src/locking/lock_manager.c:45 src/locking/lock_manager.c:53
+#: src/locking/lock_manager.c:49 src/locking/lock_manager.c:57
 #, c-format
 msgid "Missing '%s' field in lock manager driver"
 msgstr "锁管理驱动器中缺少 '%s' 字段"
 
-#: src/locking/lock_manager.c:162
+#: src/locking/lock_manager.c:146
 #, c-format
 msgid "Plugin %s not accessible"
 msgstr "插件 %s 无法访问"
 
-#: src/locking/lock_manager.c:170
+#: src/locking/lock_manager.c:154
 #, c-format
 msgid "Failed to load plugin %s: %s"
 msgstr "载入插件 %s 失败：%s"
 
-#: src/locking/lock_manager.c:177
+#: src/locking/lock_manager.c:161
 msgid "Missing plugin initialization symbol 'virLockDriverImpl'"
 msgstr "缺少插件初始化符号 'virLockDriverImpl'"
 
-#: src/locking/lock_manager.c:214
+#: src/locking/lock_manager.c:199
 msgid "this platform is missing dlopen"
 msgstr "这个平台缺少 dlopen"
 
@@ -8960,20 +9104,20 @@
 msgid "failed to convert cpumask"
 msgstr ""
 
-#: src/lxc/lxc_cgroup.c:89 src/qemu/qemu_cgroup.c:569
+#: src/lxc/lxc_cgroup.c:89 src/qemu/qemu_cgroup.c:602
 msgid "failed to convert memory nodemask"
 msgstr "转换内存节点掩码失败"
 
-#: src/lxc/lxc_cgroup.c:200
+#: src/lxc/lxc_cgroup.c:221
 msgid "cannot get the path of MEMORY cgroup controller"
 msgstr "无法获取 MEMORY cgroup 控制器的路径"
 
-#: src/lxc/lxc_cgroup.c:443 src/qemu/qemu_cgroup.c:663
+#: src/lxc/lxc_cgroup.c:464 src/qemu/qemu_cgroup.c:696
 #, c-format
 msgid "Resource partition '%s' must start with '/'"
 msgstr ""
 
-#: src/lxc/lxc_fuse.c:149 src/util/vircgroup.c:2780
+#: src/lxc/lxc_fuse.c:149 src/util/vircgroup.c:3311
 #, c-format
 msgid "Cannot open %s"
 msgstr "无法打开 %s"
@@ -8991,24 +9135,24 @@
 msgid "Cannot create %s"
 msgstr "无法生成 %s"
 
-#: src/lxc/lxc_hostdev.c:97 src/qemu/qemu_hostdev.c:854
+#: src/lxc/lxc_hostdev.c:97 src/qemu/qemu_hostdev.c:864
 #, c-format
 msgid "USB device %s is in use by domain %s"
 msgstr "USB 设备 %s 正在由域 %s 使用"
 
-#: src/lxc/lxc_hostdev.c:101 src/qemu/qemu_hostdev.c:858
+#: src/lxc/lxc_hostdev.c:101 src/qemu/qemu_hostdev.c:868
 #, c-format
 msgid "USB device %s is already in use"
 msgstr "USB 设备 %s 正在使用中"
 
-#: src/lxc/lxc_hostdev.c:183 src/qemu/qemu_hostdev.c:940
+#: src/lxc/lxc_hostdev.c:183 src/qemu/qemu_hostdev.c:950
 #, c-format
 msgid ""
 "Multiple USB devices for %x:%x were found, but none of them is at bus:%u "
 "device:%u"
 msgstr "为  %x:%x 找到多个 USB 失败，但没有一个位于 bus:%u device:%u"
 
-#: src/lxc/lxc_hostdev.c:188 src/qemu/qemu_hostdev.c:945
+#: src/lxc/lxc_hostdev.c:188 src/qemu/qemu_hostdev.c:955
 #, c-format
 msgid "Multiple USB devices for %x:%x, use <address> to specify one"
 msgstr "为  %x:%x 找到多个 USB 设备，请使用 <address> 指定一个。"
@@ -9023,6 +9167,81 @@
 msgid "Unsupported hostdev mode %s"
 msgstr ""
 
+#: src/lxc/lxc_native.c:204
+msgid "Missing lxc.rootfs configuration"
+msgstr ""
+
+#: src/lxc/lxc_native.c:228
+#, c-format
+msgid "can't convert relative size: '%s'"
+msgstr ""
+
+#: src/lxc/lxc_native.c:240
+#, c-format
+msgid "failed to convert size: '%s'"
+msgstr ""
+
+#: src/lxc/lxc_native.c:287
+msgid "missing tmpfs size, set the size option"
+msgstr ""
+
+#: src/lxc/lxc_native.c:433
+msgid "Missing 'link' attribute for NIC"
+msgstr ""
+
+#: src/lxc/lxc_native.c:573
+#, c-format
+msgid "failed to parse int: '%s'"
+msgstr ""
+
+#: src/lxc/lxc_native.c:614
+#, c-format
+msgid "invalid lxc.id_map: '%s'"
+msgstr ""
+
+#: src/lxc/lxc_native.c:700 src/lxc/lxc_native.c:828
+#, c-format
+msgid "failed to parse integer: '%s'"
+msgstr ""
+
+#: src/lxc/lxc_native.c:749
+#, c-format
+msgid "invalid %s value: '%s'"
+msgstr ""
+
+#: src/lxc/lxc_native.c:775
+#, c-format
+msgid "failed to parse device weight: '%s'"
+msgstr ""
+
+#: src/lxc/lxc_native.c:781
+#, c-format
+msgid "failed to parse read_bps_device: '%s'"
+msgstr ""
+
+#: src/lxc/lxc_native.c:788
+#, c-format
+msgid "failed to parse write_bps_device: '%s'"
+msgstr ""
+
+#: src/lxc/lxc_native.c:795
+#, c-format
+msgid "failed to parse read_iops_device: '%s'"
+msgstr ""
+
+#: src/lxc/lxc_native.c:802
+#, c-format
+msgid "failed to parse write_iops_device: '%s'"
+msgstr ""
+
+#: src/qemu/qemu_command.c:6674
+msgid "failed to generate uuid"
+msgstr "生成 uuid 失败"
+
+#: src/lxc/lxc_native.c:898
+msgid "lxc.mount found, use lxc.mount.entry lines instead"
+msgstr ""
+
 #: src/lxc/lxc_container.c:158
 #, c-format
 msgid "Malformed ctrl-alt-del setting '%s'"
@@ -9037,23 +9256,23 @@
 msgid "Expected a /dev path for '%s'"
 msgstr ""
 
-#: src/lxc/lxc_container.c:275
+#: src/lxc/lxc_container.c:147
 msgid "setsid failed"
 msgstr "setsid 失败"
 
-#: src/lxc/lxc_container.c:281
+#: src/lxc/lxc_container.c:153
 msgid "ioctl(TIOCSTTY) failed"
 msgstr "ioctl(TIOCSTTY) 失败"
 
-#: src/lxc/lxc_container.c:287
+#: src/lxc/lxc_container.c:168
 msgid "dup2(stdin) failed"
 msgstr "dup2(stdin) 失败"
 
-#: src/lxc/lxc_container.c:293
+#: src/lxc/lxc_container.c:174
 msgid "dup2(stdout) failed"
 msgstr "dup2(stdout) 失败"
 
-#: src/lxc/lxc_container.c:299
+#: src/lxc/lxc_container.c:180
 msgid "dup2(stderr) failed"
 msgstr "dup2(stderr) 失败"
 
@@ -9067,7 +9286,7 @@
 msgid "Cannot duplicate fd %d onto fd %d"
 msgstr ""
 
-#: src/lxc/lxc_container.c:363 src/util/vircommand.c:528
+#: src/lxc/lxc_container.c:363 src/util/vircommand.c:531
 #: tools/virt-login-shell.c:350
 msgid "sysconf(_SC_OPEN_MAX) failed"
 msgstr ""
@@ -9081,7 +9300,7 @@
 msgid "Failed to unmount '%s' and could not detach subtree '%s'"
 msgstr "无法卸载 '%s' 也无法分离子树 '%s'"
 
-#: src/lxc/lxc_container.c:573
+#: src/lxc/lxc_container.c:1031
 #, c-format
 msgid "Failed to unmount '%s' and could not unmount old root '%s'"
 msgstr "无法卸载 '%s' 也无法卸载旧的 root '%s'"
@@ -9095,18 +9314,17 @@
 msgid "Unsupported root filesystem type %s"
 msgstr ""
 
-#: src/lxc/lxc_container.c:646
+#: src/lxc/lxc_container.c:333
 msgid "Failed to make root private"
 msgstr "使 root 成为专用失败"
 
-#: src/lxc/lxc_container.c:655 src/lxc/lxc_container.c:675
-#: src/lxc/lxc_container.c:1084 src/lxc/lxc_container.c:1364
-#: src/lxc/lxc_container.c:1428
+#: src/lxc/lxc_container.c:344 src/lxc/lxc_container.c:366
+#: src/lxc/lxc_container.c:613 src/lxc/lxc_container.c:874
 #, c-format
 msgid "Failed to create %s"
 msgstr "创建 %s 失败"
 
-#: src/lxc/lxc_container.c:664
+#: src/lxc/lxc_container.c:353
 #, c-format
 msgid "Failed to mount empty tmpfs at %s"
 msgstr "在 %s 挂载空 tmpfs 失败"
@@ -9116,7 +9334,7 @@
 msgid "Failed to bind %s to new root %s"
 msgstr ""
 
-#: src/lxc/lxc_container.c:691
+#: src/lxc/lxc_container.c:382
 #, c-format
 msgid "Failed to make new root %s readonly"
 msgstr "让新的 root %s 为只读失败"
@@ -9126,11 +9344,11 @@
 msgid "Failed to chdir into %s"
 msgstr "使用 cd 命令进入 %s 失败"
 
-#: src/lxc/lxc_container.c:709
+#: src/lxc/lxc_container.c:400
 msgid "Failed to pivot root"
 msgstr "pivot root 失败"
 
-#: src/lxc/lxc_container.c:772
+#: src/lxc/lxc_container.c:984
 msgid "Failed to read /proc/mounts"
 msgstr "读取 /proc/mounts 失败"
 
@@ -9139,11 +9357,6 @@
 msgid "Failed to make mount %s readonly"
 msgstr ""
 
-#: src/lxc/lxc_container.c:855
-#, c-format
-msgid "Failed to mkdir %s"
-msgstr "新建文件夹 %s 失败"
-
 #: src/lxc/lxc_container.c:873
 #, c-format
 msgid "Failed to mount %s on %s type %s flags=%x"
@@ -9168,7 +9381,7 @@
 msgid "Failed to mount %s on /dev"
 msgstr ""
 
-#: src/lxc/lxc_container.c:981
+#: src/lxc/lxc_container.c:511
 msgid "Cannot create /dev/pts"
 msgstr "无法创建 /dev/pts"
 
@@ -9186,12 +9399,12 @@
 msgid "Failed to bind /dev/pts/ptmx on to /dev/ptmx"
 msgstr "将 /dev/pts/ptmx 捆绑到 /dev/ptmx 失败"
 
-#: src/lxc/lxc_container.c:1039
+#: src/lxc/lxc_container.c:583
 #, c-format
 msgid "Failed to symlink %s to %s"
 msgstr "将符号链接 %s 改为 %s 失败"
 
-#: src/lxc/lxc_container.c:1048
+#: src/lxc/lxc_container.c:591
 #, c-format
 msgid "Failed to symlink %s to /dev/console"
 msgstr "为 /dev/console 添加符号链接 %s 失败"
@@ -9216,66 +9429,66 @@
 msgid "Failed to close bind target %s"
 msgstr "无法关闭捆绑的目标 %s"
 
-#: src/lxc/lxc_container.c:1110
+#: src/lxc/lxc_container.c:620
 #, c-format
 msgid "Failed to bind mount directory %s to %s"
 msgstr "将挂载目录 %s 捆绑到 %s 失败"
 
-#: src/lxc/lxc_container.c:1119 src/lxc/lxc_container.c:1444
+#: src/lxc/lxc_container.c:629
 #, c-format
 msgid "Failed to make directory %s readonly"
 msgstr "让目录 %s 成为只读失败"
 
-#: src/lxc/lxc_container.c:1146
+#: src/lxc/lxc_container.c:656
 #, c-format
 msgid "Unable to open filesystem %s"
 msgstr "无法打开文件系统 %s"
 
-#: src/lxc/lxc_container.c:1152
+#: src/lxc/lxc_container.c:662
 msgid "Unable to create blkid library handle"
 msgstr "无法创建 blkid 库句柄"
 
-#: src/lxc/lxc_container.c:1157
+#: src/lxc/lxc_container.c:667
 #, c-format
 msgid "Unable to associate device %s with blkid library"
 msgstr "无法使用 blkid 库关联设备 %s"
 
-#: src/lxc/lxc_container.c:1173
+#: src/lxc/lxc_container.c:683
 #, c-format
 msgid "Too many filesystems detected for %s"
 msgstr "探测到 %s 的太多文件系统"
 
-#: src/lxc/lxc_container.c:1177
+#: src/lxc/lxc_container.c:687
 #, c-format
 msgid "Unable to detect filesystem for %s"
 msgstr "无法为 %s 探测文件系统"
 
-#: src/lxc/lxc_container.c:1185
+#: src/lxc/lxc_container.c:695
 #, c-format
 msgid "Unable to find filesystem type for %s"
 msgstr "无法为 %s 找到文件系统类型"
 
-#: src/lxc/lxc_container.c:1255 src/util/iohelper.c:151
+#: src/lxc/lxc_container.c:768 src/util/iohelper.c:151
 #, c-format
 msgid "Unable to read %s"
 msgstr "无法读取 %s"
 
-#: src/lxc/lxc_container.c:1285
+#: src/lxc/lxc_container.c:798
 #, c-format
 msgid "%s has unexpected '*' before last line"
 msgstr "%s 在最后一行前应有 '*'"
 
-#: src/lxc/lxc_container.c:1309
+#: src/lxc/lxc_container.c:821
 #, c-format
 msgid "Failed to mount device %s to %s"
 msgstr "将设备 %s 挂载到 %s 失败"
 
-#: src/lxc/lxc_container.c:1332
+#: src/lxc/lxc_container.c:844
 #, c-format
 msgid "Failed to mount device %s to %s, unable to detect filesystem"
 msgstr "将设备 %s 挂载到 %s 失败，无法探测文件系统。"
 
-#: src/lxc/lxc_container.c:1377
+#: src/lxc/lxc_container.c:886
 #, c-format
 msgid "Failed to mount device %s to %s as %s"
 msgstr "无法将设备 %s 作为 %s 挂载到 %s"
@@ -9285,12 +9498,12 @@
 msgid "Failed to mount directory %s as tmpfs"
 msgstr "无法将目录 %s 作为 tmpfs 挂载"
 
-#: src/lxc/lxc_container.c:1483
+#: src/lxc/lxc_container.c:935
 #, c-format
 msgid "Unexpected filesystem type %s"
 msgstr "意外的文件系统类型 %s"
 
-#: src/lxc/lxc_container.c:1488
+#: src/lxc/lxc_container.c:940
 #, c-format
 msgid "Cannot mount filesystem type %s"
 msgstr "无法挂载文件系统类型 %s"
@@ -9310,30 +9523,30 @@
 msgid "Failed to resolve symlink at %s"
 msgstr ""
 
-#: src/lxc/lxc_container.c:1749
+#: src/lxc/lxc_container.c:1148
 #, c-format
 msgid "Failed to remove capabilities: %d"
 msgstr "删除容量失败：%d"
 
-#: src/lxc/lxc_container.c:1755
+#: src/lxc/lxc_container.c:1154
 #, c-format
 msgid "Failed to apply capabilities: %d"
 msgstr "应用容量失败：%d"
 
-#: src/lxc/lxc_container.c:1801
+#: src/lxc/lxc_container.c:1195
 msgid "lxcChild() passed invalid vm definition"
 msgstr "lxcChild() 传递无效 vm 定义"
 
-#: src/lxc/lxc_container.c:1810
+#: src/lxc/lxc_container.c:1246
 msgid "Failed to read the container continue message"
 msgstr "读取容器继续信息失败"
 
-#: src/lxc/lxc_container.c:1844
+#: src/lxc/lxc_container.c:1228
 #, c-format
 msgid "Failed to open tty %s"
 msgstr "打开 tty %s 失败"
 
-#: src/lxc/lxc_container.c:1860
+#: src/lxc/lxc_container.c:1238
 #, c-format
 msgid "cannot find init path '%s' relative to container root"
 msgstr "未找到与容器 root 相关的 init 路径 '%s'"
@@ -9350,7 +9563,7 @@
 msgid "Kernel doesn't support user namespace"
 msgstr ""
 
-#: src/lxc/lxc_container.c:2038
+#: src/lxc/lxc_container.c:1372
 msgid "Failed to run clone container"
 msgstr "运行克隆容器失败"
 
@@ -9359,7 +9572,7 @@
 msgid "Failed to change owner of %s to %u:%u"
 msgstr ""
 
-#: src/lxc/lxc_conf.c:86 src/qemu/qemu_conf.c:624 src/uml/uml_conf.c:76
+#: src/lxc/lxc_conf.c:81 src/qemu/qemu_driver.c:263 src/uml/uml_conf.c:91
 msgid "cannot get the host uuid"
 msgstr "无法获得主机 uuid"
 
@@ -9410,12 +9623,12 @@
 msgid "disk driver %s is not supported"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:799
+#: src/lxc/lxc_controller.c:687
 #, c-format
 msgid "failed to apply capabilities: %d"
 msgstr "应用容量失败：%d"
 
-#: src/lxc/lxc_controller.c:881 src/lxc/lxc_controller.c:918
+#: src/lxc/lxc_controller.c:878
 msgid "Unable to add epoll fd"
 msgstr "无法添加 epoll fd"
 
@@ -9423,19 +9636,19 @@
 msgid "Unable to remove epoll fd"
 msgstr "无法删除 epoll fd"
 
-#: src/lxc/lxc_controller.c:960
+#: src/lxc/lxc_controller.c:888
 msgid "Unable to wait on epoll"
 msgstr "无法等待 epoll fd"
 
-#: src/lxc/lxc_controller.c:1018
+#: src/lxc/lxc_controller.c:960
 msgid "Unable to read container pty"
 msgstr "无法读取容器 pty"
 
-#: src/lxc/lxc_controller.c:1046
+#: src/lxc/lxc_controller.c:988
 msgid "Unable to write to container pty"
 msgstr "无法写入容器 pty"
 
-#: src/lxc/lxc_controller.c:1108
+#: src/lxc/lxc_controller.c:870
 msgid "Unable to create epoll fd"
 msgstr "无法生成 epoll fd"
 
@@ -9443,7 +9656,7 @@
 msgid "Unable to watch epoll FD"
 msgstr "无法观察 epoll fd"
 
-#: src/lxc/lxc_controller.c:1128 src/lxc/lxc_controller.c:1138
+#: src/lxc/lxc_controller.c:1115 src/lxc/lxc_controller.c:1125
 msgid "Unable to watch host console PTY"
 msgstr "无法观察主机控制器 PTY"
 
@@ -9452,7 +9665,7 @@
 msgid "unable write to %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:1251 src/lxc/lxc_controller.c:1945
+#: src/lxc/lxc_controller.c:1370
 #, c-format
 msgid "Failed to make path %s"
 msgstr "生成路径 %s 失败"
@@ -9462,33 +9675,32 @@
 msgid "Failed to mount devfs on %s type %s (%s)"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:1316
+#: src/lxc/lxc_container.c:552
 #, c-format
 msgid "Failed to make device %s"
 msgstr "生成设备 %s 失败"
 
 #: src/lxc/lxc_controller.c:1366 src/lxc/lxc_controller.c:1444
 #: src/lxc/lxc_controller.c:1523 src/lxc/lxc_controller.c:1680
-#: src/lxc/lxc_driver.c:3056 src/lxc/lxc_driver.c:3322
-#: src/lxc/lxc_driver.c:3407 src/lxc/lxc_driver.c:3515
+#: src/lxc/lxc_driver.c:4046 src/lxc/lxc_driver.c:4267
+#: src/lxc/lxc_driver.c:4336 src/lxc/lxc_driver.c:4408
 #, c-format
 msgid "Unable to access %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:1372 src/lxc/lxc_driver.c:3328
+#: src/lxc/lxc_controller.c:1372 src/lxc/lxc_driver.c:4273
 #, c-format
 msgid "USB source %s was not a character device"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:1381 src/lxc/lxc_driver.c:3337
+#: src/lxc/lxc_controller.c:1381 src/lxc/lxc_driver.c:3874
 #, c-format
 msgid "Unable to create %s"
 msgstr ""
 
 #: src/lxc/lxc_controller.c:1389 src/lxc/lxc_controller.c:1469
 #: src/lxc/lxc_controller.c:1548 src/lxc/lxc_controller.c:1708
-#: src/lxc/lxc_driver.c:3091 src/lxc/lxc_driver.c:3345
-#: src/lxc/lxc_driver.c:3445 src/lxc/lxc_driver.c:3553
+#: src/lxc/lxc_driver.c:3889
 #, c-format
 msgid "Unable to create device %s"
 msgstr ""
@@ -9513,39 +9725,39 @@
 msgstr ""
 
 #: src/lxc/lxc_controller.c:1582 src/lxc/lxc_controller.c:1610
-#: src/lxc/lxc_controller.c:1642 src/lxc/lxc_driver.c:3656
-#: src/lxc/lxc_driver.c:4077
+#: src/lxc/lxc_controller.c:1642 src/lxc/lxc_driver.c:4523
+#: src/lxc/lxc_driver.c:4910
 #, c-format
 msgid "Unsupported host device mode %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:1665 src/lxc/lxc_driver.c:3039
+#: src/lxc/lxc_controller.c:1665 src/lxc/lxc_driver.c:4029
 msgid "Can't setup disk for non-block device"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:1670 src/lxc/lxc_driver.c:3044
+#: src/lxc/lxc_controller.c:1670 src/lxc/lxc_driver.c:4034
 msgid "Can't setup disk without media"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:1686 src/lxc/lxc_driver.c:3062
+#: src/lxc/lxc_controller.c:1686
 #, c-format
 msgid "Disk source %s must be a character/block device"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:1816
+#: src/lxc/lxc_controller.c:1208
 #, c-format
 msgid "Unable to request personality for %s on %s"
 msgstr "无法在 %s 中查看 %s 的特性"
 
-#: src/lxc/lxc_controller.c:1908
+#: src/lxc/lxc_controller.c:1352
 msgid "Cannot unshare mount namespace"
 msgstr "无法取消共享挂载名称空间"
 
-#: src/lxc/lxc_controller.c:1914
+#: src/lxc/lxc_controller.c:1358
 msgid "Failed to switch root mount into slave mode"
 msgstr "将 root 挂载切换到从属模式失败"
 
-#: src/lxc/lxc_controller.c:1960
+#: src/lxc/lxc_controller.c:1381
 #, c-format
 msgid "Failed to mount devpts on %s"
 msgstr "挂载 devpts 到 %s 失败"
@@ -9554,594 +9766,623 @@
 msgid "Kernel does not support private devpts"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:2011 src/lxc/lxc_process.c:1128
+#: src/lxc/lxc_controller.c:1405 src/lxc/lxc_controller.c:1414
+#: src/lxc/lxc_driver.c:1806
 msgid "Failed to allocate tty"
 msgstr "分配 tty 失败"
 
-#: src/lxc/lxc_controller.c:2139
+#: src/lxc/lxc_controller.c:1302
 msgid "sockpair failed"
 msgstr "sockpair 失败"
 
-#: src/lxc/lxc_controller.c:2145
+#: src/lxc/lxc_controller.c:1308
 msgid "socketpair failed"
 msgstr "socketpair 失败"
 
-#: src/lxc/lxc_controller.c:2207
+#: src/lxc/lxc_controller.c:1439
 msgid "Unable to send container continue message"
 msgstr "无法发送容器继续信息"
 
-#: src/lxc/lxc_controller.c:2213
+#: src/lxc/lxc_controller.c:1445
 msgid "error receiving signal from container"
 msgstr "从容器接收信号失败"
 
-#: src/lxc/lxc_controller.c:2439
+#: src/lxc/lxc_controller.c:1664
 #, c-format
 msgid "Unable to write pid file '%s/%s.pid'"
 msgstr "无法写入 pid 文件 '%s/%s.pid'"
 
-#: src/lxc/lxc_controller.c:2453
+#: src/lxc/lxc_controller.c:1678
 msgid "Unable to change to root dir"
 msgstr "不能更改 root 目录"
 
-#: src/lxc/lxc_controller.c:2459
+#: src/lxc/lxc_controller.c:1684
 msgid "Unable to become session leader"
 msgstr "无法成为会话引导者"
 
-#: src/lxc/lxc_driver.c:132 src/libxl/libxl_driver.c:94
-#: src/qemu/qemu_driver.c:220 src/test/test_driver.c:496
-#, c-format
-msgid "no domain with matching uuid '%s' (%s)"
-msgstr ""
-
-#: src/lxc/lxc_driver.c:168
+#: src/lxc/lxc_driver.c:159
 #, c-format
 msgid "Unexpected LXC URI path '%s', try lxc:///"
 msgstr "意外 LXC URI 路径 '%s'，尝试 lxc:///"
 
-#: src/lxc/lxc_driver.c:176
+#: src/lxc/lxc_driver.c:167
 msgid "lxc state driver is not active"
 msgstr "lxc 状态驱动程序未激活"
 
-#: src/lxc/lxc_driver.c:249
+#: src/lxc/lxc_driver.c:238
 #, c-format
 msgid "No domain with matching id %d"
 msgstr "没有符合 id 为 %d 的域"
 
-#: src/lxc/lxc_driver.c:279 src/vmware/vmware_driver.c:710
-#, c-format
-msgid "No domain with matching uuid '%s'"
-msgstr "没有匹配 uuid '%s' 的域"
-
-#: src/lxc/lxc_driver.c:306
+#: src/lxc/lxc_driver.c:293
 #, c-format
 msgid "No domain with matching name '%s'"
 msgstr "没有符合名称为 '%s' 的域"
 
-#: src/lxc/lxc_driver.c:465 src/lxc/lxc_driver.c:1026
-#: src/lxc/lxc_driver.c:1128
+#: src/lxc/lxc_driver.c:449 src/lxc/lxc_driver.c:1999
+#: src/lxc/lxc_driver.c:2077
 msgid "System lacks NETNS support"
 msgstr "系统缺少 NETNS 支持"
 
-#: src/lxc/lxc_driver.c:524
-msgid "Cannot undefine transient domain"
-msgstr "无法取消定义瞬时域"
-
-#: src/lxc/lxc_driver.c:583
+#: src/lxc/lxc_driver.c:577
 msgid "Cannot read cputime for domain"
 msgstr "无法为域读取 cputime"
 
-#: src/lxc/lxc_driver.c:687
+#: src/lxc/lxc_driver.c:712
 msgid "Cannot set max memory lower than current memory"
 msgstr "无法将最大内存设置为低于当前内存"
 
-#: src/lxc/lxc_driver.c:715
+#: src/lxc/lxc_driver.c:744
 msgid "Cannot set memory higher than max memory"
 msgstr "无法将内存设置为高于最大内存"
 
-#: src/lxc/lxc_driver.c:721 src/lxc/lxc_driver.c:1394
-#: src/lxc/lxc_driver.c:2232 src/lxc/lxc_driver.c:2461
-#: src/lxc/lxc_driver.c:2510 src/lxc/lxc_driver.c:2721
-#: src/lxc/lxc_driver.c:2801 src/lxc/lxc_driver.c:4499
-#: src/libxl/libxl_driver.c:1313 src/libxl/libxl_driver.c:1365
-#: src/libxl/libxl_driver.c:1417 src/libxl/libxl_driver.c:1464
-#: src/libxl/libxl_driver.c:1502 src/libxl/libxl_driver.c:1869
-#: src/libxl/libxl_driver.c:1981 src/libxl/libxl_driver.c:2060
-#: src/libxl/libxl_driver.c:2339 src/libxl/libxl_driver.c:2563
-#: src/libxl/libxl_driver.c:3297 src/libxl/libxl_driver.c:3401
-#: src/libxl/libxl_driver.c:3505 src/libxl/libxl_driver.c:3784
-#: src/libxl/libxl_driver.c:3848 src/libxl/libxl_driver.c:3925
-#: src/libxl/libxl_driver.c:4096 src/openvz/openvz_driver.c:598
-#: src/openvz/openvz_driver.c:636 tools/virsh-domain.c:9099
-#: tools/virsh-domain.c:9272
+#: src/lxc/lxc_driver.c:750 src/lxc/lxc_driver.c:2257
+#: src/lxc/lxc_driver.c:3415 src/lxc/lxc_driver.c:3665
+#: src/lxc/lxc_driver.c:3730 src/libxl/libxl_driver.c:1346
+#: src/libxl/libxl_driver.c:1405 src/libxl/libxl_driver.c:1462
+#: src/libxl/libxl_driver.c:1508 src/libxl/libxl_driver.c:1551
+#: src/libxl/libxl_driver.c:1944 src/libxl/libxl_driver.c:2042
+#: src/libxl/libxl_driver.c:2132 src/libxl/libxl_driver.c:2404
+#: src/libxl/libxl_driver.c:2501 src/libxl/libxl_driver.c:3253
+#: src/libxl/libxl_driver.c:3548 src/libxl/libxl_driver.c:3615
+#: src/libxl/libxl_driver.c:3706 src/openvz/openvz_driver.c:523
+#: src/openvz/openvz_driver.c:561
 msgid "Domain is not running"
 msgstr "域没有在运行"
 
-#: src/lxc/lxc_driver.c:727
+#: src/lxc/lxc_driver.c:768
 msgid "Failed to set memory for domain"
 msgstr "为域设定内存失败"
 
-#: src/lxc/lxc_driver.c:788 src/lxc/lxc_driver.c:903
-#: src/qemu/qemu_driver.c:7918 src/qemu/qemu_driver.c:8041
-#: src/qemu/qemu_driver.c:8398
+#: src/qemu/qemu_driver.c:6476 src/qemu/qemu_driver.c:6638
 msgid "cgroup memory controller is not mounted"
 msgstr "未挂载 cgroup 内存控制器"
 
-#: src/lxc/lxc_driver.c:819 src/qemu/qemu_driver.c:7950
+#: src/lxc/lxc_driver.c:822 src/qemu/qemu_driver.c:8361
 msgid ""
 "memory hard_limit tunable value must be lower than or equal to "
 "swap_hard_limit"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:829 src/qemu/qemu_driver.c:7960
+#: src/lxc/lxc_driver.c:832 src/qemu/qemu_driver.c:8371
 #, c-format
 msgid "unable to set memory %s tunable"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1032 src/libxl/libxl_driver.c:2767
-#: src/vmware/vmware_driver.c:719
-msgid "Domain is already running"
-msgstr "域已经运行"
+#: src/libxl/libxl_driver.c:2587 src/libxl/libxl_driver.c:2630
+#: src/qemu/qemu_driver.c:4482 src/qemu/qemu_driver.c:4526
+#: src/xen/xen_driver.c:1274 src/xen/xen_driver.c:1323
+#, c-format
+msgid "unsupported config type %s"
+msgstr "不支持的配置类型 %s"
 
-#: src/lxc/lxc_driver.c:1195 src/qemu/qemu_driver.c:5009
-#: src/qemu/qemu_driver.c:5061
+#: src/qemu/qemu_driver.c:3334 src/qemu/qemu_driver.c:3847
 #, c-format
 msgid "unknown virt type in domain definition '%d'"
 msgstr "域定义 '%d' 中未知的 virt 类型"
 
-#: src/lxc/lxc_driver.c:1219 src/lxc/lxc_driver.c:2655
-#: src/lxc/lxc_driver.c:4505
+#: src/lxc/lxc_driver.c:1252 src/lxc/lxc_driver.c:3490
+#: src/lxc/lxc_driver.c:5338
 msgid "Init pid is not yet available"
 msgstr "init pid 尚无法使用"
 
-#: src/lxc/lxc_driver.c:1226 src/qemu/qemu_driver.c:5032
-#: src/qemu/qemu_driver.c:5095
+#: src/qemu/qemu_driver.c:3870
 msgid "Failed to get security label"
 msgstr "获得安全性标签失败"
 
-#: src/lxc/lxc_driver.c:1262 src/qemu/qemu_driver.c:5136
+#: src/qemu/qemu_driver.c:3902
 #, c-format
 msgid "security model string exceeds max %d bytes"
 msgstr "安全性模式超过最大的 %d 字节"
 
-#: src/lxc/lxc_driver.c:1271 src/qemu/qemu_driver.c:5146
+#: src/qemu/qemu_driver.c:3912
 #, c-format
 msgid "security DOI string exceeds max %d bytes"
 msgstr "安全性 DOI 超过最大的 %d 字节"
 
-#: src/lxc/lxc_driver.c:1463 src/qemu/qemu_driver.c:392
+#: src/qemu/qemu_driver.c:232
 msgid "Failed to initialize security drivers"
 msgstr "初始化安全驱动程序失败"
 
-#: src/lxc/lxc_driver.c:1668
-#, c-format
-msgid "Unknown release: %s"
-msgstr "未知发布：%s"
-
-#: src/lxc/lxc_driver.c:1710 src/lxc/lxc_driver.c:1835
-#: src/lxc/lxc_driver.c:1967 src/qemu/qemu_driver.c:7411
-#: src/qemu/qemu_driver.c:8583 src/qemu/qemu_driver.c:8841
+#: src/lxc/lxc_driver.c:2669 src/lxc/lxc_driver.c:2826
+#: src/lxc/lxc_driver.c:3026 src/qemu/qemu_driver.c:5866
+#: src/qemu/qemu_driver.c:6955 src/qemu/qemu_driver.c:7226
 msgid "cgroup CPU controller is not mounted"
 msgstr "未挂载 cgroup CPU 控制器"
 
-#: src/lxc/lxc_driver.c:2064 src/lxc/lxc_driver.c:2159
-#: src/qemu/qemu_driver.c:7595 src/qemu/qemu_driver.c:7742
+#: src/lxc/lxc_driver.c:2156 src/qemu/qemu_driver.c:7567
+#, c-format
+msgid "unable to parse blkio device '%s' '%s'"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:2194 src/qemu/qemu_driver.c:7607
+#, c-format
+msgid "Unknown parameter %s"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3152 src/lxc/lxc_driver.c:3301
+#: src/qemu/qemu_driver.c:6048 src/qemu/qemu_driver.c:6267
 msgid "blkio cgroup isn't mounted"
 msgstr "未挂账 blkio cgroup"
 
-#: src/lxc/lxc_driver.c:2074 src/lxc/lxc_driver.c:2093
-#: src/qemu/qemu_driver.c:7608 src/qemu/qemu_driver.c:7656
+#: src/qemu/qemu_driver.c:7369 src/qemu/qemu_driver.c:7434
+#: src/qemu/qemu_driver.c:7520 src/test/test_driver.c:2825
+#, c-format
+msgid "invalid path: %s"
+msgstr "无效路径：%s"
+
+#: src/qemu/qemu_driver.c:7441 src/qemu/qemu_driver.c:7527
+#: src/qemu/qemu_hotplug.c:75
+#, c-format
+msgid "missing disk device alias name for %s"
+msgstr "缺少 %s 的磁盘设备别名"
+
+#: src/lxc/lxc_driver.c:2351 src/lxc/lxc_driver.c:2375
+msgid "domain stats query failed"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3189 src/lxc/lxc_driver.c:3223
+#: src/qemu/qemu_driver.c:6085 src/qemu/qemu_driver.c:6162
 msgid "out of blkio weight range."
 msgstr "超出 blkio 加权范围"
 
-#: src/lxc/lxc_driver.c:2249
+#: src/lxc/lxc_driver.c:2560 src/qemu/qemu_driver.c:7779
+#, c-format
+msgid "Unknown blkio parameter %s"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3054 src/lxc/lxc_driver.c:3068
+#: src/lxc/lxc_driver.c:3081 src/lxc/lxc_driver.c:3339
+#: src/lxc/lxc_driver.c:3362 src/libxl/libxl_driver.c:3646
+#: src/libxl/libxl_driver.c:3657 src/qemu/qemu_driver.c:6305
+#: src/qemu/qemu_driver.c:6344 src/qemu/qemu_driver.c:6366
+#: src/qemu/qemu_driver.c:6406 src/qemu/qemu_driver.c:6677
+#: src/qemu/qemu_driver.c:6687 src/qemu/qemu_driver.c:6697
+#: src/qemu/qemu_driver.c:6731 src/qemu/qemu_driver.c:6747
+#: src/qemu/qemu_driver.c:6763 src/qemu/qemu_driver.c:7254
+#: src/qemu/qemu_driver.c:7268 src/qemu/qemu_driver.c:7281
+#: src/qemu/qemu_driver.c:7579 src/qemu/qemu_driver.c:7593
+#: src/qemu/qemu_driver.c:7607 src/qemu/qemu_driver.c:7621
+#: src/qemu/qemu_driver.c:7635 src/qemu/qemu_driver.c:7649
+#: src/qemu/qemu_driver.c:7663 src/qemu/qemu_driver.c:7677
+#: src/qemu/qemu_driver.c:11362 src/qemu/qemu_driver.c:11373
+#: src/qemu/qemu_driver.c:11384 src/qemu/qemu_driver.c:11395
+#: src/qemu/qemu_driver.c:11406 src/qemu/qemu_driver.c:11417
+#: src/test/test_driver.c:2726
+#, c-format
+msgid "Field name '%s' too long"
+msgstr "字段名称 '%s' 过长"
+
+#: src/lxc/lxc_driver.c:3432
 #, c-format
 msgid "Invalid path, '%s' is not a known interface"
 msgstr "无效路径，'%s' 是已知接口"
 
-#: src/lxc/lxc_driver.c:2304
+#: src/lxc/lxc_driver.c:3497
 msgid "Cannot set autostart for transient domain"
 msgstr "无法为瞬时域设定自动启动"
 
-#: src/lxc/lxc_driver.c:2327
+#: src/lxc/lxc_driver.c:3520
 #, c-format
 msgid "Cannot create autostart directory %s"
 msgstr "无法生成自动启动目录 %s"
 
-#: src/lxc/lxc_driver.c:2334 src/libxl/libxl_driver.c:3742
-#: src/qemu/qemu_driver.c:7359 src/uml/uml_driver.c:2435
+#: src/lxc/lxc_driver.c:3527 src/libxl/libxl_driver.c:3503
+#: src/qemu/qemu_driver.c:5796 src/uml/uml_driver.c:2275
 #, c-format
 msgid "Failed to create symlink '%s to '%s'"
 msgstr "为 '%s' 创建符号链接 '%s' 失败"
 
-#: src/lxc/lxc_driver.c:2341 src/libxl/libxl_driver.c:3749
-#: src/network/bridge_driver.c:3084 src/qemu/qemu_driver.c:7366
-#: src/storage/storage_driver.c:1171 src/uml/uml_driver.c:2442
+#: src/lxc/lxc_driver.c:3534 src/libxl/libxl_driver.c:3510
+#: src/network/bridge_driver.c:2608 src/qemu/qemu_driver.c:5803
+#: src/storage/storage_driver.c:1063 src/uml/uml_driver.c:2282
 #, c-format
 msgid "Failed to delete symlink '%s'"
 msgstr "删除符号链接 '%s' 失败"
 
-#: src/lxc/lxc_driver.c:2468
+#: src/lxc/lxc_driver.c:3672
 msgid "Suspend operation failed"
 msgstr "挂起操作失败"
 
-#: src/lxc/lxc_driver.c:2517
+#: src/lxc/lxc_driver.c:3737
 msgid "Resume operation failed"
 msgstr "恢复操作失败"
 
-#: src/lxc/lxc_driver.c:2583 src/uml/uml_driver.c:2582
+#: src/lxc/lxc_driver.c:3808 src/uml/uml_driver.c:2416
 #, c-format
 msgid "cannot find console device '%s'"
 msgstr "无法找到控制台设备 '%s'"
 
-#: src/lxc/lxc_driver.c:2584 src/uml/uml_driver.c:2583
+#: src/lxc/lxc_driver.c:3809 src/uml/uml_driver.c:2417
 msgid "default"
 msgstr "默认"
 
-#: src/lxc/lxc_driver.c:2590 src/libxl/libxl_driver.c:4018
-#: src/qemu/qemu_driver.c:13937 src/uml/uml_driver.c:2589
-#: src/xen/xen_driver.c:2664
+#: src/lxc/lxc_driver.c:3815 src/qemu/qemu_driver.c:10898
+#: src/uml/uml_driver.c:2423 src/xen/xen_driver.c:2160
 #, c-format
 msgid "character device %s is not using a PTY"
 msgstr "字符设备 %s 没有使用 PTY"
 
-#: src/lxc/lxc_driver.c:2621
+#: src/lxc/lxc_driver.c:3456
 #, c-format
 msgid "signum value %d is out of range"
 msgstr "signum 值 %d 在范围之外"
 
-#: src/lxc/lxc_driver.c:2649
+#: src/lxc/lxc_driver.c:3484
 msgid "Only the init process may be killed"
 msgstr "只能杀死 init 进程"
 
-#: src/lxc/lxc_driver.c:2665
+#: src/lxc/lxc_driver.c:3500
 #, c-format
 msgid "Unable to send %d signal to process %d"
 msgstr "无法向进程 %d 发送 %d 信号"
 
-#: src/lxc/lxc_driver.c:2727 src/lxc/lxc_driver.c:2807
+#: src/lxc/lxc_driver.c:3570 src/lxc/lxc_driver.c:3647
 msgid "Init process ID is not yet known"
 msgstr "Init 进程 ID 未知"
 
-#: src/lxc/lxc_driver.c:2744 src/lxc/lxc_driver.c:2824
+#: src/lxc/lxc_driver.c:3585 src/lxc/lxc_driver.c:3662
 msgid "Container does not provide an initctl pipe"
 msgstr "容器不提供 initctl 管道"
 
-#: src/lxc/lxc_driver.c:2757 src/lxc/lxc_driver.c:2837
+#: src/lxc/lxc_driver.c:3598 src/lxc/lxc_driver.c:3675
 #, c-format
 msgid "Unable to send SIGTERM to init pid %llu"
 msgstr "无法向 init pid %llu 发送 SIGTERM"
 
-#: src/lxc/lxc_driver.c:2867 src/libxl/libxl_driver.c:3123
+#: src/libxl/libxl_driver.c:3067 src/qemu/qemu_driver.c:5363
 #, c-format
 msgid "target %s already exists."
 msgstr "目标 %s 已存在。"
 
-#: src/lxc/lxc_driver.c:2889 src/qemu/qemu_driver.c:6640
+#: src/lxc/lxc_driver.c:3726 src/qemu/qemu_driver.c:6658
 msgid "device is already in the domain configuration"
 msgstr "该域配置中已经有设备"
 
-#: src/lxc/lxc_driver.c:2900 src/libxl/libxl_driver.c:3134
+#: src/libxl/libxl_driver.c:3080 src/qemu/qemu_driver.c:5414
 msgid "persistent attach of device is not supported"
 msgstr "不支持持久附加设备"
 
-#: src/lxc/lxc_driver.c:2924 src/lxc/lxc_driver.c:2980
-#: src/lxc/lxc_driver.c:3773 src/qemu/qemu_driver.c:6727
-#: src/qemu/qemu_hotplug.c:3393
+#: src/lxc/lxc_driver.c:3761 src/lxc/lxc_driver.c:3817
+#: src/lxc/lxc_driver.c:4636 src/qemu/qemu_driver.c:6759
+#: src/qemu/qemu_hotplug.c:3396
 #, c-format
 msgid "multiple devices matching mac address %s found"
 msgstr "找到多个匹配 mac 地址 %s 的设备"
 
-#: src/lxc/lxc_driver.c:2929 src/lxc/lxc_driver.c:2985
-#: src/qemu/qemu_driver.c:6732
+#: src/lxc/lxc_driver.c:3766 src/lxc/lxc_driver.c:3822
+#: src/qemu/qemu_driver.c:6764
 msgid "no matching network device was found"
 msgstr "未找到匹配的网络设备"
 
-#: src/lxc/lxc_driver.c:2943 src/libxl/libxl_driver.c:3256
+#: src/libxl/libxl_driver.c:3205 src/qemu/qemu_driver.c:5535
 msgid "persistent update of device is not supported"
 msgstr "不支持设备的持久更新"
 
-#: src/lxc/lxc_driver.c:2968 src/libxl/libxl_driver.c:3172
-#: src/qemu/qemu_driver.c:6716
+#: src/libxl/libxl_driver.c:3118 src/qemu/qemu_driver.c:5434
 #, c-format
 msgid "no target device %s"
 msgstr "无目标设备 %s"
 
-#: src/lxc/lxc_driver.c:2997 src/qemu/qemu_driver.c:6743
-#: src/qemu/qemu_driver.c:6767 src/qemu/qemu_hotplug.c:1383
-#: src/qemu/qemu_hotplug.c:3619
+#: src/lxc/lxc_driver.c:3834 src/qemu/qemu_driver.c:6775
+#: src/qemu/qemu_driver.c:6799 src/qemu/qemu_hotplug.c:1386
+#: src/qemu/qemu_hotplug.c:3622
 msgid "device not present in domain configuration"
 msgstr "域配置中没有设备"
 
-#: src/lxc/lxc_driver.c:3008 src/libxl/libxl_driver.c:3180
+#: src/libxl/libxl_driver.c:3125 src/qemu/qemu_driver.c:5463
 msgid "persistent detach of device is not supported"
 msgstr "不支持持久附分离设备"
 
-#: src/lxc/lxc_driver.c:3033 src/lxc/lxc_driver.c:3152
-#: src/lxc/lxc_driver.c:3713 src/lxc/lxc_driver.c:3910
-#: src/lxc/lxc_driver.c:3969
-msgid "Cannot attach disk until init PID is known"
+#: src/lxc/lxc_driver.c:3921
+#, c-format
+msgid "Unexpected device type %d"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:3050 src/libxl/libxl_driver.c:2993
-#: src/qemu/qemu_driver.c:6613 src/qemu/qemu_hotplug.c:251
-#: src/qemu/qemu_hotplug.c:492 src/qemu/qemu_hotplug.c:616
-#: src/uml/uml_driver.c:2137
+#: src/lxc/lxc_driver.c:3979
 #, c-format
-msgid "target %s already exists"
-msgstr "目标 %s 已存在"
+msgid "Unable to remove device %s"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:4017 src/lxc/lxc_driver.c:4122
+#: src/lxc/lxc_driver.c:4580 src/lxc/lxc_driver.c:4762
+#: src/lxc/lxc_driver.c:4811
+msgid "Cannot attach disk until init PID is known"
+msgstr ""
 
-#: src/lxc/lxc_driver.c:3110 src/lxc/lxc_driver.c:3312
-#: src/lxc/lxc_driver.c:3460 src/lxc/lxc_driver.c:3568
-#: src/lxc/lxc_driver.c:3733 src/lxc/lxc_driver.c:3859
-#: src/lxc/lxc_driver.c:3930 src/lxc/lxc_driver.c:3989
+#: src/lxc/lxc_driver.c:4023 src/lxc/lxc_driver.c:4059
+#: src/lxc/lxc_driver.c:4510 src/lxc/lxc_driver.c:4599
+#: src/lxc/lxc_driver.c:4716 src/lxc/lxc_driver.c:4777
+#: src/lxc/lxc_driver.c:4826
 msgid "devices cgroup isn't mounted"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:3120 src/lxc/lxc_driver.c:3468
-#: src/lxc/lxc_driver.c:3576
+#: src/libxl/libxl_driver.c:2934 src/qemu/qemu_hotplug.c:203
+#: src/qemu/qemu_hotplug.c:433 src/qemu/qemu_hotplug.c:556
+#: src/uml/uml_driver.c:1984
+#, c-format
+msgid "target %s already exists"
+msgstr "目标 %s 已存在"
+
+#: src/lxc/lxc_driver.c:4052
 #, c-format
-msgid "cannot allow device %s for domain %s"
+msgid "Disk source %s must be a block device"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:3174 src/lxc/lxc_process.c:435
+#: src/lxc/lxc_driver.c:1366
 msgid "No bridge name specified"
 msgstr "未指定桥接名称"
 
-#: src/lxc/lxc_driver.c:3199 src/lxc/lxc_process.c:402
-#: src/qemu/qemu_command.c:314 src/qemu/qemu_hotplug.c:1716
+#: src/qemu/qemu_command.c:200
 #, c-format
 msgid "Network '%s' is not active."
 msgstr "网络 '%s' 不活跃。"
 
-#: src/lxc/lxc_driver.c:3235
+#: src/lxc/lxc_driver.c:4205
 msgid "Network device type is not supported"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:3287
+#: src/lxc/lxc_driver.c:4252
 msgid "host USB device already exists"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:3395 src/lxc/lxc_driver.c:3503
+#: src/lxc/lxc_driver.c:4324 src/lxc/lxc_driver.c:4396
 msgid "Missing storage block path"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:3401 src/lxc/lxc_driver.c:3509
+#: src/lxc/lxc_driver.c:4330 src/lxc/lxc_driver.c:4402
 msgid "host device already exists"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:3414 src/lxc/lxc_driver.c:3522
+#: src/lxc/lxc_driver.c:4343 src/lxc/lxc_driver.c:4415
 #, c-format
 msgid "Hostdev source %s must be a block device"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:3433 src/lxc/lxc_driver.c:3541
-#, c-format
-msgid "Unable to create directory for device %s"
-msgstr ""
-
-#: src/lxc/lxc_driver.c:3606 src/lxc/lxc_driver.c:3627
-#: src/lxc/lxc_driver.c:4028 src/lxc/lxc_driver.c:4048
+#: src/lxc/lxc_driver.c:4467 src/lxc/lxc_driver.c:4488
+#: src/lxc/lxc_driver.c:4861 src/lxc/lxc_driver.c:4881
 #, c-format
 msgid "Unsupported host device type %s"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:3643 src/lxc/lxc_driver.c:4064
+#: src/lxc/lxc_driver.c:4504 src/lxc/lxc_driver.c:4897
 msgid "Cannot attach hostdev until init PID is known"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:3693 src/libxl/libxl_driver.c:3105
-#: src/uml/uml_driver.c:2218
+#: src/libxl/libxl_driver.c:3049 src/qemu/qemu_driver.c:5184
+#: src/uml/uml_driver.c:2066
 #, c-format
 msgid "device type '%s' cannot be attached"
 msgstr "无法附加设备类型 '%s'"
 
-#: src/lxc/lxc_driver.c:3721 src/libxl/libxl_driver.c:3053
-#: src/qemu/qemu_hotplug.c:3005 src/uml/uml_driver.c:2268
+#: src/libxl/libxl_driver.c:2997 src/qemu/qemu_hotplug.c:1505
+#: src/qemu/qemu_hotplug.c:1608 src/uml/uml_driver.c:2115
 #, c-format
 msgid "disk %s not found"
 msgstr "未找到磁盘 %s"
 
-#: src/lxc/lxc_driver.c:3741 src/lxc/lxc_driver.c:3871
-#: src/lxc/lxc_driver.c:3938 src/lxc/lxc_driver.c:3997
-#, c-format
-msgid "Unable to remove device %s"
-msgstr ""
-
-#: src/lxc/lxc_driver.c:3778 src/qemu/qemu_hotplug.c:3399
+#: src/lxc/lxc_driver.c:4641 src/qemu/qemu_hotplug.c:3402
 #, c-format
 msgid "network device %s not found"
 msgstr "未找到网络设备 %s"
 
-#: src/lxc/lxc_driver.c:3803
+#: src/lxc/lxc_driver.c:4666
 msgid "Only bridged veth devices can be detached"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:3843
+#: src/lxc/lxc_driver.c:4705
 msgid "usb device not found"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:3918 src/lxc/lxc_driver.c:3977
+#: src/lxc/lxc_driver.c:4770 src/lxc/lxc_driver.c:4819
 #, c-format
 msgid "hostdev %s not found"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:4106 src/libxl/libxl_driver.c:3153
-#: src/xen/xm_internal.c:1381
+#: src/libxl/libxl_driver.c:3099 src/xen/xm_internal.c:1547
 #, c-format
 msgid "device type '%s' cannot be detached"
 msgstr "无法分离设备类型 '%s'"
 
-#: src/lxc/lxc_driver.c:4148 src/lxc/lxc_driver.c:4274
-#: src/lxc/lxc_driver.c:4384 src/qemu/qemu_driver.c:6918
-#: src/qemu/qemu_driver.c:7065 src/qemu/qemu_driver.c:7200
+#: src/qemu/qemu_driver.c:5591
 msgid "cannot do live update a device on inactive domain"
 msgstr "无法在不活跃的域中进行设备 live 更新"
 
-#: src/lxc/lxc_driver.c:4159 src/lxc/lxc_driver.c:4282
-#: src/lxc/lxc_driver.c:4392 src/libxl/libxl_driver.c:3304
-#: src/libxl/libxl_driver.c:3408 src/libxl/libxl_driver.c:3512
-#: src/qemu/qemu_driver.c:6926 src/qemu/qemu_driver.c:7073
-#: src/qemu/qemu_driver.c:7208
+#: src/libxl/libxl_driver.c:3260 src/qemu/qemu_driver.c:5599
 msgid "cannot modify device on transient domain"
 msgstr "无法修改临时域中的设备"
 
-#: src/lxc/lxc_driver.c:4324
+#: src/lxc/lxc_driver.c:5157
 msgid "Unable to modify live devices"
 msgstr "无法修改 live 设备"
 
-#: src/lxc/lxc_driver.c:4533 src/libxl/libxl_driver.c:1079
-#: src/qemu/qemu_command.c:7858 src/qemu/qemu_driver.c:1210
-#: src/xen/xen_driver.c:640
+#: src/qemu/qemu_command.c:3696 src/qemu/qemu_driver.c:983
 msgid "Host SMBIOS information is not available"
 msgstr "主机 SMBIOS 信息不可用"
 
-#: src/lxc/lxc_process.c:279 src/network/bridge_driver.c:1870
-#: src/qemu/qemu_command.c:395 src/qemu/qemu_driver.c:9429
-#: src/qemu/qemu_hotplug.c:2167 src/util/virnetdevmacvlan.c:938
+#: src/lxc/lxc_driver.c:5415
+msgid "domain is not active"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:5650 src/qemu/qemu_driver.c:16124
+msgid "cgroup CPUACCT controller is not mounted"
+msgstr "未挂载 cgroup CPUACCT 控制器"
+
+#: src/lxc/lxc_driver.c:1226 src/network/bridge_driver.c:1780
+#: src/qemu/qemu_command.c:270 src/util/virnetdevmacvlan.c:583
 #, c-format
 msgid "cannot set bandwidth limits on %s"
 msgstr "无法在 %s 中设置带宽"
 
-#: src/lxc/lxc_process.c:314
+#: src/lxc/lxc_driver.c:1262
 msgid "Unable to set network bandwidth on direct interfaces"
 msgstr "无法在直接接口中设定网络带宽"
 
-#: src/lxc/lxc_process.c:328
+#: src/lxc/lxc_driver.c:1276
 msgid "Unable to set port profile on direct interfaces"
 msgstr "无法在直接接口中设定端口侧写"
 
-#: src/lxc/lxc_process.c:460
+#: src/lxc/lxc_driver.c:1394
 #, c-format
 msgid "Unsupported network type %s"
 msgstr "不支持的网络类型 %s"
 
-#: src/lxc/lxc_process.c:584
+#: src/lxc/lxc_process.c:582
 #, c-format
 msgid "Unable to stat %s"
 msgstr ""
 
-#: src/lxc/lxc_process.c:687
+#: src/lxc/lxc_driver.c:1465
 #, c-format
 msgid "Invalid PID %d for container"
 msgstr "容器的无效 PID %d"
 
-#: src/lxc/lxc_process.c:708
-msgid "Some processes refused to die"
+#: src/lxc/lxc_process.c:710
+msgid "Unable to kill all processes"
 msgstr ""
 
 #: src/lxc/lxc_process.c:716
+msgid "Unable to thaw all processes"
+msgstr ""
+
+#: src/lxc/lxc_process.c:730
+msgid "Some processes refused to die"
+msgstr ""
+
+#: src/lxc/lxc_process.c:738
 #, c-format
 msgid "Processes %d refused to die"
 msgstr ""
 
-#: src/lxc/lxc_process.c:855
+#: src/lxc/lxc_process.c:878
 msgid "Failure while reading log output"
 msgstr ""
 
-#: src/lxc/lxc_process.c:876
+#: src/lxc/lxc_process.c:899
 #, c-format
 msgid "Out of space while reading log output: %s"
 msgstr ""
 
-#: src/lxc/lxc_process.c:891
+#: src/lxc/lxc_process.c:914
 #, c-format
 msgid "Timed out while reading log output: %s"
 msgstr ""
 
-#: src/lxc/lxc_process.c:911
+#: src/lxc/lxc_process.c:934
 #, c-format
 msgid "Unable to open log file %s"
 msgstr ""
 
-#: src/lxc/lxc_process.c:918
+#: src/lxc/lxc_process.c:941
 #, c-format
 msgid "Unable to seek log file %s to %llu"
 msgstr ""
 
-#: src/lxc/lxc_process.c:1010
+#: src/lxc/lxc_driver.c:1747
 msgid "Unable to find 'cpuacct' cgroups controller mount"
 msgstr "无法找到 'cpuacct' cgroups 控制器挂载"
 
-#: src/lxc/lxc_process.c:1017
+#: src/lxc/lxc_driver.c:1753
 msgid "Unable to find 'devices' cgroups controller mount"
 msgstr "无法找到 'devices' cgroups 控制器挂载"
 
-#: src/lxc/lxc_process.c:1024
+#: src/lxc/lxc_driver.c:1759
 msgid "Unable to find 'memory' cgroups controller mount"
 msgstr "无法找到 'memory' cgroups 控制器挂载"
 
-#: src/lxc/lxc_process.c:1031
+#: src/lxc/lxc_driver.c:1765
 #, c-format
 msgid "Cannot create log directory '%s'"
 msgstr "无法生成日志目录 '%s'"
 
-#: src/lxc/lxc_process.c:1122
+#: src/lxc/lxc_driver.c:1800
 msgid "Only PTY console types are supported"
 msgstr "只支持 PTY 控制台类型"
 
-#: src/lxc/lxc_process.c:1150
-#, c-format
-msgid "Failed to open '%s'"
-msgstr "打开 '%s' 失败"
-
-#: src/lxc/lxc_process.c:1211 src/lxc/lxc_process.c:1231
-#: src/lxc/lxc_process.c:1240 src/lxc/lxc_process.c:1276
+#: src/lxc/lxc_driver.c:1898
 #, c-format
 msgid "guest failed to start: %s"
 msgstr "虚拟机无法启动：%s"
 
-#: src/lxc/lxc_process.c:1217
+#: src/lxc/lxc_driver.c:1872
 msgid "could not close handshake fd"
 msgstr "无法关闭握手 fd"
 
-#: src/lxc/lxc_process.c:1243
+#: src/lxc/lxc_driver.c:1885
 #, c-format
 msgid "Failed to read pid file %s/%s.pid"
 msgstr "读取 pid 文件 %s/%s.pid 失败"
 
-#: src/lxc/lxc_process.c:1257 src/lxc/lxc_process.c:1468
+#: src/lxc/lxc_process.c:1280 src/lxc/lxc_process.c:1490
 #, c-format
 msgid "No valid cgroup for machine %s"
 msgstr ""
 
-#: src/lxc/lxc_process.c:1324
+#: src/lxc/lxc_driver.c:1937
 msgid "could not close logfile"
 msgstr "无法关闭 logfile"
 
-#: src/lxc/lxc_process.c:1397 src/libxl/libxl_driver.c:122
-#: src/qemu/qemu_driver.c:290 src/uml/uml_driver.c:194
+#: src/lxc/lxc_driver.c:2329 src/libxl/libxl_driver.c:171
+#: src/qemu/qemu_driver.c:166 src/uml/uml_driver.c:168
 #, c-format
 msgid "Failed to autostart VM '%s': %s"
 msgstr "自动启动虚拟机 '%s' 失败：%s"
 
-#: src/libxl/libxl_domain.c:418
+#: src/qemu/qemu_domain.c:789
+msgid "cannot acquire state change lock"
+msgstr "无法获得状态更改锁定"
+
+#: src/qemu/qemu_domain.c:797
+msgid "cannot acquire job mutex"
+msgstr "无法获得任务互斥"
+
+#: src/lxc/lxc_driver.c:1645
 #, c-format
 msgid "failed to open logfile %s"
 msgstr ""
 
-#: src/libxl/libxl_domain.c:428
+#: src/libxl/libxl_domain.c:522
 #, c-format
 msgid "cannot create libxenlight logger for domain %s"
 msgstr ""
 
-#: src/libxl/libxl_domain.c:435
+#: src/libxl/libxl_domain.c:529
 msgid "Failed libxl context initialization"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:124 src/qemu/qemu_driver.c:284
-#: src/qemu/qemu_driver.c:292 src/qemu/qemu_hostdev.c:1218
-#: src/qemu/qemu_hostdev.c:1243 src/qemu/qemu_hostdev.c:1288
-#: src/secret/secret_driver.c:498 src/uml/uml_driver.c:195
-#: src/util/virerror.c:257 src/xenapi/xenapi_utils.c:265 tools/virsh.c:282
-#: tools/virsh-domain-monitor.c:57
+#: src/libxl/libxl_driver.c:173 src/qemu/qemu_driver.c:160
+#: src/qemu/qemu_driver.c:168 src/qemu/qemu_hostdev.c:382
+#: src/qemu/qemu_hostdev.c:401 src/qemu/qemu_hostdev.c:429
+#: src/secret/secret_driver.c:505 src/uml/uml_driver.c:169
+#: src/xenapi/xenapi_utils.c:282 tools/virsh.c:530
 msgid "unknown error"
 msgstr "未知错误"
 
-#: src/libxl/libxl_driver.c:144 src/libxl/libxl_driver.c:3585
+#: src/libxl/libxl_driver.c:189 src/libxl/libxl_driver.c:3386
 msgid "libxl_get_physinfo_info failed"
 msgstr "libxl_get_physinfo_info 失败"
 
-#: src/libxl/libxl_driver.c:150
+#: src/libxl/libxl_driver.c:205
 #, c-format
 msgid "machine type %s too big for destination"
 msgstr "对于目的地来说极其类型 %s 太大"
@@ -10151,514 +10392,516 @@
 msgid "Failed to open domain image file '%s'"
 msgstr "打开域映像文件 '%s' 失败"
 
-#: src/libxl/libxl_driver.c:204
+#: src/libxl/libxl_driver.c:251
 msgid "failed to read libxl header"
 msgstr "读取 libxl 标头失败"
 
-#: src/libxl/libxl_driver.c:209 src/qemu/qemu_driver.c:5215
+#: src/libxl/libxl_driver.c:256 src/qemu/qemu_driver.c:3965
 msgid "image magic is incorrect"
 msgstr "image magic 不正确"
 
-#: src/libxl/libxl_driver.c:215 src/qemu/qemu_driver.c:5241
+#: src/libxl/libxl_driver.c:262 src/qemu/qemu_driver.c:3991
 #, c-format
 msgid "image version is not supported (%d > %d)"
 msgstr "映像版本不受支持（%d > %d）"
 
-#: src/libxl/libxl_driver.c:222 src/qemu/qemu_driver.c:5248
+#: src/libxl/libxl_driver.c:269 src/qemu/qemu_driver.c:3998
 #, c-format
 msgid "invalid XML length: %d"
 msgstr "无效 XML 长度：%d"
 
-#: src/libxl/libxl_driver.c:230 src/qemu/qemu_driver.c:5257
+#: src/libxl/libxl_driver.c:279 src/qemu/qemu_driver.c:4009
 msgid "failed to read XML"
 msgstr "读取 XML 失败"
 
-#: src/libxl/libxl_driver.c:334
-#, c-format
-msgid "Unable to cleanup domain %d"
-msgstr "无法清除域 %d"
+#: src/libxl/libxl_driver.c:542
+msgid "Failed to create thread to handle domain shutdown"
+msgstr ""
 
-#: src/libxl/libxl_driver.c:485 src/libxl/libxl_driver.c:2409
+#: src/libxl/libxl_driver.c:562 src/libxl/libxl_driver.c:2456
 #, c-format
 msgid "Failed to pin vcpu '%d' with libxenlight"
 msgstr "使用 libxenlight pin vcpu '%d' 失败"
 
-#: src/libxl/libxl_driver.c:589 src/qemu/qemu_driver.c:5654
+#: src/libxl/libxl_driver.c:660 src/qemu/qemu_driver.c:4380
 #, c-format
 msgid ""
 "cannot restore domain '%s' uuid %s from a file which belongs to domain '%s' "
 "uuid %s"
 msgstr "无法从属于域 '%s' uuid %s 的文件中保存域 '%s' uuid %s"
 
-#: src/libxl/libxl_driver.c:614
+#: src/libxl/libxl_driver.c:684
 #, c-format
 msgid "libxenlight failed to get free memory for domain '%s'"
 msgstr "libxenlight 无法从域 '%s' 中获取可用内存"
 
-#: src/libxl/libxl_driver.c:638
+#: src/libxl/libxl_driver.c:700
 #, c-format
 msgid "libxenlight failed to create new domain '%s'"
 msgstr "libxenlight 无法生成新域 '%s'"
 
-#: src/libxl/libxl_driver.c:642
+#: src/libxl/libxl_driver.c:704
 #, c-format
 msgid "libxenlight failed to restore domain '%s'"
 msgstr "libxenlight 恢复域 '%s' 失败"
 
-#: src/libxl/libxl_driver.c:654
+#: src/libxl/libxl_driver.c:716
 msgid "libxenlight failed to store userdata"
 msgstr "libxenlight 无法保存用户数据"
 
-#: src/libxl/libxl_driver.c:847
+#: src/libxl/libxl_driver.c:996
 msgid "VNC"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:861
+#: src/libxl/libxl_driver.c:1010
 #, c-format
 msgid "failed to create log dir '%s': %s"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:868
+#: src/libxl/libxl_driver.c:1017
 #, c-format
 msgid "failed to create state dir '%s': %s"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:875
+#: src/libxl/libxl_driver.c:1024
 #, c-format
 msgid "failed to create lib dir '%s': %s"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:882
+#: src/libxl/libxl_driver.c:1031
 #, c-format
 msgid "failed to create save dir '%s': %s"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:897
+#: src/libxl/libxl_driver.c:1038
+#, c-format
+msgid "failed to create dump dir '%s': %s"
+msgstr ""
+
+#: src/libxl/libxl_driver.c:986
 msgid "cannot create capabilities for libxenlight"
 msgstr "无法为 libxenlight 生成容量"
 
-#: src/libxl/libxl_driver.c:1002
+#: src/libxl/libxl_driver.c:1091
 msgid "libxenlight state driver is not active"
 msgstr "libxenlight 状态驱动程序不活跃"
 
-#: src/libxl/libxl_driver.c:1012 src/xen/xen_driver.c:422
+#: src/libxl/libxl_driver.c:1101 src/xen/xen_driver.c:289
 #, c-format
 msgid "unexpected Xen URI path '%s', try xen:///"
 msgstr "意外的 Xen URI 路径 '%s'，尝试 xen:///"
 
-#: src/libxl/libxl_driver.c:1322
+#: src/libxl/libxl_driver.c:1355
 #, c-format
 msgid "Failed to suspend domain '%d' with libxenlight"
 msgstr "使用 libxenlight 挂起域 '%d' 失败"
 
-#: src/libxl/libxl_driver.c:1374
+#: src/libxl/libxl_driver.c:1414
 #, c-format
 msgid "Failed to resume domain '%d' with libxenlight"
 msgstr "使用 libxenlight 恢复域 '%d' 失败"
 
-#: src/libxl/libxl_driver.c:1424
+#: src/libxl/libxl_driver.c:1469
 #, c-format
 msgid "Failed to shutdown domain '%d' with libxenlight"
 msgstr "使用 libxenlight 关闭域 '%d' 失败"
 
-#: src/libxl/libxl_driver.c:1471
+#: src/libxl/libxl_driver.c:1515
 #, c-format
 msgid "Failed to reboot domain '%d' with libxenlight"
 msgstr "使用 libxenlight 重启域 '%d' 失败"
 
-#: src/libxl/libxl_driver.c:1511 src/libxl/libxl_driver.c:1831
-#: src/libxl/libxl_driver.c:2010
+#: src/libxl/libxl_driver.c:1560 src/libxl/libxl_driver.c:1897
+#: src/libxl/libxl_driver.c:2072
 #, c-format
 msgid "Failed to destroy domain '%d'"
 msgstr "销毁域 '%d' 失败"
 
-#: src/libxl/libxl_driver.c:1616
+#: src/libxl/libxl_driver.c:1677
 msgid "cannot set memory on an inactive domain"
 msgstr "无法为不活跃的域设定内存"
 
-#: src/libxl/libxl_driver.c:1623 src/libxl/libxl_driver.c:2216
+#: src/lxc/lxc_driver.c:2807 src/lxc/lxc_driver.c:3166
+#: src/lxc/lxc_driver.c:3315 src/libxl/libxl_driver.c:1684
+#: src/libxl/libxl_driver.c:2276 src/qemu/qemu_driver.c:1847
+#: src/qemu/qemu_driver.c:3328 src/qemu/qemu_driver.c:3464
+#: src/qemu/qemu_driver.c:6062 src/qemu/qemu_driver.c:6281
+#: src/qemu/qemu_driver.c:6490 src/qemu/qemu_driver.c:6652
+#: src/qemu/qemu_driver.c:6936 src/qemu/qemu_driver.c:11172
 msgid "cannot change persistent config of a transient domain"
 msgstr "无法永久更改临时域的配置"
 
-#: src/libxl/libxl_driver.c:1639
+#: src/libxl/libxl_driver.c:1698
 #, c-format
 msgid "Failed to set maximum memory for domain '%d' with libxenlight"
 msgstr "使用 libxenlight 为域 '%d' 设定最大内存失败"
 
-#: src/libxl/libxl_driver.c:1660 src/qemu/qemu_driver.c:2252
-#: src/uml/uml_driver.c:1837
+#: src/libxl/libxl_driver.c:1719 src/qemu/qemu_driver.c:1879
+#: src/uml/uml_driver.c:1707
 msgid "cannot set memory higher than max memory"
 msgstr "无法将内存设置为高于最大内存"
 
-#: src/libxl/libxl_driver.c:1669
+#: src/libxl/libxl_driver.c:1728
 #, c-format
 msgid "Failed to set memory for domain '%d' with libxenlight"
 msgstr "使用 libxenlight 为域 '%d' 设定内存失败"
 
-#: src/libxl/libxl_driver.c:1726
+#: src/libxl/libxl_driver.c:1787
 #, c-format
 msgid "libxl_domain_info failed for domain '%d'"
 msgstr "libxl_domain_info 在域 '%d' 中失败"
 
-#: src/libxl/libxl_driver.c:1786
+#: src/libxl/libxl_driver.c:1852
 #, c-format
 msgid "Domain '%d' has to be running because libxenlight will suspend it"
 msgstr "必须运行域 '%d'，因为 libxenlight 会挂起它。"
 
-#: src/libxl/libxl_driver.c:1794
+#: src/libxl/libxl_driver.c:1860
 #, c-format
 msgid "Failed to create domain save file '%s'"
 msgstr "生成域保存文件 '%s' 失败"
 
-#: src/libxl/libxl_driver.c:1809
+#: src/libxl/libxl_driver.c:1875
 msgid "Failed to write save file header"
 msgstr "写入保存文件表头失败"
 
-#: src/libxl/libxl_driver.c:1815
+#: src/libxl/libxl_driver.c:1881
 msgid "Failed to write xml description"
 msgstr "写入 xml 描述失败"
 
-#: src/libxl/libxl_driver.c:1821
+#: src/libxl/libxl_driver.c:1887
 #, c-format
 msgid "Failed to save domain '%d' with libxenlight"
 msgstr "使用 libxenlight 保存域 '%d' 失败"
 
-#: src/libxl/libxl_driver.c:1841 src/libxl/libxl_driver.c:1944
+#: src/libxl/libxl_driver.c:1911 src/libxl/libxl_driver.c:2003
 msgid "cannot close file"
 msgstr "无法关闭文件"
 
-#: src/libxl/libxl_driver.c:1858 src/libxl/libxl_driver.c:1910
-#: src/test/test_driver.c:2230 src/test/test_driver.c:2343
-#: src/xen/xen_driver.c:1198 src/xen/xen_driver.c:1321
+#: src/libxl/libxl_driver.c:1928 src/libxl/libxl_driver.c:1977
+#: src/test/test_driver.c:1747 src/test/test_driver.c:1860
+#: src/xen/xen_driver.c:1051 src/xen/xen_driver.c:1075
 msgid "xml modification unsupported"
 msgstr "不支持 xml 修改"
 
-#: src/libxl/libxl_driver.c:1991
+#: src/libxl/libxl_driver.c:2052
 #, c-format
 msgid "Before dumping core, failed to suspend domain '%d' with libxenlight"
 msgstr "转储 core 之前，使用 libxenlight 挂起域 '%d' 失败"
 
-#: src/libxl/libxl_driver.c:2002
+#: src/libxl/libxl_driver.c:2063
 #, c-format
 msgid "Failed to dump core of domain '%d' with libxenlight"
 msgstr "使用 libxenlight 转储域 '%d' 的 core 失败"
 
-#: src/libxl/libxl_driver.c:2028
+#: src/libxl/libxl_driver.c:2093
 #, c-format
 msgid "After dumping core, failed to resume domain '%d' with libxenlight"
 msgstr "转储 core 后，使用 libxenlight 恢复域 '%d' 失败"
 
-#: src/libxl/libxl_driver.c:2065 src/qemu/qemu_driver.c:3266
-#: src/test/test_driver.c:6398
+#: src/libxl/libxl_driver.c:2137 src/qemu/qemu_driver.c:2760
 msgid "cannot do managed save for transient domain"
 msgstr "无法为临时域管理保存"
 
-#: src/libxl/libxl_driver.c:2193 src/libxl/libxl_driver.c:2332
-#: src/test/test_driver.c:2646 src/xen/xen_driver.c:1373
+#: src/libxl/libxl_driver.c:2250 src/libxl/libxl_driver.c:2397
+#: src/qemu/qemu_driver.c:3791 src/test/test_driver.c:2133
+#: src/test/test_driver.c:2189 src/xen/xen_driver.c:1117
 #, c-format
 msgid "invalid flag combination: (0x%x)"
 msgstr "无效标签组合： (0x%x)"
 
-#: src/libxl/libxl_driver.c:2198
+#: src/libxl/libxl_driver.c:2255
 msgid "nvcpus is zero"
 msgstr "nvcpus 为 0"
 
-#: src/libxl/libxl_driver.c:2210
+#: src/libxl/libxl_driver.c:2270
 msgid "cannot set vcpus on an inactive domain"
 msgstr "无法在不活跃的域中设定 vcpu"
 
-#: src/libxl/libxl_driver.c:2222 src/xen/xend_internal.c:1816
-#: src/xen/xm_internal.c:690
+#: src/libxl/libxl_driver.c:2282 src/qemu/qemu_driver.c:3341
+#: src/xen/xend_internal.c:2220 src/xen/xm_internal.c:731
 msgid "could not determine max vcpus for the domain"
 msgstr "无法决定该域的最大 vcpu"
 
-#: src/libxl/libxl_driver.c:2232 src/qemu/qemu_driver.c:4177
-#: src/xen/xend_internal.c:1821 src/xen/xm_internal.c:699
+#: src/libxl/libxl_driver.c:2292 src/qemu/qemu_driver.c:3351
+#: src/xen/xend_internal.c:2225 src/xen/xm_internal.c:740
 #, c-format
 msgid ""
 "requested vcpus is greater than max allowable vcpus for the domain: %d > %d"
 msgstr "需要的 vcpu 大于该域最多允许的 vcpu：%d > %d"
 
-#: src/libxl/libxl_driver.c:2268 src/libxl/libxl_driver.c:2277
+#: src/libxl/libxl_driver.c:2330 src/libxl/libxl_driver.c:2339
 #, c-format
 msgid "Failed to set vcpus for domain '%d' with libxenlight"
 msgstr "使用 libxenlight 为域 '%d' 设定 vcpu 失败"
 
-#: src/libxl/libxl_driver.c:2346
+#: src/libxl/libxl_driver.c:2411 src/qemu/qemu_driver.c:3805
+#: src/qemu/qemu_driver.c:11340 src/test/test_driver.c:2149
 msgid "domain is transient"
 msgstr "域为暂时的"
 
-#: src/libxl/libxl_driver.c:2383
+#: src/libxl/libxl_driver.c:2619
 msgid "domain is inactive"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:2419
+#: src/libxl/libxl_driver.c:2655
 #, c-format
 msgid "Failed to delete vcpupin xml for vcpu '%d'"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:2437
+#: src/libxl/libxl_driver.c:2462
 msgid "failed to update or add vcpupin xml"
 msgstr "更新或者添加 vcpupin xml 失败"
 
-#: src/libxl/libxl_driver.c:2571
+#: src/libxl/libxl_driver.c:2509
 #, c-format
 msgid "Failed to list vcpus for domain '%d' with libxenlight"
 msgstr "使用 libxenlight 为域 '%d' 列出 vcpu 失败"
 
-#: src/libxl/libxl_driver.c:2647 src/libxl/libxl_driver.c:2691
-#: src/qemu/qemu_driver.c:5760 src/qemu/qemu_driver.c:5808
-#: src/xen/xen_driver.c:1603 src/xen/xen_driver.c:1656
-#, c-format
-msgid "unsupported config type %s"
-msgstr "不支持的配置类型 %s"
-
-#: src/libxl/libxl_driver.c:2657
+#: src/libxl/libxl_driver.c:2600
 msgid "parsing xm config failed"
 msgstr "解析 xm 配置失败"
 
-#: src/libxl/libxl_driver.c:2868 src/qemu/qemu_driver.c:6256
-#: src/uml/uml_driver.c:2097 src/vmware/vmware_driver.c:762
+#: src/libxl/libxl_driver.c:2807 src/qemu/qemu_driver.c:4972
+#: src/uml/uml_driver.c:1944 src/vmware/vmware_driver.c:644
 msgid "cannot undefine transient domain"
 msgstr "无法取消定义瞬时域"
 
-#: src/libxl/libxl_driver.c:2880 src/qemu/qemu_driver.c:6281
+#: src/libxl/libxl_driver.c:2819 src/qemu/qemu_driver.c:4997
 msgid "Failed to remove domain managed save image"
 msgstr "删除域管理的保存映像失败"
 
-#: src/libxl/libxl_driver.c:2885 src/qemu/qemu_driver.c:6287
-#: src/test/test_driver.c:3141 tools/virsh-domain.c:3161
+#: src/libxl/libxl_driver.c:2824 src/qemu/qemu_driver.c:5003
+#: tools/virsh.c:2045
 msgid "Refusing to undefine while domain managed save image exists"
 msgstr "域管理的保存映像存在时拒绝取消定义"
 
-#: src/libxl/libxl_driver.c:2941 src/qemu/qemu_driver.c:6512
-#: src/qemu/qemu_hotplug.c:734
+#: src/libxl/libxl_driver.c:2882 src/qemu/qemu_hotplug.c:67
 #, c-format
 msgid "No device with bus '%s' and target '%s'"
 msgstr "没有总线为 '%s' 且目标为 '%s' 的设备"
 
-#: src/libxl/libxl_driver.c:2948 src/qemu/qemu_hotplug.c:82
+#: src/libxl/libxl_driver.c:2889 src/qemu/qemu_hotplug.c:82
 #, c-format
 msgid "Removable media not supported for %s device"
 msgstr "%s 设备不支持可移动介质"
 
-#: src/libxl/libxl_driver.c:2958
+#: src/libxl/libxl_driver.c:2899
 #, c-format
 msgid "libxenlight failed to change media for disk '%s'"
 msgstr "libxenlight 无法在域 '%s' 中更改介质"
 
-#: src/libxl/libxl_driver.c:2999 src/qemu/qemu_hotplug.c:635
-#: src/uml/uml_driver.c:2144
+#: src/libxl/libxl_driver.c:2940 src/qemu/qemu_hotplug.c:574
+#: src/uml/uml_driver.c:1991
 msgid "disk source path is missing"
 msgstr "缺少磁盘源"
 
-#: src/libxl/libxl_driver.c:3012
+#: src/libxl/libxl_driver.c:2955
 #, c-format
 msgid "libxenlight failed to attach disk '%s'"
 msgstr "libxenlight 附加磁盘 '%s' 失败"
 
-#: src/libxl/libxl_driver.c:3021 src/qemu/qemu_hotplug.c:781
-#: src/uml/uml_driver.c:2213
+#: src/libxl/libxl_driver.c:2964 src/qemu/qemu_driver.c:5089
+#: src/uml/uml_driver.c:2061
 #, c-format
 msgid "disk bus '%s' cannot be hotplugged."
 msgstr "无法热插拔磁盘总线 '%s'。"
 
-#: src/libxl/libxl_driver.c:3027 src/qemu/qemu_hotplug.c:787
+#: src/libxl/libxl_driver.c:2970 src/qemu/qemu_driver.c:5094
 #, c-format
 msgid "disk device type '%s' cannot be hotplugged"
 msgstr "无法热插拔磁盘设备类型 '%s'。"
 
-#: src/libxl/libxl_driver.c:3065
+#: src/libxl/libxl_driver.c:3009
 #, c-format
 msgid "libxenlight failed to detach disk '%s'"
 msgstr "libxenlight 分离磁盘 '%s' 失败"
 
-#: src/libxl/libxl_driver.c:3075
+#: src/libxl/libxl_driver.c:3019
 #, c-format
 msgid "disk bus '%s' cannot be hot unplugged."
 msgstr "无法热插拔磁盘总线 '%s'。"
 
-#: src/libxl/libxl_driver.c:3081
+#: src/libxl/libxl_driver.c:3025
 #, c-format
 msgid "device type '%s' cannot hot unplugged"
 msgstr "无法热插拔设备类型 '%s'。"
 
-#: src/libxl/libxl_driver.c:3205 src/qemu/qemu_driver.c:6551
+#: src/libxl/libxl_driver.c:3150 src/qemu/qemu_driver.c:5305
 #, c-format
 msgid "disk bus '%s' cannot be updated."
 msgstr "无法更新磁盘总线 '%s'"
 
-#: src/libxl/libxl_driver.c:3212
+#: src/libxl/libxl_driver.c:3157 src/qemu/qemu_driver.c:5342
 #, c-format
 msgid "device type '%s' cannot be updated"
 msgstr "无法更新设备类型 '%s'"
 
-#: src/libxl/libxl_driver.c:3233 src/openvz/openvz_driver.c:2021
-#: src/qemu/qemu_driver.c:6810
+#: src/libxl/libxl_driver.c:3178 src/qemu/qemu_driver.c:5483
 #, c-format
 msgid "target %s doesn't exist."
 msgstr "目标 %s 不存在"
 
-#: src/libxl/libxl_driver.c:3239 src/qemu/qemu_driver.c:6817
+#: src/libxl/libxl_driver.c:3184 src/qemu/qemu_driver.c:5490
 msgid "this disk doesn't support update"
 msgstr "这个磁盘不支持更新"
 
-#: src/libxl/libxl_driver.c:3614 src/libxl/libxl_conf.c:142
+#: src/libxl/libxl_driver.c:3868 src/libxl/libxl_conf.c:143
 msgid "libxl_get_numainfo failed"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:3621 src/nodeinfo.c:1605 src/nodeinfo.c:1759
+#: src/nodeinfo.c:828
 #, c-format
 msgid "start cell %d out of range (0-%d)"
 msgstr "启动单元 %d 溢出（0 - %d）"
 
-#: src/libxl/libxl_driver.c:3720 src/qemu/qemu_driver.c:7337
-#: src/uml/uml_driver.c:2413
+#: src/libxl/libxl_driver.c:3481 src/qemu/qemu_driver.c:5774
+#: src/uml/uml_driver.c:2253
 msgid "cannot set autostart for transient domain"
 msgstr "无法为瞬时域设定自动启动"
 
-#: src/libxl/libxl_driver.c:3735 src/qemu/qemu_driver.c:7352
-#: src/storage/storage_driver.c:1156 src/uml/uml_driver.c:2428
+#: src/libxl/libxl_driver.c:3496 src/qemu/qemu_driver.c:5789
+#: src/storage/storage_driver.c:1048 src/uml/uml_driver.c:2268
 #, c-format
 msgid "cannot create autostart directory %s"
 msgstr "无法生成自动启动目录 %s"
 
-#: src/libxl/libxl_driver.c:3810
+#: src/libxl/libxl_driver.c:3555 src/libxl/libxl_driver.c:3623
+#: src/libxl/libxl_driver.c:3714
 #, c-format
 msgid "Failed to get scheduler id for domain '%d' with libxenlight"
 msgstr "使用 libxenlight 为域 '%d' 获取调度程序 id 失败"
 
-#: src/libxl/libxl_driver.c:3858 src/libxl/libxl_driver.c:3935
+#: src/libxl/libxl_driver.c:3630 src/libxl/libxl_driver.c:3721
 msgid "Only 'credit' scheduler is supported"
 msgstr "只支持 'credit' 调度程序"
 
-#: src/libxl/libxl_driver.c:3864 src/libxl/libxl_driver.c:3941
+#: src/libxl/libxl_driver.c:3636 src/libxl/libxl_driver.c:3727
 #, c-format
 msgid "Failed to get scheduler parameters for domain '%d' with libxenlight"
 msgstr "使用 libxenlight 为域 '%d' 获取调度程序参数失败"
 
-#: src/libxl/libxl_driver.c:3957
+#: src/libxl/libxl_driver.c:3759
 #, c-format
 msgid "Failed to set scheduler parameters for domain '%d' with libxenlight"
 msgstr "使用 libxenlight 为域 '%d' 设置调度程序参数失败"
 
-#: src/libxl/libxl_driver.c:3988 src/xen/xen_driver.c:2643
+#: src/xen/xen_driver.c:2139
 msgid "Named device aliases are not supported"
 msgstr "不支持命名的设备别名"
 
-#: src/libxl/libxl_driver.c:4011 src/qemu/qemu_driver.c:13930
+#: src/qemu/qemu_driver.c:10891
 #, c-format
 msgid "cannot find character device %s"
 msgstr "无法找到字符设备 %s"
 
-#: src/libxl/libxl_driver.c:4038 src/qemu/qemu_driver.c:13950
+#: src/libxl/libxl_driver.c:4306 src/qemu/qemu_driver.c:14575
 msgid "Active console session exists for this domain"
 msgstr "这个域有活跃控制台会话"
 
-#: src/libxl/libxl_driver.c:4144
+#: src/libxl/libxl_driver.c:4412
 msgid "unable to get numa affinity"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:4154
+#: src/libxl/libxl_driver.c:4422
 #, c-format
 msgid "Node %zu out of range"
 msgstr ""
 
-#: src/libxl/libxl_conf.c:110
+#: src/libxl/libxl_conf.c:913
 msgid "Failed to get node physical info from libxenlight"
 msgstr "从 libxenlight 获取节点物理信息失败"
 
-#: src/libxl/libxl_conf.c:148
+#: src/libxl/libxl_conf.c:149
 msgid "libxl_get_cpu_topology failed"
 msgstr ""
 
-#: src/libxl/libxl_conf.c:255
+#: src/libxl/libxl_conf.c:919
 msgid "Failed to get version info from libxenlight"
 msgstr "从 libxenlight 获取版本信息失败"
 
-#: src/libxl/libxl_conf.c:264 src/libxl/libxl_conf.c:1043
-#: src/storage/storage_backend.c:1628
-#: src/storage/storage_backend_logical.c:207
+#: src/storage/storage_backend.c:1447
+#: src/storage/storage_backend_logical.c:209
 #, c-format
 msgid "Failed to compile regex %s"
 msgstr "编译表达式 %s 失败"
 
-#: src/libxl/libxl_conf.c:458
+#: src/libxl/libxl_conf.c:462
 #, c-format
 msgid "libxenlight failed to resolve security label '%s'"
 msgstr "libxenlight 无法解析安全标签 '%s'"
 
-#: src/libxl/libxl_conf.c:466
+#: src/libxl/libxl_conf.c:375
 #, c-format
 msgid "libxenlight failed to parse UUID '%s'"
 msgstr "libxenlight 无法解析 UUID '%s'"
 
-#: src/libxl/libxl_conf.c:485
+#: src/libxl/libxl_conf.c:489
 msgid "unknown chrdev type"
 msgstr ""
 
-#: src/libxl/libxl_conf.c:556 src/qemu/qemu_command.c:5981
+#: src/qemu/qemu_command.c:2898
 #, c-format
 msgid "unsupported chardev '%s'"
 msgstr "不支持的 chardev '%s'"
 
-#: src/libxl/libxl_conf.c:651
+#: src/libxl/libxl_conf.c:655
 msgid "Only one serial device is supported by libxl"
 msgstr ""
 
-#: src/libxl/libxl_conf.c:661
+#: src/libxl/libxl_conf.c:665
 msgid "Parallel devices are not supported by libxl"
 msgstr ""
 
-#: src/libxl/libxl_conf.c:745 src/libxl/libxl_conf.c:770
-#: src/libxl/libxl_conf.c:780 src/libxl/libxl_conf.c:792
+#: src/libxl/libxl_conf.c:749 src/libxl/libxl_conf.c:774
+#: src/libxl/libxl_conf.c:784 src/libxl/libxl_conf.c:796
 #, c-format
 msgid "libxenlight does not support disk format %s with disk driver %s"
 msgstr "libxenlight 不支持使用磁盘驱动程序 %s 的磁盘格式 %s"
 
-#: src/libxl/libxl_conf.c:802
+#: src/libxl/libxl_conf.c:535
 #, c-format
 msgid "libxenlight does not support disk driver %s"
 msgstr "libxenlight 不支持磁盘驱动程序 %s"
 
-#: src/libxl/libxl_conf.c:822
+#: src/libxl/libxl_conf.c:551
 msgid "libxenlight does not support transient disks"
 msgstr "libxenlight 不支持临时磁盘"
 
-#: src/libxl/libxl_conf.c:899
+#: src/libxl/libxl_conf.c:903
 #, c-format
 msgid "libxenlight does not support network device type %s"
 msgstr "libxenlight 不支持网络设备类型 %s"
 
-#: src/libxl/libxl_conf.c:1086
+#: src/libxl/libxl_conf.c:1092
 #, c-format
 msgid "Failed to create log file '%s': %s"
 msgstr ""
 
-#: src/libxl/libxl_conf.c:1096
+#: src/libxl/libxl_conf.c:1102
 msgid "cannot create logger for libxenlight, disabling driver"
 msgstr ""
 
-#: src/libxl/libxl_conf.c:1101
+#: src/libxl/libxl_conf.c:1107
 msgid ""
 "cannot initialize libxenlight context, probably not running in a Xen Dom0, "
 "disabling driver"
 msgstr ""
 
-#: src/libxl/libxl_conf.c:1107
+#: src/libxl/libxl_conf.c:1113
 msgid "cannot version information from libxenlight, disabling driver"
 msgstr ""
 
-#: src/libxl/libxl_conf.c:1117
+#: src/libxl/libxl_conf.c:1123
 msgid "Unable to configure libxl's memory management parameters"
 msgstr "无法配置 libxl 的内存管理参数"
 
-#: src/network/bridge_driver.c:130
+#: src/network/bridge_driver.c:134
 #, c-format
 msgid "no network with matching uuid '%s' (%s)"
 msgstr ""
 
-#: src/network/bridge_driver.c:786
+#: src/network/bridge_driver.c:843
 #, c-format
 msgid ""
 "Publicly routable address %s is prohibited. The version of dnsmasq on this "
@@ -10669,350 +10912,362 @@
 "in RFC1918/RFC3484/RFC4193)."
 msgstr ""
 
-#: src/network/bridge_driver.c:861
+#: src/network/bridge_driver.c:918
 msgid "For IPv4, multiple DHCP definitions cannot be specified."
 msgstr "在 IPv4 中可以指定多个 DHCP 定义。"
 
-#: src/network/bridge_driver.c:874
+#: src/network/bridge_driver.c:931
 #, c-format
 msgid ""
 "The version of dnsmasq on this host (%d.%d) doesn't adequately support IPv6 "
 "dhcp range or dhcp host specification. Version %d.%d or later is required."
 msgstr ""
 
-#: src/network/bridge_driver.c:887
+#: src/network/bridge_driver.c:944
 msgid "For IPv6, multiple DHCP definitions cannot be specified."
 msgstr "在 IPv6 中不可以指定多个 DHCP 定义。"
 
-#: src/network/bridge_driver.c:1059
+#: src/network/bridge_driver.c:1116
 #, c-format
 msgid "couldn't write dnsmasq config file '%s'"
 msgstr "无法写入 dnsmasq 配置文件 '%s'"
 
-#: src/network/bridge_driver.c:1091 src/network/bridge_driver.c:1097
-#: src/network/bridge_driver.c:1108 src/network/bridge_driver.c:1408
-#: src/network/bridge_driver.c:1414
+#: src/network/bridge_driver.c:688 src/network/bridge_driver.c:694
+#: src/network/bridge_driver.c:706 src/network/bridge_driver.c:773
+#: src/network/bridge_driver.c:779
 #, c-format
 msgid "cannot create directory %s"
 msgstr "无法生成日志目录 %s"
 
-#: src/network/bridge_driver.c:1301
+#: src/network/bridge_driver.c:1358
 #, c-format
 msgid "bridge '%s' has an invalid prefix"
 msgstr "桥接 '%s' 有一个无效前缀"
 
-#: src/network/bridge_driver.c:1362
+#: src/network/bridge_driver.c:847
 #, c-format
 msgid "couldn't write radvd config file '%s'"
 msgstr "无法写入 radvd 配置文件 '%s'"
 
-#: src/network/bridge_driver.c:1400
+#: src/network/bridge_driver.c:765
 #, c-format
 msgid "Cannot find %s - Possibly the package isn't installed"
 msgstr "未找到 %s - 可能没有安装该软件包"
 
-#: src/network/bridge_driver.c:1630
+#: src/network/bridge_driver.c:1523
 #, c-format
 msgid "cannot write to %s to disable IPv6 on bridge %s"
 msgstr "无法写入  %s 以便禁用桥接 %s 中的 IPv6"
 
-#: src/network/bridge_driver.c:1650 src/network/bridge_driver.c:1664
+#: src/network/bridge_driver.c:1545 src/network/bridge_driver.c:1561
 #, c-format
 msgid "cannot disable %s"
 msgstr "无法禁用 %s"
 
-#: src/network/bridge_driver.c:1683
+#: src/network/bridge_driver.c:1675
 #, c-format
 msgid "bridge '%s' has an invalid netmask or IP address"
 msgstr "桥接 '%s' 中有无效掩码或者 IP 地址"
 
-#: src/network/bridge_driver.c:1726
+#: src/network/bridge_driver.c:1783
 #, c-format
 msgid "network '%s' has an invalid netmask or IP address in route definition"
 msgstr "网络 '%s' 在路由定义中有一个无效子网掩码或者 IP 地址"
 
-#: src/network/bridge_driver.c:1844
+#: src/network/bridge_driver.c:1765
 msgid "failed to enable IP forwarding"
 msgstr "启动 IP 转发失败"
 
-#: src/network/bridge_driver.c:2002
+#: src/network/bridge_driver.c:1914
 msgid "network is already active"
 msgstr "网络已经激活"
 
-#: src/network/bridge_driver.c:2107 src/network/bridge_driver.c:2658
-#: src/network/bridge_driver.c:2730 src/network/bridge_driver.c:2888
-#: src/network/bridge_driver.c:2922 src/network/bridge_driver.c:3046
-#: src/parallels/parallels_network.c:477 src/parallels/parallels_network.c:528
-#: src/parallels/parallels_network.c:594 src/test/test_driver.c:3803
+#: src/network/bridge_driver.c:2016 src/network/bridge_driver.c:2344
+#: src/network/bridge_driver.c:2431 src/network/bridge_driver.c:2454
+#: src/network/bridge_driver.c:2493 src/network/bridge_driver.c:2548
+#: src/network/bridge_driver.c:2573
 msgid "no network with matching uuid"
 msgstr "没有带匹配 uuid 的网络"
 
-#: src/network/bridge_driver.c:2133 src/network/bridge_driver.c:3262
-#: src/network/bridge_driver.c:3633 src/network/bridge_driver.c:3811
-#: src/network/bridge_driver.c:3965 src/parallels/parallels_network.c:501
+#: src/network/bridge_driver.c:2039 src/network/bridge_driver.c:2706
+#: src/network/bridge_driver.c:2920 src/network/bridge_driver.c:3021
+#: src/network/bridge_driver.c:3108
 #, c-format
 msgid "no network with matching name '%s'"
 msgstr "没有匹配名称 '%s' 的网络"
 
-#: src/network/bridge_driver.c:2414
+#: src/network/bridge_driver.c:2491
+#, c-format
+msgid "Unsupported <mac> element in network %s with forward mode='%s'"
+msgstr ""
+
+#: src/network/bridge_driver.c:2499
 #, c-format
 msgid "Unsupported <ip> element in network %s with forward mode='%s'"
 msgstr "使用 forward mode='%s' 的网络 %s 不支持 <ip> 元素"
 
-#: src/network/bridge_driver.c:2422
+#: src/network/bridge_driver.c:2507
 #, c-format
 msgid "Unsupported <dns> element in network %s with forward mode='%s'"
 msgstr "使用 forward mode='%s' 的网络 %s 不支持 <dns> 元素"
 
-#: src/network/bridge_driver.c:2430
+#: src/network/bridge_driver.c:2515
 #, c-format
 msgid "Unsupported <domain> element in network %s with forward mode='%s'"
 msgstr "使用 forward mode='%s' 的网络 %s 不支持 <domain> 元素"
 
-#: src/network/bridge_driver.c:2448
+#: src/network/bridge_driver.c:2523
+#, c-format
+msgid ""
+"Unsupported network-wide <bandwidth> element in network %s with forward "
+"mode='%s'"
+msgstr ""
+
+#: src/network/bridge_driver.c:2541
 msgid ""
 "Multiple IPv4 dhcp sections found -- dhcp is supported only for a single "
 "IPv4 address on each network"
 msgstr "找到多个 IPv4 dhcp 字段 -- 每个网络中只支持单一 IPv4 地址"
 
-#: src/network/bridge_driver.c:2461
+#: src/network/bridge_driver.c:2554
 msgid ""
 "Multiple IPv6 dhcp sections found -- dhcp is supported only for a single "
 "IPv6 address on each network"
 msgstr "找到多个 IPv5 dhcp 字段 -- 每个网络中只支持单一 IPv6 地址"
 
-#: src/network/bridge_driver.c:2505
+#: src/network/bridge_driver.c:2598
 #, c-format
 msgid ""
 "network '%s' has multiple default <portgroup> elements (%s and %s), but only "
 "one default is allowed"
 msgstr "网络 '%s' 有多个默认 <portgroup> 元素 (%s 和 %s)，但只允许一个默认。"
 
-#: src/network/bridge_driver.c:2523
+#: src/network/bridge_driver.c:2616
 #, c-format
 msgid ""
 "<vlan> element specified for network %s, whose type doesn't support vlan "
 "configuration"
 msgstr "为网络 %s 指定的 <vlan> 元素，其类型不支持 vlan 配置"
 
-#: src/network/bridge_driver.c:2931
+#: src/network/bridge_driver.c:2460
 msgid "network is not active"
 msgstr "网络接口 %s 未激活"
 
-#: src/network/bridge_driver.c:3001 src/test/test_driver.c:3945
+#: src/network/bridge_driver.c:2522 src/test/test_driver.c:3291
 #, c-format
 msgid "network '%s' does not have a bridge name."
 msgstr "网络 '%s' 没有桥接名称。"
 
-#: src/network/bridge_driver.c:3055
+#: src/network/bridge_driver.c:2579
 msgid "cannot set autostart for transient network"
 msgstr "无法为瞬时域设定自动启动"
 
-#: src/network/bridge_driver.c:3070
+#: src/network/bridge_driver.c:2594
 #, c-format
 msgid "cannot create autostart directory '%s'"
 msgstr "无法生成自动启动目录 '%s'"
 
-#: src/network/bridge_driver.c:3077 src/storage/storage_driver.c:1163
+#: src/network/bridge_driver.c:2601 src/storage/storage_driver.c:1055
 #, c-format
 msgid "Failed to create symlink '%s' to '%s'"
 msgstr "为 '%s' 创建符号链接 '%s' 失败"
 
-#: src/network/bridge_driver.c:3172
+#: src/network/bridge_driver.c:3265
 #, c-format
 msgid "Could not get Virtual functions on %s"
 msgstr "无法在 %s 中获取虚拟功能"
 
-#: src/network/bridge_driver.c:3179
+#: src/network/bridge_driver.c:3272
 #, c-format
 msgid "No Vf's present on SRIOV PF %s"
 msgstr "SRIOV PF %s 中未出现 Vf"
 
-#: src/network/bridge_driver.c:3200
+#: src/network/bridge_driver.c:3293
 msgid "Direct mode types require interface names"
 msgstr "直接模式类型需要接口名称"
 
-#: src/network/bridge_driver.c:3341
+#: src/network/bridge_driver.c:3436
 #, c-format
 msgid ""
 "<virtualport type='%s'> not supported for network '%s' which uses a bridge "
 "device"
 msgstr "使用桥接设备的网络 '%s' 不支持<virtualport type='%s'>"
 
-#: src/network/bridge_driver.c:3368 src/network/bridge_driver.c:3524
+#: src/network/bridge_driver.c:2860
 #, c-format
 msgid ""
 "network '%s' requires exclusive access to interfaces, but none are available"
 msgstr "网络 '%s' 需要对接口的单独访问，但没有可用接口。"
 
-#: src/network/bridge_driver.c:3394
+#: src/network/bridge_driver.c:3489
 #, c-format
 msgid "unrecognized driver name value %d  in network '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:3418
+#: src/network/bridge_driver.c:3513
 #, c-format
 msgid ""
 "<virtualport type='%s'> not supported for network '%s' which uses an SR-IOV "
 "Virtual Function via PCI passthrough"
 msgstr "通过 PCI 转移使用 SR-IOV 虚拟功能的网络 '%s' 不支持 <virtualport type='%s'>"
 
-#: src/network/bridge_driver.c:3469
+#: src/network/bridge_driver.c:3564
 #, c-format
 msgid ""
 "<virtualport type='%s'> not supported for network '%s' which uses a macvtap "
 "device"
 msgstr "使用 macvtap 设备的网络 '%s' 不支持  <virtualport type='%s'>"
 
-#: src/network/bridge_driver.c:3482
+#: src/network/bridge_driver.c:2822 src/network/bridge_driver.c:2935
+#: src/network/bridge_driver.c:3036
 #, c-format
 msgid ""
 "network '%s' uses a direct mode, but has no forward dev and no interface pool"
 msgstr "网络 '%s' 使用直接模式，但没有转发 dev 也没有接口池。"
 
-#: src/network/bridge_driver.c:3555
+#: src/network/bridge_driver.c:3650
 #, c-format
 msgid ""
 "an interface connecting to network '%s' is requesting a vlan tag, but that "
 "is not supported for this type of network"
 msgstr "连接到网络 '%s' 的接口正在请求 vlan 标签，但这个网络类型不支持该标签。"
 
-#: src/network/bridge_driver.c:3561
+#: src/network/bridge_driver.c:3656
 #, c-format
 msgid ""
 "an interface of type '%s' is requesting a vlan tag, but that is not "
 "supported for this type of connection"
 msgstr "连接到网络 '%s' 的接口正在请求 vlan 标签，但这个网络连接不支持该标签。"
 
-#: src/network/bridge_driver.c:3652
+#: src/network/bridge_driver.c:3761
 #, c-format
 msgid ""
 "network '%s' uses a direct or hostdev mode, but has no forward dev and no "
 "interface pool"
 msgstr "网络 '%s' 使用直接或者 hostdev 模式，但没有转发 dev 也没有接口池。"
 
-#: src/network/bridge_driver.c:3664 src/network/bridge_driver.c:3844
+#: src/network/bridge_driver.c:2928 src/network/bridge_driver.c:3029
 msgid "the interface uses a direct mode, but has no source dev"
 msgstr "接口使用直接模式，但没有源 dev。"
 
-#: src/network/bridge_driver.c:3681 src/network/bridge_driver.c:3860
+#: src/network/bridge_driver.c:2953 src/network/bridge_driver.c:3052
 #, c-format
 msgid "network '%s' doesn't have dev='%s' in use by domain"
 msgstr "另外 '%s' 没有域使用的 dev='%s'"
 
-#: src/network/bridge_driver.c:3698
+#: src/network/bridge_driver.c:2969
 #, c-format
 msgid "network '%s' claims dev='%s' is already in use by a different domain"
 msgstr "网络 '%s' claims dev='%s' 已被不同域使用"
 
-#: src/network/bridge_driver.c:3715 src/network/bridge_driver.c:3876
+#: src/network/bridge_driver.c:3824 src/network/bridge_driver.c:3999
 msgid "the interface uses a hostdev mode, but has no hostdev"
 msgstr "接口使用 hostdev 模式，但没有 hostdev。"
 
-#: src/network/bridge_driver.c:3733 src/network/bridge_driver.c:3892
+#: src/network/bridge_driver.c:3842 src/network/bridge_driver.c:4015
 #, c-format
 msgid ""
 "network '%s' doesn't have PCI device %04x:%02x:%02x.%x in use by domain"
 msgstr "网络 '%s' 没有域使用的 PCI 设备 %04x:%02x:%02x.%x"
 
-#: src/network/bridge_driver.c:3750
+#: src/network/bridge_driver.c:3859
 #, c-format
 msgid ""
 "network '%s' claims the PCI device at domain=%d bus=%d slot=%d function=%d "
 "is already in use by a different domain"
 msgstr "网络 '%s' 声明 domain=%d bus=%d slot=%d function=%d 的 PCI 设备已被不同的域使用"
 
-#: src/network/bridge_driver.c:3832
+#: src/network/bridge_driver.c:3955
 #, c-format
 msgid ""
 "network '%s' uses a direct/hostdev mode, but has no forward dev and no "
 "interface pool"
 msgstr "网络 '%s' 使用直接/hostdev模式，但没有转发 dev 也没有接口池。"
 
-#: src/network/bridge_driver.c:3979
+#: src/network/bridge_driver.c:3122
 #, c-format
 msgid "network '%s' doesn't have an IPv4 address"
 msgstr "网络 '%s' 没有 IPv4 地址"
 
-#: src/network/bridge_driver.c:4001
+#: src/network/bridge_driver.c:3144
 #, c-format
 msgid "network '%s' has no associated interface or bridge"
 msgstr "网络 '%s' 没有关联的接口或者桥接"
 
-#: src/network/bridge_driver.c:4055
+#: src/network/bridge_driver.c:4183
 #, c-format
 msgid ""
 "Invalid use of 'floor' on interface with MAC address %s - network '%s' has "
 "no inbound QoS set"
 msgstr ""
 
-#: src/network/bridge_driver.c:4075
+#: src/network/bridge_driver.c:4203
 #, c-format
 msgid ""
 "Cannot plug '%s' interface into '%s' because it would overcommit 'peak' on "
 "network '%s'"
 msgstr "无法将 '%s' 接口插入 '%s' 因为它会覆盖网络 '%s' 中的 ‘peak’"
 
-#: src/network/bridge_driver.c:4086
+#: src/network/bridge_driver.c:4214
 #, c-format
 msgid ""
 "Cannot plug '%s' interface into '%s' because it would overcommit 'average' "
 "on network '%s'"
 msgstr "无法将 '%s' 接口插入 '%s' 因为它会覆盖网络 '%s' 中的 ‘average’"
 
-#: src/network/bridge_driver.c:4152
+#: src/network/bridge_driver.c:4280
 #, c-format
 msgid "Cannot set bandwidth on interface '%s' of type %d"
 msgstr "无法在类型 %s 的接口 '%d' 中设定带宽"
 
-#: src/network/bridge_driver.c:4160
+#: src/network/bridge_driver.c:4288
 msgid "Could not generate next class ID"
 msgstr ""
 
-#: src/network/bridge_driver_linux.c:117
+#: src/network/bridge_driver.c:1654
 #, c-format
 msgid "Network is already in use by interface %s"
 msgstr "接口 %s 已在使用网络"
 
-#: src/network/bridge_driver_linux.c:141 src/network/bridge_driver_linux.c:378
+#: src/network/bridge_driver.c:897 src/network/bridge_driver.c:1071
 #, c-format
 msgid "Invalid prefix or netmask for '%s'"
 msgstr "无效的 '%s' 前缀或者掩码"
 
-#: src/network/bridge_driver_linux.c:152
+#: src/network/bridge_driver.c:909
 #, c-format
 msgid "failed to add iptables rule to allow forwarding from '%s'"
 msgstr "添加路由表规则允许从 '%s' 转发失败"
 
-#: src/network/bridge_driver_linux.c:165
+#: src/network/bridge_driver.c:923
 #, c-format
 msgid "failed to add iptables rule to allow forwarding to '%s'"
 msgstr "添加路由表规则允许转发至 '%s' 失败"
 
-#: src/network/bridge_driver_linux.c:211
+#: src/network/bridge_driver.c:959
 #, c-format
 msgid "failed to add iptables rule to enable masquerading to %s"
 msgstr "添加 iptables 规则启用 %s 伪装失败"
 
-#: src/network/bridge_driver_linux.c:215
+#: src/network/bridge_driver.c:960
 msgid "failed to add iptables rule to enable masquerading"
 msgstr "添加 iptables 规则启用伪装失败"
 
-#: src/network/bridge_driver_linux.c:228
+#: src/network/bridge_driver.c:973
 #, c-format
 msgid "failed to add iptables rule to enable UDP masquerading to %s"
 msgstr "添加 iptables 规则启用 %s 的 UDP 伪装失败"
 
-#: src/network/bridge_driver_linux.c:232
+#: src/network/bridge_driver.c:974
 msgid "failed to add iptables rule to enable UDP masquerading"
 msgstr "添加 iptables 规则启用 UDP 伪装失败"
 
-#: src/network/bridge_driver_linux.c:245
+#: src/network/bridge_driver.c:987
 #, c-format
 msgid "failed to add iptables rule to enable TCP masquerading to %s"
 msgstr "添加 iptables 规则启用 %s 的 TCP 伪装失败"
 
-#: src/network/bridge_driver_linux.c:249
+#: src/network/bridge_driver.c:988
 msgid "failed to add iptables rule to enable TCP masquerading"
 msgstr "添加 iptables 规则启用 TCP 伪装失败"
 
@@ -11036,32 +11291,32 @@
 msgid "failed to add iptables rule to prevent local multicast masquerading"
 msgstr ""
 
-#: src/network/bridge_driver_linux.c:389
+#: src/network/bridge_driver.c:1083
 #, c-format
 msgid "failed to add iptables rule to allow routing from '%s'"
 msgstr "添加路由表规则允许从 '%s' 路由失败"
 
-#: src/network/bridge_driver_linux.c:400
+#: src/network/bridge_driver.c:1095
 #, c-format
 msgid "failed to add iptables rule to allow routing to '%s'"
 msgstr "添加路由表规则允许路由至 '%s' 失败"
 
-#: src/network/bridge_driver_linux.c:453
+#: src/network/bridge_driver.c:1149
 #, c-format
 msgid "failed to add ip6tables rule to block outbound traffic from '%s'"
 msgstr "添加 ip6tables 规则阻断 '%s' 外出流量失败"
 
-#: src/network/bridge_driver_linux.c:460
+#: src/network/bridge_driver.c:1157
 #, c-format
 msgid "failed to add ip6tables rule to block inbound traffic to '%s'"
 msgstr "添加 ip6tables 规则阻断 '%s' 进入流量失败"
 
-#: src/network/bridge_driver_linux.c:468
+#: src/network/bridge_driver.c:1166
 #, c-format
 msgid "failed to add ip6tables rule to allow cross bridge traffic on '%s'"
 msgstr "添加 ip6tables 规则允许 '%s' 跨桥流量失败"
 
-#: src/network/bridge_driver_linux.c:480 src/network/bridge_driver_linux.c:487
+#: src/network/bridge_driver.c:1175 src/network/bridge_driver.c:1183
 #, c-format
 msgid "failed to add ip6tables rule to allow DNS requests from '%s'"
 msgstr "添加 ip6tables 规则允许 '%s' 的 DNS 请求失败"
@@ -11071,7 +11326,7 @@
 msgid "failed to add ip6tables rule to allow DHCP6 requests from '%s'"
 msgstr "添加路由表规则允许从 '%s' 请求 DHCP6 失败"
 
-#: src/network/bridge_driver_linux.c:555 src/network/bridge_driver_linux.c:562
+#: src/network/bridge_driver.c:1236 src/network/bridge_driver.c:1244
 #, c-format
 msgid "failed to add iptables rule to allow DHCP requests from '%s'"
 msgstr "添加路由表规则允许从 '%s' 请求 DHCP 失败"
@@ -11081,51 +11336,51 @@
 msgid "failed to add iptables rule to allow DHCP replies to '%s'"
 msgstr ""
 
-#: src/network/bridge_driver_linux.c:590 src/network/bridge_driver_linux.c:597
+#: src/network/bridge_driver.c:1267 src/network/bridge_driver.c:1275
 #, c-format
 msgid "failed to add iptables rule to allow DNS requests from '%s'"
 msgstr "添加路由表规则允许从 '%s' 请求 DNS 失败"
 
-#: src/network/bridge_driver_linux.c:606
+#: src/network/bridge_driver.c:1285
 #, c-format
 msgid "failed to add iptables rule to allow TFTP requests from '%s'"
 msgstr "添加 iptables 规则允许 '%s' 的 TFTP 请求失败"
 
-#: src/network/bridge_driver_linux.c:615
+#: src/network/bridge_driver.c:1295
 #, c-format
 msgid "failed to add iptables rule to block outbound traffic from '%s'"
 msgstr "添加路由表规则允许阻断从 '%s' 外出流量失败"
 
-#: src/network/bridge_driver_linux.c:622
+#: src/network/bridge_driver.c:1303
 #, c-format
 msgid "failed to add iptables rule to block inbound traffic to '%s'"
 msgstr "添加路由表规则允许进入 '%s' 的流量失败"
 
-#: src/network/bridge_driver_linux.c:630
+#: src/network/bridge_driver.c:1312
 #, c-format
 msgid "failed to add iptables rule to allow cross bridge traffic on '%s'"
 msgstr "添加路由表规则允许从 '%s' 中的跨桥接流量失败"
 
-#: src/node_device/node_device_driver.c:93
+#: src/node_device/node_device_driver.c:88
 #, c-format
 msgid "cannot resolve driver link %s"
 msgstr "无法解析驱动程序链接 %s"
 
-#: src/node_device/node_device_driver.c:311
-#: src/node_device/node_device_driver.c:344
-#: src/node_device/node_device_driver.c:382
-#: src/node_device/node_device_driver.c:416 src/test/test_driver.c:5904
-#: src/test/test_driver.c:5930 src/test/test_driver.c:5964
-#: src/test/test_driver.c:5995
+#: src/node_device/node_device_driver.c:275
+#: src/node_device/node_device_driver.c:305
+#: src/node_device/node_device_driver.c:341
+#: src/node_device/node_device_driver.c:372 src/test/test_driver.c:5181
+#: src/test/test_driver.c:5207 src/test/test_driver.c:5243
+#: src/test/test_driver.c:5274
 #, c-format
 msgid "no node device with matching name '%s'"
 msgstr "没有与名称 '%s' 匹配的节点设备"
 
-#: src/node_device/node_device_driver.c:357 src/test/test_driver.c:5939
+#: src/node_device/node_device_driver.c:316 src/test/test_driver.c:5218
 msgid "no parent for this device"
 msgstr "这个设备没有上一级设备"
 
-#: src/node_device/node_device_driver.c:449
+#: src/node_device/node_device_driver.c:491
 msgid "Could not get current time"
 msgstr "无法获得当前时间"
 
@@ -11134,45 +11389,43 @@
 msgid "DBus not available, disabling HAL driver: %s"
 msgstr "DBus 不可用，禁用 HAL 驱动程序: %s"
 
-#: src/node_device/node_device_hal.c:666
+#: src/node_device/node_device_hal.c:728
 msgid "libhal_ctx_new returned NULL"
 msgstr "libhal_ctx_new 返回 NULL"
 
-#: src/node_device/node_device_hal.c:671
+#: src/node_device/node_device_hal.c:743
 msgid "libhal_ctx_set_dbus_connection failed"
 msgstr "libhal_ctx_set_dbus_connection 失败"
 
-#: src/node_device/node_device_hal.c:675
+#: src/node_device/node_device_hal.c:747
 msgid "libhal_ctx_init failed, haldaemon is probably not running"
 msgstr "libhal_ctx_init 失败，haldaemon 可能没有运行。"
 
-#: src/node_device/node_device_hal.c:700
+#: src/node_device/node_device_hal.c:782
 msgid "setting up HAL callbacks failed"
 msgstr "设置 HAL 回叫失败"
 
-#: src/node_device/node_device_hal.c:706 src/node_device/node_device_hal.c:770
+#: src/node_device/node_device_hal.c:788 src/node_device/node_device_hal.c:849
 msgid "libhal_get_all_devices failed"
 msgstr "libhal_get_all_devices 失败"
 
-#: src/node_device/node_device_hal.c:719 src/qemu/qemu_migration.c:1249
-#: src/qemu/qemu_migration.c:1644 src/qemu/qemu_migration.c:1679
-#: src/qemu/qemu_migration.c:1685 src/qemu/qemu_migration.c:1761
-#: src/qemu/qemu_migration.c:3187
+#: src/node_device/node_device_hal.c:801 src/qemu/qemu_migration.c:880
+#: src/qemu/qemu_migration.c:903 src/qemu/qemu_migration.c:909
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: src/node_device/node_device_linux_sysfs.c:57
+#: src/node_device/node_device_linux_sysfs.c:138
 #, c-format
 msgid "Failed to read WWPN for host%d"
 msgstr "为主机 %d 读取 WWPN 失败"
 
-#: src/node_device/node_device_linux_sysfs.c:65
+#: src/node_device/node_device_linux_sysfs.c:147
 #, c-format
 msgid "Failed to read WWNN for host%d"
 msgstr "为主机 %d 读取 WWNN 失败"
 
-#: src/node_device/node_device_linux_sysfs.c:73
+#: src/node_device/node_device_linux_sysfs.c:155
 #, c-format
 msgid "Failed to read fabric WWN for host%d"
 msgstr "为 host%d 读取光纤 WWN 失败"
@@ -11197,17 +11450,17 @@
 msgid "Failed to parse value of npiv_vports_inuse '%s'"
 msgstr ""
 
-#: src/node_device/node_device_udev.c:66
+#: src/node_device/node_device_udev.c:64
 #, c-format
 msgid "Failed to convert '%s' to unsigned long long"
 msgstr "将 '%s' 转换为 unsigned long long 失败"
 
-#: src/node_device/node_device_udev.c:84 src/util/virpci.c:2276
+#: src/node_device/node_device_udev.c:82 src/util/pci.c:1768
 #, c-format
 msgid "Failed to convert '%s' to unsigned int"
 msgstr "将 '%s' 转换为未签注的 int 失败"
 
-#: src/node_device/node_device_udev.c:101
+#: src/node_device/node_device_udev.c:99
 #, c-format
 msgid "Failed to convert '%s' to int"
 msgstr "将  '%s' 转换为 int 失败"
@@ -11219,240 +11472,240 @@
 "with sysname '%s'"
 msgstr "为设备中 sysname 为  '%s' 的属性值中的属性密钥  '%s' 分配内存失败"
 
-#: src/node_device/node_device_udev.c:216
+#: src/node_device/node_device_udev.c:218
 #, c-format
 msgid ""
 "Failed to allocate memory for sysfs attribute value for sysfs attribute '%s' "
 "on device with sysname '%s'"
 msgstr "为设备中 sysname 为  '%s' 的 sysfs 的属性值中的 sysfs 属性  '%s' 分配内存失败"
 
-#: src/node_device/node_device_udev.c:334
+#: src/node_device/node_device_udev.c:336
 #, c-format
 msgid "Buffer error when generating device name for device with sysname '%s'"
 msgstr "为 sysname '%s' 的设备生成设备名称时出现缓存错误"
 
-#: src/node_device/node_device_udev.c:685
+#: src/node_device/node_device_udev.c:654
 #, c-format
 msgid "SCSI host found, but its udev name '%s' does not begin with 'host'"
 msgstr "找到 SCSI 主机，但其 udev 名称  '%s' 不是以‘host’开始"
 
-#: src/node_device/node_device_udev.c:848
+#: src/node_device/node_device_udev.c:822
 #, c-format
 msgid "Failed to process SCSI device with sysfs path '%s'"
 msgstr "处理 sysfs 路径为  '%s'  的 SCSI 设备失败"
 
-#: src/node_device/node_device_udev.c:1262
+#: src/node_device/node_device_udev.c:1194
 #, c-format
 msgid "Unknown device type %d"
 msgstr "未知设备类型 %d"
 
-#: src/node_device/node_device_udev.c:1313
+#: src/node_device/node_device_udev.c:1245
 #, c-format
 msgid "Could not get syspath for parent of '%s'"
 msgstr "无法为上级 '%s' 获取系统路径"
 
-#: src/node_device/node_device_udev.c:1381
-#: src/node_device/node_device_udev.c:1640
+#: src/node_device/node_device_udev.c:1327
+#: src/node_device/node_device_udev.c:1591
 #, c-format
 msgid "Failed to create device for '%s'"
 msgstr "创建设备 '%s' 失败"
 
-#: src/node_device/node_device_udev.c:1435
+#: src/node_device/node_device_udev.c:1379
 #, c-format
 msgid "udev scan devices returned %d"
 msgstr "udev 扫描设备返回的 %d"
 
-#: src/node_device/node_device_udev.c:1511
+#: src/node_device/node_device_udev.c:1455
 #, c-format
 msgid ""
 "File descriptor returned by udev %d does not match node device file "
 "descriptor %d"
 msgstr "根据 udev %d 返回的文件描述符与节点设备文件描述符 %d 不符"
 
-#: src/node_device/node_device_udev.c:1518
+#: src/node_device/node_device_udev.c:1462
 msgid "udev_monitor_receive_device returned NULL"
 msgstr "udev_monitor_receive_device 返回的 NULL"
 
-#: src/node_device/node_device_udev.c:1557
+#: src/node_device/node_device_udev.c:1501
 #, c-format
 msgid "Failed to get udev device for syspath '%s' or '%s'"
 msgstr "为 syspath '%s' 或者 '%s' 获取 udev 设备失败"
 
-#: src/node_device/node_device_udev.c:1676
+#: src/node_device/node_device_udev.c:1625
 #, c-format
 msgid "Failed to initialize libpciaccess: %s"
 msgstr "无法初始化 libpciaccess: %s"
 
-#: src/node_device/node_device_udev.c:1698
+#: src/node_device/node_device_udev.c:1649
 msgid "Failed to initialize mutex for driverState"
 msgstr "无法为 driverState 初始化 mutex"
 
-#: src/node_device/node_device_udev.c:1720
+#: src/node_device/node_device_udev.c:1670
 msgid "udev_monitor_new_from_netlink returned NULL"
 msgstr "udev_monitor_new_from_netlink 返回的 NULL"
 
-#: src/nodeinfo.c:66
+#: src/nodeinfo.c:68
 msgid "Cannot obtain CPU count"
 msgstr ""
 
-#: src/nodeinfo.c:91
+#: src/nodeinfo.c:93
 msgid "cannot obtain memory size"
 msgstr ""
 
-#: src/nodeinfo.c:129 src/nodeinfo.c:827
+#: src/nodeinfo.c:137 src/nodeinfo.c:817
 #, c-format
-msgid "nparams in %s must be %d"
+msgid "nparams in %s must be equal to %d"
 msgstr "%s 中的 nparams 必须为 %d"
 
-#: src/nodeinfo.c:142 src/nodeinfo.c:162
+#: src/nodeinfo.c:145 src/nodeinfo.c:178 src/nodeinfo.c:244 src/nodeinfo.c:264
 #, c-format
 msgid "sysctl failed for '%s'"
 msgstr ""
 
-#: src/nodeinfo.c:150 src/nodeinfo.c:168
+#: src/nodeinfo.c:163 src/nodeinfo.c:862
+#, c-format
+msgid "Invalid cpuNum in %s"
+msgstr "%s 中的无效 cpuNum"
+
+#: src/nodeinfo.c:188 src/nodeinfo.c:252 src/nodeinfo.c:270
 #, c-format
 msgid "Field '%s' too long for destination"
 msgstr ""
 
-#: src/nodeinfo.c:221 src/nodeinfo.c:264 src/nodeinfo.c:989
-#: src/nodeinfo.c:1061 src/nodeinfo.c:1112 src/uml/uml_driver.c:2507
-#: src/util/vircommand.c:325 src/util/virpci.c:1853
+#: src/nodeinfo.c:231 src/nodeinfo.c:908
+#, c-format
+msgid "nparams in %s must be %d"
+msgstr "%s 中的 nparams 必须为 %d"
+
+#: src/nodeinfo.c:106 src/nodeinfo.c:152 src/nodeinfo.c:617 src/nodeinfo.c:652
+#: src/nodeinfo.c:716 src/uml/uml_driver.c:2344 src/util/command.c:265
+#: src/util/pci.c:1594
 #, c-format
 msgid "cannot open %s"
 msgstr "无法打开 %s"
 
-#: src/nodeinfo.c:226 src/nodeinfo.c:270
+#: src/nodeinfo.c:111 src/nodeinfo.c:158
 #, c-format
 msgid "cannot read from %s"
 msgstr "无法从 %s 读取"
 
-#: src/nodeinfo.c:231
+#: src/nodeinfo.c:116
 #, c-format
 msgid "could not convert '%s' to an integer"
 msgstr "无法将 '%s' 转换为一个整数"
 
-#: src/nodeinfo.c:353
+#: src/nodeinfo.c:327
 #, c-format
 msgid "cannot opendir %s"
 msgstr "无法打开目录 %s"
 
-#: src/nodeinfo.c:382 src/nodeinfo.c:442 src/nodeinfo.c:611
+#: src/nodeinfo.c:363
 #, c-format
 msgid "problem reading %s"
 msgstr "读取 %s 的问题"
 
-#: src/nodeinfo.c:417
+#: src/nodeinfo.c:514
 msgid "CPU socket topology has changed"
 msgstr "已更改 CPU 插槽拓扑"
 
-#: src/nodeinfo.c:463 src/nodeinfo.c:673
+#: src/nodeinfo.c:560 src/nodeinfo.c:770
 #, c-format
 msgid "problem closing %s"
 msgstr "关闭 %s 的问题"
 
-#: src/nodeinfo.c:500 src/nodeinfo.c:523 src/nodeinfo.c:549
+#: src/nodeinfo.c:597 src/nodeinfo.c:620 src/nodeinfo.c:646
 msgid "parsing cpu MHz from cpuinfo"
 msgstr "正在解析 cpuinfo cpu MHz"
 
-#: src/nodeinfo.c:637
+#: src/nodeinfo.c:734
 msgid "no CPUs found"
 msgstr "没有找到 CPUs"
 
-#: src/nodeinfo.c:642
+#: src/nodeinfo.c:373
 msgid "no sockets found"
 msgstr "未发现插槽"
 
-#: src/nodeinfo.c:647
+#: src/nodeinfo.c:378
 msgid "no threads found"
 msgstr "未发现线程"
 
-#: src/nodeinfo.c:705
-#, c-format
-msgid "nparams in %s must be equal to %d"
-msgstr "%s 中的 nparams 必须为 %d"
-
-#: src/nodeinfo.c:737 src/nodeinfo.c:746 src/nodeinfo.c:755 src/nodeinfo.c:764
-msgid "Field kernel cpu time too long for destination"
-msgstr "对于目的地来说内核 cpu 时间字段太长"
-
-#: src/nodeinfo.c:781
-#, c-format
-msgid "Invalid cpuNum in %s"
-msgstr "%s 中的无效 cpuNum"
+#: src/nodeinfo.c:786
+msgid "kernel cpu time field is too long for the destination"
+msgstr ""
 
-#: src/nodeinfo.c:851
+#: src/nodeinfo.c:558
 msgid "no prefix found"
 msgstr "未发现前缀"
 
-#: src/nodeinfo.c:870
+#: src/nodeinfo.c:577
 msgid "Field kernel memory too long for destination"
 msgstr "对于目的地来说内核内存字段太长"
 
-#: src/nodeinfo.c:884
+#: src/nodeinfo.c:591
 msgid "no available memory line found"
 msgstr "未找到可用内存行"
 
-#: src/nodeinfo.c:911 src/nodeinfo.c:1358
+#: src/nodeinfo.c:992 src/nodeinfo.c:1441
 #, c-format
 msgid "failed to parse %s"
 msgstr "解析 %s 失败"
 
-#: src/nodeinfo.c:1021 src/nodeinfo.c:1028
+#: src/nodeinfo.c:1102 src/nodeinfo.c:1109
 msgid "cannot obtain CPU freq"
 msgstr ""
 
-#: src/nodeinfo.c:1043
+#: src/nodeinfo.c:633
 msgid "node info not implemented on this platform"
 msgstr "这个平台中没有使用节点"
 
-#: src/nodeinfo.c:1071
+#: src/nodeinfo.c:662
 msgid "node CPU stats not implemented on this platform"
 msgstr "在这个平台中未采用 CPU stats"
 
-#: src/nodeinfo.c:1099
+#: src/nodeinfo.c:1182
 #, c-format
 msgid "cellNum in %s must be less than or equal to %d"
 msgstr "%s 指定 cellNum 必须小于等于 %d"
 
-#: src/nodeinfo.c:1126
+#: src/nodeinfo.c:728
 msgid "node memory stats not implemented on this platform"
 msgstr "在这个平台中未采用内存 stats"
 
-#: src/nodeinfo.c:1157
+#: src/nodeinfo.c:1240
 msgid "host cpu counting not supported on this node"
 msgstr ""
 
-#: src/nodeinfo.c:1167
+#: src/nodeinfo.c:1250
 msgid "host cpu counting not implemented on this platform"
 msgstr "在这个平台中未采用主机  cpu 计数"
 
-#: src/nodeinfo.c:1206
+#: src/nodeinfo.c:1289
 msgid "node cpumap not implemented on this platform"
 msgstr "这个平台中没有使用节点 cpumap"
 
-#: src/nodeinfo.c:1235 src/util/virutil.c:1600
+#: src/nodeinfo.c:1318 src/util/virutil.c:1600
 #, c-format
 msgid "failed to set %s"
 msgstr "设置 %s 失败"
 
-#: src/nodeinfo.c:1265
+#: src/nodeinfo.c:1348
 #, c-format
 msgid "Parameter '%s' is not supported by this kernel"
 msgstr ""
 
-#: src/nodeinfo.c:1313
+#: src/nodeinfo.c:1396
 msgid "node set memory parameters not implemented on this platform"
 msgstr "在这个平台中未采用节点组内存参数"
 
-#: src/nodeinfo.c:1512
+#: src/nodeinfo.c:1591
 msgid "node get memory parameters not implemented on this platform"
 msgstr "获取这个平台中未采用内存的节点"
 
-#: src/nodeinfo.c:1614 src/nodeinfo.c:1629
+#: src/nodeinfo.c:1693 src/nodeinfo.c:1708
 msgid "Cannot determine free memory"
 msgstr ""
 
-#: src/nodeinfo.c:1663
+#: src/nodeinfo.c:1742
 msgid "node cpu info not implemented on this platform"
 msgstr ""
 
@@ -11503,8 +11756,7 @@
 msgid "Job submission failed on interface '%s'"
 msgstr "在接口 '%s' 中提交任务失败"
 
-#: src/nwfilter/nwfilter_dhcpsnoop.c:1634
-#: src/nwfilter/nwfilter_learnipaddr.c:694
+#: src/nwfilter/nwfilter_learnipaddr.c:788
 msgid ""
 "IP parameter must be provided since snooping the IP address does not work "
 "possibly due to missing tools"
@@ -11565,9 +11817,8 @@
 msgid "open(\"%s\")"
 msgstr "open(\"%s\")"
 
-#: src/nwfilter/nwfilter_dhcpsnoop.c:1910 src/qemu/qemu_driver.c:2991
-#: src/qemu/qemu_driver.c:3009 src/qemu/qemu_driver.c:3678
-#: src/vbox/vbox_tmpl.c:9265
+#: src/qemu/qemu_driver.c:2570 src/qemu/qemu_driver.c:2590
+#: src/qemu/qemu_driver.c:3113 src/vbox/vbox_tmpl.c:9096
 #, c-format
 msgid "unable to close %s"
 msgstr "无法关闭 %s"
@@ -11606,17 +11857,17 @@
 msgid "DBus matches could not be installed. Disabling nwfilter driver"
 msgstr "无法安装 DBus 匹配。禁用 nwfilter 驱动程序。"
 
-#: src/nwfilter/nwfilter_driver.c:364 src/nwfilter/nwfilter_driver.c:602
-#: src/nwfilter/nwfilter_driver.c:653
+#: src/nwfilter/nwfilter_driver.c:233 src/nwfilter/nwfilter_driver.c:383
+#: src/nwfilter/nwfilter_driver.c:431
 msgid "no nwfilter with matching uuid"
 msgstr "没有包含匹配的 uuid 的 nwfilter"
 
-#: src/nwfilter/nwfilter_driver.c:393
+#: src/nwfilter/nwfilter_driver.c:259
 #, c-format
 msgid "no nwfilter with matching name '%s'"
 msgstr "没有包含匹配名称  '%s' 的 nwfilter"
 
-#: src/nwfilter/nwfilter_driver.c:612
+#: src/nwfilter/nwfilter_driver.c:390
 msgid "nwfilter is in use"
 msgstr "nwfilter 未使用"
 
@@ -11625,28 +11876,28 @@
 msgid "Buffer too small to print variable '%s' into"
 msgstr "缓存太小无法输出变量 '%s'"
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:308
+#: src/nwfilter/nwfilter_ebiptables_driver.c:275
 msgid "buffer too small for IP address"
 msgstr "对于 IP 地址来说缓存太小"
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:322
+#: src/nwfilter/nwfilter_ebiptables_driver.c:289
 msgid "buffer too small for IPv6 address"
 msgstr "对于 IPv6 地址来说缓存太小"
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:333
+#: src/nwfilter/nwfilter_ebiptables_driver.c:300
 msgid "Buffer too small for MAC address"
 msgstr "对于 MAC 地址来说缓存太小"
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:345
-#: src/nwfilter/nwfilter_ebiptables_driver.c:375
+#: src/nwfilter/nwfilter_ebiptables_driver.c:312
+#: src/nwfilter/nwfilter_ebiptables_driver.c:342
 msgid "Buffer too small for uint8 type"
 msgstr "对于 unit8 地址来说缓存太小"
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:355
+#: src/nwfilter/nwfilter_ebiptables_driver.c:322
 msgid "Buffer too small for uint32 type"
 msgstr "对于 unit32 类型来说缓存太小"
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:365
+#: src/nwfilter/nwfilter_ebiptables_driver.c:332
 msgid "Buffer too small for uint16 type"
 msgstr "对于 unit16 地址来说缓存太小"
 
@@ -11658,53 +11909,53 @@
 msgid "Buffer too small for IPSETFLAGS type"
 msgstr "对于 IPSETFLAGS 类型来说缓存太小"
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:424
+#: src/nwfilter/nwfilter_ebiptables_driver.c:349
 #, c-format
 msgid "Unhandled datatype %x"
 msgstr "未处理的数据类型 %x"
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:1347
+#: src/nwfilter/nwfilter_ebiptables_driver.c:1224
 #, c-format
 msgid "cannot create rule since %s tool is missing."
 msgstr "因为缺少 %s 无法生成规则"
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:2065
+#: src/nwfilter/nwfilter_ebiptables_driver.c:1942
 msgid "cannot create rule since ebtables tool is missing."
 msgstr "因为缺少 ebtables  工具无法生成规则"
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:2166
+#: src/nwfilter/nwfilter_ebiptables_driver.c:2043
 #, c-format
 msgid ""
 "STP filtering in %s direction with source MAC address set is not supported"
 msgstr "不支持设定了源 MAC 地址设置的 %s 方向的 STP 过滤器"
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:2733
+#: src/nwfilter/nwfilter_ebiptables_driver.c:2598
 msgid "illegal protocol type"
 msgstr "非法协议类型"
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:3247
-#: src/nwfilter/nwfilter_ebiptables_driver.c:3344
-#: src/nwfilter/nwfilter_ebiptables_driver.c:3478
+#: src/nwfilter/nwfilter_ebiptables_driver.c:3112
+#: src/nwfilter/nwfilter_ebiptables_driver.c:3208
+#: src/nwfilter/nwfilter_ebiptables_driver.c:3323
 msgid "cannot create rules since ebtables tool is missing."
 msgstr "因为缺少 ebtables  工具无法生成规则"
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:3306
-#: src/nwfilter/nwfilter_ebiptables_driver.c:3454
-#: src/nwfilter/nwfilter_ebiptables_driver.c:3524
+#: src/nwfilter/nwfilter_ebiptables_driver.c:3171
+#: src/nwfilter/nwfilter_ebiptables_driver.c:3297
+#: src/nwfilter/nwfilter_ebiptables_driver.c:3369
 msgid "Some rules could not be created."
 msgstr "有些规则无法生成"
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:3629
+#: src/nwfilter/nwfilter_ebiptables_driver.c:3474
 #, c-format
 msgid "To enable ip%stables filtering for the VM do 'echo 1 > %s'"
 msgstr "要为 VM 启用  ip%stables 过滤，请执行 'echo 1 > %s'"
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:3951
+#: src/nwfilter/nwfilter_ebiptables_driver.c:3796
 #, c-format
 msgid "Some rules could not be created for interface %s%s%s"
 msgstr "无法为接口生成某些规则 %s%s%s"
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:4091
+#: src/nwfilter/nwfilter_ebiptables_driver.c:3936
 msgid "error while executing CLI commands"
 msgstr "执行 CLI 命令时出错"
 
@@ -11739,31 +11990,31 @@
 msgid "Could not determine iptables version from string %s"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:4412
+#: src/nwfilter/nwfilter_ebiptables_driver.c:4077
 msgid "essential tools to support ip(6)tables firewalls could not be located"
 msgstr "无法找到支持  ip(6)tables 防火墙的主要功能"
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:4419
+#: src/nwfilter/nwfilter_ebiptables_driver.c:4086
 msgid "firewall tools were not found or cannot be used"
 msgstr "无法找到防火墙工具，或者无法使用"
 
-#: src/nwfilter/nwfilter_gentech_driver.c:164
+#: src/nwfilter/nwfilter_gentech_driver.c:160
 msgid "Could not add variable 'MAC' to hashmap"
 msgstr "无法在哈希映射中添加可变  'MAC'"
 
-#: src/nwfilter/nwfilter_gentech_driver.c:178
+#: src/nwfilter/nwfilter_gentech_driver.c:174
 msgid "Could not add variable 'IP' to hashmap"
 msgstr "无法在哈希映射中添加可变  'IP'"
 
-#: src/nwfilter/nwfilter_gentech_driver.c:424
-#: src/nwfilter/nwfilter_gentech_driver.c:535
-#: src/nwfilter/nwfilter_gentech_driver.c:851
+#: src/nwfilter/nwfilter_gentech_driver.c:426
+#: src/nwfilter/nwfilter_gentech_driver.c:523
+#: src/nwfilter/nwfilter_gentech_driver.c:810
 #, c-format
 msgid "Filter '%s' is in use."
 msgstr "过滤器 '%s' 在使用中"
 
-#: src/nwfilter/nwfilter_gentech_driver.c:471
-#: src/nwfilter/nwfilter_gentech_driver.c:577
+#: src/nwfilter/nwfilter_gentech_driver.c:474
+#: src/nwfilter/nwfilter_gentech_driver.c:566
 #, c-format
 msgid "referenced filter '%s' is missing"
 msgstr "缺少参考的过滤器 '%s'"
@@ -11780,110 +12031,110 @@
 "elements: %s"
 msgstr "由于有无法解析的变量或者不可用元素列表而无法举例说明过滤器：%s"
 
-#: src/nwfilter/nwfilter_gentech_driver.c:833
-#: src/nwfilter/nwfilter_gentech_driver.c:1059
-#: src/nwfilter/nwfilter_gentech_driver.c:1085
-#: src/nwfilter/nwfilter_gentech_driver.c:1110
+#: src/nwfilter/nwfilter_gentech_driver.c:792
+#: src/nwfilter/nwfilter_gentech_driver.c:1012
+#: src/nwfilter/nwfilter_gentech_driver.c:1038
+#: src/nwfilter/nwfilter_gentech_driver.c:1063
 #, c-format
 msgid "Could not get access to ACL tech driver '%s'"
 msgstr "无法获得对 ACL 技术驱动程序 '%s' 的访问"
 
-#: src/nwfilter/nwfilter_gentech_driver.c:844
+#: src/nwfilter/nwfilter_gentech_driver.c:803
 #, c-format
 msgid "Could not find filter '%s'"
 msgstr "无法找到过滤器 '%s'"
 
-#: src/nwfilter/nwfilter_gentech_driver.c:1188
+#: src/nwfilter/nwfilter_gentech_driver.c:1184
 #, c-format
 msgid "Failure while applying current filter on VM %s"
 msgstr "在 VM %s 中应用现有过滤器失败"
 
-#: src/nwfilter/nwfilter_learnipaddr.c:151
+#: src/nwfilter/nwfilter_learnipaddr.c:154
 msgid "mutex initialization failed"
 msgstr "mutex 初始化失败"
 
-#: src/nwfilter/nwfilter_learnipaddr.c:158
+#: src/nwfilter/nwfilter_learnipaddr.c:161
 #, c-format
 msgid "interface name %s does not fit into buffer "
 msgstr "接口名称 %s 不适用于缓存 "
 
-#: src/nwfilter/nwfilter_learnipaddr.c:611
+#: src/nwfilter/nwfilter_learnipaddr.c:706
 #, c-format
 msgid "Failed to add IP address %s to IP address cache for interface %s"
 msgstr "无法为接口 %s 在 IP 地址缓存中添加 IP 地址 %s"
 
-#: src/nwfilter/nwfilter_learnipaddr.c:630
+#: src/nwfilter/nwfilter_learnipaddr.c:724
 #, c-format
 msgid "encountered an error on interface %s index %d"
 msgstr "在接口 %s 索引 %d 中遇到问题"
 
-#: src/nwfilter/nwfilter_learnipaddr.c:715
+#: src/nwfilter/nwfilter_learnipaddr.c:816
 #, c-format
 msgid "Destination buffer for ifname ('%s') not large enough"
 msgstr "ifname ('%s')  的目的缓存不够大"
 
-#: src/nwfilter/nwfilter_learnipaddr.c:723
+#: src/nwfilter/nwfilter_learnipaddr.c:824
 #, c-format
 msgid "Destination buffer for linkdev ('%s') not large enough"
 msgstr "linkdev ('%s') 的目的缓存不够大"
 
-#: src/nwfilter/nwfilter_learnipaddr.c:776
+#: src/nwfilter/nwfilter_learnipaddr.c:876
 msgid ""
 "IP parameter must be given since libvirt was not compiled with IP address "
 "learning support"
 msgstr "必须提供 IP 参数因为 libvirt 无法与获得支持的 IP 地址进行编译"
 
-#: src/openvz/openvz_conf.c:122
+#: src/openvz/openvz_conf.c:124
 msgid "Could not extract vzctl version"
 msgstr "无法提取 vzctl 版本"
 
-#: src/openvz/openvz_conf.c:222
+#: src/openvz/openvz_conf.c:198
 #, c-format
 msgid "Could not read 'IP_ADDRESS' from config for container %d"
 msgstr "无法为容器 %d 在 config 中读取 'IP_ADDRESS'"
 
-#: src/openvz/openvz_conf.c:252
+#: src/openvz/openvz_conf.c:230
 #, c-format
 msgid "Could not read 'NETIF' from config for container %d"
 msgstr "无法为容器 %d 在 config 中读取 'NETIF'"
 
-#: src/openvz/openvz_conf.c:278
+#: src/openvz/openvz_conf.c:256
 msgid "Too long network device name"
 msgstr "网络文件名过长"
 
-#: src/openvz/openvz_conf.c:287
+#: src/openvz/openvz_conf.c:265
 #, c-format
 msgid "Network ifname %s too long for destination"
 msgstr "过长的目的网络 ifname %s"
 
-#: src/openvz/openvz_conf.c:295
+#: src/openvz/openvz_conf.c:273
 msgid "Too long bridge device name"
 msgstr "桥接设备名称过长"
 
-#: src/openvz/openvz_conf.c:304
+#: src/openvz/openvz_conf.c:282
 #, c-format
 msgid "Bridge name %s too long for destination"
 msgstr "过长的目的桥接名称 %s"
 
-#: src/openvz/openvz_conf.c:312
+#: src/openvz/openvz_conf.c:290
 msgid "Wrong length MAC address"
 msgstr "错误的 MAC 地址长度"
 
-#: src/openvz/openvz_conf.c:317
+#: src/openvz/openvz_conf.c:295
 #, c-format
 msgid "MAC address %s too long for destination"
 msgstr "过长的目的 MAC 地址 %s"
 
-#: src/openvz/openvz_conf.c:322
+#: src/openvz/openvz_conf.c:300
 msgid "Wrong MAC address"
 msgstr "错误 MAC 地址"
 
-#: src/openvz/openvz_conf.c:396
+#: src/openvz/openvz_conf.c:373
 #, c-format
 msgid "Could not read 'OSTEMPLATE' from config for container %d"
 msgstr "无法为容器 %d 在 config 中读取 'OSTEMPLATE'"
 
-#: src/openvz/openvz_conf.c:411
+#: src/openvz/openvz_conf.c:387
 #, c-format
 msgid "Could not read 'VE_PRIVATE' from config for container %d"
 msgstr "无法为容器 %d 在 config 中读取 'VE_PRIVATE'"
@@ -11909,50 +12160,50 @@
 "Could not parse barrier and limit of '%s' from config for container %d"
 msgstr "无法在配置中为容器 %s 解析屏障和限制 '%d'"
 
-#: src/openvz/openvz_conf.c:580 src/openvz/openvz_conf.c:1160
-#: src/openvz/openvz_driver.c:1931
+#: src/openvz/openvz_conf.c:464 src/openvz/openvz_conf.c:1054
+#: src/openvz/openvz_driver.c:1651
 msgid "Failed to parse vzlist output"
 msgstr "解析 vzlist 输入失败"
 
-#: src/openvz/openvz_conf.c:602 src/parallels/parallels_driver.c:676
+#: src/openvz/openvz_conf.c:511
 msgid "UUID in config file malformed"
 msgstr "配置文件中的 UUID 很奇怪"
 
-#: src/openvz/openvz_conf.c:614
+#: src/openvz/openvz_conf.c:523
 #, c-format
 msgid "Could not read config for container %d"
 msgstr "无法为容器 %d 在 config 中读取"
 
-#: src/openvz/openvz_conf.c:1015
+#: src/openvz/openvz_conf.c:909
 #, c-format
 msgid "invalid uuid %s"
 msgstr "无效 uuid %s"
 
-#: src/openvz/openvz_conf.c:1122
+#: src/openvz/openvz_conf.c:1016
 msgid "Failed to scan configuration directory"
 msgstr "扫描配置目录失败"
 
-#: src/openvz/openvz_driver.c:139
+#: src/openvz/openvz_driver.c:110
 msgid "Container is not defined"
 msgstr "没有定义容器"
 
-#: src/openvz/openvz_driver.c:164
+#: src/openvz/openvz_driver.c:173
 msgid "only one filesystem supported"
 msgstr "只支持一个文件系统"
 
-#: src/openvz/openvz_driver.c:173
+#: src/openvz/openvz_driver.c:182
 msgid "filesystem is not of type 'template' or 'mount'"
 msgstr "filesyste 不是 'template' 或者 'mount' 类型"
 
-#: src/openvz/openvz_driver.c:184 src/openvz/openvz_driver.c:2080
+#: src/openvz/openvz_driver.c:193
 msgid "Could not convert domain name to VEID"
 msgstr "无法将域名转换为域 VEID"
 
-#: src/openvz/openvz_driver.c:190
+#: src/openvz/openvz_driver.c:199
 msgid "Could not copy default config"
 msgstr "无法复制默认 config"
 
-#: src/openvz/openvz_driver.c:196
+#: src/openvz/openvz_driver.c:205
 msgid "Could not set the source dir for the filesystem"
 msgstr "无法为文件系统设置源目录"
 
@@ -11960,24 +12211,30 @@
 msgid "Can't set soft limit without hard limit"
 msgstr "没有硬限制则无法设定软限制"
 
-#: src/openvz/openvz_driver.c:273 src/openvz/openvz_driver.c:426
-#: src/openvz/openvz_driver.c:474 src/openvz/openvz_driver.c:548
-#: src/openvz/openvz_driver.c:592 src/openvz/openvz_driver.c:630
-#: src/openvz/openvz_driver.c:673 src/openvz/openvz_driver.c:736
-#: src/openvz/openvz_driver.c:1193 src/openvz/openvz_driver.c:1242
-#: src/openvz/openvz_driver.c:1272 src/openvz/openvz_driver.c:1367
-#: src/openvz/openvz_driver.c:2073 src/uml/uml_driver.c:1724
-#: src/uml/uml_driver.c:1862 src/uml/uml_driver.c:1911
-#: src/uml/uml_driver.c:1943 src/uml/uml_driver.c:2006
-#: src/uml/uml_driver.c:2088 src/uml/uml_driver.c:2375
-#: src/uml/uml_driver.c:2404 src/uml/uml_driver.c:2482
-#: src/vbox/vbox_tmpl.c:2075 src/vbox/vbox_tmpl.c:2135
-#: src/vbox/vbox_tmpl.c:5355 src/vbox/vbox_tmpl.c:5452
-#: src/vbox/vbox_tmpl.c:5681 src/vbox/vbox_tmpl.c:8811
-#: src/vbox/vbox_tmpl.c:9183 src/vmware/vmware_driver.c:426
-#: src/vmware/vmware_driver.c:499 src/vmware/vmware_driver.c:548
-#: src/vmware/vmware_driver.c:592 src/vmware/vmware_driver.c:955
-#: src/vmware/vmware_driver.c:1083 src/vmware/vmware_driver.c:1121
+#: src/libxl/libxl_driver.c:1625 src/libxl/libxl_driver.c:1656
+#: src/libxl/libxl_driver.c:1776 src/libxl/libxl_driver.c:1823
+#: src/libxl/libxl_driver.c:2264 src/libxl/libxl_driver.c:2383
+#: src/libxl/libxl_driver.c:2440 src/libxl/libxl_driver.c:2496
+#: src/libxl/libxl_driver.c:2560 src/libxl/libxl_driver.c:3240
+#: src/libxl/libxl_driver.c:3543 src/libxl/libxl_driver.c:3610
+#: src/libxl/libxl_driver.c:3701 src/openvz/openvz_driver.c:351
+#: src/openvz/openvz_driver.c:399 src/openvz/openvz_driver.c:473
+#: src/openvz/openvz_driver.c:517 src/openvz/openvz_driver.c:555
+#: src/openvz/openvz_driver.c:598 src/openvz/openvz_driver.c:649
+#: src/openvz/openvz_driver.c:1126 src/openvz/openvz_driver.c:1175
+#: src/openvz/openvz_driver.c:1205 src/openvz/openvz_driver.c:1298
+#: src/uml/uml_driver.c:1609 src/uml/uml_driver.c:1732
+#: src/uml/uml_driver.c:1778 src/uml/uml_driver.c:1807
+#: src/uml/uml_driver.c:1859 src/uml/uml_driver.c:1938
+#: src/uml/uml_driver.c:2221 src/uml/uml_driver.c:2247
+#: src/uml/uml_driver.c:2322 src/vbox/vbox_tmpl.c:2031
+#: src/vbox/vbox_tmpl.c:2091 src/vbox/vbox_tmpl.c:5261
+#: src/vbox/vbox_tmpl.c:5355 src/vbox/vbox_tmpl.c:5592
+#: src/vbox/vbox_tmpl.c:8657 src/vbox/vbox_tmpl.c:9022
+#: src/vmware/vmware_driver.c:330 src/vmware/vmware_driver.c:387
+#: src/vmware/vmware_driver.c:436 src/vmware/vmware_driver.c:480
+#: src/vmware/vmware_driver.c:835 src/vmware/vmware_driver.c:913
+#: src/vmware/vmware_driver.c:948
 msgid "no domain with matching uuid"
 msgstr "没有与 uuid 匹配的域"
 
@@ -11986,43 +12243,43 @@
 msgid "Hostname of '%s' is unset"
 msgstr "未设定 '%s' 主机名"
 
-#: src/openvz/openvz_driver.c:439
+#: src/openvz/openvz_driver.c:364
 #, c-format
 msgid "cannot read cputime for domain %d"
 msgstr "无法为域 %d 读取 cputime"
 
-#: src/openvz/openvz_driver.c:683 src/openvz/openvz_driver.c:746
-#: src/vmware/vmware_driver.c:435 src/vmware/vmware_driver.c:507
-#: src/vmware/vmware_driver.c:605
+#: src/openvz/openvz_driver.c:608 src/openvz/openvz_driver.c:659
+#: src/vmware/vmware_driver.c:336 src/vmware/vmware_driver.c:395
+#: src/vmware/vmware_driver.c:491
 msgid "domain is not in running state"
 msgstr "域没有处于运行状态"
 
-#: src/openvz/openvz_driver.c:822
+#: src/openvz/openvz_driver.c:749
 msgid "Container ID is not specified"
 msgstr "没有指定容器 ID"
 
-#: src/openvz/openvz_driver.c:852
+#: src/openvz/openvz_driver.c:785
 msgid "Could not generate eth name for container"
 msgstr "无法为容器生成 eth 名称"
 
-#: src/openvz/openvz_driver.c:863
+#: src/openvz/openvz_driver.c:797
 msgid "Could not generate veth name"
 msgstr "无法生成 veth 名称"
 
-#: src/openvz/openvz_driver.c:927
+#: src/openvz/openvz_driver.c:878
 msgid "Could not configure network"
 msgstr "无法配置网络"
 
-#: src/openvz/openvz_driver.c:938
+#: src/openvz/openvz_driver.c:889
 msgid "cannot replace NETIF config"
 msgstr "无法替换 NETIF 配置"
 
-#: src/openvz/openvz_driver.c:970
+#: src/openvz/openvz_driver.c:921
 #, c-format
 msgid "Already an OPENVZ VM active with the id '%s'"
 msgstr "已经用 id '%s' 激活了 OPENVZ VM"
 
-#: src/openvz/openvz_driver.c:982 src/openvz/openvz_driver.c:1073
+#: src/openvz/openvz_driver.c:932 src/openvz/openvz_driver.c:1014
 msgid "Error creating initial configuration"
 msgstr "生成初始配置时出错"
 
@@ -12030,11 +12287,11 @@
 msgid "Could not set disk quota"
 msgstr "无法设定磁盘配额"
 
-#: src/openvz/openvz_driver.c:996 src/openvz/openvz_driver.c:1087
+#: src/openvz/openvz_driver.c:940 src/openvz/openvz_driver.c:1020
 msgid "Could not set UUID"
 msgstr "无法设置 UUID"
 
-#: src/openvz/openvz_driver.c:1005 src/vbox/vbox_tmpl.c:5144
+#: src/openvz/openvz_driver.c:949 src/vbox/vbox_tmpl.c:5054
 msgid "current vcpu count must equal maximum"
 msgstr "当前 vcpu 计数必须等于最大值"
 
@@ -12043,33 +12300,33 @@
 msgid "Could not set number of vCPUs"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:1019
+#: src/openvz/openvz_driver.c:963
 msgid "Could not set memory size"
 msgstr "无法设定内存大小"
 
-#: src/openvz/openvz_driver.c:1057
+#: src/openvz/openvz_driver.c:1001
 #, c-format
 msgid "Already an OPENVZ VM defined with the id '%s'"
 msgstr "已经位于 id 为 '%s' 的 OPENVZ VM 中"
 
-#: src/openvz/openvz_driver.c:1141
+#: src/openvz/openvz_driver.c:1074
 msgid "no domain with matching id"
 msgstr "没有匹配 id 的域"
 
-#: src/openvz/openvz_driver.c:1150 src/vmware/vmware_driver.c:315
+#: src/openvz/openvz_driver.c:1083 src/vmware/vmware_driver.c:217
 msgid "domain is not in shutoff state"
 msgstr "域没有处于关闭状态"
 
-#: src/openvz/openvz_driver.c:1278
+#: src/openvz/openvz_driver.c:1211
 msgid "Could not read container config"
 msgstr "无法读取容器配置"
 
-#: src/openvz/openvz_driver.c:1302 src/qemu/qemu_driver.c:1240
+#: src/openvz/openvz_driver.c:1235 src/qemu/qemu_driver.c:1010
 #, c-format
 msgid "unknown type '%s'"
 msgstr "未知类型 '%s'"
 
-#: src/openvz/openvz_driver.c:1312 src/openvz/openvz_driver.c:1357
+#: src/openvz/openvz_driver.c:1244 src/openvz/openvz_driver.c:1288
 #, c-format
 msgid "unsupported flags (0x%x)"
 msgstr "不支持的标签 (0x%x)"
@@ -12078,25 +12335,25 @@
 msgid "Number of vCPUs should be >= 1"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:1428
+#: src/openvz/openvz_driver.c:1357
 #, c-format
 msgid "unexpected OpenVZ URI path '%s', try openvz:///system"
 msgstr "意外 OpenVZ URI 路径 '%s'，尝试 openvz:///system"
 
-#: src/openvz/openvz_driver.c:1435
+#: src/openvz/openvz_driver.c:1364
 msgid "OpenVZ control file /proc/vz does not exist"
 msgstr "OpenVZ 控制的文件 /proc/vz 不存在"
 
-#: src/openvz/openvz_driver.c:1441
+#: src/openvz/openvz_driver.c:1370
 msgid "OpenVZ control file /proc/vz is not accessible"
 msgstr "OpenVZ 控制的文件 /proc/vz 无法访问"
 
-#: src/openvz/openvz_driver.c:1538 src/openvz/openvz_driver.c:1593
+#: src/openvz/openvz_driver.c:1465 src/openvz/openvz_driver.c:1520
 #, c-format
 msgid "Could not parse VPS ID %s"
 msgstr "无法解析 VPS ID %s"
 
-#: src/openvz/openvz_driver.c:1549 src/openvz/openvz_driver.c:1606
+#: src/openvz/openvz_driver.c:1476 src/openvz/openvz_driver.c:1535
 msgid "failed to close file"
 msgstr "关闭文件失败"
 
@@ -12123,18 +12380,51 @@
 msgid "Failed to set %s for %s: %d"
 msgstr "为 %s 设定 %s 失败：%d"
 
-#: src/openvz/openvz_driver.c:1975 src/parallels/parallels_driver.c:67
-#: src/parallels/parallels_driver.c:1142 src/qemu/qemu_driver.c:1380
-#: src/test/test_driver.c:2601 src/uml/uml_driver.c:1757
-#: src/uml/uml_driver.c:1786 src/uml/uml_driver.c:1822
-#: src/uml/uml_driver.c:2187 src/uml/uml_driver.c:2307
-#: src/uml/uml_driver.c:2552 src/vmware/vmware_driver.c:756
+#: src/lxc/lxc_driver.c:3781 src/libxl/libxl_driver.c:2801
+#: src/qemu/qemu_driver.c:1144 src/qemu/qemu_driver.c:1196
+#: src/qemu/qemu_driver.c:1220 src/qemu/qemu_driver.c:1244
+#: src/qemu/qemu_driver.c:1396 src/qemu/qemu_driver.c:1463
+#: src/qemu/qemu_driver.c:1520 src/qemu/qemu_driver.c:1567
+#: src/qemu/qemu_driver.c:1629 src/qemu/qemu_driver.c:1690
+#: src/qemu/qemu_driver.c:1757 src/qemu/qemu_driver.c:1784
+#: src/qemu/qemu_driver.c:1816 src/qemu/qemu_driver.c:1945
+#: src/qemu/qemu_driver.c:2022 src/qemu/qemu_driver.c:2068
+#: src/qemu/qemu_driver.c:2155 src/qemu/qemu_driver.c:2188
+#: src/qemu/qemu_driver.c:2690 src/qemu/qemu_driver.c:2749
+#: src/qemu/qemu_driver.c:2800 src/qemu/qemu_driver.c:2834
+#: src/qemu/qemu_driver.c:2958 src/qemu/qemu_driver.c:3295
+#: src/qemu/qemu_driver.c:3433 src/qemu/qemu_driver.c:3588
+#: src/qemu/qemu_driver.c:3686 src/qemu/qemu_driver.c:3777
+#: src/qemu/qemu_driver.c:3841 src/qemu/qemu_driver.c:4421
+#: src/qemu/qemu_driver.c:4748 src/qemu/qemu_driver.c:4966
+#: src/qemu/qemu_driver.c:5574 src/qemu/qemu_driver.c:5741
+#: src/qemu/qemu_driver.c:5768 src/qemu/qemu_driver.c:7422
+#: src/qemu/qemu_driver.c:7507 src/qemu/qemu_driver.c:7720
+#: src/qemu/qemu_driver.c:7782 src/qemu/qemu_driver.c:7830
+#: src/qemu/qemu_driver.c:7898 src/qemu/qemu_driver.c:7995
+#: src/qemu/qemu_driver.c:8357 src/qemu/qemu_driver.c:8446
+#: src/qemu/qemu_driver.c:8627 src/qemu/qemu_driver.c:8698
+#: src/qemu/qemu_driver.c:8916 src/qemu/qemu_driver.c:8966
+#: src/qemu/qemu_driver.c:9028 src/qemu/qemu_driver.c:9084
+#: src/qemu/qemu_driver.c:9141 src/qemu/qemu_driver.c:9618
+#: src/qemu/qemu_driver.c:9868 src/qemu/qemu_driver.c:9899
+#: src/qemu/qemu_driver.c:9937 src/qemu/qemu_driver.c:9977
+#: src/qemu/qemu_driver.c:10019 src/qemu/qemu_driver.c:10054
+#: src/qemu/qemu_driver.c:10084 src/qemu/qemu_driver.c:10127
+#: src/qemu/qemu_driver.c:10162 src/qemu/qemu_driver.c:10232
+#: src/qemu/qemu_driver.c:10593 src/qemu/qemu_driver.c:10710
+#: src/qemu/qemu_driver.c:10858 src/qemu/qemu_driver.c:10964
+#: src/qemu/qemu_driver.c:11064 src/qemu/qemu_driver.c:11142
+#: src/qemu/qemu_driver.c:11293 src/test/test_driver.c:2119
+#: src/uml/uml_driver.c:1637 src/uml/uml_driver.c:1662
+#: src/uml/uml_driver.c:1695 src/uml/uml_driver.c:2038
+#: src/uml/uml_driver.c:2156 src/uml/uml_driver.c:2389
+#: src/vmware/vmware_driver.c:638
 #, c-format
 msgid "no domain with matching uuid '%s'"
 msgstr "没有匹配 uuid '%s' 的域"
 
-#: src/openvz/openvz_driver.c:1998 src/qemu/qemu_driver.c:9282
-#: src/test/test_driver.c:3433
+#: src/qemu/qemu_driver.c:7743 src/test/test_driver.c:2880
 #, c-format
 msgid "invalid path, '%s' is not a known interface"
 msgstr "无效路径，'%s' 是未知接口"
@@ -12166,13 +12456,6 @@
 msgid "Unexpected Parallels URI path '%s', try parallels:///system"
 msgstr "意外的 UML URI 路径 '%s', 尝试 paralles:///system"
 
-#: src/parallels/parallels_driver.c:1169 src/qemu/qemu_driver.c:1406
-#: src/qemu/qemu_driver.c:10228 src/qemu/qemu_driver.c:10639
-#: src/qemu/qemu_driver.c:10682
-#, c-format
-msgid "no domain with matching name '%s'"
-msgstr "没有与名称 '%s' 匹配的域"
-
 #: src/parallels/parallels_driver.c:1366
 #, c-format
 msgid "domain '%s' not %s"
@@ -12419,8 +12702,7 @@
 msgid "pool '%s' not found"
 msgstr "未找到池 '%s'"
 
-#: src/parallels/parallels_storage.c:99 src/parallels/parallels_storage.c:339
-#: src/storage/storage_backend_fs.c:835
+#: src/storage/storage_backend_fs.c:821
 #, c-format
 msgid "cannot open path '%s'"
 msgstr "无法打开路径 '%s'"
@@ -12429,7 +12711,7 @@
 msgid "Can't generate UUID"
 msgstr ""
 
-#: src/parallels/parallels_storage.c:247
+#: src/conf/storage_conf.c:752
 msgid "unknown root element for storage pool"
 msgstr "未知存储池的根元素"
 
@@ -12446,7 +12728,7 @@
 msgid "Failed to load pool configs"
 msgstr "载入池配置失败"
 
-#: src/parallels/parallels_storage.c:681 src/storage/storage_backend_fs.c:919
+#: src/storage/storage_backend_fs.c:905
 #, c-format
 msgid "cannot statvfs path '%s'"
 msgstr "无法 statvfs 路径 '%s'"
@@ -12455,90 +12737,60 @@
 msgid "Only local directories are supported"
 msgstr "只支持本地目录"
 
-#: src/parallels/parallels_storage.c:766 src/storage/storage_driver.c:706
-#: src/storage/storage_driver.c:925
+#: src/parallels/parallels_storage.c:766 src/storage/storage_driver.c:705
+#: src/storage/storage_driver.c:924
 #, c-format
 msgid "storage pool '%s' is still active"
 msgstr "存储池 '%s' 仍活跃"
 
-#: src/parallels/parallels_storage.c:805 src/storage/storage_driver.c:771
-#: src/storage/storage_driver.c:821 src/test/test_driver.c:4702
-#: src/test/test_driver.c:4873 src/test/test_driver.c:4909
-#: src/test/test_driver.c:4980
+#: src/test/test_driver.c:4032 src/test/test_driver.c:4204
+#: src/test/test_driver.c:4240 src/test/test_driver.c:4311
 #, c-format
 msgid "storage pool '%s' is already active"
 msgstr "存储池 '%s' 已经激活"
 
-#: src/parallels/parallels_storage.c:835 src/parallels/parallels_storage.c:872
-#: src/parallels/parallels_storage.c:1019
-#: src/parallels/parallels_storage.c:1054
-#: src/parallels/parallels_storage.c:1096
-#: src/parallels/parallels_storage.c:1291
-#: src/parallels/parallels_storage.c:1332
-#: src/parallels/parallels_storage.c:1471
-#: src/parallels/parallels_storage.c:1529
-#: src/parallels/parallels_storage.c:1574
-#: src/parallels/parallels_storage.c:1613 src/storage/storage_driver.c:862
-#: src/storage/storage_driver.c:982 src/storage/storage_driver.c:1210
-#: src/storage/storage_driver.c:1252 src/storage/storage_driver.c:1307
-#: src/storage/storage_driver.c:1371 src/storage/storage_driver.c:1523
-#: src/storage/storage_driver.c:1608 src/storage/storage_driver.c:1751
-#: src/storage/storage_driver.c:1757 src/storage/storage_driver.c:1914
-#: src/storage/storage_driver.c:1980 src/storage/storage_driver.c:2049
-#: src/storage/storage_driver.c:2360 src/storage/storage_driver.c:2428
-#: src/storage/storage_driver.c:2488 src/storage/storage_driver.c:2539
-#: src/test/test_driver.c:4938 src/test/test_driver.c:5015
-#: src/test/test_driver.c:5170 src/test/test_driver.c:5206
-#: src/test/test_driver.c:5316 src/test/test_driver.c:5433
-#: src/test/test_driver.c:5511 src/test/test_driver.c:5608
-#: src/test/test_driver.c:5686 src/test/test_driver.c:5734
-#: src/test/test_driver.c:5774
+#: src/test/test_driver.c:4269 src/test/test_driver.c:4346
+#: src/test/test_driver.c:4501 src/test/test_driver.c:4536
+#: src/test/test_driver.c:4582 src/test/test_driver.c:4696
+#: src/test/test_driver.c:4780 src/test/test_driver.c:4883
+#: src/test/test_driver.c:4961 src/test/test_driver.c:5009
+#: src/test/test_driver.c:5049
 #, c-format
 msgid "storage pool '%s' is not active"
 msgstr "存储池 '%s' 未激活"
 
-#: src/parallels/parallels_storage.c:988 src/storage/storage_driver.c:1146
-#: src/test/test_driver.c:5137
+#: src/storage/storage_driver.c:1038 src/test/test_driver.c:4468
 msgid "pool has no config file"
 msgstr "池没有配置文件"
 
-#: src/parallels/parallels_storage.c:1104
-#: src/parallels/parallels_storage.c:1349
-#: src/parallels/parallels_storage.c:1465
-#: src/parallels/parallels_storage.c:1523
-#: src/parallels/parallels_storage.c:1568
-#: src/parallels/parallels_storage.c:1607 src/storage/storage_driver.c:1379
-#: src/storage/storage_driver.c:1534 src/storage/storage_driver.c:1768
-#: src/storage/storage_driver.c:1922 src/storage/storage_driver.c:1988
-#: src/storage/storage_driver.c:2060 src/storage/storage_driver.c:2368
-#: src/storage/storage_driver.c:2436 src/storage/storage_driver.c:2496
-#: src/storage/storage_driver.c:2547 src/test/test_driver.c:5324
-#: src/test/test_driver.c:5528 src/test/test_driver.c:5601
-#: src/test/test_driver.c:5679 src/test/test_driver.c:5727
-#: src/test/test_driver.c:5767
+#: src/storage/storage_driver.c:1184 src/storage/storage_driver.c:1462
+#: src/storage/storage_driver.c:1607 src/storage/storage_driver.c:1669
+#: src/storage/storage_driver.c:1886 src/storage/storage_driver.c:1946
+#: src/storage/storage_driver.c:2024 src/storage/storage_driver.c:2080
+#: src/storage/storage_driver.c:2127 src/test/test_driver.c:4590
+#: src/test/test_driver.c:4797 src/test/test_driver.c:4876
+#: src/test/test_driver.c:4954 src/test/test_driver.c:5002
+#: src/test/test_driver.c:5042
 #, c-format
 msgid "no storage vol with matching name '%s'"
 msgstr "没有带匹配名称 '%s' 的存储卷"
 
-#: src/parallels/parallels_storage.c:1148 src/test/test_driver.c:5369
+#: src/test/test_driver.c:4633
 #, c-format
 msgid "no storage vol with matching key '%s'"
 msgstr "没有带匹配密钥 '%s' 的存储卷"
 
-#: src/parallels/parallels_storage.c:1180 src/test/test_driver.c:5404
+#: src/test/test_driver.c:4667
 #, c-format
 msgid "no storage vol with matching path '%s'"
 msgstr "没有带匹配路径 '%s' 的存储卷"
 
-#: src/parallels/parallels_storage.c:1217
-#: src/parallels/parallels_storage.c:1342 src/test/test_driver.c:5443
-#: src/test/test_driver.c:5521
+#: src/storage/storage_driver.c:1322 src/test/test_driver.c:4706
+#: src/test/test_driver.c:4790
 msgid "storage vol already exists"
 msgstr "存储卷已经存在"
 
-#: src/parallels/parallels_storage.c:1226
-#: src/parallels/parallels_storage.c:1358 src/test/test_driver.c:5451
-#: src/test/test_driver.c:5537
+#: src/test/test_driver.c:4714 src/test/test_driver.c:4806
 #, c-format
 msgid "Not enough free space in pool for volume '%s'"
 msgstr "在池中没有用于卷 '%s' 的足够可用空间"
@@ -12552,228 +12804,226 @@
 msgid "Can't remove file '%s'"
 msgstr "无法删除文件 '%s'"
 
-#: src/phyp/phyp_driver.c:122 src/phyp/phyp_driver.c:135
-#: src/phyp/phyp_driver.c:160 src/phyp/phyp_driver.c:173
-#: src/phyp/phyp_driver.c:680 src/phyp/phyp_driver.c:719
+#: src/phyp/phyp_driver.c:121 src/phyp/phyp_driver.c:134
+#: src/phyp/phyp_driver.c:159 src/phyp/phyp_driver.c:172
+#: src/phyp/phyp_driver.c:679 src/phyp/phyp_driver.c:718
 msgid "unable to wait on libssh2 socket"
 msgstr ""
 
-#: src/phyp/phyp_driver.c:406
+#: src/phyp/phyp_driver.c:430
 #, c-format
 msgid "Cannot parse number from '%s'"
 msgstr "无法解析 '%s' 中的数字"
 
-#: src/phyp/phyp_driver.c:437 src/phyp/phyp_driver.c:443
+#: src/phyp/phyp_driver.c:461 src/phyp/phyp_driver.c:467
 msgid "Unable to write information to local file."
 msgstr "无法向本地文件中写入信息"
 
-#: src/phyp/phyp_driver.c:449 src/phyp/phyp_driver.c:727
+#: src/phyp/phyp_driver.c:473 src/phyp/phyp_driver.c:784
 #, c-format
 msgid "Could not close %s"
 msgstr "无法关闭 %s"
 
-#: src/phyp/phyp_driver.c:508
+#: src/phyp/phyp_driver.c:546
 #, c-format
 msgid "Failed to read from %s"
 msgstr "读取 %s 失败"
 
-#: src/phyp/phyp_driver.c:774
+#: src/phyp/phyp_driver.c:840
 msgid "Unable to determine number of domains."
 msgstr "无法确定域的数目。"
 
-#: src/phyp/phyp_driver.c:925 src/phyp/phyp_driver.c:1006
+#: src/phyp/phyp_driver.c:1005 src/phyp/phyp_driver.c:1086
 msgid "No authentication callback provided."
 msgstr "没有验证提供的回叫。"
 
-#: src/phyp/phyp_driver.c:946
+#: src/phyp/phyp_driver.c:1026
 #, c-format
 msgid "Error while getting %s address info"
 msgstr "获取 %s 地址信息时出错"
 
-#: src/phyp/phyp_driver.c:963
+#: src/phyp/phyp_driver.c:1043
 #, c-format
 msgid "Failed to connect to %s"
 msgstr "连接到 %s 失败"
 
-#: src/phyp/phyp_driver.c:983
+#: src/phyp/phyp_driver.c:1063
 msgid "Failure establishing SSH session."
 msgstr "建立 SSH 会话失败"
 
-#: src/phyp/phyp_driver.c:1025
+#: src/phyp/phyp_driver.c:1105
 msgid "Authentication failed"
 msgstr "验证失败"
 
-#: src/phyp/phyp_driver.c:1081
+#: src/phyp/phyp_driver.c:1160
 msgid "Missing server name in phyp:// URI"
 msgstr "在 phyp:// URI 缺少服务器名"
 
-#: src/phyp/phyp_driver.c:1112
+#: src/phyp/phyp_driver.c:1202
 msgid "Error parsing 'path'. Invalid characters."
 msgstr "解析 'path' 出错。无效字符。"
 
-#: src/phyp/phyp_driver.c:1119
+#: src/phyp/phyp_driver.c:1209
 msgid "Error while opening SSH session."
 msgstr "打开 SSH 会话时出错。"
 
-#: src/phyp/phyp_driver.c:1505 src/phyp/phyp_driver.c:1550
-#: src/phyp/phyp_driver.c:1722
+#: src/phyp/phyp_driver.c:1590 src/phyp/phyp_driver.c:1635
+#: src/phyp/phyp_driver.c:1813
 msgid "Unable to get VIOS profile name."
 msgstr "无法获得 VIOS 配置文件名称。"
 
-#: src/phyp/phyp_driver.c:1545 src/phyp/phyp_driver.c:1687
+#: src/phyp/phyp_driver.c:1630 src/phyp/phyp_driver.c:1778
 msgid "Unable to get VIOS name"
 msgstr "无法获得 VIOS 名称"
 
-#: src/phyp/phyp_driver.c:1555
+#: src/phyp/phyp_driver.c:1640
 msgid "Unable to get free slot number"
 msgstr "无法获得剩余插槽数"
 
-#: src/phyp/phyp_driver.c:1697 src/phyp/phyp_driver.c:1701
+#: src/phyp/phyp_driver.c:1788 src/phyp/phyp_driver.c:1792
 msgid "Unable to create new virtual adapter"
 msgstr "无法生产新的虚拟适配器"
 
-#: src/phyp/phyp_driver.c:1781
+#: src/phyp/phyp_driver.c:1872
 msgid ""
 "Possibly you don't have IBM Tools installed in your LPAR.Contact your "
 "support to enable this feature."
 msgstr "您可能没有在您的 LAPR 中安装 IBM 工具。联系支持服务启用此功能。"
 
-#: src/phyp/phyp_driver.c:1912
+#: src/phyp/phyp_driver.c:2003
 #, c-format
 msgid "Unable to create Volume: %s"
 msgstr "无法生成卷：%s"
 
-#: src/phyp/phyp_driver.c:1962 src/phyp/phyp_driver.c:2215
-#: src/phyp/phyp_driver.c:2654
+#: src/phyp/phyp_driver.c:2054 src/phyp/phyp_driver.c:2307
+#: src/phyp/phyp_driver.c:2756
 msgid "Unable to determine storage pool's name."
 msgstr "无法确定存储池的名称"
 
-#: src/phyp/phyp_driver.c:1967 src/phyp/phyp_driver.c:2659
+#: src/phyp/phyp_driver.c:2059 src/phyp/phyp_driver.c:2761
 msgid "Unable to determine storage pool's uuid."
 msgstr "无法确定存储池的 uuid。"
 
-#: src/phyp/phyp_driver.c:1973 src/phyp/phyp_driver.c:2665
+#: src/phyp/phyp_driver.c:2065 src/phyp/phyp_driver.c:2767
 msgid "Unable to determine storage pools's size."
 msgstr "无法确定存储池的大小。"
 
-#: src/phyp/phyp_driver.c:1986 src/phyp/phyp_driver.c:2678
+#: src/phyp/phyp_driver.c:2078 src/phyp/phyp_driver.c:2780
 msgid "Unable to determine storage pools's source adapter."
 msgstr "无法确定存储池的源适配器。"
 
-#: src/phyp/phyp_driver.c:1991
+#: src/phyp/phyp_driver.c:2083
 msgid "Error parsing volume XML."
 msgstr "解析卷 XML 出错。"
 
-#: src/phyp/phyp_driver.c:1997
+#: src/phyp/phyp_driver.c:2089
 msgid "StoragePool name already exists."
 msgstr "存储池名称已存在。"
 
-#: src/phyp/phyp_driver.c:2006
+#: src/phyp/phyp_driver.c:2097
 msgid "Key must be empty, Power Hypervisor will create one for you."
 msgstr "密钥必须为空。Power Hypervisor 会为您生成一个。"
 
-#: src/phyp/phyp_driver.c:2011
+#: src/phyp/phyp_driver.c:2102
 msgid "Capacity cannot be empty."
 msgstr "容量不能为空。"
 
-#: src/phyp/phyp_driver.c:2186
+#: src/phyp/phyp_driver.c:2278
 msgid "Unable to determine storage sp's name."
 msgstr "无法确定存储 sp 的名称。"
 
-#: src/phyp/phyp_driver.c:2191
+#: src/phyp/phyp_driver.c:2283
 msgid "Unable to determine storage sp's uuid."
 msgstr "无法确定存储 sp 的 uuid。"
 
-#: src/phyp/phyp_driver.c:2196
+#: src/phyp/phyp_driver.c:2288
 msgid "Unable to determine storage sps's size."
 msgstr "无法确定存储 sp 的大小。"
 
-#: src/phyp/phyp_driver.c:2208
+#: src/phyp/phyp_driver.c:2300
 msgid "Unable to determine storage sps's source adapter."
 msgstr "无法确定存储 sp 的源适配器。"
 
-#: src/phyp/phyp_driver.c:2406
+#: src/phyp/phyp_driver.c:2507
 #, c-format
 msgid "Unable to destroy Storage Pool: %s"
 msgstr "无法销毁存储池：%s"
 
-#: src/phyp/phyp_driver.c:2436
+#: src/phyp/phyp_driver.c:2435
 msgid "Only 'scsi_host' adapter is supported"
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2452
+#: src/phyp/phyp_driver.c:2546
 #, c-format
 msgid "Unable to create Storage Pool: %s"
 msgstr "无法创建存储池：%s"
 
-#: src/phyp/phyp_driver.c:3247
+#: src/phyp/phyp_driver.c:3357
 msgid "Unable to determine domain's name."
 msgstr "无法确定域的名称。"
 
-#: src/phyp/phyp_driver.c:3252
+#: src/phyp/phyp_driver.c:3362
 msgid "Unable to generate random uuid."
 msgstr "无法生成随机 uuid。"
 
-#: src/phyp/phyp_driver.c:3258
+#: src/phyp/phyp_driver.c:3368
 msgid "Unable to determine domain's max memory."
 msgstr "无法确定域的最大内存。"
 
-#: src/phyp/phyp_driver.c:3264
+#: src/phyp/phyp_driver.c:3374
 msgid "Unable to determine domain's memory."
 msgstr "无法确定域的内存。"
 
-#: src/phyp/phyp_driver.c:3270
+#: src/phyp/phyp_driver.c:3380
 msgid "Unable to determine domain's CPU."
 msgstr "无法确定域的 CPU。"
 
-#: src/phyp/phyp_driver.c:3473
+#: src/phyp/phyp_driver.c:3583
 msgid ""
 "Field <memory> on the domain XML file is missing or has invalid value."
 msgstr "域 XML 文件中缺少字段 <memory> 或者有无效值。"
 
-#: src/phyp/phyp_driver.c:3480
+#: src/phyp/phyp_driver.c:3590
 msgid ""
 "Field <currentMemory> on the domain XML file is missing or has invalid value."
 msgstr "域 XML 文件中缺少字段 <currentMemory> 或者有无效值。"
 
-#: src/phyp/phyp_driver.c:3487
+#: src/phyp/phyp_driver.c:3597
 msgid "Domain XML must contain at least one <disk> element."
 msgstr "域 XML 必须包含至少一个 <disk> 元素"
 
-#: src/phyp/phyp_driver.c:3493
+#: src/phyp/phyp_driver.c:3603
 msgid "Field <src> under <disk> on the domain XML file is missing."
 msgstr "域 XML 文件中 <disk> 项下的 <src> 字段缺失"
 
-#: src/phyp/phyp_driver.c:3509
+#: src/phyp/phyp_driver.c:3619
 #, c-format
 msgid "Unable to create LPAR. Reason: '%s'"
 msgstr "无法生成 LPAR。原因：'%s'"
 
-#: src/phyp/phyp_driver.c:3514
+#: src/phyp/phyp_driver.c:3624
 msgid "Unable to add LPAR to the table"
 msgstr "无法在表格中添加 LPAR"
 
-#: src/phyp/phyp_driver.c:3618
+#: src/phyp/phyp_driver.c:3728
 msgid "You are trying to set a number of CPUs bigger than the max possible."
 msgstr "您要设定大于最多 CPU 数的 CPU 数。"
 
-#: src/phyp/phyp_driver.c:3642
+#: src/phyp/phyp_driver.c:3752
 msgid ""
 "Possibly you don't have IBM Tools installed in your LPAR. Contact your "
 "support to enable this feature."
 msgstr "您可能没有在 LPAR 中安装 IBM 根据。请联络支持服务启用该功能。"
 
-#: src/qemu/qemu_agent.c:180 src/qemu/qemu_command.c:242
-#: src/qemu/qemu_monitor.c:280
+#: src/qemu/qemu_monitor.c:226
 msgid "failed to create socket"
 msgstr "生成插槽失败"
 
-#: src/qemu/qemu_agent.c:186 src/qemu/qemu_monitor.c:801
+#: src/qemu/qemu_monitor.c:701
 msgid "Unable to put monitor into non-blocking mode"
 msgstr "无法将监视器置于无阻塞模式"
 
-#: src/qemu/qemu_agent.c:193 src/qemu/qemu_agent.c:259
-#: src/qemu/qemu_monitor.c:796
+#: src/qemu/qemu_monitor.c:696
 msgid "Unable to set monitor close-on-exec flag"
 msgstr "无法为监视器设定 close-on-exec 标签"
 
@@ -12782,7 +13032,7 @@
 msgid "Agent path %s too big for destination"
 msgstr "对于目的地来说代理路径 %s 太大"
 
-#: src/qemu/qemu_agent.c:228 src/qemu/qemu_monitor.c:306
+#: src/qemu/qemu_monitor.c:252
 msgid "failed to connect to monitor socket"
 msgstr "无法连接到监控程序插槽"
 
@@ -12790,22 +13040,22 @@
 msgid "monitor socket did not show up"
 msgstr ""
 
-#: src/qemu/qemu_agent.c:253 src/qemu/qemu_monitor.c:331
+#: src/qemu/qemu_monitor.c:277
 #, c-format
 msgid "Unable to open monitor path %s"
 msgstr "无法打开监控器路径 %s"
 
-#: src/qemu/qemu_agent.c:315 src/qemu/qemu_monitor_json.c:164
+#: src/qemu/qemu_monitor_json.c:122
 #, c-format
 msgid "Parsed JSON reply '%s' isn't an object"
 msgstr "解析的 JSON 回复 '%s' 不是一个对象"
 
-#: src/qemu/qemu_agent.c:346 src/qemu/qemu_monitor_json.c:185
+#: src/qemu/qemu_monitor_json.c:143
 #, c-format
 msgid "Unexpected JSON reply '%s'"
 msgstr "意外的 JSON 回复 '%s'"
 
-#: src/qemu/qemu_agent.c:350 src/qemu/qemu_monitor_json.c:189
+#: src/qemu/qemu_monitor_json.c:147
 #, c-format
 msgid "Unknown JSON reply '%s'"
 msgstr "未知 JSON 回复 '%s'"
@@ -12823,50 +13073,50 @@
 msgid "Cannot connect to agent socket"
 msgstr "无法连接到代理插槽"
 
-#: src/qemu/qemu_agent.c:498 src/qemu/qemu_monitor.c:516
+#: src/qemu/qemu_monitor.c:430
 msgid "Unable to write to monitor"
 msgstr "无法写入监控程序"
 
-#: src/qemu/qemu_agent.c:536 src/qemu/qemu_monitor.c:554
+#: src/qemu/qemu_monitor.c:470
 msgid "Unable to read from monitor"
 msgstr "无法从监控程序中读取"
 
-#: src/qemu/qemu_agent.c:591 src/qemu/qemu_monitor.c:620
+#: src/qemu/qemu_monitor.c:525
 #, c-format
 msgid "event from unexpected fd %d!=%d / watch %d!=%d"
 msgstr "意外 fd %d!=%d / watch %d!=%d 中的事件"
 
-#: src/qemu/qemu_agent.c:631 src/qemu/qemu_monitor.c:656
+#: src/qemu/qemu_monitor.c:560
 msgid "End of file from monitor"
 msgstr "监控程序的文件结尾"
 
-#: src/qemu/qemu_agent.c:639 src/qemu/qemu_monitor.c:665
+#: src/qemu/qemu_monitor.c:568
 msgid "Invalid file descriptor while waiting for monitor"
 msgstr "等待监控程序时的无效文件描述符"
 
-#: src/qemu/qemu_agent.c:645 src/qemu/qemu_monitor.c:671
+#: src/qemu/qemu_monitor.c:574
 #, c-format
 msgid "Unhandled event %d for monitor fd %d"
 msgstr "监控程序 fd %d 的未处理事件 %d"
 
-#: src/qemu/qemu_agent.c:659 src/qemu/qemu_monitor.c:705
+#: src/qemu/qemu_monitor.c:588
 msgid "Error while processing monitor IO"
 msgstr "处理监控程序 IO 时出错"
 
-#: src/qemu/qemu_agent.c:716 src/qemu/qemu_monitor.c:763
+#: src/qemu/qemu_monitor.c:646
 msgid "EOF notify callback must be supplied"
 msgstr "必须提供 EOF 通知回叫"
 
-#: src/qemu/qemu_agent.c:729 src/qemu/qemu_monitor.c:782
+#: src/qemu/qemu_monitor.c:663
 msgid "cannot initialize monitor condition"
 msgstr "无法初始化监控程序条件"
 
-#: src/qemu/qemu_agent.c:748 src/qemu/qemu_monitor.c:867
+#: src/qemu/qemu_monitor.c:687
 #, c-format
 msgid "unable to handle monitor type: %s"
 msgstr "无法处理监控程序类型：%s"
 
-#: src/qemu/qemu_agent.c:769 src/qemu/qemu_monitor.c:818
+#: src/qemu/qemu_monitor.c:713
 msgid "unable to register monitor events"
 msgstr "无法注册监控程序事件"
 
@@ -12878,8 +13128,7 @@
 msgid "Unable to wait on agent monitor condition"
 msgstr ""
 
-#: src/qemu/qemu_agent.c:939 src/qemu/qemu_agent.c:1004
-#: src/qemu/qemu_monitor_json.c:275
+#: src/qemu/qemu_monitor_json.c:239
 msgid "Missing monitor reply object"
 msgstr "缺少监控程序回复对象"
 
@@ -12902,12 +13151,12 @@
 msgid "unable to execute QEMU agent command '%s': %s"
 msgstr ""
 
-#: src/qemu/qemu_agent.c:1153 src/qemu/qemu_monitor_json.c:426
+#: src/qemu/qemu_monitor_json.c:388
 #, c-format
 msgid "argument key '%s' is too short, missing type prefix"
 msgstr "参数密钥 '%s' 太短，缺少类型前缀"
 
-#: src/qemu/qemu_agent.c:1211 src/qemu/qemu_monitor_json.c:489
+#: src/qemu/qemu_monitor_json.c:442
 #, c-format
 msgid "unsupported data type '%c' for arg '%s'"
 msgstr "参数 '%c' 不支持的数据类型 '%s'"
@@ -12958,93 +13207,94 @@
 msgid "Cannot offline enough CPUs"
 msgstr "无法使足够的 CPU 离线"
 
-#: src/qemu/qemu_bridge_filter.c:42
+#: src/qemu/qemu_bridge_filter.c:43
 #, c-format
 msgid "failed to add ebtables rule to set default policy to drop on '%s'"
 msgstr "添加 ebtables 规则将默认策略设定为偶然发现 '%s' 失败"
 
-#: src/qemu/qemu_bridge_filter.c:58
+#: src/qemu/qemu_bridge_filter.c:59
 #, c-format
 msgid "cannot filter mac addresses on bridge '%s'"
 msgstr "无法在桥接 '%s' 中过滤 mac 地址"
 
-#: src/qemu/qemu_bridge_filter.c:78 src/qemu/qemu_bridge_filter.c:99
+#: src/qemu/qemu_bridge_filter.c:79 src/qemu/qemu_bridge_filter.c:100
 #, c-format
 msgid "failed to add ebtables rule to allow routing to '%s'"
 msgstr "添加 ebtables 规则允许路由到 '%s' 失败"
 
-#: src/qemu/qemu_capabilities.c:452
+#: src/qemu/qemu_capabilities.c:285 src/qemu/qemu_capabilities.c:1330
+#: src/qemu/qemu_capabilities.c:1413
 #, c-format
 msgid "Cannot find QEMU binary %s"
 msgstr "无法找到 QEMU 二进制 %s"
 
-#: src/qemu/qemu_capabilities.c:1173
+#: src/qemu/qemu_capabilities.c:1179
 msgid "this qemu binary requires libvirt to be compiled with yajl"
 msgstr "这个 qemu 二进制需要 libvirt 方可与 yajl 编译"
 
-#: src/qemu/qemu_capabilities.c:1317 src/util/virdnsmasq.c:688
+#: src/qemu/qemu_capabilities.c:1323 src/util/virdnsmasq.c:688
 #, c-format
 msgid "cannot parse %s version number in '%.*s'"
 msgstr "无法在 '%s' 中接卸 %.*s 版本号"
 
-#: src/qemu/qemu_capabilities.c:1568
+#: src/qemu/qemu_capabilities.c:1575
 msgid "Malformed QEMU device list string, missing quote"
 msgstr "畸形的 QEMU 设备列表字符串，缺少括号。"
 
-#: src/qemu/qemu_capabilities.c:1622
+#: src/qemu/qemu_capabilities.c:1629
 msgid "Malformed QEMU device list string, missing '='"
 msgstr "畸形 QEMU 设备列表字符串，缺少 '='"
 
-#: src/qemu/qemu_capabilities.c:1740
+#: src/qemu/qemu_capabilities.c:1407
 #, c-format
 msgid "Cannot find suitable emulator for %s"
 msgstr "无法找到适合 %s 的模拟器"
 
-#: src/qemu/qemu_capabilities.c:2052
+#: src/qemu/qemu_capabilities.c:2059
 msgid "unable to probe for add-fd"
 msgstr ""
 
-#: src/qemu/qemu_capabilities.c:2493
+#: src/qemu/qemu_capabilities.c:2501
 #, c-format
 msgid "Unknown QEMU arch %s"
 msgstr ""
 
-#: src/qemu/qemu_capabilities.c:2731
+#: src/qemu/qemu_capabilities.c:2745
 #, c-format
 msgid "Failed to kill process %lld: %s"
 msgstr "杀死进程 %lld 失败：%s"
 
-#: src/qemu/qemu_capabilities.c:2758
+#: src/qemu/qemu_capabilities.c:2772
 #, c-format
 msgid "Cannot check QEMU binary %s"
 msgstr "无法检查 QEMU 二进制 %s"
 
-#: src/qemu/qemu_capabilities.c:2769
+#: src/qemu/qemu_capabilities.c:2783
 #, c-format
 msgid "QEMU binary %s is not executable"
 msgstr "QEMU 二进制 %s 不可执行"
 
-#: src/qemu/qemu_cgroup.c:389
+#: src/qemu/qemu_cgroup.c:311 src/qemu/qemu_cgroup.c:334
 msgid "Block I/O tuning is not available on this host"
 msgstr "这台主机中无法使用阻断 I/O调节"
 
-#: src/qemu/qemu_cgroup.c:425
+#: src/qemu/qemu_cgroup.c:373
 msgid "Memory cgroup is not available on this host"
 msgstr "这个主机中的没存 cgroup 不可用"
 
-#: src/qemu/qemu_cgroup.c:592 src/qemu/qemu_cgroup.c:835
+#: src/qemu/qemu_cgroup.c:625 src/qemu/qemu_cgroup.c:868
 msgid "failed to convert cpu mask"
 msgstr "转换 cpu 掩码失败"
 
-#: src/qemu/qemu_cgroup.c:616
+#: src/qemu/qemu_cgroup.c:388
 msgid "CPU tuning is not available on this host"
 msgstr "这个主机中的 CPU 调节不可用"
 
-#: src/qemu/qemu_cgroup.c:736
+#: src/qemu/qemu_cgroup.c:769
 msgid "Cannot setup cgroups until process is started"
 msgstr ""
 
-#: src/qemu/qemu_cgroup.c:861 src/qemu/qemu_cgroup.c:941
+#: src/qemu/qemu_cgroup.c:894 src/qemu/qemu_cgroup.c:974
 msgid "cgroup cpu is required for scheduler tuning"
 msgstr "调度程序调试需要 cgroup cpu"
 
@@ -13052,25 +13302,20 @@
 msgid "failed to retrieve file descriptor for interface"
 msgstr ""
 
-#: src/qemu/qemu_command.c:338
-#, c-format
-msgid "Network type %d is not supported"
-msgstr "不支持网络类型 %d"
-
 #: src/qemu/qemu_command.c:386
 #, c-format
 msgid "failed to add ebtables rule to allow MAC address on '%s'"
 msgstr "添加 ebtables 规则允许 '%s' 中的 MAC 地址失败"
 
-#: src/qemu/qemu_command.c:487
+#: src/qemu/qemu_command.c:312
 msgid "vhost-net is not supported with this QEMU binary"
 msgstr "这个 QEMU 二进制文件不支持 vhost-net"
 
-#: src/qemu/qemu_command.c:499
+#: src/qemu/qemu_command.c:323
 msgid "vhost-net is only supported for virtio network interfaces"
 msgstr "只在 virtio 网络接口中支持 vhost-net"
 
-#: src/qemu/qemu_command.c:517
+#: src/qemu/qemu_command.c:339
 msgid "vhost-net was requested for an interface, but is unavailable"
 msgstr "接口要求 vhost-net，但不可用。"
 
@@ -13081,12 +13326,12 @@
 "domain %s"
 msgstr "从网络 中分配的 PCI 设备  %04x:%02x:%02x.%x %s 已被域名 %s 使用"
 
-#: src/qemu/qemu_command.c:649
+#: src/qemu/qemu_command.c:420
 #, c-format
 msgid "cannot convert disk '%s' to bus/device index"
 msgstr "无法将磁盘 '%s' 转换为总线/设备索引"
 
-#: src/qemu/qemu_command.c:681
+#: src/qemu/qemu_command.c:449
 #, c-format
 msgid "Unsupported disk name mapping for bus '%s'"
 msgstr "不支持总线 '%s' 的磁盘名称映射"
@@ -13112,15 +13357,15 @@
 msgid "Unable to determine model for scsi controller"
 msgstr "无法确定 scsi 控制器型号"
 
-#: src/qemu/qemu_command.c:828
+#: src/qemu/qemu_command.c:513
 msgid "Unable to determine device index for network device"
 msgstr "无法为网络设备确定设备索引"
 
-#: src/qemu/qemu_command.c:852
+#: src/qemu/qemu_command.c:540
 msgid "Unable to determine device index for hostdev device"
 msgstr "无法为 hostdev 设备确定设备索引"
 
-#: src/qemu/qemu_command.c:877
+#: src/qemu/qemu_command.c:567
 msgid "Unable to determine device index for redirected device"
 msgstr "无法为创新定向的设备确定设备索引"
 
@@ -13240,7 +13485,7 @@
 "device on function 0)"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2170
+#: src/qemu/qemu_command.c:947
 msgid "Only PCI device addresses with function=0 are supported"
 msgstr "只支持带 function=0 的 PCI 设备地址"
 
@@ -13248,11 +13493,11 @@
 msgid "No more available PCI slots"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2398
+#: src/qemu/qemu_command.c:1135
 msgid "Primary IDE controller must have PCI address 0:0:1.1"
 msgstr "主 IDE 控制器必须有 PCI 地址 0:0:1.1"
 
-#: src/qemu/qemu_command.c:2418
+#: src/qemu/qemu_command.c:1158
 msgid "PIIX3 USB controller must have PCI address 0:0:1.2"
 msgstr "PIIX3 USB 控制器必须有 PCI 地址 0:0:1.2"
 
@@ -13260,7 +13505,7 @@
 msgid "PCI address 0:0:2.0 is in use, QEMU needs it for primary video"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2483
+#: src/qemu/qemu_command.c:1193
 msgid "Primary video card must have PCI address 0:0:2.0"
 msgstr "主显卡必须有 PCI 地址 0:0:2.0"
 
@@ -13276,11 +13521,11 @@
 msgid "Primary video card must have PCI address 0:0:1.0"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2909
+#: src/qemu/qemu_command.c:1273
 msgid "virtio only support device address type 'PCI'"
 msgstr "virtio 只支持设备地址类型 'PCI'"
 
-#: src/qemu/qemu_command.c:2972 src/qemu/qemu_command.c:5445
+#: src/qemu/qemu_command.c:2972 src/qemu/qemu_command.c:5455
 msgid "non-primary video device must be type of 'qxl'"
 msgstr ""
 
@@ -13297,12 +13542,12 @@
 "Could not find PCI controller with index %u required for device at address %s"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3056
+#: src/qemu/qemu_command.c:1373
 msgid ""
 "Only PCI device addresses with function=0 are supported with this QEMU binary"
 msgstr "这个 QEMU 库只支持 function=0 的 PCI 设备地址"
 
-#: src/qemu/qemu_command.c:3062
+#: src/qemu/qemu_command.c:1379
 msgid "'multifunction=on' is not supported with this QEMU binary"
 msgstr "这个 QEMU 二进制不支持 'multifunction=on'"
 
@@ -13318,7 +13563,7 @@
 msgid "rombar and romfile not supported in this QEMU binary"
 msgstr "这个 QEMU 二进制支持 rombar 和 romfile"
 
-#: src/qemu/qemu_command.c:3172
+#: src/qemu/qemu_command.c:1430
 #, c-format
 msgid "driver serial '%s' contains unsafe characters"
 msgstr "驱动器序列号 '%s' 包含不安全字符"
@@ -13364,12 +13609,12 @@
 msgid "invalid name '%s' for iSCSI disk"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3524
+#: src/qemu/qemu_command.c:5748 src/qemu/qemu_command.c:6890
 #, c-format
 msgid "cannot parse nbd filename '%s'"
 msgstr "无法解析 nbd 文件名称 '%s'"
 
-#: src/qemu/qemu_command.c:3569
+#: src/qemu/qemu_command.c:3569 src/storage/storage_backend_gluster.c:536
 #, c-format
 msgid "failed to parse port number '%s'"
 msgstr ""
@@ -13401,34 +13646,34 @@
 msgid "':' not allowed in RBD source volume name '%s'"
 msgstr "RBD 源卷名称 '%s' 中部允许使用 ':'"
 
-#: src/qemu/qemu_command.c:3934 src/qemu/qemu_command.c:4292
-#: src/qemu/qemu_command.c:8580 src/uml/uml_conf.c:408
+#: src/qemu/qemu_command.c:1635 src/qemu/qemu_command.c:1924
+#: src/qemu/qemu_command.c:4222 src/uml/uml_conf.c:429
 #, c-format
 msgid "unsupported disk type '%s'"
 msgstr "不支持的磁盘类型 '%s'"
 
-#: src/qemu/qemu_command.c:3942
+#: src/qemu/qemu_command.c:1643
 msgid "unexpected address type for scsi disk"
 msgstr "scsi 磁盘中有意外的地址类型"
 
-#: src/qemu/qemu_command.c:3951
+#: src/qemu/qemu_command.c:1652
 msgid "SCSI controller only supports 1 bus"
 msgstr "SCSI 控制器只支持 1 个总线"
 
-#: src/qemu/qemu_command.c:3961
+#: src/qemu/qemu_command.c:1662
 msgid "unexpected address type for ide disk"
 msgstr "ide 磁盘中有意外的地址类型"
 
-#: src/qemu/qemu_command.c:3967 src/qemu/qemu_command.c:3983
+#: src/qemu/qemu_command.c:1668 src/qemu/qemu_command.c:1684
 #, c-format
 msgid "Only 1 %s controller is supported"
 msgstr "只支持 1 %s 控制器"
 
-#: src/qemu/qemu_command.c:3977
+#: src/qemu/qemu_command.c:1678
 msgid "unexpected address type for fdc disk"
 msgstr "fdc 磁盘中有意外的地址类型"
 
-#: src/qemu/qemu_command.c:3989
+#: src/qemu/qemu_command.c:1690
 #, c-format
 msgid "Only 1 %s bus is supported"
 msgstr "只支持 1 %s 总线"
@@ -13437,12 +13682,12 @@
 msgid "target must be 0 for controller fdc"
 msgstr "控制器 fdc 目标必须为 0"
 
-#: src/qemu/qemu_command.c:4027 src/qemu/qemu_command.c:8589
+#: src/qemu/qemu_command.c:1715 src/qemu/qemu_command.c:4232
 #, c-format
 msgid "unsupported disk driver type for '%s'"
 msgstr "'%s' 不支持的磁盘驱动器类型"
 
-#: src/qemu/qemu_command.c:4034 src/qemu/qemu_command.c:8595
+#: src/qemu/qemu_command.c:1721 src/qemu/qemu_command.c:4238
 msgid "cannot create virtual FAT disks in read-write mode"
 msgstr "无法采用 read-write 模式生成虚拟 FAT 磁盘"
 
@@ -13450,20 +13695,20 @@
 msgid "tray status 'open' is invalid for block type volume"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4050 src/qemu/qemu_command.c:8549
+#: src/qemu/qemu_command.c:4050 src/qemu/qemu_command.c:8606
 msgid "tray status 'open' is invalid for block type disk"
 msgstr "块类型磁盘的 tray status 'open' 无效"
 
-#: src/qemu/qemu_command.c:4105 src/xenxs/xen_sxpr.c:1829
-#: src/xenxs/xen_xm.c:1238
+#: src/qemu/qemu_command.c:1790 src/xenxs/xen_sxpr.c:1747
+#: src/xenxs/xen_xm.c:1189
 msgid "transient disks not supported yet"
 msgstr "尚未支持临时磁盘"
 
-#: src/qemu/qemu_command.c:4144
+#: src/qemu/qemu_command.c:1813
 msgid "disk cache mode 'directsync' is not supported by this QEMU"
 msgstr "这个 QEMU 不支持磁盘缓存模式 'directsync'"
 
-#: src/qemu/qemu_command.c:4150
+#: src/qemu/qemu_command.c:1819
 msgid "disk cache mode 'unsafe' is not supported by this QEMU"
 msgstr "这个 QEMU 不支持磁盘缓存模式 'undafe'"
 
@@ -13475,11 +13720,11 @@
 msgid "discard is not supported by this QEMU binary"
 msgstr "这个 QEMU 二进制不支持弃用"
 
-#: src/qemu/qemu_command.c:4216
+#: src/qemu/qemu_command.c:1863
 msgid "disk aio mode not supported with this QEMU binary"
 msgstr "这个 QEMU 二进制不支持磁盘 aio 模式"
 
-#: src/qemu/qemu_command.c:4231 src/qemu/qemu_driver.c:14967
+#: src/qemu/qemu_command.c:4231 src/qemu/qemu_driver.c:15592
 msgid "block I/O throttling not supported with this QEMU binary"
 msgstr "这个 QEMU 二进制中不支持块 I/O节流"
 
@@ -13557,7 +13802,7 @@
 msgid "This QEMU doesn't support '-device usb-storage'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4563
+#: src/qemu/qemu_command.c:1964
 #, c-format
 msgid "unsupported disk bus '%s' with device setup"
 msgstr "磁盘设定不支持的磁盘总线 '%s'"
@@ -13567,11 +13812,11 @@
 "This QEMU doesn't support setting the removable flag of USB storage devices"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4630
+#: src/qemu/qemu_command.c:1993
 msgid "only supports mount filesystem type"
 msgstr "只支持挂载文件系统类型"
 
-#: src/qemu/qemu_command.c:4636
+#: src/qemu/qemu_command.c:1999
 msgid "Filesystem driver type not supported"
 msgstr "不支持的文件系统驱动程序"
 
@@ -13587,11 +13832,11 @@
 msgid "readonly filesystem is not supported by this QEMU binary"
 msgstr "这个 QEMU 二进制不支持只读文件系统"
 
-#: src/qemu/qemu_command.c:4706
+#: src/qemu/qemu_command.c:2035
 msgid "can only passthrough directories"
 msgstr "只能穿过目录"
 
-#: src/qemu/qemu_command.c:4781 src/qemu/qemu_command.c:5411
+#: src/qemu/qemu_command.c:2102
 #, c-format
 msgid "%s not supported in this QEMU binary"
 msgstr "这个 QEMU 二进制中不支持 %s"
@@ -13618,25 +13863,25 @@
 msgid "wrong function called for pci-root/pcie-root"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4933
+#: src/qemu/qemu_command.c:2172
 #, c-format
 msgid "Unknown controller type: %s"
 msgstr "未知控制器类型：%s"
 
-#: src/qemu/qemu_command.c:5021
+#: src/qemu/qemu_command.c:2254
 msgid "unrecognized virtio-net-pci 'tx' option"
 msgstr "无法识别的 virtio-net-pci 'tx' 选项"
 
-#: src/qemu/qemu_command.c:5026
+#: src/qemu/qemu_command.c:2259
 msgid "virtio-net-pci 'tx' option not supported in this QEMU binary"
 msgstr "这个 QEMU 二进制不支持 virtio-net-pci 'tx' 选项"
 
-#: src/qemu/qemu_command.c:5088 src/xenxs/xen_sxpr.c:1879
+#: src/qemu/qemu_command.c:5088 src/xenxs/xen_sxpr.c:1881
 #, c-format
 msgid "scripts are not supported on interfaces of type %s"
 msgstr "接口类型 %s 中不支持的脚本"
 
-#: src/qemu/qemu_command.c:5214 src/qemu/qemu_command.c:9274
+#: src/qemu/qemu_command.c:2409 src/qemu/qemu_command.c:5231
 msgid "missing watchdog model"
 msgstr "缺少 watchdog 型号"
 
@@ -13649,841 +13894,840 @@
 msgid "nvram address type must be spaprvio"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5339 src/qemu/qemu_command.c:9235
+#: src/qemu/qemu_command.c:2489 src/qemu/qemu_command.c:5193
 msgid "invalid sound model"
 msgstr "无效的声音模块"
 
-#: src/qemu/qemu_command.c:5358
+#: src/qemu/qemu_command.c:5368
 msgid ""
 "The ich9-intel-hda audio controller is not supported in this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5438 src/qemu/qemu_command.c:9071
+#: src/qemu/qemu_command.c:5055
 #, c-format
 msgid "video type %s is not supported with QEMU"
 msgstr "QEMU 不支持显卡类型 %s"
 
-#: src/qemu/qemu_command.c:5451 src/qemu/qemu_command.c:9133
-#: src/qemu/qemu_command.c:9162
+#: src/qemu/qemu_command.c:5128
 msgid "only one video card is currently supported"
 msgstr "目前只支持一个显卡"
 
-#: src/qemu/qemu_command.c:5463 src/qemu/qemu_command.c:9088
+#: src/qemu/qemu_command.c:2557 src/qemu/qemu_command.c:5067
 #, c-format
 msgid "value for 'vram' must be less than '%u'"
 msgstr "'vram' 值必须小于 '%u'"
 
-#: src/qemu/qemu_command.c:5469 src/qemu/qemu_command.c:9094
+#: src/qemu/qemu_command.c:5479 src/qemu/qemu_command.c:9148
 #, c-format
 msgid "value for 'ram' must be less than '%u'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5513
+#: src/qemu/qemu_command.c:2600
 #, c-format
 msgid "Failed opening %s"
 msgstr "打开 %s 失败"
 
-#: src/qemu/qemu_command.c:5544
+#: src/qemu/qemu_command.c:5554
 #, c-format
 msgid "invalid PCI passthrough type '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5598
+#: src/qemu/qemu_command.c:2681
 #, c-format
 msgid "Redirection bus %s is not supported by QEMU"
 msgstr "QEMU 不支持重新定向总线 %s"
 
-#: src/qemu/qemu_command.c:5605
+#: src/qemu/qemu_command.c:2688
 msgid "USB redirection is not supported by this version of QEMU"
 msgstr "QEMU 的这个版本不支持 USB 重新定向"
 
-#: src/qemu/qemu_command.c:5617
+#: src/qemu/qemu_command.c:5627
 msgid "USB redirection filter is not supported by this version of QEMU"
 msgstr "QEMU 的这个版本不支持 USB 重新定向过滤器"
 
-#: src/qemu/qemu_command.c:5655
+#: src/qemu/qemu_command.c:5665
 msgid "USB redirection booting is not supported by this version of QEMU"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5688 src/qemu/qemu_command.c:5770
+#: src/qemu/qemu_command.c:2721 src/qemu/qemu_command.c:2791
 msgid "USB host device is missing bus/device information"
 msgstr "USB 主机失败缺少  bus/device 信息"
 
-#: src/qemu/qemu_command.c:5727
+#: src/qemu/qemu_command.c:2754
 #, c-format
 msgid "hub type %s not supported"
 msgstr "不支持集线器类型 %s"
 
-#: src/qemu/qemu_command.c:5734
+#: src/qemu/qemu_command.c:2761
 msgid "usb-hub not supported by QEMU binary"
 msgstr "这个 QEMU 二进制中不支持 usb 集线器"
 
-#: src/qemu/qemu_command.c:5763
+#: src/qemu/qemu_command.c:5773
 msgid "This QEMU doesn't not support missing USB devices"
 msgstr "这个 QEMU 不支持 USB 设备"
 
-#: src/qemu/qemu_command.c:5805
+#: src/qemu/qemu_command.c:5816
 msgid "this qemu doesn't support 'readonly' for -drive"
 msgstr "这个 qumu 在 -drive 中部支持 'readonly'"
 
-#: src/qemu/qemu_command.c:5841
+#: src/qemu/qemu_command.c:5852
 msgid ""
 "target must be 0 for scsi host device if its controller model is 'lsilogic'"
 msgstr "如果控制器模型为 'lsilogic'，则 scsi 目标必须为 0."
 
-#: src/qemu/qemu_command.c:5848
+#: src/qemu/qemu_command.c:5859
 msgid ""
 "unit must be not more than 7 for scsi host device if its controller model is "
 "'lsilogic'"
 msgstr "如果控制器模型为 'lsilogic'，则 scsi 主机设备单元不得超过 7 个"
 
-#: src/qemu/qemu_command.c:5972
+#: src/qemu/qemu_command.c:2889
 msgid "spicevmc not supported in this QEMU binary"
 msgstr "这个 QEMU 二进制中不支持 spicevmc"
 
-#: src/qemu/qemu_command.c:6109
+#: src/qemu/qemu_command.c:5993
+msgid "spiceport not supported in this QEMU binary"
+msgstr ""
+
+#: src/qemu/qemu_command.c:3026
 msgid "Cannot use virtio serial for parallel/serial devices"
 msgstr "无法使用 virtio 串口或者并口/串口设备"
 
-#: src/qemu/qemu_command.c:6121
+#: src/qemu/qemu_command.c:3036
 msgid "virtio serial device has invalid address type"
 msgstr "virtio 串口设备有无效地址类型"
 
-#: src/qemu/qemu_command.c:6138
+#: src/qemu/qemu_command.c:3054
 #, c-format
 msgid "Unsupported spicevmc target name '%s'"
 msgstr "不支持的 spicevmc 目标名称 '%s'"
 
-#: src/qemu/qemu_command.c:6182
+#: src/qemu/qemu_command.c:6207
 msgid "Cannot use slcp with devices other than console"
 msgstr ""
 
-#: src/qemu/qemu_command.c:6213
+#: src/qemu/qemu_command.c:6238
 msgid "this qemu doesn't support the rng-random backend"
 msgstr ""
 
-#: src/qemu/qemu_command.c:6230
+#: src/qemu/qemu_command.c:6255
 msgid "this qemu doesn't support the rng-egd backend"
 msgstr ""
 
-#: src/qemu/qemu_command.c:6271
+#: src/qemu/qemu_command.c:6296
 #, c-format
 msgid "this qemu doesn't support RNG device type '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:6349
+#: src/qemu/qemu_command.c:6374
 #, c-format
 msgid "The QEMU executable %s does not support TPM backend type %s"
 msgstr ""
 
-#: src/qemu/qemu_command.c:6369
+#: src/qemu/qemu_command.c:6394
 #, c-format
 msgid "The QEMU executable %s does not support TPM model %s"
 msgstr ""
 
-#: src/qemu/qemu_command.c:6494
-#, c-format
-msgid "unsupported clock basis '%s'"
-msgstr "不支持的时钟基准 '%s'"
-
-#: src/qemu/qemu_command.c:6515 src/qemu/qemu_command.c:7984
+#: src/qemu/qemu_command.c:3198 src/qemu/qemu_command.c:3815
+#: src/xenxs/xen_sxpr.c:2113 src/xenxs/xen_xm.c:1577
 #, c-format
 msgid "unsupported clock offset '%s'"
 msgstr "不支持的锁偏移 '%s'"
 
-#: src/qemu/qemu_command.c:6529
+#: src/qemu/qemu_command.c:3212
 #, c-format
 msgid "unsupported rtc timer track '%s'"
 msgstr "不支持的 rtc 计时器跟踪 '%s'"
 
-#: src/qemu/qemu_command.c:6553
+#: src/qemu/qemu_command.c:3236
 #, c-format
 msgid "unsupported rtc timer tickpolicy '%s'"
 msgstr "不支持的 rtc 计时器记录策略 '%s'"
 
-#: src/qemu/qemu_command.c:6619
+#: src/qemu/qemu_command.c:3285
 msgid "CPU specification not supported by hypervisor"
 msgstr "hypervisor 不支持的 CPU 规格"
 
-#: src/qemu/qemu_command.c:6636
+#: src/qemu/qemu_command.c:6665
 #, c-format
 msgid "guest and host CPU are not compatible: %s"
 msgstr "虚拟机和主机 CPU 不兼容：%s"
 
-#: src/qemu/qemu_command.c:6640
+#: src/qemu/qemu_command.c:3299
 msgid "guest CPU is not compatible with host CPU"
 msgstr "虚拟机 CPU 与主机 CPU 不兼容"
 
-#: src/qemu/qemu_command.c:6665
+#: src/qemu/qemu_command.c:6694
 #, c-format
 msgid "CPU mode '%s' is not supported by QEMU binary"
 msgstr "这个 QEMU 二进制不支持 CPU 模式 '%s'"
 
-#: src/qemu/qemu_command.c:6671
+#: src/qemu/qemu_command.c:6700
 #, c-format
 msgid "CPU mode '%s' is only supported with kvm"
 msgstr "只有 kvm 支持 CPU 模式 '%s'"
 
-#: src/qemu/qemu_command.c:6843
+#: src/qemu/qemu_command.c:6875
 msgid "the QEMU binary does not support kqemu"
 msgstr ""
 
-#: src/qemu/qemu_command.c:6856
+#: src/qemu/qemu_command.c:6888
 msgid "the QEMU binary does not support kvm"
 msgstr ""
 
-#: src/qemu/qemu_command.c:6867
+#: src/qemu/qemu_command.c:6899
 #, c-format
 msgid "the QEMU binary does not support %s"
 msgstr ""
 
-#: src/qemu/qemu_command.c:6905 src/qemu/qemu_command.c:6940
+#: src/qemu/qemu_command.c:6937 src/qemu/qemu_command.c:6972
 msgid "dump-guest-core is not available with this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:6912 src/qemu/qemu_command.c:6955
+#: src/qemu/qemu_command.c:6944 src/qemu/qemu_command.c:6987
 msgid "disable shared memory is not available with this QEMU binary"
 msgstr "这个 QEMU 二进制中不能使用共享内存"
 
-#: src/qemu/qemu_command.c:6999
+#: src/qemu/qemu_command.c:3411
 msgid ""
 "setting current vcpu count less than maximum is not supported with this QEMU "
 "binary"
 msgstr "在这个 QEMU 二进制中不支持将当前 vcpu 计数值设定为小于最大值"
 
-#: src/qemu/qemu_command.c:7037
+#: src/qemu/qemu_command.c:7069
 msgid "disjoint NUMA cpu ranges are not supported with this QEMU"
 msgstr ""
 
-#: src/qemu/qemu_command.c:7078
+#: src/qemu/qemu_command.c:7110
 msgid "vnc graphics are not supported with this QEMU"
 msgstr "这个 QEMU 不支持 vnc 图形"
 
-#: src/qemu/qemu_command.c:7103 src/qemu/qemu_command.c:7267
+#: src/qemu/qemu_command.c:4813 src/qemu/qemu_command.c:4955
 msgid "network-based listen not possible, network driver not present"
 msgstr "不能使用基于网络的侦听，没有网络驱动程序。"
 
-#: src/qemu/qemu_command.c:7109 src/qemu/qemu_command.c:7273
+#: src/qemu/qemu_command.c:4819 src/qemu/qemu_command.c:4961
 #, c-format
 msgid "listen network '%s' had no usable address"
 msgstr "侦听网络 '%s' 没有可用地址"
 
-#: src/qemu/qemu_command.c:7144
+#: src/qemu/qemu_command.c:7176
 msgid "VNC WebSockets are not supported with this QEMU binary"
 msgstr "这个 QEMU 二进制不支持 VNC WebSockets"
 
-#: src/qemu/qemu_command.c:7154
+#: src/qemu/qemu_command.c:7186
 msgid "vnc display sharing policy is not supported with this QEMU"
 msgstr ""
 
-#: src/qemu/qemu_command.c:7226
+#: src/qemu/qemu_command.c:4934
 msgid "spice graphics are not supported with this QEMU"
 msgstr "这个 QEMU 不支持 spice 图形"
 
-#: src/qemu/qemu_command.c:7236
+#: src/qemu/qemu_command.c:7268
 msgid ""
 "spice TLS port set in XML configuration, but TLS is disabled in qemu.conf"
 msgstr "XML 配置中设置 spice TLS，但没有在 qemu.conf 禁用 TLS。"
 
-#: src/qemu/qemu_command.c:7333
+#: src/qemu/qemu_command.c:7365
 msgid ""
 "spice secure channels set in XML configuration, but TLS port is not provided"
 msgstr ""
 
-#: src/qemu/qemu_command.c:7344
+#: src/qemu/qemu_command.c:7376
 msgid ""
 "spice insecure channels set in XML configuration, but plain port is not "
 "provided"
 msgstr ""
 
-#: src/qemu/qemu_command.c:7357
+#: src/qemu/qemu_command.c:7389
 msgid ""
 "spice defaultMode secure requested in XML configuration but TLS port not "
 "provided"
 msgstr ""
 
-#: src/qemu/qemu_command.c:7366
+#: src/qemu/qemu_command.c:7398
 msgid ""
 "spice defaultMode insecure requested in XML configuration but plain port not "
 "provided"
 msgstr ""
 
-#: src/qemu/qemu_command.c:7435
+#: src/qemu/qemu_command.c:7431
+msgid "This QEMU can't disable file transfers through spice"
+msgstr ""
+
+#: src/qemu/qemu_command.c:4897
 #, c-format
 msgid "sdl not supported by '%s'"
 msgstr "'%s' 不支持 sdl"
 
-#: src/qemu/qemu_command.c:7471
+#: src/qemu/qemu_command.c:5035
 #, c-format
 msgid "unsupported graphics type '%s'"
 msgstr "不支持的图形类型 '%s'"
 
-#: src/qemu/qemu_command.c:7516 src/qemu/qemu_hotplug.c:867
+#: src/qemu/qemu_command.c:7557 src/qemu/qemu_hotplug.c:867
 #, c-format
 msgid "Multiqueue network is not supported for: %s"
 msgstr "%s 不支持多队列网络"
 
-#: src/qemu/qemu_command.c:7782
+#: src/qemu/qemu_command.c:3622
 msgid "hugetlbfs filesystem is not mounted"
 msgstr "未挂载 hugetlbfs 文件系统"
 
-#: src/qemu/qemu_command.c:7787
+#: src/qemu/qemu_command.c:3627
 msgid "hugepages are disabled by administrator config"
 msgstr "管理员配置禁用超大页面"
 
-#: src/qemu/qemu_command.c:7792
+#: src/qemu/qemu_command.c:3632
 #, c-format
 msgid "hugepage backing not supported by '%s'"
 msgstr "'%s' 不支持超大页面备份"
 
-#: src/qemu/qemu_command.c:7802
+#: src/qemu/qemu_command.c:7858
 msgid "memory locking not supported by QEMU binary"
 msgstr "QEMU 二进制不支持内存锁定"
 
-#: src/qemu/qemu_command.c:7836
+#: src/qemu/qemu_command.c:3674
 #, c-format
 msgid "qemu emulator '%s' does not support xen"
 msgstr "qemu 模拟器 '%s' 不支持 xen"
 
-#: src/qemu/qemu_command.c:7849
+#: src/qemu/qemu_command.c:3687
 #, c-format
 msgid "the QEMU binary %s does not support smbios settings"
 msgstr "QEMU 二进制 %s 不支持 smbios 设定"
 
-#: src/qemu/qemu_command.c:7867
+#: src/qemu/qemu_command.c:3705
 #, c-format
 msgid "Domain '%s' sysinfo are not available"
 msgstr "域 '%s' sysinfo 不可用"
 
-#: src/qemu/qemu_command.c:7919 src/qemu/qemu_hotplug.c:1406
+#: src/qemu/qemu_command.c:3750
 msgid "qemu does not support -device"
 msgstr "qemu 不支持 -device"
 
-#: src/qemu/qemu_command.c:7924
+#: src/qemu/qemu_command.c:3755
 msgid "qemu does not support SGA"
 msgstr "qemu 不支持 SGA"
 
-#: src/qemu/qemu_command.c:7929
+#: src/qemu/qemu_command.c:3760
 msgid "need at least one serial port to use SGA"
 msgstr "需要至少一个串口方可使用 SGA"
 
-#: src/qemu/qemu_command.c:8000
+#: src/qemu/qemu_command.c:3831
 #, c-format
 msgid "unsupported timer type (name) '%s'"
 msgstr "不支持的计时器类型（名称）'%s'"
 
-#: src/qemu/qemu_command.c:8024 src/qemu/qemu_command.c:8035
+#: src/qemu/qemu_command.c:3851 src/qemu/qemu_command.c:3862
 #, c-format
 msgid "unsupported rtc tickpolicy '%s'"
 msgstr "不支持的 rtc 计数策略 '%s'"
 
-#: src/qemu/qemu_command.c:8063 src/qemu/qemu_command.c:8072
+#: src/qemu/qemu_command.c:3886 src/qemu/qemu_command.c:3895
 #, c-format
 msgid "unsupported pit tickpolicy '%s'"
 msgstr "不支持的 pit 计数策略 '%s'"
 
-#: src/qemu/qemu_command.c:8094
+#: src/qemu/qemu_command.c:3917
 msgid "pit timer is not supported"
 msgstr "不支持 pit 计时器"
 
-#: src/qemu/qemu_command.c:8128
+#: src/qemu/qemu_command.c:8185
 msgid "setting ACPI S3 not supported"
 msgstr "不支持设定 ACPI S3"
 
-#: src/qemu/qemu_command.c:8139
+#: src/qemu/qemu_command.c:8196
 msgid "setting ACPI S4 not supported"
 msgstr "不支持设定 ACPI S4"
 
-#: src/qemu/qemu_command.c:8161
+#: src/qemu/qemu_command.c:3950
 msgid "hypervisor lacks deviceboot feature"
 msgstr "hypervisor 缺少设备引导功能"
 
-#: src/qemu/qemu_command.c:8219
+#: src/qemu/qemu_command.c:8276
 msgid "reboot timeout is not supported by this QEMU binary"
 msgstr "这个 QEMU 二进制中不支持重启超时"
 
-#: src/qemu/qemu_command.c:8270
+#: src/qemu/qemu_command.c:8327
 msgid "dtb is not supported with this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:8301
+#: src/qemu/qemu_command.c:8358
 msgid "64-bit PCI hole setting is only for root PCI controllers"
 msgstr ""
 
-#: src/qemu/qemu_command.c:8308
+#: src/qemu/qemu_command.c:8365
 #, c-format
 msgid "Setting the 64-bit PCI hole size is not supported for machine '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:8314
+#: src/qemu/qemu_command.c:8371
 msgid "64-bit PCI hole size setting is not supported with this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:8331 src/qemu/qemu_hotplug.c:708
+#: src/qemu/qemu_command.c:4016 src/qemu/qemu_driver.c:5059
 #, c-format
 msgid "unsupported driver name '%s' for disk '%s'"
 msgstr "磁盘 '%s' 不支持驱动程序名称 '%s'"
 
-#: src/qemu/qemu_command.c:8363
+#: src/qemu/qemu_command.c:4037
 msgid "SATA is not supported with this QEMU binary"
 msgstr "这个 QEMU 二进制中不支持 SATA"
 
-#: src/qemu/qemu_command.c:8387
+#: src/qemu/qemu_command.c:8444
 msgid "Multiple legacy USB controllers are not supported"
 msgstr "不支持多个传统 USB 控制器"
 
-#: src/qemu/qemu_command.c:8459 src/qemu/qemu_command.c:8560
+#: src/qemu/qemu_command.c:4111 src/qemu/qemu_command.c:4202
 #, c-format
 msgid "unsupported usb disk type for '%s'"
 msgstr "'%s' 中不支持的 usb 磁盘类型"
 
-#: src/qemu/qemu_command.c:8607
+#: src/qemu/qemu_command.c:8664
 msgid "network disks are only supported with -drive"
 msgstr ""
 
-#: src/qemu/qemu_command.c:8645
+#: src/qemu/qemu_command.c:4320
 msgid "filesystem passthrough not supported by this QEMU"
 msgstr "这个 QEMU 二进制中不支持文件系统转移"
 
-#: src/qemu/qemu_command.c:8700
+#: src/qemu/qemu_command.c:4473
 msgid "this QEMU binary lacks multiple smartcard support"
 msgstr "这个 QEMU 二进制缺少多智能卡支持"
 
-#: src/qemu/qemu_command.c:8711 src/qemu/qemu_command.c:8723
+#: src/qemu/qemu_command.c:4484 src/qemu/qemu_command.c:4496
 msgid "this QEMU binary lacks smartcard host mode support"
 msgstr "这个 QEMU 二进制缺少智能卡主机模型支持"
 
-#: src/qemu/qemu_command.c:8733
+#: src/qemu/qemu_command.c:4506
 #, c-format
 msgid "invalid certificate name: %s"
 msgstr "无效证书名称：%s"
 
-#: src/qemu/qemu_command.c:8744
+#: src/qemu/qemu_command.c:4517
 #, c-format
 msgid "invalid database name: %s"
 msgstr "无效数据库名称：%s"
 
-#: src/qemu/qemu_command.c:8759
+#: src/qemu/qemu_command.c:4532
 msgid "this QEMU binary lacks smartcard passthrough mode support"
 msgstr "这个 QEMU 二进制缺少智能卡转移模型支持"
 
-#: src/qemu/qemu_command.c:8862
+#: src/qemu/qemu_command.c:4641
 msgid "guestfwd requires QEMU to support -chardev & -device"
 msgstr "guestfwd 要求 QEMU 支持 -chardev & -device"
 
-#: src/qemu/qemu_command.c:8883 src/qemu/qemu_command.c:8943
+#: src/qemu/qemu_command.c:4669 src/qemu/qemu_command.c:4708
 msgid "virtio channel requires QEMU to support -device"
 msgstr "virtio 频道要求 QEMU 支持 -device"
 
-#: src/qemu/qemu_command.c:8919
+#: src/qemu/qemu_command.c:8978
 msgid "sclp console requires QEMU to support -device"
 msgstr ""
 
-#: src/qemu/qemu_command.c:8924
+#: src/qemu/qemu_command.c:8983
 msgid "sclp console requires QEMU to support s390-sclp"
 msgstr ""
 
-#: src/qemu/qemu_command.c:8964
+#: src/qemu/qemu_command.c:4733
 #, c-format
 msgid "unsupported console target type %s"
 msgstr "不支持的控制台目标类型 %s"
 
-#: src/qemu/qemu_command.c:9020
+#: src/qemu/qemu_command.c:4774
 msgid "only 1 graphics device is supported"
 msgstr "只支持一个图形设备"
 
-#: src/qemu/qemu_command.c:9025
+#: src/qemu/qemu_command.c:9079
 msgid "only 1 graphics device of each type (sdl, vnc, spice) is supported"
 msgstr ""
 
-#: src/qemu/qemu_command.c:9064
+#: src/qemu/qemu_command.c:5048
 msgid "This QEMU does not support QXL graphics adapters"
 msgstr "这个 QEMU 不支持 QXL 图形适配器"
 
-#: src/qemu/qemu_command.c:9118
+#: src/qemu/qemu_command.c:5113
 #, c-format
 msgid "video type %s is only valid as primary video card"
 msgstr "显卡类型 %s 只能作为主显卡使用"
 
-#: src/qemu/qemu_command.c:9155
+#: src/qemu/qemu_command.c:5101
 #, c-format
 msgid "video type %s is not supported with this QEMU"
 msgstr "这个 QEMU 不支持显卡类型 %s"
 
-#: src/qemu/qemu_command.c:9243
+#: src/qemu/qemu_command.c:5164 src/qemu/qemu_command.c:5200
 msgid "this QEMU binary lacks hda support"
 msgstr "这个 QEMU 二进制缺少 hda 支持"
 
-#: src/qemu/qemu_command.c:9290
+#: src/qemu/qemu_command.c:5247
 msgid "invalid watchdog action"
 msgstr "无效 watchdog 动作"
 
-#: src/qemu/qemu_command.c:9332
+#: src/qemu/qemu_command.c:9386
 msgid ""
 "booting from assigned devices is only supported for PCI, USB and SCSI devices"
 msgstr "只有 PCI、USB、和 SCSI 设备支持从分配的设备引导"
 
-#: src/qemu/qemu_command.c:9341
+#: src/qemu/qemu_command.c:9395
 msgid ""
 "booting from PCI devices assigned with VFIO is not supported with this "
 "version of qemu"
 msgstr ""
 
-#: src/qemu/qemu_command.c:9348
+#: src/qemu/qemu_command.c:5293
 msgid ""
 "booting from assigned PCI devices is not supported with this version of qemu"
 msgstr "qemu 的这个版本不支持从分配的 PCI 设备中引导"
 
-#: src/qemu/qemu_command.c:9357
+#: src/qemu/qemu_command.c:9411
 msgid ""
 "booting from assigned USB devices is not supported with this version of qemu"
 msgstr ""
 
-#: src/qemu/qemu_command.c:9364
+#: src/qemu/qemu_command.c:9418
 msgid ""
 "booting from assigned SCSI devices is not supported with this version of qemu"
 msgstr "这个版本的 qemu 不支持使用分配的 SCSI 设备引导"
 
-#: src/qemu/qemu_command.c:9398 src/qemu/qemu_hotplug.c:1169
+#: src/qemu/qemu_command.c:9452 src/qemu/qemu_hotplug.c:1172
 msgid "VFIO PCI device assignment is not supported by this version of qemu"
 msgstr ""
 
-#: src/qemu/qemu_command.c:9438 src/qemu/qemu_monitor_text.c:1829
+#: src/qemu/qemu_command.c:5350 src/qemu/qemu_monitor_text.c:1961
 msgid "PCI device assignment is not supported by this version of qemu"
 msgstr "qemu 的这个版本不支持 PCI 设备分配"
 
-#: src/qemu/qemu_command.c:9464 src/qemu/qemu_hotplug.c:1548
+#: src/qemu/qemu_command.c:9518 src/qemu/qemu_hotplug.c:1551
 msgid "SCSI passthrough is not supported by this version of qemu"
 msgstr "这个版本的 qemu 不支持 SCSI 转移"
 
-#: src/qemu/qemu_command.c:9478
+#: src/qemu/qemu_command.c:5364
 msgid "TCP migration is not supported with this QEMU binary"
 msgstr "在此 QEMU 二进制中不支持 TCP 迁移"
 
-#: src/qemu/qemu_command.c:9495
+#: src/qemu/qemu_command.c:5381
 msgid "STDIO migration is not supported with this QEMU binary"
 msgstr "在此 QEMU 二进制中不支持 STDIO 迁移"
 
-#: src/qemu/qemu_command.c:9502
+#: src/qemu/qemu_command.c:5388
 msgid "EXEC migration is not supported with this QEMU binary"
 msgstr "这个 QEMU 二进制不支持 EXEC 迁移"
 
-#: src/qemu/qemu_command.c:9510
+#: src/qemu/qemu_command.c:5396
 msgid "FD migration is not supported with this QEMU binary"
 msgstr "这个 QEMU 二进制不支持 FD 迁移"
 
-#: src/qemu/qemu_command.c:9519
+#: src/qemu/qemu_command.c:5405
 msgid "UNIX migration is not supported with this QEMU binary"
 msgstr "这个 QEMU 二进制不支持 UNIX 迁移"
 
-#: src/qemu/qemu_command.c:9526
+#: src/qemu/qemu_command.c:5412
 msgid "unknown migration protocol"
 msgstr "未知迁移协议"
 
-#: src/qemu/qemu_command.c:9545
+#: src/qemu/qemu_command.c:5427
 #, c-format
 msgid ""
 "Memory balloon device type '%s' is not supported by this version of qemu"
 msgstr "qemu 的这个版本不支持内存布尔设备类型 '%s'"
 
-#: src/qemu/qemu_command.c:9578
+#: src/qemu/qemu_command.c:9632
 msgid "nvram device is not supported by this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:9593
+#: src/qemu/qemu_command.c:9647
 msgid "nvram device is only supported for PPC64"
 msgstr ""
 
-#: src/qemu/qemu_command.c:9619
+#: src/qemu/qemu_command.c:9673
 msgid "QEMU does not support seccomp sandboxes"
 msgstr "QEMU 不支持 seccomp 沙箱"
 
-#: src/qemu/qemu_command.c:9634
+#: src/qemu/qemu_command.c:9688
 msgid "your QEMU is too old to support pvpanic"
 msgstr ""
 
-#: src/qemu/qemu_command.c:9698
+#: src/qemu/qemu_command.c:9752
 msgid "usb-serial is not supported in this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:10016
+#: src/qemu/qemu_command.c:5645
 #, c-format
 msgid "malformed keyword arguments in '%s'"
 msgstr "'%s' 中被破坏的关键字参数"
 
-#: src/qemu/qemu_command.c:10176 src/qemu/qemu_command.c:11481
+#: src/qemu/qemu_command.c:5807 src/qemu/qemu_command.c:6919
 #, c-format
 msgid "cannot parse sheepdog filename '%s'"
 msgstr "无法解析 sheepdog 文件名称 '%s'"
 
-#: src/qemu/qemu_command.c:10203
+#: src/qemu/qemu_command.c:10257
 #, c-format
 msgid "pseries systems do not support ide devices '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:10256
+#: src/qemu/qemu_command.c:5894
 #, c-format
 msgid "cannot parse drive index '%s'"
 msgstr "无法解析驱动器索引 '%s'"
 
-#: src/qemu/qemu_command.c:10262
+#: src/qemu/qemu_command.c:5902
 #, c-format
 msgid "cannot parse drive bus '%s'"
 msgstr "无法解析驱动器总线 '%s'"
 
-#: src/qemu/qemu_command.c:10268
+#: src/qemu/qemu_command.c:5910
 #, c-format
 msgid "cannot parse drive unit '%s'"
 msgstr "无法解析驱动器单元 '%s'"
 
-#: src/qemu/qemu_command.c:10277
+#: src/qemu/qemu_command.c:5919
 #, c-format
 msgid "cannot parse io mode '%s'"
 msgstr "无法解析 io 模式 '%s'"
 
-#: src/qemu/qemu_command.c:10286
+#: src/qemu/qemu_command.c:10340
 #, c-format
 msgid "cannot parse cylinders value'%s'"
 msgstr "无法解析柱面值 '%s'"
 
-#: src/qemu/qemu_command.c:10296
+#: src/qemu/qemu_command.c:10350
 #, c-format
 msgid "cannot parse heads value'%s'"
 msgstr "无法解析标头值 '%s'"
 
-#: src/qemu/qemu_command.c:10306
+#: src/qemu/qemu_command.c:10360
 #, c-format
 msgid "cannot parse sectors value'%s'"
 msgstr "无法解析扇区值 '%s'"
 
-#: src/qemu/qemu_command.c:10318
+#: src/qemu/qemu_command.c:10372
 #, c-format
 msgid "cannot parse translation value'%s'"
 msgstr "无法解析转换值 '%s'"
 
-#: src/qemu/qemu_command.c:10332
+#: src/qemu/qemu_command.c:5931
 #, c-format
 msgid "missing file parameter in drive '%s'"
 msgstr "驱动器 '%s' 中缺少 file 参数"
 
-#: src/qemu/qemu_command.c:10343
+#: src/qemu/qemu_command.c:5944
 #, c-format
 msgid "missing index/unit/bus parameter in drive '%s'"
 msgstr "驱动器 '%s' 中缺少 index/unit/bus 参数"
 
-#: src/qemu/qemu_command.c:10388
+#: src/qemu/qemu_command.c:5993
 #, c-format
 msgid "invalid device name '%s'"
 msgstr "无效设备名称 '%s'"
 
-#: src/qemu/qemu_command.c:10429
+#: src/qemu/qemu_command.c:6029
 #, c-format
 msgid "cannot parse NIC vlan in '%s'"
 msgstr "无法解析 '%s' 中的 NIC vlan"
 
-#: src/qemu/qemu_command.c:10441
+#: src/qemu/qemu_command.c:6041
 #, c-format
 msgid "cannot find NIC definition for vlan %d"
 msgstr "无法为 vlan %d 找到 NIC 定义"
 
-#: src/qemu/qemu_command.c:10498
+#: src/qemu/qemu_command.c:6098
 #, c-format
 msgid "cannot parse vlan in '%s'"
 msgstr "无法解析 '%s' 中的 vlan"
 
-#: src/qemu/qemu_command.c:10528
+#: src/qemu/qemu_command.c:6128
 #, c-format
 msgid "cannot parse NIC definition '%s'"
 msgstr "无法解析 NIC 定义 '%s'"
 
-#: src/qemu/qemu_command.c:10578
+#: src/qemu/qemu_command.c:6176
 #, c-format
 msgid "cannot parse sndbuf size in '%s'"
 msgstr "无法解析 '%s' 中的 sndbuf 大小"
 
-#: src/qemu/qemu_command.c:10617
+#: src/qemu/qemu_command.c:6212
 #, c-format
 msgid "unknown PCI device syntax '%s'"
 msgstr "未知 PCI 设备语法 '%s'"
 
-#: src/qemu/qemu_command.c:10624
+#: src/qemu/qemu_command.c:6220
 #, c-format
 msgid "cannot extract PCI device bus '%s'"
 msgstr "无法提取 PCI 设备总线 '%s'"
 
-#: src/qemu/qemu_command.c:10630
+#: src/qemu/qemu_command.c:6227
 #, c-format
 msgid "cannot extract PCI device slot '%s'"
 msgstr "无法提取 PCI 设备插槽 '%s'"
 
-#: src/qemu/qemu_command.c:10636
+#: src/qemu/qemu_command.c:6234
 #, c-format
 msgid "cannot extract PCI device function '%s'"
 msgstr "无法提取 PCI 设备功能 '%s'"
 
-#: src/qemu/qemu_command.c:10670
+#: src/qemu/qemu_command.c:6269
 #, c-format
 msgid "unknown USB device syntax '%s'"
 msgstr "未知 USB 设备语法 '%s'"
 
-#: src/qemu/qemu_command.c:10678
+#: src/qemu/qemu_command.c:6278
 #, c-format
 msgid "cannot extract USB device vendor '%s'"
 msgstr "无法提取 USB 设备零售商 '%s'"
 
-#: src/qemu/qemu_command.c:10684
+#: src/qemu/qemu_command.c:6285
 #, c-format
 msgid "cannot extract USB device product '%s'"
 msgstr "无法提取 USB 设备产品 '%s'"
 
-#: src/qemu/qemu_command.c:10690
+#: src/qemu/qemu_command.c:6292
 #, c-format
 msgid "cannot extract USB device bus '%s'"
 msgstr "无法提取 USB 设备总线 '%s'"
 
-#: src/qemu/qemu_command.c:10696
+#: src/qemu/qemu_command.c:6299
 #, c-format
 msgid "cannot extract USB device address '%s'"
 msgstr "无法提取 USB 设备地址 '%s'"
 
-#: src/qemu/qemu_command.c:10788
+#: src/qemu/qemu_command.c:6408
 #, c-format
 msgid "cannot find port number in character device %s"
 msgstr "无法找到字符设备 %s 中的端口号"
 
-#: src/qemu/qemu_command.c:10814
+#: src/qemu/qemu_command.c:6448
 #, c-format
 msgid "unknown character device syntax %s"
 msgstr "未知字符设备语法 %s"
 
-#: src/qemu/qemu_command.c:10890
+#: src/qemu/qemu_command.c:10944
 #, c-format
 msgid "%s platform doesn't support CPU features'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:10916
+#: src/qemu/qemu_command.c:10971
 msgid "conflicting occurrences of kvmclock feature"
 msgstr "kvmclock 功能出现冲突"
 
-#: src/qemu/qemu_command.c:10957
+#: src/qemu/qemu_command.c:11012
 #, c-format
 msgid "unsupported HyperV Enlightenment feature '%s'"
 msgstr "不支持的 HyperV 加强功能 '%s'"
 
-#: src/qemu/qemu_command.c:10967
+#: src/qemu/qemu_command.c:11022
 #, c-format
 msgid "HyperV feature '%s' should not have a value"
 msgstr "HyperV 功能 '%s' 不应为一个数值"
 
-#: src/qemu/qemu_command.c:10978
+#: src/qemu/qemu_command.c:11033
 msgid "missing HyperV spinlock retry count"
 msgstr "缺少 HyperV spinlock 重试计数"
 
-#: src/qemu/qemu_command.c:10984
+#: src/qemu/qemu_command.c:11039
 msgid "cannot parse HyperV spinlock retry count"
 msgstr "无法解析 HyperV spinlock 重试计数"
 
-#: src/qemu/qemu_command.c:11029
+#: src/qemu/qemu_command.c:6541
 #, c-format
 msgid "unknown CPU syntax '%s'"
 msgstr "未知 CPU 语法 '%s'"
 
-#: src/qemu/qemu_command.c:11102
+#: src/qemu/qemu_command.c:6620
 #, c-format
 msgid "cannot parse CPU topology '%s'"
 msgstr "无法解析 CPU 拓扑 '%s'"
 
-#: src/qemu/qemu_command.c:11165
+#: src/qemu/qemu_command.c:6661
 msgid "no emulator path found"
 msgstr "未发现模拟器路径"
 
-#: src/qemu/qemu_command.c:11178
-msgid "failed to generate uuid"
-msgstr "生成 uuid 失败"
-
-#: src/qemu/qemu_command.c:11226
+#: src/qemu/qemu_command.c:6723
 #, c-format
 msgid "missing value for %s argument"
 msgstr "缺少 %s 参数值"
 
-#: src/qemu/qemu_command.c:11286
+#: src/qemu/qemu_command.c:6783
 #, c-format
 msgid "missing VNC port number in '%s'"
 msgstr "'%s' 中缺少 VNC 端口号"
 
-#: src/qemu/qemu_command.c:11294
+#: src/qemu/qemu_command.c:6790
 #, c-format
 msgid "cannot parse VNC port '%s'"
 msgstr "无法解析 VNC 端口 '%s'"
 
-#: src/qemu/qemu_command.c:11332
+#: src/qemu/qemu_command.c:11387
 #, c-format
 msgid "cannot parse VNC WebSocket port '%s'"
 msgstr "无法解析 VNC WebSocket 端口 '%s'"
 
-#: src/qemu/qemu_command.c:11364
+#: src/qemu/qemu_command.c:11419
 msgid "missing vnc sharing policy"
 msgstr "缺少 vnc 共享策略"
 
-#: src/qemu/qemu_command.c:11389
+#: src/qemu/qemu_command.c:6817
 #, c-format
 msgid "cannot parse memory level '%s'"
 msgstr "无法解析内存水平 '%s'"
 
-#: src/qemu/qemu_command.c:11401
+#: src/qemu/qemu_command.c:6829
 #, c-format
 msgid "cannot parse UUID '%s'"
 msgstr "无法解析 UUID '%s'"
 
-#: src/qemu/qemu_command.c:11510
+#: src/qemu/qemu_command.c:11565
 #, c-format
 msgid "Cannot assign address for device name '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:11574
+#: src/qemu/qemu_command.c:11629
 msgid "cannot parse reboot-timeout value"
 msgstr "无法解析 reboot-timeout 值"
 
-#: src/qemu/qemu_command.c:11828
+#: src/qemu/qemu_command.c:7193
 #, c-format
 msgid "unknown video adapter type '%s'"
 msgstr "未知显卡类型  '%s'"
 
-#: src/qemu/qemu_command.c:11887
+#: src/qemu/qemu_command.c:11945
 #, c-format
 msgid "invalid value for disable_s3 parameter: '%s'"
 msgstr "disable_s3 参数的无效值: '%s'"
 
-#: src/qemu/qemu_command.c:11904
+#: src/qemu/qemu_command.c:11962
 #, c-format
 msgid "invalid value for disable_s4 parameter: '%s'"
 msgstr "disable_s4 参数的无效值: '%s'"
 
-#: src/qemu/qemu_command.c:11923
+#: src/qemu/qemu_command.c:11981
 #, c-format
 msgid "cannot parse nvram's address '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:11956
+#: src/qemu/qemu_command.c:7260
 msgid "CEPH_ARGS was set without an rbd disk"
 msgstr "设定 CEPH_ARGS 时没有 rbd 磁盘"
 
-#: src/qemu/qemu_command.c:11963
+#: src/qemu/qemu_command.c:7267
 #, c-format
 msgid "could not parse CEPH_ARGS '%s'"
 msgstr "无法解析 CEPH_ARGS '%s'"
 
-#: src/qemu/qemu_command.c:11999
+#: src/qemu/qemu_command.c:7302
 #, c-format
 msgid "found no rbd hosts in CEPH_ARGS '%s'"
 msgstr "没有在 CEPH_ARGS '%s' 中找到 rbd 主机"
 
-#: src/qemu/qemu_command.c:12204
+#: src/qemu/qemu_command.c:7511
 #, c-format
 msgid "Unable to resolve %s for pid %u"
 msgstr "无法为 pid %s 解析 %u"
 
-#: src/qemu/qemu_conf.c:240
+#: src/qemu/qemu_conf.c:108
 msgid "unable to find hugetlbfs mountpoint"
 msgstr "未找到 hugetlbfs 挂载点"
 
@@ -14537,16 +14781,16 @@
 "%s: migration_port_max: port must be between the minimal port %d and 65535"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:510
+#: src/qemu/qemu_conf.c:292
 msgid "cgroup_controllers must be a list of strings"
 msgstr "cgroup_controllers 必须是字符串列表"
 
-#: src/qemu/qemu_conf.c:517
+#: src/qemu/qemu_conf.c:298
 #, c-format
 msgid "Unknown cgroup controller '%s'"
 msgstr "未知 cgroup 控制器 '%s'"
 
-#: src/qemu/qemu_conf.c:537
+#: src/qemu/qemu_conf.c:333
 msgid "cgroup_device_acl must be a list of strings"
 msgstr "cgroup_device_acl 必须是字符串列表"
 
@@ -14555,25 +14799,25 @@
 msgid "Unable to get minor number of device '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:815
+#: src/qemu/qemu_conf.c:816
 #, c-format
 msgid ""
 "sgio of shared disk 'pool=%s' 'volume=%s' conflicts with other active domains"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:821
+#: src/qemu/qemu_conf.c:822
 #, c-format
 msgid "sgio of shared disk '%s' conflicts with other active domains"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:826
+#: src/qemu/qemu_conf.c:827
 #, c-format
 msgid ""
 "sgio of shared scsi host device '%s-%d-%d-%d' conflicts with other active "
 "domains"
 msgstr "共享主机设备 '%s-%d-%d-%d' 的 sgio 与其他活跃域冲突"
 
-#: src/qemu/qemu_conf.c:1198 src/storage/storage_backend_fs.c:290
+#: src/qemu/qemu_conf.c:1202 src/storage/storage_backend_fs.c:290
 #: src/storage/storage_backend_fs.c:380 src/storage/storage_backend_fs.c:476
 #: src/storage/storage_backend_iscsi.c:60
 #: src/storage/storage_backend_iscsi.c:581
@@ -14582,35 +14826,35 @@
 msgid "Expected exactly 1 host for the storage pool"
 msgstr "该存储池应只有一个主机"
 
-#: src/qemu/qemu_conf.c:1223
+#: src/qemu/qemu_conf.c:1227
 #, c-format
 msgid "unexpected iscsi volume name '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:1335
+#: src/qemu/qemu_conf.c:1329
 #, c-format
 msgid "storage pool '%s' containing volume '%s' is not active"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:1358
+#: src/qemu/qemu_conf.c:1352
 msgid "disk source mode is only valid when storage pool is of iscsi type"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:1379 src/qemu/qemu_conf.c:1413
+#: src/qemu/qemu_conf.c:1373 src/qemu/qemu_conf.c:1407
 msgid "'startupPolicy' is only valid for 'file' type volume"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:1401
+#: src/qemu/qemu_conf.c:1395
 #, c-format
 msgid "unexpected storage volume type '%s' for storage pool type '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:1448
+#: src/qemu/qemu_conf.c:1442
 #, c-format
 msgid "using '%s' pools for backing 'volume' disks isn't yet supported"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:1491
+#: src/qemu/qemu_conf.c:1475
 msgid "Snapshots are not yet supported with 'pool' volumes"
 msgstr ""
 
@@ -14618,7 +14862,7 @@
 msgid "Unable to init qemu driver mutexes"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:259
+#: src/qemu/qemu_domain.c:244
 msgid "Unexpected QEMU monitor still active during domain deletion"
 msgstr "删除域的过程中 QEMU 监控器仍活跃"
 
@@ -14626,35 +14870,35 @@
 msgid "Unexpected QEMU agent still active during domain deletion"
 msgstr "删除域的过程中意外 QEMU 代理仍活跃"
 
-#: src/qemu/qemu_domain.c:372
+#: src/qemu/qemu_domain.c:335
 msgid "no monitor path"
 msgstr "没有监视器路径"
 
-#: src/qemu/qemu_domain.c:396
+#: src/qemu/qemu_domain.c:362
 #, c-format
 msgid "unsupported monitor type '%s'"
 msgstr "不支持的显示器类型 '%s'"
 
-#: src/qemu/qemu_domain.c:425
+#: src/qemu/qemu_domain.c:393
 msgid "failed to parse qemu capabilities flags"
 msgstr "解析 qemu 功能标签失败"
 
-#: src/qemu/qemu_domain.c:438
+#: src/qemu/qemu_domain.c:406
 #, c-format
 msgid "Unknown qemu capabilities flag %s"
 msgstr "未知 qemu 功能标签 %s"
 
-#: src/qemu/qemu_domain.c:458
+#: src/qemu/qemu_domain.c:426
 #, c-format
 msgid "Unknown job type %s"
 msgstr "未知任务类型 %s"
 
-#: src/qemu/qemu_domain.c:471
+#: src/qemu/qemu_domain.c:439
 #, c-format
 msgid "Unknown async job type %s"
 msgstr "未知 async 任务类型 %s"
 
-#: src/qemu/qemu_domain.c:482
+#: src/qemu/qemu_domain.c:450
 #, c-format
 msgid "Unknown job phase %s"
 msgstr "未知任务阶段 %s"
@@ -14663,1328 +14907,1326 @@
 msgid "failed to parse qemu device list"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:556 src/test/test_driver.c:224
+#: src/qemu/qemu_domain.c:505
 #, c-format
 msgid "Failed to register xml namespace '%s'"
 msgstr "注册 xml 名称空间 '%s' 失败"
 
-#: src/qemu/qemu_domain.c:577
+#: src/qemu/qemu_domain.c:528
 msgid "No qemu command-line argument specified"
 msgstr "未指定 qemu 命令行参数"
 
-#: src/qemu/qemu_domain.c:603
+#: src/qemu/qemu_domain.c:554
 msgid "No qemu environment name specified"
 msgstr "未指定 qemu 环境名称"
 
-#: src/qemu/qemu_domain.c:608
+#: src/qemu/qemu_domain.c:559
 msgid "Empty qemu environment name specified"
 msgstr "指定 qemu 空环境名称"
 
-#: src/qemu/qemu_domain.c:613
+#: src/qemu/qemu_domain.c:564
 msgid "Invalid environment name, it must begin with a letter or underscore"
 msgstr "无效环境名称，必须以字母或者下划线开始。"
 
-#: src/qemu/qemu_domain.c:618
+#: src/qemu/qemu_domain.c:569
 msgid ""
 "Invalid environment name, it must contain only alphanumerics and underscore"
 msgstr "无效环境名称，必须只能包含数字、字母和下划线。"
 
-#: src/qemu/qemu_domain.c:1101
-msgid "cannot acquire state change lock"
-msgstr "无法获得状态更改锁定"
-
-#: src/qemu/qemu_domain.c:1105
+#: src/qemu/qemu_domain.c:793
 msgid "cannot acquire state change lock due to max_queued limit"
 msgstr "由于 max_queued 的限制无法获取状态更改锁定"
 
-#: src/qemu/qemu_domain.c:1109
-msgid "cannot acquire job mutex"
-msgstr "无法获得任务互斥"
-
-#: src/qemu/qemu_domain.c:1150
+#: src/qemu/qemu_domain.c:1172
 #, c-format
 msgid "unexpected async job %d"
 msgstr "意外的异步任务 %d"
 
-#: src/qemu/qemu_domain.c:1245
+#: src/qemu/qemu_domain.c:929
 msgid "domain is no longer running"
 msgstr "域不再运行"
 
-#: src/qemu/qemu_domain.c:1450
+#: src/qemu/qemu_domain.c:1086 src/qemu/qemu_driver.c:8875
 msgid "cannot get host CPU capabilities"
 msgstr "无法获取主机 CPU 功能"
 
-#: src/qemu/qemu_domain.c:1713 src/uml/uml_driver.c:1070
+#: src/libxl/libxl_driver.c:949 src/qemu/qemu_domain.c:1218
+#: src/uml/uml_driver.c:1019
 #, c-format
 msgid "failed to create logfile %s"
 msgstr "生成日志文件 %s 失败"
 
-#: src/qemu/qemu_domain.c:1718
+#: src/qemu/qemu_domain.c:1223
 #, c-format
 msgid "failed to set close-on-exec flag on %s"
 msgstr "在 %s 中设定 close-on-exec 标签失败"
 
-#: src/qemu/qemu_domain.c:1725
+#: src/qemu/qemu_domain.c:1751
 #, c-format
 msgid "failed to truncate %s"
 msgstr "截取 %s 失败"
 
-#: src/qemu/qemu_domain.c:1782
+#: src/lxc/lxc_driver.c:1661 src/qemu/qemu_domain.c:1273
 #, c-format
 msgid "unable to seek to end of log for %s"
 msgstr "无法查找 %s 日志结尾"
 
-#: src/qemu/qemu_domain.c:1786
+#: src/lxc/lxc_driver.c:1665 src/qemu/qemu_domain.c:1277
 #, c-format
 msgid "unable to seek to %lld from start for %s"
 msgstr "无法为 %lld 从头查找 %s"
 
-#: src/qemu/qemu_domain.c:1814
+#: src/qemu/qemu_domain.c:1307
 #, c-format
 msgid "Unable to write to domain logfile %s"
 msgstr "无法写入域日志文件 %s"
 
-#: src/qemu/qemu_domain.c:1837 src/storage/storage_backend.c:982
-#: src/storage/storage_backend_fs.c:1231
+#: src/qemu/qemu_domain.c:1334 src/storage/storage_backend.c:783
 msgid "unable to find kvm-img or qemu-img"
 msgstr "无法找到 kvm-img 或者 qemu-img"
 
-#: src/qemu/qemu_domain.c:1862
+#: src/qemu/qemu_domain.c:1365
 #, c-format
 msgid "cannot create snapshot directory '%s'"
 msgstr "无法生成快照目录 '%s'"
 
-#: src/qemu/qemu_domain.c:1922
+#: src/qemu/qemu_domain.c:1438
 #, c-format
 msgid "Disk device '%s' does not support snapshotting"
 msgstr "磁盘设备 '%s' 不支持快照功能"
 
-#: src/qemu/qemu_domain.c:2147
+#: src/qemu/qemu_domain.c:2173
 #, c-format
 msgid "no source device %s"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:2313
+#: src/qemu/qemu_domain.c:2339
 #, c-format
 msgid "Backing file '%s' of image '%s' is missing."
 msgstr ""
 
-#: src/qemu/qemu_driver.c:247 src/test/test_driver.c:6486
+#: src/qemu/qemu_driver.c:9944 src/qemu/qemu_driver.c:9984
+#: src/qemu/qemu_driver.c:10091 src/qemu/qemu_driver.c:10169
+#: src/qemu/qemu_driver.c:10239 src/qemu/qemu_driver.c:10600
 #, c-format
 msgid "no domain snapshot with matching name '%s'"
 msgstr "没有与名称 '%s' 匹配的域快照"
 
-#: src/qemu/qemu_driver.c:282
+#: src/qemu/qemu_driver.c:158
 #, c-format
 msgid "Failed to start job on VM '%s': %s"
 msgstr "在 VM '%s' 中启动任务失败：%s"
 
-#: src/qemu/qemu_driver.c:422
+#: src/qemu/qemu_driver.c:313
 #, c-format
 msgid "Failed to allocate memory for snapshot directory for domain %s"
 msgstr "为域 %s 的快照目录分配内存失败"
 
-#: src/qemu/qemu_driver.c:435
+#: src/qemu/qemu_driver.c:323
 #, c-format
 msgid "Failed to open snapshot directory %s for domain %s: %s"
 msgstr "为域 %s 打开快照目录 %s 失败：%s"
 
-#: src/qemu/qemu_driver.c:450
+#: src/qemu/qemu_driver.c:338
 msgid "Failed to allocate memory for path"
 msgstr "为路径分配内存失败"
 
-#: src/qemu/qemu_driver.c:456
+#: src/qemu/qemu_driver.c:345
 #, c-format
 msgid "Failed to read snapshot file %s: %s"
 msgstr "读取快照文件 %s 失败：%s"
 
-#: src/qemu/qemu_driver.c:468
+#: src/qemu/qemu_driver.c:356
 #, c-format
 msgid "Failed to parse snapshot XML from file '%s'"
 msgstr "从文件  '%s' 解析快照 XML 失败"
 
-#: src/qemu/qemu_driver.c:489
+#: src/qemu/qemu_driver.c:377
 #, c-format
 msgid "Too many snapshots claiming to be current for domain %s"
 msgstr "有太多声称是域 %s 的快照"
 
-#: src/qemu/qemu_driver.c:495 src/test/test_driver.c:1055
+#: src/qemu/qemu_driver.c:383
 #, c-format
 msgid "Snapshots have inconsistent relations for domain %s"
 msgstr "域 %s 有不连贯的关系"
 
-#: src/qemu/qemu_driver.c:619
+#: src/libxl/libxl_driver.c:926 src/qemu/qemu_driver.c:512
 #, c-format
 msgid "Failed to create state dir '%s': %s"
 msgstr "生成 state 目录 '%s' 失败：%s"
 
-#: src/qemu/qemu_driver.c:624
+#: src/libxl/libxl_driver.c:932 src/qemu/qemu_driver.c:518
 #, c-format
 msgid "Failed to create lib dir '%s': %s"
 msgstr "生成 lib 目录 '%s' 失败：%s"
 
-#: src/qemu/qemu_driver.c:629
+#: src/qemu/qemu_driver.c:524
 #, c-format
 msgid "Failed to create cache dir '%s': %s"
 msgstr "生成 cache 目录  '%s' 失败：%s"
 
-#: src/qemu/qemu_driver.c:634 src/qemu/qemu_driver.c:639
+#: src/libxl/libxl_driver.c:938 src/qemu/qemu_driver.c:530
+#: src/qemu/qemu_driver.c:536
 #, c-format
 msgid "Failed to create save dir '%s': %s"
 msgstr "生成 save 目录  '%s' 失败：%s"
 
-#: src/qemu/qemu_driver.c:644
+#: src/qemu/qemu_driver.c:542
 #, c-format
 msgid "Failed to create dump dir '%s': %s"
 msgstr "生成 dump 目录  '%s' 失败：%s"
 
-#: src/qemu/qemu_driver.c:664
+#: src/qemu/qemu_conf.c:407
 #, c-format
 msgid "failed to enable mac filter in '%s'"
 msgstr "在 '%s' 中启用 mac 过滤器失败"
 
-#: src/qemu/qemu_driver.c:671
+#: src/qemu/qemu_conf.c:415
 #, c-format
 msgid "failed to add rule to drop all frames in '%s'"
 msgstr "添加丢弃 '%s' 中所有帧的规则失败"
 
-#: src/qemu/qemu_driver.c:681
+#: src/qemu/qemu_driver.c:680
 msgid "display"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:687
+#: src/qemu/qemu_driver.c:686
 msgid "webSocket"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:693
+#: src/qemu/qemu_driver.c:692
 msgid "migration"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:719
+#: src/qemu/qemu_driver.c:590
 #, c-format
 msgid "unable to set ownership of '%s' to user %d:%d"
 msgstr "无法为用户 %s 设定拥有者 '%d' ：%d"
 
-#: src/qemu/qemu_driver.c:726 src/qemu/qemu_driver.c:733
-#: src/qemu/qemu_driver.c:740
+#: src/qemu/qemu_driver.c:596 src/qemu/qemu_driver.c:602
+#: src/qemu/qemu_driver.c:608
 #, c-format
 msgid "unable to set ownership of '%s' to %d:%d"
 msgstr "无法为 %s 设定拥有者 '%d' ：%d"
 
-#: src/qemu/qemu_driver.c:777
+#: src/qemu/qemu_driver.c:629
 #, c-format
 msgid "unable to create hugepage path %s"
 msgstr "无法生成超大页面路径 %s"
 
-#: src/qemu/qemu_driver.c:785
+#: src/qemu/qemu_driver.c:636
 #, c-format
 msgid "unable to set ownership on %s to %d:%d"
 msgstr "无法在 %s 中设定拥有者 %d ：%d"
 
-#: src/qemu/qemu_driver.c:1064
+#: src/qemu/qemu_driver.c:863
 msgid "qemu state driver is not active"
 msgstr "qemu 状态驱动程序不活跃"
 
-#: src/qemu/qemu_driver.c:1071
+#: src/qemu/qemu_driver.c:869
 #, c-format
 msgid "no QEMU URI path given, try %s"
 msgstr "未给出 QEMU URI 路径，尝试 %s"
 
-#: src/qemu/qemu_driver.c:1080
+#: src/qemu/qemu_driver.c:880
 #, c-format
 msgid "unexpected QEMU URI path '%s', try qemu:///system"
 msgstr "应为 QEMU URI 路径 '%s'，尝试 qemu:///system"
 
-#: src/qemu/qemu_driver.c:1087
+#: src/qemu/qemu_driver.c:887
 #, c-format
 msgid "unexpected QEMU URI path '%s', try qemu:///session"
 msgstr "应为 QEMU URI 路径 '%s'，尝试 qemu:///session"
 
-#: src/qemu/qemu_driver.c:1172 src/util/iohelper.c:59 src/util/virfile.c:570
-#: src/util/virfile.c:611 src/util/virfile.c:690 src/util/virnetdevtap.c:345
+#: src/lxc/lxc_controller.c:109 src/lxc/lxc_controller.c:162
+#: src/qemu/qemu_driver.c:960 src/util/iohelper.c:57
 #, c-format
 msgid "Unable to open %s"
 msgstr "无法打开 tty %s"
 
-#: src/qemu/qemu_driver.c:1352 src/uml/uml_driver.c:1635
-#: src/uml/uml_driver.c:1679 src/vbox/vbox_tmpl.c:1261
-#: src/vbox/vbox_tmpl.c:1585 src/vbox/vbox_tmpl.c:1637
-#: src/vbox/vbox_tmpl.c:1691 src/vbox/vbox_tmpl.c:1749
-#: src/vbox/vbox_tmpl.c:1800 src/vbox/vbox_tmpl.c:1874
-#: src/vbox/vbox_tmpl.c:2157
+#: src/qemu/qemu_driver.c:1117 src/uml/uml_driver.c:1531
+#: src/uml/uml_driver.c:1567 src/vbox/vbox_tmpl.c:1233
+#: src/vbox/vbox_tmpl.c:1520 src/vbox/vbox_tmpl.c:1572
+#: src/vbox/vbox_tmpl.c:1623 src/vbox/vbox_tmpl.c:1676
+#: src/vbox/vbox_tmpl.c:1727 src/vbox/vbox_tmpl.c:1803
+#: src/vbox/vbox_tmpl.c:2113
 #, c-format
 msgid "no domain with matching id %d"
 msgstr "没有匹配 id %d 的域"
 
-#: src/qemu/qemu_driver.c:1716 src/qemu/qemu_driver.c:1777
+#: src/qemu/qemu_driver.c:1715 src/qemu/qemu_driver.c:1776
 msgid "domain is pmsuspended"
 msgstr "域为点暂停"
 
-#: src/qemu/qemu_driver.c:1785 src/qemu/qemu_migration.c:2756
-#: src/qemu/qemu_migration.c:4492 src/qemu/qemu_process.c:593
-#: src/qemu/qemu_process.c:4119
+#: src/qemu/qemu_driver.c:1481 src/qemu/qemu_migration.c:2674
+#: src/qemu/qemu_migration.c:2801 src/qemu/qemu_process.c:406
+#: src/qemu/qemu_process.c:3287
 msgid "resume operation failed"
 msgstr "恢复操作失败"
 
-#: src/qemu/qemu_driver.c:1848 src/qemu/qemu_driver.c:1954
-#: src/qemu/qemu_driver.c:4193 src/qemu/qemu_driver.c:4931
-#: src/qemu/qemu_driver.c:11575 src/qemu/qemu_driver.c:11602
-#: src/qemu/qemu_driver.c:15635 src/qemu/qemu_driver.c:15768
-#: src/qemu/qemu_driver.c:15846
+#: src/qemu/qemu_driver.c:1847 src/qemu/qemu_driver.c:1953
+#: src/qemu/qemu_driver.c:4207 src/qemu/qemu_driver.c:4945
+#: src/qemu/qemu_driver.c:12048 src/qemu/qemu_driver.c:12075
+#: src/qemu/qemu_driver.c:16210 src/qemu/qemu_driver.c:16343
+#: src/qemu/qemu_driver.c:16421
 msgid "QEMU guest agent is not available due to an error"
 msgstr "由于出错导致 QEMU 虚拟机代理不可用"
 
-#: src/qemu/qemu_driver.c:1859 src/qemu/qemu_driver.c:1960
-#: src/qemu/qemu_driver.c:4200 src/qemu/qemu_driver.c:4938
-#: src/qemu/qemu_driver.c:11581 src/qemu/qemu_driver.c:11609
-#: src/qemu/qemu_driver.c:15642 src/qemu/qemu_driver.c:15775
-#: src/qemu/qemu_driver.c:15840
+#: src/qemu/qemu_driver.c:1858 src/qemu/qemu_driver.c:1959
+#: src/qemu/qemu_driver.c:4214 src/qemu/qemu_driver.c:4952
+#: src/qemu/qemu_driver.c:12054 src/qemu/qemu_driver.c:12082
+#: src/qemu/qemu_driver.c:16217 src/qemu/qemu_driver.c:16350
+#: src/qemu/qemu_driver.c:16415
 msgid "QEMU guest agent is not configured"
 msgstr "未配置 QEMU 虚拟机代理"
 
-#: src/qemu/qemu_driver.c:1927
+#: src/qemu/qemu_driver.c:1926
 msgid "flags for acpi power button and guest agent are mutually exclusive"
 msgstr "acpi 电源按钮标签和虚拟机代理标签之间彼此互斥"
 
-#: src/qemu/qemu_driver.c:1968
+#: src/qemu/qemu_driver.c:1576
 msgid "Reboot is not supported with this QEMU binary"
 msgstr "这个 QEMU 二进制中不支持重启"
 
-#: src/qemu/qemu_driver.c:1974
+#: src/qemu/qemu_driver.c:1601
 msgid "Reboot is not supported without the JSON monitor"
 msgstr "没有 JSON 监控程序也支持重启"
 
-#: src/qemu/qemu_driver.c:2232
+#: src/qemu/qemu_driver.c:1859
 msgid "cannot resize the maximum memory on an active domain"
 msgstr "无法在活跃的域中创新定义内存最大值"
 
-#: src/qemu/qemu_driver.c:2269
+#: src/qemu/qemu_driver.c:2276
 msgid ""
 "Unable to change memory of active domain without the balloon device and "
 "guest OS balloon driver"
 msgstr "没有布尔失败好虚拟机 OS 布尔驱动程序则无法更改活跃域的内存"
 
-#: src/qemu/qemu_driver.c:2347
+#: src/qemu/qemu_driver.c:2354
 msgid "unable to set balloon driver collection period"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2440
+#: src/qemu/qemu_driver.c:2007
 #, c-format
 msgid "cannot translate keycode %u of %s codeset to rfb keycode"
 msgstr "无法将 %u 编码集的序列号 %s 转换为 rfb 序列号"
 
-#: src/qemu/qemu_driver.c:2502 src/uml/uml_driver.c:1876
+#: src/qemu/qemu_driver.c:2079 src/uml/uml_driver.c:1743
 msgid "cannot read cputime for domain"
 msgstr "无法为域读取 cputime"
 
-#: src/qemu/qemu_driver.c:2704
+#: src/qemu/qemu_driver.c:2288
 #, c-format
 msgid "failed to write header to domain save file '%s'"
 msgstr "将标头写入域保存文件 '%s' 失败"
 
-#: src/qemu/qemu_driver.c:2712 src/qemu/qemu_driver.c:5609
+#: src/qemu/qemu_driver.c:2296 src/qemu/qemu_driver.c:4334
 #, c-format
 msgid "failed to write xml to '%s'"
 msgstr "将 xml 写入 '%s' 失败"
 
-#: src/qemu/qemu_driver.c:2736
+#: src/qemu/qemu_driver.c:4078
 #, c-format
 msgid "Invalid compressed save format %d"
 msgstr "无效压缩保存格式 %d"
 
-#: src/qemu/qemu_driver.c:2852
+#: src/qemu/qemu_driver.c:2377
 #, c-format
 msgid "Failed to create file '%s': couldn't determine fs type"
 msgstr "生成文件 '%s' 失败：无法确定文件系统类型"
 
-#: src/qemu/qemu_driver.c:2854
+#: src/qemu/qemu_driver.c:2861
 #, c-format
 msgid "Failed to open file '%s': couldn't determine fs type"
 msgstr "打开文件 '%s' 失败：无法确定文件系统类型"
 
-#: src/qemu/qemu_driver.c:2872
+#: src/qemu/qemu_driver.c:2398
 #, c-format
 msgid "Error from child process creating '%s'"
 msgstr "生成 '%s' 的子进程的错误"
 
-#: src/qemu/qemu_driver.c:2873
+#: src/qemu/qemu_driver.c:2880
 #, c-format
 msgid "Error from child process opening '%s'"
 msgstr "从自进程打开 '%s' 出错"
 
-#: src/qemu/qemu_driver.c:2894 src/storage/storage_backend.c:432
+#: src/qemu/qemu_driver.c:2362 src/qemu/qemu_driver.c:2386
 #, c-format
 msgid "Failed to create file '%s'"
 msgstr "创建文件 '%s' 失败"
 
-#: src/qemu/qemu_driver.c:2895 src/util/virfile.c:1280
-#: src/util/virstoragefile.c:902 src/util/virstoragefile.c:1060
+#: src/util/util.c:451
 #, c-format
 msgid "Failed to open file '%s'"
 msgstr "打开文件 '%s' 失败"
 
-#: src/qemu/qemu_driver.c:2960 src/qemu/qemu_driver.c:3432
-#: src/qemu/qemu_driver.c:5183
+#: src/qemu/qemu_driver.c:2539 src/qemu/qemu_driver.c:2869
+#: src/qemu/qemu_driver.c:3947
 msgid "bypass cache unsupported by this system"
 msgstr "这个系统不支持的旁路缓存"
 
-#: src/qemu/qemu_driver.c:3004
+#: src/qemu/qemu_driver.c:2586
 #, c-format
 msgid "unable to write %s"
 msgstr "无法写入 %s"
 
-#: src/qemu/qemu_driver.c:3065 src/qemu/qemu_driver.c:3556
-#: src/qemu/qemu_driver.c:11781 src/qemu/qemu_driver.c:12484
-#: src/qemu/qemu_driver.c:13404 src/qemu/qemu_driver.c:13456
-#: src/qemu/qemu_driver.c:14124 src/qemu/qemu_hotplug.c:465
-#: src/qemu/qemu_hotplug.c:996 src/qemu/qemu_migration.c:3245
-#: src/qemu/qemu_migration.c:3563 src/qemu/qemu_migration.c:4001
-#: src/qemu/qemu_migration.c:4412 src/qemu/qemu_process.c:568
-#: src/qemu/qemu_process.c:581
+#: src/qemu/qemu_driver.c:2476 src/qemu/qemu_driver.c:2986
+#: src/qemu/qemu_driver.c:9220 src/qemu/qemu_driver.c:9502
+#: src/qemu/qemu_driver.c:10366 src/qemu/qemu_driver.c:10417
+#: src/qemu/qemu_hotplug.c:408 src/qemu/qemu_hotplug.c:761
+#: src/qemu/qemu_migration.c:1622 src/qemu/qemu_migration.c:1937
+#: src/qemu/qemu_migration.c:2261 src/qemu/qemu_migration.c:2612
+#: src/qemu/qemu_process.c:384 src/qemu/qemu_process.c:397
 msgid "guest unexpectedly quit"
 msgstr "虚拟机意外退出"
 
-#: src/qemu/qemu_driver.c:3098
+#: src/qemu/qemu_driver.c:2510
 msgid "failed to get domain xml"
 msgstr "获得域 xml 失败"
 
-#: src/qemu/qemu_driver.c:3183 src/qemu/qemu_driver.c:3275
+#: src/qemu/qemu_driver.c:2673
 msgid "Invalid save image format specified in configuration file"
 msgstr "配置文件中指定的无效映像格式"
 
-#: src/qemu/qemu_driver.c:3189 src/qemu/qemu_driver.c:3281
-#: src/qemu/qemu_driver.c:12512
+#: src/qemu/qemu_driver.c:2679
 msgid ""
 "Compression program for image format in configuration file isn't available"
 msgstr "用于配置文件中映像格式的压缩程序不可用"
 
-#: src/qemu/qemu_driver.c:3372
+#: src/qemu/qemu_driver.c:3379
 #, c-format
 msgid "Failed to remove managed save file '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3394
+#: src/qemu/qemu_driver.c:3401
 msgid "dump-guest-memory is not supported"
 msgstr "不支持 dump-guest-memory"
 
-#: src/qemu/qemu_driver.c:3460
+#: src/qemu/qemu_driver.c:3467
 #, c-format
 msgid "unable to close file %s"
 msgstr "无法关闭文件 %s"
 
-#: src/qemu/qemu_driver.c:3493
+#: src/qemu/qemu_driver.c:2923
 msgid "Invalid dump image format specified in configuration file, using raw"
 msgstr "配置文件中指定的无效转储映像格式，使用 raw"
 
-#: src/qemu/qemu_driver.c:3499
+#: src/qemu/qemu_driver.c:2928
 msgid ""
 "Compression program for dump image format in configuration file isn't "
 "available, using raw"
 msgstr "用于配置文件中转储映像格式的压缩文件不可用，使用 raw"
 
-#: src/qemu/qemu_driver.c:3596
+#: src/qemu/qemu_driver.c:3024
 msgid "resuming after dump failed"
 msgstr "转储失败后恢复"
 
-#: src/qemu/qemu_driver.c:3654
+#: src/qemu/qemu_driver.c:3087
 msgid "currently is supported only taking screenshots of screen ID 0"
 msgstr "目前只支持提取页面 ID 0 的快照"
 
-#: src/qemu/qemu_driver.c:3663 src/qemu/qemu_driver.c:9744
-#: src/vbox/vbox_tmpl.c:9209
+#: src/qemu/qemu_driver.c:3670 src/qemu/qemu_driver.c:10168
+#: src/vbox/vbox_tmpl.c:9213
 #, c-format
 msgid "mkostemp(\"%s\") failed"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3684 src/vbox/vbox_tmpl.c:9274
+#: src/qemu/qemu_driver.c:3119 src/vbox/vbox_tmpl.c:9102
 msgid "unable to open stream"
 msgstr "无法打开流"
 
-#: src/qemu/qemu_driver.c:3741 src/qemu/qemu_driver.c:3805
+#: src/qemu/qemu_driver.c:3180
 msgid "Dump failed"
 msgstr "转储失败"
 
-#: src/qemu/qemu_driver.c:3749
+#: src/qemu/qemu_driver.c:3188
 msgid "Resuming after dump failed"
 msgstr "转储失败后恢复"
 
-#: src/qemu/qemu_driver.c:4000
+#: src/qemu/qemu_driver.c:4007
 msgid "qemu didn't unplug the vCPUs properly"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4008 src/qemu/qemu_process.c:1957
+#: src/qemu/qemu_process.c:1350
 #, c-format
 msgid "got wrong number of vCPU pids from QEMU monitor. got %d, wanted %d"
 msgstr "从 QEMU 监控程序中获得错误的 vCPU 数。得到的是 %d，应为 %d。"
 
-#: src/qemu/qemu_driver.c:4028
+#: src/qemu/qemu_driver.c:4035
 #, c-format
 msgid "unable to add vcpu %zu task %d to cgroup"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4059
+#: src/qemu/qemu_driver.c:4066
 #, c-format
 msgid "failed to set cpuset.cpus in cgroup for vcpu %zu"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4068
+#: src/qemu/qemu_driver.c:4075
 #, c-format
 msgid "failed to set cpu affinity for vcpu %zu"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4114
+#: src/qemu/qemu_driver.c:3259
 msgid "cannot change vcpu count of this domain"
 msgstr "无法更改这个域的 vcpu 计数"
 
-#: src/qemu/qemu_driver.c:4141 src/test/test_driver.c:2651
-#: src/xen/xen_driver.c:1378
+#: src/qemu/qemu_driver.c:3283 src/test/test_driver.c:2194
+#: src/xen/xen_driver.c:1122
 #, c-format
 msgid "argument out of range: %d"
 msgstr "参数超出范围：%d"
 
-#: src/qemu/qemu_driver.c:4171
+#: src/qemu/qemu_driver.c:3316
 msgid "cannot adjust maximum on running domain"
 msgstr "无法调整运行域的最大值"
 
-#: src/qemu/qemu_driver.c:4186
+#: src/qemu/qemu_driver.c:4200
 msgid "changing of maximum vCPU count isn't supported via guest agent"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4206
+#: src/qemu/qemu_driver.c:4220
 #, c-format
 msgid ""
 "requested vcpu count is greater than the count of enabled vcpus in the "
 "domain: %d > %d"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4231
+#: src/qemu/qemu_driver.c:4245
 #, c-format
 msgid "failed to set state of cpu %d via guest agent"
 msgstr "通过虚拟代理设定 cpu %d 状态失败"
 
-#: src/qemu/qemu_driver.c:4320
+#: src/qemu/qemu_driver.c:3456
 #, c-format
 msgid "vcpu number out of range %d > %d"
 msgstr "vcpu 数超过范围 %d > %d"
 
-#: src/qemu/qemu_driver.c:4331 src/qemu/qemu_driver.c:4605
+#: src/qemu/qemu_driver.c:4345 src/qemu/qemu_driver.c:4619
 msgid "Empty cpu list for pinning"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4345 src/qemu/qemu_driver.c:4670
-#: src/qemu/qemu_process.c:2121
+#: src/qemu/qemu_driver.c:3495 src/qemu/qemu_process.c:1578
 msgid "cpu affinity is not supported"
 msgstr "不支持 cpu 亲和性"
 
-#: src/qemu/qemu_driver.c:4364 src/qemu/qemu_driver.c:4625
+#: src/qemu/qemu_driver.c:4378 src/qemu/qemu_driver.c:4639
 msgid "failed to update vcpupin"
 msgstr "更新 vcpupin 失败"
 
-#: src/qemu/qemu_driver.c:4375
+#: src/qemu/qemu_driver.c:4389
 #, c-format
 msgid "failed to set cpuset.cpus in cgroup for vcpu %d"
 msgstr "在 cgroup 中为 vcpu %d 设定 cpuset.cpus 失败"
 
-#: src/qemu/qemu_driver.c:4382
+#: src/qemu/qemu_driver.c:4396
 #, c-format
 msgid "failed to set cpu affinity for vcpu %d"
 msgstr "为 vcpu %d 设定 cpu 亲和性失败"
 
-#: src/qemu/qemu_driver.c:4391
+#: src/qemu/qemu_driver.c:3502
 msgid "failed to delete vcpupin xml of a running domain"
 msgstr "删除运行的域的 vcpupin xml 失败"
 
-#: src/qemu/qemu_driver.c:4416
+#: src/qemu/qemu_driver.c:3524
 msgid "failed to delete vcpupin xml of a persistent domain"
 msgstr "删除持久域的 vcpupin xml 失败"
 
-#: src/qemu/qemu_driver.c:4432
+#: src/qemu/qemu_driver.c:3531
 msgid "failed to update or add vcpupin xml of a persistent domain"
 msgstr "更新或者具体持久域的 vcpupin xml 失败"
 
-#: src/qemu/qemu_driver.c:4588
+#: src/qemu/qemu_driver.c:4602
 msgid ""
 "Changing affinity for emulator thread dynamically is not allowed when CPU "
 "placement is 'auto'"
 msgstr "CPU 为 'auto' 时不允许动态更改模拟程序线程的亲和性"
 
-#: src/qemu/qemu_driver.c:4640
+#: src/qemu/qemu_driver.c:4654
 msgid "failed to set cpuset.cpus in cgroup for emulator threads"
 msgstr "在 cgroup 中为模拟程序线程设定 cpuset.cpus 失败"
 
-#: src/qemu/qemu_driver.c:4647
+#: src/qemu/qemu_driver.c:4661
 msgid "failed to set cpu affinity for emulator threads"
 msgstr "为模拟程序线程设定 cpu 亲和性失败"
 
-#: src/qemu/qemu_driver.c:4656
+#: src/qemu/qemu_driver.c:4670
 msgid "failed to delete emulatorpin xml of a running domain"
 msgstr "删除运行的域的 emulatorpin xml 失败"
 
-#: src/qemu/qemu_driver.c:4683
+#: src/qemu/qemu_driver.c:4697
 msgid "failed to delete emulatorpin xml of a persistent domain"
 msgstr "删除持久域的 emulatorpin xml 失败"
 
-#: src/qemu/qemu_driver.c:4690
+#: src/qemu/qemu_driver.c:4704
 msgid "failed to update or add emulatorpin xml of a persistent domain"
 msgstr "更新或者具体持久域的 emulatorpin xml 失败"
 
-#: src/qemu/qemu_driver.c:4809
+#: src/qemu/qemu_driver.c:3693
 msgid "cannot list vcpu pinning for an inactive domain"
 msgstr "无法为不活跃域列出 vcpu pinning"
 
-#: src/qemu/qemu_driver.c:4840
+#: src/qemu/qemu_driver.c:3724
 msgid "cannot get vCPU placement & pCPU time"
 msgstr "无法获取 vCPU 布置和 pCPU 时间"
 
-#: src/qemu/qemu_driver.c:4868
+#: src/qemu/qemu_driver.c:3742
 msgid "cpu affinity is not available"
 msgstr "cpu 亲和性不可用"
 
-#: src/qemu/qemu_driver.c:4921
+#: src/qemu/qemu_driver.c:4935
 msgid ""
 "vCPU count provided by the guest agent can only be  requested for live "
 "domains"
 msgstr "只能由 live 域请求虚拟代理提供的 vCPU 计数"
 
-#: src/qemu/qemu_driver.c:5203 src/qemu/qemu_driver.c:5223
+#: src/qemu/qemu_driver.c:3973
 #, c-format
 msgid "cannot remove corrupt file: %s"
 msgstr "无法删除崩溃文件：%s"
 
-#: src/qemu/qemu_driver.c:5210
+#: src/qemu/qemu_driver.c:3960
 msgid "failed to read qemu header"
 msgstr "读取 qemu 标题失败"
 
-#: src/qemu/qemu_driver.c:5219
+#: src/qemu/qemu_driver.c:3969
 msgid "save image is incomplete"
 msgstr "保存映像不完整"
 
-#: src/qemu/qemu_driver.c:5265 src/qemu/qemu_driver.c:5396
+#: src/qemu/qemu_driver.c:4017 src/qemu/qemu_driver.c:4121
 #, c-format
 msgid "cannot close file: %s"
 msgstr "无法关闭文件：%s"
 
-#: src/qemu/qemu_driver.c:5420
+#: src/qemu/qemu_driver.c:4145
 msgid "failed to resume domain"
 msgstr "恢复域失败"
 
-#: src/qemu/qemu_driver.c:5596
+#: src/qemu/qemu_driver.c:4319
 msgid "new xml too large to fit in file"
 msgstr "新的 xml 太大无法放入文件"
 
-#: src/qemu/qemu_driver.c:5603
+#: src/qemu/qemu_driver.c:4328
 #, c-format
 msgid "cannot seek in '%s'"
 msgstr "无法在 '%s' 中查询"
 
-#: src/qemu/qemu_driver.c:6039
+#: src/qemu/qemu_driver.c:4687
 #, c-format
 msgid "cannot remove managed save file %s"
 msgstr "无法删除管理的保存文件 %s"
 
-#: src/qemu/qemu_driver.c:6113
+#: src/qemu/qemu_driver.c:4757
 msgid "domain is already running"
 msgstr "域正在运行中"
 
-#: src/qemu/qemu_driver.c:6182 src/qemu/qemu_driver.c:12681
-#: src/qemu/qemu_driver.c:13282
+#: src/qemu/qemu_driver.c:6199 src/qemu/qemu_driver.c:13306
+#: src/qemu/qemu_driver.c:13907
 msgid "domain has active block copy job"
 msgstr "域有活跃块复制任务"
 
-#: src/qemu/qemu_driver.c:6264 src/test/test_driver.c:3154
+#: src/qemu/qemu_driver.c:4980
 #, c-format
 msgid "cannot delete inactive domain with %d snapshots"
 msgstr "无法删除使用 %d 快照的不活跃域"
 
-#: src/qemu/qemu_driver.c:6345
+#: src/qemu/qemu_driver.c:6362
 #, c-format
 msgid "'%s' controller cannot be hot plugged."
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6412
+#: src/qemu/qemu_driver.c:6429
 #, c-format
 msgid "live attach of device '%s' is not supported"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6437
+#: src/qemu/qemu_driver.c:6454
 #, c-format
 msgid "'%s' controller cannot be hot unplugged."
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6472
+#: src/qemu/qemu_driver.c:6489
 #, c-format
 msgid "live detach of device '%s' is not supported"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6589
+#: src/qemu/qemu_driver.c:6606
 #, c-format
 msgid "live update of device '%s' is not supported"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6654
+#: src/qemu/qemu_driver.c:5401
 #, c-format
 msgid "Lease %s in lockspace %s already exists"
 msgstr "锁空间 %s 中租赁 %s 已存在"
 
-#: src/qemu/qemu_driver.c:6670
+#: src/qemu/qemu_driver.c:6688 src/qemu/qemu_driver.c:6710
 msgid "Target already exists"
 msgstr "目标已存在"
 
-#: src/qemu/qemu_driver.c:6690
+#: src/qemu/qemu_driver.c:6721
 #, c-format
 msgid "persistent attach of device '%s' is not supported"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6755 src/qemu/qemu_hotplug.c:3593
+#: src/qemu/qemu_driver.c:5455 src/qemu/qemu_hotplug.c:2262
 #, c-format
 msgid "Lease %s in lockspace %s does not exist"
 msgstr "锁空间 %s 中租赁 %s 已不存在"
 
-#: src/qemu/qemu_driver.c:6786
+#: src/qemu/qemu_driver.c:6821
+msgid "no matching filesystem device was found"
+msgstr ""
+
+#: src/qemu/qemu_driver.c:6831
 #, c-format
 msgid "persistent detach of device '%s' is not supported"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6844 src/qemu/qemu_driver.c:6850
+#: src/qemu/qemu_driver.c:6889 src/qemu/qemu_driver.c:6895
 #, c-format
 msgid "couldn't find matching device with mac address %s"
 msgstr "无法找到 mac 地址为 %s 的设备"
 
-#: src/qemu/qemu_driver.c:6866
+#: src/qemu/qemu_driver.c:6911
 #, c-format
 msgid "persistent update of device '%s' is not supported"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7506
-#, c-format
-msgid "unable to parse device weight '%s'"
-msgstr "无法解析设备加权 '%s'"
-
-#: src/qemu/qemu_driver.c:7805 src/qemu/qemu_driver.c:7840
-#: src/util/virtypedparam.c:193 src/util/virtypedparam.c:251
-#, c-format
-msgid "Field name '%s' too long"
-msgstr "字段名称 '%s' 过长"
-
-#: src/qemu/qemu_driver.c:8159
+#: src/qemu/qemu_driver.c:8570
 msgid "change of nodeset for running domain requires strict numa mode"
 msgstr "为运行的域更改 nodeset 需要严格 numa 模式"
 
-#: src/qemu/qemu_driver.c:8175
+#: src/qemu/qemu_driver.c:8587
 msgid "Failed to get cpuset bit values"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8180
+#: src/qemu/qemu_driver.c:8592
 msgid "Failed to set temporary cpuset bit values"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8187 src/qemu/qemu_driver.c:8198
+#: src/qemu/qemu_driver.c:8599 src/qemu/qemu_driver.c:8610
 msgid "Failed to format nodeset"
 msgstr "格式化 nodeset 失败"
 
-#: src/qemu/qemu_driver.c:8268
+#: src/qemu/qemu_driver.c:8680
 msgid "cgroup cpuset controller is not mounted"
 msgstr "未挂载 cgroup cpuset 控制器"
 
-#: src/qemu/qemu_driver.c:8283
+#: src/qemu/qemu_driver.c:8695
 #, c-format
 msgid "unsupported numa_mode: '%d'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8290
+#: src/qemu/qemu_driver.c:8702
 msgid "can't change numa mode for running domain"
 msgstr "无法为运行的域更改 numa 模式"
 
-#: src/qemu/qemu_driver.c:8517
+#: src/qemu/qemu_driver.c:8929
 #, c-format
 msgid "value of '%s' is out of range [%lld, %lld]"
 msgstr "'%s' 值超过 [%lld, %lld] 范围"
 
-#: src/qemu/qemu_driver.c:8946
+#: src/qemu/qemu_driver.c:7333
 msgid "empty path"
 msgstr "库路径"
 
-#: src/qemu/qemu_driver.c:8954
+#: src/qemu/qemu_driver.c:7339
 #, c-format
 msgid "size must be less than %llu"
 msgstr "大小必须小于 %llu"
 
-#: src/qemu/qemu_driver.c:8980 src/qemu/qemu_driver.c:9042
-#: src/qemu/qemu_driver.c:9119 src/test/test_driver.c:3377
-#, c-format
-msgid "invalid path: %s"
-msgstr "无效路径：%s"
-
-#: src/qemu/qemu_driver.c:9049 src/qemu/qemu_driver.c:9126
-#: src/qemu/qemu_hotplug.c:75
-#, c-format
-msgid "missing disk device alias name for %s"
-msgstr "缺少 %s 的磁盘设备别名"
+#: src/qemu/qemu_driver.c:9439 src/qemu/qemu_driver.c:9518
+#: src/test/test_driver.c:3367
+msgid "summary statistics are not supported yet"
+msgstr ""
 
-#: src/qemu/qemu_driver.c:9296
+#: src/qemu/qemu_driver.c:7757
 msgid "interface stats not implemented on this platform"
 msgstr "在这个平台中未采用接口 stats"
 
-#: src/qemu/qemu_driver.c:9355 src/qemu/qemu_driver.c:9363
-#: src/qemu/qemu_driver.c:9518
+#: src/qemu/qemu_driver.c:9779 src/qemu/qemu_driver.c:9787
+#: src/qemu/qemu_driver.c:9942
 #, c-format
 msgid "Can't find device %s"
 msgstr "无法找到设备 %s"
 
-#: src/qemu/qemu_driver.c:9623
+#: src/qemu/qemu_driver.c:10047
 msgid "cannot get RSS for domain"
 msgstr "无法为域获取 RSS"
 
-#: src/qemu/qemu_driver.c:9664 src/qemu/qemu_driver.c:9822
-#: src/uml/uml_driver.c:2491
+#: src/qemu/qemu_driver.c:7836 src/qemu/qemu_driver.c:8001
+#: src/uml/uml_driver.c:2328
 msgid "NULL or empty path"
 msgstr "NULL 或者空路径"
 
-#: src/qemu/qemu_driver.c:9671 src/uml/uml_driver.c:2498
+#: src/qemu/qemu_driver.c:7843 src/uml/uml_driver.c:2335
 #, c-format
 msgid "invalid path '%s'"
 msgstr "无效路径 '%s'"
 
-#: src/qemu/qemu_driver.c:9687
+#: src/qemu/qemu_driver.c:7863
 #, c-format
 msgid "%s: failed to seek or read"
 msgstr "%s：查找并读取失败"
 
-#: src/qemu/qemu_driver.c:9725
+#: src/qemu/qemu_driver.c:7904
 msgid "flags parameter must be VIR_MEMORY_VIRTUAL or VIR_MEMORY_PHYSICAL"
 msgstr "标签参数必须为 VIR_MEMORY_VIRTUAL 或者 VIR_MEMORY_PHYSICAL"
 
-#: src/qemu/qemu_driver.c:9768
+#: src/qemu/qemu_driver.c:7949
 #, c-format
 msgid "failed to read temporary file created with template %s"
 msgstr "读取使用模板 %s 创建的临时文件失败"
 
-#: src/qemu/qemu_driver.c:9829
+#: src/qemu/qemu_driver.c:8008
 #, c-format
 msgid "invalid path %s not assigned to domain"
 msgstr "没有为域分配无效路径 %s"
 
-#: src/qemu/qemu_driver.c:9835
+#: src/qemu/qemu_driver.c:8014
 #, c-format
 msgid "disk %s does not currently have a source assigned"
 msgstr "磁盘 %s 没有目前为其分配的源"
 
-#: src/qemu/qemu_driver.c:9857
+#: src/conf/domain_conf.c:13218 src/qemu/qemu_driver.c:8042
 #, c-format
 msgid "no disk format for %s and probing is disabled"
 msgstr "没有可用于 %s 的磁盘格式，并禁用探测。"
 
-#: src/qemu/qemu_driver.c:9869 src/storage/storage_backend.c:1170
-#: src/storage/storage_backend.c:1204 src/util/virstoragefile.c:907
-#: src/util/virstoragefile.c:983
+#: src/qemu/qemu_driver.c:8061 src/storage/storage_backend.c:1018
+#: src/storage/storage_backend.c:1046 src/storage/storage_backend.c:1166
+#: src/util/storage_file.c:744 src/util/storage_file.c:840
 #, c-format
 msgid "cannot stat file '%s'"
 msgstr "无法 stat 文件 '%s'"
 
-#: src/qemu/qemu_driver.c:9891
+#: src/qemu/qemu_driver.c:8083
 #, c-format
 msgid "failed to seek to end of %s"
 msgstr "查找 %s 的结尾失败"
 
-#: src/qemu/qemu_driver.c:10069 src/qemu/qemu_driver.c:10452
-#: src/qemu/qemu_driver.c:10505
+#: src/qemu/qemu_driver.c:8241 src/qemu/qemu_driver.c:8581
 msgid "PrepareTunnel called but no TUNNELLED flag set"
 msgstr "调用 PrepareTunnel 但没有设置 TUNNELLED 标签"
 
-#: src/qemu/qemu_driver.c:10075 src/qemu/qemu_driver.c:10130
-#: src/qemu/qemu_driver.c:10176
+#: src/qemu/qemu_driver.c:8252 src/qemu/qemu_driver.c:8292
+#: src/qemu/qemu_driver.c:8347
 #, c-format
 msgid "Cannot use migrate v2 protocol with lock manager %s"
 msgstr "无法在锁管理器 %s 中使用迁移 v2 协议"
 
-#: src/qemu/qemu_driver.c:10123 src/qemu/qemu_driver.c:10339
-#: src/qemu/qemu_driver.c:10406
+#: src/qemu/qemu_driver.c:8302 src/qemu/qemu_driver.c:8535
 msgid "Tunnelled migration requested but invalid RPC method called"
 msgstr "请求管道迁移但调用无效 RPC 方法"
 
-#: src/qemu/qemu_driver.c:10776 src/xen/xen_driver.c:2458
+#: src/qemu/qemu_driver.c:8769 src/xen/xen_driver.c:1970
 #, c-format
 msgid "device %s is not a PCI device"
 msgstr "设备 %s 不是 PCI 设备"
 
-#: src/qemu/qemu_driver.c:10827
+#: src/qemu/qemu_driver.c:11267
 msgid ""
-"neither VFIO nor kvm device assignment is currently supported on this system"
+"neither VFIO nor KVM device assignment is currently supported on this system"
+msgstr ""
+
+#: src/qemu/qemu_driver.c:11276
+msgid "VFIO device assignment is currently not supported on this system"
+msgstr ""
+
+#: src/qemu/qemu_driver.c:11285
+msgid "KVM device assignment is currently not supported on this system"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:10838 src/xen/xen_driver.c:2492
+#: src/qemu/qemu_driver.c:11293 src/xen/xen_driver.c:2490
 #, c-format
 msgid "unknown driver name '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:10904
+#: src/qemu/qemu_driver.c:11359
 #, c-format
 msgid "PCI device %s is still in use by domain %s"
 msgstr "PCI 设备 %s 仍被域 %s 使用"
 
-#: src/qemu/qemu_driver.c:10908
+#: src/qemu/qemu_driver.c:11363
 #, c-format
 msgid "PCI device %s is still in use"
 msgstr "PCI 设备 %s 仍在使用中"
 
-#: src/qemu/qemu_driver.c:11240
+#: src/qemu/qemu_driver.c:8983
 msgid "no job is active on the domain"
 msgstr "该域中没有活跃的任务"
 
-#: src/qemu/qemu_driver.c:11244
+#: src/qemu/qemu_driver.c:8987
 msgid "cannot abort incoming migration; use virDomainDestroy instead"
 msgstr "无法中止进入的迁移；使用 virDomainDestroy。"
 
-#: src/qemu/qemu_driver.c:11297
+#: src/qemu/qemu_driver.c:9045
 msgid "domain is not being migrated"
 msgstr "没有要迁移域"
 
-#: src/qemu/qemu_driver.c:11352 src/qemu/qemu_driver.c:11407
+#: src/qemu/qemu_driver.c:11807 src/qemu/qemu_driver.c:11862
 msgid "Compressed migration is not supported by QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:11685
+#: src/qemu/qemu_driver.c:12158
 #, c-format
 msgid "unknown image format of '%s' and format probing is disabled"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:11814 src/qemu/qemu_driver.c:12589
+#: src/qemu/qemu_driver.c:9254 src/qemu/qemu_driver.c:9561
 msgid "resuming after snapshot failed"
 msgstr "快照失败后恢复"
 
-#: src/qemu/qemu_driver.c:11856
+#: src/qemu/qemu_driver.c:12329
 #, c-format
 msgid ""
 "external inactive snapshots are not supported on 'network' disks using '%s' "
 "protocol"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:11867 src/qemu/qemu_driver.c:11915
+#: src/qemu/qemu_driver.c:12340 src/qemu/qemu_driver.c:12428
 #, c-format
 msgid "external inactive snapshots are not supported on '%s' disks"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:11891
+#: src/qemu/qemu_driver.c:12357
+msgid ""
+"external active snapshots are not supported on scsi passthrough devices"
+msgstr ""
+
+#: src/qemu/qemu_driver.c:12392
+#, c-format
+msgid ""
+"external active snapshots are not supported on 'network' disks using '%s' "
+"protocol"
+msgstr ""
+
+#: src/qemu/qemu_driver.c:12404
 #, c-format
 msgid "external active snapshots are not supported on '%s' disks"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:11960 src/qemu/qemu_driver.c:14508
+#: src/qemu/qemu_driver.c:9318
 #, c-format
 msgid "unable to stat for disk %s: %s"
 msgstr "无法获取磁盘 %s 统计数据：%s"
 
-#: src/qemu/qemu_driver.c:11965
+#: src/qemu/qemu_driver.c:12479
 #, c-format
 msgid "missing existing file for disk %s: %s"
 msgstr "磁盘 %s 缺少现有文件：%s"
 
-#: src/qemu/qemu_driver.c:11971
+#: src/qemu/qemu_driver.c:9324
 #, c-format
 msgid ""
 "external snapshot file for disk %s already exists and is not a block device: "
 "%s"
 msgstr "磁盘 %s 的外部快照已存在，且不是块设备：%s"
 
-#: src/qemu/qemu_driver.c:12024
+#: src/qemu/qemu_driver.c:12534
 #, c-format
 msgid ""
 "internal inactive snapshots are not supported on 'network' disks using '%s' "
 "protocol"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:12035
+#: src/qemu/qemu_driver.c:12545
 #, c-format
 msgid "internal inactive snapshots are not supported on '%s' disks"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:12062
+#: src/qemu/qemu_driver.c:12572
 msgid "reuse is not supported with this QEMU binary"
 msgstr "这个 QEMU 二进制中不支持重新使用"
 
-#: src/qemu/qemu_driver.c:12076
+#: src/qemu/qemu_driver.c:9284
 #, c-format
 msgid ""
 "active qemu domains require external disk snapshots; disk %s requested "
 "internal"
 msgstr "活跃 qemu 域需要外部磁盘快照；地盘 %s 要求内部快照。"
 
-#: src/qemu/qemu_driver.c:12094
+#: src/qemu/qemu_driver.c:9292
 #, c-format
 msgid "internal snapshot for disk %s unsupported for storage type %s"
 msgstr "存储类型 %s 不支持磁盘 %s 的内部快照"
 
-#: src/qemu/qemu_driver.c:12109
+#: src/qemu/qemu_driver.c:9310
 #, c-format
 msgid "external snapshot format for disk %s is unsupported: %s"
 msgstr "磁盘 %s 不支持的外部快照：%s"
 
-#: src/qemu/qemu_driver.c:12129 src/qemu/qemu_driver.c:12205
+#: src/qemu/qemu_driver.c:9338 src/qemu/qemu_driver.c:9378
 msgid "unexpected code path"
 msgstr "意外代码路径"
 
-#: src/qemu/qemu_driver.c:12138
+#: src/qemu/qemu_driver.c:12648
 msgid ""
 "internal checkpoints require at least one disk to be selected for snapshot"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:12146
+#: src/qemu/qemu_driver.c:12656
 msgid ""
 "disk-only snapshots require at least one disk to be selected for snapshot"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:12156
+#: src/qemu/qemu_driver.c:12666
 msgid ""
 "mixing internal and external targets for a snapshot is not yet supported"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:12171
+#: src/qemu/qemu_driver.c:12681
 msgid "atomic live snapshot of multiple disks is unsupported"
 msgstr "不支持错磁盘的 atomic live 快照"
 
-#: src/qemu/qemu_driver.c:12340
-msgid "live disk snapshot not supported with this QEMU binary"
+#: src/qemu/qemu_driver.c:12786
+#, c-format
+msgid "snapshots on volumes using '%s' protocol are not supported"
+msgstr ""
+
+#: src/qemu/qemu_driver.c:12795
+#, c-format
+msgid "snapshots are not supported on '%s' volumes"
+msgstr ""
+
+#: src/qemu/qemu_driver.c:12817 src/qemu/qemu_driver.c:12992
+msgid "domain crashed while taking the snapshot"
+msgstr ""
+
+#: src/qemu/qemu_driver.c:12954
+msgid "live disk snapshot not supported with this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:12506
+#: src/qemu/qemu_driver.c:13131
 msgid "Invalid snapshot image format specified in configuration file"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:12653
+#: src/qemu/qemu_driver.c:13278
 msgid "quiesce requires disk-only"
 msgstr "quiesce 需要 disk-only"
 
-#: src/qemu/qemu_driver.c:12676 src/qemu/qemu_migration.c:1404
+#: src/qemu/qemu_driver.c:2448 src/qemu/qemu_driver.c:9624
+#: src/qemu/qemu_migration.c:799
 msgid "domain is marked for auto destroy"
 msgstr "将域标记为自动销毁"
 
-#: src/qemu/qemu_driver.c:12687 src/test/test_driver.c:6900
+#: src/qemu/qemu_driver.c:9629
 msgid "cannot halt after transient domain snapshot"
 msgstr "无法停止临时域快照"
 
-#: src/qemu/qemu_driver.c:12704
+#: src/qemu/qemu_driver.c:13329
 #, c-format
 msgid "invalid snapshot name '%s': name can't contain '/'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:12712
+#: src/qemu/qemu_driver.c:13337
 #, c-format
 msgid "invalid snapshot name '%s': name can't start with '.'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:12725
+#: src/qemu/qemu_driver.c:13350
 msgid "live snapshot creation is supported only with external checkpoints"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:12839
+#: src/qemu/qemu_driver.c:13464
 #, c-format
 msgid "unable to save metadata for snapshot %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:13124 src/test/test_driver.c:6740
+#: src/qemu/qemu_driver.c:10133
 msgid "the domain does not have a current snapshot"
 msgstr "该域没有当前快照"
 
-#: src/qemu/qemu_driver.c:13295 src/test/test_driver.c:7150
+#: src/qemu/qemu_driver.c:10250
 msgid ""
 "transient domain needs to request run or pause to revert to inactive snapshot"
 msgstr "临时域需要请求运行或者暂停到不活跃快照的转换"
 
-#: src/qemu/qemu_driver.c:13301
+#: src/qemu/qemu_driver.c:10256
 msgid "revert to external disk snapshot not supported yet"
 msgstr "尚不支持外部磁盘快照转换"
 
-#: src/qemu/qemu_driver.c:13308 src/test/test_driver.c:7158
+#: src/qemu/qemu_driver.c:10263
 #, c-format
 msgid "snapshot '%s' lacks domain '%s' rollback info"
 msgstr "快照 '%s' 缺少域 '%s' 恢复信息"
 
-#: src/qemu/qemu_driver.c:13318
+#: src/qemu/qemu_driver.c:10273
 msgid "must respawn qemu to start inactive snapshot"
 msgstr "必须复位 qemu 方可启动不活跃的快照"
 
-#: src/qemu/qemu_driver.c:13653
+#: src/qemu/qemu_driver.c:10615
 #, c-format
 msgid "deletion of %d external disk snapshots not supported yet"
 msgstr "尚不支持 %d 外部磁盘快照删除"
 
-#: src/qemu/qemu_driver.c:13680
+#: src/qemu/qemu_driver.c:10642
 #, c-format
 msgid "failed to set snapshot '%s' as current"
 msgstr "将快照 '%s' 设定为当前快照失败"
 
-#: src/qemu/qemu_driver.c:13808
+#: src/qemu/qemu_driver.c:10774
 #, c-format
 msgid "No monitor connection for pid %u"
 msgstr "没有 pid %u 的监控程序连接"
 
-#: src/qemu/qemu_driver.c:13813
+#: src/qemu/qemu_driver.c:10780
 #, c-format
 msgid "Cannot connect to monitor connection of type '%s' for pid %u"
 msgstr "无法为 pid %s 连接到类型 '%u' 的监控程序连接"
 
-#: src/qemu/qemu_driver.c:14005
+#: src/qemu/qemu_driver.c:14630
 #, c-format
 msgid "cannot find channel %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:14012
+#: src/qemu/qemu_driver.c:14637
 #, c-format
 msgid "channel %s is not using a UNIX socket"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:14025
+#: src/qemu/qemu_driver.c:14650
 msgid "Active channel stream exists for this domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:14058
+#: src/qemu/qemu_driver.c:10942
 msgid "No device found for specified path"
 msgstr "没有找到指定路径的设备"
 
-#: src/qemu/qemu_driver.c:14101
+#: src/qemu/qemu_driver.c:14726
 #, c-format
 msgid "disk '%s' not ready for pivot yet"
 msgstr "磁盘 '%s' 尚不可进行 pivot"
 
-#: src/qemu/qemu_driver.c:14206
+#: src/qemu/qemu_driver.c:14831
 msgid "resuming after drive-reopen failed"
 msgstr "重新打开驱动器失败后恢复"
 
-#: src/qemu/qemu_driver.c:14240
+#: src/qemu/qemu_driver.c:14865
 msgid "block jobs not supported with this QEMU binary"
 msgstr "这个 QEMU 二进制中不支持块任务"
 
-#: src/qemu/qemu_driver.c:14244
+#: src/qemu/qemu_driver.c:14869
 msgid "partial block pull not supported with this QEMU binary"
 msgstr "这个 QEMU 二进制中不支持部分块提取"
 
-#: src/qemu/qemu_driver.c:14249
+#: src/qemu/qemu_driver.c:14874
 msgid ""
 "setting bandwidth at start of block pull not supported with this QEMU binary"
 msgstr "在这个 QEMU 二进制中不支持在开始提取块时设定带宽"
 
-#: src/qemu/qemu_driver.c:14270 src/qemu/qemu_driver.c:14471
+#: src/qemu/qemu_driver.c:14895 src/qemu/qemu_driver.c:15096
 #, c-format
 msgid "disk '%s' already in active block copy job"
 msgstr "磁盘 '%s' 已有活跃块复制任务"
 
-#: src/qemu/qemu_driver.c:14278
+#: src/qemu/qemu_driver.c:14903
 #, c-format
 msgid "pivot of disk '%s' requires an active copy job"
 msgstr "磁盘 '%s' 的 pivot 操作需要有活跃的复制任务"
 
-#: src/qemu/qemu_driver.c:14479
+#: src/qemu/qemu_driver.c:15104
 msgid "block copy is not supported with this QEMU binary"
 msgstr "这个 QEMU 二进制中不支持块复制"
 
-#: src/qemu/qemu_driver.c:14488
+#: src/qemu/qemu_driver.c:15113
 msgid "domain is not transient"
 msgstr "域不是临时的"
 
-#: src/qemu/qemu_driver.c:14499
+#: src/qemu/qemu_driver.c:15124
 #, c-format
 msgid "disk '%s' has backing file, so raw shallow copy is not possible"
 msgstr "磁盘 '%s' 有备份文件，因此不可能进行影子复制。"
 
-#: src/qemu/qemu_driver.c:14513
+#: src/qemu/qemu_driver.c:15138
 #, c-format
 msgid "missing destination file for disk %s: %s"
 msgstr "磁盘 %s 缺少目的文件：%s"
 
-#: src/qemu/qemu_driver.c:14520
+#: src/qemu/qemu_driver.c:15145
 #, c-format
 msgid ""
 "external destination file for disk %s already exists and is not a block "
 "device: %s"
 msgstr "磁盘 %s 的外部目的文件已存在，且不是块设备：%s"
 
-#: src/qemu/qemu_driver.c:14537
+#: src/qemu/qemu_driver.c:15162
 #, c-format
 msgid "unrecognized format '%s'"
 msgstr "未识别的格式 '%s'"
 
-#: src/qemu/qemu_driver.c:14684
+#: src/qemu/qemu_driver.c:15309
 msgid "online commit not supported with this QEMU binary"
 msgstr "这个 QEMU 二进制中不支持在线提交"
 
-#: src/qemu/qemu_driver.c:14695
+#: src/qemu/qemu_driver.c:15320
 #, c-format
 msgid "disk %s has no source file to be committed"
 msgstr "磁盘 %s 没有可提交的源文件"
 
-#: src/qemu/qemu_driver.c:14710
+#: src/qemu/qemu_driver.c:15335
 #, c-format
 msgid "could not find top '%s' in chain for '%s'"
 msgstr "无法在链中找到名为 '%s' 的顶端 '%s'"
 
-#: src/qemu/qemu_driver.c:14716
+#: src/qemu/qemu_driver.c:15341
 #, c-format
 msgid "top '%s' in chain for '%s' has no backing file"
 msgstr "链中 '%s' 的顶端 '%s' 没有备份文件"
 
-#: src/qemu/qemu_driver.c:14725
+#: src/qemu/qemu_driver.c:15350
 #, c-format
 msgid "could not find base '%s' below '%s' in chain for '%s'"
 msgstr "无法在链中为 '%s' 找到低于 '%s' 的基本 '%s'"
 
-#: src/qemu/qemu_driver.c:14736
+#: src/qemu/qemu_driver.c:15361
 #, c-format
 msgid "base '%s' is not immediately below '%s' in chain for '%s'"
 msgstr "基本 '%s' 在链中不是 '%s' 的紧接 '%s'"
 
-#: src/qemu/qemu_driver.c:14814
+#: src/qemu/qemu_driver.c:11078
 #, c-format
 msgid "No graphics backend with index %d"
 msgstr "没有使用索引 %d 的图形后端"
 
-#: src/qemu/qemu_driver.c:14826
+#: src/qemu/qemu_driver.c:11090
 #, c-format
 msgid "Can only open VNC or SPICE graphics backends, not %s"
 msgstr "只能打开 VNC 或者 SPICE 图形后端，无法打开 %s。"
 
-#: src/qemu/qemu_driver.c:14919
+#: src/qemu/qemu_driver.c:15544
 #, c-format
 msgid "block I/O throttle limit value must be less than %llu"
 msgstr "块 I/O 节流器阈值必须小于 %llu"
 
-#: src/qemu/qemu_driver.c:14953
+#: src/qemu/qemu_driver.c:11220
 msgid "total and read/write of bytes_sec cannot be set at the same time"
 msgstr "无法在同时设置总计以及读取/写入 bytes_sec"
 
-#: src/qemu/qemu_driver.c:14960
+#: src/qemu/qemu_driver.c:11227
 msgid "total and read/write of iops_sec cannot be set at the same time"
 msgstr "无法同时设置总计以及读取/写入 iops_sec"
 
-#: src/qemu/qemu_driver.c:15011
+#: src/qemu/qemu_driver.c:11246
 msgid "Write to config file failed"
 msgstr "写入配置文件失败"
 
-#: src/qemu/qemu_driver.c:15322 src/qemu/qemu_driver.c:15336
-msgid "unable to get cpu account"
-msgstr "无法获取 cpu 计数"
-
-#: src/qemu/qemu_driver.c:15397 src/qemu/qemu_driver.c:15473
+#: src/qemu/qemu_driver.c:15972 src/qemu/qemu_driver.c:16047
+#: src/util/vircgroup.c:2884
 msgid "cpuacct parse error"
 msgstr "cpuacct 解析出错"
 
-#: src/qemu/qemu_driver.c:15450
+#: src/qemu/qemu_driver.c:16025 src/util/vircgroup.c:2862
 #, c-format
 msgid "start_cpu %d larger than maximum of %d"
 msgstr "start_cpu %d 大于最大值 %d"
 
-#: src/qemu/qemu_driver.c:15550
-msgid "cgroup CPUACCT controller is not mounted"
-msgstr "未挂载 cgroup CPUACCT 控制器"
-
-#: src/qemu/qemu_driver.c:15580
+#: src/qemu/qemu_driver.c:16155
 msgid "Duration not supported. Use 0 for now"
 msgstr "不支持时限。从现在开始使用 0。"
 
-#: src/qemu/qemu_driver.c:15588
+#: src/qemu/qemu_driver.c:16163
 #, c-format
 msgid "Unknown suspend target: %u"
 msgstr "未知挂起目标：%u"
 
-#: src/qemu/qemu_driver.c:15611
+#: src/qemu/qemu_driver.c:16186
 msgid "Unable to suspend domain due to missing system_wakeup monitor command"
 msgstr "由于缺少 system_wakeup 监控程序命令无法挂起域"
 
-#: src/qemu/qemu_driver.c:15621
+#: src/qemu/qemu_driver.c:16196
 msgid "S3 state is disabled for this domain"
 msgstr "这个域禁用 S3 状态"
 
-#: src/qemu/qemu_driver.c:15628
+#: src/qemu/qemu_driver.c:16203
 msgid "S4 state is disabled for this domain"
 msgstr "这个域禁用 S4 状态"
 
-#: src/qemu/qemu_driver.c:15699
+#: src/qemu/qemu_driver.c:16274
 msgid "Unable to wake up domain due to missing system_wakeup monitor command"
 msgstr "由于缺少 system_wakeup 监控程序命令无法唤醒域"
 
-#: src/qemu/qemu_driver.c:15819
+#: src/qemu/qemu_driver.c:16394
 msgid "Specifying mount point is not supported for now"
 msgstr ""
 
-#: src/qemu/qemu_hostdev.c:367
+#: src/qemu/qemu_hostdev.c:377
 #, c-format
 msgid ""
 "virtualport type %s is currently not supported on interfaces of type hostdev"
 msgstr "hostdev 类型中目前不支持虚拟端口类型 %s"
 
-#: src/qemu/qemu_hostdev.c:406 src/qemu/qemu_hostdev.c:481
+#: src/qemu/qemu_hostdev.c:416 src/qemu/qemu_hostdev.c:491
 msgid ""
 "Interface type hostdev is currently supported on SR-IOV Virtual Functions "
 "only"
 msgstr "只有 SR-IOV Virtual Functions 目前支持接口类型 hostdev"
 
-#: src/qemu/qemu_hostdev.c:420
+#: src/qemu/qemu_hostdev.c:430
 #, c-format
 msgid ""
 "direct setting of the vlan tag is not allowed for hostdev devices using %s "
 "mode"
 msgstr "不允许使用 %s 模式为 hostdev 设备直接设定 vlan 标签"
 
-#: src/qemu/qemu_hostdev.c:433
+#: src/qemu/qemu_hostdev.c:443
 msgid "vlan trunking is not supported by SR-IOV network devices"
 msgstr "SR-IOV 网络设备不支持 vlan 集群"
 
-#: src/qemu/qemu_hostdev.c:439
+#: src/qemu/qemu_hostdev.c:449
 #, c-format
 msgid "vlan can only be set for SR-IOV VFs, but %s is not a VF"
 msgstr "只能为 SR-IOV VF 设定 vlan,但 %s 不是 VF。"
 
-#: src/qemu/qemu_hostdev.c:604
+#: src/qemu/qemu_hostdev.c:614
 msgid "host doesn't support passthrough of host PCI devices"
 msgstr ""
 
-#: src/qemu/qemu_hostdev.c:614
+#: src/qemu/qemu_hostdev.c:624
 msgid "host doesn't support VFIO PCI passthrough"
 msgstr ""
 
-#: src/qemu/qemu_hostdev.c:622
+#: src/qemu/qemu_hostdev.c:632
 msgid "host doesn't support legacy PCI passthrough"
 msgstr ""
 
-#: src/qemu/qemu_hostdev.c:678
+#: src/qemu/qemu_hostdev.c:189
 #, c-format
 msgid "PCI device %s is not assignable"
 msgstr "PCI 设备 %s 不可分配"
 
-#: src/qemu/qemu_hostdev.c:690
+#: src/qemu/qemu_hostdev.c:201
 #, c-format
 msgid "PCI device %s is in use by domain %s"
 msgstr "域 %s 正在使用 PCI 设备 %s"
 
-#: src/qemu/qemu_hostdev.c:694
+#: src/qemu/qemu_hostdev.c:205
 #, c-format
 msgid "PCI device %s is already in use"
 msgstr "PCI 设备 %s 已在使用中"
 
-#: src/qemu/qemu_hostdev.c:1092
+#: src/qemu/qemu_hostdev.c:1102
 msgid "SCSI host device doesn't support managed mode"
 msgstr "SCSI 主机设备不支持管理的模式"
 
-#: src/qemu/qemu_hostdev.c:1123
-#, c-format
-msgid "SCSI device %s is in use by domain %s"
-msgstr "SCSI 设备 %s 正在由域 %s 使用"
-
-#: src/qemu/qemu_hostdev.c:1127
+#: src/qemu/qemu_hostdev.c:1136
 #, c-format
-msgid "SCSI device %s is already in use"
-msgstr "SCSI 设备 %s 正在使用中"
+msgid "SCSI device %s is already in use by other domain(s) as '%s'"
+msgstr ""
 
-#: src/qemu/qemu_hostdev.c:1217
+#: src/qemu/qemu_hostdev.c:381
 #, c-format
 msgid "Failed to re-attach PCI device: %s"
 msgstr "重新附加 PCI 设备失败：%s"
 
-#: src/qemu/qemu_hostdev.c:1242
+#: src/qemu/qemu_hostdev.c:1259
 #, c-format
 msgid "Failed to allocate PCI device list: %s"
 msgstr ""
 
-#: src/qemu/qemu_hostdev.c:1287
+#: src/qemu/qemu_hostdev.c:428
 #, c-format
 msgid "Failed to reset PCI device: %s"
 msgstr "重新附加 PCI 设备失败：%s"
@@ -15993,21 +16235,21 @@
 msgid "Unable to eject media"
 msgstr "无法弹出介质"
 
-#: src/qemu/qemu_hotplug.c:363
+#: src/qemu/qemu_hotplug.c:311
 #, c-format
 msgid "target %s:%d already exists"
 msgstr "目标 %s:%d 已存在"
 
-#: src/qemu/qemu_hotplug.c:394
+#: src/qemu/qemu_hotplug.c:328
 msgid "USB controller hotplug unsupported in this QEMU binary"
 msgstr "这个 QEMU 二进制中不支持 USB 控制器热插拔"
 
-#: src/qemu/qemu_hotplug.c:511
+#: src/qemu/qemu_hotplug.c:451
 #, c-format
 msgid "unexpected disk address type %s"
 msgstr "错误的磁盘地址类型 %s"
 
-#: src/qemu/qemu_hotplug.c:555
+#: src/qemu/qemu_hotplug.c:479
 #, c-format
 msgid "SCSI controller %d was missing its PCI address"
 msgstr "SCSI 控制器 %d 缺少其 PCI 地址"
@@ -16016,7 +16258,7 @@
 msgid "disk device='lun' is not supported for usb bus"
 msgstr "usb 总线不支持 disk device='lun'"
 
-#: src/qemu/qemu_hotplug.c:858
+#: src/qemu/qemu_hotplug.c:658
 msgid "installed qemu version does not support host_net_add"
 msgstr "安装的 qemu 版本不支持 host_net_add"
 
@@ -16024,332 +16266,334 @@
 msgid "virtio-s390 net device cannot be hotplugged."
 msgstr ""
 
-#: src/qemu/qemu_hotplug.c:934
+#: src/qemu/qemu_hotplug.c:711
 msgid "Unable to attach network devices without vlan"
 msgstr "没有 vlan 无法附加网络设备"
 
-#: src/qemu/qemu_hotplug.c:1033
+#: src/qemu/qemu_hotplug.c:797
 msgid "device alias not found: cannot set link state to down"
 msgstr "未找到设备别名：无法将链接状态设定为 down"
 
-#: src/qemu/qemu_hotplug.c:1045
+#: src/qemu/qemu_hotplug.c:809
 msgid "setting of link state not supported: Link is up"
 msgstr "不支持设定链接状态：链接为 up"
 
-#: src/qemu/qemu_hotplug.c:1221
+#: src/qemu/qemu_hotplug.c:923
 msgid "guest unexpectedly quit during hotplug"
 msgstr "热插拔过程中虚拟机意外退出"
 
-#: src/qemu/qemu_hotplug.c:1327
+#: src/qemu/qemu_hotplug.c:1330
 msgid "attaching serial console is not supported"
 msgstr ""
 
-#: src/qemu/qemu_hotplug.c:1333
+#: src/qemu/qemu_hotplug.c:1336
 msgid "chardev already exists"
 msgstr ""
 
-#: src/qemu/qemu_hotplug.c:1369
+#: src/qemu/qemu_hotplug.c:1372
 msgid "detaching serial console is not supported"
 msgstr ""
 
-#: src/qemu/qemu_hotplug.c:1559
+#: src/qemu/qemu_hotplug.c:1562
 #, c-format
 msgid "Unable to prepare scsi hostdev: %s:%d:%d:%d"
 msgstr "无法准备 scsi hostdev: %s:%d:%d:%d"
 
-#: src/qemu/qemu_hotplug.c:1633 src/qemu/qemu_hotplug.c:3329
+#: src/qemu/qemu_hotplug.c:1092 src/qemu/qemu_hotplug.c:2145
 #, c-format
 msgid "hostdev mode '%s' not supported"
 msgstr "不支持 hostdev 模式 '%s'"
 
-#: src/qemu/qemu_hotplug.c:1659 src/qemu/qemu_hotplug.c:3302
+#: src/qemu/qemu_hotplug.c:1133 src/qemu/qemu_hotplug.c:2159
 #, c-format
 msgid "hostdev subsys type '%s' not supported"
 msgstr "不支持 hostdev 子系统类型 '%s'"
 
-#: src/qemu/qemu_hotplug.c:1693
+#: src/qemu/qemu_hotplug.c:1696
 msgid "interface is missing bridge name"
 msgstr "接口缺少桥接名称"
 
-#: src/qemu/qemu_hotplug.c:1706
+#: src/qemu/qemu_hotplug.c:1709
 #, c-format
 msgid "Couldn't find network '%s'"
 msgstr "无法找到网络 '%s'"
 
-#: src/qemu/qemu_hotplug.c:1728
+#: src/qemu/qemu_hotplug.c:1731
 #, c-format
 msgid "Interface type %d has no bridge name"
 msgstr ""
 
-#: src/qemu/qemu_hotplug.c:1756
+#: src/qemu/qemu_hotplug.c:1759
 #, c-format
 msgid "bridge %s doesn't exist"
 msgstr "桥接 %s 不存在"
 
-#: src/qemu/qemu_hotplug.c:1780
+#: src/qemu/qemu_hotplug.c:1783
 #, c-format
 msgid "unable to recover former state by adding port to bridge %s"
 msgstr "无法通过为桥接 %s 添加端口恢复之前的状态"
 
-#: src/qemu/qemu_hotplug.c:1807
+#: src/qemu/qemu_hotplug.c:1810
 #, c-format
 msgid "filters not supported on interfaces of type %s"
 msgstr ""
 
-#: src/qemu/qemu_hotplug.c:1818
+#: src/qemu/qemu_hotplug.c:1821
 #, c-format
 msgid ""
 "failed to add new filter rules to '%s' - attempting to restore old rules"
 msgstr ""
 
-#: src/qemu/qemu_hotplug.c:1842
+#: src/qemu/qemu_hotplug.c:1173
 msgid "can't change link state: device alias not found"
 msgstr "无法更改链接状态：未找到设备别名"
 
-#: src/qemu/qemu_hotplug.c:1881
+#: src/qemu/qemu_hotplug.c:1203
 msgid "cannot find existing network device to modify"
 msgstr "无法找到要修改的现有网络设备"
 
-#: src/qemu/qemu_hotplug.c:1889
+#: src/qemu/qemu_hotplug.c:1892
 #, c-format
 msgid "cannot change config of '%s' network type"
 msgstr "无法更改 '%s' 网络类型配置"
 
-#: src/qemu/qemu_hotplug.c:1912
+#: src/qemu/qemu_hotplug.c:1915
 #, c-format
 msgid "cannot change network interface mac address from %s to %s"
 msgstr "无法将网络接口 mac 地址从 %s 改为 %s"
 
-#: src/qemu/qemu_hotplug.c:1921
+#: src/qemu/qemu_hotplug.c:1924
 #, c-format
 msgid "cannot modify network device model from %s to %s"
 msgstr "无法将网络设备型号从 %s 改为 %s"
 
-#: src/qemu/qemu_hotplug.c:1934
+#: src/qemu/qemu_hotplug.c:1937
 msgid "cannot modify virtio network device driver attributes"
 msgstr "无法修改 virtio 网络设备驱动程序属性"
 
-#: src/qemu/qemu_hotplug.c:1948
+#: src/qemu/qemu_hotplug.c:1951
 msgid "cannot modify network device script attribute"
 msgstr "无法修改网络设备 script 属性"
 
-#: src/qemu/qemu_hotplug.c:1957
+#: src/qemu/qemu_hotplug.c:1960
 msgid "cannot modify network device tap name"
 msgstr "无法修改网络设备 tap 名称"
 
-#: src/qemu/qemu_hotplug.c:1975
+#: src/qemu/qemu_hotplug.c:1978
 msgid "cannot modify network device guest PCI address"
 msgstr "无法修改网络设备虚拟机 PCI 地址"
 
-#: src/qemu/qemu_hotplug.c:1984
+#: src/qemu/qemu_hotplug.c:1987
 msgid "cannot modify network device alias"
 msgstr "无法修改网络设备别名"
 
-#: src/qemu/qemu_hotplug.c:1989
+#: src/qemu/qemu_hotplug.c:1992
 msgid "cannot modify network device rom bar setting"
 msgstr "无法修改网络设备 rom 条设置"
 
-#: src/qemu/qemu_hotplug.c:1994
+#: src/qemu/qemu_hotplug.c:1997
 msgid "cannot modify network rom file"
 msgstr "无法修改网络 rom 文件"
 
-#: src/qemu/qemu_hotplug.c:1999
+#: src/qemu/qemu_hotplug.c:2002
 msgid "cannot modify network device boot index setting"
 msgstr "无法修改网络设备引导索引设置"
 
-#: src/qemu/qemu_hotplug.c:2026
+#: src/qemu/qemu_hotplug.c:2029
 #, c-format
 msgid "cannot change network interface type to '%s'"
 msgstr "无法将网络接口类型改为 '%s'"
 
-#: src/qemu/qemu_hotplug.c:2084 src/qemu/qemu_hotplug.c:2157
+#: src/qemu/qemu_hotplug.c:1269
 #, c-format
 msgid "unable to change config on '%s' network type"
 msgstr "无法在  '%s' 网络类型中更改配置"
 
-#: src/qemu/qemu_hotplug.c:2269
+#: src/qemu/qemu_hotplug.c:1327
 msgid "cannot find existing graphics device to modify"
 msgstr "无法找到现有图形设备进行修改"
 
-#: src/qemu/qemu_hotplug.c:2275
+#: src/qemu/qemu_hotplug.c:2278
 msgid "cannot change the number of listen addresses"
 msgstr "无法更改侦听地址数"
 
-#: src/qemu/qemu_hotplug.c:2285
+#: src/qemu/qemu_hotplug.c:2288
 msgid "cannot change the type of listen address"
 msgstr "无法更改侦听地址类型"
 
-#: src/qemu/qemu_hotplug.c:2294
+#: src/qemu/qemu_hotplug.c:1347
 msgid "cannot change listen address setting on vnc graphics"
 msgstr "无法在 vnc 图形中更改侦听地址设置"
 
-#: src/qemu/qemu_hotplug.c:2295
+#: src/qemu/qemu_hotplug.c:1400
 msgid "cannot change listen address setting on spice graphics"
 msgstr "无法在 spice 图形中更改侦听地址设置"
 
-#: src/qemu/qemu_hotplug.c:2304
+#: src/qemu/qemu_hotplug.c:1352
 msgid "cannot change listen network setting on vnc graphics"
 msgstr "无法在 vnc 图形中更改侦听网络设置"
 
-#: src/qemu/qemu_hotplug.c:2305
+#: src/qemu/qemu_hotplug.c:1405
 msgid "cannot change listen network setting on spice graphics"
 msgstr "无法更改 spice 图形中的侦听网络设置"
 
-#: src/qemu/qemu_hotplug.c:2323
+#: src/qemu/qemu_hotplug.c:1342
 msgid "cannot change port settings on vnc graphics"
 msgstr "无法在 vnc 图形中更改端口设置"
 
-#: src/qemu/qemu_hotplug.c:2328
+#: src/qemu/qemu_hotplug.c:1357
 msgid "cannot change keymap setting on vnc graphics"
 msgstr "无法在 vnc 图形中更改 keymap 设置"
 
-#: src/qemu/qemu_hotplug.c:2368
+#: src/qemu/qemu_hotplug.c:1395
 msgid "cannot change port settings on spice graphics"
 msgstr "无法在 spice 图形中更改端口设置"
 
-#: src/qemu/qemu_hotplug.c:2374
+#: src/qemu/qemu_hotplug.c:1411
 msgid "cannot change keymap setting on spice graphics"
 msgstr "无法在 spice 图形中更改 keymap 设置"
 
-#: src/qemu/qemu_hotplug.c:2415
+#: src/qemu/qemu_hotplug.c:1444
 #, c-format
 msgid "unable to change config on '%s' graphics type"
 msgstr "无法在  '%s' 图形类型中更改配置"
 
-#: src/qemu/qemu_hotplug.c:2706
+#: src/qemu/qemu_hotplug.c:2709
 #, c-format
 msgid "failed to remove ebtables rule on '%s'"
 msgstr "删除 '%s' 中的 ebtables 规则失败"
 
-#: src/qemu/qemu_hotplug.c:2781
+#: src/qemu/qemu_hotplug.c:2784
 #, c-format
 msgid "don't know how to remove a %s device"
 msgstr ""
 
-#: src/qemu/qemu_hotplug.c:2833
+#: src/qemu/qemu_hotplug.c:2836
 msgid "Unable to wait on unplug condition"
 msgstr ""
 
-#: src/qemu/qemu_hotplug.c:2866 src/qemu/qemu_hotplug.c:3122
+#: src/qemu/qemu_hotplug.c:1513 src/qemu/qemu_hotplug.c:1760
+#: src/qemu/qemu_hotplug.c:1995
 #, c-format
 msgid "cannot hot unplug multifunction PCI device: %s"
 msgstr "不能热插拔多功能 PCI 设备：%s"
 
-#: src/qemu/qemu_hotplug.c:2876
+#: src/qemu/qemu_hotplug.c:2879
 msgid "device cannot be detached without a valid CCW address"
 msgstr ""
 
-#: src/qemu/qemu_hotplug.c:2883
+#: src/qemu/qemu_hotplug.c:2886
 msgid "device cannot be detached without a valid PCI address"
 msgstr ""
 
-#: src/qemu/qemu_hotplug.c:2938
+#: src/qemu/qemu_hotplug.c:1614
 #, c-format
 msgid "Underlying qemu does not support %s disk removal"
 msgstr "基础 qemu 不支持 %s 磁盘删除"
 
-#: src/qemu/qemu_hotplug.c:2945
+#: src/qemu/qemu_hotplug.c:2948
 #, c-format
 msgid "disk '%s' is in an active block copy job"
 msgstr "磁盘 '%s' 是一个活跃块复制任务"
 
-#: src/qemu/qemu_hotplug.c:3020 src/uml/uml_driver.c:2331
+#: src/qemu/qemu_driver.c:5210 src/uml/uml_driver.c:2177
 msgid "This type of disk cannot be hot unplugged"
 msgstr "无法热插拔此类磁盘"
 
-#: src/qemu/qemu_hotplug.c:3024
+#: src/qemu/qemu_driver.c:5214
 #, c-format
 msgid "disk device type '%s' cannot be detached"
 msgstr "无法分离磁盘设备类型 '%s'"
 
-#: src/qemu/qemu_hotplug.c:3095
+#: src/qemu/qemu_hotplug.c:3098
 #, c-format
 msgid "controller %s:%d not found"
 msgstr "未找到控制器 %s:%d"
 
-#: src/qemu/qemu_hotplug.c:3107
+#: src/qemu/qemu_hotplug.c:3110
 #, c-format
 msgid "device with '%s' address cannot be detached"
 msgstr ""
 
-#: src/qemu/qemu_hotplug.c:3114
+#: src/qemu/qemu_hotplug.c:3117
 #, c-format
 msgid "device with invalid '%s' address cannot be detached"
 msgstr ""
 
-#: src/qemu/qemu_hotplug.c:3129
+#: src/qemu/qemu_hotplug.c:1767
 msgid "device cannot be detached: device is busy"
 msgstr "不分离设备：设备忙"
 
-#: src/qemu/qemu_hotplug.c:3176
+#: src/qemu/qemu_hotplug.c:3179
 #, c-format
 msgid "cannot hot unplug multifunction PCI device: %.4x:%.2x:%.2x.%.1x"
 msgstr "无法热插拔多功能 PCI 设备：%.4x:%.2x:%.2x.%.1x"
 
-#: src/qemu/qemu_hotplug.c:3185 src/qemu/qemu_hotplug.c:3423
+#: src/qemu/qemu_hotplug.c:1530 src/qemu/qemu_hotplug.c:1754
+#: src/qemu/qemu_hotplug.c:1849 src/qemu/qemu_hotplug.c:2003
 msgid "device cannot be detached without a PCI address"
 msgstr "没有 PCI 地址无法分割设备"
 
-#: src/qemu/qemu_hotplug.c:3212 src/qemu/qemu_hotplug.c:3243
+#: src/qemu/qemu_hotplug.c:2101
 msgid "device cannot be detached without a device alias"
 msgstr "没有设备别名无法分割设备"
 
-#: src/qemu/qemu_hotplug.c:3218 src/qemu/qemu_hotplug.c:3249
+#: src/qemu/qemu_hotplug.c:2107
 msgid "device cannot be detached with this QEMU version"
 msgstr "在这个 QEMU 版本中无法分割设备"
 
-#: src/qemu/qemu_hotplug.c:3340
+#: src/qemu/qemu_hotplug.c:1985
 #, c-format
 msgid "host pci device %.4x:%.2x:%.2x.%.1x not found"
 msgstr "未找到主机 pci 设备 %.4x:%.2x:%.2x.%.1x"
 
-#: src/qemu/qemu_hotplug.c:3347
+#: src/qemu/qemu_hotplug.c:2093
 #, c-format
 msgid "host usb device %03d.%03d not found"
 msgstr "未找到主机 usb 设备%03d.%03d"
 
-#: src/qemu/qemu_hotplug.c:3351
+#: src/qemu/qemu_hotplug.c:3354
 #, c-format
 msgid "host usb device vendor=0x%.4x product=0x%.4x not found"
 msgstr "未找到 host usb device vendor=0x%.4x product=0x%.4x"
 
-#: src/qemu/qemu_hotplug.c:3357
+#: src/qemu/qemu_hotplug.c:3360
 #, c-format
 msgid "host scsi device %s:%d:%d.%d not found"
 msgstr "未找到主机 scsi 设备 %s:%d:%d.%d"
 
-#: src/qemu/qemu_hotplug.c:3416
+#: src/qemu/qemu_hotplug.c:3419
 msgid "device cannot be detached without a CCW address"
 msgstr ""
 
-#: src/qemu/qemu_hotplug.c:3429
+#: src/qemu/qemu_hotplug.c:1855
 #, c-format
 msgid "cannot hot unplug multifunction PCI device :%s"
 msgstr "不能热插拔多功能 PCI 设备：%s"
 
-#: src/qemu/qemu_hotplug.c:3437
+#: src/qemu/qemu_hotplug.c:1862
 msgid "unable to determine original VLAN"
 msgstr "无法确定原始 VLAN"
 
-#: src/qemu/qemu_hotplug.c:3520
+#: src/qemu/qemu_hotplug.c:2199
 msgid "Graphics password only supported for VNC"
 msgstr "图形密码只可用于 VNC"
 
-#: src/qemu/qemu_hotplug.c:3546
+#: src/qemu/qemu_hotplug.c:2225
 msgid "Expiry of passwords is not supported"
 msgstr "不支持密码过期"
 
-#: src/qemu/qemu_migration.c:235
+#: src/qemu/qemu_migration.c:164
 #, c-format
 msgid "unable to read server cert %s"
 msgstr "无法读取服务器证书 %s"
 
-#: src/qemu/qemu_migration.c:242
+#: src/qemu/qemu_migration.c:171
 #, c-format
 msgid "cannot initialize cert object: %s"
 msgstr "无法初始化证书对象：%s"
 
-#: src/qemu/qemu_migration.c:253
+#: src/qemu/qemu_migration.c:182
 #, c-format
 msgid "cannot load cert data from %s: %s"
 msgstr "无法从 %s 载入证书数据：%s"
@@ -16359,19 +16603,19 @@
 msgid "Unable to run command to get OVS port data for interface %s"
 msgstr "无法运行命令以获取接口 %s 的 OVS 端口数据"
 
-#: src/qemu/qemu_migration.c:402
+#: src/qemu/qemu_migration.c:277
 msgid "Unable to obtain host UUID"
 msgstr "无法获取主机 UUID"
 
-#: src/qemu/qemu_migration.c:423
+#: src/qemu/qemu_migration.c:298
 msgid "Migration graphics data already present"
 msgstr "已显示迁移图形数据"
 
-#: src/qemu/qemu_migration.c:450
+#: src/qemu/qemu_migration.c:324
 msgid "Migration lockstate data already present"
 msgstr "已显示迁移锁状态数据"
 
-#: src/qemu/qemu_migration.c:480
+#: src/qemu/qemu_migration.c:355
 msgid "Migration persistent data already present"
 msgstr "已显示迁移持久数据"
 
@@ -16379,24 +16623,24 @@
 msgid "Network migration data already present"
 msgstr "已显示网络迁移数据"
 
-#: src/qemu/qemu_migration.c:680
+#: src/qemu/qemu_migration.c:470
 msgid "missing type attribute in migration data"
 msgstr "迁移数据中缺少 type 属性"
 
-#: src/qemu/qemu_migration.c:685 src/qemu/qemu_migration.c:1808
+#: src/qemu/qemu_migration.c:475
 #, c-format
 msgid "unknown graphics type %s"
 msgstr "未知图形类型 %s"
 
-#: src/qemu/qemu_migration.c:692
+#: src/qemu/qemu_migration.c:482
 msgid "missing port attribute in migration data"
 msgstr "迁移数据中缺少 port 属性"
 
-#: src/qemu/qemu_migration.c:698
+#: src/qemu/qemu_migration.c:488
 msgid "missing tlsPort attribute in migration data"
 msgstr "迁移数据中缺少 tlsport 属性"
 
-#: src/qemu/qemu_migration.c:704
+#: src/qemu/qemu_migration.c:494
 msgid "missing listen attribute in migration data"
 msgstr "迁移数据中缺少 listen 属性"
 
@@ -16408,60 +16652,60 @@
 msgid "missing vporttype attribute in migration data"
 msgstr "迁移数据中缺少 vporttype 属性"
 
-#: src/qemu/qemu_migration.c:793
+#: src/qemu/qemu_migration.c:531
 msgid "missing name element in migration data"
 msgstr "迁移数据中缺少 name 元素"
 
-#: src/qemu/qemu_migration.c:798
+#: src/qemu/qemu_migration.c:536
 #, c-format
 msgid "Incoming cookie data had unexpected name %s vs %s"
 msgstr "进入的 cookie 数据中有意外名称 %s vs %s"
 
-#: src/qemu/qemu_migration.c:808
+#: src/qemu/qemu_migration.c:546
 msgid "missing uuid element in migration data"
 msgstr "迁移数据中缺少 uuid 元素"
 
-#: src/qemu/qemu_migration.c:814
+#: src/qemu/qemu_migration.c:552
 #, c-format
 msgid "Incoming cookie data had unexpected UUID %s vs %s"
 msgstr "进入的 cookie 数据中有意外 UUID %s vs %s"
 
-#: src/qemu/qemu_migration.c:822
+#: src/qemu/qemu_migration.c:560
 msgid "missing hostname element in migration data"
 msgstr "迁移数据中缺少 hostname 元素"
 
-#: src/qemu/qemu_migration.c:827 src/qemu/qemu_migration.c:844
+#: src/qemu/qemu_migration.c:565 src/qemu/qemu_migration.c:582
 #, c-format
 msgid "Attempt to migrate guest to the same host %s"
 msgstr "尝试将虚拟机迁移到同一主机 %s"
 
-#: src/qemu/qemu_migration.c:834
+#: src/qemu/qemu_migration.c:572
 msgid "missing hostuuid element in migration data"
 msgstr "迁移数据中缺少 hostuuid 元素"
 
-#: src/qemu/qemu_migration.c:839
+#: src/qemu/qemu_migration.c:577
 msgid "malformed hostuuid element in migration data"
 msgstr "迁移数据中受损的 hostuuid 元素"
 
-#: src/qemu/qemu_migration.c:860
+#: src/qemu/qemu_migration.c:598
 msgid "missing feature name"
 msgstr "缺少功能名称"
 
-#: src/qemu/qemu_migration.c:866
+#: src/qemu/qemu_migration.c:604
 #, c-format
 msgid "Unknown migration cookie feature %s"
 msgstr "未知迁移 cookie 功能 %s"
 
-#: src/qemu/qemu_migration.c:874
+#: src/qemu/qemu_migration.c:612
 #, c-format
 msgid "Unsupported migration cookie feature %s"
 msgstr "不支持的迁移 cookie 功能 %s"
 
-#: src/qemu/qemu_migration.c:892
+#: src/qemu/qemu_migration.c:630
 msgid "Missing lock driver name in migration cookie"
 msgstr "迁移 cookie 中缺少锁驱动器名称"
 
-#: src/qemu/qemu_migration.c:904
+#: src/qemu/qemu_migration.c:642
 #, c-format
 msgid "Too many domain elements in migration cookie: %d"
 msgstr "迁移 cookie 中有太多域元素：%d"
@@ -16471,262 +16715,262 @@
 msgid "Malformed nbd port '%s'"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:966
+#: src/qemu/qemu_migration.c:678
 msgid "(qemu_migration_cookie)"
 msgstr "(qemu_migration_cookie)"
 
-#: src/qemu/qemu_migration.c:1037
+#: src/qemu/qemu_migration.c:740
 msgid "Migration cookie was not NULL terminated"
 msgstr "迁移 cookie 不是 NULL 终止"
 
-#: src/qemu/qemu_migration.c:1057
+#: src/qemu/qemu_migration.c:760
 #, c-format
 msgid "Missing %s lock state for migration cookie"
 msgstr "迁移 cookie 缺少 %s 锁状态"
 
-#: src/qemu/qemu_migration.c:1064
+#: src/qemu/qemu_migration.c:767
 #, c-format
 msgid "Source host lock driver %s different from target %s"
 msgstr "源主机锁驱动器 %s 与目标 %s 不同"
 
-#: src/qemu/qemu_migration.c:1251 src/qemu/qemu_migration.c:1685
-#: src/qemu/qemu_migration.c:3189
+#: src/qemu/qemu_migration.c:2368 src/qemu/qemu_migration.c:2441
+#, c-format
+msgid "Failed to resume guest %s after failure"
+msgstr "失败后恢复虚拟机 %s 失败"
+
+#: src/qemu/qemu_migration.c:909
 msgid "canceled by client"
 msgstr "由客户端取消"
 
-#: src/qemu/qemu_migration.c:1416
+#: src/qemu/qemu_migration.c:804
 #, c-format
 msgid "cannot migrate domain with %d snapshots"
 msgstr "无法使用 %d 快照迁移域"
 
-#: src/qemu/qemu_migration.c:1426
+#: src/qemu/qemu_migration.c:1473
 msgid "cannot migrate domain with I/O error"
 msgstr "无法迁移有 I/O 错误的域"
 
-#: src/qemu/qemu_migration.c:1434
+#: src/qemu/qemu_migration.c:1481
 msgid "domain has an active block job"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:1455
+#: src/qemu/qemu_migration.c:1502
 msgid "domain has assigned non-USB host devices"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:1493
+#: src/qemu/qemu_migration.c:1540
 msgid "Migration may lead to data corruption if disks use cache != none"
 msgstr "如果磁盘使用 cache != none 则迁移会导致数据崩溃"
 
-#: src/qemu/qemu_migration.c:1547
+#: src/qemu/qemu_migration.c:1594
 msgid "Compressed migration is not supported by target QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:1551
+#: src/qemu/qemu_migration.c:1598
 msgid "Compressed migration is not supported by source QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:1644
+#: src/qemu/qemu_migration.c:880
 msgid "is not active"
 msgstr "不活跃"
 
-#: src/qemu/qemu_migration.c:1679
+#: src/qemu/qemu_migration.c:903
 msgid "unexpectedly failed"
 msgstr "意外失败"
 
-#: src/qemu/qemu_migration.c:1704 src/qemu/qemu_migration.c:3257
+#: src/qemu/qemu_migration.c:927 src/qemu/qemu_migration.c:1634
 msgid "migration job"
 msgstr "迁移任务"
 
-#: src/qemu/qemu_migration.c:1707
+#: src/qemu/qemu_migration.c:930
 msgid "domain save job"
 msgstr "域保存任务"
 
-#: src/qemu/qemu_migration.c:1710
+#: src/qemu/qemu_migration.c:933
 msgid "domain core dump job"
 msgstr "域核转储任务"
 
-#: src/qemu/qemu_migration.c:1713
+#: src/qemu/qemu_migration.c:936
 msgid "job"
 msgstr "任务"
 
-#: src/qemu/qemu_migration.c:1733
+#: src/qemu/qemu_migration.c:950
 msgid "Lost connection to destination host"
 msgstr "丢失到目的主机的连接"
 
-#: src/qemu/qemu_migration.c:1761
+#: src/qemu/qemu_migration.c:1808
 msgid "failed due to I/O error"
 msgstr "因为 I/O 错误失败"
 
-#: src/qemu/qemu_migration.c:1823
+#: src/qemu/qemu_migration.c:1870
 #, c-format
 msgid "invalid tlsPort number: %s"
 msgstr "无效 tlsPort 数：%s"
 
-#: src/qemu/qemu_migration.c:1875 src/util/virnetdevopenvswitch.c:253
+#: src/qemu/qemu_migration.c:1922 src/util/virnetdevopenvswitch.c:253
 #, c-format
 msgid "Unable to run command to set OVS port data for interface %s"
 msgstr "无法运行命令为接口 %s 设定 OVS 端口数据"
 
-#: src/qemu/qemu_migration.c:2016 src/qemu/qemu_migration.c:2192
+#: src/qemu/qemu_migration.c:2063 src/qemu/qemu_migration.c:2242
 msgid "offline migration cannot handle non-shared storage"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:2022 src/qemu/qemu_migration.c:2198
+#: src/qemu/qemu_migration.c:2069 src/qemu/qemu_migration.c:2248
 msgid "offline migration must be specified with the persistent flag set"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:2028 src/qemu/qemu_migration.c:2204
+#: src/qemu/qemu_migration.c:2075 src/qemu/qemu_migration.c:2254
 msgid "tunnelled offline migration does not make sense"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:2107 src/qemu/qemu_migration.c:2437
+#: src/qemu/qemu_driver.c:8483 src/qemu/qemu_migration.c:1207
 msgid "domain disappeared"
 msgstr "域已消失"
 
-#: src/qemu/qemu_migration.c:2295
+#: src/qemu/qemu_migration.c:2349
 msgid "qemu isn't capable of IPv6"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:2300
+#: src/qemu/qemu_migration.c:2354
 msgid "host isn't capable of IPv6"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:2357 src/qemu/qemu_migration.c:3451
+#: src/qemu/qemu_migration.c:1149 src/qemu/qemu_migration.c:1829
 msgid "cannot create pipe for tunnelled migration"
 msgstr "无法为管道迁移生成通道"
 
-#: src/qemu/qemu_migration.c:2375
+#: src/qemu/qemu_migration.c:1169
 msgid "cannot pass pipe for tunnelled migration"
 msgstr "无法为管道迁移传递通道"
 
-#: src/qemu/qemu_migration.c:2504
+#: src/qemu/qemu_driver.c:8246 src/qemu/qemu_driver.c:8586
 msgid "tunnelled migration requested but NULL stream passed"
 msgstr "请求管道迁移但通过的流为空"
 
-#: src/qemu/qemu_migration.c:2566
+#: src/qemu/qemu_migration.c:1315
 msgid ""
 "hostname on destination resolved to localhost, but migration requires an FQDN"
 msgstr "本地主机在目的地解析了主机名，但迁移需要一个 FQDN。"
 
-#: src/qemu/qemu_migration.c:2586
+#: src/qemu/qemu_migration.c:1337
 msgid "only tcp URIs are supported for KVM/QEMU migrations"
 msgstr "KVM/QEMU 迁移只支持 tcp URI"
 
-#: src/qemu/qemu_migration.c:2602
+#: src/qemu/qemu_migration.c:2661
 #, c-format
 msgid "unable to parse URI: %s"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:2608
+#: src/qemu/qemu_migration.c:2667
 #, c-format
 msgid "missing host in migration URI: %s"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:2665
+#: src/qemu/qemu_driver.c:8236 src/qemu/qemu_driver.c:8308
+#: src/qemu/qemu_driver.c:8541 src/qemu/qemu_driver.c:8576
 msgid "no domain XML passed"
 msgstr "没有给出域 XML"
 
-#: src/qemu/qemu_migration.c:2910
+#: src/qemu/qemu_migration.c:2959
 msgid "poll failed in migration tunnel"
 msgstr "迁移通道中失败的提取"
 
-#: src/qemu/qemu_migration.c:2928
+#: src/qemu/qemu_migration.c:2977
 msgid "failed to read from wakeup fd"
 msgstr "从唤醒 fd 中读取失败"
 
-#: src/qemu/qemu_migration.c:2950
+#: src/qemu/qemu_migration.c:1449
 msgid "tunnelled migration failed to read from qemu"
 msgstr "管道迁移失败，无法读取 qemu。"
 
-#: src/qemu/qemu_migration.c:2994
+#: src/qemu/qemu_migration.c:3043
 msgid "Unable to make pipe"
 msgstr "无法生成管道"
 
-#: src/qemu/qemu_migration.c:3010
+#: src/qemu/qemu_migration.c:1495
 msgid "Unable to create migration thread"
 msgstr "无法生成迁移线程"
 
-#: src/qemu/qemu_migration.c:3032
+#: src/qemu/qemu_migration.c:3081
 msgid "failed to wakeup migration tunnel"
 msgstr "唤醒迁移通道失败"
 
-#: src/qemu/qemu_migration.c:3086
+#: src/qemu/qemu_migration.c:3135
 #, c-format
 msgid "Unable to set FD %d blocking"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:3145
+#: src/qemu/qemu_migration.c:1553
 #, c-format
 msgid "Migration with lock driver %s requires cookie support"
 msgstr "使用锁驱动器 %s 迁移需要 cookie 支持"
 
-#: src/qemu/qemu_migration.c:3265
+#: src/qemu/qemu_migration.c:1642
 msgid "failed to accept connection from qemu"
 msgstr "从 qemu 接受连接失败"
 
-#: src/qemu/qemu_migration.c:3428
+#: src/qemu/qemu_migration.c:1807
 msgid "Source qemu is too old to support tunnelled migration"
 msgstr "源 qemu 太旧，不支持管道迁移。"
 
-#: src/qemu/qemu_migration.c:3950
+#: src/qemu/qemu_migration.c:4007
 #, c-format
 msgid "Failed to connect to remote libvirt URI %s: %s"
 msgstr "连接到远程 libvirt URI %s 失败：%s"
 
-#: src/qemu/qemu_migration.c:3978
+#: src/qemu/qemu_migration.c:2254
 msgid "Destination libvirt does not support peer-to-peer migration protocol"
 msgstr "目的地 libvirt 不支持点对点迁移协议"
 
-#: src/qemu/qemu_migration.c:4122 src/qemu/qemu_migration.c:4204
-#, c-format
-msgid "Failed to resume guest %s after failure"
-msgstr "失败后恢复虚拟机 %s 失败"
-
-#: src/qemu/qemu_migration.c:4272
+#: src/qemu/qemu_migration.c:2502
 msgid "received unexpected cookie with P2P migration"
 msgstr "收到 P2P 迁移中的意外 cookie"
 
-#: src/qemu/qemu_migration.c:4284
+#: src/qemu/qemu_migration.c:2513
 msgid "Unexpected dconnuri parameter with non-peer2peer migration"
 msgstr "P2P 迁移中的意外 dconnuri 参数"
 
-#: src/qemu/qemu_migration.c:4322
+#: src/qemu/qemu_migration.c:4350
 #, c-format
 msgid "Port profile Associate failed for %s"
 msgstr "%s 的端口侧写关联失败"
 
-#: src/qemu/qemu_migration.c:4468
+#: src/qemu/qemu_migration.c:2650
 msgid "can't get vmdef"
 msgstr "无法获取 vmdef"
 
-#: src/qemu/qemu_migration.c:4673
+#: src/qemu/qemu_migration.c:2914
 msgid "Unable to set cloexec flag"
 msgstr "无法设定 cloexec 标签"
 
-#: src/qemu/qemu_migration.c:4768
+#: src/qemu/qemu_migration.c:3001
 #, c-format
 msgid "migration protocol going backwards %s => %s"
 msgstr "迁移协议反向进行 %s => %s"
 
-#: src/qemu/qemu_migration.c:4803
+#: src/qemu/qemu_migration.c:3035
 #, c-format
 msgid "domain '%s' is not processing incoming migration"
 msgstr "要进行的迁移没有处理域 '%s'"
 
-#: src/qemu/qemu_migration.c:4805
+#: src/qemu/qemu_migration.c:3037
 #, c-format
 msgid "domain '%s' is not being migrated"
 msgstr "未迁移域 '%s'"
 
-#: src/qemu/qemu_monitor.c:288
+#: src/qemu/qemu_monitor.c:234
 #, c-format
 msgid "Monitor path %s too big for destination"
 msgstr "对于目的地址来说监控程序路径 %s 太大"
 
-#: src/qemu/qemu_monitor.c:387
+#: src/qemu/qemu_monitor.c:304
 #, c-format
 msgid "Process %d %p %p [[[[%s]]][[[%s]]]"
 msgstr "进程 %d %p %p [[[[%s]]][[[%s]]]"
 
-#: src/qemu/qemu_monitor.c:485
+#: src/qemu/qemu_monitor.c:399
 msgid "Monitor does not support sending of file descriptors"
 msgstr "监控程序不支持发送文件描述符"
 
@@ -16745,7 +16989,7 @@
 msgid "Qemu monitor was closed"
 msgstr "已关闭 Qemu 监控程序"
 
-#: src/qemu/qemu_monitor.c:964
+#: src/qemu/qemu_monitor.c:793
 msgid "Unable to wait on monitor condition"
 msgstr "无法在监控程序环境中等待"
 
@@ -16757,187 +17001,172 @@
 msgid "Memory balloon model must be virtio to get memballoon path"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:1076
+#: src/qemu/qemu_monitor.c:1083
 msgid ""
 "Property 'guest-stats-polling-interval' not found on memory balloon driver."
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:1119
+#: src/qemu/qemu_monitor.c:1126
 msgid "Unable to unescape command"
 msgstr "无法取消退出命令"
 
-#: src/qemu/qemu_monitor.c:1363 src/qemu/qemu_monitor.c:1389
-#: src/qemu/qemu_monitor.c:1409 src/qemu/qemu_monitor.c:1450
-#: src/qemu/qemu_monitor.c:1469 src/qemu/qemu_monitor.c:1489
-#: src/qemu/qemu_monitor.c:1528 src/qemu/qemu_monitor.c:1548
-#: src/qemu/qemu_monitor.c:1569 src/qemu/qemu_monitor.c:1592
-#: src/qemu/qemu_monitor.c:1646 src/qemu/qemu_monitor.c:1700
-#: src/qemu/qemu_monitor.c:1736 src/qemu/qemu_monitor.c:1787
-#: src/qemu/qemu_monitor.c:1833 src/qemu/qemu_monitor.c:1865
-#: src/qemu/qemu_monitor.c:1887 src/qemu/qemu_monitor.c:1906
-#: src/qemu/qemu_monitor.c:1927 src/qemu/qemu_monitor.c:1950
-#: src/qemu/qemu_monitor.c:1973 src/qemu/qemu_monitor.c:1995
-#: src/qemu/qemu_monitor.c:2015 src/qemu/qemu_monitor.c:2035
-#: src/qemu/qemu_monitor.c:2055 src/qemu/qemu_monitor.c:2076
-#: src/qemu/qemu_monitor.c:2098 src/qemu/qemu_monitor.c:2118
-#: src/qemu/qemu_monitor.c:2144 src/qemu/qemu_monitor.c:2177
-#: src/qemu/qemu_monitor.c:2207 src/qemu/qemu_monitor.c:2245
-#: src/qemu/qemu_monitor.c:2306 src/qemu/qemu_monitor.c:2329
-#: src/qemu/qemu_monitor.c:2348 src/qemu/qemu_monitor.c:2412
-#: src/qemu/qemu_monitor.c:2433 src/qemu/qemu_monitor.c:2454
-#: src/qemu/qemu_monitor.c:2477 src/qemu/qemu_monitor.c:2500
-#: src/qemu/qemu_monitor.c:2521 src/qemu/qemu_monitor.c:2543
-#: src/qemu/qemu_monitor.c:2565 src/qemu/qemu_monitor.c:2603
-#: src/qemu/qemu_monitor.c:2633 src/qemu/qemu_monitor.c:2674
-#: src/qemu/qemu_monitor.c:2708 src/qemu/qemu_monitor.c:2753
-#: src/qemu/qemu_monitor.c:2781 src/qemu/qemu_monitor.c:2823
-#: src/qemu/qemu_monitor.c:2844 src/qemu/qemu_monitor.c:2865
-#: src/qemu/qemu_monitor.c:2891 src/qemu/qemu_monitor.c:2912
-#: src/qemu/qemu_monitor.c:2931 src/qemu/qemu_monitor.c:2950
-#: src/qemu/qemu_monitor.c:2973 src/qemu/qemu_monitor.c:3007
-#: src/qemu/qemu_monitor.c:3028 src/qemu/qemu_monitor.c:3047
-#: src/qemu/qemu_monitor.c:3066 src/qemu/qemu_monitor.c:3085
-#: src/qemu/qemu_monitor.c:3111 src/qemu/qemu_monitor.c:3280
-#: src/qemu/qemu_monitor.c:3426 src/qemu/qemu_monitor.c:3452
-#: src/qemu/qemu_monitor.c:3476 src/qemu/qemu_monitor.c:3497
-#: src/qemu/qemu_monitor.c:3527 src/qemu/qemu_monitor.c:3549
-#: src/qemu/qemu_monitor.c:3571 src/qemu/qemu_monitor.c:3596
-#: src/qemu/qemu_monitor.c:3619 src/qemu/qemu_monitor.c:3641
-#: src/qemu/qemu_monitor.c:3664 src/qemu/qemu_monitor.c:3685
-#: src/qemu/qemu_monitor.c:3709 src/qemu/qemu_monitor.c:3727
-#: src/qemu/qemu_monitor.c:3749 src/qemu/qemu_monitor.c:3771
-#: src/qemu/qemu_monitor.c:3790 src/qemu/qemu_monitor.c:3812
-#: src/qemu/qemu_monitor.c:3834 src/qemu/qemu_monitor.c:3855
-#: src/qemu/qemu_monitor.c:3875 src/qemu/qemu_monitor.c:3896
-#: src/qemu/qemu_monitor.c:3952
+#: src/qemu/qemu_monitor.c:971 src/qemu/qemu_monitor.c:1018
+#: src/qemu/qemu_monitor.c:1038 src/qemu/qemu_monitor.c:1079
+#: src/qemu/qemu_monitor.c:1098 src/qemu/qemu_monitor.c:1118
+#: src/qemu/qemu_monitor.c:1157 src/qemu/qemu_monitor.c:1177
+#: src/qemu/qemu_monitor.c:1198 src/qemu/qemu_monitor.c:1218
+#: src/qemu/qemu_monitor.c:1246 src/qemu/qemu_monitor.c:1282
+#: src/qemu/qemu_monitor.c:1335 src/qemu/qemu_monitor.c:1381
+#: src/qemu/qemu_monitor.c:1413 src/qemu/qemu_monitor.c:1435
+#: src/qemu/qemu_monitor.c:1454 src/qemu/qemu_monitor.c:1475
+#: src/qemu/qemu_monitor.c:1498 src/qemu/qemu_monitor.c:1521
+#: src/qemu/qemu_monitor.c:1543 src/qemu/qemu_monitor.c:1563
+#: src/qemu/qemu_monitor.c:1583 src/qemu/qemu_monitor.c:1606
+#: src/qemu/qemu_monitor.c:1634 src/qemu/qemu_monitor.c:1667
+#: src/qemu/qemu_monitor.c:1699 src/qemu/qemu_monitor.c:1741
+#: src/qemu/qemu_monitor.c:1806 src/qemu/qemu_monitor.c:1831
+#: src/qemu/qemu_monitor.c:1881 src/qemu/qemu_monitor.c:1902
+#: src/qemu/qemu_monitor.c:1923 src/qemu/qemu_monitor.c:1946
+#: src/qemu/qemu_monitor.c:1969 src/qemu/qemu_monitor.c:1990
+#: src/qemu/qemu_monitor.c:2012 src/qemu/qemu_monitor.c:2034
+#: src/qemu/qemu_monitor.c:2072 src/qemu/qemu_monitor.c:2103
+#: src/qemu/qemu_monitor.c:2142 src/qemu/qemu_monitor.c:2167
+#: src/qemu/qemu_monitor.c:2204 src/qemu/qemu_monitor.c:2225
+#: src/qemu/qemu_monitor.c:2246 src/qemu/qemu_monitor.c:2272
+#: src/qemu/qemu_monitor.c:2292 src/qemu/qemu_monitor.c:2311
+#: src/qemu/qemu_monitor.c:2330 src/qemu/qemu_monitor.c:2353
+#: src/qemu/qemu_monitor.c:2387 src/qemu/qemu_monitor.c:2408
+#: src/qemu/qemu_monitor.c:2427 src/qemu/qemu_monitor.c:2446
+#: src/qemu/qemu_monitor.c:2465 src/qemu/qemu_monitor.c:2489
+#: src/qemu/qemu_monitor.c:2556 src/qemu/qemu_monitor.c:2681
 msgid "monitor must not be NULL"
 msgstr "监控程序不能为空"
 
-#: src/qemu/qemu_monitor.c:1431
+#: src/qemu/qemu_monitor.c:1060
 msgid "both monitor and running must not be NULL"
 msgstr "监控程序以及运行的系统都不得为 NULL"
 
-#: src/qemu/qemu_monitor.c:1509
+#: src/qemu/qemu_monitor.c:1138
 msgid "monitor || name must not be NULL"
 msgstr "监控程序 || 名称不能为空"
 
-#: src/qemu/qemu_monitor.c:1598 src/qemu/qemu_monitor.c:2061
-#: src/qemu/qemu_monitor.c:2082 src/qemu/qemu_monitor.c:2126
-#: src/qemu/qemu_monitor.c:3458 src/qemu/qemu_monitor.c:3482
-#: src/qemu/qemu_monitor.c:3503 src/qemu/qemu_monitor.c:3533
-#: src/qemu/qemu_monitor.c:3555 src/qemu/qemu_monitor.c:3577
-#: src/qemu/qemu_monitor.c:3602 src/qemu/qemu_monitor.c:3625
-#: src/qemu/qemu_monitor.c:3647 src/qemu/qemu_monitor.c:3670
-#: src/qemu/qemu_monitor.c:3691 src/qemu/qemu_monitor.c:3733
-#: src/qemu/qemu_monitor.c:3755 src/qemu/qemu_monitor.c:3777
-#: src/qemu/qemu_monitor.c:3796 src/qemu/qemu_monitor.c:3818
-#: src/qemu/qemu_monitor.c:3840 src/qemu/qemu_monitor.c:3861
-#: src/qemu/qemu_monitor.c:3881 src/qemu/qemu_monitor.c:3902
-#: src/qemu/qemu_monitor.c:3958
+#: src/qemu/qemu_monitor.c:1605 src/qemu/qemu_monitor.c:2068
+#: src/qemu/qemu_monitor.c:2089 src/qemu/qemu_monitor.c:2133
+#: src/qemu/qemu_monitor.c:3465 src/qemu/qemu_monitor.c:3489
+#: src/qemu/qemu_monitor.c:3510 src/qemu/qemu_monitor.c:3540
+#: src/qemu/qemu_monitor.c:3562 src/qemu/qemu_monitor.c:3584
+#: src/qemu/qemu_monitor.c:3609 src/qemu/qemu_monitor.c:3632
+#: src/qemu/qemu_monitor.c:3654 src/qemu/qemu_monitor.c:3677
+#: src/qemu/qemu_monitor.c:3698 src/qemu/qemu_monitor.c:3740
+#: src/qemu/qemu_monitor.c:3762 src/qemu/qemu_monitor.c:3784
+#: src/qemu/qemu_monitor.c:3803 src/qemu/qemu_monitor.c:3825
+#: src/qemu/qemu_monitor.c:3847 src/qemu/qemu_monitor.c:3868
+#: src/qemu/qemu_monitor.c:3888 src/qemu/qemu_monitor.c:3909
+#: src/qemu/qemu_monitor.c:3965
 msgid "JSON monitor is required"
 msgstr "需要 JSON 监控器"
 
-#: src/qemu/qemu_monitor.c:1617
+#: src/qemu/qemu_monitor.c:1624
 #, c-format
 msgid "unknown block IO status: %s"
 msgstr "未知块 IO 状态：%s"
 
-#: src/qemu/qemu_monitor.c:1676
+#: src/qemu/qemu_monitor_json.c:1437
 #, c-format
 msgid "cannot find info for device '%s'"
 msgstr "无法找到设备 '%s' 的信息"
 
-#: src/qemu/qemu_monitor.c:1810
+#: src/qemu/qemu_monitor.c:1358
 #, c-format
 msgid "unsupported protocol type %s"
 msgstr "不支持的协议类型 %s"
 
-#: src/qemu/qemu_monitor.c:2251
+#: src/qemu/qemu_monitor.c:1747
 #, c-format
 msgid "file offset must be a multiple of %llu"
 msgstr "文件偏移必须是 %llu 的倍数"
 
-#: src/qemu/qemu_monitor.c:2357
+#: src/qemu/qemu_monitor.c:2364
 msgid "dump-guest-memory is not supported in text mode"
 msgstr "文本模式不支持 dump-guest-memory"
 
-#: src/qemu/qemu_monitor.c:2571
+#: src/qemu/qemu_monitor.c:2040
 msgid "fd must be valid"
 msgstr "fd 必须有效"
 
-#: src/qemu/qemu_monitor.c:2577 src/qemu/qemu_monitor.c:2645
+#: src/qemu/qemu_monitor.c:2046
 #, c-format
 msgid "qemu is not using a unix socket monitor, cannot send fd %s"
 msgstr "qemu 不使用 unix 插槽监控程序，无法发送 fd %s"
 
-#: src/qemu/qemu_monitor.c:2639
+#: src/qemu/qemu_monitor.c:2646
 msgid "fd and fdset must be valid"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:2654
+#: src/qemu/qemu_monitor.c:2661
 msgid "add fd requires JSON monitor"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:2682
+#: src/qemu/qemu_monitor.c:2689
 msgid "remove fd requires JSON monitor"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:2723
+#: src/qemu/qemu_monitor.c:2730
 msgid "JSON monitor should be using AddNetdev"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:2759
+#: src/qemu/qemu_monitor.c:2766
 msgid "JSON monitor should be using RemoveNetdev"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:2897
+#: src/qemu/qemu_monitor.c:2904
 msgid "JSON monitor should be using AddDrive"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:3120
+#: src/qemu/qemu_monitor.c:3127
 msgid "disk snapshot requires JSON monitor"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:3143 src/qemu/qemu_monitor.c:3191
-#: src/qemu/qemu_monitor.c:3312
+#: src/qemu/qemu_monitor.c:3150 src/qemu/qemu_monitor.c:3198
+#: src/qemu/qemu_monitor.c:3319
 #, c-format
 msgid "bandwidth must be less than %llu"
 msgstr "带宽必须小于 %llu"
 
-#: src/qemu/qemu_monitor.c:3154
+#: src/qemu/qemu_monitor.c:3161
 msgid "drive-mirror requires JSON monitor"
 msgstr "drive-mirror 需要 JSON 监控程序"
 
-#: src/qemu/qemu_monitor.c:3170
+#: src/qemu/qemu_monitor.c:3177
 msgid "transaction requires JSON monitor"
 msgstr "事务需要 JSON 监控器"
 
-#: src/qemu/qemu_monitor.c:3201
+#: src/qemu/qemu_monitor.c:3208
 msgid "block-commit requires JSON monitor"
 msgstr "block-commit 需要 JSON 监控程序"
 
-#: src/qemu/qemu_monitor.c:3220
+#: src/qemu/qemu_monitor.c:3227
 msgid "drive pivot requires JSON monitor"
 msgstr "驱动器 pivot 需要 JSON 监控程序"
 
-#: src/qemu/qemu_monitor.c:3323
+#: src/qemu/qemu_monitor.c:3330
 msgid "block jobs require JSON monitor"
 msgstr "块任务需要 JSON 监控器"
 
-#: src/qemu/qemu_monitor.c:3924
+#: src/qemu/qemu_monitor.c:3931
 msgid "failed to duplicate log fd"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:252
+#: src/qemu/qemu_monitor_json.c:212
 msgid "Unable to append command 'id' string"
 msgstr "无法添加命令 ’id‘ 字符串"
 
-#: src/qemu/qemu_monitor_json.c:348 src/qemu/qemu_monitor_json.c:366
+#: src/qemu/qemu_monitor_json.c:312 src/qemu/qemu_monitor_json.c:330
 #, c-format
 msgid "unable to execute QEMU command '%s'"
 msgstr "无法执行 QEMU 命令 '%s'"
 
-#: src/qemu/qemu_monitor_json.c:352
+#: src/qemu/qemu_monitor_json.c:316
 #, c-format
 msgid "unable to execute QEMU command '%s': %s"
 msgstr "无法执行 QEMU 命令 '%s'：%s"
@@ -16947,7 +17176,7 @@
 msgid "argument key '%s' must not have null value"
 msgstr "参数键 '%s' 不能为空值"
 
-#: src/qemu/qemu_monitor_json.c:545
+#: src/qemu/qemu_monitor_json.c:500
 #, c-format
 msgid "unexpected empty keyword in %s"
 msgstr "%s 中的意外空 keymap"
@@ -16957,35 +17186,35 @@
 msgid "Human monitor command is not available to run %s"
 msgstr "运行 %s 的人为监控命令不可用"
 
-#: src/qemu/qemu_monitor_json.c:968
+#: src/qemu/qemu_monitor_json.c:750
 msgid "human monitor command was missing return data"
 msgstr "人工监控程序命令缺少返回的数据"
 
-#: src/qemu/qemu_monitor_json.c:1096
+#: src/qemu/qemu_monitor_json.c:932
 msgid "query-status reply was missing return data"
 msgstr "query-status 回复缺少返回数据"
 
-#: src/qemu/qemu_monitor_json.c:1102
+#: src/qemu/qemu_monitor_json.c:938
 msgid "query-status reply was missing running state"
 msgstr "query-status 回复缺少返回状态"
 
-#: src/qemu/qemu_monitor_json.c:1199
+#: src/qemu/qemu_monitor_json.c:1035
 msgid "cpu reply was missing return data"
 msgstr "cpu 回复缺少返回数据"
 
-#: src/qemu/qemu_monitor_json.c:1205
+#: src/qemu/qemu_monitor_json.c:1041
 msgid "cpu information was not an array"
 msgstr "cpu 信息不是一个阵列"
 
-#: src/qemu/qemu_monitor_json.c:1211
+#: src/qemu/qemu_monitor_json.c:1047
 msgid "cpu information was empty"
 msgstr "cpu 信息为空"
 
-#: src/qemu/qemu_monitor_json.c:1223 src/qemu/qemu_monitor_json.c:2977
+#: src/qemu/qemu_monitor_json.c:1062 src/qemu/qemu_monitor_json.c:2589
 msgid "character device information was missing array element"
 msgstr "字符设备信息缺少 array 元素"
 
-#: src/qemu/qemu_monitor_json.c:1298
+#: src/qemu/qemu_monitor_json.c:1150
 msgid "info kvm reply was missing return data"
 msgstr "info kvm 回复缺少返回值"
 
@@ -16993,63 +17222,63 @@
 msgid "info kvm reply missing 'enabled' field"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:1355
+#: src/qemu/qemu_monitor_json.c:1207 src/qemu/qemu_monitor_json.c:1262
 msgid "info balloon reply was missing return data"
 msgstr "info 布尔值回复缺少返回数据"
 
-#: src/qemu/qemu_monitor_json.c:1362
+#: src/qemu/qemu_monitor_json.c:1214
 msgid "info balloon reply was missing balloon data"
 msgstr "info 布尔值回复缺少布尔数据"
 
 #: src/qemu/qemu_monitor_json.c:1455 src/qemu/qemu_monitor_json.c:4664
-#: src/qemu/qemu_monitor_json.c:4707 src/qemu/qemu_monitor_json.c:5582
+#: src/qemu/qemu_monitor_json.c:4707 src/qemu/qemu_monitor_json.c:5583
 msgid "qom-get reply was missing return data"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:1539
+#: src/qemu/qemu_monitor_json.c:1385
 msgid "block info reply was missing device list"
 msgstr "块信息回复缺少设备列表"
 
-#: src/qemu/qemu_monitor_json.c:1551 src/qemu/qemu_monitor_json.c:1557
+#: src/qemu/qemu_monitor_json.c:1395 src/qemu/qemu_monitor_json.c:1401
 msgid "block info device entry was not in expected format"
 msgstr "块信息 device 条目未使用预期的格式"
 
-#: src/qemu/qemu_monitor_json.c:1574 src/qemu/qemu_monitor_json.c:1581
+#: src/qemu/qemu_monitor_json.c:1414 src/qemu/qemu_monitor_json.c:1421
 #, c-format
 msgid "cannot read %s value"
 msgstr "无法读取 %s 值"
 
-#: src/qemu/qemu_monitor_json.c:1655 src/qemu/qemu_monitor_json.c:1795
-#: src/qemu/qemu_monitor_json.c:1870
+#: src/qemu/qemu_monitor_json.c:1497 src/qemu/qemu_monitor_json.c:1636
+#: src/qemu/qemu_monitor_json.c:1711
 msgid "blockstats reply was missing device list"
 msgstr "块状态回复缺少设备列表"
 
-#: src/qemu/qemu_monitor_json.c:1665 src/qemu/qemu_monitor_json.c:1671
-#: src/qemu/qemu_monitor_json.c:1803 src/qemu/qemu_monitor_json.c:1881
-#: src/qemu/qemu_monitor_json.c:1887
+#: src/qemu/qemu_monitor_json.c:1507 src/qemu/qemu_monitor_json.c:1513
+#: src/qemu/qemu_monitor_json.c:1644 src/qemu/qemu_monitor_json.c:1722
+#: src/qemu/qemu_monitor_json.c:1728
 msgid "blockstats device entry was not in expected format"
 msgstr "块状态设备条目不是预期的格式"
 
-#: src/qemu/qemu_monitor_json.c:1689 src/qemu/qemu_monitor_json.c:1810
-#: src/qemu/qemu_monitor_json.c:1912
+#: src/qemu/qemu_monitor_json.c:1531 src/qemu/qemu_monitor_json.c:1651
+#: src/qemu/qemu_monitor_json.c:1753
 msgid "blockstats stats entry was not in expected format"
 msgstr "块状态条目不是预期的格式"
 
-#: src/qemu/qemu_monitor_json.c:1695 src/qemu/qemu_monitor_json.c:1701
-#: src/qemu/qemu_monitor_json.c:1710 src/qemu/qemu_monitor_json.c:1716
-#: src/qemu/qemu_monitor_json.c:1722 src/qemu/qemu_monitor_json.c:1731
-#: src/qemu/qemu_monitor_json.c:1740 src/qemu/qemu_monitor_json.c:1749
-#: src/qemu/qemu_monitor_json.c:1918
+#: src/qemu/qemu_monitor_json.c:1537 src/qemu/qemu_monitor_json.c:1543
+#: src/qemu/qemu_monitor_json.c:1552 src/qemu/qemu_monitor_json.c:1558
+#: src/qemu/qemu_monitor_json.c:1564 src/qemu/qemu_monitor_json.c:1573
+#: src/qemu/qemu_monitor_json.c:1582 src/qemu/qemu_monitor_json.c:1591
+#: src/qemu/qemu_monitor_json.c:1759
 #, c-format
 msgid "cannot read %s statistic"
 msgstr "无法读取 %s 统计数据"
 
-#: src/qemu/qemu_monitor_json.c:1757 src/qemu/qemu_monitor_json.c:1926
+#: src/qemu/qemu_monitor_json.c:1599 src/qemu/qemu_monitor_json.c:1767
 #, c-format
 msgid "cannot find statistics for device '%s'"
 msgstr "无法找到设备 '%s' 的统计数据"
 
-#: src/qemu/qemu_monitor_json.c:1905
+#: src/qemu/qemu_monitor_json.c:1746
 msgid "blockstats parent entry was not in expected format"
 msgstr "块状态上级条目不是预期的格式"
 
@@ -17057,45 +17286,45 @@
 msgid "query-migrate-cache-size reply was missing 'return' data"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2364
+#: src/qemu/qemu_monitor_json.c:2147
 msgid "info migration reply was missing return data"
 msgstr "info 迁移回复缺少返回数据"
 
-#: src/qemu/qemu_monitor_json.c:2370
+#: src/qemu/qemu_monitor_json.c:2153
 msgid "info migration reply was missing return status"
 msgstr "信息迁移回复缺少返回的状态"
 
-#: src/qemu/qemu_monitor_json.c:2377 src/qemu/qemu_monitor_text.c:1439
-#: src/qemu/qemu_monitor_text.c:1447
+#: src/qemu/qemu_monitor_json.c:2159 src/qemu/qemu_monitor_text.c:1541
+#: src/qemu/qemu_monitor_text.c:1548
 #, c-format
 msgid "unexpected migration status in %s"
 msgstr "%s 中意外的迁移状态"
 
-#: src/qemu/qemu_monitor_json.c:2396
+#: src/qemu/qemu_monitor_json.c:2167
 msgid "migration was active, but no RAM info was set"
 msgstr "迁移是活跃的但没有设定 RAM 信息"
 
-#: src/qemu/qemu_monitor_json.c:2403
+#: src/qemu/qemu_monitor_json.c:2174
 msgid "migration was active, but RAM 'transferred' data was missing"
 msgstr "迁移是活跃的但缺少 RAM 'transferred' 数据"
 
-#: src/qemu/qemu_monitor_json.c:2410
+#: src/qemu/qemu_monitor_json.c:2180
 msgid "migration was active, but RAM 'remaining' data was missing"
 msgstr "迁移是活跃的但缺少 RAM 'remaining' 数据"
 
-#: src/qemu/qemu_monitor_json.c:2417
+#: src/qemu/qemu_monitor_json.c:2186
 msgid "migration was active, but RAM 'total' data was missing"
 msgstr "迁移是活跃的但缺少 RAM 'total' 数据"
 
-#: src/qemu/qemu_monitor_json.c:2435
+#: src/qemu/qemu_monitor_json.c:2198
 msgid "disk migration was active, but 'transferred' data was missing"
 msgstr "磁盘迁移是活跃的但缺少 'transferred' 数据"
 
-#: src/qemu/qemu_monitor_json.c:2444
+#: src/qemu/qemu_monitor_json.c:2205
 msgid "disk migration was active, but 'remaining' data was missing"
 msgstr "磁盘迁移是活跃的但缺少 'remaining' 数据"
 
-#: src/qemu/qemu_monitor_json.c:2453
+#: src/qemu/qemu_monitor_json.c:2212
 msgid "disk migration was active, but 'total' data was missing"
 msgstr "磁盘迁移是活跃的但缺少 'total' 数据"
 
@@ -17145,19 +17374,19 @@
 msgid "incomplete return information"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2961
+#: src/qemu/qemu_monitor_json.c:2573
 msgid "character device reply was missing return data"
 msgstr "字符设备回复缺少返回的状态"
 
-#: src/qemu/qemu_monitor_json.c:2967
+#: src/qemu/qemu_monitor_json.c:2579
 msgid "character device information was not an array"
 msgstr "字符设备信息不实一个阵列"
 
-#: src/qemu/qemu_monitor_json.c:2983 src/qemu/qemu_monitor_json.c:2989
+#: src/qemu/qemu_monitor_json.c:2595 src/qemu/qemu_monitor_json.c:2601
 msgid "character device information was missing filename"
 msgstr "字符设备信息缺少文件名"
 
-#: src/qemu/qemu_monitor_json.c:3000 src/qemu/qemu_monitor_text.c:2212
+#: src/qemu/qemu_monitor_json.c:2614 src/qemu/qemu_monitor_text.c:2398
 #, c-format
 msgid "failed to save chardev path '%s'"
 msgstr "保存 chardev 路径 '%s' 失败"
@@ -17166,7 +17395,7 @@
 msgid "query-pci not supported in JSON mode"
 msgstr "JSON 模式中不支持 query-pci"
 
-#: src/qemu/qemu_monitor_json.c:3135
+#: src/qemu/qemu_monitor_json.c:2854
 msgid ""
 "deleting disk is not supported.  This may leak data if disk is reassigned"
 msgstr "不支持删除磁盘。如果重新分配磁盘可能造成数据泄露。"
@@ -17176,27 +17405,27 @@
 msgid "keycode %zu is invalid: 0x%X"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3511
+#: src/qemu/qemu_monitor_json.c:3139
 msgid "entry was missing 'device'"
 msgstr "条目缺少 'device'"
 
-#: src/qemu/qemu_monitor_json.c:3520
+#: src/qemu/qemu_monitor_json.c:3148
 msgid "entry was missing 'type'"
 msgstr "条目缺少 'type'"
 
-#: src/qemu/qemu_monitor_json.c:3534
+#: src/qemu/qemu_monitor_json.c:3158
 msgid "entry was missing 'speed'"
 msgstr "条目缺少 'speed'"
 
-#: src/qemu/qemu_monitor_json.c:3541
+#: src/qemu/qemu_monitor_json.c:3165
 msgid "entry was missing 'offset'"
 msgstr "条目缺少 'offset'"
 
-#: src/qemu/qemu_monitor_json.c:3547
+#: src/qemu/qemu_monitor_json.c:3171
 msgid "entry was missing 'len'"
 msgstr "条目缺少 'len'"
 
-#: src/qemu/qemu_monitor_json.c:3570
+#: src/qemu/qemu_monitor_json.c:3193
 msgid "reply was missing return data"
 msgstr "条目缺少返回值"
 
@@ -17204,11 +17433,11 @@
 msgid "unrecognized format of block job information"
 msgstr "阻断任务信息中无法识别的格式"
 
-#: src/qemu/qemu_monitor_json.c:3582
+#: src/qemu/qemu_monitor_json.c:3205
 msgid "unable to determine array size"
 msgstr "无法确定阵列大小"
 
-#: src/qemu/qemu_monitor_json.c:3590
+#: src/qemu/qemu_monitor_json.c:3213
 msgid "missing array element"
 msgstr "缺少 array 元素"
 
@@ -17222,31 +17451,31 @@
 msgid "only modern block pull supports speed: %llu"
 msgstr "只有先进的块提取支持速度：%llu"
 
-#: src/qemu/qemu_monitor_json.c:3668 src/qemu/qemu_monitor_json.c:3829
-#: src/qemu/qemu_monitor_json.c:3862
+#: src/qemu/qemu_monitor_json.c:3261 src/qemu/qemu_monitor_json.c:3437
+#: src/qemu/qemu_monitor_json.c:3470 src/qemu/qemu_monitor_text.c:3349
 #, c-format
 msgid "No active operation on device: %s"
 msgstr "设备中没有活跃操作：%s"
 
-#: src/qemu/qemu_monitor_json.c:3672
+#: src/qemu/qemu_monitor_json.c:3264 src/qemu/qemu_monitor_text.c:3341
 #, c-format
 msgid "Device %s in use"
 msgstr "设备 %s 使用者"
 
-#: src/qemu/qemu_monitor_json.c:3675 src/qemu/qemu_monitor_json.c:3832
-#: src/qemu/qemu_monitor_json.c:3865
+#: src/qemu/qemu_monitor_json.c:3267 src/qemu/qemu_monitor_json.c:3440
+#: src/qemu/qemu_monitor_json.c:3473 src/qemu/qemu_monitor_text.c:3361
 #, c-format
 msgid "Operation is not supported for device: %s"
 msgstr "设备不支持操作：%s"
 
-#: src/qemu/qemu_monitor_json.c:3679 src/qemu/qemu_monitor_text.c:2993
-#: src/qemu/qemu_monitor_text.c:3092
+#: src/qemu/qemu_monitor_json.c:3270 src/qemu/qemu_monitor_text.c:3421
+#: src/qemu/qemu_monitor_text.c:3497 src/qemu/qemu_monitor_text.c:3603
 #, c-format
 msgid "Command '%s' is not found"
 msgstr "未找到命令 '%s'"
 
-#: src/qemu/qemu_monitor_json.c:3682 src/qemu/qemu_monitor_json.c:3835
-#: src/qemu/qemu_monitor_json.c:3868
+#: src/qemu/qemu_monitor_json.c:3273 src/qemu/qemu_monitor_json.c:3443
+#: src/qemu/qemu_monitor_json.c:3476
 msgid "Unexpected error"
 msgstr "意外错误"
 
@@ -17255,7 +17484,7 @@
 msgid "block_io_throttle field '%s' missing in qemu's output"
 msgstr "qemu 输出结果中缺少 block_io_throttle 字段 '%s'"
 
-#: src/qemu/qemu_monitor_json.c:3746
+#: src/qemu/qemu_monitor_json.c:3327
 msgid " block_io_throttle reply was missing device list"
 msgstr " block_io_throttle 恢复缺少设备列表"
 
@@ -17267,7 +17496,7 @@
 msgid "block_io_throttle inserted entry was not in expected format"
 msgstr "block_io_throttle 插入的条目不是正确的格式"
 
-#: src/qemu/qemu_monitor_json.c:3793
+#: src/qemu/qemu_monitor_json.c:3402
 #, c-format
 msgid "cannot find throttling info for device '%s'"
 msgstr "无法找到设备 '%s' 的节流信息"
@@ -17469,267 +17698,267 @@
 msgid "%s array element does not contain data"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:5325
+#: src/qemu/qemu_monitor_json.c:5326
 #, c-format
 msgid "Unsupported char device type '%d'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:5377
+#: src/qemu/qemu_monitor_json.c:5378
 msgid "chardev-add reply was missing return data"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:5383
+#: src/qemu/qemu_monitor_json.c:5384
 msgid "chardev-add reply was missing pty path"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:5473
+#: src/qemu/qemu_monitor_json.c:5474
 msgid "missing cpuid-register in CPU data"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:5478
+#: src/qemu/qemu_monitor_json.c:5479
 msgid "missing or invalid cpuid-input-eax in CPU data"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:5483
+#: src/qemu/qemu_monitor_json.c:5484
 msgid "missing or invalid features in CPU data"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:5498
+#: src/qemu/qemu_monitor_json.c:5499
 #, c-format
 msgid "unknown CPU register '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:5547 src/qemu/qemu_monitor_json.c:5588
+#: src/qemu/qemu_monitor_json.c:5548 src/qemu/qemu_monitor_json.c:5589
 #, c-format
 msgid "%s CPU property did not return an array"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:5639
+#: src/qemu/qemu_monitor_json.c:5640
 #, c-format
 msgid "CPU definition retrieval isn't supported for '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:178
+#: src/qemu/qemu_monitor_text.c:173
 msgid "Password request seen, but no handler available"
 msgstr "看到所需密码，但没有可用的句柄。"
 
-#: src/qemu/qemu_monitor_text.c:319
+#: src/qemu/qemu_monitor_text.c:321
 #, c-format
 msgid "Unable to extract disk path from %s"
 msgstr "无法从 %s 中提取磁盘路径"
 
-#: src/qemu/qemu_monitor_text.c:422
+#: src/qemu/qemu_monitor_text.c:433
 #, c-format
 msgid "unexpected reply from info status: %s"
 msgstr "来自信息状态的意外回复：%s"
 
-#: src/qemu/qemu_monitor_text.c:464
+#: src/qemu/qemu_monitor_text.c:482
 msgid "'set_link' not supported by this qemu"
 msgstr "这个 qemu 不支持 'set_link"
 
-#: src/qemu/qemu_monitor_text.c:471
+#: src/qemu/qemu_monitor_text.c:489
 msgid "device name rejected"
 msgstr "设备名称被拒绝"
 
-#: src/qemu/qemu_monitor_text.c:681 src/qemu/qemu_monitor_text.c:687
+#: src/qemu/qemu_monitor_text.c:726 src/qemu/qemu_monitor_text.c:732
 #, c-format
 msgid "unexpected balloon information '%s'"
 msgstr "意外布尔信息 '%s'"
 
-#: src/qemu/qemu_monitor_text.c:743
+#: src/qemu/qemu_monitor_text.c:794
 msgid "info block not supported by this qemu"
 msgstr "这个 qemu 不支持 info block"
 
-#: src/qemu/qemu_monitor_text.c:862 src/qemu/qemu_monitor_text.c:986
+#: src/qemu/qemu_monitor_text.c:896 src/qemu/qemu_monitor_text.c:1023
 msgid "'info blockstats' not supported by this qemu"
 msgstr "这个 qemu 不支持 'info blockstats'"
 
-#: src/qemu/qemu_monitor_text.c:960
+#: src/qemu/qemu_monitor_text.c:994
 #, c-format
 msgid "no stats found for device %s"
 msgstr "未找到设备 %s 的 stats"
 
-#: src/qemu/qemu_monitor_text.c:1037
+#: src/qemu/qemu_monitor_text.c:1074
 msgid "unable to query block extent with this QEMU"
 msgstr "无法使用这个 QEMU 查询块扩展"
 
-#: src/qemu/qemu_monitor_text.c:1107
+#: src/qemu/qemu_monitor_text.c:1151
 msgid "setting VNC password failed"
 msgstr "设定 VNC 密码失败"
 
-#: src/qemu/qemu_monitor_text.c:1263
+#: src/qemu/qemu_monitor_text.c:1330
 #, c-format
 msgid "could not eject media on %s: %s"
 msgstr "无法在 %s 中弹出介质：%s"
 
-#: src/qemu/qemu_monitor_text.c:1300 src/qemu/qemu_monitor_text.c:1307
+#: src/qemu/qemu_monitor_text.c:1374 src/qemu/qemu_monitor_text.c:1381
 #, c-format
 msgid "could not change media on %s: %s"
 msgstr "无法在 %s 中更改介质：%s"
 
-#: src/qemu/qemu_monitor_text.c:1461
+#: src/qemu/qemu_monitor_text.c:1561
 #, c-format
 msgid "cannot parse migration data transferred statistic %s"
 msgstr "无法解析迁移数据转移的统计数据 %s"
 
-#: src/qemu/qemu_monitor_text.c:1474
+#: src/qemu/qemu_monitor_text.c:1574
 #, c-format
 msgid "cannot parse migration data remaining statistic %s"
 msgstr "无法解析迁移数据剩余的统计数据 %s"
 
-#: src/qemu/qemu_monitor_text.c:1487
+#: src/qemu/qemu_monitor_text.c:1587
 #, c-format
 msgid "cannot parse migration data total statistic %s"
 msgstr "无法解析迁移数据统计数据总额 %s"
 
-#: src/qemu/qemu_monitor_text.c:1504
+#: src/qemu/qemu_monitor_text.c:1603
 #, c-format
 msgid "cannot parse disk migration data transferred statistic %s"
 msgstr "无法解析迁磁盘移数据转移的统计数据 %s"
 
-#: src/qemu/qemu_monitor_text.c:1517
+#: src/qemu/qemu_monitor_text.c:1616
 #, c-format
 msgid "cannot parse disk migration data remaining statistic %s"
 msgstr "无法解析磁盘迁移数据剩余的统计数据 %s"
 
-#: src/qemu/qemu_monitor_text.c:1530
+#: src/qemu/qemu_monitor_text.c:1629
 #, c-format
 msgid "cannot parse disk migration data total statistic %s"
 msgstr "无法解析磁盘迁移数据统计数据总额 %s"
 
-#: src/qemu/qemu_monitor_text.c:1586
+#: src/qemu/qemu_monitor_text.c:1690
 #, c-format
 msgid "migration to '%s' failed: %s"
 msgstr "迁移到 '%s' 失败：%s"
 
-#: src/qemu/qemu_monitor_text.c:1593
+#: src/qemu/qemu_monitor_text.c:1697
 #, c-format
 msgid "migration to '%s' not supported by this qemu: %s"
 msgstr "这个 qemu 不支持迁移到 '%s' ：%s"
 
-#: src/qemu/qemu_monitor_text.c:1668
+#: src/qemu/qemu_monitor_text.c:1786
 #, c-format
 msgid "unable to add USB disk %s: %s"
 msgstr "无法添加 USB 磁盘 %s: %s"
 
-#: src/qemu/qemu_monitor_text.c:1699
+#: src/qemu/qemu_monitor_text.c:1822
 msgid "adding usb device failed"
 msgstr "添加 usb 设备失败"
 
-#: src/qemu/qemu_monitor_text.c:1835 src/qemu/qemu_monitor_text.c:1910
+#: src/qemu/qemu_monitor_text.c:1967 src/qemu/qemu_monitor_text.c:2054
 #, c-format
 msgid "parsing pci_add reply failed: %s"
 msgstr "parsing pci_add 回复失败：%s"
 
-#: src/qemu/qemu_monitor_text.c:1880
+#: src/qemu/qemu_monitor_text.c:2019
 #, c-format
 msgid "adding %s disk failed %s: %s"
 msgstr "添加 %s 磁盘失败 %s: %s"
 
-#: src/qemu/qemu_monitor_text.c:1960
+#: src/qemu/qemu_monitor_text.c:2111
 #, c-format
 msgid "failed to detach PCI device, invalid address %.4x:%.2x:%.2x: %s"
 msgstr "分离 PCI 设备失败，无效地址 %.4x:%.2x:%.2x: %s"
 
-#: src/qemu/qemu_monitor_text.c:1992
+#: src/qemu/qemu_monitor_text.c:2148
 #, c-format
 msgid "qemu does not support sending of file handles: %s"
 msgstr "qemu 不支持发送文件句柄：%s"
 
-#: src/qemu/qemu_monitor_text.c:1999
+#: src/qemu/qemu_monitor_text.c:2155
 #, c-format
 msgid "unable to send file handle '%s': %s"
 msgstr "无法发送文件句柄 '%s': %s"
 
-#: src/qemu/qemu_monitor_text.c:2030
+#: src/qemu/qemu_monitor_text.c:2191
 #, c-format
 msgid "qemu does not support closing of file handles: %s"
 msgstr "qemu 不支持关闭文件句柄：%s"
 
-#: src/qemu/qemu_monitor_text.c:2059
+#: src/qemu/qemu_monitor_text.c:2225
 #, c-format
 msgid "unable to add host net: %s"
 msgstr "无法添加主机网络：%s"
 
-#: src/qemu/qemu_monitor_text.c:2254
+#: src/qemu/qemu_monitor_text.c:2445
 #, c-format
 msgid "adding %s disk controller failed: %s"
 msgstr "添加 %s 磁盘控制器失败：%s"
 
-#: src/qemu/qemu_monitor_text.c:2339 src/qemu/qemu_monitor_text.c:2590
+#: src/qemu/qemu_monitor_text.c:2537 src/qemu/qemu_monitor_text.c:2814
 msgid "drive hotplug is not supported"
 msgstr "不支持驱动器热插拔"
 
-#: src/qemu/qemu_monitor_text.c:2351
+#: src/qemu/qemu_monitor_text.c:2549
 #, c-format
 msgid "adding %s disk failed: %s"
 msgstr "添加 %s 磁盘失败：%s"
 
-#: src/qemu/qemu_monitor_text.c:2406
+#: src/qemu/qemu_monitor_text.c:2604
 #, c-format
 msgid "cannot parse value for %s"
 msgstr "无法为 %s 解析数值"
 
-#: src/qemu/qemu_monitor_text.c:2511
+#: src/qemu/qemu_monitor_text.c:2721
 #, c-format
 msgid "detaching %s device failed: %s"
 msgstr "分离 %s 设备失败：%s"
 
-#: src/qemu/qemu_monitor_text.c:2554
+#: src/qemu/qemu_monitor_text.c:2771
 #, c-format
 msgid "adding %s device failed: %s"
 msgstr "添加 %s 设备失败：%s"
 
-#: src/qemu/qemu_monitor_text.c:2596
+#: src/qemu/qemu_monitor_text.c:2820
 msgid "open disk image file failed"
 msgstr "打开磁盘映像文件失败"
 
-#: src/qemu/qemu_monitor_text.c:2630
+#: src/qemu/qemu_monitor_text.c:2861
 msgid ""
 "deleting drive is not supported.  This may leak data if disk is reassigned"
 msgstr "不支持删除驱动器。创新分配磁盘可能会有数据泄露。"
 
-#: src/qemu/qemu_monitor_text.c:2642
+#: src/qemu/qemu_monitor_text.c:2873
 #, c-format
 msgid "deleting %s drive failed: %s"
 msgstr "删除 %s 驱动器失败：%s"
 
-#: src/qemu/qemu_monitor_text.c:2677
+#: src/qemu/qemu_monitor_text.c:2915
 msgid "setting disk password is not supported"
 msgstr "不支持设定磁盘密码"
 
-#: src/qemu/qemu_monitor_text.c:2681
+#: src/qemu/qemu_monitor_text.c:2919
 msgid "the disk password is incorrect"
 msgstr "磁盘密码不正确"
 
-#: src/qemu/qemu_monitor_text.c:2710
+#: src/qemu/qemu_monitor_text.c:2953 src/qemu/qemu_monitor_text.c:3106
 #, c-format
 msgid "Failed to take snapshot: %s"
 msgstr "提取快照失败：%s"
 
-#: src/qemu/qemu_monitor_text.c:2715
+#: src/qemu/qemu_monitor_text.c:2958
 msgid "this domain does not have a device to take snapshots"
 msgstr "这个域没有要提取快照的设备"
 
-#: src/qemu/qemu_monitor_text.c:2753
+#: src/qemu/qemu_monitor_text.c:3002
 msgid "this domain does not have a device to load snapshots"
 msgstr "这个域没有要载入快照的设备"
 
-#: src/qemu/qemu_monitor_text.c:2758
+#: src/qemu/qemu_monitor_text.c:3007
 #, c-format
 msgid "the snapshot '%s' does not exist, and was not loaded"
 msgstr "快照 '%s' 不存在，因此无法载入。"
 
-#: src/qemu/qemu_monitor_text.c:2805
+#: src/qemu/qemu_monitor_text.c:3060
 msgid "this domain does not have a device to delete snapshots"
 msgstr "这个域没有要删除快照的设备"
 
-#: src/qemu/qemu_monitor_text.c:2905
+#: src/qemu/qemu_monitor_text.c:3218
 #, c-format
 msgid "failed to send key '%s'"
 msgstr "发送密钥 '%s' 失败"
 
-#: src/qemu/qemu_monitor_text.c:3073
+#: src/qemu/qemu_monitor_text.c:3580
 #, c-format
 msgid "No info for device '%s'"
 msgstr "无设备 '%s' 的信息"
@@ -17748,69 +17977,69 @@
 msgid "Failed to clear security context for agent for %s"
 msgstr "为 %s 的代理清除安全上下文失败"
 
-#: src/qemu/qemu_process.c:381
+#: src/qemu/qemu_process.c:202
 #, c-format
 msgid "no disk found with path %s"
 msgstr "未发现路径为 %s 的磁盘"
 
-#: src/qemu/qemu_process.c:404
+#: src/qemu/qemu_process.c:225
 #, c-format
 msgid "no disk found with alias %s"
 msgstr "未发现别名为 %s 的磁盘"
 
-#: src/qemu/qemu_process.c:424
+#: src/qemu/qemu_process.c:245
 #, c-format
 msgid "disk %s does not have any encryption information"
 msgstr "磁盘 %s 不包含任何加密信息"
 
-#: src/qemu/qemu_process.c:432
+#: src/qemu/qemu_process.c:253
 msgid "cannot find secrets without a connection"
 msgstr "没有连接则无法找到秘密"
 
-#: src/qemu/qemu_process.c:440 src/storage/storage_backend.c:490
+#: src/qemu/qemu_process.c:261 src/storage/storage_backend.c:465
 msgid "secret storage not supported"
 msgstr "不支持 secret 存储"
 
-#: src/qemu/qemu_process.c:449
+#: src/qemu/qemu_process.c:270
 #, c-format
 msgid "invalid <encryption> for volume %s"
 msgstr "卷 %s 的无效 <encryption>"
 
-#: src/qemu/qemu_process.c:467
+#: src/qemu/qemu_process.c:288
 #, c-format
 msgid "format='qcow' passphrase for %s must not contain a '\\0'"
 msgstr "%s 的 format='qcow' 密码短语一定不能包含 '\\0'"
 
-#: src/qemu/qemu_process.c:640
+#: src/qemu/qemu_process.c:447
 msgid "Failed to create reboot thread, killing domain"
 msgstr "生成重启线程失败，正在杀死域。"
 
-#: src/qemu/qemu_process.c:1397
+#: src/qemu/qemu_process.c:877
 #, c-format
 msgid "Failed to set security context for monitor for %s"
 msgstr "为 %s 的监视器设定安全上下文失败"
 
-#: src/qemu/qemu_process.c:1429
+#: src/qemu/qemu_process.c:910
 #, c-format
 msgid "Failed to clear security context for monitor for %s"
 msgstr "为 %s 的监视器清除安全上下文失败"
 
-#: src/qemu/qemu_process.c:1533
+#: src/qemu/qemu_process.c:976
 #, c-format
 msgid "Failure while reading %s log output"
 msgstr "读取 %s 日志输出失败"
 
-#: src/qemu/qemu_process.c:1540
+#: src/qemu/qemu_process.c:998
 #, c-format
 msgid "Out of space while reading %s log output: %s"
 msgstr "读取 %s 日志输出时超出范围：%s"
 
-#: src/qemu/qemu_process.c:1547
+#: src/qemu/qemu_process.c:1005
 #, c-format
 msgid "Process exited while reading %s log output: %s"
 msgstr "读取 %s 日志输出时进程推出：%s"
 
-#: src/qemu/qemu_process.c:1562
+#: src/qemu/qemu_process.c:1020
 #, c-format
 msgid "Timed out while reading %s log output: %s"
 msgstr "读取 %s 日志输出时超时：%s"
@@ -17820,12 +18049,12 @@
 msgid "Process exited prior to exec: %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:1712
+#: src/qemu/qemu_process.c:1107
 #, c-format
 msgid "no assigned pty for device %s"
 msgstr "没有为设备 %s 分配 pty"
 
-#: src/qemu/qemu_process.c:1914
+#: src/qemu/qemu_process.c:1300
 #, c-format
 msgid "process exited while connecting to monitor: %s"
 msgstr "连接到监控程序时进程推出：%s"
@@ -17838,56 +18067,56 @@
 msgid "Cannot setup CPU affinity until process is started"
 msgstr ""
 
-#: src/qemu/qemu_process.c:2088
+#: src/qemu/qemu_process.c:1537
 msgid "Setting of link state is not supported by this qemu"
 msgstr "这个 qemu 不支持设定链接状态"
 
-#: src/qemu/qemu_process.c:2097
+#: src/qemu/qemu_process.c:1546
 #, c-format
 msgid "Couldn't set link state on interface: %s"
 msgstr "无法在接口中设定链接状态：%s"
 
-#: src/qemu/qemu_process.c:2486
+#: src/qemu/qemu_process.c:1947
 #, c-format
 msgid "cannot find PCI address for VirtIO disk %s"
 msgstr "无法找到用于 VirtIO 磁盘 %s 的 PCI 地址"
 
-#: src/qemu/qemu_process.c:2500
+#: src/qemu/qemu_process.c:1961
 #, c-format
 msgid "cannot find PCI address for %s NIC"
 msgstr "无法找到用于 %s NIC 的 PCI 地址"
 
-#: src/qemu/qemu_process.c:2514
+#: src/qemu/qemu_process.c:1975
 #, c-format
 msgid "cannot find PCI address for controller %s"
 msgstr "无法找到用于控制器 %s  的 PCI 地址"
 
-#: src/qemu/qemu_process.c:2528
+#: src/qemu/qemu_process.c:1989
 #, c-format
 msgid "cannot find PCI address for video adapter %s"
 msgstr "无法找到用于显卡 %s 的 PCI 地址"
 
-#: src/qemu/qemu_process.c:2542
+#: src/qemu/qemu_process.c:2003
 #, c-format
 msgid "cannot find PCI address for sound adapter %s"
 msgstr "无法找到用于声卡 %s 的 PCI 地址"
 
-#: src/qemu/qemu_process.c:2555
+#: src/qemu/qemu_process.c:2016
 #, c-format
 msgid "cannot find PCI address for watchdog %s"
 msgstr "无法找到用于 watchdog %s 的 PCI 地址"
 
-#: src/qemu/qemu_process.c:2567
+#: src/qemu/qemu_process.c:2028
 #, c-format
 msgid "cannot find PCI address for balloon %s"
 msgstr "无法找到用于布尔 %s 的 PCI 地址"
 
-#: src/qemu/qemu_process.c:2619
+#: src/qemu/qemu_process.c:2147
 #, c-format
 msgid "Unable to pre-create chardev file '%s'"
 msgstr "无法预先生成 chardev 文件 '%s'"
 
-#: src/qemu/qemu_process.c:3362
+#: src/qemu/qemu_process.c:2843
 msgid "Could not create thread. QEMU initialization might be incomplete"
 msgstr "无法生成线程。QEMU 初始化可能没有完成。"
 
@@ -17905,8 +18134,8 @@
 msgid "host doesn't support paravirtual spinlocks"
 msgstr ""
 
-#: src/qemu/qemu_process.c:3632 src/qemu/qemu_process.c:4497
-#: src/uml/uml_driver.c:1036
+#: src/qemu/qemu_process.c:2909 src/qemu/qemu_process.c:3579
+#: src/uml/uml_driver.c:983
 msgid "VM is already active"
 msgstr "VM 已经激活"
 
@@ -17914,8 +18143,8 @@
 msgid "Unable to set huge path in security driver"
 msgstr ""
 
-#: src/qemu/qemu_process.c:3751 src/qemu/qemu_process.c:4521
-#: src/uml/uml_driver.c:1058
+#: src/qemu/qemu_process.c:3005 src/qemu/qemu_process.c:3595
+#: src/uml/uml_driver.c:1005
 #, c-format
 msgid "cannot create log directory %s"
 msgstr "无法生成日志目录 %s"
@@ -17927,11 +18156,11 @@
 "modules."
 msgstr "域需要 KVM，但不可用。在主机 BIOS 中启用了检查虚拟化，同时将主机配置为载入 kvm 模块。"
 
-#: src/qemu/qemu_process.c:3825
+#: src/qemu/qemu_process.c:3054
 msgid "Failed to build pidfile path."
 msgstr "无法构建 pidfile 路径。"
 
-#: src/qemu/qemu_process.c:3832
+#: src/qemu/qemu_process.c:3061
 #, c-format
 msgid "Cannot remove stale PID file %s"
 msgstr "无法删除停滞 PID 文件 %s"
@@ -17940,12 +18169,7 @@
 msgid "Raw I/O is not supported on this platform"
 msgstr ""
 
-#: src/qemu/qemu_process.c:3947
-#, c-format
-msgid "Domain %s didn't show up"
-msgstr "未显示域 %s"
-
-#: src/qemu/qemu_process.c:4000
+#: src/qemu/qemu_process.c:3203
 #, c-format
 msgid "cannot stat fd %d"
 msgstr "无法执行 stat fd %d"
@@ -17960,271 +18184,275 @@
 msgid "failed to remove ebtables rule to allow MAC address on '%s'"
 msgstr "删除 ebtables 规则允许 '%s' 中的 MAC 地址失败"
 
-#: src/remote/remote_client_bodies.h:17 src/remote/remote_client_bodies.h:2348
-#: src/remote/remote_client_bodies.h:2387
-#: src/remote/remote_client_bodies.h:2484
-#: src/remote/remote_client_bodies.h:2723
-#: src/remote/remote_client_bodies.h:2757
-#: src/remote/remote_client_bodies.h:3145
-#: src/remote/remote_client_bodies.h:5556 src/remote/remote_driver.c:1998
+#: src/remote/remote_client_bodies.h:17 src/remote/remote_client_bodies.h:1219
+#: src/remote/remote_client_bodies.h:1258
+#: src/remote/remote_client_bodies.h:1326
+#: src/remote/remote_client_bodies.h:1498
+#: src/remote/remote_client_bodies.h:1532
+#: src/remote/remote_client_bodies.h:1868
+#: src/remote/remote_client_bodies.h:4967
 #, c-format
 msgid "%s length greater than maximum: %d > %d"
 msgstr "%s 长度超过上限：%d > %d"
 
-#: src/remote/remote_client_bodies.h:292 src/remote/remote_client_bodies.h:309
-#: src/remote/remote_client_bodies.h:352 src/remote/remote_client_bodies.h:369
-#: src/remote/remote_client_bodies.h:412 src/remote/remote_client_bodies.h:429
-#: src/remote/remote_client_bodies.h:472 src/remote/remote_client_bodies.h:489
-#: src/remote/remote_client_bodies.h:532 src/remote/remote_client_bodies.h:549
-#: src/remote/remote_client_bodies.h:592 src/remote/remote_client_bodies.h:609
-#: src/remote/remote_client_bodies.h:652 src/remote/remote_client_bodies.h:669
-#: src/remote/remote_client_bodies.h:712 src/remote/remote_client_bodies.h:729
-#: src/remote/remote_client_bodies.h:772 src/remote/remote_client_bodies.h:789
-#: src/remote/remote_client_bodies.h:3881
-#: src/remote/remote_client_bodies.h:3900
-#: src/remote/remote_client_bodies.h:3943
-#: src/remote/remote_client_bodies.h:3962
-#: src/remote/remote_client_bodies.h:4960
-#: src/remote/remote_client_bodies.h:4978
-#: src/remote/remote_client_bodies.h:5162
-#: src/remote/remote_client_bodies.h:5181
-#: src/remote/remote_client_bodies.h:5914
-#: src/remote/remote_client_bodies.h:5932
+#: src/remote/remote_client_bodies.h:2378
+#: src/remote/remote_client_bodies.h:2397
+#: src/remote/remote_client_bodies.h:2441
+#: src/remote/remote_client_bodies.h:2460
+#: src/remote/remote_client_bodies.h:3185
+#: src/remote/remote_client_bodies.h:3202
+#: src/remote/remote_client_bodies.h:3246
+#: src/remote/remote_client_bodies.h:3263
+#: src/remote/remote_client_bodies.h:3307
+#: src/remote/remote_client_bodies.h:3324
+#: src/remote/remote_client_bodies.h:3368
+#: src/remote/remote_client_bodies.h:3385
+#: src/remote/remote_client_bodies.h:3429
+#: src/remote/remote_client_bodies.h:3446
+#: src/remote/remote_client_bodies.h:3490
+#: src/remote/remote_client_bodies.h:3507
+#: src/remote/remote_client_bodies.h:3551
+#: src/remote/remote_client_bodies.h:3568
+#: src/remote/remote_client_bodies.h:3612
+#: src/remote/remote_client_bodies.h:3629
+#: src/remote/remote_client_bodies.h:3673
+#: src/remote/remote_client_bodies.h:3690
+#: src/remote/remote_client_bodies.h:4189
+#: src/remote/remote_client_bodies.h:4207
+#: src/remote/remote_client_bodies.h:4362
+#: src/remote/remote_client_bodies.h:4381
+#: src/remote/remote_client_bodies.h:5325
+#: src/remote/remote_client_bodies.h:5343
 #, c-format
 msgid "too many remote undefineds: %d > %d"
 msgstr "未定义的远程太多：%d > %d"
 
-#: src/remote/remote_driver.c:401
+#: src/remote/remote_driver.c:549
 #, c-format
 msgid "Failed to parse value of URI component %s"
 msgstr "解析 URI 组件 %s 值失败"
 
-#: src/remote/remote_driver.c:473
+#: src/remote/remote_driver.c:354
 #, c-format
 msgid "using unix socket and remote server '%s' is not supported."
 msgstr "不支持少于 unix 插槽并删除服务器 '%s'"
 
-#: src/remote/remote_driver.c:490
+#: src/remote/remote_driver.c:638
 msgid ""
 "remote_open: transport in URL not recognised (should be "
 "tls|unix|ssh|ext|tcp|libssh2)"
 msgstr "remote_open: 无法识别 URL 中的传输（应为 tls|unix|ssh|ext|tcp|libssh2）"
 
-#: src/remote/remote_driver.c:511
+#: src/remote/remote_driver.c:659
 msgid "Only Unix socket URI transport is allowed in setuid mode"
 msgstr ""
 
-#: src/remote/remote_driver.c:628
+#: src/remote/remote_driver.c:539
 msgid "remote_open: for 'ext' transport, command is required"
 msgstr "remote_open：'ext' 传输需要命令"
 
-#: src/remote/remote_driver.c:647
+#: src/remote/remote_driver.c:795
 msgid "GNUTLS support not available in this build"
 msgstr ""
 
-#: src/remote/remote_driver.c:672
+#: src/remote/remote_driver.c:820
 msgid ""
 "Connecting to session instance without socket path is not supported by the "
 "libssh2 connection driver"
 msgstr "libssh2 连接驱动程序不支持在没有套接字路径的情况下连接到会话实例"
 
-#: src/remote/remote_driver.c:729
+#: src/remote/remote_driver.c:877
 #, c-format
 msgid ""
 "Unable to locate libvirtd daemon in %s (to override, set $LIBVIRTD_PATH to "
 "the name of the libvirtd binary)"
 msgstr "无法在 %s 定位 libvirtd 守护进程（要覆盖它，请将 $LIBVIRTD_PATH 设定为 libvirtd 二进制名称）"
 
-#: src/remote/remote_driver.c:751
+#: src/remote/remote_driver.c:899
 msgid ""
 "Connecting to session instance without socket path is not supported by the "
 "ssh connection driver"
 msgstr "ssh 连接驱动程序不支持在没有套接字路径的情况下连接到会话实例"
 
-#: src/remote/remote_driver.c:793
+#: src/remote/remote_driver.c:651
 msgid "transport methods unix, ssh and ext are not supported under Windows"
 msgstr "Windows 中不支持 unix、ssh 以及 ext 传输方法"
 
-#: src/remote/remote_driver.c:1252
+#: src/remote/remote_driver.c:1078
 msgid "remoteNodeGetCPUStats: returned number of stats exceeds limit"
 msgstr "remoteNodeGetCPUStats: 返回的统计数据超过限制"
 
-#: src/remote/remote_driver.c:1271 src/remote/remote_driver.c:1335
+#: src/remote/remote_driver.c:1097 src/remote/remote_driver.c:1161
 #, c-format
 msgid "Stats %s too big for destination"
 msgstr "对于目的地来说 stats %s 太大"
 
-#: src/remote/remote_driver.c:1316
+#: src/remote/remote_driver.c:1142
 msgid "remoteNodeGetMemoryStats: returned number of stats exceeds limit"
 msgstr "remoteNodeGetMemoryStats: 返回的统计数据超过限制"
 
-#: src/remote/remote_driver.c:1367
+#: src/remote/remote_driver.c:1194
 #, c-format
 msgid "too many NUMA cells: %d > %d"
 msgstr "NUMA 单元过多：%d > %d"
 
-#: src/remote/remote_driver.c:1599
+#: src/remote/remote_driver.c:1365
 msgid "returned number of parameters exceeds limit"
 msgstr "返回的参数值超过限制"
 
-#: src/remote/remote_driver.c:1685
+#: src/remote/remote_driver.c:1851
 msgid "returned number of disk errors exceeds limit"
 msgstr "返回的磁盘错误数值超过限制"
 
-#: src/remote/remote_driver.c:1733
+#: src/remote/remote_driver.c:1462
 msgid "remoteDomainBlockStatsFlags: returned number of stats exceeds limit"
 msgstr "remoteDomainBlockStatsFlags: 返回的统计数据超过限额"
 
-#: src/remote/remote_driver.c:1928 src/remote/remote_driver.c:2098
+#: src/remote/remote_driver.c:1609 src/remote/remote_driver.c:1682
 #, c-format
 msgid "vCPU count exceeds maximum: %d > %d"
 msgstr "vCPU 计数超过最大值：%d > %d"
 
-#: src/remote/remote_driver.c:1936 src/remote/remote_driver.c:2040
-#: src/remote/remote_driver.c:2105
+#: src/remote/remote_driver.c:1617 src/remote/remote_driver.c:1689
 #, c-format
 msgid "vCPU map buffer length exceeds maximum: %d > %d"
 msgstr "vCPU 映像缓冲长度超过最大值：%d > %d"
 
-#: src/remote/remote_driver.c:1957 src/remote/remote_driver.c:2122
+#: src/remote/remote_driver.c:1638 src/remote/remote_driver.c:1706
 #, c-format
 msgid "host reports too many vCPUs: %d > %d"
 msgstr "主机报告太多 vCPU：%d > %d"
 
-#: src/remote/remote_driver.c:1964 src/remote/remote_driver.c:2060
-#: src/remote/remote_driver.c:2128
+#: src/remote/remote_driver.c:1645 src/remote/remote_driver.c:1712
 #, c-format
 msgid "host reports map buffer length exceeds maximum: %d > %d"
 msgstr "主机报告映像缓冲长度超过最大值：%d > %d"
 
-#: src/remote/remote_driver.c:2178
+#: src/remote/remote_driver.c:2344
 #, c-format
 msgid "security label exceeds maximum: %zu"
 msgstr "安全性标签超过最大值：%zu"
 
-#: src/remote/remote_driver.c:2223
+#: src/remote/remote_driver.c:1762
 #, c-format
 msgid "security label exceeds maximum: %zd"
 msgstr "安全性标签超过最大值：%zd"
 
-#: src/remote/remote_driver.c:2295
+#: src/remote/remote_driver.c:2461
 #, c-format
 msgid "security model exceeds maximum: %zu"
 msgstr "安全性模式超过最大值：%zu"
 
-#: src/remote/remote_driver.c:2304
+#: src/remote/remote_driver.c:2470
 #, c-format
 msgid "security doi exceeds maximum: %zu"
 msgstr "安全性 doi 超过最大值：%zu"
 
-#: src/remote/remote_driver.c:2391
+#: src/remote/remote_driver.c:1928
 msgid "caller ignores cookie or cookielen"
 msgstr "调度程序忽略 cookie 或者 cookielen"
 
-#: src/remote/remote_driver.c:2400 src/remote/remote_driver.c:5453
-#: src/remote/remote_driver.c:6445
+#: src/remote/remote_driver.c:1937 src/remote/remote_driver.c:3988
 msgid "caller ignores uri_out"
 msgstr "调度程序忽略 uri_out"
 
-#: src/remote/remote_driver.c:2533
+#: src/remote/remote_driver.c:2040
 #, c-format
 msgid "too many memory stats requested: %d > %d"
 msgstr "stats 请求过多：%d > %d"
 
-#: src/remote/remote_driver.c:2577
+#: src/remote/remote_driver.c:2084
 #, c-format
 msgid "block peek request too large for remote protocol, %zi > %d"
 msgstr "为远程协议请求的块 peek 过大，%zi > %d"
 
-#: src/remote/remote_driver.c:2598 src/remote/remote_driver.c:2649
+#: src/remote/remote_driver.c:2105 src/remote/remote_driver.c:2156
 msgid "returned buffer is not same size as requested"
 msgstr "返回的缓冲和请求的大小不同"
 
-#: src/remote/remote_driver.c:2629
+#: src/remote/remote_driver.c:2136
 #, c-format
 msgid "memory peek request too large for remote protocol, %zi > %d"
 msgstr "为远程协议请求的内存 peek 过大，%zi > %d"
 
-#: src/remote/remote_driver.c:2774
+#: src/remote/remote_driver.c:2940
 #, c-format
 msgid "nparams count exceeds maximum: %u > %u"
 msgstr "nparams 计数超过最大值：%u > %u"
 
-#: src/remote/remote_driver.c:2780
+#: src/remote/remote_driver.c:2946
 #, c-format
 msgid "ncpus count exceeds maximum: %u > %u"
 msgstr "ncpus 计数超过最大值：%u > %u"
 
-#: src/remote/remote_driver.c:2805
+#: src/remote/remote_driver.c:2971
 msgid "remoteDomainGetCPUStats: returned number of stats exceeds limit"
 msgstr "remoteDomainGetCPUStats: 返回的统计数据超过限制"
 
-#: src/remote/remote_driver.c:3720
+#: src/remote/remote_driver.c:2556
 #, c-format
 msgid "unknown authentication type %s"
 msgstr "未知验证类型 %s"
 
-#: src/remote/remote_driver.c:3729
+#: src/remote/remote_driver.c:2565
 #, c-format
 msgid "requested authentication type %s rejected"
 msgstr "请求的验证类型 %s 被拒绝"
 
-#: src/remote/remote_driver.c:3768
+#: src/remote/remote_driver.c:2604
 #, c-format
 msgid "unsupported authentication type %d"
 msgstr "不支持的验证类型 %d"
 
-#: src/remote/remote_driver.c:4056
+#: src/remote/remote_driver.c:2886 src/remote/remote_driver.c:2956
 msgid "Failed to make auth credentials"
 msgstr "生成验证证书失败"
 
-#: src/remote/remote_driver.c:4067
+#: src/remote/remote_driver.c:2967
 msgid "No authentication callback available"
 msgstr "没有可用认证回叫"
 
-#: src/remote/remote_driver.c:4073 src/remote/remote_driver.c:4391
+#: src/remote/remote_driver.c:2965 src/remote/remote_driver.c:3092
 msgid "Failed to collect auth credentials"
 msgstr "收集验证证书失败"
 
-#: src/remote/remote_driver.c:4179
+#: src/remote/remote_driver.c:2859
 #, c-format
 msgid "SASL mechanism %s not supported by server"
 msgstr "服务器不支持 SASL 机制 %s"
 
-#: src/remote/remote_driver.c:4209
+#: src/remote/remote_driver.c:2907
 #, c-format
 msgid "SASL negotiation data too long: %zu bytes"
 msgstr "SASL 谈判数据太长：%zu 字节"
 
-#: src/remote/remote_driver.c:4308
+#: src/remote/remote_driver.c:3019
 #, c-format
 msgid "negotiation SSF %d was not strong enough"
 msgstr "协商 SSF %d 不够强大"
 
-#: src/remote/remote_driver.c:4968
+#: src/remote/remote_driver.c:3503
 msgid "no internalFlags support"
 msgstr "无 internalFlags 支持"
 
-#: src/remote/remote_driver.c:5385 src/remote/remote_driver.c:5444
-#: src/remote/remote_driver.c:5527 src/remote/remote_driver.c:5588
-#: src/remote/remote_driver.c:5647 src/remote/remote_driver.c:6366
-#: src/remote/remote_driver.c:6436 src/remote/remote_driver.c:6534
-#: src/remote/remote_driver.c:6606 src/remote/remote_driver.c:6679
+#: src/remote/remote_driver.c:3920 src/remote/remote_driver.c:3979
+#: src/remote/remote_driver.c:4061 src/remote/remote_driver.c:4122
+#: src/remote/remote_driver.c:4181
 msgid "caller ignores cookieout or cookieoutlen"
 msgstr "嗲用程序忽略 cookieout 或者 cookieoutlen"
 
-#: src/remote/remote_driver.c:5733
+#: src/remote/remote_driver.c:6243
 #, c-format
 msgid "Too many model names '%d' for limit '%d'"
 msgstr ""
 
-#: src/remote/remote_driver.c:5808
+#: src/remote/remote_driver.c:4275
 msgid ""
 "the caller doesn't support keepalive protocol; perhaps it's missing event "
 "loop implementation"
 msgstr "调用程序不支持 keepalive 协议；可能没有使用事件循环。"
 
-#: src/rpc/virkeepalive.c:254
+#: src/rpc/virkeepalive.c:337
 msgid "keepalive interval already set"
 msgstr "已设定 keepalive 间隔"
 
@@ -18233,7 +18461,7 @@
 msgid "keepalive interval %d too large"
 msgstr ""
 
-#: src/rpc/virnetclient.c:309
+#: src/rpc/virnetclient.c:280
 msgid "unable to make pipe"
 msgstr "无法生成管道"
 
@@ -18245,134 +18473,134 @@
 msgid "Unable to enable keepalives without async IO support"
 msgstr "没有异步 IO 支持无法启用 keepalives"
 
-#: src/rpc/virnetclient.c:710 src/rpc/virnetclient.c:1727
+#: src/rpc/virnetclient.c:540 src/rpc/virnetclient.c:1556
 msgid "failed to wake up polling thread"
 msgstr "叫醒投票线程失败"
 
-#: src/rpc/virnetclient.c:821
+#: src/rpc/virnetclient.c:645
 msgid "Unable to read TLS confirmation"
 msgstr "无法读取 TLS 确认信息。"
 
-#: src/rpc/virnetclient.c:826
+#: src/rpc/virnetclient.c:650
 msgid "server verification (of our certificate or IP address) failed"
 msgstr "服务器认证（证书或者 IP 地址）失败"
 
-#: src/rpc/virnetclient.c:978
+#: src/rpc/virnetclient.c:801
 #, c-format
 msgid "no call waiting for reply with prog %d vers %d serial %d"
 msgstr "没有 prog %d vers %d serial %d 的调用等待回复"
 
-#: src/rpc/virnetclient.c:1147
+#: src/rpc/virnetclient.c:954
 #, c-format
 msgid "got unexpected RPC call prog %d vers %d proc %d type %d"
 msgstr "得到意外的 RPC 调用 prog %d vers %d serial %d type %d"
 
-#: src/rpc/virnetclient.c:1530
+#: src/rpc/virnetclient.c:1402
 msgid "poll on socket failed"
 msgstr "poll on 套接字失败"
 
-#: src/rpc/virnetclient.c:1557
+#: src/rpc/virnetclient.c:1382
 msgid "read on wakeup fd failed"
 msgstr "读取叫醒 fd 失败"
 
-#: src/rpc/virnetclient.c:1601
+#: src/rpc/virnetclient.c:1450
 msgid "received hangup / error event on socket"
 msgstr "在套接字中收到 hangup / error 事件"
 
-#: src/rpc/virnetclient.c:1745
+#: src/rpc/virnetclient.c:1565
 msgid "failed to wait on condition"
 msgstr "等待命令失败：%s"
 
-#: src/rpc/virnetclient.c:1874
+#: src/rpc/virnetclient.c:1691
 msgid "Attempt to send an asynchronous message with a synchronous reply"
 msgstr "尝试使用同步回复发送异步信息"
 
-#: src/rpc/virnetclient.c:1881
+#: src/rpc/virnetclient.c:1697
 msgid "Attempt to send a non-blocking message with a synchronous reply"
 msgstr "尝试使用同步回复发送非阻断信息"
 
-#: src/rpc/virnetclient.c:1891
+#: src/rpc/virnetclient.c:1716
 msgid "cannot initialize condition variable"
 msgstr "无法初始化条件变量"
 
-#: src/rpc/virnetclient.c:1956
+#: src/rpc/virnetclient.c:1710
 msgid "client socket is closed"
 msgstr "已关闭客户端插槽"
 
-#: src/rpc/virnetclientprogram.c:222
+#: src/rpc/virnetclientprogram.c:221
 #, c-format
 msgid "program mismatch in event (actual %x, expected %x)"
 msgstr "事件中有不匹配的程序（实际为 %x，应为 %x）"
 
-#: src/rpc/virnetclientprogram.c:228
+#: src/rpc/virnetclientprogram.c:227
 #, c-format
 msgid "version mismatch in event (actual %x, expected %x)"
 msgstr "事件中有不匹配的版本（实际为 %x，应为 %x）"
 
-#: src/rpc/virnetclientprogram.c:234
+#: src/rpc/virnetclientprogram.c:233
 #, c-format
 msgid "status mismatch in event (actual %x, expected %x)"
 msgstr "事件中 status 不匹配（实际为 %x，应为 %x）"
 
-#: src/rpc/virnetclientprogram.c:240
+#: src/rpc/virnetclientprogram.c:239
 #, c-format
 msgid "type mismatch in event (actual %x, expected %x)"
 msgstr "事件中 type 不匹配（实际为 %x，应为 %x）"
 
-#: src/rpc/virnetclientprogram.c:248
+#: src/rpc/virnetclientprogram.c:247
 #, c-format
 msgid "No event expected with procedure %x"
 msgstr "不应有步骤为 %x 的事件"
 
-#: src/rpc/virnetclientprogram.c:305 src/rpc/virnetclientprogram.c:364
+#: src/rpc/virnetclientprogram.c:308 src/rpc/virnetclientprogram.c:369
 #, c-format
 msgid "Cannot duplicate FD %d"
 msgstr "无法复制 FD %d"
 
-#: src/rpc/virnetclientprogram.c:311 src/rpc/virnetclientprogram.c:370
-#: src/rpc/virnetmessage.c:559
+#: src/rpc/virnetclientprogram.c:314 src/rpc/virnetclientprogram.c:375
+#: src/rpc/virnetmessage.c:514
 #, c-format
 msgid "Cannot set close-on-exec %d"
 msgstr "无法设定 close-on-exec %d"
 
-#: src/rpc/virnetclientprogram.c:337
+#: src/rpc/virnetclientprogram.c:340
 #, c-format
 msgid "Unexpected message type %d"
 msgstr "意外信息类型 %d"
 
-#: src/rpc/virnetclientprogram.c:342
+#: src/rpc/virnetclientprogram.c:345
 #, c-format
 msgid "Unexpected message proc %d != %d"
 msgstr "意外信息 proc %d != %d"
 
-#: src/rpc/virnetclientprogram.c:348
+#: src/rpc/virnetclientprogram.c:351
 #, c-format
 msgid "Unexpected message serial %d != %d"
 msgstr "意外信息序列 %d != %d"
 
-#: src/rpc/virnetclientprogram.c:387
+#: src/rpc/virnetclientprogram.c:392
 #, c-format
 msgid "Unexpected message status %d"
 msgstr "意外信息状态 %d"
 
-#: src/rpc/virnetclientstream.c:433
+#: src/rpc/virnetclientstream.c:456
 msgid "multiple stream callbacks not supported"
 msgstr "不支持多流回叫"
 
-#: src/rpc/virnetclientstream.c:469 src/rpc/virnetclientstream.c:491
+#: src/rpc/virnetclientstream.c:492 src/rpc/virnetclientstream.c:514
 msgid "no stream callback registered"
 msgstr "未注册流回叫"
 
-#: src/rpc/virnetmessage.c:120
+#: src/rpc/virnetmessage.c:122
 msgid "Unable to decode message length"
 msgstr "无法解码信息长度"
 
-#: src/rpc/virnetmessage.c:127
+#: src/rpc/virnetmessage.c:129
 #, c-format
 msgid "packet %d bytes received from server too small, want %d"
 msgstr "从服务器接收的数据包 %d 太小，希望为 %d。"
 
-#: src/rpc/virnetmessage.c:137
+#: src/rpc/virnetmessage.c:139
 #, c-format
 msgid "packet %d bytes received from server too large, want %d"
 msgstr "从服务器接收的数据包 %d 太大，希望为 %d。"
@@ -18381,74 +18609,74 @@
 msgid "Unable to decode header until len is received"
 msgstr ""
 
-#: src/rpc/virnetmessage.c:190
+#: src/rpc/virnetmessage.c:184
 msgid "Unable to decode message header"
 msgstr "无法解码信息标头"
 
-#: src/rpc/virnetmessage.c:234 src/rpc/virnetmessage.c:378
-#: src/rpc/virnetmessage.c:458 src/rpc/virnetmessage.c:483
+#: src/rpc/virnetmessage.c:226 src/rpc/virnetmessage.c:355
+#: src/rpc/virnetmessage.c:420 src/rpc/virnetmessage.c:445
 msgid "Unable to encode message length"
 msgstr "无法解码信息长度"
 
-#: src/rpc/virnetmessage.c:239
+#: src/rpc/virnetmessage.c:231
 msgid "Unable to encode message header"
 msgstr "无法解码信息标头"
 
-#: src/rpc/virnetmessage.c:250
+#: src/rpc/virnetmessage.c:242
 msgid "Unable to re-encode message length"
 msgstr "无法重新编码信息长度"
 
-#: src/rpc/virnetmessage.c:275
+#: src/rpc/virnetmessage.c:267
 #, c-format
 msgid "Too many FDs to send %d, expected %d maximum"
 msgstr "太多 FD 要发送 %d，最多应有 %d。"
 
-#: src/rpc/virnetmessage.c:281
+#: src/rpc/virnetmessage.c:273
 msgid "Unable to encode number of FDs"
 msgstr "无法对 FD 号进行编码"
 
-#: src/rpc/virnetmessage.c:306
+#: src/rpc/virnetmessage.c:298
 msgid "Unable to decode number of FDs"
 msgstr "无法将 FD 号解码"
 
-#: src/rpc/virnetmessage.c:313
+#: src/rpc/virnetmessage.c:305
 #, c-format
 msgid "Received too many FDs %d, expected %d maximum"
 msgstr "收到太多 FD %d，最多应为 %d。"
 
-#: src/rpc/virnetmessage.c:352
+#: src/rpc/virnetmessage.c:342
 msgid "Unable to encode message payload"
 msgstr "无法编码信息净负荷"
 
-#: src/rpc/virnetmessage.c:406
+#: src/rpc/virnetmessage.c:383
 msgid "Unable to decode message payload"
 msgstr "无法解码信息净负荷"
 
-#: src/rpc/virnetmessage.c:433
+#: src/rpc/virnetmessage.c:407
 #, c-format
 msgid "Stream data too long to send (%zu bytes needed, %zu bytes available)"
 msgstr "流数据太长无法发送（需要 %zu 字节，只有 %zu 字节可用）"
 
-#: src/rpc/virnetmessage.c:532
+#: src/rpc/virnetmessage.c:488
 msgid "Library function returned error but did not set virError"
 msgstr "库功能返回出错信息但没有数值 virError"
 
-#: src/rpc/virnetmessage.c:546
+#: src/rpc/virnetmessage.c:501
 #, c-format
 msgid "No FD available at slot %zu"
 msgstr "插槽 %zu 没有可用 FD"
 
-#: src/rpc/virnetmessage.c:552
+#: src/rpc/virnetmessage.c:507
 #, c-format
 msgid "Unable to duplicate FD %d"
 msgstr "无法复制 FD %d"
 
-#: src/rpc/virnetsaslcontext.c:86 src/rpc/virnetsaslcontext.c:108
+#: src/rpc/virnetsaslcontext.c:61 src/rpc/virnetsaslcontext.c:91
 #, c-format
 msgid "failed to initialize SASL library: %d (%s)"
 msgstr "初始化 SASL 程序库验证失败：%d（%s）"
 
-#: src/rpc/virnetsaslcontext.c:144 src/rpc/virnettlscontext.c:383
+#: src/rpc/virnetsaslcontext.c:137 src/rpc/virnettlscontext.c:360
 #, c-format
 msgid "Malformed TLS whitelist regular expression '%s'"
 msgstr "受损的 TLS 白列表正则表达式 '%s'"
@@ -18458,161 +18686,159 @@
 msgid "SASL client identity '%s' not allowed in whitelist"
 msgstr ""
 
-#: src/rpc/virnetsaslcontext.c:157
+#: src/rpc/virnetsaslcontext.c:150
 msgid "Client's username is not on the list of allowed clients"
 msgstr "客户端用户没有在允许的客户端列表中"
 
-#: src/rpc/virnetsaslcontext.c:191 src/rpc/virnetsaslcontext.c:228
+#: src/rpc/virnetsaslcontext.c:218 src/rpc/virnetsaslcontext.c:264
 #, c-format
 msgid "Failed to create SASL client context: %d (%s)"
 msgstr "创建 SASL 客户端环境失败：%d（%s）"
 
-#: src/rpc/virnetsaslcontext.c:250
+#: src/rpc/virnetsaslcontext.c:293
 #, c-format
 msgid "cannot set external SSF %d (%s)"
 msgstr "无法设定外部 SSF %d（%s）"
 
-#: src/rpc/virnetsaslcontext.c:271
+#: src/rpc/virnetsaslcontext.c:314
 #, c-format
 msgid "cannot query SASL username on connection %d (%s)"
 msgstr "在连接到 %d（%s）时不能查询 SASL 用户名"
 
-#: src/rpc/virnetsaslcontext.c:278
+#: src/rpc/virnetsaslcontext.c:321
 msgid "no client username was found"
 msgstr "没有找到客户端用户名"
 
-#: src/rpc/virnetsaslcontext.c:299
+#: src/rpc/virnetsaslcontext.c:342
 #, c-format
 msgid "cannot query SASL ssf on connection %d (%s)"
 msgstr "无法在连接 %d（%s）是查询 SASL"
 
-#: src/rpc/virnetsaslcontext.c:335
+#: src/rpc/virnetsaslcontext.c:378
 #, c-format
 msgid "cannot set security props %d (%s)"
 msgstr "无法设定安全支持 %d（%s）"
 
-#: src/rpc/virnetsaslcontext.c:359
+#: src/rpc/virnetsaslcontext.c:402
 #, c-format
 msgid "cannot get security props %d (%s)"
 msgstr "无法获取安全 props %d (%s)"
 
-#: src/rpc/virnetsaslcontext.c:387
+#: src/rpc/virnetsaslcontext.c:430
 #, c-format
 msgid "cannot list SASL mechanisms %d (%s)"
 msgstr "无法列出 SASL 机制 %d（%s）"
 
-#: src/rpc/virnetsaslcontext.c:437 src/rpc/virnetsaslcontext.c:532
-#: src/rpc/virnetsaslcontext.c:577
+#: src/rpc/virnetsaslcontext.c:483 src/rpc/virnetsaslcontext.c:578
+#: src/rpc/virnetsaslcontext.c:623
 #, c-format
 msgid "Failed to start SASL negotiation: %d (%s)"
 msgstr "启动 SASL 协商失败：%d（%s）"
 
-#: src/rpc/virnetsaslcontext.c:486
+#: src/rpc/virnetsaslcontext.c:532
 #, c-format
 msgid "Failed to step SASL negotiation: %d (%s)"
 msgstr "进入 SASL 谈判失败：%d (%s)"
 
-#: src/rpc/virnetsaslcontext.c:610 src/rpc/virnetsaslcontext.c:649
+#: src/rpc/virnetsaslcontext.c:656 src/rpc/virnetsaslcontext.c:695
 #, c-format
 msgid "SASL data length %zu too long, max %zu"
 msgstr "SASL 数据长度 %zu 太长，最大值为 %zu。"
 
-#: src/rpc/virnetsaslcontext.c:624
+#: src/rpc/virnetsaslcontext.c:670
 #, c-format
 msgid "failed to encode SASL data: %d (%s)"
 msgstr "编码 SASL 数据失败：%d (%s)"
 
-#: src/rpc/virnetsaslcontext.c:662
+#: src/rpc/virnetsaslcontext.c:708
 #, c-format
 msgid "failed to decode SASL data: %d (%s)"
 msgstr "解码 SASL 数据失败：%d (%s)"
 
-#: src/rpc/virnetsocket.c:159
+#: src/rpc/virnetsocket.c:123
 msgid "Unable to set close-on-exec flag"
 msgstr "无法设定 close-on-exec 标签"
 
-#: src/rpc/virnetsocket.c:164
+#: src/rpc/virnetsocket.c:128
 msgid "Unable to enable non-blocking flag"
 msgstr "无法启用 non-blocking 标签"
 
-#: src/rpc/virnetsocket.c:186
+#: src/rpc/virnetsocket.c:160
 msgid "Unable to disable nagle algorithm"
 msgstr "无法禁用 nagle 算法"
 
-#: src/rpc/virnetsocket.c:239 src/rpc/virnetsocket.c:454
+#: src/rpc/virnetsocket.c:213 src/rpc/virnetsocket.c:410
 #, c-format
 msgid "Unable to resolve address '%s' service '%s': %s"
 msgstr "无法解析地址 '%s' 服务 '%s': %s"
 
-#: src/rpc/virnetsocket.c:252 src/rpc/virnetsocket.c:465
+#: src/rpc/virnetsocket.c:226 src/rpc/virnetsocket.c:421
 msgid "Unable to create socket"
 msgstr "无法生成插槽"
 
-#: src/rpc/virnetsocket.c:258
+#: src/rpc/virnetsocket.c:232
 msgid "Unable to enable port reuse"
 msgstr "无法启用端口再利用"
 
-#: src/rpc/virnetsocket.c:275
+#: src/rpc/virnetsocket.c:249
 msgid "Unable to force bind to IPv6 only"
 msgstr "无法强制只捆绑到 IPv6"
 
-#: src/rpc/virnetsocket.c:283 src/rpc/virnetsocket.c:311
+#: src/rpc/virnetsocket.c:257 src/rpc/virnetsocket.c:287
 msgid "Unable to bind to port"
 msgstr "无法捆绑到端口"
 
-#: src/rpc/virnetsocket.c:294 src/rpc/virnetsocket.c:419
-#: src/rpc/virnetsocket.c:490 src/rpc/virnetsocket.c:573
-#: src/rpc/virnetsocket.c:894 src/rpc/virnetsocket.c:946
-#: src/rpc/virnetsocket.c:1737
+#: src/rpc/virnetsocket.c:268 src/rpc/virnetsocket.c:444
+#: src/rpc/virnetsocket.c:523 src/rpc/virnetsocket.c:1272
 msgid "Unable to get local socket name"
 msgstr "无法获取本地插槽名"
 
-#: src/rpc/virnetsocket.c:349 src/rpc/virnetsocket.c:537
+#: src/rpc/virnetsocket.c:325 src/rpc/virnetsocket.c:491
 msgid "Failed to create socket"
 msgstr "生成插槽失败"
 
-#: src/rpc/virnetsocket.c:356 src/rpc/virnetsocket.c:543
+#: src/rpc/virnetsocket.c:332 src/rpc/virnetsocket.c:497
 #, c-format
 msgid "Path %s too long for unix socket"
 msgstr "对于 unix 套接字路径 %s 过长"
 
-#: src/rpc/virnetsocket.c:369
+#: src/rpc/virnetsocket.c:345
 #, c-format
 msgid "Failed to bind socket to '%s'"
 msgstr "将插槽捆绑到 '%s' 失败"
 
-#: src/rpc/virnetsocket.c:380
+#: src/rpc/virnetsocket.c:356
 #, c-format
 msgid "Failed to change ownership of '%s' to %d:%d"
 msgstr "将 '%s' 的拥有者改为 %d 失败：%d"
 
-#: src/rpc/virnetsocket.c:404 src/rpc/virnetsocket.c:593
+#: src/rpc/virnetsocket.c:380 src/rpc/virnetsocket.c:543
 msgid "UNIX sockets are not supported on this platform"
 msgstr "这个平台不支持 UNIX 插槽"
 
-#: src/rpc/virnetsocket.c:483
+#: src/rpc/virnetsocket.c:437
 #, c-format
 msgid "unable to connect to server at '%s:%s'"
 msgstr "无法在 '%s :%s' 连接到服务器"
 
-#: src/rpc/virnetsocket.c:496
+#: src/rpc/virnetsocket.c:450
 msgid "Unable to get remote socket name"
 msgstr "无法获取远程插槽名"
 
-#: src/rpc/virnetsocket.c:532
+#: src/rpc/virnetsocket.c:486
 msgid "Auto-spawn of daemon requested, but no binary specified"
 msgstr "需要 auto-spawn 守护进程，但没有指定二进制文件。"
 
-#: src/rpc/virnetsocket.c:566
+#: src/rpc/virnetsocket.c:516
 #, c-format
 msgid "Failed to connect socket to '%s'"
 msgstr "将插槽连接到 '%s' 失败"
 
-#: src/rpc/virnetsocket.c:615 src/rpc/virnetsocket.c:621
+#: src/rpc/virnetsocket.c:565 src/rpc/virnetsocket.c:571
 msgid "unable to create socket pair"
 msgstr "无法创建套接字对"
 
-#: src/rpc/virnetsocket.c:659
+#: src/rpc/virnetsocket.c:609
 msgid "Tunnelling sockets not supported on this platform"
 msgstr "这个平台不支持管道插槽"
 
@@ -18672,11 +18898,11 @@
 msgid "Cannot disable close-on-exec flag on pipe %d"
 msgstr "无法在管道 %d 中禁用 close-on-exec 标签"
 
-#: src/rpc/virnetsocket.c:1079
+#: src/rpc/virnetsocket.c:787
 msgid "Unable to copy socket file handle"
 msgstr "无法复制插槽文件句柄"
 
-#: src/rpc/virnetsocket.c:1133 src/rpc/virnetsocket.c:1183
+#: src/rpc/virnetsocket.c:837
 msgid "Failed to get client socket identity"
 msgstr "获取客户端插槽身份失败"
 
@@ -18692,7 +18918,7 @@
 msgid "Failed to get client socket PID"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:1244
+#: src/rpc/virnetsocket.c:855
 msgid "Client socket identity not available"
 msgstr "客户端插槽身份不可用"
 
@@ -18700,176 +18926,176 @@
 msgid "Unable to query peer security context"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:1443
+#: src/rpc/virnetsocket.c:985
 #, c-format
 msgid "Cannot recv data: %s"
 msgstr "无法 recv 数据：%s"
 
-#: src/rpc/virnetsocket.c:1446
+#: src/rpc/virnetsocket.c:988
 msgid "Cannot recv data"
 msgstr "无法 recv 数据"
 
-#: src/rpc/virnetsocket.c:1451
+#: src/rpc/virnetsocket.c:993
 #, c-format
 msgid "End of file while reading data: %s"
 msgstr "读取数据时进入文件终点：%s"
 
-#: src/rpc/virnetsocket.c:1454
+#: src/rpc/virnetsocket.c:996
 msgid "End of file while reading data"
 msgstr "读取数据时进入文件终点"
 
-#: src/rpc/virnetsocket.c:1491
+#: src/rpc/virnetsocket.c:1023
 msgid "Cannot write data"
 msgstr "无法写入数据"
 
-#: src/rpc/virnetsocket.c:1496
+#: src/rpc/virnetsocket.c:1028
 msgid "End of file while writing data"
 msgstr "写入数据时进入文件终点"
 
-#: src/rpc/virnetsocket.c:1639
+#: src/rpc/virnetsocket.c:1174
 msgid "Sending file descriptors is not supported on this socket"
 msgstr "这个插槽不支持发送文件描述符"
 
-#: src/rpc/virnetsocket.c:1650
+#: src/rpc/virnetsocket.c:1185
 #, c-format
 msgid "Failed to send file descriptor %d"
 msgstr "发送文件描述符 %d 失败"
 
-#: src/rpc/virnetsocket.c:1673
+#: src/rpc/virnetsocket.c:1208
 msgid "Receiving file descriptors is not supported on this socket"
 msgstr "这个插槽不支持接收文件描述符"
 
-#: src/rpc/virnetsocket.c:1683
+#: src/rpc/virnetsocket.c:1218
 msgid "Failed to recv file descriptor"
 msgstr "接收文件描述符失败"
 
-#: src/rpc/virnetsocket.c:1700
+#: src/rpc/virnetsocket.c:1235
 msgid "Unable to listen on socket"
 msgstr "无法在插槽中侦听"
 
-#: src/rpc/virnetsocket.c:1731
+#: src/rpc/virnetsocket.c:1266
 msgid "Unable to accept client"
 msgstr "无法接受客户端"
 
-#: src/rpc/virnetserver.c:262
+#: src/rpc/virnetserver.c:245
 #, c-format
 msgid "Too many active clients (%zu), dropping connection from %s"
 msgstr "太多活跃客户端（%zu），从 %s 中放弃连接。"
 
-#: src/rpc/virnetserver.c:460
+#: src/rpc/virnetserver.c:461
 msgid "Missing min_workers data in JSON document"
 msgstr "JSON 文档中缺少 min_workers 数据"
 
-#: src/rpc/virnetserver.c:465
+#: src/rpc/virnetserver.c:466
 msgid "Missing max_workers data in JSON document"
 msgstr "JSON 文档中缺少 max_workers 数据"
 
-#: src/rpc/virnetserver.c:470
+#: src/rpc/virnetserver.c:471
 msgid "Missing priority_workers data in JSON document"
 msgstr "JSON 文档中缺少 priority_workers 数据"
 
-#: src/rpc/virnetserver.c:475
+#: src/rpc/virnetserver.c:476
 msgid "Missing max_clients data in JSON document"
 msgstr "JSON 文档中缺少 max_clients 数据"
 
-#: src/rpc/virnetserver.c:480
+#: src/rpc/virnetserver.c:481
 msgid "Missing keepaliveInterval data in JSON document"
 msgstr "JSON 文档中缺少 keepaliveInterval 数据"
 
-#: src/rpc/virnetserver.c:485
+#: src/rpc/virnetserver.c:486
 msgid "Missing keepaliveCount data in JSON document"
 msgstr "JSON 文档中缺少 keepaliveCount 数据"
 
-#: src/rpc/virnetserver.c:490
+#: src/rpc/virnetserver.c:491
 msgid "Missing keepaliveRequired data in JSON document"
 msgstr "JSON 文档中缺少 keepaliveREquired 数据"
 
-#: src/rpc/virnetserver.c:497
+#: src/rpc/virnetserver.c:498
 msgid "Malformed mdnsGroupName data in JSON document"
 msgstr "JSON 文档中的畸形 mdnsGroupName 数据"
 
-#: src/rpc/virnetserver.c:511
+#: src/rpc/virnetserver.c:512
 msgid "Missing services data in JSON document"
 msgstr "JSON 文档缺少 serivces 数据"
 
-#: src/rpc/virnetserver.c:518
+#: src/rpc/virnetserver.c:519
 msgid "Malformed services data in JSON document"
 msgstr "JSON 文档中的畸形 service 数据"
 
-#: src/rpc/virnetserver.c:527
+#: src/rpc/virnetserver.c:528
 msgid "Missing service data in JSON document"
 msgstr "JSON 文档中缺少 service 数据"
 
-#: src/rpc/virnetserver.c:544
+#: src/rpc/virnetserver.c:545
 msgid "Missing clients data in JSON document"
 msgstr "JSON 文档中缺少 clients 数据"
 
-#: src/rpc/virnetserver.c:551
+#: src/rpc/virnetserver.c:552
 msgid "Malformed clients data in JSON document"
 msgstr "JSON 文档中的畸形 clients 数据"
 
-#: src/rpc/virnetserver.c:560
+#: src/rpc/virnetserver.c:561
 msgid "Missing client data in JSON document"
 msgstr "JSON 文档中缺少 client 数据"
 
-#: src/rpc/virnetserver.c:601
+#: src/rpc/virnetserver.c:602
 msgid "Cannot set min_workers data in JSON document"
 msgstr "无法在 JSON 文档中设定 min_workers 数据"
 
-#: src/rpc/virnetserver.c:607
+#: src/rpc/virnetserver.c:608
 msgid "Cannot set max_workers data in JSON document"
 msgstr "无法在 JSON 文档中设定 max_workers 数据"
 
-#: src/rpc/virnetserver.c:613
+#: src/rpc/virnetserver.c:614
 msgid "Cannot set priority_workers data in JSON document"
 msgstr "无法在 JSON 文档中设定 priority_workers 数据"
 
-#: src/rpc/virnetserver.c:618
+#: src/rpc/virnetserver.c:619
 msgid "Cannot set max_clients data in JSON document"
 msgstr "无法在 JSON 文档中设定 max_clients 数据"
 
-#: src/rpc/virnetserver.c:623
+#: src/rpc/virnetserver.c:624
 msgid "Cannot set keepaliveInterval data in JSON document"
 msgstr "无法在 JSON 文档中设定 keepaliveInterval 数据"
 
-#: src/rpc/virnetserver.c:628
+#: src/rpc/virnetserver.c:629
 msgid "Cannot set keepaliveCount data in JSON document"
 msgstr "无法在 JSON 文档中设定 keepaliveCount 数据"
 
-#: src/rpc/virnetserver.c:633
+#: src/rpc/virnetserver.c:634
 msgid "Cannot set keepaliveRequired data in JSON document"
 msgstr "无法在 JSON 文档中设定 keepaliveRequired 数据"
 
-#: src/rpc/virnetserver.c:640
+#: src/rpc/virnetserver.c:641
 msgid "Cannot set mdnsGroupName data in JSON document"
 msgstr "无法在 JSON 文档中设定 mdnsGroupName 数据"
 
-#: src/rpc/virnetserver.c:803
+#: src/rpc/virnetserver.c:804
 msgid "Libvirt"
 msgstr ""
 
-#: src/rpc/virnetserver.c:804
+#: src/rpc/virnetserver.c:805
 msgid "Virtual machines need to be saved"
 msgstr ""
 
-#: src/rpc/virnetserver.c:869
+#: src/rpc/virnetserver.c:489
 msgid "Failed to read from signal pipe"
 msgstr "读取信号管道失败"
 
-#: src/rpc/virnetserver.c:886
+#: src/rpc/virnetserver.c:506
 #, c-format
 msgid "Unexpected signal received: %d"
 msgstr "收到意外的信号：%d"
 
-#: src/rpc/virnetserver.c:901
+#: src/rpc/virnetserver.c:521
 msgid "Unable to create signal pipe"
 msgstr "无法生成信号管道"
 
-#: src/rpc/virnetserver.c:910
+#: src/rpc/virnetserver.c:530
 msgid "Failed to add signal handle watch"
 msgstr "添加信号处理观察失败"
 
-#: src/rpc/virnetserver.c:1084
+#: src/rpc/virnetserver.c:708
 msgid "Failed to register shutdown timeout"
 msgstr "注册关机超时失败"
 
@@ -18893,17 +19119,17 @@
 msgid "Missing privateData field in JSON state document"
 msgstr "JSON 文档中缺少 privateData 字段"
 
-#: src/rpc/virnetserverclient.c:1106 src/rpc/virnetserverclient.c:1286
+#: src/rpc/virnetserverclient.c:788 src/rpc/virnetserverclient.c:947
 #, c-format
 msgid "unexpected zero/negative length request %lld"
 msgstr "请求 %lld 的意外 0/负长度"
 
-#: src/rpc/virnetservermdns.c:291
+#: src/rpc/virnetservermdns.c:289
 #, c-format
 msgid "Failed to add watch for fd %d events %d"
 msgstr "为 fd %d 事件  %d 添加 watch 失败"
 
-#: src/rpc/virnetservermdns.c:344 src/util/virtime.c:244
+#: src/rpc/virnetservermdns.c:344 src/util/virtime.c:247
 msgid "Unable to get current time"
 msgstr "无法获取当期时间"
 
@@ -18912,7 +19138,7 @@
 msgid "Failed to add timer with timeout %lld"
 msgstr "无超时 %lld 添加计时器会失败"
 
-#: src/rpc/virnetservermdns.c:457
+#: src/rpc/virnetservermdns.c:459
 #, c-format
 msgid "Failed to create mDNS client: %s"
 msgstr "生成 mDNS 客户端失败：%s"
@@ -18921,37 +19147,37 @@
 msgid "avahi not available at build time"
 msgstr "构建时 avahi 不可用"
 
-#: src/rpc/virnetserverprogram.c:238
+#: src/rpc/virnetserverprogram.c:222
 #, c-format
 msgid "Cannot find program %d version %d"
 msgstr "无法找到程序 %d 版本 %d"
 
-#: src/rpc/virnetserverprogram.c:290
+#: src/rpc/virnetserverprogram.c:274
 #, c-format
 msgid "program mismatch (actual %x, expected %x)"
 msgstr "程序不匹配（实际为 %x，应为 %x）"
 
-#: src/rpc/virnetserverprogram.c:297
+#: src/rpc/virnetserverprogram.c:281
 #, c-format
 msgid "version mismatch (actual %x, expected %x)"
-msgstr "版本不匹配 (实际是 %x，想要的是 %x)"
+msgstr "版本不匹配（实际是 %x，想要的是 %x）"
 
-#: src/rpc/virnetserverprogram.c:327
+#: src/rpc/virnetserverprogram.c:311
 #, c-format
 msgid "Unexpected message type %u"
 msgstr "意外的信息类型 %u"
 
-#: src/rpc/virnetserverprogram.c:384
+#: src/rpc/virnetserverprogram.c:367
 #, c-format
 msgid "Unexpected message status %u"
 msgstr "意外信息状态 %u"
 
-#: src/rpc/virnetserverprogram.c:393
+#: src/rpc/virnetserverprogram.c:376
 #, c-format
 msgid "unknown procedure: %d"
 msgstr "未知过程：%d"
 
-#: src/rpc/virnetserverprogram.c:407
+#: src/rpc/virnetserverprogram.c:390
 msgid "authentication required"
 msgstr "需要验证"
 
@@ -19080,7 +19306,7 @@
 msgid "failed to retrieve password"
 msgstr ""
 
-#: src/rpc/virnetsshsession.c:748 src/util/virerror.c:987
+#: src/util/virterror.c:1022
 #, c-format
 msgid "authentication failed: %s"
 msgstr "验证失败: %s"
@@ -19202,103 +19428,103 @@
 msgid "write failed: %s"
 msgstr "写入失败：%s"
 
-#: src/rpc/virnettlscontext.c:116
+#: src/rpc/virnettlscontext.c:91
 #, c-format
 msgid "Cannot read %s '%s'"
 msgstr "无法读取 %s '%s'"
 
-#: src/rpc/virnettlscontext.c:139
+#: src/rpc/virnettlscontext.c:114
 msgid "cannot get current time"
 msgstr "无法获得当前时间"
 
-#: src/rpc/virnettlscontext.c:146
+#: src/rpc/virnettlscontext.c:121
 #, c-format
 msgid "The CA certificate %s has expired"
 msgstr "CA 证书 %s 已过期"
 
-#: src/rpc/virnettlscontext.c:148
+#: src/rpc/virnettlscontext.c:123
 #, c-format
 msgid "The server certificate %s has expired"
 msgstr "服务器证书 %s 已过期"
 
-#: src/rpc/virnettlscontext.c:149
+#: src/rpc/virnettlscontext.c:124
 #, c-format
 msgid "The client certificate %s has expired"
 msgstr "客户端证书 %s 已过期"
 
-#: src/rpc/virnettlscontext.c:157
+#: src/rpc/virnettlscontext.c:132
 #, c-format
 msgid "The CA certificate %s is not yet active"
 msgstr "CA 证书 %s 还为激活"
 
-#: src/rpc/virnettlscontext.c:159
+#: src/rpc/virnettlscontext.c:134
 #, c-format
 msgid "The server certificate %s is not yet active"
 msgstr "服务器证书 %s 尚未激活"
 
-#: src/rpc/virnettlscontext.c:160
+#: src/rpc/virnettlscontext.c:135
 #, c-format
 msgid "The client certificate %s is not yet active"
 msgstr "客户端证书 %s 尚未激活"
 
-#: src/rpc/virnettlscontext.c:190
+#: src/rpc/virnettlscontext.c:165
 #, c-format
 msgid ""
 "The certificate %s basic constraints show a CA, but we need one for a server"
 msgstr "证书 %s 基本约束显示一个 CA，但我们的服务器还需要一个。"
 
-#: src/rpc/virnettlscontext.c:191
+#: src/rpc/virnettlscontext.c:166
 #, c-format
 msgid ""
 "The certificate %s basic constraints show a CA, but we need one for a client"
 msgstr "证书 %s 基本约束显示一个 CA，但我们的客户端还需要一个。"
 
-#: src/rpc/virnettlscontext.c:198
+#: src/rpc/virnettlscontext.c:173
 #, c-format
 msgid "The certificate %s basic constraints do not show a CA"
 msgstr "证书 %s 基本约束未显示一个 CA。"
 
-#: src/rpc/virnettlscontext.c:205
+#: src/rpc/virnettlscontext.c:180
 #, c-format
 msgid "The certificate %s is missing basic constraints for a CA"
 msgstr "证书 %s 缺少 CA 的基本约束。"
 
-#: src/rpc/virnettlscontext.c:211
+#: src/rpc/virnettlscontext.c:186
 #, c-format
 msgid "Unable to query certificate %s basic constraints %s"
 msgstr "无法查询证书 %s 的基本约束 %s"
 
-#: src/rpc/virnettlscontext.c:238
+#: src/rpc/virnettlscontext.c:213
 #, c-format
 msgid "Unable to query certificate %s key usage %s"
 msgstr "无法查询证书 %s 的主要用法 %s"
 
-#: src/rpc/virnettlscontext.c:248
+#: src/rpc/virnettlscontext.c:223
 #, c-format
 msgid "Certificate %s usage does not permit certificate signing"
 msgstr "证书 %s 用法不允许签署证书"
 
-#: src/rpc/virnettlscontext.c:260
+#: src/rpc/virnettlscontext.c:235
 #, c-format
 msgid "Certificate %s usage does not permit digital signature"
 msgstr "证书 %s 用法不允许数字签名"
 
-#: src/rpc/virnettlscontext.c:271
+#: src/rpc/virnettlscontext.c:246
 #, c-format
 msgid "Certificate %s usage does not permit key encipherment"
 msgstr "证书 %s 用法不允许 key 部分"
 
-#: src/rpc/virnettlscontext.c:312 src/rpc/virnettlscontext.c:324
+#: src/rpc/virnettlscontext.c:287 src/rpc/virnettlscontext.c:301
 #, c-format
 msgid "Unable to query certificate %s key purpose %s"
 msgstr "无法查询证书 %s 秒目的 %s"
 
-#: src/rpc/virnettlscontext.c:347
+#: src/rpc/virnettlscontext.c:324
 #, c-format
 msgid "Certificate %s purpose does not allow use for with a TLS server"
 msgstr "证书 %s 目的不允许使用 TLS 服务器的用户"
 
-#: src/rpc/virnettlscontext.c:359
+#: src/rpc/virnettlscontext.c:336
 #, c-format
 msgid "Certificate %s purpose does not allow use for with a TLS client"
 msgstr "证书 %s 目的不允许使用 TLS 服务器的用户"
@@ -19314,56 +19540,56 @@
 "clientcert.pem' 查看客户端证书的专有名称（Distinguished Name）字段，或者在运行这个守护进程时添加 --verbose "
 "选项。"
 
-#: src/rpc/virnettlscontext.c:419
+#: src/rpc/virnettlscontext.c:396
 #, c-format
 msgid "Certificate %s owner does not match the hostname %s"
 msgstr "证书 %s 拥有者与主机名 %s 不符"
 
-#: src/rpc/virnettlscontext.c:470
+#: src/rpc/virnettlscontext.c:446
 #, c-format
 msgid "Unable to verify server certificate %s against CA certificate %s"
 msgstr "无法根据 CA 证书 %s 确认证书 %s"
 
-#: src/rpc/virnettlscontext.c:471
+#: src/rpc/virnettlscontext.c:447
 #, c-format
 msgid "Unable to verify client certificate %s against CA certificate %s"
 msgstr "无法根据 CA 证书 %s 确认证书 %s"
 
-#: src/rpc/virnettlscontext.c:477 src/rpc/virnettlscontext.c:1009
+#: src/rpc/virnettlscontext.c:453 src/rpc/virnettlscontext.c:964
 msgid "Invalid certificate"
 msgstr "无效证书"
 
-#: src/rpc/virnettlscontext.c:480 src/rpc/virnettlscontext.c:1012
+#: src/rpc/virnettlscontext.c:456 src/rpc/virnettlscontext.c:967
 msgid "The certificate is not trusted."
 msgstr "该证书不可信。"
 
-#: src/rpc/virnettlscontext.c:483 src/rpc/virnettlscontext.c:1015
+#: src/rpc/virnettlscontext.c:459 src/rpc/virnettlscontext.c:970
 msgid "The certificate hasn't got a known issuer."
 msgstr "该证书没有公认发行人。"
 
-#: src/rpc/virnettlscontext.c:486 src/rpc/virnettlscontext.c:1018
+#: src/rpc/virnettlscontext.c:462 src/rpc/virnettlscontext.c:973
 msgid "The certificate has been revoked."
 msgstr "证书已撤销。"
 
-#: src/rpc/virnettlscontext.c:490 src/rpc/virnettlscontext.c:1022
+#: src/rpc/virnettlscontext.c:466 src/rpc/virnettlscontext.c:977
 msgid "The certificate uses an insecure algorithm"
 msgstr "该证书使用不安全的算法"
 
-#: src/rpc/virnettlscontext.c:494
+#: src/rpc/virnettlscontext.c:470
 #, c-format
 msgid "Our own certificate %s failed validation against %s: %s"
 msgstr "我们的证书 %s 无法根据 %s 进行验证：%s"
 
-#: src/rpc/virnettlscontext.c:516 src/rpc/virnettlscontext.c:1048
+#: src/rpc/virnettlscontext.c:493 src/rpc/virnettlscontext.c:1003
 msgid "Unable to initialize certificate"
 msgstr "无法初始化证书"
 
-#: src/rpc/virnettlscontext.c:528
+#: src/rpc/virnettlscontext.c:505
 #, c-format
 msgid "Unable to import server certificate %s"
 msgstr "无法导入服务器证书 %s"
 
-#: src/rpc/virnettlscontext.c:529
+#: src/rpc/virnettlscontext.c:506
 #, c-format
 msgid "Unable to import client certificate %s"
 msgstr "无法导入客户端证书 %s"
@@ -19373,88 +19599,88 @@
 msgid "Unable to import CA certificate list %s"
 msgstr ""
 
-#: src/rpc/virnettlscontext.c:644
+#: src/rpc/virnettlscontext.c:581
 #, c-format
 msgid "Unable to set x509 CA certificate: %s: %s"
 msgstr "无法设定 x509 CA 证书：%s：%s"
 
-#: src/rpc/virnettlscontext.c:662
+#: src/rpc/virnettlscontext.c:599
 #, c-format
 msgid "Unable to set x509 certificate revocation list: %s: %s"
 msgstr "无法设定 x509 证书取消列表：%s：%s"
 
-#: src/rpc/virnettlscontext.c:687
+#: src/rpc/virnettlscontext.c:624
 #, c-format
 msgid "Unable to set x509 key and certificate: %s, %s: %s"
 msgstr "无法设定 x509 密钥和证书：%s，%s: %s"
 
-#: src/rpc/virnettlscontext.c:735
+#: src/rpc/virnettlscontext.c:680
 #, c-format
 msgid "Unable to allocate x509 credentials: %s"
 msgstr "无法分配 x509 凭据：%s"
 
-#: src/rpc/virnettlscontext.c:756
+#: src/rpc/virnettlscontext.c:701
 #, c-format
 msgid "Unable to initialize diffie-hellman parameters: %s"
 msgstr "无法初始化 diffie-hellman 参数：%s"
 
-#: src/rpc/virnettlscontext.c:763
+#: src/rpc/virnettlscontext.c:708
 #, c-format
 msgid "Unable to generate diffie-hellman parameters: %s"
 msgstr "无法生成 diffie-hellman 参数：%s"
 
-#: src/rpc/virnettlscontext.c:1003
+#: src/rpc/virnettlscontext.c:958
 #, c-format
 msgid "Unable to verify TLS peer: %s"
 msgstr "无法验证 TLS 对等：%s"
 
-#: src/rpc/virnettlscontext.c:1026
+#: src/rpc/virnettlscontext.c:981
 #, c-format
 msgid "Certificate failed validation: %s"
 msgstr "证书验证失败：%s"
 
-#: src/rpc/virnettlscontext.c:1033
+#: src/rpc/virnettlscontext.c:988
 msgid "Only x509 certificates are supported"
 msgstr "只支持 x509 证书"
 
-#: src/rpc/virnettlscontext.c:1039
+#: src/rpc/virnettlscontext.c:994
 msgid "The certificate has no peers"
 msgstr "无对等证书"
 
-#: src/rpc/virnettlscontext.c:1054
+#: src/rpc/virnettlscontext.c:1009
 msgid "Unable to load certificate"
 msgstr "无法载入证书"
 
-#: src/rpc/virnettlscontext.c:1069
+#: src/rpc/virnettlscontext.c:1024
 #, c-format
 msgid "Failed to get certificate %s distinguished name: %s"
 msgstr "获取证书 %s 的可识别名称失败：%s"
 
-#: src/rpc/virnettlscontext.c:1143
+#: src/rpc/virnettlscontext.c:1096
 msgid "Failed to verify peer's certificate"
 msgstr "对等证书验证失败"
 
-#: src/rpc/virnettlscontext.c:1217
+#: src/rpc/virnettlscontext.c:1195
 #, c-format
 msgid "Failed to initialize TLS session: %s"
 msgstr "初始化 TLS 会话失败：%s"
 
-#: src/rpc/virnettlscontext.c:1227
+#: src/rpc/virnettlscontext.c:1205
 #, c-format
 msgid "Failed to set TLS session priority %s"
 msgstr "设定 TLS 会话优先权 %s 失败"
 
-#: src/rpc/virnettlscontext.c:1236
+#: src/rpc/virnettlscontext.c:1214
 #, c-format
 msgid "Failed set TLS x509 credentials: %s"
 msgstr "设定 TLS x509 凭据失败：%s"
 
-#: src/rpc/virnettlscontext.c:1368
+#: src/rpc/virnettlscontext.c:1356
 #, c-format
 msgid "TLS handshake failed %s"
 msgstr "TLS 握手失败 %s"
 
-#: src/rpc/virnettlscontext.c:1400
+#: src/rpc/virnettlscontext.c:1388
 msgid "invalid cipher size for TLS session"
 msgstr "对 TLS 会话无效的密码大小"
 
@@ -19463,177 +19689,175 @@
 msgid "mkostemp('%s') failed"
 msgstr ""
 
-#: src/secret/secret_driver.c:184
+#: src/secret/secret_driver.c:180
 #, c-format
 msgid "fchmod('%s') failed"
 msgstr "fchmod('%s') 失败"
 
-#: src/secret/secret_driver.c:190
+#: src/secret/secret_driver.c:186
 #, c-format
 msgid "error writing to '%s'"
 msgstr "写入 '%s' 出错"
 
-#: src/secret/secret_driver.c:195
+#: src/secret/secret_driver.c:191
 #, c-format
 msgid "error closing '%s'"
 msgstr "关闭 '%s' 出错"
 
-#: src/secret/secret_driver.c:201
+#: src/secret/secret_driver.c:197
 #, c-format
 msgid "rename(%s, %s) failed"
 msgstr "重命名(%s, %s) 失败"
 
-#: src/secret/secret_driver.c:248
+#: src/secret/secret_driver.c:247
 #, c-format
 msgid "cannot create '%s'"
 msgstr "无法生成 '%s'"
 
-#: src/secret/secret_driver.c:355
+#: src/secret/secret_driver.c:354
 #, c-format
 msgid "<uuid> does not match secret file name '%s'"
 msgstr "<uuid> 与 secret 文件名 '%s' 不匹配"
 
-#: src/secret/secret_driver.c:382 src/secret/secret_driver.c:481
+#: src/secret/secret_driver.c:381 src/secret/secret_driver.c:488
 #, c-format
 msgid "cannot open '%s'"
 msgstr "无法打开 '%s'"
 
-#: src/secret/secret_driver.c:386 src/storage/storage_backend_gluster.c:210
-#: src/util/virfile.c:508
+#: src/secret/secret_driver.c:385
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "无法对 '%s' 执行 state 命令"
 
-#: src/secret/secret_driver.c:391
+#: src/secret/secret_driver.c:390
 #, c-format
 msgid "'%s' file does not fit in memory"
 msgstr "'%s' 不适用于内存"
 
-#: src/secret/secret_driver.c:398
+#: src/secret/secret_driver.c:399
 #, c-format
 msgid "cannot read '%s'"
 msgstr "无法读取 '%s'"
 
-#: src/secret/secret_driver.c:405
+#: src/secret/secret_driver.c:406
 #, c-format
 msgid "invalid base64 in '%s'"
 msgstr "'%s' 中无效的 base64"
 
-#: src/secret/secret_driver.c:497
+#: src/secret/secret_driver.c:504
 #, c-format
 msgid "Error reading secret: %s"
 msgstr "读取 secret 出错：%s"
 
-#: src/secret/secret_driver.c:725 src/secret/secret_driver.c:904
-#: src/secret/secret_driver.c:941 src/secret/secret_driver.c:999
-#: src/secret/secret_driver.c:1046
+#: src/secret/secret_driver.c:637 src/secret/secret_driver.c:809
+#: src/secret/secret_driver.c:845 src/secret/secret_driver.c:900
+#: src/secret/secret_driver.c:946
 #, c-format
 msgid "no secret with matching uuid '%s'"
 msgstr "没有满足 uuid 为 '%s' 的 secret"
 
-#: src/secret/secret_driver.c:755
+#: src/secret/secret_driver.c:664
 #, c-format
 msgid "no secret with matching usage '%s'"
 msgstr "没有满足用量为 '%s' 的 secret"
 
-#: src/secret/secret_driver.c:803
+#: src/secret/secret_driver.c:706
 #, c-format
 msgid "a secret with UUID %s already defined for use with %s"
 msgstr "已将 UUID 为%s 的 secret 定义为与 %s 一同使用"
 
-#: src/secret/secret_driver.c:821
+#: src/secret/secret_driver.c:726
 #, c-format
 msgid "a secret with UUID %s is already defined for use with %s"
 msgstr "已将 UUID 为%s 的 secret 定义为与 %s 一同使用"
 
-#: src/secret/secret_driver.c:828
+#: src/secret/secret_driver.c:733
 msgid "cannot change private flag on existing secret"
 msgstr "无法在现有 secret 中更改专用标签"
 
-#: src/secret/secret_driver.c:876
+#: src/secret/secret_driver.c:781
 msgid "list of secrets is inconsistent"
 msgstr "secret 列表不一致"
 
-#: src/secret/secret_driver.c:1010
+#: src/secret/secret_driver.c:908
 #, c-format
 msgid "secret '%s' does not have a value"
 msgstr "secret '%s' 没有数值"
 
-#: src/secret/secret_driver.c:1017
+#: src/secret/secret_driver.c:915
 msgid "secret is private"
 msgstr "secret 是专用的"
 
-#: src/security/security_apparmor.c:93
+#: src/security/security_apparmor.c:85
 #, c-format
 msgid "Failed to read AppArmor profiles list '%s'"
 msgstr "读取 AppArmor 配置文件列表 '%s' 失败"
 
-#: src/security/security_apparmor.c:140
+#: src/security/security_apparmor.c:134
 #, c-format
 msgid "Failed to read '%s'"
 msgstr "读取 '%s' 失败"
 
-#: src/security/security_apparmor.c:245
+#: src/security/security_apparmor.c:242
 msgid "could not find libvirtd"
 msgstr "无法找到 libvirtd"
 
-#: src/security/security_apparmor.c:286 src/security/security_apparmor.c:314
-#: src/security/security_apparmor.c:715
+#: src/security/security_apparmor.c:279 src/security/security_apparmor.c:303
+#: src/security/security_apparmor.c:321 src/security/security_apparmor.c:643
 #, c-format
 msgid "cannot update AppArmor profile '%s'"
 msgstr "无法更新 AppArmor 配置文件 '%s'"
 
-#: src/security/security_apparmor.c:362
+#: src/security/security_apparmor.c:348
 #, c-format
 msgid "template '%s' does not exist"
 msgstr "模板 '%s' 不存在"
 
-#: src/security/security_apparmor.c:423
+#: src/security/security_apparmor.c:404
 msgid "Cannot set a base label with AppArmour"
 msgstr "无法使用 AppArmour 设定基础标签"
 
-#: src/security/security_apparmor.c:430 src/security/security_selinux.c:594
+#: src/security/security_apparmor.c:412 src/security/security_selinux.c:185
 msgid "security label already defined for VM"
 msgstr "已经为 VM 定义了安全性标签"
 
-#: src/security/security_apparmor.c:450
+#: src/security/security_apparmor.c:442
 #, c-format
 msgid "cannot load AppArmor profile '%s'"
 msgstr "无法载入 AppArmor 侧写 '%s'"
 
-#: src/security/security_apparmor.c:507
+#: src/security/security_apparmor.c:493
 msgid "error copying profile name"
 msgstr "复制配置文件名称时出错"
 
-#: src/security/security_apparmor.c:513
+#: src/security/security_apparmor.c:499
 msgid "error calling profile_status()"
 msgstr "调用 profile_status() 出错"
 
-#: src/security/security_apparmor.c:559
+#: src/security/security_apparmor.c:538
 #, c-format
 msgid "could not remove profile for '%s'"
 msgstr "无法为  '%s' 删除配置文件"
 
-#: src/security/security_apparmor.c:586 src/security/security_apparmor.c:627
-#: src/security/security_selinux.c:1982 src/security/security_selinux.c:2016
-#: src/security/security_selinux.c:2053 src/security/security_selinux.c:2085
-#: src/security/security_selinux.c:2135 src/security/security_selinux.c:2176
+#: src/security/security_apparmor.c:560 src/security/security_selinux.c:1042
+#: src/security/security_selinux.c:1071 src/security/security_selinux.c:1106
+#: src/security/security_selinux.c:1173 src/security/security_selinux.c:1210
 #, c-format
 msgid ""
 "security label driver mismatch: '%s' model configured for domain, but "
 "hypervisor driver is '%s'."
 msgstr "安全标签驱动程序不匹配：为域配置的是  '%s' 型号，但 hypervisor 驱动程序是  '%s'。"
 
-#: src/security/security_apparmor.c:596
+#: src/security/security_apparmor.c:570
 msgid "error calling aa_change_profile()"
 msgstr "调用 aa_change_profile() 出错"
 
-#: src/security/security_apparmor.c:703
+#: src/security/security_apparmor.c:631
 #, c-format
 msgid "'%s' does not exist"
 msgstr "'%s' 不存在"
 
-#: src/security/security_apparmor.c:743
+#: src/security/security_apparmor.c:667
 #, c-format
 msgid "Invalid security label '%s'"
 msgstr "无效安全标签  '%s'"
@@ -19661,31 +19885,31 @@
 msgid "unable to set user and group to '%ld:%ld' on '%s'"
 msgstr "无法在  中将用户和组设定为  '%ld:%ld' '%s'"
 
-#: src/security/security_dac.c:307
+#: src/security/security_dac.c:143
 #, c-format
 msgid "cannot resolve symlink %s"
 msgstr "无法解析系统链接 %s"
 
-#: src/security/security_dac.c:1043 src/security/security_selinux.c:600
+#: src/security/security_selinux.c:191
 msgid "security image label already defined for VM"
 msgstr "已经为 VM 定义安全映像标签"
 
-#: src/security/security_dac.c:1051 src/security/security_selinux.c:607
+#: src/security/security_selinux.c:198
 #, c-format
 msgid "security label model %s is not supported with selinux"
 msgstr "selinux 不支持安全标签模式 %s"
 
-#: src/security/security_dac.c:1061
+#: src/security/security_dac.c:1065
 #, c-format
 msgid "missing label for static security driver in domain %s"
 msgstr "域 %s 的静态安全驱动器缺少标签"
 
-#: src/security/security_dac.c:1073
+#: src/security/security_dac.c:1077
 #, c-format
 msgid "cannot generate dac user and group id for domain %s"
 msgstr "无法为域 %s 生成 dac 用户和组 id"
 
-#: src/security/security_dac.c:1083 src/security/security_selinux.c:678
+#: src/security/security_dac.c:1087 src/security/security_selinux.c:685
 #, c-format
 msgid "unexpected security label type '%s'"
 msgstr "意外的安全标签类型 %s"
@@ -19695,7 +19919,7 @@
 msgid "Security driver %s not enabled"
 msgstr "未启用安全驱动器 %s"
 
-#: src/security/security_driver.c:90
+#: src/security/security_driver.c:71
 #, c-format
 msgid "Security driver %s not found"
 msgstr "未找到安全驱动程序  '%s'"
@@ -19794,12 +20018,12 @@
 msgid "cannot read SELinux virtual domain context file '%s'"
 msgstr "无法读取 SELinux 虚拟域上下文文件 '%s'"
 
-#: src/security/security_selinux.c:520
+#: src/security/security_selinux.c:145
 #, c-format
 msgid "cannot read SELinux virtual image context file %s"
 msgstr "无法读取 SELinux 虚拟映像上下文文件 %s"
 
-#: src/security/security_selinux.c:618
+#: src/security/security_selinux.c:206 src/security/security_selinux.c:1115
 #, c-format
 msgid "unable to allocate socket security context '%s'"
 msgstr "无法分配插槽安全上下文  '%s'"
@@ -19808,79 +20032,80 @@
 msgid "unable to get selinux context range"
 msgstr ""
 
-#: src/security/security_selinux.c:760
+#: src/security/security_selinux.c:767
 #, c-format
 msgid "MCS level for existing domain label %s already reserved"
 msgstr "已为现有域标签 %s 保存 MCS 等级"
 
-#: src/security/security_selinux.c:907
+#: src/security/security_selinux.c:424
 #, c-format
 msgid "unable to set security context '%s' on '%s'"
 msgstr "无法在  '%s' 中设定安全上下文  '%s'"
 
-#: src/security/security_selinux.c:916
+#: src/security/security_selinux.c:433
 #, c-format
 msgid ""
 "Setting security context '%s' on '%s' not supported. Consider setting "
 "virt_use_nfs"
 msgstr "在 '%s' 中部支持设定安全上下文 '%s'。应考虑设置 virt_use_nfs。"
 
-#: src/security/security_selinux.c:972
+#: src/security/security_selinux.c:475
 #, c-format
 msgid "unable to set security context '%s' on fd %d"
 msgstr "无法在 fd %s 中设定安全上下文  '%d'"
 
-#: src/security/security_selinux.c:1819 src/security/security_selinux.c:2233
+#: src/security/security_selinux.c:923 src/security/security_selinux.c:1268
 #, c-format
 msgid "unknown smartcard type %d"
 msgstr "未知智能卡类型 %d"
 
-#: src/security/security_selinux.c:1992
+#: src/security/security_selinux.c:1052
 #, c-format
 msgid "Invalid security label %s"
 msgstr "无效安全性标签 %s"
 
-#: src/security/security_selinux.c:2026
+#: src/security/security_selinux.c:1081
 #, c-format
 msgid "unable to set security context '%s'"
 msgstr "无法设定安全上下文  '%s'"
 
-#: src/security/security_selinux.c:2094
+#: src/security/security_selinux.c:1122
 #, c-format
 msgid "unable to get current process context '%s'"
 msgstr "无法获得当前进程上下文  '%s'"
 
-#: src/security/security_selinux.c:2105 src/security/security_selinux.c:2146
+#: src/security/security_selinux.c:1129 src/security/security_selinux.c:1145
+#: src/security/security_selinux.c:1184
 #, c-format
 msgid "unable to set socket security context '%s'"
 msgstr "无法设定插槽安全上下文  '%s'"
 
-#: src/security/security_selinux.c:2186
+#: src/security/security_selinux.c:1220
 #, c-format
 msgid "unable to clear socket security context '%s'"
 msgstr "无法清除插槽安全上下文  '%s'"
 
-#: src/security/security_selinux.c:2354
+#: src/security/security_selinux.c:2366
 #, c-format
 msgid "cannot stat tap fd %d"
 msgstr "无法执行 stat fd %d"
 
-#: src/security/security_selinux.c:2360
+#: src/security/security_selinux.c:2372
 #, c-format
 msgid "tap fd %d is not character device"
 msgstr "tap fd %d 不是字符设备"
 
-#: src/security/security_selinux.c:2366
+#: src/security/security_selinux.c:2378
 #, c-format
 msgid "cannot lookup default selinux label for tap fd %d"
 msgstr "无法为 tap fd %d 查找默认 selinux 标签"
 
-#: src/security/security_selinux.c:2400
+#: src/security/security_selinux.c:2412
 #, c-format
 msgid "unable to create selinux context for: %s"
 msgstr ""
 
-#: src/security/virt-aa-helper.c:103
+#: src/security/virt-aa-helper.c:90
 #, c-format
 msgid ""
 "\n"
@@ -19913,22 +20138,22 @@
 "    -u | --uuid <uuid>             uuid (profile name)\n"
 "\n"
 
-#: src/security/virt-aa-helper.c:116
+#: src/security/virt-aa-helper.c:103
 msgid ""
 "This command is intended to be used by libvirtd and not used directly.\n"
 msgstr "这个命令旨在由 libvirtd 使用且不可直接使用。\n"
 
-#: src/security/virt-aa-helper.c:124
+#: src/security/virt-aa-helper.c:111
 #, c-format
 msgid "%s: error: %s%c"
 msgstr "%s:错误: %s%c"
 
-#: src/security/virt-aa-helper.c:136
+#: src/security/virt-aa-helper.c:123
 #, c-format
 msgid "%s: warning: %s%c"
 msgstr "%s: 警告: %s%c"
 
-#: src/security/virt-aa-helper.c:142
+#: src/security/virt-aa-helper.c:129
 #, c-format
 msgid ""
 "%s:\n"
@@ -19937,131 +20162,132 @@
 "%s:\n"
 "%s%c"
 
-#: src/security/virt-aa-helper.c:159
+#: src/security/virt-aa-helper.c:146
 msgid "could not find replacement string"
 msgstr "未找到替换字符串"
 
-#: src/security/virt-aa-helper.c:164
+#: src/security/virt-aa-helper.c:151
 msgid "could not allocate memory for string"
 msgstr "没有为字符串分配内存"
 
-#: src/security/virt-aa-helper.c:176 src/security/virt-aa-helper.c:184
+#: src/security/virt-aa-helper.c:163 src/security/virt-aa-helper.c:171
 msgid "not enough space in target buffer"
 msgstr "目标缓存中没有足够空间"
 
-#: src/security/virt-aa-helper.c:192
+#: src/security/virt-aa-helper.c:179
 msgid "error replacing string"
 msgstr "替换字符串时出错"
 
-#: src/security/virt-aa-helper.c:214
+#: src/security/virt-aa-helper.c:201
 msgid "invalid flag"
 msgstr "无效标签"
 
-#: src/security/virt-aa-helper.c:222
+#: src/security/virt-aa-helper.c:209
 msgid "profile name exceeds maximum length"
 msgstr "侧写名称超过上限"
 
-#: src/security/virt-aa-helper.c:227
+#: src/security/virt-aa-helper.c:214
 msgid "profile does not exist"
 msgstr "侧写不存在"
 
-#: src/security/virt-aa-helper.c:236
+#: src/security/virt-aa-helper.c:223
 msgid "failed to run apparmor_parser"
 msgstr "运行 apparmor_parser 失败"
 
-#: src/security/virt-aa-helper.c:240
+#: src/security/virt-aa-helper.c:227
 msgid "unable to unload already unloaded profile"
 msgstr "无法载入已载入的侧写"
 
-#: src/security/virt-aa-helper.c:242
+#: src/security/virt-aa-helper.c:229
 msgid "apparmor_parser exited with error"
 msgstr "apparmor_parser 出错并退出"
 
-#: src/security/virt-aa-helper.c:279 src/security/virt-aa-helper.c:284
-#: src/security/virt-aa-helper.c:395
+#: src/security/virt-aa-helper.c:266 src/security/virt-aa-helper.c:271
+#: src/security/virt-aa-helper.c:382
 msgid "could not allocate memory for profile"
 msgstr "无法为侧写分配内存"
 
-#: src/security/virt-aa-helper.c:291 src/security/virt-aa-helper.c:390
+#: src/security/virt-aa-helper.c:278 src/security/virt-aa-helper.c:377
 msgid "invalid length for new profile"
 msgstr "新侧写的长度无效"
 
-#: src/security/virt-aa-helper.c:303
+#: src/security/virt-aa-helper.c:290
 msgid "failed to create include file"
 msgstr "生成包含的文件失败"
 
-#: src/security/virt-aa-helper.c:309 src/security/virt-aa-helper.c:415
+#: src/security/virt-aa-helper.c:296 src/security/virt-aa-helper.c:402
 msgid "failed to write to profile"
 msgstr "写入侧写失败"
 
-#: src/security/virt-aa-helper.c:314 src/security/virt-aa-helper.c:420
+#: src/security/virt-aa-helper.c:301 src/security/virt-aa-helper.c:407
 msgid "failed to close or write to profile"
 msgstr "关闭或者写入侧写失败"
 
-#: src/security/virt-aa-helper.c:345 src/security/virt-aa-helper.c:1230
+#: src/security/virt-aa-helper.c:332 src/security/virt-aa-helper.c:1208
 msgid "profile exists"
 msgstr "侧写已存在"
 
-#: src/security/virt-aa-helper.c:350
+#: src/security/virt-aa-helper.c:337
 msgid "template name exceeds maximum length"
 msgstr "模板名称超过最大长度"
 
-#: src/security/virt-aa-helper.c:355
+#: src/security/virt-aa-helper.c:342
 msgid "template does not exist"
 msgstr "模板不存在"
 
-#: src/security/virt-aa-helper.c:360
+#: src/security/virt-aa-helper.c:347
 msgid "failed to read AppArmor template"
 msgstr "读取 AppArmor 模板失败"
 
-#: src/security/virt-aa-helper.c:365 src/security/virt-aa-helper.c:370
+#: src/security/virt-aa-helper.c:352 src/security/virt-aa-helper.c:357
 msgid "no replacement string in template"
 msgstr "模板中没有可替换字符串"
 
-#: src/security/virt-aa-helper.c:376
+#: src/security/virt-aa-helper.c:363
 msgid "could not allocate memory for profile name"
 msgstr "无法为侧写名称分配内存"
 
-#: src/security/virt-aa-helper.c:382
+#: src/security/virt-aa-helper.c:369
 msgid "could not allocate memory for profile files"
 msgstr "无法为侧写文件分配内存"
 
-#: src/security/virt-aa-helper.c:409
+#: src/security/virt-aa-helper.c:396
 msgid "failed to create profile"
 msgstr "生成侧写失败"
 
-#: src/security/virt-aa-helper.c:560
+#: src/security/virt-aa-helper.c:547
 msgid "bad pathname"
 msgstr "坏路径名"
 
-#: src/security/virt-aa-helper.c:575
+#: src/security/virt-aa-helper.c:562
 msgid "path does not exist, skipping file type checks"
 msgstr "路径不存在，跳过文件类型检查。"
 
-#: src/security/virt-aa-helper.c:615
+#: src/security/virt-aa-helper.c:602
 msgid "Invalid context"
 msgstr "无效上下文"
 
-#: src/security/virt-aa-helper.c:621
+#: src/security/virt-aa-helper.c:608
 msgid "Could not find <name>"
 msgstr "未找到 <name>"
 
-#: src/security/virt-aa-helper.c:628
+#: src/security/virt-aa-helper.c:615
 msgid "Could not find <uuid>"
 msgstr "未找到 <uuid>"
 
-#: src/security/virt-aa-helper.c:660
+#: src/security/virt-aa-helper.c:647
 msgid "unexpected root element, expecting <domain>"
 msgstr "意外的 root 元素，应为 <domain>"
 
-#: src/security/virt-aa-helper.c:670
+#: src/security/virt-aa-helper.c:657
 msgid "os.type is not 'hvm'"
 msgstr "os.type 不是 'hvm'"
 
-#: src/security/virt-aa-helper.c:705 src/security/virt-aa-helper.c:721
-#: src/security/virt-aa-helper.c:816 src/security/virt-aa-helper.c:825
-#: src/security/virt-aa-helper.c:900 src/security/virt-aa-helper.c:1212
-#: src/security/virt-aa-helper.c:1216 src/security/virt-aa-helper.c:1276
+#: src/security/virt-aa-helper.c:670 src/security/virt-aa-helper.c:707
+#: src/security/virt-aa-helper.c:721 src/security/virt-aa-helper.c:815
+#: src/security/virt-aa-helper.c:824 src/security/virt-aa-helper.c:899
+#: src/security/virt-aa-helper.c:1190 src/security/virt-aa-helper.c:1194
+#: src/security/virt-aa-helper.c:1254
 msgid "could not allocate memory"
 msgstr "无法分配内存"
 
@@ -20069,15 +20295,15 @@
 msgid "Failed to create XML config object"
 msgstr ""
 
-#: src/security/virt-aa-helper.c:729
+#: src/security/virt-aa-helper.c:728
 msgid "could not parse XML"
 msgstr "无法解析 XML"
 
-#: src/security/virt-aa-helper.c:734
+#: src/security/virt-aa-helper.c:733
 msgid "could not find name in XML"
 msgstr "无法在 XML 自己找到名称"
 
-#: src/security/virt-aa-helper.c:739
+#: src/security/virt-aa-helper.c:738
 msgid "bad name"
 msgstr "坏名字"
 
@@ -20093,67 +20319,67 @@
 msgid "skipped restricted file"
 msgstr "跳过受限制的文件"
 
-#: src/security/virt-aa-helper.c:905
+#: src/security/virt-aa-helper.c:904
 msgid "given uuid does not match XML uuid"
 msgstr "给定 uuid 与 XML uuid 不符"
 
-#: src/security/virt-aa-helper.c:1058
+#: src/security/virt-aa-helper.c:1036
 msgid "failed to allocate file buffer"
 msgstr "分配文件缓冲失败"
 
-#: src/security/virt-aa-helper.c:1107
+#: src/security/virt-aa-helper.c:1085
 msgid "could not allocate memory for disk"
 msgstr "无法为磁盘分配内存"
 
-#: src/security/virt-aa-helper.c:1122 src/security/virt-aa-helper.c:1142
+#: src/security/virt-aa-helper.c:1100 src/security/virt-aa-helper.c:1120
 msgid "invalid UUID"
 msgstr "无效 UUID"
 
-#: src/security/virt-aa-helper.c:1125
+#: src/security/virt-aa-helper.c:1103
 msgid "error copying UUID"
 msgstr "复制 UUID 出错"
 
-#: src/security/virt-aa-helper.c:1134
+#: src/security/virt-aa-helper.c:1112
 msgid "unsupported option"
 msgstr "不支持的选项"
 
-#: src/security/virt-aa-helper.c:1139
+#: src/security/virt-aa-helper.c:1117
 msgid "bad command"
 msgstr "坏命令"
 
-#: src/security/virt-aa-helper.c:1152
+#: src/security/virt-aa-helper.c:1130
 msgid "could not read xml file"
 msgstr "无法读取 xml 文件"
 
-#: src/security/virt-aa-helper.c:1156
+#: src/security/virt-aa-helper.c:1134
 msgid "could not get VM definition"
 msgstr "无法获取 VM 定义"
 
-#: src/security/virt-aa-helper.c:1161
+#: src/security/virt-aa-helper.c:1139
 msgid "invalid VM definition"
 msgstr "无效 VM 定义"
 
-#: src/security/virt-aa-helper.c:1193
+#: src/security/virt-aa-helper.c:1171
 msgid "could not set PATH"
 msgstr "无法设定 PATH"
 
-#: src/security/virt-aa-helper.c:1197
+#: src/security/virt-aa-helper.c:1175
 msgid "could not set IFS"
 msgstr "无法设定 IFS"
 
-#: src/security/virt-aa-helper.c:1208
+#: src/security/virt-aa-helper.c:1186
 msgid "could not parse arguments"
 msgstr "无法解析参数"
 
-#: src/security/virt-aa-helper.c:1255
+#: src/security/virt-aa-helper.c:1233
 msgid "failed to allocate buffer"
 msgstr "分配缓存失败"
 
-#: src/security/virt-aa-helper.c:1286
+#: src/security/virt-aa-helper.c:1264
 msgid "could not create profile"
 msgstr "无法生成配置文件"
 
-#: src/storage/parthelper.c:84
+#: src/storage/parthelper.c:82
 #, c-format
 msgid "syntax: %s DEVICE [-g]\n"
 msgstr "语法：%s DEVICE [-g]\n"
@@ -20168,258 +20394,267 @@
 msgid "unable to access disk %s\n"
 msgstr "无法访问磁盘 %s\n"
 
-#: src/storage/storage_backend.c:153
+#: src/storage/storage_backend.c:141
 #, c-format
 msgid "could not open input path '%s'"
 msgstr "无法打开输入路径 '%s'"
 
-#: src/storage/storage_backend.c:187
+#: src/storage/storage_backend.c:179
 #, c-format
 msgid "failed reading from file '%s'"
 msgstr "读取文件 '%s' 失败"
 
-#: src/storage/storage_backend.c:204 src/storage/storage_backend.c:333
+#: src/storage/storage_backend.c:196 src/storage/storage_backend.c:318
 #, c-format
 msgid "cannot extend file '%s'"
 msgstr "无法扩展文件 '%s'"
 
-#: src/storage/storage_backend.c:211
+#: src/storage/storage_backend.c:203
 #, c-format
 msgid "failed writing to file '%s'"
 msgstr "写入文件 '%s' 失败"
 
-#: src/storage/storage_backend.c:221 src/storage/storage_backend.c:386
+#: src/storage/storage_backend.c:213 src/storage/storage_backend.c:365
 #, c-format
 msgid "cannot sync data to file '%s'"
 msgstr "无法将数据同步到 '%s'"
 
-#: src/storage/storage_backend.c:230 src/storage/storage_backend.c:307
-#: src/storage/storage_backend_logical.c:774
+#: src/storage/storage_backend.c:222 src/storage/storage_backend.c:293
+#: src/storage/storage_backend_logical.c:734
 #, c-format
 msgid "cannot close file '%s'"
 msgstr "无法关闭文件 '%s'"
 
-#: src/storage/storage_backend.c:263
+#: src/storage/storage_backend.c:276
 msgid "metadata preallocation is not supported for block volumes"
 msgstr "块卷不支持元数据预分配"
 
-#: src/storage/storage_backend.c:270 src/storage/storage_backend_fs.c:780
-#: src/storage/storage_backend_fs.c:797 src/storage/storage_backend_fs.c:1044
+#: src/storage/storage_backend.c:257 src/storage/storage_backend.c:407
+#: src/storage/storage_backend_fs.c:761 src/storage/storage_backend_fs.c:788
+#: src/storage/storage_backend_fs.c:1042
 #, c-format
 msgid "cannot create path '%s'"
 msgstr "无法创建路径 '%s'"
 
-#: src/storage/storage_backend.c:285 src/util/virfile.c:1803
-#: src/util/virfile.c:2102 src/util/virfile.c:2209
+#: src/storage/storage_backend.c:272 src/util/util.c:757 src/util/util.c:801
+#: src/util/util.c:1034
 #, c-format
 msgid "stat of '%s' failed"
 msgstr "stat 文件 '%s' 失败"
 
-#: src/storage/storage_backend.c:301 src/storage/storage_backend.c:608
-#: src/util/virfile.c:1825 src/util/virfile.c:2116 src/util/virfile.c:2222
+#: src/storage/storage_backend.c:287 src/storage/storage_backend.c:601
+#: src/util/util.c:774 src/util/util.c:815 src/util/util.c:1047
 #, c-format
 msgid "cannot set mode of '%s' to %04o"
 msgstr "无法将模式 '%s' 设定为 %04o"
 
-#: src/storage/storage_backend.c:353
+#: src/storage/storage_backend.c:366
 #, c-format
 msgid "cannot allocate %llu bytes in file '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:378
+#: src/storage/storage_backend.c:346 src/storage/storage_backend.c:355
 #, c-format
 msgid "cannot fill file '%s'"
 msgstr "无法装入文件 '%s'"
 
-#: src/storage/storage_backend.c:410
+#: src/storage/storage_backend.c:423
 msgid "metadata preallocation is not supported for raw volumes"
 msgstr "原始卷不支持元数据预分配"
 
-#: src/storage/storage_backend.c:417 src/storage/storage_backend_disk.c:634
-#: src/storage/storage_backend_logical.c:715
-#: src/storage/storage_backend_rbd.c:466
+#: src/storage/storage_backend.c:391 src/storage/storage_backend_disk.c:648
+#: src/storage/storage_backend_logical.c:683
 msgid "storage pool does not support encrypted volumes"
 msgstr "存储池不支持加密卷"
 
-#: src/storage/storage_backend.c:467
+#: src/storage/storage_backend.c:442
 msgid "too many conflicts when generating an uuid"
 msgstr "生成 uuid 时有太多冲突"
 
-#: src/storage/storage_backend.c:497
+#: src/storage/storage_backend.c:472
 msgid "secrets already defined"
 msgstr "已定义 secrets"
 
-#: src/storage/storage_backend.c:591
+#: src/storage/storage_backend.c:585
 #, c-format
 msgid "failed to create %s"
 msgstr "生成 %s 失败"
 
-#: src/storage/storage_backend.c:601
+#: src/storage/storage_backend.c:595
 #, c-format
 msgid "cannot chown %s to (%u, %u)"
 msgstr "无法将 '%s' chown 为 (%u, %u)"
 
-#: src/storage/storage_backend.c:671
+#: src/storage/storage_backend.c:637
 #, c-format
 msgid "unable to parse qemu-img output '%s'"
 msgstr "无法解析 qemu-img 输出结果 '%s'"
 
-#: src/storage/storage_backend.c:723
+#: src/storage/storage_backend.c:736
 #, c-format
 msgid "Feature %s not supported with compat level %s"
 msgstr "兼容水平 %s 不支持功能 %s"
 
-#: src/storage/storage_backend.c:787 src/storage/storage_backend.c:821
+#: src/storage/storage_backend.c:688 src/storage/storage_backend.c:694
 #, c-format
 msgid "unknown storage vol type %d"
 msgstr "未知存储卷类型 %d"
 
-#: src/storage/storage_backend.c:794
+#: src/storage/storage_backend.c:807
 msgid "metadata preallocation only available with qcow2"
 msgstr ""
 
-#: src/storage/storage_backend.c:799
+#: src/storage/storage_backend.c:812
 msgid "compatibility option only available with qcow2"
 msgstr "只有在 qcow2 中可使用兼容选项"
 
-#: src/storage/storage_backend.c:804
+#: src/storage/storage_backend.c:817
 msgid "format features only available with qcow2"
 msgstr "只有在 qcow2 中可使用格式功能"
 
-#: src/storage/storage_backend.c:811
+#: src/storage/storage_backend.c:824
 msgid "missing input volume target path"
 msgstr "缺少输入卷目标路径"
 
-#: src/storage/storage_backend.c:836
+#: src/storage/storage_backend.c:849
 msgid "metadata preallocation conflicts with backing store"
 msgstr ""
 
-#: src/storage/storage_backend.c:848
+#: src/storage/storage_backend.c:711
 msgid "a different backing store cannot be specified."
 msgstr "无法指定不同的后端存储。"
 
-#: src/storage/storage_backend.c:854
+#: src/storage/storage_backend.c:718
 #, c-format
 msgid "unknown storage vol backing store type %d"
 msgstr "未知存储后端存储类型 %d"
 
-#: src/storage/storage_backend.c:871
+#: src/storage/storage_backend.c:737
 #, c-format
 msgid "inaccessible backing store volume %s"
 msgstr "无法访问的后端存储卷 %s"
 
-#: src/storage/storage_backend.c:883
+#: src/storage/storage_backend.c:749
 #, c-format
 msgid "qcow volume encryption unsupported with volume format %s"
 msgstr "卷格式 %s 不支持 qcow 卷加密"
 
-#: src/storage/storage_backend.c:891
+#: src/storage/storage_backend.c:757
 #, c-format
 msgid "unsupported volume encryption format %d"
 msgstr "不支持卷加密格式 %d"
 
-#: src/storage/storage_backend.c:897
+#: src/storage/storage_backend.c:763
 msgid "too many secrets for qcow encryption"
 msgstr "qcow 加密有太多 secret"
 
-#: src/storage/storage_backend.c:1022
+#: src/storage/storage_backend.c:1035
 msgid "metadata preallocation is not supported with qcow-create"
 msgstr "qcow-create 不支持元数据预分配"
 
-#: src/storage/storage_backend.c:1029
+#: src/storage/storage_backend.c:877
 msgid "cannot copy from volume with qcow-create"
 msgstr "无法使用 qcow-create 复制卷"
 
-#: src/storage/storage_backend.c:1035
+#: src/storage/storage_backend.c:883
 #, c-format
 msgid "unsupported storage vol type %d"
 msgstr "不支持的存储卷类型 %d"
 
-#: src/storage/storage_backend.c:1041
+#: src/storage/storage_backend.c:889
 msgid "copy-on-write image not supported with qcow-create"
 msgstr "创建 qcow 不支持写时复制（copy-on-write）映像"
 
-#: src/storage/storage_backend.c:1047
+#: src/storage/storage_backend.c:895
 msgid "encrypted volumes not supported with qcow-create"
 msgstr "qcow-create 不支持加密卷"
 
-#: src/storage/storage_backend.c:1077
+#: src/storage/storage_backend.c:927
 #, c-format
 msgid "Unknown file create tool type '%d'."
 msgstr "未知文件生成同居类型 '%d'。"
 
-#: src/storage/storage_backend.c:1125
+#: src/storage/storage_backend.c:975
 msgid "creation of non-raw file images is not supported without qemu-img."
 msgstr "qemu-img 不支持费原始文件映像。"
 
-#: src/storage/storage_backend.c:1149
+#: src/storage/storage_backend.c:1162
 #, c-format
 msgid "missing backend for pool type %d (%s)"
 msgstr ""
 
-#: src/storage/storage_backend.c:1197
-#: src/storage/storage_backend_gluster.c:257
+#: src/storage/storage_backend.c:1186
+#, c-format
+msgid "missing storage backend for network files using %s protocol"
+msgstr ""
+
+#: src/storage/storage_backend.c:1191
+#, c-format
+msgid "missing storage backend for '%s' storage"
+msgstr ""
+
+#: src/storage/storage_backend.c:1039
 #, c-format
 msgid "cannot open volume '%s'"
 msgstr "无法打开卷 '%s'"
 
-#: src/storage/storage_backend.c:1232
+#: src/storage/storage_backend.c:1276
 #, c-format
 msgid "unable to set blocking mode for '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:1244
+#: src/storage/storage_backend.c:1075
 #, c-format
 msgid "unexpected storage mode for '%s'"
 msgstr "'%s' 的意外存储模式"
 
-#: src/storage/storage_backend.c:1364
+#: src/storage/storage_backend.c:1199
 #, c-format
 msgid "cannot seek to end of file '%s'"
 msgstr "无法查找文件 '%s' 的结尾"
 
-#: src/storage/storage_backend.c:1393
+#: src/storage/storage_backend.c:1220
 #, c-format
 msgid "cannot get file context of '%s'"
 msgstr "无法获得 '%s' 的文件上下文"
 
-#: src/storage/storage_backend.c:1459
+#: src/storage/storage_backend.c:1290
 #, c-format
 msgid "cannot seek to beginning of file '%s'"
 msgstr "无法查找文件 '%s' 的开始"
 
-#: src/storage/storage_backend.c:1466
+#: src/storage/storage_backend.c:1297
 #, c-format
 msgid "cannot read beginning of file '%s'"
 msgstr "无法读取文件 '%s' 的开始"
 
-#: src/storage/storage_backend.c:1540
+#: src/storage/storage_backend.c:1362
 #, c-format
 msgid "cannot read dir '%s'"
 msgstr "无法读取目录 '%s'"
 
-#: src/storage/storage_backend.c:1654
+#: src/storage/storage_backend.c:1478
 msgid "cannot read fd"
 msgstr "无法读取 fd"
 
-#: src/storage/storage_backend.c:1761
+#: src/storage/storage_backend.c:1593
 msgid "cannot open file using fd"
 msgstr "无法使用 fd 打开文件"
 
-#: src/storage/storage_backend.c:1792
+#: src/storage/storage_backend.c:1836
 msgid "read error on pipe"
 msgstr "读取管道中的错误"
 
-#: src/storage/storage_backend.c:1821 src/storage/storage_backend.c:1834
+#: src/storage/storage_backend.c:1654 src/storage/storage_backend.c:1666
 #, c-format
 msgid "%s not implemented on Win32"
 msgstr "在 Win32 中没有使用 %s"
 
-#: src/storage/storage_backend_disk.c:101
+#: src/storage/storage_backend_disk.c:110
 msgid "cannot parse device start location"
 msgstr "无法解析设备起始位置"
 
-#: src/storage/storage_backend_disk.c:108
+#: src/storage/storage_backend_disk.c:117
 msgid "cannot parse device end location"
 msgstr "无法解析设备终止位置"
 
@@ -20432,96 +20667,95 @@
 msgid "device path '%s' doesn't exist"
 msgstr "失败路径 '%s' 不存在"
 
-#: src/storage/storage_backend_disk.c:389 src/storage/storage_backend_fs.c:761
+#: src/storage/storage_backend_disk.c:398 src/storage/storage_backend_fs.c:740
 msgid "Overwrite and no overwrite flags are mutually exclusive"
 msgstr "overwrite 和 no overwrite 标签彼此互斥"
 
-#: src/storage/storage_backend_disk.c:405
+#: src/storage/storage_backend_disk.c:414
 msgid "Error checking for disk label"
 msgstr "磁盘标签检查出错"
 
-#: src/storage/storage_backend_disk.c:408
+#: src/storage/storage_backend_disk.c:417
 msgid "Disk label already present"
 msgstr "已显示磁盘标签"
 
-#: src/storage/storage_backend_disk.c:467
+#: src/storage/storage_backend_disk.c:466
 msgid "Invalid partition type"
 msgstr "无效分区类型"
 
-#: src/storage/storage_backend_disk.c:476
+#: src/storage/storage_backend_disk.c:475
 msgid "extended partition already exists"
 msgstr "已存在扩展分区"
 
-#: src/storage/storage_backend_disk.c:505
+#: src/storage/storage_backend_disk.c:510
 msgid "no extended partition found and no primary partition available"
 msgstr "未找到扩展分区或者没有可用主分区"
 
-#: src/storage/storage_backend_disk.c:511
+#: src/storage/storage_backend_disk.c:516
 msgid "unknown partition type"
 msgstr "未知分区类型"
 
-#: src/storage/storage_backend_disk.c:593
+#: src/storage/storage_backend_disk.c:600
 msgid "no large enough free extent"
 msgstr "没有足够的可用扩展"
 
-#: src/storage/storage_backend_disk.c:711
+#: src/storage/storage_backend_disk.c:731
 #, c-format
 msgid "Couldn't read volume target path '%s'"
 msgstr "无法读取卷目标路径 '%s'"
 
-#: src/storage/storage_backend_disk.c:724
+#: src/storage/storage_backend_disk.c:744
 #, c-format
 msgid "Volume path '%s' did not start with parent pool source device name."
 msgstr "卷路径 '%s' 没有以上一级池源设备名称开始。"
 
-#: src/storage/storage_backend_disk.c:734
+#: src/storage/storage_backend_disk.c:754
 #, c-format
 msgid "cannot parse partition number from target '%s'"
 msgstr "无法从目标 '%s' 中解析分区号码"
 
-#: src/storage/storage_backend_fs.c:97 src/util/virstoragefile.c:923
-#: src/util/virstoragefile.c:1000
+#: src/util/storage_file.c:765 src/util/storage_file.c:861
 #, c-format
 msgid "cannot read header '%s'"
 msgstr "无法读取标题 '%s'"
 
-#: src/storage/storage_backend_fs.c:129
+#: src/storage/storage_backend_fs.c:117
 #, c-format
 msgid "cannot probe backing volume format: %s"
 msgstr "无法探测后端卷格式：%s"
 
-#: src/storage/storage_backend_fs.c:216
+#: src/storage/storage_backend_fs.c:196
 #, c-format
 msgid "invalid netfs path (no /): %s"
 msgstr "无效 netfs 路径（没有 /）：%s"
 
-#: src/storage/storage_backend_fs.c:222
+#: src/storage/storage_backend_fs.c:202
 #, c-format
 msgid "invalid netfs path (ends in /): %s"
 msgstr "无效 netfs 路径（以 / 结尾）：%s"
 
-#: src/storage/storage_backend_fs.c:280 src/test/test_driver.c:4749
+#: src/storage/storage_backend_fs.c:280 src/test/test_driver.c:4755
 msgid "hostname must be specified for netfs sources"
 msgstr "必须为 netfs 源指定主机名"
 
-#: src/storage/storage_backend_fs.c:338
+#: src/storage/storage_backend_fs.c:304
 #, c-format
 msgid "cannot read mount list '%s'"
 msgstr "无法读取挂载列表 '%s'"
 
-#: src/storage/storage_backend_fs.c:385 src/storage/storage_backend_fs.c:481
-#: src/storage/storage_backend_iscsi.c:645
-#: src/storage/storage_backend_iscsi.c:804
+#: src/storage/storage_backend_fs.c:392 src/storage/storage_backend_fs.c:457
+#: src/storage/storage_backend_iscsi.c:628
+#: src/storage/storage_backend_iscsi.c:660
 msgid "missing source host"
 msgstr "源主机缺失"
 
-#: src/storage/storage_backend_fs.c:390
+#: src/storage/storage_backend_fs.c:397
 msgid "missing source path"
 msgstr "缺少源路径"
 
-#: src/storage/storage_backend_fs.c:396 src/storage/storage_backend_fs.c:492
-#: src/storage/storage_backend_iscsi.c:652
-#: src/storage/storage_backend_iscsi.c:811
+#: src/storage/storage_backend_fs.c:403 src/storage/storage_backend_fs.c:468
+#: src/storage/storage_backend_iscsi.c:635
+#: src/storage/storage_backend_iscsi.c:667
 msgid "missing source device"
 msgstr "缺少源设备"
 
@@ -20530,66 +20764,66 @@
 msgid "Target '%s' is already mounted"
 msgstr "已挂账目标 '%s'"
 
-#: src/storage/storage_backend_fs.c:486
+#: src/storage/storage_backend_fs.c:462
 msgid "missing source dir"
 msgstr "缺少源目录"
 
-#: src/storage/storage_backend_fs.c:575
+#: src/storage/storage_backend_fs.c:554
 #, c-format
 msgid "Not capable of probing for filesystem of type %s"
 msgstr "无法探测文件系统类型 %s"
 
-#: src/storage/storage_backend_fs.c:584
+#: src/storage/storage_backend_fs.c:563
 #, c-format
 msgid "Failed to create filesystem probe for device %s"
 msgstr "为设备 %s 生成文件系统探测失败"
 
-#: src/storage/storage_backend_fs.c:606
+#: src/storage/storage_backend_fs.c:587
 #, c-format
 msgid "Existing filesystem of type '%s' found on device '%s'"
 msgstr "设备 '%s' 中已有文件系统类型 '%s'"
 
-#: src/storage/storage_backend_fs.c:614
+#: src/storage/storage_backend_fs.c:595
 msgid "Found additional probes to run, filesystem probing may be incorrect"
 msgstr "找到可运行的附加探测，文件系统探测可能不正确。"
 
-#: src/storage/storage_backend_fs.c:636
+#: src/storage/storage_backend_fs.c:617
 msgid "probing for filesystems is unsupported by this build"
 msgstr "这个构建不支持文件系统探测"
 
-#: src/storage/storage_backend_fs.c:661
+#: src/storage/storage_backend_fs.c:642
 #, c-format
 msgid "Failed to make filesystem of type '%s' on device '%s'"
 msgstr "在失败 '%s' 中探测文件系统类型 '%s' 失败"
 
-#: src/storage/storage_backend_fs.c:676
+#: src/storage/storage_backend_fs.c:655
 #, c-format
 msgid ""
 "mkfs is not supported on this platform: Failed to make filesystem of type "
 "'%s' on device '%s'"
 msgstr "这个平台不支持 mkfs：在设备 '%s' 中生成文件系统类型 '%s' 失败"
 
-#: src/storage/storage_backend_fs.c:694
+#: src/storage/storage_backend_fs.c:673
 #, c-format
 msgid "No source device specified when formatting pool '%s'"
 msgstr "格式化池 '%s' 时没有指定设备"
 
-#: src/storage/storage_backend_fs.c:705
+#: src/storage/storage_backend_fs.c:684
 #, c-format
 msgid "Source device does not exist when formatting pool '%s'"
 msgstr "格式化池 '%s' 时不存在源设备"
 
-#: src/storage/storage_backend_fs.c:770
+#: src/storage/storage_backend_fs.c:751
 #, c-format
 msgid "path '%s' is not absolute"
 msgstr "路径 '%s' 不是绝对路径"
 
-#: src/storage/storage_backend_fs.c:902
+#: src/storage/storage_backend_fs.c:888
 #, c-format
 msgid "cannot probe backing volume info: %s"
 msgstr "无法探测后端卷信息：%s"
 
-#: src/storage/storage_backend_fs.c:981
+#: src/storage/storage_backend_fs.c:974
 #, c-format
 msgid "failed to remove pool '%s'"
 msgstr "删除池 '%s' 失败"
@@ -20599,20 +20833,20 @@
 msgid "volume target path '%s' already exists"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:1034
+#: src/storage/storage_backend_fs.c:1028
 msgid "cannot copy from volume to a directory volume"
 msgstr "无法将卷复制到目录卷"
 
-#: src/storage/storage_backend_fs.c:1065
+#: src/storage/storage_backend_fs.c:1062
 msgid ""
 "storage pool does not support building encrypted volumes from other volumes"
 msgstr "存储池不支持从其他卷构建加密卷"
 
-#: src/storage/storage_backend_fs.c:1085
+#: src/storage/storage_backend_fs.c:1082
 msgid "creation of non-raw images is not supported without qemu-img"
 msgstr "没有 qemu-img 则不支持生成非原始映像"
 
-#: src/storage/storage_backend_fs.c:1143
+#: src/storage/storage_backend_fs.c:1134
 #, c-format
 msgid "cannot unlink file '%s'"
 msgstr "无法取消链接文件 '%s'"
@@ -20656,69 +20890,92 @@
 msgid "unable to read '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_gluster.c:341
+#: src/storage/storage_backend_gluster.c:367
 #, c-format
 msgid "cannot open path '%s' in '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_gluster.c:358
+#: src/storage/storage_backend_gluster.c:384
 #, c-format
 msgid "failed to read directory '%s' in '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_gluster.c:364
+#: src/storage/storage_backend_gluster.c:390
 #, c-format
 msgid "cannot statvfs path '%s' in '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_iscsi.c:130
+#: src/storage/storage_backend_gluster.c:429
+#, c-format
+msgid "removing of '%s' volumes is not supported by the gluster backend: %s"
+msgstr ""
+
+#: src/storage/storage_backend_gluster.c:443
+#, c-format
+msgid "cannot remove gluster volume file '%s'"
+msgstr ""
+
+#: src/storage/storage_backend_gluster.c:457
+#, c-format
+msgid "cannot remove gluster volume dir '%s'"
+msgstr ""
+
+#: src/storage/storage_backend_gluster.c:525
+#, c-format
+msgid "invalid path of gluster volume: '%s'"
+msgstr ""
+
+#: src/storage/storage_backend_gluster.c:554
+#, c-format
+msgid "failed to set gluster volfile server '%s'"
+msgstr ""
+
+#: src/storage/storage_backend_gluster.c:561
+#, c-format
+msgid "failed to initialize gluster connection to server: '%s'"
+msgstr ""
+
+#: src/storage/storage_backend_iscsi.c:168
 msgid "cannot find session"
 msgstr "无法找到会话"
 
-#: src/storage/storage_backend_iscsi.c:156
+#: src/storage/storage_backend_iscsi.c:192
 #, c-format
 msgid "Could not allocate memory for output of '%s'"
 msgstr "无法为 '%s' 的输出分配内存"
 
-#: src/storage/storage_backend_iscsi.c:171
+#: src/storage/storage_backend_iscsi.c:207
 #, c-format
 msgid ""
 "Failed to open stream for file descriptor when reading output from '%s': '%s'"
 msgstr "从  '%s' 读取输出结果时为文件描述符打开流失败： '%s'"
 
-#: src/storage/storage_backend_iscsi.c:183
+#: src/storage/storage_backend_iscsi.c:219
 #, c-format
 msgid "Unexpected line > %d characters when parsing output of '%s'"
 msgstr "解析  '%d' 的输出时行超过 %s 字符"
 
-#: src/storage/storage_backend_iscsi.c:201
+#: src/storage/storage_backend_iscsi.c:237
 #, c-format
 msgid "Missing space when parsing output of '%s'"
 msgstr "解析 '%s' 输出时缺少空格"
 
-#: src/storage/storage_backend_iscsi.c:259
+#: src/storage/storage_backend_iscsi.c:305
 #, c-format
 msgid "Failed to run command '%s' to create new iscsi interface"
 msgstr "运行  '%s' 命令生成新的 iscsi 接口失败"
 
-#: src/storage/storage_backend_iscsi.c:278
+#: src/storage/storage_backend_iscsi.c:315
 #, c-format
 msgid "Failed to run command '%s' to update iscsi interface with IQN '%s'"
 msgstr "运行  '%s' 命令使用 IQN  '%s' 更新 iscsi 接口失败"
 
-#: src/storage/storage_backend_iscsi.c:372
-#: src/storage/storage_backend_scsi.c:507 src/util/virutil.c:1842
-#: src/util/virutil.c:1936
-#, c-format
-msgid "Failed to opendir path '%s'"
-msgstr "打开目录路径 '%s' 失败"
-
-#: src/storage/storage_backend_iscsi.c:407
+#: src/storage/storage_backend_iscsi.c:408
 #, c-format
 msgid "Failed to get host number for iSCSI session with path '%s'"
 msgstr "为路径为 '%s' 的 iSCSI 会话获取主机名失败"
 
-#: src/storage/storage_backend_iscsi.c:415
+#: src/storage/storage_backend_iscsi.c:416
 #, c-format
 msgid "Failed to find LUs on host %u"
 msgstr "在直接 %u 中查找 LUs 失败"
@@ -20752,13 +21009,13 @@
 msgstr ""
 
 #: src/storage/storage_backend_iscsi.c:755
-#: src/storage/storage_backend_rbd.c:96
+#: src/storage/storage_backend_rbd.c:99
 #, c-format
 msgid "no secret matches uuid '%s'"
 msgstr ""
 
 #: src/storage/storage_backend_iscsi.c:759
-#: src/storage/storage_backend_rbd.c:100
+#: src/storage/storage_backend_rbd.c:103
 #, c-format
 msgid "no secret matches usage value '%s'"
 msgstr ""
@@ -20767,11 +21024,11 @@
 msgid "malformed volume extent stripes value"
 msgstr "畸形的卷扩展条值"
 
-#: src/storage/storage_backend_logical.c:166
+#: src/storage/storage_backend_logical.c:168
 msgid "malformed volume extent length value"
 msgstr "畸形的卷扩展长度值"
 
-#: src/storage/storage_backend_logical.c:171
+#: src/storage/storage_backend_logical.c:173
 msgid "malformed volume extent size value"
 msgstr "畸形的卷扩展大小值"
 
@@ -20783,372 +21040,370 @@
 msgid "malformed volume extent devices value"
 msgstr "畸形的卷扩展设备值"
 
-#: src/storage/storage_backend_logical.c:242
+#: src/storage/storage_backend_logical.c:245
 msgid "malformed volume extent offset value"
 msgstr "畸形的卷扩展补偿值"
 
-#: src/storage/storage_backend_logical.c:446
+#: src/storage/storage_backend_logical.c:434
 msgid "failed to get source from sourceList"
 msgstr "从 sourceList 获得源失败"
 
-#: src/storage/storage_backend_logical.c:505
+#: src/storage/storage_backend_logical.c:511
 #, c-format
 msgid "cannot open device '%s'"
 msgstr "无法打开设备 '%s'"
 
-#: src/storage/storage_backend_logical.c:511
+#: src/storage/storage_backend_logical.c:517
 #, c-format
 msgid "cannot clear device header of '%s'"
 msgstr "无法清除设备标题 '%s'"
 
-#: src/storage/storage_backend_logical.c:518
+#: src/storage/storage_backend_logical.c:524
 #, c-format
 msgid "cannot flush header of device'%s'"
 msgstr "无法清除失败 '%s' 的标头"
 
-#: src/storage/storage_backend_logical.c:525
+#: src/storage/storage_backend_logical.c:531
 #, c-format
 msgid "cannot close device '%s'"
 msgstr "无法关闭设备 '%s'"
 
-#: src/storage/storage_backend_logical.c:760
+#: src/storage/storage_backend_logical.c:720
 #, c-format
 msgid "cannot set file owner '%s'"
 msgstr "无法设定文件拥有者 '%s'"
 
-#: src/storage/storage_backend_logical.c:767
+#: src/storage/storage_backend_logical.c:727
 #, c-format
 msgid "cannot set file mode '%s'"
 msgstr "无法设定文件模式 '%s'"
 
-#: src/storage/storage_backend_logical.c:782
+#: src/storage/storage_backend_logical.c:743
 #, c-format
 msgid "cannot find newly created volume '%s'"
 msgstr "无法找到新生成的卷 '%s'"
 
-#: src/storage/storage_backend_mpath.c:223
+#: src/storage/storage_backend_mpath.c:232
 #, c-format
 msgid "Failed to get %s minor number"
 msgstr "获取 %s 监控程序数失败"
 
-#: src/storage/storage_backend_rbd.c:71
+#: src/storage/storage_backend_rbd.c:74
 msgid "failed to initialize RADOS"
 msgstr "启动 RADOS 失败"
 
-#: src/storage/storage_backend_rbd.c:77
+#: src/storage/storage_backend_rbd.c:80
 msgid "'ceph' authentication not supported for autostarted pools"
 msgstr ""
 
-#: src/storage/storage_backend_rbd.c:112
+#: src/storage/storage_backend_rbd.c:115
 #, c-format
 msgid ""
 "could not get the value of the secret for username '%s' using uuid '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_rbd.c:118
+#: src/storage/storage_backend_rbd.c:121
 #, c-format
 msgid ""
 "could not get the value of the secret for username '%s' using usage value "
 "'%s'"
 msgstr ""
 
-#: src/storage/storage_backend_rbd.c:132
+#: src/storage/storage_backend_rbd.c:135
 msgid "failed to decode the RADOS key"
 msgstr "解码 RADOS 密钥失败"
 
-#: src/storage/storage_backend_rbd.c:139 src/storage/storage_backend_rbd.c:148
-#: src/storage/storage_backend_rbd.c:161 src/storage/storage_backend_rbd.c:195
+#: src/storage/storage_backend_rbd.c:142 src/storage/storage_backend_rbd.c:151
+#: src/storage/storage_backend_rbd.c:164 src/storage/storage_backend_rbd.c:198
 #, c-format
 msgid "failed to set RADOS option: %s"
 msgstr "设定 RADOS 选项：%s"
 
-#: src/storage/storage_backend_rbd.c:156
+#: src/storage/storage_backend_rbd.c:159
 msgid "failed to create the RADOS cluster"
 msgstr "生成 RADOS 集群失败"
 
-#: src/storage/storage_backend_rbd.c:182
+#: src/storage/storage_backend_rbd.c:185
 msgid "received malformed monitor, check the XML definition"
 msgstr "收到受损监控程序，检查 XML 定义。"
 
-#: src/storage/storage_backend_rbd.c:203
+#: src/storage/storage_backend_rbd.c:220
 #, c-format
 msgid "failed to connect to the RADOS monitor on: %s"
 msgstr "连接到 RADOS 监控程序失败：%s"
 
-#: src/storage/storage_backend_rbd.c:254 src/storage/storage_backend_rbd.c:549
+#: src/storage/storage_backend_rbd.c:243
+#, c-format
+msgid "failed to create the RBD IoCTX. Does the pool '%s' exist?"
+msgstr "生成 RBD IoCTX 失败。池 '%s' 存在吗？"
+
+#: src/storage/storage_backend_rbd.c:283 src/storage/storage_backend_rbd.c:605
 #, c-format
 msgid "failed to open the RBD image '%s'"
 msgstr "打开 RBD 映像 '%s' 失败"
 
-#: src/storage/storage_backend_rbd.c:262
-msgid "failed to stat the RBD image"
-msgstr "启动 RBD 映像失败"
-
-#: src/storage/storage_backend_rbd.c:312 src/storage/storage_backend_rbd.c:418
-#: src/storage/storage_backend_rbd.c:459 src/storage/storage_backend_rbd.c:505
-#: src/storage/storage_backend_rbd.c:542
+#: src/storage/storage_backend_rbd.c:291
 #, c-format
-msgid "failed to create the RBD IoCTX. Does the pool '%s' exist?"
-msgstr "生成 RBD IoCTX 失败。池 '%s' 存在吗？"
+msgid "failed to stat the RBD image '%s'"
+msgstr ""
 
-#: src/storage/storage_backend_rbd.c:320
+#: src/storage/storage_backend_rbd.c:347
 msgid "failed to stat the RADOS cluster"
 msgstr "启动 RADOS 集群失败"
 
-#: src/storage/storage_backend_rbd.c:327
+#: src/storage/storage_backend_rbd.c:354
 #, c-format
 msgid "failed to stat the RADOS pool '%s'"
 msgstr "启动 RADOS 池 '%s' 失败"
 
-#: src/storage/storage_backend_rbd.c:349
+#: src/storage/storage_backend_rbd.c:376
 msgid "A problem occurred while listing RBD images"
 msgstr "列出 RBD 映像时出现问题"
 
-#: src/storage/storage_backend_rbd.c:408
+#: src/storage/storage_backend_rbd.c:436
 msgid "This storage backend does not supported zeroed removal of volumes"
 msgstr "这个存储后端不支持删除归零的卷"
 
-#: src/storage/storage_backend_rbd.c:425
+#: src/storage/storage_backend_rbd.c:449
 #, c-format
 msgid "failed to remove volume '%s/%s'"
 msgstr "删除卷 '%s/%s' 失败"
 
-#: src/storage/storage_backend_rbd.c:472
+#: src/storage/storage_backend_rbd.c:536
 #, c-format
 msgid "failed to create volume '%s/%s'"
 msgstr "生成卷 '%s/%s' 失败"
 
-#: src/storage/storage_backend_rbd.c:556
+#: src/storage/storage_backend_rbd.c:612
 #, c-format
 msgid "failed to resize the RBD image '%s'"
 msgstr "创新定义 RBD 映像 '%s' 大小失败"
 
-#: src/storage/storage_backend_scsi.c:65
+#: src/storage/storage_backend_scsi.c:66
 #, c-format
 msgid "Could not find typefile '%s'"
 msgstr "无法找到类型文件 '%s'"
 
-#: src/storage/storage_backend_scsi.c:77
+#: src/storage/storage_backend_scsi.c:78
 #, c-format
 msgid "Could not read typefile '%s'"
 msgstr "无法读取类型文件 '%s'"
 
-#: src/storage/storage_backend_scsi.c:89
+#: src/storage/storage_backend_scsi.c:90
 #, c-format
 msgid "Device type '%s' is not an integer"
 msgstr "设备类型 '%s' 不是一个整数"
 
-#: src/storage/storage_backend_scsi.c:269
+#: src/storage/storage_backend_scsi.c:270
 #, c-format
 msgid "Failed to update volume for '%s'"
 msgstr "为 '%s' 更新卷失败"
 
-#: src/storage/storage_backend_scsi.c:318
-#: src/storage/storage_backend_scsi.c:399
+#: src/storage/storage_backend_scsi.c:322
+#: src/storage/storage_backend_scsi.c:411
 #, c-format
 msgid "Failed to opendir sysfs path '%s'"
 msgstr "opendir sysfs 路径 '%s' 失败"
 
-#: src/storage/storage_backend_scsi.c:362
+#: src/storage/storage_backend_scsi.c:369
 #, c-format
 msgid "Failed to parse block name %s"
 msgstr "解析块名称 %s 失败"
 
-#: src/storage/storage_backend_scsi.c:445
+#: src/storage/storage_backend_scsi.c:457
 #, c-format
 msgid "Failed to determine if %u:%u:%u:%u is a Direct-Access LUN"
 msgstr "确定 %u:%u:%u:%u 是否为直接访问 LUN 失败"
 
-#: src/storage/storage_backend_scsi.c:549
+#: src/storage/storage_backend_scsi.c:609
 #, c-format
 msgid "Could not open '%s' to trigger host scan"
 msgstr "无法打开  '%s' 激活主机扫描"
 
-#: src/storage/storage_backend_scsi.c:560
+#: src/storage/storage_backend_scsi.c:620
 #, c-format
 msgid "Write to '%s' to trigger host scan failed"
 msgstr "写入  '%s' 激活主机扫描失败"
 
-#: src/storage/storage_backend_scsi.c:590
-#: src/storage/storage_backend_scsi.c:597
+#: src/storage/storage_backend_scsi.c:564
+#: src/storage/storage_backend_scsi.c:571
 #, c-format
 msgid "Invalid adapter name '%s' for SCSI pool"
 msgstr ""
 
-#: src/storage/storage_backend_scsi.c:619
+#: src/storage/storage_backend_scsi.c:593
 #, c-format
 msgid "Failed to find SCSI host with wwnn='%s', wwpn='%s'"
 msgstr ""
 
-#: src/storage/storage_backend_scsi.c:646
+#: src/storage/storage_backend_scsi.c:620
 msgid "'parent' for vHBA not specified, and cannot find one on this host"
 msgstr ""
 
-#: src/storage/storage_backend_sheepdog.c:162
+#: src/storage/storage_backend_sheepdog.c:120
+msgid "Missing disk info when adding volume"
+msgstr ""
+
+#: src/storage/storage_backend_sheepdog.c:241
 msgid "Sheepdog does not support encrypted volumes"
 msgstr "Sheepdog 不支持加密卷"
 
-#: src/storage/storage_driver.c:87
+#: src/storage/storage_driver.c:78
 #, c-format
 msgid "Missing backend %d"
 msgstr "缺少后端 %d"
 
-#: src/storage/storage_driver.c:95
+#: src/storage/storage_driver.c:86
 #, c-format
 msgid "Failed to initialize storage pool '%s': %s"
 msgstr "初始化存储池 '%s' 失败：%s"
 
-#: src/storage/storage_driver.c:97 src/storage/storage_driver.c:110
-#: src/storage/storage_driver.c:124
+#: src/storage/storage_driver.c:88 src/storage/storage_driver.c:101
+#: src/storage/storage_driver.c:115
 msgid "no error message found"
 msgstr "未找到出错信息"
 
-#: src/storage/storage_driver.c:108 src/storage/storage_driver.c:122
+#: src/storage/storage_driver.c:99 src/storage/storage_driver.c:113
 #, c-format
 msgid "Failed to autostart storage pool '%s': %s"
 msgstr "自动启动化存储池 '%s' 失败：%s"
 
-#: src/storage/storage_driver.c:273 src/storage/storage_driver.c:697
-#: src/storage/storage_driver.c:759 src/storage/storage_driver.c:809
-#: src/storage/storage_driver.c:850 src/storage/storage_driver.c:913
-#: src/storage/storage_driver.c:970 src/storage/storage_driver.c:1029
-#: src/storage/storage_driver.c:1072 src/storage/storage_driver.c:1105
-#: src/storage/storage_driver.c:1137 src/storage/storage_driver.c:1201
-#: src/storage/storage_driver.c:1243 src/storage/storage_driver.c:1297
-#: src/storage/storage_driver.c:1365 src/storage/storage_driver.c:1602
-#: src/storage/storage_driver.c:1738
+#: src/storage/storage_driver.c:272 src/storage/storage_driver.c:696
+#: src/storage/storage_driver.c:758 src/storage/storage_driver.c:808
+#: src/storage/storage_driver.c:849 src/storage/storage_driver.c:912
+#: src/storage/storage_driver.c:969 src/storage/storage_driver.c:1028
+#: src/storage/storage_driver.c:1071 src/storage/storage_driver.c:1104
+#: src/storage/storage_driver.c:1136 src/storage/storage_driver.c:1200
+#: src/storage/storage_driver.c:1242 src/storage/storage_driver.c:1296
+#: src/storage/storage_driver.c:1364 src/storage/storage_driver.c:1601
+#: src/storage/storage_driver.c:1737
 #, c-format
 msgid "no storage pool with matching uuid %s"
 msgstr "没有带匹配 uuid %s 的存储池"
 
-#: src/storage/storage_driver.c:302 src/storage/storage_driver.c:330
-#: src/storage/storage_driver.c:1516 src/storage/storage_driver.c:1744
-#: src/storage/storage_driver.c:1907 src/storage/storage_driver.c:1973
-#: src/storage/storage_driver.c:2042 src/storage/storage_driver.c:2353
-#: src/storage/storage_driver.c:2421 src/storage/storage_driver.c:2481
-#: src/storage/storage_driver.c:2532
+#: src/storage/storage_driver.c:1439
 #, c-format
 msgid "no storage pool with matching name '%s'"
 msgstr "没有与名称 '%s' 匹配的存储池"
 
-#: src/storage/storage_driver.c:513 src/test/test_driver.c:4759
+#: src/storage/storage_driver.c:464 src/test/test_driver.c:4092
 #, c-format
 msgid "pool type '%s' does not support source discovery"
 msgstr "池类型 '%s' 不支持源发现"
 
-#: src/storage/storage_driver.c:713 src/storage/storage_driver.c:868
-#: src/storage/storage_driver.c:932 src/storage/storage_driver.c:988
+#: src/storage/storage_driver.c:644 src/storage/storage_driver.c:788
+#: src/storage/storage_driver.c:845 src/storage/storage_driver.c:898
 #, c-format
 msgid "pool '%s' has asynchronous jobs running."
 msgstr "池 '%s' 有异步任务运行。"
 
-#: src/storage/storage_driver.c:723
+#: src/storage/storage_driver.c:654
 #, c-format
 msgid "Failed to delete autostart link '%s': %s"
 msgstr "删除自动启动链接  '%s' 失败：%s"
 
-#: src/storage/storage_driver.c:939
+#: src/storage/storage_driver.c:852
 msgid "pool does not support pool deletion"
 msgstr "池不支持池删除"
 
-#: src/storage/storage_driver.c:1429
+#: src/storage/storage_driver.c:1428
 #, c-format
 msgid "no storage vol with matching key %s"
 msgstr "没有带匹配密钥 %s 的存储卷"
 
-#: src/storage/storage_driver.c:1490
+#: src/storage/storage_driver.c:1489
 #, c-format
 msgid "no storage vol with matching path %s"
 msgstr "没有带匹配路径 %s 的存储卷"
 
-#: src/storage/storage_driver.c:1544 src/storage/storage_driver.c:1804
-#: src/storage/storage_driver.c:1932 src/storage/storage_driver.c:1998
-#: src/storage/storage_driver.c:2070 src/storage/storage_driver.c:2378
+#: src/storage/storage_driver.c:1495 src/storage/storage_driver.c:1614
+#: src/storage/storage_driver.c:1676 src/storage/storage_driver.c:1893
+#: src/storage/storage_driver.c:1953
 #, c-format
 msgid "volume '%s' is still being allocated."
 msgstr "卷 '%s' 仍在分配中。"
 
-#: src/storage/storage_driver.c:1551
+#: src/storage/storage_driver.c:1960
 msgid "storage pool does not support vol deletion"
 msgstr "存储池不支持卷删除"
 
-#: src/storage/storage_driver.c:1624
+#: src/storage/storage_driver.c:1623
 #, c-format
 msgid "'%s'"
 msgstr ""
 
-#: src/storage/storage_driver.c:1634
+#: src/storage/storage_driver.c:1334
 msgid "storage pool does not support volume creation"
 msgstr "存储池不支持卷创建"
 
-#: src/storage/storage_driver.c:1782
+#: src/storage/storage_driver.c:1473
 #, c-format
 msgid "storage volume name '%s' already in use."
 msgstr "存储卷名称 '%s' 已在使用中。"
 
-#: src/storage/storage_driver.c:1798
+#: src/storage/storage_driver.c:1489
 msgid "storage pool does not support volume creation from an existing volume"
 msgstr "存储池不支持从现有卷中生成卷"
 
-#: src/storage/storage_driver.c:2084
+#: src/storage/storage_driver.c:2087
 msgid "can't shrink capacity below existing allocation"
 msgstr "无法缩小现有分配的容量"
 
-#: src/storage/storage_driver.c:2092
+#: src/storage/storage_driver.c:2095
 msgid ""
 "Can't shrink capacity below current capacity with shrink flag explicitly "
 "specified"
 msgstr "在明确指定缩小标签后无法将通量降低到当前容量以下"
 
-#: src/storage/storage_driver.c:2099
+#: src/storage/storage_driver.c:2102
 msgid "Not enough space left on storage pool"
 msgstr "没有在村吃池中剩余足够空间"
 
-#: src/storage/storage_driver.c:2105
+#: src/storage/storage_driver.c:2108
 msgid "storage pool does not support changing of volume capacity"
 msgstr "存储池不支持更改卷容量"
 
-#: src/storage/storage_driver.c:2154
+#: src/storage/storage_driver.c:1724
 #, c-format
 msgid "Failed to truncate volume with path '%s' to 0 bytes"
 msgstr "使用路径 '%s' 将卷截取到 0 字节失败"
 
-#: src/storage/storage_driver.c:2163
+#: src/storage/storage_driver.c:1733
 #, c-format
 msgid "Failed to truncate volume with path '%s' to %ju bytes"
 msgstr "使用路径 '%s' 将卷截取到 %ju 字节失败"
 
-#: src/storage/storage_driver.c:2191
+#: src/storage/storage_driver.c:1761
 #, c-format
 msgid "Failed to seek to position %ju in volume with path '%s'"
 msgstr "使用路径 '%ju' 在卷中查找 %s 字节失败"
 
-#: src/storage/storage_driver.c:2204
+#: src/storage/storage_driver.c:1774
 #, c-format
 msgid "Failed to write %zu bytes to storage volume with path '%s'"
 msgstr "使用路径 '%zu' 在存储卷中写入 %s 字节失败"
 
-#: src/storage/storage_driver.c:2218
+#: src/storage/storage_driver.c:1788
 #, c-format
 msgid "cannot sync data to volume with path '%s'"
 msgstr "无法使用路径 '%s' 与卷同步数据"
 
-#: src/storage/storage_driver.c:2249
+#: src/storage/storage_driver.c:1816
 #, c-format
 msgid "Failed to open storage volume with path '%s'"
 msgstr "使用路径 '%s' 打开存储卷失败"
 
-#: src/storage/storage_driver.c:2256
+#: src/storage/storage_driver.c:1823
 #, c-format
 msgid "Failed to stat storage volume with path '%s'"
 msgstr "使用路径 '%s'  stat 存储卷失败"
 
-#: src/storage/storage_driver.c:2290
+#: src/storage/storage_driver.c:2293
 #, c-format
 msgid "unsupported algorithm %d"
 msgstr "不支持的算法 %d"
 
-#: src/storage/storage_driver.c:2342
+#: src/storage/storage_driver.c:2345
 #, c-format
 msgid "wiping algorithm %d not supported"
 msgstr "不支持擦除算法 %d"
@@ -21178,7 +21433,7 @@
 msgid "domain with managedsave data can only have runstate 'shutoff'"
 msgstr ""
 
-#: src/test/test_driver.c:531
+#: src/test/test_driver.c:347
 #, c-format
 msgid "Exceeded max iface limit %d"
 msgstr "超过 iface 上限 %d"
@@ -21188,36 +21443,36 @@
 msgid "resolving %s filename"
 msgstr ""
 
-#: src/test/test_driver.c:931
+#: src/test/test_driver.c:804
 msgid "invalid node cpu nodes value"
 msgstr "无效节点 cpu 节点值"
 
-#: src/test/test_driver.c:940
+#: src/test/test_driver.c:813
 msgid "invalid node cpu sockets value"
 msgstr "无效节点 cpu 插槽值"
 
-#: src/test/test_driver.c:949
+#: src/test/test_driver.c:822
 msgid "invalid node cpu cores value"
 msgstr "无效节点 cpu core 值"
 
-#: src/test/test_driver.c:958
+#: src/test/test_driver.c:831
 msgid "invalid node cpu threads value"
 msgstr "无效节点 cpu 线程值"
 
-#: src/test/test_driver.c:971
+#: src/test/test_driver.c:843
 msgid "invalid node cpu active value"
 msgstr "无效节点 cpu 活跃值"
 
-#: src/test/test_driver.c:979
+#: src/test/test_driver.c:851
 msgid "invalid node cpu mhz value"
 msgstr "无效节点 cpu mhz 值"
 
-#: src/test/test_driver.c:987 src/xenxs/xen_xm.c:703
+#: src/test/test_driver.c:859 src/xenxs/xen_xm.c:655
 #, c-format
 msgid "Model %s too big for destination"
 msgstr "对于目的地来说型号 %s 太大"
 
-#: src/test/test_driver.c:999
+#: src/test/test_driver.c:871
 msgid "invalid node memory value"
 msgstr "无效节点 cpu 内存值"
 
@@ -21229,7 +21484,7 @@
 msgid "missing username in /node/auth/user field"
 msgstr ""
 
-#: src/test/test_driver.c:1447
+#: src/test/test_driver.c:786
 msgid "Root element is not 'node'"
 msgstr "根元素不是 'node'"
 
@@ -21245,61 +21500,61 @@
 msgid "authentication failed, see test XML for the correct username/password"
 msgstr ""
 
-#: src/test/test_driver.c:1574
+#: src/test/test_driver.c:1125
 msgid "testOpen: supply a path or use test:///default"
 msgstr "testOpen：提供一个路径或者默认使用 test:///"
 
-#: src/test/test_driver.c:1957
+#: src/test/test_driver.c:1482
 #, c-format
 msgid "domain '%s' not paused"
 msgstr "域 '%s' 未中断"
 
-#: src/test/test_driver.c:2000 src/test/test_driver.c:2044
+#: src/test/test_driver.c:1525 src/test/test_driver.c:1566
 #, c-format
 msgid "domain '%s' not running"
 msgstr "域 '%s' 没有在运行"
 
-#: src/test/test_driver.c:2165 src/test/test_driver.c:2759
-#: src/test/test_driver.c:3383 src/test/test_driver.c:3439
+#: src/test/test_driver.c:1682 src/test/test_driver.c:2300
+#: src/test/test_driver.c:2831 src/test/test_driver.c:2886
 msgid "getting time of day"
 msgstr "正在获得一天当中的时间"
 
-#: src/test/test_driver.c:2248
+#: src/test/test_driver.c:1765
 #, c-format
 msgid "saving domain '%s' failed to allocate space for metadata"
 msgstr "保存域 '%s' 失败，无法为元数据分配空间"
 
-#: src/test/test_driver.c:2255
+#: src/test/test_driver.c:1772
 #, c-format
 msgid "saving domain '%s' to '%s': open failed"
 msgstr "将域 '%s' 保存到 '%s'：打开失败"
 
-#: src/test/test_driver.c:2262 src/test/test_driver.c:2268
-#: src/test/test_driver.c:2274 src/test/test_driver.c:2281
+#: src/test/test_driver.c:1779 src/test/test_driver.c:1785
+#: src/test/test_driver.c:1791 src/test/test_driver.c:1798
 #, c-format
 msgid "saving domain '%s' to '%s': write failed"
 msgstr "将域 '%s' 保存到 '%s'：写入失败"
 
-#: src/test/test_driver.c:2351
+#: src/test/test_driver.c:1866
 #, c-format
 msgid "cannot read domain image '%s'"
 msgstr "无法读取域映像 '%s'"
 
-#: src/test/test_driver.c:2357
+#: src/test/test_driver.c:1872
 #, c-format
 msgid "incomplete save header in '%s'"
 msgstr "没有完成在 '%s' 中保存标题"
 
-#: src/test/test_driver.c:2363
+#: src/test/test_driver.c:1878
 msgid "mismatched header magic"
 msgstr "错误匹配的 header magic"
 
-#: src/test/test_driver.c:2368
+#: src/test/test_driver.c:1883
 #, c-format
 msgid "failed to read metadata length in '%s'"
 msgstr "在 '%s' 中读取元数据长度失败"
 
-#: src/test/test_driver.c:2374
+#: src/test/test_driver.c:1889
 msgid "length of metadata out of range"
 msgstr "元数据长度超出范围"
 
@@ -21308,22 +21563,22 @@
 msgid "incomplete metadata in '%s'"
 msgstr ""
 
-#: src/test/test_driver.c:2453
+#: src/test/test_driver.c:1970
 #, c-format
 msgid "domain '%s' coredump: failed to open %s"
 msgstr "域 '%s' coredump：打开 %s 失败"
 
-#: src/test/test_driver.c:2459
+#: src/test/test_driver.c:1976
 #, c-format
 msgid "domain '%s' coredump: failed to write header to %s"
 msgstr "域 '%s' coredump：在 %s 写入标题失败"
 
-#: src/test/test_driver.c:2465
+#: src/test/test_driver.c:1982
 #, c-format
 msgid "domain '%s' coredump: write failed: %s"
 msgstr "域 '%s' coredump：写入失败：%s"
 
-#: src/test/test_driver.c:2666
+#: src/test/test_driver.c:2209
 msgid "cannot hotplug vcpus for an inactive domain"
 msgstr "无法为不活跃的域热插拔 vcpu"
 
@@ -21332,87 +21587,103 @@
 msgid "requested cpu amount exceeds maximum (%d > %d)"
 msgstr "所需 cpu 数超过最大值 (%d > %d)"
 
-#: src/test/test_driver.c:2751
+#: src/test/test_driver.c:2292
 msgid "cannot list vcpus for an inactive domain"
 msgstr "无法为不活跃的域列出 vcpu"
 
-#: src/test/test_driver.c:2838
+#: src/libxl/libxl_driver.c:2446 src/test/test_driver.c:2378
 msgid "cannot pin vcpus on an inactive domain"
 msgstr "无法在活跃的域中 pin vcpu"
 
-#: src/test/test_driver.c:2844
+#: src/test/test_driver.c:2384
 msgid "requested vcpu is higher than allocated vcpus"
 msgstr "请求的 vcpu 超过已分配的 vcpu"
 
-#: src/test/test_driver.c:3054
+#: src/test/test_driver.c:2525
 msgid "Range exceeds available cells"
 msgstr "范围超出可用单元"
 
-#: src/test/test_driver.c:3090
+#: src/test/test_driver.c:2561
 #, c-format
 msgid "Domain '%s' is already running"
 msgstr "域 '%s' 已经运行"
 
-#: src/test/test_driver.c:3760
+#: src/test/test_driver.c:3172
 #, c-format
 msgid "Network '%s' is still running"
 msgstr "网络 '%s' 仍在运行"
 
-#: src/test/test_driver.c:3848
+#: src/test/test_driver.c:3205
 #, c-format
 msgid "Network '%s' is already running"
 msgstr "网络 '%s' 已经运行"
 
-#: src/test/test_driver.c:4213
+#: src/test/test_driver.c:3560
 msgid "there is another transaction running."
 msgstr "有另一个事务正在运行中。"
 
-#: src/test/test_driver.c:4241
+#: src/test/test_driver.c:4247
 msgid "no transaction running, nothing to be committed."
 msgstr "无事务正在运行，没有可提交的事务。"
 
-#: src/test/test_driver.c:4269
+#: src/test/test_driver.c:3614
 msgid "no transaction running, nothing to rollback."
 msgstr "没有正在运行的事务，无法回转。"
 
-#: src/test/test_driver.c:4789
+#: src/test/test_driver.c:4122
 msgid "storage pool already exists"
 msgstr "存储池已存在"
 
-#: src/test/test_driver.c:5248
+#: src/storage/storage_driver.c:632 src/storage/storage_driver.c:690
+#: src/storage/storage_driver.c:736 src/storage/storage_driver.c:773
+#: src/storage/storage_driver.c:830 src/storage/storage_driver.c:883
+#: src/storage/storage_driver.c:939 src/storage/storage_driver.c:978
+#: src/storage/storage_driver.c:1092 src/storage/storage_driver.c:1125
+#: src/storage/storage_driver.c:1170 src/storage/storage_driver.c:1303
+#: src/storage/storage_driver.c:1433 src/storage/storage_driver.c:1593
+#: src/storage/storage_driver.c:1655 src/storage/storage_driver.c:1872
+#: src/storage/storage_driver.c:1929 src/storage/storage_driver.c:2010
+#: src/storage/storage_driver.c:2066 src/storage/storage_driver.c:2113
 msgid "no storage pool with matching uuid"
 msgstr "没有带匹配 uuid 的存储池"
 
-#: src/test/test_driver.c:5254
+#: src/storage/storage_driver.c:782 src/storage/storage_driver.c:892
+#: src/storage/storage_driver.c:1098 src/storage/storage_driver.c:1131
+#: src/storage/storage_driver.c:1176 src/storage/storage_driver.c:1309
+#: src/storage/storage_driver.c:1446 src/storage/storage_driver.c:1452
+#: src/storage/storage_driver.c:1599 src/storage/storage_driver.c:1661
+#: src/storage/storage_driver.c:1878 src/storage/storage_driver.c:1935
+#: src/storage/storage_driver.c:2016 src/storage/storage_driver.c:2072
+#: src/storage/storage_driver.c:2119
 msgid "storage pool is not active"
 msgstr "存储池未激活"
 
-#: src/test/test_driver.c:7168
+#: src/test/test_driver.c:7174
 msgid "must respawn guest to start inactive snapshot"
 msgstr ""
 
-#: src/uml/uml_conf.c:178
+#: src/uml/uml_conf.c:191
 msgid "IP address not supported for ethernet interface"
 msgstr "以太网接口不支持 IP 地址"
 
-#: src/uml/uml_conf.c:185
+#: src/uml/uml_conf.c:203
 msgid "TCP server networking type not supported"
 msgstr "不支持 TCP 服务器联网类型"
 
-#: src/uml/uml_conf.c:190
+#: src/uml/uml_conf.c:208
 msgid "TCP client networking type not supported"
 msgstr "不支持 TCP 客户端联网类型"
 
-#: src/uml/uml_conf.c:205
+#: src/uml/uml_conf.c:223
 #, c-format
 msgid "Network '%s' not found"
 msgstr "未找到网络 '%s'"
 
-#: src/uml/uml_conf.c:236
+#: src/uml/uml_conf.c:253
 msgid "internal networking type not supported"
 msgstr "不支持内部联网类型"
 
-#: src/uml/uml_conf.c:241
+#: src/uml/uml_conf.c:258
 msgid "direct networking type not supported"
 msgstr "不支持直接联网类型"
 
@@ -21424,144 +21695,144 @@
 msgid "interface script execution not supported by this driver"
 msgstr "这台驱动器不支持接口脚本执行"
 
-#: src/uml/uml_conf.c:311
+#: src/uml/uml_conf.c:327
 msgid "only TCP listen is supported for chr device"
 msgstr "只支持字符设备的 TCP 侦听"
 
-#: src/uml/uml_conf.c:327
+#: src/uml/uml_conf.c:345
 #, c-format
 msgid "failed to open chardev file: %s"
 msgstr "打开 chardev 文件失败：%s"
 
-#: src/uml/uml_conf.c:348
+#: src/uml/uml_conf.c:366
 #, c-format
 msgid "unsupported chr device type %d"
 msgstr "不支持字符设备类型 %d"
 
-#: src/uml/uml_driver.c:530
+#: src/uml/uml_driver.c:471
 msgid "cannot initialize inotify"
 msgstr "无法初始化 inotify"
 
-#: src/uml/uml_driver.c:536
+#: src/uml/uml_driver.c:477
 #, c-format
 msgid "Failed to create monitor directory %s: %s"
 msgstr "创建监视器目录 %s 失败：%s"
 
-#: src/uml/uml_driver.c:547
+#: src/uml/uml_driver.c:546
 #, c-format
 msgid "Failed to create inotify watch on %s: %s"
 msgstr ""
 
-#: src/uml/uml_driver.c:578
+#: src/uml/uml_driver.c:514
 msgid "umlStartup: out of memory"
 msgstr "umlStartup: 超出内存"
 
-#: src/uml/uml_driver.c:832
+#: src/uml/uml_driver.c:776
 #, c-format
 msgid "failed to read pid: %s"
 msgstr "读取 pid 失败：%s"
 
-#: src/uml/uml_driver.c:853
+#: src/uml/uml_driver.c:798
 #, c-format
 msgid "Unix path %s too long for destination"
 msgstr "对于目的地来说 Unix 路径 %s 太长"
 
-#: src/uml/uml_driver.c:883
+#: src/uml/uml_driver.c:828
 msgid "cannot open socket"
 msgstr "无法打开套接字"
 
-#: src/uml/uml_driver.c:893
+#: src/uml/uml_driver.c:838
 msgid "cannot bind socket"
 msgstr "无法绑定套接字"
 
-#: src/uml/uml_driver.c:947
+#: src/uml/uml_driver.c:892
 #, c-format
 msgid "cannot send too long command %s (%d bytes)"
 msgstr "无法发送过长的命令 %s（%d 字节）"
 
-#: src/uml/uml_driver.c:953
+#: src/uml/uml_driver.c:898
 #, c-format
 msgid "Command %s too long for destination"
 msgstr "对于目的地来说命令 %s 太长"
 
-#: src/uml/uml_driver.c:960
+#: src/uml/uml_driver.c:905
 #, c-format
 msgid "cannot send command %s"
 msgstr "无法发送命令 %s"
 
-#: src/uml/uml_driver.c:973
+#: src/uml/uml_driver.c:918
 #, c-format
 msgid "cannot read reply %s"
 msgstr "无法读取回复 %s"
 
-#: src/uml/uml_driver.c:979
+#: src/uml/uml_driver.c:924
 #, c-format
 msgid "incomplete reply %s"
 msgstr "不完整的回复 %s"
 
-#: src/uml/uml_driver.c:1042
+#: src/uml/uml_driver.c:989
 msgid "no kernel specified"
 msgstr "没有指定内核"
 
-#: src/uml/uml_driver.c:1051
+#: src/uml/uml_driver.c:998
 #, c-format
 msgid "Cannot find UML kernel %s"
 msgstr "无法找到 UML 内核 %s"
 
-#: src/uml/uml_driver.c:1079
+#: src/uml/uml_driver.c:1028
 msgid "Unable to set VM logfile close-on-exec flag"
 msgstr "无法为 VM 日志文件设定 close-on-exec 标签"
 
-#: src/uml/uml_driver.c:1218
+#: src/uml/uml_driver.c:1167
 #, c-format
 msgid "unexpected UML URI path '%s', try uml:///system"
 msgstr "意外的 UML URI 路径 '%s', 尝试 uml:///system"
 
-#: src/uml/uml_driver.c:1225
+#: src/uml/uml_driver.c:1174
 #, c-format
 msgid "unexpected UML URI path '%s', try uml:///session"
 msgstr "意外的 UML URI 路径 '%s', 尝试 uml:///session"
 
-#: src/uml/uml_driver.c:1234
+#: src/uml/uml_driver.c:1183
 msgid "uml state driver is not active"
 msgstr "uml 状态驱动器不活跃"
 
-#: src/uml/uml_driver.c:1517
+#: src/uml/uml_driver.c:1435
 #, c-format
 msgid "cannot parse version %s"
 msgstr "无法解析版本 %s"
 
-#: src/uml/uml_driver.c:1645
+#: src/uml/uml_driver.c:1538
 msgid "shutdown operation failed"
 msgstr "关闭操作失败"
 
-#: src/uml/uml_driver.c:1795
+#: src/uml/uml_driver.c:1668
 msgid "cannot set max memory lower than current memory"
 msgstr "无法将最大内存设置为低于当前内存"
 
-#: src/uml/uml_driver.c:1831
+#: src/qemu/qemu_driver.c:1896 src/uml/uml_driver.c:1701
 msgid "cannot set memory of an active domain"
 msgstr "无法在活跃域中设定内存"
 
-#: src/uml/uml_driver.c:2196
+#: src/uml/uml_driver.c:2044
 msgid "cannot attach device on inactive domain"
 msgstr "无法在非活跃的域中附加设备"
 
-#: src/uml/uml_driver.c:2242 src/uml/uml_driver.c:2356
-#: src/vbox/vbox_tmpl.c:5635 src/vbox/vbox_tmpl.c:5650
-#: src/vbox/vbox_tmpl.c:5798
+#: src/uml/uml_driver.c:2090 src/uml/uml_driver.c:2202
+#: src/vbox/vbox_tmpl.c:5538 src/vbox/vbox_tmpl.c:5553
+#: src/vbox/vbox_tmpl.c:5709
 msgid "cannot modify the persistent configuration of a domain"
 msgstr "无法修改域的永久配置"
 
-#: src/uml/uml_driver.c:2316
+#: src/uml/uml_driver.c:2162
 msgid "cannot detach device on inactive domain"
 msgstr "无法在非活跃的域中分离设备"
 
-#: src/uml/uml_driver.c:2335
+#: src/qemu/qemu_driver.c:5267 src/uml/uml_driver.c:2181
 msgid "This type of device cannot be hot unplugged"
 msgstr "无法热插拔此类设备"
 
-#: src/uml/uml_driver.c:2518 tools/virsh-volume.c:665
+#: src/uml/uml_driver.c:2355 tools/virsh.c:10107
 #, c-format
 msgid "cannot read %s"
 msgstr "无法读取 %s"
@@ -21598,17 +21869,17 @@
 msgid "unable to fsync %s"
 msgstr ""
 
-#: src/util/iohelper.c:195
+#: src/util/iohelper.c:186
 #, c-format
 msgid "Unable to close %s"
 msgstr "无法关闭 %s"
 
-#: src/util/iohelper.c:209
+#: src/util/iohelper.c:200
 #, c-format
 msgid "%s: try --help for more details"
 msgstr "%s: 尝试使用 --help 获取更多信息"
 
-#: src/util/iohelper.c:211
+#: src/util/iohelper.c:202
 #, c-format
 msgid ""
 "Usage: %s FILENAME OFLAGS MODE OFFSET LENGTH DELETE\n"
@@ -21617,42 +21888,42 @@
 "用法：%s FILENAME OFLAGS MODE OFFSET LENGTH DELETE\n"
 "   或者：%s FILENAME LENGTH FD\n"
 
-#: src/util/iohelper.c:253
+#: src/util/iohelper.c:245
 #, c-format
 msgid "%s: malformed file flags %s"
 msgstr "%s: 受损文件标签 %s"
 
-#: src/util/iohelper.c:258
+#: src/util/iohelper.c:250
 #, c-format
 msgid "%s: malformed file mode %s"
 msgstr "%s: 受损文件模式 %s"
 
-#: src/util/iohelper.c:263
+#: src/util/iohelper.c:255
 #, c-format
 msgid "%s: malformed file offset %s"
 msgstr "%s: 受损文件偏移 %s"
 
-#: src/util/iohelper.c:268
+#: src/util/iohelper.c:260
 #, c-format
 msgid "%s: malformed delete flag %s"
 msgstr "%s: 受损的删除标签 %s"
 
-#: src/util/iohelper.c:276
+#: src/util/iohelper.c:268
 #, c-format
 msgid "%s: malformed fd %s"
 msgstr "%s: 受损的 fd %s"
 
-#: src/util/iohelper.c:290
+#: src/util/iohelper.c:282
 #, c-format
 msgid "%s: unable to determine access mode of fd %d"
 msgstr "%s: 无法确定 fd %d 的访问模式"
 
-#: src/util/iohelper.c:299
+#: src/util/iohelper.c:291
 #, c-format
 msgid "%s: malformed file length %s"
 msgstr "%s: 受损文件长度 %s"
 
-#: src/util/iohelper.c:317
+#: src/util/iohelper.c:309
 #, c-format
 msgid "%s: unknown failure with %s\n"
 msgstr "%s: %s 的未知失败\n"
@@ -21666,17 +21937,17 @@
 msgid "Unable to initialize audit layer"
 msgstr "无法启动审核层"
 
-#: src/util/virauth.c:168
+#: src/util/authhelper.c:41
 #, c-format
 msgid "Enter username for %s [%s]"
 msgstr "为 %s [%s] 输入用户名"
 
-#: src/util/virauth.c:173
+#: src/util/authhelper.c:46
 #, c-format
 msgid "Enter username for %s"
 msgstr "为 %s 输入用户名"
 
-#: src/util/virauth.c:244
+#: src/util/authhelper.c:87
 #, c-format
 msgid "Enter %s's password for %s"
 msgstr "为 %s 输入 %s's 密码"
@@ -21696,228 +21967,285 @@
 msgid "Failed to parse bitmap '%s'"
 msgstr ""
 
-#: src/util/vircgroup.c:133
+#: src/util/vircgroup.c:139
 msgid "Cannot open /proc/cgroups"
 msgstr ""
 
-#: src/util/vircgroup.c:168
+#: src/util/vircgroup.c:174
 msgid "Error while reading /proc/cgroups"
 msgstr ""
 
-#: src/util/vircgroup.c:306
+#: src/util/cgroup.c:113
 msgid "Unable to open /proc/mounts"
 msgstr "无法打开 /proc/mounts"
 
-#: src/util/vircgroup.c:344
+#: src/util/vircgroup.c:350
 #, c-format
 msgid "Missing '/' separator in cgroup mount '%s'"
 msgstr ""
 
-#: src/util/vircgroup.c:365
+#: src/util/vircgroup.c:371
 #, c-format
 msgid "Cannot stat %s"
 msgstr ""
 
-#: src/util/vircgroup.c:477 src/util/virstoragefile.c:1210
-#, c-format
-msgid "Unable to open '%s'"
-msgstr "无法打开 '%s'"
-
-#: src/util/vircgroup.c:595
+#: src/util/vircgroup.c:601
 #, c-format
 msgid "Controller '%s' is not wanted, but '%s' is co-mounted"
 msgstr ""
 
-#: src/util/vircgroup.c:620
+#: src/util/vircgroup.c:626
 msgid "At least one cgroup controller is required"
 msgstr ""
 
-#: src/util/vircgroup.c:642
+#: src/util/cgroup.c:251
 #, c-format
 msgid "Could not find placement for controller %s at %s"
 msgstr "无法在 %s 为控制器 %s 查找位置"
 
-#: src/util/vircgroup.c:677
+#: src/util/vircgroup.c:683
 #, c-format
 msgid "Invalid value '%s' for '%s'"
 msgstr ""
 
-#: src/util/vircgroup.c:682
+#: src/util/vircgroup.c:688
 #, c-format
 msgid "Unable to write to '%s'"
 msgstr ""
 
-#: src/util/vircgroup.c:712
+#: src/util/vircgroup.c:718
 #, c-format
 msgid "Unable to read from '%s'"
 msgstr ""
 
-#: src/util/vircgroup.c:782 src/util/vircgroup.c:809
+#: src/util/vircgroup.c:788 src/util/vircgroup.c:815
 #, c-format
 msgid "Unable to parse '%s' as an integer"
 msgstr ""
 
-#: src/util/vircgroup.c:930
+#: src/util/vircgroup.c:936
 #, c-format
 msgid "Failed to create controller %s for group"
 msgstr ""
 
-#: src/util/vircgroup.c:1073
+#: src/util/vircgroup.c:1079
 #, c-format
 msgid "Controller %d out of range"
 msgstr ""
 
-#: src/util/vircgroup.c:1079
+#: src/util/vircgroup.c:1085
 #, c-format
 msgid "Controller '%s' not mounted"
 msgstr ""
 
-#: src/util/vircgroup.c:1106
+#: src/util/vircgroup.c:1112
 #, c-format
 msgid "Cannot parse '%s' as an integer"
 msgstr ""
 
-#: src/util/vircgroup.c:1255
+#: src/util/vircgroup.c:1261
 #, c-format
 msgid "Partition path '%s' must start with '/'"
 msgstr ""
 
-#: src/util/vircgroup.c:1760
+#: src/util/vircgroup.c:1766
 msgid "No controllers are mounted"
 msgstr ""
 
-#: src/util/vircgroup.c:1766
+#: src/util/vircgroup.c:1772
 #, c-format
 msgid "Controller '%s' is not mounted"
 msgstr ""
 
-#: src/util/vircgroup.c:1773
+#: src/util/vircgroup.c:1779
 #, c-format
 msgid "Controller '%s' is not enabled for group"
 msgstr ""
 
-#: src/util/vircgroup.c:1852 src/util/vircgroup.c:2307
-#: src/util/vircgroup.c:2405
+#: src/util/vircgroup.c:1854
+#, c-format
+msgid "Cannot parse byte %sstat '%s'"
+msgstr ""
+
+#: src/util/vircgroup.c:1864
+#, c-format
+msgid "Sum of byte %sstat overflows"
+msgstr ""
+
+#: src/util/vircgroup.c:1875
+#, c-format
+msgid "Cannot parse %srequest stat '%s'"
+msgstr ""
+
+#: src/util/vircgroup.c:1885
+#, c-format
+msgid "Sum of %srequest stat overflows"
+msgstr ""
+
+#: src/util/vircgroup.c:1942 src/util/vircgroup.c:2079
+#: src/util/vircgroup.c:2124 src/util/vircgroup.c:2169
+#: src/util/vircgroup.c:2213 src/util/vircgroup.c:2262
+#: src/util/vircgroup.c:2716 src/util/vircgroup.c:2814
 #, c-format
 msgid "Path '%s' is not accessible"
 msgstr ""
 
-#: src/util/vircgroup.c:1859
+#: src/util/vircgroup.c:1949 src/util/vircgroup.c:2086
+#: src/util/vircgroup.c:2131 src/util/vircgroup.c:2176
+#: src/util/vircgroup.c:2220 src/util/vircgroup.c:2269
 #, c-format
 msgid "Path '%s' must be a block device"
 msgstr ""
 
-#: src/util/vircgroup.c:1893 src/util/vircgroup.c:1992
-#: src/util/vircgroup.c:2054
+#: src/util/vircgroup.c:1969
+#, c-format
+msgid "Cannot find byte stats for block device '%s'"
+msgstr ""
+
+#: src/util/vircgroup.c:1976
+#, c-format
+msgid "Cannot find request stats for block device '%s'"
+msgstr ""
+
+#: src/util/vircgroup.c:1984
+#, c-format
+msgid "Cannot find byte %sstats for block device '%s'"
+msgstr ""
+
+#: src/util/vircgroup.c:1991 src/util/vircgroup.c:2005
+#, c-format
+msgid "Cannot parse %sstat '%s'"
+msgstr ""
+
+#: src/util/vircgroup.c:1998
+#, c-format
+msgid "Cannot find request %sstats for block device '%s'"
+msgstr ""
+
+#: src/util/vircgroup.c:2302 src/util/vircgroup.c:2401
+#: src/util/vircgroup.c:2463
 #, c-format
 msgid "Memory '%llu' must be less than %llu"
 msgstr ""
 
-#: src/util/vircgroup.c:2455
+#: src/util/vircgroup.c:2916 src/util/vircgroup.c:2930
+msgid "unable to get cpu account"
+msgstr "无法获取 cpu 计数"
+
+#: src/util/vircgroup.c:2986
 #, c-format
 msgid "cfs_period '%llu' must be in range (1000, 1000000)"
 msgstr ""
 
-#: src/util/vircgroup.c:2500
+#: src/util/vircgroup.c:3031
 #, c-format
 msgid "cfs_quota '%lld' must be in range (1000, %llu)"
 msgstr ""
 
-#: src/util/vircgroup.c:2531
+#: src/util/cgroup.c:683
 #, c-format
 msgid "Unable to open %s (%d)"
 msgstr "无法打开 %s (%d)"
 
-#: src/util/vircgroup.c:2542
+#: src/util/cgroup.c:694
 #, c-format
 msgid "Failed to readdir for %s (%d)"
 msgstr "读取 %s (%d) 目录失败"
 
-#: src/util/vircgroup.c:2563
+#: src/util/cgroup.c:715
 #, c-format
 msgid "Unable to remove %s (%d)"
 msgstr "无法删除 %s (%d)"
 
-#: src/util/vircgroup.c:2650 src/util/vircgroup.c:2660 src/util/virfile.c:1617
+#: src/util/vircgroup.c:3181 src/util/vircgroup.c:3191 src/util/virfile.c:1617
 #, c-format
 msgid "Failed to read %s"
 msgstr ""
 
-#: src/util/vircgroup.c:2672
+#: src/util/vircgroup.c:3203
 #, c-format
 msgid "Failed to kill process %lu"
 msgstr ""
 
-#: src/util/vircgroup.c:2880
+#: src/util/vircgroup.c:3411
 #, c-format
 msgid "Could not find directory separator in %s"
 msgstr ""
 
-#: src/util/vircgroup.c:2892
+#: src/util/vircgroup.c:3423
 msgid "Could not find any mounted controllers"
 msgstr ""
 
-#: src/util/vircgroup.c:2940
+#: src/util/vircgroup.c:3471
 #, c-format
 msgid "Cannot parse user stat '%s'"
 msgstr ""
 
-#: src/util/vircgroup.c:2947
+#: src/util/vircgroup.c:3478
 #, c-format
 msgid "Cannot parse sys stat '%s'"
 msgstr ""
 
-#: src/util/vircgroup.c:2958
+#: src/util/vircgroup.c:3489
 msgid "Cannot determine system clock HZ"
 msgstr ""
 
-#: src/util/vircgroup.c:3007 src/util/vircgroup.c:3039
+#: src/util/vircgroup.c:3538 src/util/vircgroup.c:3570
 #, c-format
 msgid "Unable to create directory %s"
 msgstr "无法生成目录 %s"
 
-#: src/util/vircgroup.c:3018
+#: src/lxc/lxc_container.c:484
 #, c-format
 msgid "Failed to mount %s on %s type %s"
 msgstr "将 %s 在 %s 类型 %s 中挂载失败"
 
-#: src/util/vircgroup.c:3048
+#: src/util/vircgroup.c:3579
 #, c-format
 msgid "Failed to bind cgroup '%s' on '%s'"
 msgstr ""
 
-#: src/util/vircgroup.c:3064
+#: src/util/vircgroup.c:3595
 #, c-format
 msgid "Unable to symlink directory %s to %s"
 msgstr "无法为目录 %s 添加符号链接 %s"
 
-#: src/util/vircgroup.c:3126 src/util/vircgroup.c:3135
-#: src/util/vircgroup.c:3148 src/util/vircgroup.c:3160
-#: src/util/vircgroup.c:3171 src/util/vircgroup.c:3182
-#: src/util/vircgroup.c:3196 src/util/vircgroup.c:3213
-#: src/util/vircgroup.c:3230 src/util/vircgroup.c:3249
-#: src/util/vircgroup.c:3259 src/util/vircgroup.c:3270
-#: src/util/vircgroup.c:3280 src/util/vircgroup.c:3290
-#: src/util/vircgroup.c:3300 src/util/vircgroup.c:3311
-#: src/util/vircgroup.c:3321 src/util/vircgroup.c:3331
-#: src/util/vircgroup.c:3341 src/util/vircgroup.c:3351
-#: src/util/vircgroup.c:3361 src/util/vircgroup.c:3371
-#: src/util/vircgroup.c:3381 src/util/vircgroup.c:3391
-#: src/util/vircgroup.c:3401 src/util/vircgroup.c:3411
-#: src/util/vircgroup.c:3421 src/util/vircgroup.c:3431
-#: src/util/vircgroup.c:3441 src/util/vircgroup.c:3450
-#: src/util/vircgroup.c:3463 src/util/vircgroup.c:3475
-#: src/util/vircgroup.c:3486 src/util/vircgroup.c:3499
-#: src/util/vircgroup.c:3511 src/util/vircgroup.c:3522
-#: src/util/vircgroup.c:3532 src/util/vircgroup.c:3542
-#: src/util/vircgroup.c:3552 src/util/vircgroup.c:3562
-#: src/util/vircgroup.c:3572 src/util/vircgroup.c:3581
-#: src/util/vircgroup.c:3590 src/util/vircgroup.c:3600
-#: src/util/vircgroup.c:3610 src/util/vircgroup.c:3619
-#: src/util/vircgroup.c:3629 src/util/vircgroup.c:3639
-#: src/util/vircgroup.c:3649 src/util/vircgroup.c:3660
-#: src/util/vircgroup.c:3670 src/util/vircgroup.c:3680
-#: src/util/vircgroup.c:3691
+#: src/util/vircgroup.c:3636
+#, c-format
+msgid "Unable to open dir '%s'"
+msgstr ""
+
+#: src/util/vircgroup.c:3727 src/util/vircgroup.c:3736
+#: src/util/vircgroup.c:3749 src/util/vircgroup.c:3761
+#: src/util/vircgroup.c:3772 src/util/vircgroup.c:3783
+#: src/util/vircgroup.c:3797 src/util/vircgroup.c:3814
+#: src/util/vircgroup.c:3831 src/util/vircgroup.c:3850
+#: src/util/vircgroup.c:3860 src/util/vircgroup.c:3871
+#: src/util/vircgroup.c:3881 src/util/vircgroup.c:3894
+#: src/util/vircgroup.c:3908 src/util/vircgroup.c:3918
+#: src/util/vircgroup.c:3928 src/util/vircgroup.c:3939
+#: src/util/vircgroup.c:3949 src/util/vircgroup.c:3959
+#: src/util/vircgroup.c:3969 src/util/vircgroup.c:3979
+#: src/util/vircgroup.c:3989 src/util/vircgroup.c:3999
+#: src/util/vircgroup.c:4009 src/util/vircgroup.c:4019
+#: src/util/vircgroup.c:4029 src/util/vircgroup.c:4039
+#: src/util/vircgroup.c:4049 src/util/vircgroup.c:4059
+#: src/util/vircgroup.c:4069 src/util/vircgroup.c:4079
+#: src/util/vircgroup.c:4089 src/util/vircgroup.c:4099
+#: src/util/vircgroup.c:4109 src/util/vircgroup.c:4118
+#: src/util/vircgroup.c:4131 src/util/vircgroup.c:4143
+#: src/util/vircgroup.c:4154 src/util/vircgroup.c:4167
+#: src/util/vircgroup.c:4179 src/util/vircgroup.c:4190
+#: src/util/vircgroup.c:4200 src/util/vircgroup.c:4210
+#: src/util/vircgroup.c:4220 src/util/vircgroup.c:4230
+#: src/util/vircgroup.c:4240 src/util/vircgroup.c:4249
+#: src/util/vircgroup.c:4258 src/util/vircgroup.c:4268
+#: src/util/vircgroup.c:4278 src/util/vircgroup.c:4287
+#: src/util/vircgroup.c:4297 src/util/vircgroup.c:4307
+#: src/util/vircgroup.c:4317 src/util/vircgroup.c:4328
+#: src/util/vircgroup.c:4339 src/util/vircgroup.c:4349
+#: src/util/vircgroup.c:4359 src/util/vircgroup.c:4370
+#: src/util/vircgroup.c:4391 src/util/vircgroup.c:4403
 msgid "Control groups not supported on this platform"
 msgstr ""
 
@@ -21937,213 +22265,212 @@
 msgid "Trying to remove mismatching close callback for domain %s"
 msgstr "尝试为域 %s 删除不匹配的 close 回叫"
 
-#: src/util/vircommand.c:227
+#: src/util/command.c:167
 msgid "cannot block signals"
 msgstr "无法阻断信号"
 
-#: src/util/vircommand.c:246 src/util/vircommand.c:589
+#: src/util/command.c:186 src/util/command.c:492
 msgid "cannot fork child process"
 msgstr "无法分开子进程"
 
-#: src/util/vircommand.c:258 src/util/vircommand.c:303
+#: src/util/command.c:198 src/util/command.c:243
 msgid "cannot unblock signals"
 msgstr "无法取消信号阻断"
 
-#: src/util/vircommand.c:363
+#: src/util/command.c:1946
 msgid "Unable to notify parent process"
 msgstr "无法通知上级进程"
 
-#: src/util/vircommand.c:373
+#: src/util/command.c:1968
 msgid "Unable to wait on parent process"
 msgstr "无法在上级进程中等待"
 
-#: src/util/vircommand.c:376
+#: src/util/command.c:1970
 msgid "libvirtd quit during handshake"
 msgstr "握手过程中 libvirt 退出"
 
-#: src/util/vircommand.c:381
+#: src/util/vircommand.c:384
 #, c-format
 msgid "Unexpected confirm code '%c' from parent"
 msgstr "上级的意外确定代码 '%c'"
 
-#: src/util/vircommand.c:418
+#: src/util/command.c:327
 #, c-format
 msgid "Cannot find '%s' in path"
 msgstr "未在路径中找到 '%s'"
 
-#: src/util/vircommand.c:436
+#: src/util/command.c:345
 msgid "cannot create pipe"
 msgstr "无法创建管道"
 
-#: src/util/vircommand.c:443 src/util/vircommand.c:470
+#: src/util/command.c:352 src/util/command.c:377
 msgid "Failed to set non-blocking file descriptor flag"
 msgstr "设定非块文件描述符标记失败"
 
-#: src/util/vircommand.c:463
+#: src/util/command.c:370
 msgid "Failed to create pipe"
 msgstr "创建管道失败"
 
-#: src/util/vircommand.c:538
+#: src/util/command.c:437
 #, c-format
 msgid "failed to preserve fd %d"
 msgstr "保留 fd %d 失败"
 
-#: src/util/vircommand.c:545
+#: src/util/command.c:444
 msgid "failed to setup stdin file handle"
 msgstr "设置 stdin 文件处理失败"
 
-#: src/util/vircommand.c:550
+#: src/util/command.c:449
 msgid "failed to setup stdout file handle"
 msgstr "设置 stdout 文件处理失败"
 
-#: src/util/vircommand.c:555
+#: src/util/command.c:454
 msgid "failed to setup stderr file handle"
 msgstr "设置 stderr 文件处理失败"
 
-#: src/util/vircommand.c:576
+#: src/util/command.c:479
 msgid "cannot become session leader"
 msgstr "无法成为会话领导者"
 
-#: src/util/vircommand.c:582
+#: src/util/command.c:485
 msgid "cannot change to root directory"
 msgstr "无法进入 root 目录"
 
-#: src/util/vircommand.c:599
+#: src/util/command.c:502
 #, c-format
 msgid "could not write pidfile %s for %d"
 msgstr "无法为 %s 写入 pid 文件 %d"
 
-#: src/util/vircommand.c:618
+#: src/util/command.c:523
 msgid "Could not disable SIGPIPE"
 msgstr "无法禁用 SIGPIPE"
 
-#: src/util/vircommand.c:642
+#: src/util/vircommand.c:645
 #, c-format
 msgid "unable to set SELinux security context '%s' for '%s'"
 msgstr ""
 
-#: src/util/vircommand.c:655
+#: src/util/vircommand.c:658
 #, c-format
 msgid "unable to set AppArmor profile '%s' for '%s'"
 msgstr ""
 
-#: src/util/vircommand.c:681
+#: src/util/command.c:1938
 #, c-format
 msgid "Unable to change to %s"
 msgstr "无法更改为 %s"
 
-#: src/util/vircommand.c:691
+#: src/util/command.c:534
 msgid "Could not re-enable SIGPIPE"
 msgstr "无法创新启用 SIGPIPE"
 
-#: src/util/vircommand.c:704
+#: src/util/command.c:554
 #, c-format
 msgid "cannot execute binary %s"
 msgstr "无法执行二进制文件 %s"
 
-#: src/util/vircommand.c:765
+#: src/util/command.c:615
 msgid "virRun is not implemented for WIN32"
 msgstr "WIN32 中未采用 virRun"
 
-#: src/util/vircommand.c:777
+#: src/util/command.c:637
 msgid "virExec is not implemented for WIN32"
 msgstr "没有为 WIN32 采用virExec"
 
-#: src/util/vircommand.c:1815 src/util/vircommand.c:1827
-#: src/util/vircommand.c:2014 src/util/vircommand.c:2062
-#: src/util/vircommand.c:2213 src/util/vircommand.c:2333
-#: src/util/vircommand.c:2476 src/util/vircommand.c:2542
+#: src/util/command.c:1526 src/util/command.c:1745 src/util/command.c:1793
+#: src/util/command.c:2021 src/util/command.c:2167 src/util/command.c:2356
+#: src/util/command.c:2415
 msgid "invalid use of command API"
 msgstr "命令 API 的无效使用"
 
-#: src/util/vircommand.c:1916
+#: src/util/command.c:1643
 msgid "unable to poll on child"
 msgstr "无法在子目录中投票"
 
-#: src/util/vircommand.c:1943
+#: src/util/command.c:1670
 msgid "unable to read child stdout"
 msgstr "无法读取子标准输出"
 
-#: src/util/vircommand.c:1944
+#: src/util/command.c:1671
 msgid "unable to read child stderr"
 msgstr "无法读取子标准输入"
 
-#: src/util/vircommand.c:1973
+#: src/util/command.c:1699
 msgid "unable to write to child input"
 msgstr "无法写入子输入"
 
-#: src/util/vircommand.c:2028
+#: src/util/command.c:1759
 msgid "Executing new processes is not supported on Win32 platform"
 msgstr "在 Win32 平台中部支持执行新进程"
 
-#: src/util/vircommand.c:2084
+#: src/util/command.c:1815
 msgid "cannot mix caller fds with blocking execution"
 msgstr "无法将调度程序 fd 与阻止执行混合"
 
-#: src/util/vircommand.c:2090
+#: src/util/command.c:1821
 msgid "cannot mix string I/O with daemon"
 msgstr "无法将字符 I/O 与守护进程混合"
 
-#: src/util/vircommand.c:2226
+#: src/util/command.c:1831
 msgid "unable to open pipe"
 msgstr "无法打开管道"
 
-#: src/util/vircommand.c:2236
+#: src/util/command.c:2033
 msgid "cannot mix string I/O with asynchronous command"
 msgstr "无法将字符 I/O 与异步命令混合"
 
-#: src/util/vircommand.c:2242
+#: src/util/vircommand.c:2245
 #, c-format
 msgid "command is already running as pid %lld"
 msgstr "命令已作为 pid %lld 运行"
 
-#: src/util/vircommand.c:2249
+#: src/util/command.c:2046
 msgid "daemonized command cannot use virCommandRunAsync"
 msgstr "守护进程式命令不能使用 virCommandRunAsync"
 
-#: src/util/vircommand.c:2254
+#: src/util/command.c:2051
 #, c-format
 msgid "daemonized command cannot set working directory %s"
 msgstr "守护进程式的命令不能设定工作目录 %s"
 
-#: src/util/vircommand.c:2260
+#: src/util/command.c:2057
 msgid "creation of pid file requires daemonized command"
 msgstr "生成 pid 文件需要守护进程式的命令"
 
-#: src/util/vircommand.c:2293
+#: src/util/vircommand.c:2308
 msgid "Unable to create thread to process command's IO"
 msgstr ""
 
-#: src/util/vircommand.c:2339
+#: src/util/command.c:2173
 msgid "command is not yet running"
 msgstr "命令尚未运行"
 
-#: src/util/vircommand.c:2356
+#: src/util/vircommand.c:2379
 msgid "Error while processing command's IO"
 msgstr ""
 
-#: src/util/vircommand.c:2373
+#: src/util/vircommand.c:2396
 #, c-format
 msgid "Child process (%s) unexpected %s%s%s"
 msgstr "子进程 (%s) 的意外 %s%s%s"
 
-#: src/util/vircommand.c:2482 src/util/vircommand.c:2548
+#: src/util/command.c:2362 src/util/command.c:2421
 msgid "Handshake is already complete"
 msgstr "握手过程已完成"
 
-#: src/util/vircommand.c:2490
+#: src/util/command.c:2369
 msgid "Unable to wait for child process"
 msgstr "无法等待子进程"
 
-#: src/util/vircommand.c:2493
+#: src/util/vircommand.c:2516
 msgid "Child quit during startup handshake"
 msgstr "启动握手时下级退出"
 
-#: src/util/vircommand.c:2513
+#: src/util/command.c:2386
 msgid "No error message from child failure"
 msgstr "没有子进程失败的出错信息"
 
-#: src/util/vircommand.c:2554
+#: src/util/command.c:2427
 msgid "Unable to notify child process"
 msgstr "无法通知子进程"
 
@@ -22152,51 +22479,51 @@
 msgid "%s:%d: %s"
 msgstr "%s:%d: %s"
 
-#: src/util/virconf.c:360
+#: src/util/conf.c:355
 msgid "unterminated number"
 msgstr "未终止的数"
 
-#: src/util/virconf.c:393 src/util/virconf.c:414 src/util/virconf.c:426
+#: src/util/conf.c:388 src/util/conf.c:412 src/util/conf.c:427
 msgid "unterminated string"
 msgstr "未终止的字符串"
 
-#: src/util/virconf.c:454 src/util/virconf.c:524
+#: src/util/conf.c:458 src/util/conf.c:528
 msgid "expecting a value"
 msgstr "需要一个值"
 
-#: src/util/virconf.c:465
+#: src/util/conf.c:469
 msgid "lists not allowed in VMX format"
 msgstr "VMX格式下不允许使用列表"
 
-#: src/util/virconf.c:486
+#: src/util/conf.c:490
 msgid "expecting a separator in list"
 msgstr "在列表中需要一个分隔符"
 
-#: src/util/virconf.c:509
+#: src/util/conf.c:513
 msgid "list is not closed with ]"
 msgstr "列表没有使用 ] 结尾"
 
-#: src/util/virconf.c:516
+#: src/util/conf.c:520
 msgid "numbers not allowed in VMX format"
 msgstr "VMX 格式中不允许有数字"
 
-#: src/util/virconf.c:558
+#: src/util/conf.c:563
 msgid "expecting a name"
 msgstr "需要一个名称"
 
-#: src/util/virconf.c:619
+#: src/util/conf.c:627
 msgid "expecting a separator"
 msgstr "需要一个分隔符"
 
-#: src/util/virconf.c:650
+#: src/util/conf.c:658
 msgid "expecting an assignment"
 msgstr "需要一个参数"
 
-#: src/util/virconf.c:946
+#: src/util/conf.c:953
 msgid "failed to open file"
 msgstr "打开文件失败"
 
-#: src/util/virconf.c:956
+#: src/util/conf.c:963
 msgid "failed to save content"
 msgstr "保存内容失败"
 
@@ -22282,12 +22609,12 @@
 msgid "DBus support not compiled into this binary"
 msgstr "这个 QEMU 二进制中不支持 Dbus"
 
-#: src/util/virdnsmasq.c:253 src/util/virdnsmasq.c:437
+#: src/util/dnsmasq.c:251 src/util/dnsmasq.c:417
 #, c-format
 msgid "cannot write config file '%s'"
 msgstr "无法写入配置文件 '%s'"
 
-#: src/util/virdnsmasq.c:594
+#: src/util/dnsmasq.c:576
 #, c-format
 msgid "Failed to make dnsmasq (PID: %d) reload config files."
 msgstr "生成 dnsmasq (PID: %d) 创新载入配置文件失败。"
@@ -22312,15 +22639,15 @@
 msgid "failed to run '%s --help': %s"
 msgstr ""
 
-#: src/util/vireventpoll.c:638
+#: src/util/event_poll.c:627
 msgid "Unable to poll on file handles"
 msgstr "无法提取文件句柄"
 
-#: src/util/vireventpoll.c:688
+#: src/util/event_poll.c:677
 msgid "Unable to setup wakeup pipe"
 msgstr "无法设定唤醒管道"
 
-#: src/util/vireventpoll.c:696
+#: src/util/event_poll.c:685
 #, c-format
 msgid "Unable to add handle %d to event loop"
 msgstr "无法在事件循环中添加句柄 %d"
@@ -22329,26 +22656,26 @@
 msgid "invalid use with no flags"
 msgstr "没有标签则是无效使用"
 
-#: src/util/virfile.c:210
+#: src/util/virfile.c:150
 msgid "O_DIRECT unsupported on this platform"
 msgstr "这个平台不支持 O_DIRECT"
 
-#: src/util/virfile.c:220
+#: src/util/virfile.c:167
 #, c-format
 msgid "invalid fd %d for %s"
 msgstr "%d 的无效 fd %s"
 
-#: src/util/virfile.c:226
+#: src/util/virfile.c:173
 #, c-format
 msgid "unexpected mode %x for %s"
 msgstr "%x 的意外模式 %s"
 
-#: src/util/virfile.c:233
+#: src/util/virfile.c:180
 #, c-format
 msgid "unable to create pipe for %s"
 msgstr "无法为 %s 生成管道"
 
-#: src/util/virfile.c:260
+#: src/util/virfile.c:200
 msgid "unable to close pipe"
 msgstr "无法关闭管道"
 
@@ -22356,27 +22683,27 @@
 msgid "virFileWrapperFd unsupported on this platform"
 msgstr "这个平台不支持 virFileWrapperFd"
 
-#: src/util/virfile.c:431 src/util/virfile.c:477
+#: src/util/virfile.c:354
 #, c-format
 msgid "cannot create file '%s'"
 msgstr "无法生成文件 '%s'"
 
-#: src/util/virfile.c:437
+#: src/util/virfile.c:360
 #, c-format
 msgid "cannot write data to file '%s'"
 msgstr "无法在 '%s' 写入数据"
 
-#: src/util/virfile.c:443
+#: src/util/virfile.c:366
 #, c-format
 msgid "cannot sync file '%s'"
 msgstr "无法同步文件 '%s'"
 
-#: src/util/virfile.c:449 src/util/virfile.c:483
+#: src/util/virfile.c:372
 #, c-format
 msgid "cannot save file '%s'"
 msgstr "无法保存文件 '%s'"
 
-#: src/util/virfile.c:455
+#: src/util/virfile.c:378
 #, c-format
 msgid "cannot rename file '%s' as '%s'"
 msgstr "无法将文件 '%s' 重命名为 '%s'"
@@ -22398,11 +22725,11 @@
 msgid "Unable to get free loop device via ioctl"
 msgstr ""
 
-#: src/util/virfile.c:592
+#: src/lxc/lxc_controller.c:93
 msgid "Unable to read /dev"
 msgstr "无法读取 /dev"
 
-#: src/util/virfile.c:622
+#: src/lxc/lxc_controller.c:120
 #, c-format
 msgid "Unable to get loop status on %s"
 msgstr "无法获取 %s 中的回路状态"
@@ -22411,16 +22738,16 @@
 msgid "Unable to iterate over loop devices"
 msgstr "无法迭代循环设备"
 
-#: src/util/virfile.c:638
+#: src/lxc/lxc_controller.c:131
 msgid "Unable to find a free loop device in /dev"
 msgstr "无法在 /dev 中找到可用回路设备"
 
-#: src/util/virfile.c:696
+#: src/lxc/lxc_controller.c:168
 #, c-format
 msgid "Unable to attach %s to loop device"
 msgstr "无法将 %s 附加到回路设备"
 
-#: src/util/virfile.c:703
+#: src/lxc/lxc_controller.c:175
 msgid "Unable to mark loop device as autoclear"
 msgstr "无法将回路设备标记为 autoclear"
 
@@ -22481,7 +22808,7 @@
 msgid "Cannot delete directory '%s'"
 msgstr ""
 
-#: src/util/virfile.c:1287
+#: src/util/util.c:458
 #, c-format
 msgid "Failed to read file '%s'"
 msgstr "读取文件 '%s' 失败"
@@ -22495,7 +22822,7 @@
 msgid "Unable to determine mount table on this platform"
 msgstr ""
 
-#: src/util/virfile.c:1861
+#: src/util/util.c:866
 #, c-format
 msgid "failed to create socket needed for '%s'"
 msgstr "生成 '%s' 所需插槽失败"
@@ -22509,53 +22836,53 @@
 msgid "child process failed to send fd to parent"
 msgstr "子进程无法向上级发送 fd"
 
-#: src/util/virfile.c:1952 src/util/virfile.c:2169
+#: src/util/util.c:901 src/util/util.c:994
 #, c-format
 msgid "failed to wait for child creating '%s'"
 msgstr "等待生成子目录 '%s' 失败"
 
-#: src/util/virfile.c:2095
+#: src/util/util.c:794
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "生成目录 '%s' 失败"
 
-#: src/util/virfile.c:2199
+#: src/util/util.c:1024
 #, c-format
 msgid "child failed to create directory '%s'"
 msgstr "子目录生成目录 '%s' 失败"
 
-#: src/util/virfile.c:2215
+#: src/util/util.c:1040
 #, c-format
 msgid "cannot chown '%s' to group %u"
 msgstr "无法 chown '%s' 为组 %u"
 
-#: src/util/virfile.c:2254
+#: src/util/util.c:1078
 msgid "virFileOpenAs is not implemented for WIN32"
 msgstr "没有为 WIN32 采用virFileOpenAs"
 
-#: src/util/virfile.c:2267
+#: src/util/util.c:1090
 msgid "virDirCreate is not implemented for WIN32"
 msgstr "没有为 WIN32 采用 virDirCreate"
 
-#: src/util/virfile.c:2622
+#: src/util/virfile.c:2651
 msgid "Could not write to stream"
 msgstr "无法写入流"
 
-#: src/util/virhash.c:43
+#: src/util/hash.c:40
 msgid "Hash operation not allowed during iteration"
 msgstr "迭代过程中部允许哈希操作"
 
-#: src/util/virhook.c:105
+#: src/util/hooks.c:101
 #, c-format
 msgid "Invalid hook name for #%d"
 msgstr "#%d 的无效 hook 名称"
 
-#: src/util/virhook.c:112 src/util/virhook.c:265
+#: src/util/hooks.c:108 src/util/hooks.c:249
 #, c-format
 msgid "Failed to build path for %s hook"
 msgstr "为 %s hook 构建路径失败"
 
-#: src/util/virhook.c:252
+#: src/util/hooks.c:236
 #, c-format
 msgid "Hook for %s, failed to find operation #%d"
 msgstr "%s 的 hook，无法找到操作 #%d"
@@ -22576,25 +22903,25 @@
 msgid "Identity attribute is already set"
 msgstr ""
 
-#: src/util/virinitctl.c:148
+#: src/util/virinitctl.c:143
 #, c-format
 msgid "Cannot open init control %s"
 msgstr ""
 
-#: src/util/virinitctl.c:155
+#: src/util/virinitctl.c:150
 #, c-format
 msgid "Failed to send request to init control %s"
 msgstr ""
 
-#: src/util/viriptables.c:337
+#: src/util/iptables.c:297
 msgid "Only IPv4 or IPv6 addresses can be used with iptables"
 msgstr "iptables 中只能使用 IPv4 或者 IPv6 地址"
 
-#: src/util/viriptables.c:343
+#: src/util/iptables.c:303
 msgid "Failure to mask address"
 msgstr "为地址添加掩码失败"
 
-#: src/util/viriptables.c:790 src/util/viriptables.c:938
+#: src/util/iptables.c:767
 #, c-format
 msgid "Attempted to NAT '%s'. NAT is only supported for IPv4."
 msgstr "尝试 NAT '%s'。只有 IPv4 支持 NAT。"
@@ -22604,11 +22931,11 @@
 msgid "Invalid port range '%u-%u'."
 msgstr ""
 
-#: src/util/virjson.c:988
+#: src/util/json.c:927
 msgid "Unable to create JSON parser"
 msgstr "无法生成 JSON 解析程序"
 
-#: src/util/virjson.c:1000
+#: src/util/json.c:939
 #, c-format
 msgid "cannot parse json %s: %s"
 msgstr "无法解析 json %s: %s"
@@ -22618,11 +22945,11 @@
 msgid "cannot parse json %s: unterminated string/map/array"
 msgstr ""
 
-#: src/util/virjson.c:1120
+#: src/util/json.c:1051
 msgid "Unable to create JSON formatter"
 msgstr "无法生成 JSON 格式化程序"
 
-#: src/util/virjson.c:1149 src/util/virjson.c:1156
+#: src/util/json.c:1081 src/util/json.c:1087
 msgid "No JSON parser implementation is available"
 msgstr "没有可用 JSON 解析程序"
 
@@ -22636,13 +22963,12 @@
 msgid "Unable to open/create resource %s"
 msgstr "无法打开/创建资源 %s"
 
-#: src/util/virlockspace.c:146 src/util/virlockspace.c:200
-#: src/util/virpidfile.c:394
+#: src/util/virpidfile.c:328
 #, c-format
 msgid "Failed to set close-on-exec flag '%s'"
 msgstr "设定 close-on-exec '%s' 标签失败"
 
-#: src/util/virlockspace.c:153 src/util/virpidfile.c:402
+#: src/util/virpidfile.c:336
 #, c-format
 msgid "Unable to check status of pid file '%s'"
 msgstr "无法坚持 pid 文件 '%s' 状态"
@@ -22736,19 +23062,18 @@
 msgid "owner %lld does not hold the resource lock"
 msgstr "拥有者 %lld 未持有资源锁"
 
-#: src/util/virnetdev.c:70 src/util/virnetdev.c:536
-#: src/util/virnetdevbridge.c:95 src/util/virnetdevbridge.c:392
-#: src/util/virnetdevbridge.c:462 src/util/virnetdevtap.c:194
-#: src/util/virnetdevtap.c:255
+#: src/util/virnetdev.c:62 src/util/virnetdev.c:486
+#: src/util/virnetdevbridge.c:61 src/util/virnetdevtap.c:146
+#: src/util/virnetdevtap.c:204
 #, c-format
 msgid "Network interface name '%s' is too long"
 msgstr "网络接口名称 '%s' 太长"
 
-#: src/util/virnetdev.c:78 src/util/virnetdevbridge.c:89
+#: src/util/virnetdev.c:69 src/util/virnetdevbridge.c:69
 msgid "Cannot open network interface control socket"
 msgstr "无法打开网络接口控制插槽"
 
-#: src/util/virnetdev.c:84
+#: src/util/virnetdev.c:75 src/util/virnetdevbridge.c:75
 msgid "Cannot set close-on-exec flag for socket"
 msgstr "无法为插槽关闭 close-on-exec 标签"
 
@@ -22756,99 +23081,99 @@
 msgid "Network device configuration is not supported on this platform"
 msgstr "这个平台不支持网络设备配置"
 
-#: src/util/virnetdev.c:135
+#: src/util/virnetdev.c:115
 #, c-format
 msgid "Unable to check interface flags for %s"
 msgstr "无法为 %s 检查接口标签"
 
-#: src/util/virnetdev.c:149
+#: src/util/virnetdev.c:129
 #, c-format
 msgid "Unable to check interface %s"
 msgstr "无法检查接口 %s"
 
-#: src/util/virnetdev.c:180 src/util/virnetdev.c:268 src/util/virnetdev.c:286
+#: src/util/virnetdev.c:159 src/util/virnetdev.c:213 src/util/virnetdev.c:231
 #, c-format
 msgid "Cannot get interface MAC on '%s'"
 msgstr "无法在 '%s' 获取接口 MAC"
 
-#: src/util/virnetdev.c:189 src/util/virnetdev.c:223 src/util/virnetdev.c:239
+#: src/util/virnetdev.c:168 src/util/virnetdev.c:184
 #, c-format
 msgid "Cannot set interface MAC on '%s'"
 msgstr "无法在 '%s' 设定接口 MAC"
 
-#: src/util/virnetdev.c:322
+#: src/util/virnetdev.c:269
 #, c-format
 msgid "Unable to preserve mac for %s"
 msgstr "无法为 %s 保留 mac"
 
-#: src/util/virnetdev.c:361 src/util/virnetdev.c:1732
+#: src/util/virnetdev.c:310
 #, c-format
 msgid "Cannot parse MAC address from '%s'"
 msgstr "无法从 '%s' 解析 MAC 地址"
 
-#: src/util/virnetdev.c:396 src/util/virnetdev.c:411
+#: src/util/virnetdev.c:345 src/util/virnetdev.c:360
 #, c-format
 msgid "Cannot get interface MTU on '%s'"
 msgstr "无法在 '%s' 获取接口 MTU"
 
-#: src/util/virnetdev.c:442 src/util/virnetdev.c:457
+#: src/util/virnetdev.c:391 src/util/virnetdev.c:406
 #, c-format
 msgid "Cannot set interface MTU on '%s'"
 msgstr "无法在 '%s' 设定接口 MTU"
 
-#: src/util/virnetdev.c:546
+#: src/util/virnetdev.c:493
 #, c-format
 msgid "Unable to rename '%s' to '%s'"
 msgstr "无法将 '%s' 重命名为 '%s'"
 
-#: src/util/virnetdev.c:561
+#: src/util/virnetdev.c:508
 #, c-format
 msgid "Cannot rename interface '%s' to '%s' on this platform"
 msgstr "无法在这个平台中将 '%s' 重命名为 '%s'"
 
-#: src/util/virnetdev.c:591 src/util/virnetdev.c:651 src/util/virnetdev.c:668
+#: src/util/virnetdev.c:538 src/util/virnetdev.c:598 src/util/virnetdev.c:615
 #, c-format
 msgid "Cannot get interface flags on '%s'"
 msgstr "无法在 '%s' 中获取接口标签"
 
-#: src/util/virnetdev.c:605 src/util/virnetdev.c:622
+#: src/util/virnetdev.c:552 src/util/virnetdev.c:569
 #, c-format
 msgid "Cannot set interface flags on '%s'"
 msgstr "无法在 '%s' 中设定接口标签"
 
-#: src/util/virnetdev.c:693 src/util/virnetdev.c:746
+#: src/util/virnetdev.c:640 src/util/virnetdev.c:689
 msgid "Unable to open control socket"
 msgstr "无法打开控制插槽"
 
-#: src/util/virnetdev.c:702 src/util/virnetdev.c:752
+#: src/util/virnetdev.c:649 src/util/virnetdev.c:695
 #, c-format
 msgid "invalid interface name %s"
 msgstr "无效接口名称 %s"
 
-#: src/util/virnetdev.c:709
+#: src/util/virnetdev.c:656
 #, c-format
 msgid "Unable to get index for interface %s"
 msgstr "无法为接口 %s 获取索引"
 
-#: src/util/virnetdev.c:729
+#: src/util/virnetdev.c:672
 msgid "Unable to get interface index on this platform"
 msgstr "无法在这个平台中获取接口索引"
 
-#: src/util/virnetdev.c:759
+#: src/util/virnetdev.c:702
 #, c-format
 msgid "Unable to get VLAN for interface %s"
 msgstr "无法为接口 %s 获取 VLAN"
 
-#: src/util/virnetdev.c:776
+#: src/util/virnetdev.c:719
 msgid "Unable to get VLAN on this platform"
 msgstr "无法在这个平台中获取 VLAN"
 
-#: src/util/virnetdev.c:964
+#: src/util/virnetdev.c:837
 #, c-format
 msgid "Unable to get IPv4 address for interface %s"
 msgstr "无法为接口 %s 获取 IPv4 地址"
 
-#: src/util/virnetdev.c:984
+#: src/util/virnetdev.c:857
 msgid "Unable to get IPv4 address on this platform"
 msgstr "无法在这个平台中获取 IPv4 地址"
 
@@ -22857,7 +23182,7 @@
 msgid "could not get MAC address of interface %s"
 msgstr "无法获取接口 %s 的 MAC 地址"
 
-#: src/util/virnetdev.c:1063
+#: src/util/virnetdev.c:935
 msgid "Unable to check interface config on this platform"
 msgstr "无法在这个平台中检查接口配置"
 
@@ -22889,20 +23214,18 @@
 msgid "Unable to get virtual function info on this platform"
 msgstr "无法在这个平台中获取虚拟功能"
 
-#: src/util/virnetdev.c:1428
+#: src/util/virnetdevvportprofile.c:245
 #, c-format
 msgid "error dumping %s (%d) interface"
 msgstr "转储g %s (%d) 接口出错"
 
-#: src/util/virnetdev.c:1453 src/util/virnetdev.c:1575
-#: src/util/virnetdevmacvlan.c:211 src/util/virnetdevmacvlan.c:288
-#: src/util/virnetdevvportprofile.c:754
+#: src/util/virnetdevmacvlan.c:208 src/util/virnetdevmacvlan.c:294
+#: src/util/virnetdevvportprofile.c:275 src/util/virnetdevvportprofile.c:562
 msgid "malformed netlink response message"
 msgstr "被破坏的 netlink 响应信息"
 
-#: src/util/virnetdev.c:1458 src/util/virnetdev.c:1580
-#: src/util/virnetdevmacvlan.c:216 src/util/virnetdevmacvlan.c:293
-#: src/util/virnetdevvportprofile.c:759
+#: src/util/virnetdevmacvlan.c:216 src/util/virnetdevmacvlan.c:302
+#: src/util/virnetdevvportprofile.c:283 src/util/virnetdevvportprofile.c:570
 msgid "allocated netlink buffer is too small"
 msgstr "分配的 netlink 缓存太小"
 
@@ -22956,19 +23279,19 @@
 msgid "Bridge '%s' has no QoS set, therefore unable to set 'floor' on '%s'"
 msgstr ""
 
-#: src/util/virnetdevbridge.c:138 src/util/virnetdevbridge.c:149
-#: src/util/virnetdevbridge.c:156
+#: src/util/virnetdevbridge.c:118 src/util/virnetdevbridge.c:129
+#: src/util/virnetdevbridge.c:136
 #, c-format
 msgid "Unable to set bridge %s %s"
 msgstr "无法获取桥接 %s %s"
 
-#: src/util/virnetdevbridge.c:188 src/util/virnetdevbridge.c:200
-#: src/util/virnetdevbridge.c:210
+#: src/util/virnetdevbridge.c:170 src/util/virnetdevbridge.c:182
+#: src/util/virnetdevbridge.c:192
 #, c-format
 msgid "Unable to get bridge %s %s"
 msgstr "无法获取桥接 %s %s"
 
-#: src/util/virnetdevbridge.c:242 src/util/virnetdevbridge.c:281
+#: src/util/virnetdevbridge.c:224 src/util/virnetdevbridge.c:238
 #, c-format
 msgid "Unable to create bridge %s"
 msgstr "无法生成桥接 %s"
@@ -22977,7 +23300,7 @@
 msgid "Unable to create bridge device"
 msgstr "无法生成桥接设备"
 
-#: src/util/virnetdevbridge.c:305 src/util/virnetdevbridge.c:341
+#: src/util/virnetdevbridge.c:262 src/util/virnetdevbridge.c:276
 #, c-format
 msgid "Unable to delete bridge %s"
 msgstr "无法删除桥接 %s"
@@ -22987,19 +23310,17 @@
 msgid "Unable to remove bridge %s"
 msgstr "无法删除桥接设备 %s"
 
-#: src/util/virnetdevbridge.c:368 src/util/virnetdevbridge.c:437
+#: src/util/virnetdevbridge.c:303 src/util/virnetdevbridge.c:350
 #, c-format
 msgid "Unable to get interface index for %s"
 msgstr "无法为 %s 获取接口索引"
 
-#: src/util/virnetdevbridge.c:374 src/util/virnetdevbridge.c:399
-#: src/util/virnetdevbridge.c:410
+#: src/util/virnetdevbridge.c:309 src/util/virnetdevbridge.c:323
 #, c-format
 msgid "Unable to add bridge %s port %s"
 msgstr "无法添加桥接 %s 端口 %s"
 
-#: src/util/virnetdevbridge.c:444 src/util/virnetdevbridge.c:469
-#: src/util/virnetdevbridge.c:480
+#: src/util/virnetdevbridge.c:357 src/util/virnetdevbridge.c:371
 #, c-format
 msgid "Unable to remove bridge %s port %s"
 msgstr "无法删除桥接 %s 端口 %s"
@@ -23009,22 +23330,22 @@
 msgid "Unable to set STP delay on %s"
 msgstr "无法在 %s 中设定 STP 延迟"
 
-#: src/util/virnetdevbridge.c:629 src/util/virnetdevbridge.c:663
+#: src/util/virnetdevbridge.c:510
 #, c-format
 msgid "Unable to get STP delay on %s on this platform"
 msgstr "无法在这个平台中为 %s 获取 STP 延迟"
 
-#: src/util/virnetdevbridge.c:646 src/util/virnetdevbridge.c:681
+#: src/util/virnetdevbridge.c:528
 #, c-format
 msgid "Unable to get STP on %s on this platform"
 msgstr "无法在这个平台中为 %s 获取 STP"
 
-#: src/util/virnetdevbridge.c:655
+#: src/util/virnetdevbridge.c:502
 #, c-format
 msgid "Unable to set STP delay on %s on this platform"
 msgstr "无法在这个平台中为 %s 设定 STP 延迟"
 
-#: src/util/virnetdevbridge.c:673
+#: src/util/virnetdevbridge.c:520
 #, c-format
 msgid "Unable to set STP on %s on this platform"
 msgstr "无法在这个平台中为 %s 设定 STP"
@@ -23034,57 +23355,56 @@
 msgid "error creating %s type of interface attach to %s"
 msgstr ""
 
-#: src/util/virnetdevmacvlan.c:267
+#: src/util/virnetdevmacvlan.c:270
 #, c-format
 msgid "error destroying %s interface"
 msgstr "销毁 %s 接口出错"
 
-#: src/util/virnetdevmacvlan.c:320
+#: src/util/virnetdevmacvlan.c:329
 msgid "buffer for ifindex path is too small"
 msgstr "ifindex 路径的缓存太小"
 
-#: src/util/virnetdevmacvlan.c:328
+#: src/util/virnetdevmacvlan.c:337
 #, c-format
 msgid "cannot open macvtap file %s to determine interface index"
 msgstr "无法打开 macvtap 文件 %s 以便确定接口索引"
 
-#: src/util/virnetdevmacvlan.c:335
+#: src/util/virnetdevmacvlan.c:344
 msgid "cannot determine macvtap's tap device interface index"
 msgstr "无法确定 macvtap 的 tap 设备接口索引"
 
-#: src/util/virnetdevmacvlan.c:347
+#: src/util/virnetdevmacvlan.c:356
 msgid "internal buffer for tap device is too small"
 msgstr "tap 设备的内部缓存太小"
 
-#: src/util/virnetdevmacvlan.c:364
+#: src/util/virnetdevmacvlan.c:373
 #, c-format
 msgid "cannot open macvtap tap device %s"
 msgstr "无法打开 macvtap tap 设备 %s"
 
-#: src/util/virnetdevmacvlan.c:398
+#: src/util/virnetdevmacvlan.c:407
 msgid "cannot get interface flags on macvtap tap"
 msgstr "无法在 macvtap tap 中获得接口标签"
 
-#: src/util/virnetdevmacvlan.c:407
+#: src/util/virnetdevmacvlan.c:416
 msgid "cannot clean IFF_VNET_HDR flag on macvtap tap"
 msgstr "无法清除 macvtap tap 中的 IFF_VNET_HDR 标签"
 
-#: src/util/virnetdevmacvlan.c:411
+#: src/util/virnetdevmacvlan.c:420
 msgid "cannot get feature flags on macvtap tap"
 msgstr "无法在 macvtap tap 中获得功能标签"
 
-#: src/util/virnetdevmacvlan.c:416
+#: src/util/virnetdevmacvlan.c:425
 msgid "cannot set IFF_VNET_HDR flag on macvtap tap"
 msgstr "无法清除 macvtap tap 中的 IFF_VNET_HDR 标签"
 
-#: src/util/virnetdevmacvlan.c:864
+#: src/util/virnetdevmacvlan.c:517
 #, c-format
 msgid "Unable to create macvlan device %s"
 msgstr "无法生成 macvlan 设备 %s"
 
-#: src/util/virnetdevmacvlan.c:1069 src/util/virnetdevmacvlan.c:1076
-#: src/util/virnetdevmacvlan.c:1094 src/util/virnetdevmacvlan.c:1106
-#: src/util/virnetdevmacvlan.c:1118 src/util/virnetdevmacvlan.c:1130
+#: src/util/virnetdevmacvlan.c:653 src/util/virnetdevmacvlan.c:660
+#: src/util/virnetdevmacvlan.c:678 src/util/virnetdevmacvlan.c:690
 msgid "Cannot create macvlan devices on this platform"
 msgstr "无法在这个平台中生成 macvlan 设备"
 
@@ -23098,11 +23418,7 @@
 msgid "Unable to delete port %s from OVS"
 msgstr "无法从 OVS 中删除端口 %s"
 
-#: src/util/virnetdevtap.c:63
-msgid "Unable to query tap interface name"
-msgstr ""
-
-#: src/util/virnetdevtap.c:168 src/util/virnetdevtap.c:246
+#: src/util/virnetdevtap.c:131 src/util/virnetdevtap.c:195
 msgid "Unable to open /dev/net/tun, is tun module loaded?"
 msgstr "无法打开 /dev/net/tun，已载入 tun 模块了吗？"
 
@@ -23110,21 +23426,21 @@
 msgid "Multiqueue devices are not supported on this system"
 msgstr "在这个系统中部支持多队列设备"
 
-#: src/util/virnetdevtap.c:202
+#: src/util/virnetdevtap.c:154
 #, c-format
 msgid "Unable to create tap device %s"
 msgstr "无法生成 tap 设备 %s"
 
-#: src/util/virnetdevtap.c:218
+#: src/util/virnetdevtap.c:162
 #, c-format
 msgid "Unable to set tap device %s to persistent"
 msgstr "无法将 tap 设备 %s 设定为永久"
 
-#: src/util/virnetdevtap.c:262
+#: src/util/virnetdevtap.c:211
 msgid "Unable to associate TAP device"
 msgstr "无法关联 TAP 设备"
 
-#: src/util/virnetdevtap.c:268
+#: src/util/virnetdevtap.c:217
 msgid "Unable to make TAP device non-persistent"
 msgstr "无法让 TAP 设备设定为不持久"
 
@@ -23142,11 +23458,11 @@
 msgid "Unable to remove tap device %s"
 msgstr "无法删除虚拟网卡设备 %s"
 
-#: src/util/virnetdevtap.c:395
+#: src/util/virnetdevtap.c:233
 msgid "Unable to create TAP devices on this platform"
 msgstr "无法在这个平台中生成 TAP 设备"
 
-#: src/util/virnetdevtap.c:401
+#: src/util/virnetdevtap.c:239
 msgid "Unable to delete TAP devices on this platform"
 msgstr "无法在这个平台中删除 TAP 设备"
 
@@ -23155,16 +23471,16 @@
 msgid "Unable to use MAC address starting with reserved value 0xFE - '%s' - "
 msgstr ""
 
-#: src/util/virnetdevveth.c:78
+#: src/util/virnetdevveth.c:91
 msgid "No free veth devices available"
 msgstr ""
 
-#: src/util/virnetdevveth.c:178
+#: src/util/virnetdevveth.c:195
 #, c-format
 msgid "Failed to allocate free veth pair after %d attempts"
 msgstr ""
 
-#: src/util/virnetdevveth.c:215
+#: src/util/virnetdevveth.c:233
 #, c-format
 msgid "Failed to delete veth device %s"
 msgstr ""
@@ -23222,71 +23538,71 @@
 msgid "corrupted profileid string"
 msgstr "被破坏的 profileid 字符串"
 
-#: src/util/virnetdevvportprofile.c:468
+#: src/util/virnetdevvportprofile.c:154
 msgid "error parsing pid of lldpad"
 msgstr "解析 lldpad 的pid 出错"
 
-#: src/util/virnetdevvportprofile.c:473
+#: src/util/virnetdevvportprofile.c:159
 #, c-format
 msgid "Error opening file %s"
 msgstr "打开文件 %s 出错"
 
-#: src/util/virnetdevvportprofile.c:508
+#: src/util/virnetdevvportprofile.c:314
 msgid "error parsing IFLA_PORT_SELF part"
 msgstr "解析 IFLA_PORT_SELF 部分出错"
 
-#: src/util/virnetdevvportprofile.c:513
+#: src/util/virnetdevvportprofile.c:318
 msgid "IFLA_PORT_SELF is missing"
 msgstr "缺少 IFLA_PORT_SELF"
 
-#: src/util/virnetdevvportprofile.c:526
+#: src/util/virnetdevvportprofile.c:330
 msgid "error while iterating over IFLA_VF_PORTS part"
 msgstr "迭代 IFLA_VF_PORTS 部分时出错"
 
-#: src/util/virnetdevvportprofile.c:534
+#: src/util/virnetdevvportprofile.c:336
 msgid "error parsing IFLA_VF_PORT part"
 msgstr "接卸 IFLA_VF_PORT 部分出错"
 
-#: src/util/virnetdevvportprofile.c:553
+#: src/util/virnetdevvportprofile.c:354
 msgid "Could not find netlink response with expected parameters"
 msgstr "无法找到有正确参数的 netlink 响应"
 
-#: src/util/virnetdevvportprofile.c:559
+#: src/util/virnetdevvportprofile.c:359
 msgid "IFLA_VF_PORTS is missing"
 msgstr "缺少 IFLA_VF_PORTS"
 
-#: src/util/virnetdevvportprofile.c:574
+#: src/util/virnetdevvportprofile.c:373
 msgid "no IFLA_PORT_RESPONSE found in netlink message"
 msgstr "netlink 中没有找到 IFLA_PORT_RESPONSE"
 
-#: src/util/virnetdevvportprofile.c:733
+#: src/util/virnetdevvportprofile.c:536
 #, c-format
 msgid "error during virtual port configuration of ifindex %d"
 msgstr "ifindex %d 的虚拟端口配置过程出错"
 
-#: src/util/virnetdevvportprofile.c:806
+#: src/util/virnetdevvportprofile.c:618
 msgid "buffer for root interface name is too small"
 msgstr "root 接口名称的缓存太小"
 
-#: src/util/virnetdevvportprofile.c:861
+#: src/util/virnetdevvportprofile.c:674
 msgid "sending of PortProfileRequest failed."
 msgstr "发送 PortProfileRequest 失败。"
 
-#: src/util/virnetdevvportprofile.c:891
+#: src/util/virnetdevvportprofile.c:695
 #, c-format
 msgid "error %d during port-profile setlink on interface %s (%d)"
 msgstr "接口 %d (%s) 中端口配置设定链接过程出错 %d"
 
-#: src/util/virnetdevvportprofile.c:903
+#: src/util/virnetdevvportprofile.c:709
 msgid "port-profile setlink timed out"
 msgstr "端口配置设定链接超时"
 
-#: src/util/virnetdevvportprofile.c:991 src/util/virnetdevvportprofile.c:1105
+#: src/util/virnetdevvportprofile.c:793 src/util/virnetdevvportprofile.c:925
 #, c-format
 msgid "operation type %d not supported"
 msgstr "不支持操作类型 %d"
 
-#: src/util/virnetdevvportprofile.c:1252 src/util/virnetdevvportprofile.c:1264
+#: src/util/virnetdevvportprofile.c:1062 src/util/virnetdevvportprofile.c:1073
 msgid "Virtual port profile association not supported on this platform"
 msgstr "在这个平台中部支持虚拟端口侧写关联"
 
@@ -23300,7 +23616,7 @@
 msgid "invalid protocol argument: %d"
 msgstr "无效协议参数：%d"
 
-#: src/util/virnetlink.c:203
+#: src/util/netlink.c:81
 msgid "cannot allocate nlhandle for netlink"
 msgstr "无法为 netlink 分配 nlhandle"
 
@@ -23317,7 +23633,7 @@
 msgid "cannot add netlink membership"
 msgstr "无法添加 netlint 成员"
 
-#: src/util/virnetlink.c:237
+#: src/util/netlink.c:99
 msgid "cannot send to netlink socket"
 msgstr "无法发送 netlink 插槽"
 
@@ -23325,11 +23641,11 @@
 msgid "error in poll call"
 msgstr "投票调用中的错误"
 
-#: src/util/virnetlink.c:253
+#: src/util/netlink.c:116
 msgid "no valid netlink response was received"
 msgstr "未收到有效 netlink 响应"
 
-#: src/util/virnetlink.c:262
+#: src/util/netlink.c:124
 msgid "nl_recv failed"
 msgstr "nl_recv 失败"
 
@@ -23361,31 +23677,31 @@
 msgid "libnl was not available at build time"
 msgstr "构建时 libnl 不可用"
 
-#: src/util/virnetlink.c:735 src/util/virpci.c:2628
+#: src/util/virnetlink.c:735 src/util/virpci.c:2670
 msgid "not supported on non-linux platforms"
 msgstr "在非 linux 平台中不支持"
 
-#: src/util/virnodesuspend.c:89
+#: src/util/virnodesuspend.c:99
 msgid "Suspend duration is too short"
 msgstr "挂起阶段太短"
 
-#: src/util/virnodesuspend.c:194
+#: src/util/virnodesuspend.c:202
 msgid "Suspend operation already in progress"
 msgstr "挂起操作已在进行"
 
-#: src/util/virnodesuspend.c:202
+#: src/util/virnodesuspend.c:210
 msgid "Suspend-to-RAM"
 msgstr "Suspend-to-RAM"
 
-#: src/util/virnodesuspend.c:210
+#: src/util/virnodesuspend.c:218
 msgid "Suspend-to-Disk"
 msgstr "Suspend-to-Disk"
 
-#: src/util/virnodesuspend.c:218
+#: src/util/virnodesuspend.c:226
 msgid "Hybrid-Suspend"
 msgstr "Hybrid-Suspend"
 
-#: src/util/virnodesuspend.c:225
+#: src/util/virnodesuspend.c:233
 msgid "Invalid suspend target"
 msgstr "无效挂起目标"
 
@@ -23401,20 +23717,20 @@
 msgid "numad is not available on this host"
 msgstr "这个主机中的 numad 不可用"
 
-#: src/util/virnuma.c:121
+#: src/lxc/lxc_controller.c:252 src/qemu/qemu_process.c:1386
 msgid "Host kernel is not aware of NUMA."
 msgstr "主机内核未识别 NUMA。"
 
-#: src/util/virnuma.c:133
+#: src/util/virnuma.c:134
 #, c-format
-msgid "Nodeset is out of range, host cannot support NUMA node bigger than %d"
+msgid "NUMA node %d is out of range"
 msgstr ""
 
-#: src/util/virnuma.c:157
+#: src/lxc/lxc_controller.c:293 src/qemu/qemu_process.c:1427
 msgid "NUMA memory tuning in 'preferred' mode only supports single node"
 msgstr "只在单一节点中支持将 NUMA 内存调整为 'preferred' 模式"
 
-#: src/util/virnuma.c:171
+#: src/qemu/qemu_process.c:1441
 msgid "Invalid mode for memory NUMA tuning."
 msgstr "内存 NUMA 调整的无效模式"
 
@@ -23426,7 +23742,7 @@
 msgid "Failed to request maximum NUMA node id"
 msgstr ""
 
-#: src/util/virnuma.c:338
+#: src/qemu/qemu_process.c:1456
 msgid "libvirt is compiled without NUMA tuning support"
 msgstr "在没有 NUMA 调整支持的情况下编译 libvirt"
 
@@ -23440,355 +23756,376 @@
 msgid "Class %s must derive from virObjectLockable"
 msgstr ""
 
-#: src/util/virpci.c:241
+#: src/util/virpci.c:247
 #, c-format
 msgid "Invalid device %s driver file %s is not a symlink"
 msgstr ""
 
-#: src/util/virpci.c:247
+#: src/util/virpci.c:253
 #, c-format
 msgid "Unable to resolve device %s driver symlink %s"
 msgstr ""
 
-#: src/util/virpci.c:278
+#: src/util/pci.c:728
 #, c-format
 msgid "Failed to open config space file '%s'"
 msgstr "打开 config 空间文件 '%s' 失败"
 
-#: src/util/virpci.c:364
+#: src/util/virpci.c:370
 #, c-format
 msgid "Unusual value in %s/devices/%s/class: %s"
 msgstr ""
 
-#: src/util/virpci.c:778
+#: src/util/pci.c:624
 #, c-format
 msgid "Active %s devices on bus with %s, not doing bus reset"
 msgstr "使用 %s 在总线中激活 %s 失败，不要重置总线。"
 
-#: src/util/virpci.c:788 src/util/virpci.c:2201
+#: src/util/pci.c:634 src/util/pci.c:1678
 #, c-format
 msgid "Failed to find parent device for %s"
 msgstr "查找 %s 的上级设备失败"
 
-#: src/util/virpci.c:803 src/util/virpci.c:852
+#: src/util/pci.c:647 src/util/pci.c:693
 #, c-format
 msgid "Failed to read PCI config space for %s"
 msgstr "读取 %s 的 PCI 配置空间失败"
 
-#: src/util/virpci.c:824 src/util/virpci.c:874
+#: src/util/pci.c:667 src/util/pci.c:713
 #, c-format
 msgid "Failed to restore PCI config space for %s"
 msgstr "恢复 %s 的 PCI 配置空间失败"
 
-#: src/util/virpci.c:910
+#: src/util/pci.c:753
 #, c-format
 msgid "Not resetting active device %s"
 msgstr "不要重置活跃设备 %s"
 
-#: src/util/virpci.c:958
+#: src/util/pci.c:780
 #, c-format
 msgid "Unable to reset PCI device %s: %s"
 msgstr "无法重置 PCI 设备 %s: %s"
 
-#: src/util/virpci.c:961
+#: src/util/pci.c:782
 msgid "no FLR, PM reset or bus reset available"
 msgstr "没有可用 FLR、PM 重置 或者总线重置"
 
-#: src/util/virpci.c:1047
+#: src/util/virpci.c:1011
+#, c-format
+msgid "Failed to load PCI stub module %s: administratively prohibited"
+msgstr ""
+
+#: src/util/virpci.c:1016
+#, c-format
+msgid "Failed to load PCI stub module %s"
+msgstr ""
+
+#: src/util/pci.c:906
 #, c-format
 msgid "Failed to unbind PCI device '%s' from %s"
 msgstr "从 %s 中取消捆绑 PCI 设备 '%s' 失败"
 
-#: src/util/virpci.c:1065
+#: src/util/pci.c:924
 #, c-format
 msgid "Failed to remove slot for PCI device '%s' from %s"
 msgstr "从 %s 中的 PCI 设备 '%s' 删除插槽失败"
 
-#: src/util/virpci.c:1089
+#: src/util/pci.c:948
 #, c-format
 msgid "Failed to trigger a re-probe for PCI device '%s'"
 msgstr "为 PCI 设备 '%s' 激发重新探测失败"
 
-#: src/util/virpci.c:1153
+#: src/util/pci.c:1006
 #, c-format
 msgid "Failed to add PCI device ID '%s' to %s"
 msgstr "将 PCI 设备 ID '%s' 添加到 %s 失败"
 
-#: src/util/virpci.c:1179
-#, c-format
-msgid "Failed to unbind PCI device '%s'"
-msgstr "取消绑定 PCI 设备 '%s' 失败"
-
-#: src/util/virpci.c:1196
+#: src/util/pci.c:1059
 #, c-format
 msgid "Failed to add slot for PCI device '%s' to %s"
 msgstr "为 PCI 设备 '%s' 在 %s 添加插槽失败"
 
-#: src/util/virpci.c:1209
+#: src/util/pci.c:1071
 #, c-format
 msgid "Failed to bind PCI device '%s' to %s"
 msgstr "将 PCI 设备 ID '%s' 绑定到 %s 失败"
 
-#: src/util/virpci.c:1232
+#: src/util/pci.c:1094
 #, c-format
 msgid "Failed to remove PCI ID '%s' from %s"
 msgstr "从 %s 中删除 PCI ID '%s' 失败"
 
-#: src/util/virpci.c:1288
-#, c-format
-msgid "Failed to load PCI stub module %s"
-msgstr ""
-
-#: src/util/virpci.c:1295
+#: src/util/pci.c:1131
 #, c-format
 msgid "Not detaching active device %s"
 msgstr "不要分离活跃的设备 %s"
 
-#: src/util/virpci.c:1320
+#: src/util/pci.c:1150
 #, c-format
 msgid "Not reattaching active device %s"
 msgstr "不要创新附加活跃的设备 %s"
 
-#: src/util/virpci.c:1517
+#: src/util/pci.c:1321
 #, c-format
 msgid "dev->name buffer overflow: %.4x:%.2x:%.2x.%.1x"
 msgstr "dev->name 缓存溢出: %.4x:%.2x:%.2x.%.1x"
 
-#: src/util/virpci.c:1527
+#: src/util/pci.c:1333
 #, c-format
 msgid "Device %s not found: could not access %s"
 msgstr "未找到设备 %s：无法访问 %s"
 
-#: src/util/virpci.c:1537
+#: src/util/pci.c:1343
 #, c-format
 msgid "Failed to read product/vendor ID for %s"
 msgstr "读取 %s 产品/经销商 ID 失败"
 
-#: src/util/virpci.c:1546
+#: src/util/pci.c:1352
 #, c-format
 msgid "dev->id buffer overflow: %s %s"
 msgstr "dev->id 缓存溢出: %s %s"
 
-#: src/util/virpci.c:1720 src/util/virusb.c:449
+#: src/util/pci.c:1490
 #, c-format
 msgid "Device %s is already in use"
 msgstr "失败 %s 已在使用中"
 
-#: src/util/virpci.c:1920
+#: src/util/virpci.c:1962
 #, c-format
 msgid "Found invalid device link '%s' in '%s'"
 msgstr "在 '%s' 中找到无效设备链接 '%s'"
 
-#: src/util/virpci.c:1930
+#: src/util/virpci.c:1972
 #, c-format
 msgid "Failed to read directory entry for %s"
 msgstr "为 %s 读取目录条目失败"
 
-#: src/util/virpci.c:2079 src/util/virpci.c:2123
+#: src/util/virpci.c:2121 src/util/virpci.c:2165
 #, c-format
 msgid "Unable to resolve device %s iommu_group symlink %s"
 msgstr ""
 
-#: src/util/virpci.c:2087
+#: src/util/virpci.c:2129
 #, c-format
 msgid "device %s iommu_group symlink %s has invalid group number %s"
 msgstr "设备 %s iommu_group 符号链接 %s 包含无效组群数 %s"
 
-#: src/util/virpci.c:2117
+#: src/util/virpci.c:2159
 #, c-format
 msgid "Invalid device %s iommu_group file %s is not a symlink"
 msgstr ""
 
-#: src/util/virpci.c:2256
+#: src/util/pci.c:1733
 #, c-format
 msgid "Device %s is behind a switch lacking ACS and cannot be assigned"
 msgstr "设备 %s 位于缺少 ACS 的开关够，且无法为其分配 ACS。"
 
-#: src/util/virpci.c:2353
+#: src/util/virpci.c:2395
 #, c-format
 msgid "Failed to resolve device link '%s'"
 msgstr ""
 
-#: src/util/virpci.c:2364
+#: src/util/pci.c:1844
 #, c-format
 msgid "Failed to parse PCI config address '%s'"
 msgstr "解析 PCI 配置地址 '%s' 失败"
 
-#: src/util/virpci.c:2440
+#: src/util/virpci.c:2482
 #, c-format
 msgid "Failed to get SRIOV function from device link '%s'"
 msgstr ""
 
-#: src/util/virpci.c:2507
+#: src/util/pci.c:2004
 #, c-format
 msgid "Error getting physical function's '%s' virtual_functions"
 msgstr "获取物理功能的 '%s' virtual_functions 失败"
 
-#: src/util/virpidfile.c:387
+#: src/util/virpidfile.c:321
 #, c-format
 msgid "Failed to open pid file '%s'"
 msgstr "打开 pid 文件 '%s' 失败"
 
-#: src/util/virpidfile.c:410
+#: src/util/virpidfile.c:344
 #, c-format
 msgid "Failed to acquire pid file '%s'"
 msgstr "无法请求 pid 文件 '%s' 状态"
 
-#: src/util/virpidfile.c:440
+#: src/util/virpidfile.c:374
 #, c-format
 msgid "Failed to write to pid file '%s'"
 msgstr "写入 pid 文件 '%s' 失败"
 
-#: src/util/virportallocator.c:120
+#: src/util/virportallocator.c:132
 #, c-format
-msgid "Failed to query port %zu"
+msgid "Unknown family %d"
 msgstr ""
 
-#: src/util/virportallocator.c:133
+#: src/util/virportallocator.c:142
 msgid "Unable to open test socket"
 msgstr ""
 
-#: src/util/virportallocator.c:139
+#: src/util/virportallocator.c:149
 msgid "Unable to set socket reuse addr flag"
 msgstr ""
 
-#: src/util/virportallocator.c:146
+#: src/util/virportallocator.c:156
+msgid "Unable to set IPV6_V6ONLY flag"
+msgstr ""
+
+#: src/util/virportallocator.c:165
 #, c-format
-msgid "Unable to bind to port %zu"
+msgid "Unable to bind to port %d"
 msgstr ""
 
-#: src/util/virportallocator.c:156
+#: src/util/virportallocator.c:191
+#, c-format
+msgid "Failed to query port %zu"
+msgstr ""
+
+#: src/util/virportallocator.c:207
 #, c-format
 msgid "Failed to reserve port %zu"
 msgstr ""
 
-#: src/util/virportallocator.c:166
+#: src/util/virportallocator.c:217
 #, c-format
 msgid "Unable to find an unused port in range '%s' (%d-%d)"
 msgstr ""
 
-#: src/util/virportallocator.c:195
+#: src/util/virportallocator.c:245
 #, c-format
 msgid "Failed to release port %d"
 msgstr ""
 
-#: src/util/virprocess.c:65
+#: src/util/command.c:1563
 #, c-format
 msgid "exit status %d"
 msgstr "退出状态 %d"
 
-#: src/util/virprocess.c:68
+#: src/util/command.c:1566
 #, c-format
 msgid "fatal signal %d"
 msgstr "严重错误信号 %d"
 
-#: src/util/virprocess.c:71
+#: src/util/command.c:1569
 #, c-format
 msgid "invalid value %d"
 msgstr "无效值 %d"
 
-#: src/util/virprocess.c:166 src/util/virprocess.c:176
+#: src/util/virprocess.c:171 src/util/virprocess.c:181
 #, c-format
 msgid "unable to wait for process %lld"
 msgstr "无法等待进程 %lld"
 
-#: src/util/virprocess.c:185
+#: src/util/virprocess.c:190
 #, c-format
 msgid "Child process (%lld) unexpected %s"
 msgstr "子进程 (%lld) 的意外 %s"
 
-#: src/util/virprocess.c:302 src/util/virprocess.c:314
+#: src/util/virprocess.c:307 src/util/virprocess.c:319
 #, c-format
 msgid "Failed to terminate process %lld with SIG%s"
 msgstr ""
 
-#: src/util/virprocess.c:366 src/util/virprocess.c:384
+#: src/util/processinfo.c:75 src/util/processinfo.c:91
 #, c-format
 msgid "cannot set CPU affinity on process %d"
 msgstr "无法在进程 %d 中设置 CPU 亲和性"
 
-#: src/util/virprocess.c:428 src/util/virprocess.c:447
+#: src/util/processinfo.c:136 src/util/processinfo.c:150
 #, c-format
 msgid "cannot get CPU affinity of process %d"
 msgstr "无法获取进程 %d 的 CPU 亲和性"
 
-#: src/util/virprocess.c:466
-msgid "setting process affinity isn't supported on FreeBSD yet"
-msgstr ""
-
-#: src/util/virprocess.c:491 src/util/virprocess.c:500
+#: src/util/processinfo.c:170 src/util/processinfo.c:180
 msgid "Process CPU affinity is not supported on this platform"
 msgstr "这个平台不支持进程 CPU 亲和性"
 
-#: src/util/virprocess.c:559
+#: src/util/virprocess.c:590
 msgid "Expected at least one file descriptor"
 msgstr ""
 
-#: src/util/virprocess.c:571
+#: src/util/virprocess.c:602
 msgid "Unable to join domain namespace"
 msgstr ""
 
-#: src/util/virprocess.c:583
+#: src/util/virprocess.c:614
 #, c-format
 msgid "Cannot get namespaces for %llu"
 msgstr ""
 
-#: src/util/virprocess.c:593
+#: src/util/virprocess.c:624
 msgid "Cannot set namespaces"
 msgstr ""
 
-#: src/util/virprocess.c:628
+#: src/util/virprocess.c:659
 #, c-format
 msgid "cannot limit locked memory to %llu"
 msgstr ""
 
-#: src/util/virprocess.c:635
+#: src/util/virprocess.c:666
 #, c-format
 msgid "cannot limit locked memory of process %lld to %llu"
 msgstr ""
 
-#: src/util/virprocess.c:650 src/util/virprocess.c:691
-#: src/util/virprocess.c:739 src/util/virutil.c:2008 src/util/virutil.c:2016
-#: src/util/virutil.c:2024 src/util/virutil.c:2034 src/util/virutil.c:2043
-#: src/util/virutil.c:2050
+#: src/util/virprocess.c:681 src/util/virprocess.c:722
+#: src/util/virprocess.c:770 src/util/virutil.c:2011 src/util/virutil.c:2019
+#: src/util/virutil.c:2027 src/util/virutil.c:2037 src/util/virutil.c:2046
+#: src/util/virutil.c:2053
 msgid "Not supported on this platform"
 msgstr ""
 
-#: src/util/virprocess.c:669
+#: src/util/virprocess.c:700
 #, c-format
 msgid "cannot limit number of subprocesses to %u"
 msgstr ""
 
-#: src/util/virprocess.c:676
+#: src/util/virprocess.c:707
 #, c-format
 msgid "cannot limit number of subprocesses of process %lld to %u"
 msgstr ""
 
-#: src/util/virprocess.c:717
+#: src/util/virprocess.c:748
 #, c-format
 msgid "cannot limit number of open files to %u"
 msgstr ""
 
-#: src/util/virprocess.c:724
+#: src/util/virprocess.c:755
 #, c-format
 msgid "cannot limit number of open files of process %lld to %u"
 msgstr ""
 
-#: src/util/virprocess.c:773 src/util/virprocess.c:780
-#: src/util/virprocess.c:789
+#: src/util/virprocess.c:804 src/util/virprocess.c:811
+#: src/util/virprocess.c:820
 #, c-format
 msgid "Cannot find start time in %s"
 msgstr "无法找到 %s 中的启示时间"
 
-#: src/util/virprocess.c:799
+#: src/util/virprocess.c:830
 #, c-format
 msgid "Cannot parse start time %s in %s"
 msgstr ""
 
-#: src/util/virprocess.c:827
+#: src/util/virprocess.c:858
 msgid "Unable to query process ID start time"
 msgstr "无法查询进程 ID 启示时间"
 
+#: src/util/virprocess.c:898
+msgid "Kernel does not provide mount namespace"
+msgstr ""
+
+#: src/util/virprocess.c:904
+msgid "Unable to enter mount namespace"
+msgstr ""
+
+#: src/util/virprocess.c:940
+msgid "Cannot create pipe for child"
+msgstr ""
+
+#: src/util/virprocess.c:982
+msgid "Mount namespaces are not available on this platform"
+msgstr ""
+
 #: src/util/virrandom.c:171
 msgid "argument virt_type must not be NULL"
 msgstr "参数 virt_type 一定不能为 NULL"
@@ -23797,57 +24134,57 @@
 msgid "Unsupported virt type"
 msgstr "不支持的 virt 类型"
 
-#: src/util/virsexpr.c:244
+#: src/util/sexpr.c:245
 #, c-format
 msgid "unknown s-expression kind %d"
 msgstr "%d 的 s 表达式类型"
 
-#: src/util/virscsi.c:96
+#: src/util/virscsi.c:100
 #, c-format
 msgid "Cannot parse adapter '%s'"
 msgstr "无法解析适配器 '%s'"
 
-#: src/util/virscsi.c:122 src/util/virscsi.c:165 src/util/virsysinfo.c:228
+#: src/util/virscsi.c:128 src/util/virscsi.c:173 src/util/virsysinfo.c:228
 #: src/util/virsysinfo.c:345 src/util/virsysinfo.c:473
 #: src/util/virsysinfo.c:488
 #, c-format
 msgid "Failed to open %s"
 msgstr "打开 %s 失败"
 
-#: src/util/virscsi.c:218
+#: src/util/virscsi.c:231
 #, c-format
 msgid "SCSI device '%s': could not access %s"
 msgstr "SCSI 设备 '%s：无法访问 %s"
 
-#: src/util/virscsi.c:354
+#: src/util/virscsi.c:383
 #, c-format
 msgid "Device %s already exists"
 msgstr "设备 %s 已存在"
 
-#: src/util/virsocketaddr.c:89 src/util/virsocketaddr.c:304
+#: src/util/virsocketaddr.c:95 src/util/virsocketaddr.c:188
 msgid "Missing address"
 msgstr "缺少地址"
 
-#: src/util/virsocketaddr.c:99
+#: src/util/virsocketaddr.c:104
 #, c-format
 msgid "Cannot parse socket address '%s': %s"
 msgstr "无法解析插槽地址 '%s': %s"
 
-#: src/util/virsocketaddr.c:128
+#: src/util/virsocketaddr.c:111
 #, c-format
 msgid "No socket addresses found for '%s'"
 msgstr "未找到 '%s' 的插槽地址"
 
-#: src/util/virsocketaddr.c:328
+#: src/util/virsocketaddr.c:212
 #, c-format
 msgid "Cannot convert socket address to string: %s"
 msgstr "无法将插槽地址转换为字符串：%s"
 
-#: src/util/virstatslinux.c:61
+#: src/util/stats_linux.c:54
 msgid "Could not open /proc/net/dev"
 msgstr "无法打开 /proc/net/dev"
 
-#: src/util/virstatslinux.c:117 src/xen/xen_hypervisor.c:1474
+#: src/util/stats_linux.c:110
 msgid "/proc/net/dev: Interface not found"
 msgstr "/proc/net/dev：未找到接口"
 
@@ -23866,22 +24203,22 @@
 msgid "Can't canonicalize path '%s'"
 msgstr ""
 
-#: src/util/virstoragefile.c:780
+#: src/util/storage_file.c:870
 #, c-format
 msgid "unknown storage file format %d"
 msgstr "未知存储文件格式 %d"
 
-#: src/util/virstoragefile.c:918
+#: src/util/storage_file.c:760
 #, c-format
 msgid "cannot set to start of '%s'"
 msgstr "无法设定启动 '%s'"
 
-#: src/util/virstoragefile.c:995
+#: src/util/storage_file.c:851
 #, c-format
 msgid "cannot seek to start of '%s'"
 msgstr "无法查找 '%s' 启动"
 
-#: src/util/virstoragefile.c:1052
+#: src/conf/domain_conf.c:13235
 #, c-format
 msgid "backing store for %s is self-referential"
 msgstr "%s 的反向存储是自我指认的"
@@ -23905,12 +24242,12 @@
 msgid "Unable to save '%s'"
 msgstr "无法保存 '%s'"
 
-#: src/util/virstoragefile.c:1298
+#: src/util/storage_file.c:974
 #, c-format
 msgid "Invalid relative path '%s'"
 msgstr "无效间接路径 '%s'"
 
-#: src/util/virstoragefile.c:1316
+#: src/util/storage_file.c:992
 #, c-format
 msgid "cannot determine filesystem for '%s'"
 msgstr "无法为 '%s' 确定文件系统"
@@ -23925,813 +24262,823 @@
 msgid "Unable to get SCSI key for %s"
 msgstr "无法为 %s 获取 SCSI 密钥"
 
-#: src/util/virsysinfo.c:517
+#: src/util/virstring.c:704
+#, c-format
+msgid "Error while compiling regular expression '%s': %s"
+msgstr ""
+
+#: src/util/virstring.c:711
+#, c-format
+msgid "Regular expression '%s' must have exactly 1 match group, not %zu"
+msgstr ""
+
+#: src/util/sysinfo.c:127
 msgid "Host sysinfo extraction not supported on this platform"
 msgstr "这个平台不支持主机系统信息提取"
 
-#: src/util/virsysinfo.c:831
+#: src/util/sysinfo.c:464
 #, c-format
 msgid "Failed to find path for %s binary"
 msgstr "查找 %s 二进制路径失败"
 
-#: src/util/virsysinfo.c:1039
+#: src/util/sysinfo.c:680
 #, c-format
 msgid "unexpected sysinfo type model %d"
 msgstr "意外的系统信息类型模式 %d"
 
-#: src/util/virsysinfo.c:1072
+#: src/util/sysinfo.c:713
 msgid "Target sysinfo does not match source"
 msgstr "目标系统信息与源不匹配"
 
-#: src/util/virsysinfo.c:1078
+#: src/util/sysinfo.c:719
 #, c-format
 msgid "Target sysinfo %s does not match source %s"
 msgstr "目标系统信息 %s 与源 %s 不匹配"
 
-#: src/util/virsysinfo.c:1088
+#: src/util/sysinfo.c:729
 #, c-format
 msgid "Target sysinfo %s %s does not match source %s"
 msgstr "目标系统信息 %s %s 与源 %s 不匹配"
 
-#: src/util/virerror.c:171
+#: src/util/virterror.c:226
 msgid "An error occurred, but the cause is unknown"
 msgstr "出错，但原因不明。"
 
-#: src/util/virerror.c:255 tools/virsh-domain-monitor.c:48
+#: src/util/virerror.c:256 tools/virsh-domain-monitor.c:46
 msgid "no error"
 msgstr "无错误"
 
-#: src/util/virerror.c:539
+#: src/util/virterror.c:572
 msgid "warning"
 msgstr "警告"
 
-#: src/util/virerror.c:542 tools/virsh-domain-monitor.c:130
+#: src/util/virterror.c:575 tools/virsh.c:16932
 msgid "error"
 msgstr "错误"
 
-#: src/util/virerror.c:674
+#: src/util/virterror.c:705
 msgid "No error message provided"
 msgstr "没有错误讯息提供"
 
-#: src/util/virerror.c:733
+#: src/util/virerror.c:740
 #, c-format
 msgid "internal error: %s"
 msgstr ""
 
-#: src/util/virerror.c:735
+#: src/util/virterror.c:770
 msgid "internal error"
 msgstr "内部错误"
 
-#: src/util/virerror.c:738 tools/virsh.c:676
+#: src/util/virterror.c:773 tools/virsh.c:12077
 msgid "out of memory"
 msgstr "内存溢出"
 
-#: src/util/virerror.c:742
+#: src/util/virterror.c:777
 msgid "this function is not supported by the connection driver"
 msgstr "连接驱动器不支持这个功能"
 
-#: src/util/virerror.c:744
+#: src/util/virterror.c:779
 #, c-format
 msgid "this function is not supported by the connection driver: %s"
 msgstr "连接驱动器不支持这个功能：%s"
 
-#: src/util/virerror.c:748
+#: src/util/virterror.c:783
 msgid "no connection driver available"
 msgstr "没有连接驱动器可用"
 
-#: src/util/virerror.c:750
+#: src/util/virterror.c:785
 #, c-format
 msgid "no connection driver available for %s"
 msgstr "%s 没有连接驱动器可用"
 
-#: src/util/virerror.c:754
+#: src/util/virterror.c:789
 msgid "invalid connection pointer in"
 msgstr "无效的连接指向"
 
-#: src/util/virerror.c:756
+#: src/util/virterror.c:791
 #, c-format
 msgid "invalid connection pointer in %s"
 msgstr "无效的连接指向 %s"
 
-#: src/util/virerror.c:760
+#: src/util/virterror.c:795
 msgid "invalid domain pointer in"
 msgstr "无效的域名指向"
 
-#: src/util/virerror.c:762
+#: src/util/virterror.c:797
 #, c-format
 msgid "invalid domain pointer in %s"
 msgstr "无效的域名指向 %s"
 
-#: src/util/virerror.c:766 src/xen/xen_hypervisor.c:2919
+#: src/util/virterror.c:801
 msgid "invalid argument"
 msgstr "无效参数"
 
-#: src/util/virerror.c:768
+#: src/util/virterror.c:803
 #, c-format
 msgid "invalid argument: %s"
 msgstr "无效参数：%s"
 
-#: src/util/virerror.c:772
+#: src/util/virterror.c:807
 #, c-format
 msgid "operation failed: %s"
 msgstr "操作失败: %s"
 
-#: src/util/virerror.c:774
+#: src/util/virterror.c:809
 msgid "operation failed"
 msgstr "操作失败"
 
-#: src/util/virerror.c:778
+#: src/util/virterror.c:813
 #, c-format
 msgid "GET operation failed: %s"
 msgstr "GET操作失败: %s"
 
-#: src/util/virerror.c:780
+#: src/util/virterror.c:815
 msgid "GET operation failed"
 msgstr "GET操作失败"
 
-#: src/util/virerror.c:784
+#: src/util/virterror.c:819
 #, c-format
 msgid "POST operation failed: %s"
 msgstr "POST操作失败: %s"
 
-#: src/util/virerror.c:786
+#: src/util/virterror.c:821
 msgid "POST operation failed"
 msgstr "POST操作失败"
 
-#: src/util/virerror.c:789
+#: src/util/virterror.c:824
 #, c-format
 msgid "got unknown HTTP error code %d"
 msgstr "得到未知的HTTP错误代码 %d"
 
-#: src/util/virerror.c:793
+#: src/util/virterror.c:828
 #, c-format
 msgid "unknown host %s"
 msgstr "未知的主机 %s"
 
-#: src/util/virerror.c:795
+#: src/util/virterror.c:830
 msgid "unknown host"
 msgstr "未知的主机"
 
-#: src/util/virerror.c:799
+#: src/util/virterror.c:834
 #, c-format
 msgid "failed to serialize S-Expr: %s"
 msgstr "序列化S-Expr失败: %s"
 
-#: src/util/virerror.c:801
+#: src/util/virterror.c:836
 msgid "failed to serialize S-Expr"
 msgstr "序列化S-Expr失败"
 
-#: src/util/virerror.c:805
+#: src/util/virterror.c:840
 msgid "could not use Xen hypervisor entry"
 msgstr "不能使用Xen管理程序登录"
 
-#: src/util/virerror.c:807
+#: src/util/virterror.c:842
 #, c-format
 msgid "could not use Xen hypervisor entry %s"
 msgstr "不能使用Xen管理程序登录 %s"
 
-#: src/util/virerror.c:811
+#: src/util/virterror.c:846
 msgid "could not connect to Xen Store"
 msgstr "不能连接Xen存储器"
 
-#: src/util/virerror.c:813
+#: src/util/virterror.c:848
 #, c-format
 msgid "could not connect to Xen Store %s"
 msgstr "不能连接Xen存储器 %s"
 
-#: src/util/virerror.c:816
+#: src/util/virterror.c:851
 #, c-format
 msgid "failed Xen syscall %s"
 msgstr "Xen系统调用失败 %s"
 
-#: src/util/virerror.c:820
+#: src/util/virterror.c:855
 msgid "unknown OS type"
 msgstr "未知操作系统类型"
 
-#: src/util/virerror.c:822
+#: src/util/virterror.c:857
 #, c-format
 msgid "unknown OS type %s"
 msgstr "未知操作系统类型 %s"
 
-#: src/util/virerror.c:825
+#: src/util/virterror.c:860
 msgid "missing kernel information"
 msgstr "丢失内核信息"
 
-#: src/util/virerror.c:829
+#: src/util/virterror.c:864
 msgid "missing root device information"
 msgstr "丢失root设备信息"
 
-#: src/util/virerror.c:831
+#: src/util/virterror.c:866
 #, c-format
 msgid "missing root device information in %s"
 msgstr "丢失root信息 %s"
 
-#: src/util/virerror.c:835
+#: src/util/virterror.c:870
 msgid "missing source information for device"
 msgstr "丢失设备的源代码信息"
 
-#: src/util/virerror.c:837
+#: src/util/virterror.c:872
 #, c-format
 msgid "missing source information for device %s"
 msgstr "丢失设备的源代码信息 %s"
 
-#: src/util/virerror.c:841
+#: src/util/virterror.c:876
 msgid "missing target information for device"
 msgstr "丢失设备的目标信息"
 
-#: src/util/virerror.c:843
+#: src/util/virterror.c:878
 #, c-format
 msgid "missing target information for device %s"
 msgstr "丢失设备的目标信息 %s"
 
-#: src/util/virerror.c:847
+#: src/util/virerror.c:854
 msgid "missing name information"
 msgstr "丢失名称信息"
 
-#: src/util/virerror.c:849
+#: src/util/virerror.c:856
 #, c-format
 msgid "missing name information in %s"
 msgstr "%s 中缺少名称信息"
 
-#: src/util/virerror.c:853
+#: src/util/virterror.c:888
 msgid "missing operating system information"
 msgstr "丢失操作系统信息"
 
-#: src/util/virerror.c:855
+#: src/util/virterror.c:890
 #, c-format
 msgid "missing operating system information for %s"
 msgstr "丢失操作系统信息 %s"
 
-#: src/util/virerror.c:859
+#: src/util/virterror.c:894
 msgid "missing devices information"
 msgstr "丢失设备信息"
 
-#: src/util/virerror.c:861
+#: src/util/virterror.c:896
 #, c-format
 msgid "missing devices information for %s"
 msgstr "丢失设备信息 %s"
 
-#: src/util/virerror.c:865
+#: src/util/virterror.c:900
 msgid "too many drivers registered"
 msgstr "注册了太多的设备"
 
-#: src/util/virerror.c:867
+#: src/util/virterror.c:902
 #, c-format
 msgid "too many drivers registered in %s"
 msgstr "注册了太多的设备 %s"
 
-#: src/util/virerror.c:871
+#: src/util/virterror.c:906
 msgid "library call failed, possibly not supported"
 msgstr "库调用失败，可能不支持"
 
-#: src/util/virerror.c:873
+#: src/util/virterror.c:908
 #, c-format
 msgid "library call %s failed, possibly not supported"
 msgstr "库调用 %s 失败，可能不支持"
 
-#: src/util/virerror.c:877
+#: src/util/virterror.c:912
 msgid "XML description is invalid or not well formed"
 msgstr "XML 描述无效或者不合格"
 
-#: src/util/virerror.c:879
+#: src/util/virterror.c:914
 #, c-format
 msgid "XML error: %s"
 msgstr "XML 错误：%s"
 
-#: src/util/virerror.c:883
+#: src/util/virterror.c:918
 msgid "this domain exists already"
 msgstr "这个域名已经存在"
 
-#: src/util/virerror.c:885
+#: src/util/virterror.c:920
 #, c-format
 msgid "domain %s exists already"
 msgstr "域名 %s 已经存在"
 
-#: src/util/virerror.c:889
+#: src/util/virterror.c:924
 msgid "operation forbidden for read only access"
 msgstr "只读权限禁止此操作"
 
-#: src/util/virerror.c:891
+#: src/util/virerror.c:898
 #, c-format
 msgid "operation forbidden: %s"
 msgstr ""
 
-#: src/util/virerror.c:895
+#: src/util/virterror.c:930
 msgid "failed to open configuration file for reading"
 msgstr "打开并读取配置文件失败"
 
-#: src/util/virerror.c:897
+#: src/util/virterror.c:932
 #, c-format
 msgid "failed to open %s for reading"
 msgstr "打开并读取 %s 文件失败"
 
-#: src/util/virerror.c:901
+#: src/util/virterror.c:936
 msgid "failed to read configuration file"
 msgstr "读取配置文件失败"
 
-#: src/util/virerror.c:903
+#: src/util/virterror.c:938
 #, c-format
 msgid "failed to read configuration file %s"
 msgstr "读取配置文件 %s 失败"
 
-#: src/util/virerror.c:907
+#: src/util/virterror.c:942
 msgid "failed to parse configuration file"
 msgstr "解析配置文件失败"
 
-#: src/util/virerror.c:909
+#: src/util/virterror.c:944
 #, c-format
 msgid "failed to parse configuration file %s"
 msgstr "解析配置文件%s失败"
 
-#: src/util/virerror.c:913
+#: src/util/virterror.c:948
 msgid "configuration file syntax error"
 msgstr "配置文件语法错误"
 
-#: src/util/virerror.c:915
+#: src/util/virterror.c:950
 #, c-format
 msgid "configuration file syntax error: %s"
 msgstr "配置文件语法错误: %s"
 
-#: src/util/virerror.c:919
+#: src/util/virterror.c:954
 msgid "failed to write configuration file"
 msgstr "写入配置文件失败"
 
-#: src/util/virerror.c:921
+#: src/util/virterror.c:956
 #, c-format
 msgid "failed to write configuration file: %s"
 msgstr "写入配置文件失败: %s"
 
-#: src/util/virerror.c:925
+#: src/util/virterror.c:960
 msgid "parser error"
 msgstr "语法错误"
 
-#: src/util/virerror.c:931
+#: src/util/virterror.c:966
 msgid "invalid network pointer in"
 msgstr "无效的网络指针"
 
-#: src/util/virerror.c:933
+#: src/util/virterror.c:968
 #, c-format
 msgid "invalid network pointer in %s"
 msgstr "无效的网络指针 %s"
 
-#: src/util/virerror.c:937
+#: src/util/virterror.c:972
 msgid "this network exists already"
 msgstr "这个网络已存在"
 
-#: src/util/virerror.c:939
+#: src/util/virterror.c:974
 #, c-format
 msgid "network %s exists already"
 msgstr "网络%s 已经存在"
 
-#: src/util/virerror.c:943
+#: src/util/virterror.c:978
 msgid "system call error"
 msgstr "系统调用错误"
 
-#: src/util/virerror.c:949
+#: src/util/virterror.c:984
 msgid "RPC error"
 msgstr "RPC错误"
 
-#: src/util/virerror.c:955
+#: src/util/virterror.c:990
 msgid "GNUTLS call error"
 msgstr "GNUTLS调用错误"
 
-#: src/util/virerror.c:961
+#: src/util/virterror.c:996
 msgid "Failed to find the network"
 msgstr "查找网络失败"
 
-#: src/util/virerror.c:963
+#: src/util/virterror.c:998
 #, c-format
 msgid "Failed to find the network: %s"
 msgstr "查找网络失败: %s"
 
-#: src/util/virerror.c:967
+#: src/util/virterror.c:1002
 msgid "Domain not found"
 msgstr "未找到域"
 
-#: src/util/virerror.c:969
+#: src/util/virterror.c:1004
 #, c-format
 msgid "Domain not found: %s"
 msgstr "未找到域: %s"
 
-#: src/util/virerror.c:973
+#: src/util/virterror.c:1008
 msgid "Network not found"
 msgstr "未找到网络"
 
-#: src/util/virerror.c:975
+#: src/util/virterror.c:1010
 #, c-format
 msgid "Network not found: %s"
 msgstr "未找到网络: %s"
 
-#: src/util/virerror.c:979
+#: src/util/virterror.c:1014
 msgid "invalid MAC address"
 msgstr "无效的 MAC 地址"
 
-#: src/util/virerror.c:981
+#: src/util/virterror.c:1016
 #, c-format
 msgid "invalid MAC address: %s"
 msgstr "无效的 MAC 地址: %s"
 
-#: src/util/virerror.c:991
+#: src/util/virerror.c:998
 msgid "authentication cancelled"
 msgstr "已取消认证"
 
-#: src/util/virerror.c:993
+#: src/util/virerror.c:1000
 #, c-format
 msgid "authentication cancelled: %s"
 msgstr "已取消认证：%s"
 
-#: src/util/virerror.c:997
+#: src/util/virterror.c:1026
 msgid "Storage pool not found"
 msgstr "未找到存储池"
 
-#: src/util/virerror.c:999
+#: src/util/virterror.c:1028
 #, c-format
 msgid "Storage pool not found: %s"
 msgstr "未找到存储池: %s"
 
-#: src/util/virerror.c:1003
+#: src/util/virterror.c:1032
 msgid "Storage volume not found"
 msgstr "未找到存储卷"
 
-#: src/util/virerror.c:1005
+#: src/util/virterror.c:1034
 #, c-format
 msgid "Storage volume not found: %s"
 msgstr "未找到存储卷: %s"
 
-#: src/util/virerror.c:1009
+#: src/util/virerror.c:1016
 msgid "this storage volume exists already"
 msgstr ""
 
-#: src/util/virerror.c:1011
+#: src/util/virerror.c:1018
 #, c-format
 msgid "storage volume %s exists already"
 msgstr ""
 
-#: src/util/virerror.c:1015
+#: src/util/virterror.c:1038
 msgid "Storage pool probe failed"
 msgstr "未找到存储池"
 
-#: src/util/virerror.c:1017
+#: src/util/virterror.c:1040
 #, c-format
 msgid "Storage pool probe failed: %s"
 msgstr "未找到存储池: %s"
 
-#: src/util/virerror.c:1021
+#: src/util/virterror.c:1044
 msgid "Storage pool already built"
 msgstr "存储池已构建"
 
-#: src/util/virerror.c:1023
+#: src/util/virterror.c:1046
 #, c-format
 msgid "Storage pool already built: %s"
 msgstr "存储池已构建：%s"
 
-#: src/util/virerror.c:1027
+#: src/util/virterror.c:1050
 msgid "invalid storage pool pointer in"
 msgstr "无效的存储池指针"
 
-#: src/util/virerror.c:1029
+#: src/util/virterror.c:1052
 #, c-format
 msgid "invalid storage pool pointer in %s"
 msgstr "%s 中无效的存储池指针"
 
-#: src/util/virerror.c:1033
+#: src/util/virterror.c:1056
 msgid "invalid storage volume pointer in"
 msgstr "无效的存储卷指针"
 
-#: src/util/virerror.c:1035
+#: src/util/virterror.c:1058
 #, c-format
 msgid "invalid storage volume pointer in %s"
 msgstr "%s 中无效的存储卷指针"
 
-#: src/util/virerror.c:1039
+#: src/util/virterror.c:1062
 msgid "Failed to find a storage driver"
 msgstr "查找存储驱动程序失败"
 
-#: src/util/virerror.c:1041
+#: src/util/virterror.c:1064
 #, c-format
 msgid "Failed to find a storage driver: %s"
 msgstr "查找存储驱动程序失败： %s"
 
-#: src/util/virerror.c:1045
+#: src/util/virterror.c:1068
 msgid "Failed to find a node driver"
 msgstr "查找节点程序失败"
 
-#: src/util/virerror.c:1047
+#: src/util/virterror.c:1070
 #, c-format
 msgid "Failed to find a node driver: %s"
 msgstr "查找节点程序失败：%s"
 
-#: src/util/virerror.c:1051
+#: src/util/virterror.c:1074
 msgid "invalid node device pointer"
 msgstr "无效的节点设备"
 
-#: src/util/virerror.c:1053
+#: src/util/virterror.c:1076
 #, c-format
 msgid "invalid node device pointer in %s"
 msgstr "%s 中的无效节点设备指针"
 
-#: src/util/virerror.c:1057
+#: src/util/virterror.c:1080
 msgid "Node device not found"
 msgstr "未找到节点设备"
 
-#: src/util/virerror.c:1059
+#: src/util/virterror.c:1082
 #, c-format
 msgid "Node device not found: %s"
 msgstr "未找到节点设备：%s"
 
-#: src/util/virerror.c:1063
+#: src/util/virterror.c:1086
 msgid "Security model not found"
 msgstr "未找到安全性模式"
 
-#: src/util/virerror.c:1065
+#: src/util/virterror.c:1088
 #, c-format
 msgid "Security model not found: %s"
 msgstr "未找到安全性模式：%s"
 
-#: src/util/virerror.c:1069
+#: src/util/virterror.c:1092
 msgid "Requested operation is not valid"
 msgstr "所需操作无效"
 
-#: src/util/virerror.c:1071
+#: src/util/virterror.c:1094
 #, c-format
 msgid "Requested operation is not valid: %s"
 msgstr "所需操作无效：%s"
 
-#: src/util/virerror.c:1075
+#: src/util/virterror.c:1098
 msgid "Failed to find the interface"
 msgstr "查找接口失败"
 
-#: src/util/virerror.c:1077
+#: src/util/virterror.c:1100
 #, c-format
 msgid "Failed to find the interface: %s"
 msgstr "查找接口失败：%s"
 
-#: src/util/virerror.c:1081
+#: src/util/virterror.c:1104
 msgid "Interface not found"
 msgstr "未找到接口"
 
-#: src/util/virerror.c:1083
+#: src/util/virterror.c:1106
 #, c-format
 msgid "Interface not found: %s"
 msgstr "未找到接口：%s"
 
-#: src/util/virerror.c:1087
+#: src/util/virterror.c:1110
 msgid "invalid interface pointer in"
 msgstr "无效接口指针"
 
-#: src/util/virerror.c:1089
+#: src/util/virterror.c:1112
 #, c-format
 msgid "invalid interface pointer in %s"
 msgstr "%s 中的无效接口指针"
 
-#: src/util/virerror.c:1093
+#: src/util/virterror.c:1116
 msgid "multiple matching interfaces found"
 msgstr "找到多个匹配的接口"
 
-#: src/util/virerror.c:1095
+#: src/util/virterror.c:1118
 #, c-format
 msgid "multiple matching interfaces found: %s"
 msgstr "找到多个匹配的接口：%s"
 
-#: src/util/virerror.c:1099
+#: src/util/virterror.c:1122
 msgid "Failed to find a secret storage driver"
 msgstr "查找 secret 存储驱动程序失败"
 
-#: src/util/virerror.c:1101
+#: src/util/virterror.c:1124
 #, c-format
 msgid "Failed to find a secret storage driver: %s"
 msgstr "查找 secret 存储驱动程序失败：%s"
 
-#: src/util/virerror.c:1105
+#: src/util/virterror.c:1128
 msgid "Invalid secret"
 msgstr "无效 secret"
 
-#: src/util/virerror.c:1107
+#: src/util/virterror.c:1130
 #, c-format
 msgid "Invalid secret: %s"
 msgstr "无效 secret：%s"
 
-#: src/util/virerror.c:1111
+#: src/util/virterror.c:1134
 msgid "Secret not found"
 msgstr "未找到 secret"
 
-#: src/util/virerror.c:1113
+#: src/util/virterror.c:1136
 #, c-format
 msgid "Secret not found: %s"
 msgstr "未找到 secret：%s"
 
-#: src/util/virerror.c:1117
+#: src/util/virterror.c:1140
 msgid "Failed to start the nwfilter driver"
 msgstr "启动 nwfilter 驱动程序失败"
 
-#: src/util/virerror.c:1119
+#: src/util/virterror.c:1142
 #, c-format
 msgid "Failed to start the nwfilter driver: %s"
 msgstr "启动 nwfilter 驱动程序失败：%s"
 
-#: src/util/virerror.c:1123
+#: src/util/virterror.c:1146
 msgid "Invalid network filter"
 msgstr "无效网络过滤器"
 
-#: src/util/virerror.c:1125
+#: src/util/virterror.c:1148
 #, c-format
 msgid "Invalid network filter: %s"
 msgstr "无效网络过滤器：%s"
 
-#: src/util/virerror.c:1129
+#: src/util/virterror.c:1152
 msgid "Network filter not found"
 msgstr "未找到网络过滤器"
 
-#: src/util/virerror.c:1131
+#: src/util/virterror.c:1154
 #, c-format
 msgid "Network filter not found: %s"
 msgstr "未找到网络过滤器：%s"
 
-#: src/util/virerror.c:1135
+#: src/util/virterror.c:1158
 msgid "Error while building firewall"
 msgstr "构建防火墙出错"
 
-#: src/util/virerror.c:1137
+#: src/util/virterror.c:1160
 #, c-format
 msgid "Error while building firewall: %s"
 msgstr "构建防火墙出错：%s"
 
-#: src/util/virerror.c:1141
+#: src/util/virterror.c:1164
 msgid "unsupported configuration"
 msgstr "不支持的配置"
 
-#: src/util/virerror.c:1143
+#: src/util/virterror.c:1166
 #, c-format
 msgid "unsupported configuration: %s"
 msgstr "不支持的配置：%s"
 
-#: src/util/virerror.c:1147
+#: src/util/virterror.c:1170
 msgid "Timed out during operation"
 msgstr "操作超时"
 
-#: src/util/virerror.c:1149
+#: src/util/virterror.c:1172
 #, c-format
 msgid "Timed out during operation: %s"
 msgstr "操作超时：%s"
 
-#: src/util/virerror.c:1153
+#: src/util/virterror.c:1176
 msgid "Failed to make domain persistent after migration"
 msgstr "迁移后保持域一致失败"
 
-#: src/util/virerror.c:1155
+#: src/util/virterror.c:1178
 #, c-format
 msgid "Failed to make domain persistent after migration: %s"
 msgstr "迁移后保持域一致失败：%s"
 
-#: src/util/virerror.c:1159
+#: src/util/virterror.c:1182
 msgid "Hook script execution failed"
 msgstr "Hook 脚本执行失败"
 
-#: src/util/virerror.c:1161
+#: src/util/virterror.c:1184
 #, c-format
 msgid "Hook script execution failed: %s"
 msgstr "Hook 脚本执行失败：%s"
 
-#: src/util/virerror.c:1165
+#: src/util/virterror.c:1188
 msgid "Invalid snapshot"
 msgstr "无效快照"
 
-#: src/util/virerror.c:1167
+#: src/util/virterror.c:1190
 #, c-format
 msgid "Invalid snapshot: %s"
 msgstr "无效快照：%s"
 
-#: src/util/virerror.c:1171
+#: src/util/virterror.c:1194
 msgid "Domain snapshot not found"
 msgstr "未找到域快照"
 
-#: src/util/virerror.c:1173
+#: src/util/virterror.c:1196
 #, c-format
 msgid "Domain snapshot not found: %s"
 msgstr "未找到域快照：%s"
 
-#: src/util/virerror.c:1177
+#: src/util/virterror.c:1200
 msgid "invalid stream pointer"
 msgstr "无效流指针"
 
-#: src/util/virerror.c:1179
+#: src/util/virterror.c:1202
 #, c-format
 msgid "invalid stream pointer in %s"
 msgstr "%s 中的无效流指针"
 
-#: src/util/virerror.c:1183
+#: src/util/virterror.c:1206
 msgid "argument unsupported"
 msgstr "不支持的参数"
 
-#: src/util/virerror.c:1185
+#: src/util/virterror.c:1208
 #, c-format
 msgid "argument unsupported: %s"
 msgstr "不支持的参数：%s"
 
-#: src/util/virerror.c:1189
+#: src/util/virterror.c:1212
 msgid "revert requires force"
 msgstr "转换请求强制"
 
-#: src/util/virerror.c:1191
+#: src/util/virterror.c:1214
 #, c-format
 msgid "revert requires force: %s"
 msgstr "转换请求强制：%s"
 
-#: src/util/virerror.c:1195
+#: src/util/virerror.c:1202
 msgid "operation aborted"
 msgstr "放弃操作"
 
-#: src/util/virerror.c:1197
+#: src/util/virerror.c:1204
 #, c-format
 msgid "operation aborted: %s"
 msgstr "放弃操作：%s"
 
-#: src/util/virerror.c:1201
+#: src/util/virerror.c:1208
 msgid "metadata not found"
 msgstr "未找到元数据"
 
-#: src/util/virerror.c:1203
+#: src/util/virerror.c:1210
 #, c-format
 msgid "metadata not found: %s"
 msgstr "未找到元数据：%s"
 
-#: src/util/virerror.c:1207
+#: src/util/virerror.c:1214
 msgid "Unsafe migration"
 msgstr "不安全的迁移"
 
-#: src/util/virerror.c:1209
+#: src/util/virerror.c:1216
 #, c-format
 msgid "Unsafe migration: %s"
 msgstr "不安全的迁移:%s"
 
-#: src/util/virerror.c:1213
+#: src/util/virerror.c:1220
 msgid "numerical overflow"
 msgstr "数字溢出"
 
-#: src/util/virerror.c:1215
+#: src/util/virerror.c:1222
 #, c-format
 msgid "numerical overflow: %s"
 msgstr "数字溢出：%s"
 
-#: src/util/virerror.c:1219
+#: src/util/virerror.c:1226
 msgid "block copy still active"
 msgstr "块复制仍活跃"
 
-#: src/util/virerror.c:1221
+#: src/util/virerror.c:1228
 #, c-format
 msgid "block copy still active: %s"
 msgstr "块复制仍活跃：%s"
 
-#: src/util/virerror.c:1225
+#: src/util/virerror.c:1232
 msgid "Operation not supported"
 msgstr "不支持的操作"
 
-#: src/util/virerror.c:1227
+#: src/util/virerror.c:1234
 #, c-format
 msgid "Operation not supported: %s"
 msgstr "不支持的操作：%s"
 
-#: src/util/virerror.c:1231
+#: src/util/virerror.c:1238
 msgid "SSH transport error"
 msgstr "SSH 传输出错"
 
-#: src/util/virerror.c:1233
+#: src/util/virerror.c:1240
 #, c-format
 msgid "SSH transport error: %s"
 msgstr "SSH 传输出错：%s"
 
-#: src/util/virerror.c:1237
+#: src/util/virerror.c:1244
 msgid "Guest agent is not responding"
 msgstr "虚拟机代理未响应"
 
-#: src/util/virerror.c:1239
+#: src/util/virerror.c:1246
 #, c-format
 msgid "Guest agent is not responding: %s"
 msgstr "虚拟机代理未响应：%s"
 
-#: src/util/virerror.c:1243
+#: src/util/virerror.c:1250
 msgid "resource busy"
 msgstr "资源忙"
 
-#: src/util/virerror.c:1245
+#: src/util/virerror.c:1252
 #, c-format
 msgid "resource busy %s"
 msgstr "资源忙 %s"
 
-#: src/util/virerror.c:1249
+#: src/util/virerror.c:1256
 msgid "access denied"
 msgstr "访问被拒绝"
 
-#: src/util/virerror.c:1251
+#: src/util/virerror.c:1258
 #, c-format
 msgid "access denied: %s"
 msgstr "访问被拒绝：%s"
 
-#: src/util/virerror.c:1255
+#: src/util/virerror.c:1262
 msgid "error from service"
 msgstr ""
 
-#: src/util/virerror.c:1257
+#: src/util/virerror.c:1264
 #, c-format
 msgid "error from service: %s"
 msgstr ""
@@ -24766,11 +25113,11 @@
 msgid "%s in %s must be zero or greater"
 msgstr "%s 中的 %s 必须大于等于 0"
 
-#: src/util/virtime.c:285
+#: src/util/virtime.c:288
 msgid "Unable to break out time format"
 msgstr "无法打破时间格式"
 
-#: src/util/virtime.c:311 src/util/virtime.c:340
+#: src/util/virtime.c:316 src/util/virtime.c:347
 msgid "Unable to format time"
 msgstr "无法格式化时间"
 
@@ -24859,22 +25206,22 @@
 msgid "Unable to parse URI %s"
 msgstr "无法解析 URI %s"
 
-#: src/util/virusb.c:107
+#: src/util/hostusb.c:80
 #, c-format
 msgid "Could not parse usb file %s"
 msgstr "无法解析 usb 文件 %s"
 
-#: src/util/virusb.c:139
+#: src/util/hostusb.c:102
 #, c-format
 msgid "Could not open directory %s"
 msgstr "无法打开目录 %s"
 
-#: src/util/virusb.c:164
+#: src/util/hostusb.c:129
 #, c-format
 msgid "Failed to parse dir name '%s'"
 msgstr "解析目录名称e '%s' 失败"
 
-#: src/util/virusb.c:235
+#: src/util/hostusb.c:147
 #, c-format
 msgid "Did not find USB device %x:%x"
 msgstr "未找到 USB 设备 %x:%x"
@@ -24894,16 +25241,16 @@
 msgid "dev->name buffer overflow: %.3d:%.3d"
 msgstr "dev-> 名称缓存溢出：%.3d:%.3d"
 
-#: src/util/virusb.c:360
+#: src/util/hostusb.c:193
 #, c-format
 msgid "dev->id buffer overflow: %d %d"
 msgstr "dev->id 缓存溢出: %d %d"
 
-#: src/util/virutil.c:173
+#: src/util/util.c:328
 msgid "Unknown poll response."
 msgstr "未知 poll 响应。"
 
-#: src/util/virutil.c:205
+#: src/util/util.c:362
 msgid "poll error"
 msgstr "poll 错误"
 
@@ -24922,16 +25269,16 @@
 msgid "value too large: %llu%s"
 msgstr "数值太大：%llu%s"
 
-#: src/util/virutil.c:545
+#: src/util/util.c:1913
 #, c-format
 msgid "Disk index %d is negative"
 msgstr "磁盘缩影 %d 为负数"
 
-#: src/util/virutil.c:599
+#: src/util/util.c:1969
 msgid "failed to determine host name"
 msgstr "决定主机名失败"
 
-#: src/util/virutil.c:697 src/util/virutil.c:702
+#: src/util/util.c:2151
 #, c-format
 msgid "Failed to find user record for uid '%u'"
 msgstr "查找 uid '%u' 的用户记录失败"
@@ -24978,7 +25325,7 @@
 msgid "Unable to determine config directory"
 msgstr "无法确定 config 目录"
 
-#: src/util/virutil.c:1229
+#: src/util/util.c:2357
 msgid "virGetUserDirectory is not available"
 msgstr "virGetUserDirectory 不可用"
 
@@ -24994,19 +25341,19 @@
 msgid "virGetUserRuntimeDirectory is not available"
 msgstr "virGetUserRuntimeDirectory 不可用"
 
-#: src/util/virutil.c:1266
+#: src/util/util.c:2366
 msgid "virGetUserName is not available"
 msgstr "virGetUserName 不可用"
 
-#: src/util/virutil.c:1275
+#: src/util/util.c:2375
 msgid "virGetUserID is not available"
 msgstr "virGetUserID 不可用"
 
-#: src/util/virutil.c:1285
+#: src/util/util.c:2385
 msgid "virGetGroupID is not available"
 msgstr "virGetGroupID 不可用"
 
-#: src/util/virutil.c:1297
+#: src/util/util.c:2395
 msgid "virSetUIDGID is not available"
 msgstr "virSetUIDGID 不可用"
 
@@ -25046,7 +25393,7 @@
 msgid "failed to parse value of %s"
 msgstr ""
 
-#: src/util/virutil.c:1772
+#: src/node_device/node_device_driver.c:418
 #, c-format
 msgid "Invalid vport operation (%d)"
 msgstr "无效的 vport 操作 (%d)"
@@ -25056,17 +25403,17 @@
 msgid "vport operation '%s' is not supported for host%d"
 msgstr ""
 
-#: src/util/virutil.c:1810
+#: src/node_device/node_device_driver.c:469
 #, c-format
 msgid "Write of '%s' to '%s' during vport create/delete failed"
 msgstr "在创建/删除 vport 过程中将 '%s' 写入 '%s' 失败"
 
-#: src/util/virutil.c:2107
+#: src/util/virutil.c:2110
 #, c-format
 msgid "Failed to parse uid and gid from '%s'"
 msgstr ""
 
-#: src/util/virxml.c:79
+#: src/util/xml.c:70
 msgid "Invalid parameter to virXPathString()"
 msgstr "virXPathString() 的无效参数"
 
@@ -25075,40 +25422,40 @@
 msgid "'%s' value longer than %zu bytes"
 msgstr "'%s' 值超过 %zu 字节"
 
-#: src/util/virxml.c:146
+#: src/util/xml.c:140
 msgid "Invalid parameter to virXPathNumber()"
 msgstr "virXPathNumber() 的无效参数"
 
-#: src/util/virxml.c:175
+#: src/util/xml.c:169
 msgid "Invalid parameter to virXPathLong()"
 msgstr "virXPathLong() 的无效参数"
 
-#: src/util/virxml.c:281 src/util/virxml.c:398
+#: src/util/xml.c:282 src/util/xml.c:406
 msgid "Invalid parameter to virXPathULong()"
 msgstr "virXPathLong() 的无效参数"
 
-#: src/util/virxml.c:445
+#: src/util/xml.c:460
 msgid "Invalid parameter to virXPathLongLong()"
 msgstr "virXPathLongLong() 的无效参数"
 
-#: src/util/virxml.c:505
+#: src/util/xml.c:517
 msgid "Invalid parameter to virXPathBoolean()"
 msgstr "virXPathBoolean() 的无效参数"
 
-#: src/util/virxml.c:542
+#: src/util/xml.c:554
 msgid "Invalid parameter to virXPathNode()"
 msgstr "virXPathNode() 的无效参数"
 
-#: src/util/virxml.c:582
+#: src/util/xml.c:594
 msgid "Invalid parameter to virXPathNodeSet()"
 msgstr "virXPathNodeSet() 的无效参数"
 
-#: src/util/virxml.c:597
+#: src/util/xml.c:609
 #, c-format
 msgid "Incorrect xpath '%s'"
 msgstr "错误的 xpath '%s'"
 
-#: src/util/virxml.c:693
+#: src/util/xml.c:706
 #, c-format
 msgid ""
 "%s:%d: %s%s\n"
@@ -25117,7 +25464,7 @@
 "%s:%d: %s%s\n"
 "%s"
 
-#: src/util/virxml.c:701
+#: src/util/xml.c:714
 #, c-format
 msgid ""
 "at line %d: %s%s\n"
@@ -25126,11 +25473,11 @@
 "在行 %d: %s%s\n"
 "%s"
 
-#: src/util/virxml.c:761
+#: src/util/xml.c:774
 msgid "missing root element"
 msgstr "缺少根元素"
 
-#: src/util/virxml.c:785
+#: src/util/xml.c:798
 msgid "failed to parse xml document"
 msgstr "解析 xml 文档失败"
 
@@ -25146,487 +25493,484 @@
 msgid "failed to create a new XML namespace"
 msgstr ""
 
-#: src/vbox/vbox_MSCOMGlue.c:357 src/vbox/vbox_MSCOMGlue.c:382
+#: src/vbox/vbox_MSCOMGlue.c:352 src/vbox/vbox_MSCOMGlue.c:379
 #, c-format
 msgid "Could not query registry value '%s\\%s'"
 msgstr "无法查询注册值 '%s\\%s'"
 
-#: src/vbox/vbox_MSCOMGlue.c:363
+#: src/vbox/vbox_MSCOMGlue.c:358
 #, c-format
 msgid "Registry value '%s\\%s' has unexpected type"
 msgstr "注册值 '%s\\%s' 包含意外类型"
 
-#: src/vbox/vbox_MSCOMGlue.c:369
+#: src/vbox/vbox_MSCOMGlue.c:364
 #, c-format
 msgid "Registry value '%s\\%s' is too short"
 msgstr "注册值 '%s\\%s' 太短"
 
-#: src/vbox/vbox_MSCOMGlue.c:546 src/vbox/vbox_MSCOMGlue.c:554
+#: src/vbox/vbox_MSCOMGlue.c:545 src/vbox/vbox_MSCOMGlue.c:553
 #, c-format
 msgid "Could not parse IID from '%s', rc = 0x%08x"
 msgstr "无法在 '%s', rc = 0x%08x 中解析 ID"
 
-#: src/vbox/vbox_MSCOMGlue.c:563
+#: src/vbox/vbox_MSCOMGlue.c:562
 #, c-format
 msgid "Could not create VirtualBox instance, rc = 0x%08x"
 msgstr "无法生成 VirtualBox 实例，rc = 0x%08x"
 
-#: src/vbox/vbox_MSCOMGlue.c:572
+#: src/vbox/vbox_MSCOMGlue.c:571
 #, c-format
 msgid "Could not create Session instance, rc = 0x%08x"
 msgstr "无法生成绘话实例，rc = 0x%08x"
 
-#: src/vbox/vbox_XPCOMCGlue.c:102
+#: src/vbox/vbox_XPCOMCGlue.c:100
 #, c-format
 msgid "Library '%s' doesn't exist"
 msgstr "库 '%s' 不存在"
 
-#: src/vbox/vbox_XPCOMCGlue.c:143
+#: src/vbox/vbox_XPCOMCGlue.c:145
 #, c-format
 msgid "Could not dlsym %s from '%s': %s"
 msgstr "无法从 '%s' dlsym %s：%s"
 
-#: src/vbox/vbox_XPCOMCGlue.c:151
+#: src/vbox/vbox_XPCOMCGlue.c:153
 #, c-format
 msgid "Calling %s from '%s' failed"
 msgstr "从 '%s' 调用 %s 失败"
 
-#: src/vbox/vbox_driver.c:176 src/vbox/vbox_tmpl.c:1022
+#: src/vbox/vbox_driver.c:166 src/vbox/vbox_tmpl.c:1001
 msgid "no VirtualBox driver path specified (try vbox:///session)"
 msgstr "未指定 VirtualBox 驱动程序路径 (尝试：vbox:///session)"
 
-#: src/vbox/vbox_driver.c:183 src/vbox/vbox_tmpl.c:1029
+#: src/vbox/vbox_driver.c:173 src/vbox/vbox_tmpl.c:1008
 #, c-format
 msgid "unknown driver path '%s' specified (try vbox:///session)"
 msgstr "指定未知驱动程序路径 '%s'  (尝试：vbox:///session)"
 
-#: src/vbox/vbox_driver.c:190 src/vbox/vbox_tmpl.c:1036
+#: src/vbox/vbox_driver.c:180 src/vbox/vbox_tmpl.c:1015
 #, c-format
 msgid "unknown driver path '%s' specified (try vbox:///system)"
 msgstr "指定未知驱动程序路径 '%s'  (尝试：vbox:///systme)"
 
-#: src/vbox/vbox_driver.c:196
+#: src/vbox/vbox_driver.c:186
 msgid "unable to initialize VirtualBox driver API"
 msgstr "无法初始化 VirtualBox 驱动程序 API"
 
-#: src/vbox/vbox_tmpl.c:928
+#: src/vbox/vbox_tmpl.c:905
 msgid "nsIEventQueue object is null"
 msgstr "nsIEventQueue 对象为空"
 
-#: src/vbox/vbox_tmpl.c:937
+#: src/vbox/vbox_tmpl.c:914
 msgid "IVirtualBox object is null"
 msgstr "IVirtualBox 对象为空"
 
-#: src/vbox/vbox_tmpl.c:943
+#: src/vbox/vbox_tmpl.c:920
 msgid "ISession object is null"
 msgstr "ISession 对象为空"
 
-#: src/vbox/vbox_tmpl.c:976
+#: src/vbox/vbox_tmpl.c:980
 msgid "Could not extract VirtualBox version"
 msgstr "无法提取 VirtualBox 版本"
 
-#: src/vbox/vbox_tmpl.c:1159
+#: src/vbox/vbox_tmpl.c:1132
 #, c-format
 msgid "Could not get list of Domains, rc=%08x"
 msgstr "无法获取域列表，rc=%08x"
 
-#: src/vbox/vbox_tmpl.c:1197
+#: src/vbox/vbox_tmpl.c:1169
 #, c-format
 msgid "Could not get number of Domains, rc=%08x"
 msgstr "无法获取域数量，rc=%08x"
 
-#: src/vbox/vbox_tmpl.c:1269 src/vbox/vbox_tmpl.c:1330
-#: src/vbox/vbox_tmpl.c:1401 src/vbox/vbox_tmpl.c:1470
-#: src/vbox/vbox_tmpl.c:1950 src/vbox/vbox_tmpl.c:3719
+#: src/vbox/vbox_tmpl.c:1241 src/vbox/vbox_tmpl.c:1301
+#: src/vbox/vbox_tmpl.c:1371 src/vbox/vbox_tmpl.c:1445
+#: src/vbox/vbox_tmpl.c:1858 src/vbox/vbox_tmpl.c:3684
 #, c-format
 msgid "Could not get list of machines, rc=%08x"
 msgstr "无法获取及其列表，rc=%08x"
 
-#: src/vbox/vbox_tmpl.c:1535 src/vbox/vbox_tmpl.c:1560
-#: src/vbox/vbox_tmpl.c:2036 src/vbox/vbox_tmpl.c:5984
-#: src/vbox/vbox_tmpl.c:6086 src/vbox/vbox_tmpl.c:6190
-#: src/vbox/vbox_tmpl.c:6241 src/vbox/vbox_tmpl.c:6327
-#: src/vbox/vbox_tmpl.c:6359 src/vbox/vbox_tmpl.c:6401
-#: src/vbox/vbox_tmpl.c:6465 src/vbox/vbox_tmpl.c:6526
-#: src/vbox/vbox_tmpl.c:6586 src/vbox/vbox_tmpl.c:6730
-#: src/vbox/vbox_tmpl.c:6888
+#: src/vbox/vbox_tmpl.c:1969 src/vbox/vbox_tmpl.c:5896
+#: src/vbox/vbox_tmpl.c:5998 src/vbox/vbox_tmpl.c:6103
+#: src/vbox/vbox_tmpl.c:6154 src/vbox/vbox_tmpl.c:6243
+#: src/vbox/vbox_tmpl.c:6275 src/vbox/vbox_tmpl.c:6317
+#: src/vbox/vbox_tmpl.c:6381 src/vbox/vbox_tmpl.c:6549
+#: src/vbox/vbox_tmpl.c:6707
 msgid "no domain with matching UUID"
 msgstr "没有符合 UUID 的域"
 
-#: src/vbox/vbox_tmpl.c:1606
+#: src/vbox/vbox_tmpl.c:1541
 msgid "error while suspending the domain"
 msgstr "挂起域时出错"
 
-#: src/vbox/vbox_tmpl.c:1612
+#: src/vbox/vbox_tmpl.c:1547
 msgid "machine not in running state to suspend it"
 msgstr "及其没有以挂起的方式运行"
 
-#: src/vbox/vbox_tmpl.c:1658
+#: src/vbox/vbox_tmpl.c:1593
 msgid "error while resuming the domain"
 msgstr "恢复域时出错"
 
-#: src/vbox/vbox_tmpl.c:1664
+#: src/vbox/vbox_tmpl.c:1599
 msgid "machine not paused, so can't resume it"
 msgstr "机器没有暂挂起，因此无法恢复。"
 
-#: src/vbox/vbox_tmpl.c:1704
+#: src/vbox/vbox_tmpl.c:1636
 msgid "machine paused, so can't power it down"
 msgstr "机器已挂起，因此无法关闭。"
 
-#: src/vbox/vbox_tmpl.c:1708 src/vbox/vbox_tmpl.c:1813
+#: src/vbox/vbox_tmpl.c:1640 src/vbox/vbox_tmpl.c:1740
 msgid "machine already powered down"
 msgstr "机器已关闭"
 
-#: src/vbox/vbox_tmpl.c:1771
+#: src/vbox/vbox_tmpl.c:1698
 msgid "machine not running, so can't reboot it"
 msgstr "机器没有运行，因此无法重启。"
 
-#: src/vbox/vbox_tmpl.c:1887
+#: src/vbox/vbox_tmpl.c:1816
 msgid "memory size can't be changed unless domain is powered down"
 msgstr "域没有关机就无法更改内存大小"
 
-#: src/vbox/vbox_tmpl.c:1903
+#: src/vbox/vbox_tmpl.c:1832 src/vbox/vbox_tmpl.c:5047
 #, c-format
 msgid "could not set the memory size of the domain to: %lu Kb, rc=%08x"
 msgstr "无法将该域的内存设定为：%lu Kb, rc=%08x"
 
-#: src/vbox/vbox_tmpl.c:2150
+#: src/vbox/vbox_tmpl.c:2106
 #, c-format
 msgid "could not set the number of cpus of the domain to: %u, rc=%08x"
 msgstr "无法将该域的 cpu 数设定为：%u, rc=%08x"
 
-#: src/vbox/vbox_tmpl.c:2161
+#: src/vbox/vbox_tmpl.c:2117
 #, c-format
 msgid "can't open session to the domain with id %d"
 msgstr "无法使用 id %d 在该域中打开会话"
 
-#: src/vbox/vbox_tmpl.c:2913
+#: src/vbox/vbox_tmpl.c:2770
 #, c-format
 msgid ""
 "Could not generate medium name for the disk at: controller instance:%u, "
 "port:%d, slot:%d"
 msgstr "无法在此为磁盘生成中间名称：控制器实例：%u, 端口：%d, 插槽：%d"
 
-#: src/vbox/vbox_tmpl.c:3458
+#: src/vbox/vbox_tmpl.c:3410
 #, c-format
 msgid "Could not get list of Defined Domains, rc=%08x"
 msgstr "无法获取定义的域列表：rc=%08x"
 
-#: src/vbox/vbox_tmpl.c:3510
+#: src/vbox/vbox_tmpl.c:3460
 #, c-format
 msgid "Could not get number of Defined Domains, rc=%08x"
 msgstr "无法获取定义的域数量：rc=%08x"
 
-#: src/vbox/vbox_tmpl.c:3665
+#: src/vbox/vbox_tmpl.c:3630
 msgid "OpenRemoteSession/LaunchVMProcess failed, domain can't be started"
 msgstr "OpenRemoteSession/LaunchVMProcess 失败，无法启用域。"
 
-#: src/vbox/vbox_tmpl.c:3712
+#: src/vbox/vbox_tmpl.c:3677
 msgid "Error while reading the domain name"
 msgstr "读取域名时出错"
 
-#: src/vbox/vbox_tmpl.c:3749
+#: src/vbox/vbox_tmpl.c:3714
 msgid "machine is not in poweroff|saved|aborted state, so couldn't start it"
 msgstr "机器没有处于 poweroff|saved|aborted 状态，因此无法启动。"
 
-#: src/vbox/vbox_tmpl.c:3884 src/vbox/vbox_tmpl.c:5495
+#: src/vbox/vbox_tmpl.c:3847 src/vbox/vbox_tmpl.c:5398
 #, c-format
 msgid "can't get the uuid of the file to be attached to cdrom: %s, rc=%08x"
 msgstr "无法获取附加到 cdrom 的 uuid：%s, rc=%08x"
 
-#: src/vbox/vbox_tmpl.c:3891 src/vbox/vbox_tmpl.c:5504
+#: src/vbox/vbox_tmpl.c:3854 src/vbox/vbox_tmpl.c:5407
 #, c-format
 msgid "could not attach the file to cdrom: %s, rc=%08x"
 msgstr "无法将文件附加到 cdrom: %s, rc=%08x"
 
-#: src/vbox/vbox_tmpl.c:3948
+#: src/vbox/vbox_tmpl.c:3911
 #, c-format
 msgid ""
 "can't get the uuid of the file to be attached as harddisk: %s, rc=%08x"
 msgstr "无法获取附加到硬盘的文件 uuid：%s, rc=%08x"
 
-#: src/vbox/vbox_tmpl.c:3995
+#: src/vbox/vbox_tmpl.c:3957
 #, c-format
 msgid "could not attach the file as harddisk: %s, rc=%08x"
 msgstr "无法作为硬盘附加文件：%s, rc=%08x"
 
-#: src/vbox/vbox_tmpl.c:4041 src/vbox/vbox_tmpl.c:5548
+#: src/vbox/vbox_tmpl.c:4003 src/vbox/vbox_tmpl.c:5451
 #, c-format
 msgid ""
 "can't get the uuid of the file to be attached to floppy drive: %s, rc=%08x"
 msgstr "无法获取附加到软盘的文件 uuid：%s, rc=%08x"
 
-#: src/vbox/vbox_tmpl.c:4049 src/vbox/vbox_tmpl.c:5555
+#: src/vbox/vbox_tmpl.c:4011 src/vbox/vbox_tmpl.c:5458
 #, c-format
 msgid "could not attach the file to floppy drive: %s, rc=%08x"
 msgstr "无法作为软盘附加文件：%s, rc=%08x"
 
-#: src/vbox/vbox_tmpl.c:4233
+#: src/vbox/vbox_tmpl.c:4191
 #, c-format
 msgid ""
 "Failed to attach the following disk/dvd/floppy to the machine: %s, rc=%08x"
 msgstr "在机器中附加以下磁盘/dvd/软盘失败：%s, rc=%08x"
 
-#: src/vbox/vbox_tmpl.c:4243
+#: src/vbox/vbox_tmpl.c:4201
 #, c-format
 msgid ""
 "can't get the uuid of the file to be attached as harddisk/dvd/floppy: %s, "
 "rc=%08x"
 msgstr "无法获取作为硬盘/dvd/软盘附加的文件 uuid：%s, rc=%08x"
 
-#: src/vbox/vbox_tmpl.c:4284
+#: src/vbox/vbox_tmpl.c:4242
 #, c-format
 msgid ""
 "can't get the port/slot number of harddisk/dvd/floppy to be attached: %s, "
 "rc=%08x"
 msgstr "无法获取要附加的硬盘/dvd/软盘的端口/插槽号：%s, rc=%08x"
 
-#: src/vbox/vbox_tmpl.c:4308
+#: src/vbox/vbox_tmpl.c:4265
 #, c-format
 msgid "could not attach the file as harddisk/dvd/floppy: %s, rc=%08x"
 msgstr "无法作为硬盘/dvd/软盘附加该文件：%s, rc=%08x"
 
-#: src/vbox/vbox_tmpl.c:5129 src/vbox/vbox_tmpl.c:5200
+#: src/vbox/vbox_tmpl.c:5039 src/vbox/vbox_tmpl.c:5107
 #, c-format
 msgid "could not define a domain, rc=%08x"
 msgstr "无法定义域，rc=%08x"
 
-#: src/vbox/vbox_tmpl.c:5137
+#: src/vbox/vbox_tmpl.c:5141
 #, c-format
 msgid "could not set the memory size of the domain to: %llu Kb, rc=%08x"
 msgstr "无法将该域的内存大小设定为：%llu Kb, rc=%08x"
 
-#: src/vbox/vbox_tmpl.c:5149
+#: src/vbox/vbox_tmpl.c:5059
 #, c-format
 msgid "could not set the number of virtual CPUs to: %u, rc=%08x"
 msgstr "无法将虚拟 CPUs 数设定为：%u, rc=%08x"
 
-#: src/vbox/vbox_tmpl.c:5168
+#: src/vbox/vbox_tmpl.c:5077
 #, c-format
 msgid "could not change PAE status to: %s, rc=%08x"
 msgstr "无法将PAE 状态改为：%s, rc=%08x"
 
-#: src/vbox/vbox_tmpl.c:5170 src/vbox/vbox_tmpl.c:5182
-#: src/vbox/vbox_tmpl.c:5191
+#: src/vbox/vbox_tmpl.c:5079 src/vbox/vbox_tmpl.c:5090
+#: src/vbox/vbox_tmpl.c:5098
 msgid "Enabled"
 msgstr "启用"
 
-#: src/vbox/vbox_tmpl.c:5170 src/vbox/vbox_tmpl.c:5182
-#: src/vbox/vbox_tmpl.c:5191
+#: src/vbox/vbox_tmpl.c:5079 src/vbox/vbox_tmpl.c:5090
+#: src/vbox/vbox_tmpl.c:5098
 msgid "Disabled"
 msgstr "禁用"
 
-#: src/vbox/vbox_tmpl.c:5180
+#: src/vbox/vbox_tmpl.c:5088
 #, c-format
 msgid "could not change ACPI status to: %s, rc=%08x"
 msgstr "无法将 ACPI 状态改为：%s, rc=%08x"
 
-#: src/vbox/vbox_tmpl.c:5189
+#: src/vbox/vbox_tmpl.c:5096
 #, c-format
 msgid "could not change APIC status to: %s, rc=%08x"
 msgstr "无法将 APIC 状态改为：%s, rc=%08x"
 
-#: src/vbox/vbox_tmpl.c:5408
+#: src/vbox/vbox_tmpl.c:5303
 #, c-format
 msgid "could not delete the domain, rc=%08x"
 msgstr "无法删除域，rc=%08x"
 
-#: src/vbox/vbox_tmpl.c:5600
+#: src/vbox/vbox_tmpl.c:5503
 #, c-format
 msgid "could not attach shared folder '%s', rc=%08x"
 msgstr "无法附加到共享文件夹: %s, rc=%08x"
 
-#: src/vbox/vbox_tmpl.c:5712
+#: src/vbox/vbox_tmpl.c:5623
 #, c-format
 msgid "could not de-attach the mounted ISO, rc=%08x"
 msgstr "无法分离已挂账的 ISO, rc=%08x"
 
-#: src/vbox/vbox_tmpl.c:5733
+#: src/vbox/vbox_tmpl.c:5644
 #, c-format
 msgid "could not attach the file to floppy drive, rc=%08x"
 msgstr "无法将该文件附加到软盘，rc=%08x"
 
-#: src/vbox/vbox_tmpl.c:5768
+#: src/vbox/vbox_tmpl.c:5679
 #, c-format
 msgid "could not detach shared folder '%s', rc=%08x"
 msgstr "无法从共享文件夹中分离 '%s', rc=%08x"
 
-#: src/vbox/vbox_tmpl.c:5820 src/vbox/vbox_tmpl.c:6203
+#: src/vbox/vbox_tmpl.c:5731 src/vbox/vbox_tmpl.c:6116
 #, c-format
 msgid "could not get snapshot count for domain %s"
 msgstr "无法为域 %s 获取快照计数"
 
-#: src/vbox/vbox_tmpl.c:5838 src/vbox/vbox_tmpl.c:6262
+#: src/vbox/vbox_tmpl.c:5751 src/vbox/vbox_tmpl.c:6177
 #, c-format
 msgid "could not get root snapshot for domain %s"
 msgstr "无法为域 %s 获取根快照"
 
-#: src/vbox/vbox_tmpl.c:5851
+#: src/vbox/vbox_tmpl.c:5764
 #, c-format
 msgid "unexpected number of snapshots < %u"
 msgstr "意外的快照数 < %u"
 
-#: src/vbox/vbox_tmpl.c:5859 src/vbox/vbox_tmpl.c:6852
+#: src/vbox/vbox_tmpl.c:5772 src/vbox/vbox_tmpl.c:6671
 msgid "could not get children snapshots"
 msgstr "无法获取子快照"
 
-#: src/vbox/vbox_tmpl.c:5868
+#: src/vbox/vbox_tmpl.c:5781
 #, c-format
 msgid "unexpected number of snapshots > %u"
 msgstr "意外的快照数 > %u"
 
-#: src/vbox/vbox_tmpl.c:5914 src/vbox/vbox_tmpl.c:6282
+#: src/vbox/vbox_tmpl.c:5827 src/vbox/vbox_tmpl.c:6197
 msgid "could not get snapshot name"
 msgstr "无法获取快照名称"
 
-#: src/vbox/vbox_tmpl.c:5929
+#: src/vbox/vbox_tmpl.c:5842
 #, c-format
 msgid "domain %s has no snapshots with name %s"
 msgstr "域 %s 没有名为 %s 的快照"
 
-#: src/vbox/vbox_tmpl.c:5991 src/vbox/vbox_tmpl.c:6657
-#: src/vbox/vbox_tmpl.c:6757 src/vbox/vbox_tmpl.c:6899
+#: src/vbox/vbox_tmpl.c:5903 src/vbox/vbox_tmpl.c:6476
+#: src/vbox/vbox_tmpl.c:6576 src/vbox/vbox_tmpl.c:6718
 msgid "could not get domain state"
 msgstr "无法获得域状态"
 
-#: src/vbox/vbox_tmpl.c:6006 src/vbox/vbox_tmpl.c:6673
-#: src/vbox/vbox_tmpl.c:6922
+#: src/vbox/vbox_tmpl.c:5918 src/vbox/vbox_tmpl.c:6492
+#: src/vbox/vbox_tmpl.c:6741
 #, c-format
 msgid "could not open VirtualBox session with domain %s"
 msgstr "无法在域 %s 中打开 VirtualBox 会话"
 
-#: src/vbox/vbox_tmpl.c:6028 src/vbox/vbox_tmpl.c:6036
+#: src/vbox/vbox_tmpl.c:5940 src/vbox/vbox_tmpl.c:5948
 #, c-format
 msgid "could not take snapshot of domain %s"
 msgstr "无法提取域 %s 的快照"
 
-#: src/vbox/vbox_tmpl.c:6043 src/vbox/vbox_tmpl.c:6749
+#: src/vbox/vbox_tmpl.c:5955 src/vbox/vbox_tmpl.c:6568
 #, c-format
 msgid "could not get current snapshot of domain %s"
 msgstr "无法获取域 %s 的当前快照"
 
-#: src/vbox/vbox_tmpl.c:6101
+#: src/vbox/vbox_tmpl.c:6012
 #, c-format
 msgid "could not get description of snapshot %s"
 msgstr "无法获取快照 %s 的描述"
 
-#: src/vbox/vbox_tmpl.c:6118
+#: src/vbox/vbox_tmpl.c:6028
 #, c-format
 msgid "could not get creation time of snapshot %s"
 msgstr "无法获取快照 %s 的生成时间"
 
-#: src/vbox/vbox_tmpl.c:6128 src/vbox/vbox_tmpl.c:6411
+#: src/vbox/vbox_tmpl.c:6038 src/vbox/vbox_tmpl.c:6327
 #, c-format
 msgid "could not get parent of snapshot %s"
 msgstr "无法获取快照 %s 的上级快照"
 
-#: src/vbox/vbox_tmpl.c:6136 src/vbox/vbox_tmpl.c:6425
+#: src/vbox/vbox_tmpl.c:6046 src/vbox/vbox_tmpl.c:6341
 #, c-format
 msgid "could not get name of parent of snapshot %s"
 msgstr "无法获取快照 %s 的上级名称"
 
-#: src/vbox/vbox_tmpl.c:6152 src/vbox/vbox_tmpl.c:6741
+#: src/vbox/vbox_tmpl.c:6061 src/vbox/vbox_tmpl.c:6560
 #, c-format
 msgid "could not get online state of snapshot %s"
 msgstr "无法获取快照 %s 的在线状态"
 
-#: src/vbox/vbox_tmpl.c:6366 src/vbox/vbox_tmpl.c:6472
-#: src/vbox/vbox_tmpl.c:6536
+#: src/vbox/vbox_tmpl.c:6282 src/vbox/vbox_tmpl.c:6388
 msgid "could not get current snapshot"
 msgstr "无法获取当前快照"
 
-#: src/vbox/vbox_tmpl.c:6478
+#: src/vbox/vbox_tmpl.c:6394
 msgid "domain has no snapshots"
 msgstr "域没有快照"
 
-#: src/vbox/vbox_tmpl.c:6485 src/vbox/vbox_tmpl.c:6547
+#: src/vbox/vbox_tmpl.c:6401
 msgid "could not get current snapshot name"
 msgstr "无法获取当前快照名称"
 
-#: src/vbox/vbox_tmpl.c:6616 src/vbox/vbox_tmpl.c:6803
+#: src/vbox/vbox_tmpl.c:6435 src/vbox/vbox_tmpl.c:6622
 msgid "could not get snapshot UUID"
 msgstr "无法获取当前快照 UUID"
 
-#: src/vbox/vbox_tmpl.c:6623 src/vbox/vbox_tmpl.c:6685
-#: src/vbox/vbox_tmpl.c:6695
+#: src/vbox/vbox_tmpl.c:6442 src/vbox/vbox_tmpl.c:6504
+#: src/vbox/vbox_tmpl.c:6514
 #, c-format
 msgid "could not restore snapshot for domain %s"
 msgstr "无法为域 %s 保存快照"
 
-#: src/vbox/vbox_tmpl.c:6650
+#: src/vbox/vbox_tmpl.c:6469
 msgid "could not get domain UUID"
 msgstr "无法获取当前域 UUID"
 
-#: src/vbox/vbox_tmpl.c:6664
+#: src/vbox/vbox_tmpl.c:6483
 #, c-format
 msgid "domain %s is already running"
 msgstr "域 %s 已在运行中"
 
-#: src/vbox/vbox_tmpl.c:6682
+#: src/vbox/vbox_tmpl.c:6501
 msgid "cannot restore domain snapshot for running domain"
 msgstr "无法为运行中的域保存域快照"
 
-#: src/vbox/vbox_tmpl.c:6764
+#: src/vbox/vbox_tmpl.c:6583
 msgid "cannot revert snapshot of running domain"
 msgstr "无法转换运行中的域的快照"
 
-#: src/vbox/vbox_tmpl.c:6815
+#: src/vbox/vbox_tmpl.c:6634
 msgid "cannot delete domain snapshot for running domain"
 msgstr "无法删除运行中的域的快照"
 
-#: src/vbox/vbox_tmpl.c:6818 src/vbox/vbox_tmpl.c:6827
+#: src/vbox/vbox_tmpl.c:6637 src/vbox/vbox_tmpl.c:6646
 msgid "could not delete snapshot"
 msgstr "无法删除快照"
 
-#: src/vbox/vbox_tmpl.c:6913
+#: src/vbox/vbox_tmpl.c:6732
 msgid "cannot delete snapshots of running domain"
 msgstr "无法删除运行中的域的快照"
 
-#: src/vbox/vbox_tmpl.c:8383
+#: src/vbox/vbox_tmpl.c:8243
 #, c-format
 msgid "could not get number of volumes in the pool: %s, rc=%08x"
 msgstr "无法获取池中卷数：%s, rc=%08x"
 
-#: src/vbox/vbox_tmpl.c:8431
+#: src/vbox/vbox_tmpl.c:8295
 #, c-format
 msgid "could not get the volume list in the pool: %s, rc=%08x"
 msgstr "无法获取池中卷列表：%s, rc=%08x"
 
-#: src/vbox/vbox_tmpl.c:8513 src/vbox/vbox_tmpl.c:8758
-#: src/vbox/vbox_tmpl.c:8930 src/vbox/vbox_tmpl.c:9004
-#: src/vbox/vbox_tmpl.c:9113
+#: src/vbox/vbox_tmpl.c:8377 src/vbox/vbox_tmpl.c:8608
+#: src/vbox/vbox_tmpl.c:8777 src/vbox/vbox_tmpl.c:8847
+#: src/vbox/vbox_tmpl.c:8954
 #, c-format
 msgid "Could not parse UUID from '%s'"
 msgstr "无法解析 '%s' 的 UUID"
 
-#: src/vbox/vbox_tmpl.c:9190
+#: src/vbox/vbox_tmpl.c:9029
 msgid "unable to get monitor count"
 msgstr "无法获取监控程序计数"
 
-#: src/vbox/vbox_tmpl.c:9197
+#: src/vbox/vbox_tmpl.c:9035
 #, c-format
 msgid "screen ID higher than monitor count (%d)"
 msgstr "页面 ID 高于监控程序计数（%d）"
 
-#: src/vbox/vbox_tmpl.c:9243
+#: src/vbox/vbox_tmpl.c:9074
 msgid "unable to get screen resolution"
 msgstr "无法获取屏幕分辨率"
 
-#: src/vbox/vbox_tmpl.c:9253
+#: src/vbox/vbox_tmpl.c:9084
 msgid "failed to take screenshot"
 msgstr "截屏失败"
 
-#: src/vbox/vbox_tmpl.c:9259
+#: src/vbox/vbox_tmpl.c:9090
 #, c-format
 msgid "unable to write data to '%s'"
 msgstr "无法向 '%s' 写入数据"
 
-#: src/vbox/vbox_tmpl.c:9341
+#: src/vbox/vbox_tmpl.c:9345
 #, c-format
 msgid "Could not get list of domains, rc=%08x"
 msgstr "无法获取域列表，rc=%08x"
 
-#: src/vbox/vbox_tmpl.c:9375
+#: src/vbox/vbox_tmpl.c:9379
 msgid "could not get snapshot count for listed domains"
 msgstr "无法为列出的域获取快照计数"
 
@@ -25640,7 +25984,7 @@
 msgid "failed to parse %sversion"
 msgstr ""
 
-#: src/vmware/vmware_conf.c:252
+#: src/vmware/vmware_conf.c:262
 msgid "version parsing error"
 msgstr "版本解析出错"
 
@@ -25648,30 +25992,30 @@
 msgid "invalid driver type for version detection"
 msgstr ""
 
-#: src/vmware/vmware_conf.c:346
+#: src/vmware/vmware_conf.c:307
 #, c-format
 msgid "path '%s' doesn't reference a file"
 msgstr "路径 '%s' 不指向某个文件"
 
-#: src/vmware/vmware_conf.c:457
+#: src/vmware/vmware_conf.c:423
 #, c-format
 msgid "file %s does not exist"
 msgstr "文件 %s 不存在"
 
-#: src/vmware/vmware_conf.c:469
+#: src/vmware/vmware_conf.c:435
 #, c-format
 msgid "failed to move file to %s "
 msgstr "移动文件 %s 失败 "
 
-#: src/vmware/vmware_conf.c:506
+#: src/vmware/vmware_conf.c:476
 msgid "unable to read vmware log file"
 msgstr "读取 vmware 日志文件失败"
 
-#: src/vmware/vmware_conf.c:512
+#: src/vmware/vmware_conf.c:482
 msgid "cannot find pid in vmware log file"
 msgstr "无法在 vmware 日志文件中找到 pid"
 
-#: src/vmware/vmware_conf.c:522
+#: src/vmware/vmware_conf.c:490
 msgid "cannot parse pid in vmware log file"
 msgstr "无法解析 vmware 日志文件中的 pid"
 
@@ -25696,179 +26040,179 @@
 msgid "unable to find valid requested VMware backend '%s'"
 msgstr ""
 
-#: src/vmware/vmware_driver.c:373 src/vmware/vmware_driver.c:655
+#: src/vmware/vmware_driver.c:278 src/vmware/vmware_driver.c:544
 #, c-format
 msgid "Failed to write vmx file '%s'"
 msgstr "写入 vmx 文件 '%s' 失败"
 
-#: src/vmware/vmware_driver.c:488 src/vmware/vmware_driver.c:537
+#: src/vmware/vmware_driver.c:376
 msgid ""
 "vmplayer does not support libvirt suspend/resume (vmware pause/unpause) "
 "operation "
 msgstr "vmplayer u支持 libvirt suspend/resume (vmware pause/unpause) 操作 "
 
-#: src/vmware/vmware_driver.c:556
+#: src/vmware/vmware_driver.c:444
 msgid "domain is not in suspend state"
 msgstr "域不是挂起状态"
 
-#: src/vmx/vmx.c:622
+#: src/vmx/vmx.c:588
 #, c-format
 msgid "libxml2 doesn't handle %s encoding"
 msgstr "libxml2 无法处理 %s 代码"
 
-#: src/vmx/vmx.c:631
+#: src/vmx/vmx.c:597
 #, c-format
 msgid "Could not convert from %s to UTF-8 encoding"
 msgstr "无法从 %s 转换为 UTF-8 代码"
 
-#: src/vmx/vmx.c:663 src/vmx/vmx.c:679 src/vmx/vmx.c:701 src/vmx/vmx.c:717
-#: src/vmx/vmx.c:747 src/vmx/vmx.c:758 src/vmx/vmx.c:796 src/vmx/vmx.c:807
+#: src/vmx/vmx.c:629 src/vmx/vmx.c:645 src/vmx/vmx.c:674 src/vmx/vmx.c:690
+#: src/vmx/vmx.c:720 src/vmx/vmx.c:731 src/vmx/vmx.c:769 src/vmx/vmx.c:780
 #, c-format
 msgid "Missing essential config entry '%s'"
 msgstr "缺少关键配置条目 '%s'"
 
-#: src/vmx/vmx.c:669 src/vmx/vmx.c:708 src/vmx/vmx.c:773 src/vmx/vmx.c:824
+#: src/vmx/vmx.c:635 src/vmx/vmx.c:681 src/vmx/vmx.c:746 src/vmx/vmx.c:797
 #, c-format
 msgid "Config entry '%s' must be a string"
 msgstr "配置条目 '%s' 必须是字符串"
 
-#: src/vmx/vmx.c:767
+#: src/vmx/vmx.c:740
 #, c-format
 msgid "Config entry '%s' must represent an integer value"
 msgstr "配置条目 '%s' 必须代表整数值"
 
-#: src/vmx/vmx.c:818
+#: src/vmx/vmx.c:791
 #, c-format
 msgid "Config entry '%s' must represent a boolean value (true|false)"
 msgstr "配置条目 '%s' 必须代表布尔值（true|false）"
 
-#: src/vmx/vmx.c:840
+#: src/vmx/vmx.c:813
 msgid ""
 "Expecting domain XML attribute 'dev' of entry 'devices/disk/target' to start "
 "with 'sd'"
 msgstr "条目 'devices/disk/target' 的域 XML 属性 'dev' 应以 'sd' 开头"
 
-#: src/vmx/vmx.c:849 src/vmx/vmx.c:889 src/vmx/vmx.c:924
+#: src/vmx/vmx.c:822 src/vmx/vmx.c:862 src/vmx/vmx.c:897
 #, c-format
 msgid "Could not parse valid disk index from '%s'"
 msgstr "无法在 '%s' 中解析有效磁盘索引"
 
-#: src/vmx/vmx.c:856
+#: src/vmx/vmx.c:829
 #, c-format
 msgid "SCSI disk index (parsed from '%s') is too large"
 msgstr "SCSI 磁盘索引 (从 '%s' 中解析获得) 太大"
 
-#: src/vmx/vmx.c:880
+#: src/vmx/vmx.c:853
 msgid ""
 "Expecting domain XML attribute 'dev' of entry 'devices/disk/target' to start "
 "with 'hd'"
 msgstr "条目 'devices/disk/target' 的域 XML 属性 'dev' 应以 'hd' 开头"
 
-#: src/vmx/vmx.c:896
+#: src/vmx/vmx.c:869
 #, c-format
 msgid "IDE disk index (parsed from '%s') is too large"
 msgstr "IDE 磁盘索引 (从 '%s' 中解析获得) 太大"
 
-#: src/vmx/vmx.c:915
+#: src/vmx/vmx.c:888
 msgid ""
 "Expecting domain XML attribute 'dev' of entry 'devices/disk/target' to start "
 "with 'fd'"
 msgstr "条目 'devices/disk/target' 的域 XML 属性 'dev' 应以 'fd' 开头"
 
-#: src/vmx/vmx.c:931
+#: src/vmx/vmx.c:904
 #, c-format
 msgid "Floppy disk index (parsed from '%s') is too large"
 msgstr "软盘索引 (从 '%s' 中解析获得) 太大"
 
-#: src/vmx/vmx.c:952
+#: src/vmx/vmx.c:925
 #, c-format
 msgid "Unsupported disk address type '%s'"
 msgstr "不支持的磁盘地址类型 '%s'"
 
-#: src/vmx/vmx.c:964
+#: src/vmx/vmx.c:937
 msgid "Could not verify disk address"
 msgstr "无法确认磁盘地址"
 
-#: src/vmx/vmx.c:972
+#: src/vmx/vmx.c:945
 #, c-format
 msgid "Disk address %d:%d:%d doesn't match target device '%s'"
 msgstr "磁盘地址 %d:%d:%d 与目标设备 '%s' 不匹配"
 
-#: src/vmx/vmx.c:981 src/vmx/vmx.c:1657 src/vmx/vmx.c:1878 src/vmx/vmx.c:2003
+#: src/vmx/vmx.c:954 src/vmx/vmx.c:1643 src/vmx/vmx.c:1844 src/vmx/vmx.c:1964
 #, c-format
 msgid "SCSI controller index %d out of [0..3] range"
 msgstr "SCSI 控制器索引 %d 超出 [0..3] 范围"
 
-#: src/vmx/vmx.c:988
+#: src/vmx/vmx.c:961
 #, c-format
 msgid "SCSI bus index %d out of [0] range"
 msgstr "SCSI 总线索引 %d 超出 [0] 范围"
 
-#: src/vmx/vmx.c:995 src/vmx/vmx.c:2010
+#: src/vmx/vmx.c:968 src/vmx/vmx.c:1971
 #, c-format
 msgid "SCSI unit index %d out of [0..6,8..15] range"
 msgstr "SCSI 单位索引 %d 超出 [0..6,8..15] 范围"
 
-#: src/vmx/vmx.c:1002
+#: src/vmx/vmx.c:975
 #, c-format
 msgid "IDE controller index %d out of [0] range"
 msgstr "IDE 控制器索引 %d 超出 [0] 范围"
 
-#: src/vmx/vmx.c:1009 src/vmx/vmx.c:2028
+#: src/vmx/vmx.c:982 src/vmx/vmx.c:1991
 #, c-format
 msgid "IDE bus index %d out of [0..1] range"
 msgstr "IDE 总线索引 %d 超出 [0..1] 范围"
 
-#: src/vmx/vmx.c:1016 src/vmx/vmx.c:2035
+#: src/vmx/vmx.c:989 src/vmx/vmx.c:1998
 #, c-format
 msgid "IDE unit index %d out of [0..1] range"
 msgstr "IDE 单位索引 %d 超出 [0..1] 范围"
 
-#: src/vmx/vmx.c:1023 src/vmx/vmx.c:2058
+#: src/vmx/vmx.c:996 src/vmx/vmx.c:2023
 #, c-format
 msgid "FDC controller index %d out of [0] range"
 msgstr "FDC 控制器索引 %d 超出 [0] 范围"
 
-#: src/vmx/vmx.c:1030
+#: src/vmx/vmx.c:1003
 #, c-format
 msgid "FDC bus index %d out of [0] range"
 msgstr "FDC 总线索引 %d 超出 [0] 范围"
 
-#: src/vmx/vmx.c:1037 src/vmx/vmx.c:2065
+#: src/vmx/vmx.c:1010 src/vmx/vmx.c:2030
 #, c-format
 msgid "FDC unit index %d out of [0..1] range"
 msgstr "FDC 单位索引 %d 超出 [0..1] 范围"
 
-#: src/vmx/vmx.c:1043
+#: src/vmx/vmx.c:1016
 #, c-format
 msgid "Unsupported bus type '%s'"
 msgstr "不支持的总线类型 '%s'"
 
-#: src/vmx/vmx.c:1076
+#: src/vmx/vmx.c:1048
 #, c-format
 msgid "Unknown driver name '%s'"
 msgstr "未知驱动器名称 '%s'"
 
-#: src/vmx/vmx.c:1089
+#: src/vmx/vmx.c:1061
 #, c-format
 msgid "Missing SCSI controller for index %d"
 msgstr "缺少索引 %d 的 SCSI 控制器"
 
-#: src/vmx/vmx.c:1098
+#: src/vmx/vmx.c:1070
 #, c-format
 msgid ""
 "Inconsistent SCSI controller model ('%s' is not '%s') for SCSI controller "
 "index %d"
 msgstr "SCSI 控制器索引 %s 不一致的 SCSI 控制器型号（'%s' 不是 '%d'）"
 
-#: src/vmx/vmx.c:1176
+#: src/vmx/vmx.c:1150
 #, c-format
 msgid ""
 "Disks on SCSI controller %d have inconsistent controller models, cannot "
 "autodetect model"
 msgstr "SCSI 控制器 %d 中的磁盘有不一致的控制器型号，无法自动探测型号。"
 
-#: src/vmx/vmx.c:1192
+#: src/vmx/vmx.c:1166
 #, c-format
 msgid ""
 "Expecting domain XML attribute 'model' of entry 'controller' to be "
@@ -25877,11 +26221,11 @@
 "条目 'controller' 的 XML 属性 'model' 应为 'buslogic' 或者 'lsilogic' 或者 'lsisas1068' "
 "或者 'vmpvscsi' 但却显示为 '%s'"
 
-#: src/vmx/vmx.c:1249
+#: src/vmx/vmx.c:1218
 msgid "virVMXContext has no parseFileName function set"
 msgstr "virVMXContext 中没有设定 parseFileName 功能"
 
-#: src/vmx/vmx.c:1300
+#: src/vmx/vmx.c:1271
 #, c-format
 msgid "Expecting VMX entry 'config.version' to be 8 but found %lld"
 msgstr "VMX 条目 'config.version' 应为 8，但却显示为 %lld。"
@@ -25892,41 +26236,41 @@
 "Expecting VMX entry 'virtualHW.version' to be 4, 7, 8 or 9 but found %lld"
 msgstr ""
 
-#: src/vmx/vmx.c:1335
+#: src/vmx/vmx.c:1306
 msgid "VMX entry 'name' contains invalid escape sequence"
 msgstr "VMX 条目 ‘name' 包含无效换码顺序"
 
-#: src/vmx/vmx.c:1349
+#: src/vmx/vmx.c:1320
 msgid "VMX entry 'annotation' contains invalid escape sequence"
 msgstr "VMX 条目 ‘annotation' 包含无效换码顺序"
 
-#: src/vmx/vmx.c:1362
+#: src/vmx/vmx.c:1333
 #, c-format
 msgid ""
 "Expecting VMX entry 'memsize' to be an unsigned integer (multiple of 4) but "
 "found %lld"
 msgstr "VMX 条目 'memsize' 应为一个未分配的整数（4 的倍数）但却显示为 %lld"
 
-#: src/vmx/vmx.c:1408
+#: src/vmx/vmx.c:1379
 #, c-format
 msgid ""
 "Expecting VMX entry 'numvcpus' to be an unsigned integer (1 or a multiple of "
 "2) but found %lld"
 msgstr "VMX 条目 'numvcpus' 应为一个未分配的整数（1 或者 2  的倍数）但却显示为 %lld"
 
-#: src/vmx/vmx.c:1439 src/vmx/vmx.c:1467
+#: src/vmx/vmx.c:1411 src/vmx/vmx.c:1439
 #, c-format
 msgid ""
 "Expecting VMX entry 'sched.cpu.affinity' to be a comma separated list of "
 "unsigned integers but found '%s'"
 msgstr "VMX 条目 'sched.cpu.affinity' 应为用逗号分开的列表但却显示为 '%s'"
 
-#: src/vmx/vmx.c:1447
+#: src/vmx/vmx.c:1419
 #, c-format
 msgid "VMX entry 'sched.cpu.affinity' contains a %d, this value is too large"
 msgstr "VMX 条目 'sched.cpu.affinity' 包含一个 %d，这个数值太大。"
 
-#: src/vmx/vmx.c:1478
+#: src/vmx/vmx.c:1450
 #, c-format
 msgid ""
 "Expecting VMX entry 'sched.cpu.affinity' to contain at least as many values "
@@ -25934,7 +26278,7 @@
 msgstr ""
 "VMX 条目 'sched.cpu.affinity' 应至少包含与'numvcpus' (%lld) 相同的数值，但却只有 %d 个数值。"
 
-#: src/vmx/vmx.c:1502
+#: src/vmx/vmx.c:1474
 #, c-format
 msgid ""
 "Expecting VMX entry 'sched.cpu.shares' to be an unsigned integer or 'low', "
@@ -25942,11 +26286,11 @@
 msgstr ""
 "VMX 条目 'sched.cpu.shares' 应为一个未分配的证书，或者 'low', 'normal' 或者 'high' 但却显示为 '%s'。"
 
-#: src/vmx/vmx.c:1649
+#: src/vmx/vmx.c:1634
 msgid "Could not add controllers"
 msgstr "无法添加控制器"
 
-#: src/vmx/vmx.c:1916
+#: src/vmx/vmx.c:1882
 #, c-format
 msgid ""
 "Expecting VMX entry '%s' to be 'buslogic' or 'lsilogic' or 'lsisas1068' or "
@@ -25955,18 +26299,18 @@
 "VMX 条目 '%s'应为 'buslogic' 或者 'lsilogic' 或者 'lsisas1068' 或者 'pvscsi' ，但却显示为 "
 "'%s'。"
 
-#: src/vmx/vmx.c:2049 src/vmx/vmx.c:2080
+#: src/vmx/vmx.c:2014 src/vmx/vmx.c:2047
 #, c-format
 msgid "Unsupported bus type '%s' for device type '%s'"
 msgstr "设备类型 '%s' 不支持的总线类型 '%s'"
 
-#: src/vmx/vmx.c:2165
+#: src/vmx/vmx.c:2126
 #, c-format
 msgid ""
 "Expecting VMX entry '%s' to be 'scsi-hardDisk' or 'disk' but found '%s'"
 msgstr "VMX 条目 '%s' 应为 'scsi-hardDisk' 或者 'disk'，但却显示 '%s'。"
 
-#: src/vmx/vmx.c:2173
+#: src/vmx/vmx.c:2134
 #, c-format
 msgid ""
 "Expecting VMX entry '%s' to be 'ata-hardDisk' or 'disk' but found '%s'"
@@ -25978,34 +26322,34 @@
 "Invalid or not yet handled value '%s' for VMX entry '%s' for device type '%s'"
 msgstr ""
 
-#: src/vmx/vmx.c:2214
+#: src/vmx/vmx.c:2169
 #, c-format
 msgid "Expecting VMX entry '%s' to be 'cdrom-image' but found '%s'"
 msgstr "VMX 条目 '%s' 应为  'cdrom-image' 但却显示为 '%s'"
 
-#: src/vmx/vmx.c:2289
+#: src/vmx/vmx.c:2236
 #, c-format
 msgid "Could not assign address to disk '%s'"
 msgstr "无法为磁盘 '%s' 分配地址"
 
-#: src/vmx/vmx.c:2463 src/vmx/vmx.c:3612
+#: src/vmx/vmx.c:2309 src/vmx/vmx.c:3501
 #, c-format
 msgid "Ethernet controller index %d out of [0..3] range"
 msgstr "以太网控制器索引 %d 超出范围 [0..3]"
 
-#: src/vmx/vmx.c:2520 src/vmx/vmx.c:2530
+#: src/vmx/vmx.c:2368 src/vmx/vmx.c:2378
 #, c-format
 msgid "Expecting VMX entry '%s' to be MAC address but found '%s'"
 msgstr "VMX 条目 '%s' 应为 MAC 地址但却显示为 '%s'"
 
-#: src/vmx/vmx.c:2537
+#: src/vmx/vmx.c:2385
 #, c-format
 msgid ""
 "Expecting VMX entry '%s' to be 'generated' or 'static' or 'vpx' but found "
 "'%s'"
 msgstr "VMX 条目 '%s' 应为 'generated' 或者 'static' 或者 'vpx' 但却显示为 '%s'"
 
-#: src/vmx/vmx.c:2554
+#: src/vmx/vmx.c:2402
 #, c-format
 msgid ""
 "Expecting VMX entry '%s' to be 'vlance' or 'vmxnet' or 'vmxnet3' or 'e1000' "
@@ -26013,103 +26357,103 @@
 msgstr ""
 "VMX 条目 '%s' 应为 'vlance' 或者 'vmxnet' 或者 'vmxnet3' 或者 'e1000' 但却显示为 '%s'"
 
-#: src/vmx/vmx.c:2597
+#: src/vmx/vmx.c:2446 src/vmx/vmx.c:2452
 #, c-format
 msgid "No yet handled value '%s' for VMX entry '%s'"
 msgstr "VMX 条目 '%s' 尚未处理的值 '%s'"
 
-#: src/vmx/vmx.c:2616
+#: src/vmx/vmx.c:2466
 #, c-format
 msgid "Invalid value '%s' for VMX entry '%s'"
 msgstr "VMX 条目 '%s' 无效值 '%s'"
 
-#: src/vmx/vmx.c:2681 src/vmx/vmx.c:3720
+#: src/vmx/vmx.c:2530 src/vmx/vmx.c:3603
 #, c-format
 msgid "Serial port index %d out of [0..3] range"
 msgstr "串口索引 %d 超出范围 [0..3]"
 
-#: src/vmx/vmx.c:2765
+#: src/vmx/vmx.c:2620
 #, c-format
 msgid "VMX entry '%s' doesn't contain a port part"
 msgstr "VMX 条目 '%s' 不包含端口部分"
 
-#: src/vmx/vmx.c:2796
+#: src/vmx/vmx.c:2657
 #, c-format
 msgid "VMX entry '%s' contains unsupported scheme '%s'"
 msgstr "VMX 条目 '%s' 包含不支持的方案 '%s'"
 
-#: src/vmx/vmx.c:2807
+#: src/vmx/vmx.c:2668
 #, c-format
 msgid "Expecting VMX entry '%s' to be 'server' or 'client' but found '%s'"
 msgstr "VMX 条目 '%s' 应为 'server' 或者 'client'但却显示为 '%s'"
 
-#: src/vmx/vmx.c:2813
+#: src/vmx/vmx.c:2674
 #, c-format
 msgid ""
 "Expecting VMX entry '%s' to be 'device', 'file' or 'pipe' or 'network' but "
 "found '%s'"
 msgstr "VMX 条目 '%s' 应为 'device', 'file' 或者 'pipe' 或者 'network' 但却显示为 '%s'"
 
-#: src/vmx/vmx.c:2870 src/vmx/vmx.c:3826
+#: src/vmx/vmx.c:2731 src/vmx/vmx.c:3709
 #, c-format
 msgid "Parallel port index %d out of [0..2] range"
 msgstr "并口索引 %d 超出范围 [0..2]"
 
-#: src/vmx/vmx.c:2930
+#: src/vmx/vmx.c:2793
 #, c-format
 msgid "Expecting VMX entry '%s' to be 'device' or 'file' but found '%s'"
 msgstr "VMX 条目 '%s' 应为 'device' 或者 'file' 但却显示为 '%s'"
 
-#: src/vmx/vmx.c:3019
+#: src/vmx/vmx.c:2884
 msgid "virVMXContext has no formatFileName function set"
 msgstr "virVMXContext 没有设定 formatFileName 功能"
 
-#: src/vmx/vmx.c:3027
+#: src/vmx/vmx.c:2892
 #, c-format
 msgid "Expecting virt type to be '%s' but found '%s'"
 msgstr "virt 类型应为 '%s' 但却显示为 '%s'"
 
-#: src/vmx/vmx.c:3050
+#: src/vmx/vmx.c:2915
 #, c-format
 msgid ""
 "Expecting domain XML attribute 'arch' of entry 'os/type' to be 'i686' or "
 "'x86_64' but found '%s'"
 msgstr "条目  'os/type'  的域 XML 属性 'arch' 应为 'i686' 或者 'x86_64' 但却显示为 '%s'"
 
-#: src/vmx/vmx.c:3064
+#: src/vmx/vmx.c:2928
 #, c-format
 msgid "Unsupported SMBIOS mode '%s'"
 msgstr "不支持的 SMBIOS 模式 '%s'"
 
-#: src/vmx/vmx.c:3129
+#: src/vmx/vmx.c:2992
 msgid "No support for domain XML entry 'vcpu' attribute 'current'"
 msgstr "不支持域 XML 条目 'vcpu' 属性 'current'"
 
-#: src/vmx/vmx.c:3135
+#: src/vmx/vmx.c:2998
 #, c-format
 msgid ""
 "Expecting domain XML entry 'vcpu' to be an unsigned integer (1 or a multiple "
 "of 2) but found %d"
 msgstr "域 XML 条目 'vcpu' 应为未分配的证书 (1 或者 2 的倍数) ，但得到的却是 %d。"
 
-#: src/vmx/vmx.c:3157
+#: src/vmx/vmx.c:3020
 #, c-format
 msgid ""
 "Expecting domain XML attribute 'cpuset' of entry 'vcpu' to contain at least "
 "%d CPU(s)"
 msgstr "域条目 'vcpu' 的 XML 属性 'cpuset' 应至少包含 %d 个CPU"
 
-#: src/vmx/vmx.c:3204
+#: src/vmx/vmx.c:3068
 #, c-format
 msgid "Unsupported graphics type '%s'"
 msgstr "不支持的图形类型 '%s'"
 
-#: src/vmx/vmx.c:3256
+#: src/vmx/vmx.c:3125
 #, c-format
 msgid "Unsupported disk device type '%s'"
 msgstr "不支持的磁盘设备类型 '%s'"
 
-#: src/vmx/vmx.c:3298
+#: src/vmx/vmx.c:3158
 msgid "No support for multiple video devices"
 msgstr "不支持多个视频设备"
 
@@ -26138,12 +26482,12 @@
 msgid "Image file for %s %s '%s' has unsupported suffix, expecting '%s'"
 msgstr ""
 
-#: src/vmx/vmx.c:3507
+#: src/vmx/vmx.c:3330
 #, c-format
 msgid "%s harddisk '%s' has unsupported cache mode '%s'"
 msgstr "%s 硬盘 '%s' 有不支持缓存模式 '%s'"
 
-#: src/vmx/vmx.c:3565
+#: src/vmx/vmx.c:3479
 #, c-format
 msgid "Floppy '%s' has unsupported type '%s', expecting '%s' or '%s'"
 msgstr "软盘 '%s' 有不支持的后类型 '%s' ，应为 '%s' 或者 '%s'。"
@@ -26153,7 +26497,7 @@
 msgid "Only '%s' filesystem type is supported"
 msgstr "只支持 '%s' 文件系统类型"
 
-#: src/vmx/vmx.c:3627
+#: src/vmx/vmx.c:3516
 #, c-format
 msgid ""
 "Expecting domain XML entry 'devices/interface/model' to be 'vlance' or "
@@ -26162,72 +26506,72 @@
 "XML 条目 'devices/interface/model' 应为 'vlance' 或者 'vmxnet' 或者 'vmxnet2' 或者 "
 "'vmxnet3' 或者 'e1000' 但却显示为 '%s'"
 
-#: src/vmx/vmx.c:3669
+#: src/vmx/vmx.c:3552
 #, c-format
 msgid "Unsupported net type '%s'"
 msgstr "不支持的网络类型 '%s'"
 
-#: src/vmx/vmx.c:3785
+#: src/vmx/vmx.c:3668
 #, c-format
 msgid "Unsupported character device TCP protocol '%s'"
 msgstr "不支持的字符设备 TCP 协议 '%s'"
 
-#: src/vmx/vmx.c:3803 src/vmx/vmx.c:3861
+#: src/vmx/vmx.c:3686 src/vmx/vmx.c:3744
 #, c-format
 msgid "Unsupported character device type '%s'"
 msgstr "不支持的字符设备类型 '%s'"
 
-#: src/vmx/vmx.c:3878
+#: src/vmx/vmx.c:3761
 #, c-format
 msgid "Unsupported video device type '%s'"
 msgstr "不支持的视频设备类型 '%s'"
 
-#: src/vmx/vmx.c:3891
+#: src/vmx/vmx.c:3774
 msgid "Multi-head video devices are unsupported"
 msgstr "不支持多头视频设备"
 
-#: src/xen/block_stats.c:184
+#: src/xen/block_stats.c:176
 #, c-format
 msgid "Failed to read any block statistics for domain %d"
 msgstr "读取域 %d 的任意块统计数据失败"
 
-#: src/xen/block_stats.c:198
+#: src/xen/block_stats.c:190
 #, c-format
 msgid "Frontend block device not connected for domain %d"
 msgstr "前段块设备没有与域 %d 连接"
 
-#: src/xen/block_stats.c:209
+#: src/xen/block_stats.c:201
 #, c-format
 msgid "stats->rd_bytes would overflow 64 bit counter for domain %d"
 msgstr "stats->rd_bytes 会在域 %d 中溢出 64 位计数器"
 
-#: src/xen/block_stats.c:218
+#: src/xen/block_stats.c:210
 #, c-format
 msgid "stats->wr_bytes would overflow 64 bit counter for domain %d"
 msgstr "stats->wr_bytes 会在域 %d 中溢出 64 位计数器"
 
-#: src/xen/block_stats.c:336
+#: src/xen/block_stats.c:330
 #, c-format
 msgid ""
 "invalid path, device names must be in the range sda[1-15] - sdiv[1-15] for "
 "domain %d"
 msgstr "无效路径，域 %d 的设备名称必须在 sda[1-15] - sdiv[1-15] 范围内"
 
-#: src/xen/block_stats.c:340
+#: src/xen/block_stats.c:334
 #, c-format
 msgid ""
 "invalid path, device names must be in the range hda[1-63] - hdt[1-63] for "
 "domain %d"
 msgstr "无效路径，域 %d 的设备名称必须在 hda[1-63] - hdt[1-63] 范围内"
 
-#: src/xen/block_stats.c:344
+#: src/xen/block_stats.c:338
 #, c-format
 msgid ""
 "invalid path, device names must be in the range xvda[1-15] - xvdiz[1-15] for "
 "domain %d"
 msgstr "无效路径，域 %d 的设备名称必须在 xvda[1-15] - xvdiz[1-15] 范围内"
 
-#: src/xen/block_stats.c:348
+#: src/xen/block_stats.c:342
 #, c-format
 msgid "unsupported path, use xvdN, hdN, or sdN for domain %d"
 msgstr "不支持的路径，在域 %d 中使用 xvdN, hdN, 或者 sdN。"
@@ -26250,12 +26594,12 @@
 msgid "Cannot change scheduler parameters"
 msgstr "无法更改调度程序参数"
 
-#: src/xen/xen_driver.c:2584
+#: src/xen/xen_driver.c:2080
 #, c-format
 msgid "Device %s has been assigned to guest %d"
 msgstr "已将设备 %s 分配给虚拟机 %d"
 
-#: src/xen/xen_driver.c:2658
+#: src/xen/xen_driver.c:2154
 msgid "cannot find default console device"
 msgstr "无法找到默认控制台设备"
 
@@ -26280,7 +26624,8 @@
 msgid "unsupported in dom interface < 5"
 msgstr "在 dom interface < 5 中部支持"
 
-#: src/xen/xen_hypervisor.c:1262 src/xen/xend_internal.c:3051
+#: src/nodeinfo.c:417 src/xen/xen_hypervisor.c:1270
+#: src/xen/xend_internal.c:3609
 msgid "Invalid parameter count"
 msgstr "无效参数计数"
 
@@ -26289,12 +26634,12 @@
 msgid "Unknown scheduler %d"
 msgstr "未知调度程序 %d"
 
-#: src/xen/xen_hypervisor.c:1386
+#: src/xen/xen_hypervisor.c:1409
 #, c-format
 msgid "Credit scheduler weight parameter (%d) is out of range (1-65535)"
 msgstr "信用调度程序加权参数 (%d) 超出范围 （1-65535）"
 
-#: src/xen/xen_hypervisor.c:1395
+#: src/xen/xen_hypervisor.c:1418
 #, c-format
 msgid "Credit scheduler cap parameter (%d) is out of range (0-65534)"
 msgstr "信用调度程序 cap 参数（%d）超出范围（0-65534）"
@@ -26316,17 +26661,17 @@
 msgid "Unable to issue hypervisor ioctl %lu"
 msgstr "无法启动 hypervisor ioctl %lu"
 
-#: src/xen/xen_hypervisor.c:2247
+#: src/xen/xen_hypervisor.c:2444
 msgid "could not read CPU flags"
 msgstr "无法读取 CPU 标签"
 
-#: src/xen/xen_hypervisor.c:2510 src/xen/xen_hypervisor.c:2521
+#: src/xen/xen_hypervisor.c:2725 src/xen/xen_hypervisor.c:2736
 #, c-format
 msgid "cannot read file %s"
 msgstr "无法读取文件 %s"
 
-#: src/xen/xen_hypervisor.c:2586 src/xen/xen_hypervisor.c:2592
-#: src/xen/xen_hypervisor.c:3054
+#: src/xen/xen_hypervisor.c:2921 src/xen/xen_hypervisor.c:2927
+#: src/xen/xen_hypervisor.c:3613
 msgid "cannot get domain details"
 msgstr "无法获取域详情"
 
@@ -26342,331 +26687,334 @@
 msgid "invalid cpumap_t size"
 msgstr "无效 cpumap_t size"
 
-#: src/xen/xen_hypervisor.c:3071 src/xen/xen_hypervisor.c:3079
+#: src/xen/xen_hypervisor.c:3630 src/xen/xen_hypervisor.c:3638
 msgid "cannot get VCPUs info"
 msgstr "无法获取 VCPU 信息"
 
-#: src/xen/xen_inotify.c:89 src/xen/xen_inotify.c:166
+#: src/xen/xen_inotify.c:95 src/xen/xen_inotify.c:171
 #, c-format
 msgid "parsing uuid %s"
 msgstr "正在解析 uuid %s"
 
-#: src/xen/xen_inotify.c:111
+#: src/xen/xen_inotify.c:120
 msgid "finding dom on config list"
 msgstr "正在 config 列表中查找 dom"
 
-#: src/xen/xen_inotify.c:202
+#: src/xen/xen_inotify.c:207
 msgid "Error looking up domain"
 msgstr "正在查找域"
 
-#: src/xen/xen_inotify.c:209 src/xen/xen_inotify.c:305
-#: src/xen/xen_inotify.c:312
+#: src/xen/xen_inotify.c:214 src/xen/xen_inotify.c:307
+#: src/xen/xen_inotify.c:314
 msgid "Error adding file to config cache"
 msgstr "在 config 缓存中添加文件时出错"
 
-#: src/xen/xen_inotify.c:255
+#: src/xen/xen_inotify.c:260
 msgid "conn, or private data is NULL"
 msgstr "conn 或者专用数据为 NULL"
 
-#: src/xen/xen_inotify.c:301 src/xen/xen_inotify.c:324
+#: src/xen/xen_inotify.c:303 src/xen/xen_inotify.c:326
 msgid "looking up dom"
 msgstr "查找 dom"
 
-#: src/xen/xen_inotify.c:369
+#: src/xen/xen_inotify.c:373
 #, c-format
 msgid "cannot open directory: %s"
 msgstr "无法打开目录：%s"
 
-#: src/xen/xen_inotify.c:385
+#: src/xen/xen_inotify.c:389
 msgid "Error adding file to config list"
 msgstr "在 config 列表中添加文件时出错"
 
-#: src/xen/xen_inotify.c:398
+#: src/xen/xen_inotify.c:402
 msgid "initializing inotify"
 msgstr "初始化 inotify"
 
-#: src/xen/xen_inotify.c:409
+#: src/xen/xen_inotify.c:413
 #, c-format
 msgid "adding watch on %s"
 msgstr "在 %s 中添加 watch"
 
-#: src/xen/xend_internal.c:95
+#: src/xen/xend_internal.c:93
 msgid "failed to create a socket"
 msgstr "生成套接字失败"
 
-#: src/xen/xend_internal.c:114
+#: src/xen/xend_internal.c:113
 msgid "failed to connect to xend"
 msgstr "连接到 xend 失败"
 
-#: src/xen/xend_internal.c:161
+#: src/xen/xend_internal.c:160
 msgid "failed to read from Xen Daemon"
 msgstr "从 Xen 守护进程读失败"
 
-#: src/xen/xend_internal.c:164
+#: src/xen/xend_internal.c:163
 msgid "failed to write to Xen Daemon"
 msgstr "写入 Xen 守护进程失败"
 
-#: src/xen/xend_internal.c:296
+#: src/xen/xend_internal.c:297
 msgid "failed to parse Xend response content length"
 msgstr ""
 
-#: src/xen/xend_internal.c:302
+#: src/xen/xend_internal.c:303
 msgid "failed to parse Xend response return code"
 msgstr ""
 
-#: src/xen/xend_internal.c:315
+#: src/xen/xend_internal.c:307
 #, c-format
 msgid "Xend returned HTTP Content-Length of %d, which exceeds maximum of %d"
 msgstr "Xend 返回的 HTTP 内容长度为%d，超过最大值 %d。"
 
-#: src/xen/xend_internal.c:372
+#: src/xen/xend_internal.c:367
 #, c-format
 msgid "%d status from xen daemon: %s:%s"
 msgstr "来自 xen 守护进程的 %d 状态：%s:%s"
 
-#: src/xen/xend_internal.c:420 src/xen/xend_internal.c:423
-#: src/xen/xend_internal.c:432
+#: src/xen/xend_internal.c:415 src/xen/xend_internal.c:418
+#: src/xen/xend_internal.c:427
 #, c-format
 msgid "xend_post: error from xen daemon: %s"
 msgstr "xend_post：来自 xen 守护进程的错误：%s"
 
-#: src/xen/xend_internal.c:467
+#: src/xen/xend_internal.c:468
 #, c-format
 msgid "Unexpected HTTP error code %d"
 msgstr "意外 HTTP 错误代码 %d"
 
-#: src/xen/xend_internal.c:678
+#: src/xen/xend_internal.c:681
 #, c-format
 msgid "unable to resolve hostname '%s': %s"
 msgstr "无法解析主机名 '%s'：%s"
 
-#: src/xen/xend_internal.c:715
+#: src/xen/xend_internal.c:718
 #, c-format
 msgid "unable to connect to '%s:%s'"
 msgstr "无法连接到 '%s:%s'"
 
-#: src/xen/xend_internal.c:850
+#: src/xen/xend_internal.c:855
 msgid "domain information incomplete, missing domid"
 msgstr "域信息不完全，缺少 domid"
 
-#: src/xen/xend_internal.c:856
+#: src/xen/xend_internal.c:861
 msgid "domain information incorrect domid not numeric"
 msgstr "域信息不正确，domid 不是数字值"
 
-#: src/xen/xend_internal.c:861
+#: src/xen/xend_internal.c:866 src/xen/xend_internal.c:918
 msgid "domain information incomplete, missing uuid"
 msgstr "域信息不完全，缺少 uuid"
 
-#: src/xen/xend_internal.c:1108
+#: src/xen/xend_internal.c:1176
 msgid "topology syntax error"
 msgstr "拓扑结构句法错误"
 
-#: src/xen/xend_internal.c:1155
+#: src/xen/xend_internal.c:1239
 msgid "failed to parse Xend domain information"
 msgstr "解释 Xend 域信息失败"
 
-#: src/xen/xend_internal.c:1274 src/xen/xend_internal.c:1295
-#: src/xen/xend_internal.c:1318 src/xen/xend_internal.c:1341
-#: src/xen/xend_internal.c:1367 src/xen/xend_internal.c:1423
-#: src/xen/xend_internal.c:1460
+#: src/xen/xend_internal.c:1365 src/xen/xend_internal.c:1391
+#: src/xen/xend_internal.c:1418 src/xen/xend_internal.c:1448
+#: src/xen/xend_internal.c:1485 src/xen/xend_internal.c:1561
+#: src/xen/xend_internal.c:1599
 #, c-format
 msgid "Domain %s isn't running."
 msgstr "域 %s 没有在运行。"
 
-#: src/xen/xend_internal.c:1430
+#: src/xen/xend_internal.c:1431
 msgid "Cannot save host domain"
 msgstr "无法保存主机域"
 
-#: src/xen/xend_internal.c:1799
+#: src/xen/xend_internal.c:2203
 msgid "domain not running"
 msgstr "域未运行"
 
-#: src/xen/xend_internal.c:1806 src/xen/xend_internal.c:2246
-#: src/xen/xend_internal.c:2394 src/xen/xend_internal.c:2496
+#: src/xen/xend_internal.c:2210 src/xen/xend_internal.c:2671
+#: src/xen/xend_internal.c:2839 src/xen/xend_internal.c:2952
 msgid "Xend only supports modifying both live and persistent config"
 msgstr "Xend 只支持修改 live 且持久的配置"
 
-#: src/xen/xend_internal.c:1907
+#: src/xen/xend_internal.c:2299
 msgid "failed to add vcpupin xml entry"
 msgstr "在 xml 条目中添加 vcpupin 失败"
 
-#: src/xen/xend_internal.c:1945 src/xen/xm_internal.c:750
+#: src/qemu/qemu_driver.c:3798 src/test/test_driver.c:2142
+#: src/xen/xend_internal.c:2347 src/xen/xm_internal.c:795
 msgid "domain not active"
 msgstr "域不活跃"
 
-#: src/xen/xend_internal.c:2148
+#: src/xen/xend_internal.c:2149
 #, c-format
 msgid "Domain %s is already running"
 msgstr "域 %s 已在运行"
 
-#: src/xen/xend_internal.c:2171
+#: src/xen/xend_internal.c:2172
 #, c-format
 msgid "Domain %s did not start"
 msgstr "域 %s 未启动"
 
-#: src/xen/xend_internal.c:2226 src/xen/xend_internal.c:2374
-#: src/xen/xend_internal.c:2476
+#: src/xen/xend_internal.c:2644 src/xen/xend_internal.c:2812
+#: src/xen/xend_internal.c:2925
 msgid "Cannot modify live config if domain is inactive"
 msgstr "如果域不活跃则无法修改 live 配置"
 
-#: src/xen/xend_internal.c:2235 src/xen/xend_internal.c:2383
-#: src/xen/xend_internal.c:2485
+#: src/xen/xend_internal.c:2196 src/xen/xend_internal.c:2650
+#: src/xen/xend_internal.c:2660 src/xen/xend_internal.c:2818
+#: src/xen/xend_internal.c:2828 src/xen/xend_internal.c:2931
+#: src/xen/xend_internal.c:2941
 msgid "Xend version does not support modifying persistent config"
 msgstr "Xend 版本不支持修改持久配置"
 
-#: src/xen/xend_internal.c:2305 src/xen/xend_internal.c:2312
-#: src/xen/xend_internal.c:2422 src/xen/xend_internal.c:2522
+#: src/xen/xend_internal.c:2739 src/xen/xend_internal.c:2746
+#: src/xen/xend_internal.c:2867 src/xen/xend_internal.c:2978
 msgid "unsupported device type"
 msgstr "不支持的设备类型"
 
-#: src/xen/xend_internal.c:2325
+#: src/xen/xend_internal.c:2759
 #, c-format
 msgid "target '%s' already exists"
 msgstr "目标 '%s' 已存在"
 
-#: src/xen/xend_internal.c:2430
+#: src/xen/xend_internal.c:2875
 msgid "requested device does not exist"
 msgstr "请求的设备不存在"
 
-#: src/xen/xend_internal.c:2554
+#: src/xen/xend_internal.c:3022
 msgid "xenDaemonGetAutostart failed to find this domain"
 msgstr "xenDaemonGetAutostart 无法找到这个域"
 
-#: src/xen/xend_internal.c:2582
+#: src/xen/xend_internal.c:3062
 msgid "xenDaemonSetAutostart failed to find this domain"
 msgstr "xenDaemonGetAutostart 无法找到这个域"
 
-#: src/xen/xend_internal.c:2592
+#: src/xen/xend_internal.c:3072
 msgid "unexpected value from on_xend_start"
 msgstr "on_xend_start 中的意外值"
 
-#: src/xen/xend_internal.c:2604
+#: src/xen/xend_internal.c:3087
 msgid "sexpr2string failed"
 msgstr "sexpr2string 失败"
 
-#: src/xen/xend_internal.c:2617
+#: src/xen/xend_internal.c:3100
 msgid "Failed to redefine sexpr"
 msgstr "重新定义 sexpr 失败"
 
-#: src/xen/xend_internal.c:2622
+#: src/xen/xend_internal.c:3105
 msgid "on_xend_start not present in sexpr"
 msgstr "sexpr 中没有 on_xend_start"
 
-#: src/xen/xend_internal.c:2686
+#: src/xen/xend_internal.c:3168
 msgid ""
 "xenDaemonDomainMigrate: Xen does not support renaming domains during "
 "migration"
 msgstr "xenDaemonDomainMigrate：Xen 不支持在迁移时重新命名域"
 
-#: src/xen/xend_internal.c:2696
+#: src/xen/xend_internal.c:3178
 msgid ""
 "xenDaemonDomainMigrate: Xen does not support bandwidth limits during "
 "migration"
 msgstr "xenDaemonDomainMigrate：Xen 不支持在迁移时的带宽限制"
 
-#: src/xen/xend_internal.c:2724
+#: src/xen/xend_internal.c:3206
 msgid "xenDaemonDomainMigrate: xend cannot migrate paused domains"
 msgstr "xenDaemonDomainMigrate: xend 无法迁移暂停的域"
 
-#: src/xen/xend_internal.c:2732
+#: src/xen/xend_internal.c:3214
 msgid "xenDaemonDomainMigrate: unsupported flag"
 msgstr "xenDaemonDomainMigrate：不支持的标记"
 
-#: src/xen/xend_internal.c:2748
+#: src/xen/xend_internal.c:3232
 msgid ""
 "xenDaemonDomainMigrate: only xenmigr:// migrations are supported by Xen"
 msgstr "xenDaemonDomainMigrate：Xen 只支持 xenmigr:// 迁移"
 
-#: src/xen/xend_internal.c:2755
+#: src/xen/xend_internal.c:3239
 msgid "xenDaemonDomainMigrate: a hostname must be specified in the URI"
 msgstr "xenDaemonDomainMigrate：在 URI 中必须指定主机名"
 
-#: src/xen/xend_internal.c:2773
+#: src/xen/xend_internal.c:3259
 msgid "xenDaemonDomainMigrate: invalid port number"
 msgstr "xenDaemonDomainMigrate：无效端口号"
 
-#: src/xen/xend_internal.c:2826
+#: src/xen/xend_internal.c:3331
 msgid "failed to build sexpr"
 msgstr "构建 sexpr 失败"
 
-#: src/xen/xend_internal.c:2834
+#: src/xen/xend_internal.c:3339
 #, c-format
 msgid "Failed to create inactive domain %s"
 msgstr "生成不活跃域 %s 失败"
 
-#: src/xen/xend_internal.c:2966 src/xen/xend_internal.c:3030
-#: src/xen/xend_internal.c:3135
+#: src/xen/xend_internal.c:3515 src/xen/xend_internal.c:3588
+#: src/xen/xend_internal.c:3696
 msgid "unsupported in xendConfigVersion < 4"
 msgstr "xendConfigVersion < 4 不支持"
 
-#: src/xen/xend_internal.c:2978
+#: src/xen/xend_internal.c:3527
 msgid "node information incomplete, missing scheduler name"
 msgstr "节点信息不完整，缺少调度程序名称"
 
-#: src/xen/xend_internal.c:2992 src/xen/xend_internal.c:3098
-#: src/xen/xend_internal.c:3205
+#: src/xen/xend_internal.c:3547 src/xen/xend_internal.c:3656
+#: src/xen/xend_internal.c:3766
 msgid "Unknown scheduler"
 msgstr "未知调度程序"
 
-#: src/xen/xend_internal.c:3043 src/xen/xend_internal.c:3148
+#: src/xen/xend_internal.c:3601 src/xen/xend_internal.c:3709
 msgid "Failed to get a scheduler name"
 msgstr "获得调度程序名失败"
 
-#: src/xen/xend_internal.c:3062 src/xen/xend_internal.c:3184
+#: src/xen/xend_internal.c:3620 src/xen/xend_internal.c:3745
 msgid "domain information incomplete, missing cpu_weight"
 msgstr "域信息不完整，缺少 cpu_weight"
 
-#: src/xen/xend_internal.c:3067 src/xen/xend_internal.c:3193
+#: src/xen/xend_internal.c:3625 src/xen/xend_internal.c:3754
 msgid "domain information incomplete, missing cpu_cap"
 msgstr "域信息不完整，缺少 cpu_cap"
 
-#: src/xen/xend_internal.c:3074
+#: src/xen/xend_internal.c:3632
 #, c-format
 msgid "Weight %s too big for destination"
 msgstr "对于目的地来说加权 %s 太大"
 
-#: src/xen/xend_internal.c:3085
+#: src/xen/xend_internal.c:3643
 #, c-format
 msgid "Cap %s too big for destination"
 msgstr "对于目的地来说 cap %s 太大"
 
-#: src/xen/xend_internal.c:3253
+#: src/xen/xend_internal.c:3815
 msgid "domainBlockPeek is not supported for dom0"
 msgstr "不支持 dom0 中的 domainBlockPeek"
 
-#: src/xen/xend_internal.c:3275
+#: src/xen/xend_internal.c:3836
 #, c-format
 msgid "%s: invalid path"
 msgstr "%s：无效路径"
 
-#: src/xen/xend_internal.c:3284
+#: src/xen/xend_internal.c:3845
 #, c-format
 msgid "failed to open for reading: %s"
 msgstr "打开并读取失败：%s"
 
-#: src/xen/xend_internal.c:3296
+#: src/xen/xend_internal.c:3857
 #, c-format
 msgid "failed to lseek or read from file: %s"
 msgstr "从文件 lseek 或者读取失败：%s"
 
-#: src/xen/xend_internal.c:3407
+#: src/xen/xend_internal.c:3998
 msgid "hotplug of device type not supported"
 msgstr "不支持热查报设备类型"
 
-#: src/xen/xm_internal.c:205
+#: src/xen/xm_internal.c:221
 #, c-format
 msgid "cannot stat: %s"
 msgstr "无法 stat：%s"
 
-#: src/xen/xm_internal.c:266
+#: src/xen/xm_internal.c:285
 msgid "xenXMConfigCacheRefresh: virHashAddEntry"
 msgstr "xenXMConfigCacheRefresh: virHashAddEntry"
 
-#: src/xen/xm_internal.c:309
+#: src/xen/xm_internal.c:326
 msgid "cannot get time of day"
 msgstr "正在获得日期"
 
-#: src/xen/xm_internal.c:322
+#: src/xen/xm_internal.c:339
 #, c-format
 msgid "cannot read directory %s"
 msgstr "无法读取目录 %s"
@@ -26676,86 +27024,86 @@
 msgid "Memory %lu too small, min %lu"
 msgstr "内存 %lu 太小，最小为 %lu"
 
-#: src/xen/xm_internal.c:802
+#: src/xen/xm_internal.c:861
 msgid "virHashLookup"
 msgstr "virHashLookup"
 
-#: src/xen/xm_internal.c:807
+#: src/xen/xm_internal.c:866
 msgid "can't retrieve config file for domain"
 msgstr "无法为域搜索配置文件"
 
-#: src/xen/xm_internal.c:998
+#: src/xen/xm_internal.c:1129
 msgid "can't retrieve config filename for domain to overwrite"
 msgstr "无法为域搜索用来覆盖的配置文件文件名"
 
-#: src/xen/xm_internal.c:1004
+#: src/xen/xm_internal.c:1135
 msgid "can't retrieve config entry for domain to overwrite"
 msgstr "无法为域搜索用来覆盖的配置文件条目"
 
-#: src/xen/xm_internal.c:1011 src/xen/xm_internal.c:1018
+#: src/xen/xm_internal.c:1142 src/xen/xm_internal.c:1149
 msgid "failed to remove old domain from config map"
 msgstr "从配置映像中删除原来的域失败"
 
-#: src/xen/xm_internal.c:1036
+#: src/xen/xm_internal.c:1169
 msgid "unable to get current time"
 msgstr "无法获得当前时间"
 
-#: src/xen/xm_internal.c:1046 src/xen/xm_internal.c:1053
+#: src/xen/xm_internal.c:1181 src/xen/xm_internal.c:1188
 msgid "unable to store config file handle"
 msgstr "无法保存配置文件软件"
 
-#: src/xen/xm_internal.c:1236 src/xen/xm_internal.c:1325
+#: src/xen/xm_internal.c:1392 src/xen/xm_internal.c:1489
 msgid "Xm driver only supports modifying persistent config"
 msgstr "Xm 驱动器只支持修改持久配置"
 
-#: src/xen/xm_internal.c:1274
+#: src/xen/xm_internal.c:1434
 msgid "Xm driver only supports adding disk or network devices"
 msgstr "Xm 驱动器只支持添加磁盘或者网络设备"
 
-#: src/xen/xm_internal.c:1409
+#: src/xen/xm_internal.c:1574
 msgid "block peeking not implemented"
 msgstr "未使用块窥视"
 
-#: src/xen/xm_internal.c:1446
+#: src/xen/xm_internal.c:1609
 #, c-format
 msgid "cannot check link %s points to config %s"
 msgstr "无法检查 config %s 的链接 %s"
 
-#: src/xen/xm_internal.c:1475
+#: src/xen/xm_internal.c:1638
 #, c-format
 msgid "failed to create link %s to %s"
 msgstr "创建 %s 到 %s 的链接失败"
 
-#: src/xen/xm_internal.c:1483
+#: src/xen/xm_internal.c:1646
 #, c-format
 msgid "failed to remove link %s"
 msgstr "删除链接 %s 失败"
 
-#: src/xen/xs_internal.c:129
+#: src/xen/xs_internal.c:258
 msgid "failed to connect to Xen Store"
 msgstr "连接到 Xen Store 失败"
 
-#: src/xen/xs_internal.c:149
+#: src/xen/xs_internal.c:282
 msgid "adding watch @releaseDomain"
 msgstr "正在添加 watch @releaseDomain"
 
-#: src/xen/xs_internal.c:158
+#: src/xen/xs_internal.c:291
 msgid "adding watch @introduceDomain"
 msgstr "正在添加 watch @introduceDomain"
 
-#: src/xen/xs_internal.c:655
+#: src/xen/xs_internal.c:1141
 msgid "watch already tracked"
 msgstr "已跟踪 watch"
 
-#: src/xenapi/xenapi_driver.c:125
+#: src/xenapi/xenapi_driver.c:123
 msgid "Server name not in URI"
 msgstr "URI 中没有服务器名称"
 
-#: src/xenapi/xenapi_driver.c:131
+#: src/xenapi/xenapi_driver.c:129
 msgid "Authentication Credentials not found"
 msgstr "未找到认证凭据"
 
-#: src/xenapi/xenapi_driver.c:167
+#: src/xenapi/xenapi_driver.c:173
 msgid "Capabilities not found"
 msgstr "未找到功能"
 
@@ -26767,126 +27115,126 @@
 msgid "Failed to allocate xen session"
 msgstr "分配 xen 会话失败"
 
-#: src/xenapi/xenapi_driver.c:324
+#: src/xenapi/xenapi_driver.c:322
 msgid "Couldn't parse version info"
 msgstr "无法解析版本信息"
 
-#: src/xenapi/xenapi_driver.c:332
+#: src/xenapi/xenapi_driver.c:330
 msgid "Couldn't get version info"
 msgstr "无法获取版本信息"
 
-#: src/xenapi/xenapi_driver.c:401
+#: src/xenapi/xenapi_driver.c:399
 msgid "Unable to get host metric Information"
 msgstr "无法获取主机度量信息"
 
-#: src/xenapi/xenapi_driver.c:423
+#: src/xenapi/xenapi_driver.c:421
 msgid "Unable to get Host CPU set"
 msgstr "无法获取主机 CPU 设置"
 
-#: src/xenapi/xenapi_driver.c:446
+#: src/xenapi/xenapi_driver.c:442
 msgid "Capabilities not available"
 msgstr "不可用的功能"
 
-#: src/xenapi/xenapi_driver.c:476
+#: src/xenapi/xenapi_driver.c:472
 msgid "DomainID can't fit in 32 bits"
 msgstr "DomainID 超过 32 字节"
 
-#: src/xenapi/xenapi_driver.c:552
+#: src/xenapi/xenapi_driver.c:548
 msgid "Domain Pointer is invalid"
 msgstr "域指针无效"
 
-#: src/xenapi/xenapi_driver.c:605 src/xenapi/xenapi_driver.c:647
+#: src/xenapi/xenapi_driver.c:601 src/xenapi/xenapi_driver.c:643
 msgid "Domain Pointer not valid"
 msgstr "域指针无效"
 
-#: src/xenapi/xenapi_driver.c:682 src/xenapi/xenapi_driver.c:730
-#: src/xenapi/xenapi_driver.c:766 src/xenapi/xenapi_driver.c:805
-#: src/xenapi/xenapi_driver.c:850 src/xenapi/xenapi_driver.c:894
-#: src/xenapi/xenapi_driver.c:943 src/xenapi/xenapi_driver.c:979
-#: src/xenapi/xenapi_driver.c:1011 src/xenapi/xenapi_driver.c:1049
-#: src/xenapi/xenapi_driver.c:1105 src/xenapi/xenapi_driver.c:1149
-#: src/xenapi/xenapi_driver.c:1194 src/xenapi/xenapi_driver.c:1263
-#: src/xenapi/xenapi_driver.c:1321 src/xenapi/xenapi_driver.c:1381
-#: src/xenapi/xenapi_driver.c:1657 src/xenapi/xenapi_driver.c:1755
-#: src/xenapi/xenapi_driver.c:1799 src/xenapi/xenapi_driver.c:1847
+#: src/xenapi/xenapi_driver.c:678 src/xenapi/xenapi_driver.c:725
+#: src/xenapi/xenapi_driver.c:760 src/xenapi/xenapi_driver.c:795
+#: src/xenapi/xenapi_driver.c:833 src/xenapi/xenapi_driver.c:876
+#: src/xenapi/xenapi_driver.c:924 src/xenapi/xenapi_driver.c:959
+#: src/xenapi/xenapi_driver.c:990 src/xenapi/xenapi_driver.c:1027
+#: src/xenapi/xenapi_driver.c:1082 src/xenapi/xenapi_driver.c:1126
+#: src/xenapi/xenapi_driver.c:1170 src/xenapi/xenapi_driver.c:1237
+#: src/xenapi/xenapi_driver.c:1296 src/xenapi/xenapi_driver.c:1354
+#: src/xenapi/xenapi_driver.c:1627 src/xenapi/xenapi_driver.c:1723
+#: src/xenapi/xenapi_driver.c:1765 src/xenapi/xenapi_driver.c:1811
 msgid "Domain name is not unique"
 msgstr "域名不是唯一的"
 
-#: src/xenapi/xenapi_driver.c:703
+#: src/xenapi/xenapi_driver.c:699
 msgid "Couldn't get the Domain Pointer"
 msgstr "无法获取域指针"
 
-#: src/xenapi/xenapi_driver.c:1247
+#: src/xenapi/xenapi_driver.c:1221
 msgid "Couldn't fetch Domain Information"
 msgstr "无法提取域信息"
 
-#: src/xenapi/xenapi_driver.c:1252
+#: src/xenapi/xenapi_driver.c:1226
 msgid "Couldn't fetch Node Information"
 msgstr "无法提取节点信息"
 
-#: src/xenapi/xenapi_driver.c:1536
+#: src/xenapi/xenapi_driver.c:1509
 msgid "Unable to parse given mac address"
 msgstr "无法解析给定的 mac 地址"
 
-#: src/xenapi/xenapi_driver.c:1589
+#: src/xenapi/xenapi_driver.c:1561
 msgid "Couldn't get VM record"
 msgstr "无法获取 VM 记录"
 
-#: src/xenapi/xenapi_driver.c:1720
+#: src/xenapi/xenapi_driver.c:1688
 msgid "Couldn't get VM information from XML"
 msgstr "无法从 XML 中获取 VM 记录"
 
-#: src/xenapi/xenapi_driver.c:1898
+#: src/xenapi/xenapi_driver.c:1862
 msgid "Couldn't get host metrics - memory information"
 msgstr "无法获取主机度量 - 内存信息"
 
-#: src/xenapi/xenapi_driver.c:1904
+#: src/xenapi/xenapi_driver.c:1868
 msgid "Couldn't get host metrics"
 msgstr "无法获取主机度量"
 
-#: src/xenapi/xenapi_utils.c:109
+#: src/xenapi/xenapi_utils.c:123
 msgid "Query parameter 'no_verify' has unexpected value (should be 0 or 1)"
 msgstr "查询参数 'no_verify' 有意外值（应为 0 或者 1）"
 
-#: src/xenxs/xen_sxpr.c:64 src/xenxs/xen_sxpr.c:1101
+#: src/xenxs/xen_sxpr.c:60 src/xenxs/xen_sxpr.c:1073
 msgid "domain information incomplete, missing id"
 msgstr "域信息不完全，缺少 id"
 
-#: src/xenxs/xen_sxpr.c:102
+#: src/xenxs/xen_sxpr.c:98
 msgid "domain information incomplete, missing HVM loader"
 msgstr "域信息不完全，缺少 HVM 装载程序"
 
-#: src/xenxs/xen_sxpr.c:162
+#: src/xenxs/xen_sxpr.c:158
 msgid "domain information incomplete, missing kernel & bootloader"
 msgstr "域信息不完全,缺少内核和启动器"
 
-#: src/xenxs/xen_sxpr.c:211
+#: src/xenxs/xen_sxpr.c:199
 #, c-format
 msgid "unknown chr device type '%s'"
 msgstr "未知字符设备类型 '%s'"
 
-#: src/xenxs/xen_sxpr.c:236 src/xenxs/xen_sxpr.c:262 src/xenxs/xen_sxpr.c:279
+#: src/xenxs/xen_sxpr.c:225 src/xenxs/xen_sxpr.c:255 src/xenxs/xen_sxpr.c:273
 msgid "malformed char device string"
 msgstr "畸形字符设备字符串"
 
-#: src/xenxs/xen_sxpr.c:376
+#: src/xenxs/xen_sxpr.c:375
 msgid "domain information incomplete, vbd has no dev"
 msgstr "域信息不完全，vbd 没有 dev"
 
-#: src/xenxs/xen_sxpr.c:387
+#: src/xenxs/xen_sxpr.c:386
 msgid "domain information incomplete, vbd has no src"
 msgstr "域信息不完全，vbd 没有 src"
 
-#: src/xenxs/xen_sxpr.c:396
+#: src/xenxs/xen_sxpr.c:395
 msgid "cannot parse vbd filename, missing driver name"
 msgstr "缺少驱动名，无法解释 vbd 文件名"
 
-#: src/xenxs/xen_sxpr.c:410 src/xenxs/xen_xm.c:538
+#: src/xenxs/xen_sxpr.c:409 src/xenxs/xen_xm.c:496
 #, c-format
 msgid "Driver name %s too big for destination"
 msgstr "对于目的地来说驱动程序名称 %s 太大"
 
-#: src/xenxs/xen_sxpr.c:425
+#: src/xenxs/xen_sxpr.c:422
 msgid "cannot parse vbd filename, missing driver type"
 msgstr "缺少驱动类型，无法解释 vbd 文件名"
 
@@ -26895,389 +27243,396 @@
 msgid "Unknown driver type %s"
 msgstr "未知驱动程序类型 %s"
 
-#: src/xenxs/xen_sxpr.c:592 src/xenxs/xen_xm.c:743
+#: src/xenxs/xen_sxpr.c:585 src/xenxs/xen_xm.c:695
 #, c-format
 msgid "malformed mac address '%s'"
 msgstr "畸形 mac 地址 '%s'"
 
-#: src/xenxs/xen_sxpr.c:675
+#: src/xenxs/xen_sxpr.c:663
 #, c-format
 msgid "Sound model %s too big for destination"
 msgstr "对于目的地来说声音模式 %s 太大"
 
-#: src/xenxs/xen_sxpr.c:888
+#: src/xenxs/xen_sxpr.c:853
 #, c-format
 msgid "unknown graphics type '%s'"
 msgstr "未知图形类型 '%s'"
 
-#: src/xenxs/xen_sxpr.c:1007
+#: src/xenxs/xen_sxpr.c:976
 msgid "missing PCI domain"
 msgstr "缺少 PCI 域"
 
-#: src/xenxs/xen_sxpr.c:1012
+#: src/xenxs/xen_sxpr.c:981
 msgid "missing PCI bus"
 msgstr "缺少 PCI 总线"
 
-#: src/xenxs/xen_sxpr.c:1017
+#: src/xenxs/xen_sxpr.c:986
 msgid "missing PCI slot"
 msgstr "缺少 PCI 插槽"
 
-#: src/xenxs/xen_sxpr.c:1022
+#: src/xenxs/xen_sxpr.c:991
 msgid "missing PCI func"
 msgstr "缺少 PCI 功能"
 
-#: src/xenxs/xen_sxpr.c:1028
+#: src/xenxs/xen_sxpr.c:997
 #, c-format
 msgid "cannot parse PCI domain '%s'"
 msgstr "无法解析 PCI 域 '%s'"
 
-#: src/xenxs/xen_sxpr.c:1033
+#: src/xenxs/xen_sxpr.c:1002
 #, c-format
 msgid "cannot parse PCI bus '%s'"
 msgstr "无法解析 PCI 总线 '%s'"
 
-#: src/xenxs/xen_sxpr.c:1038
+#: src/xenxs/xen_sxpr.c:1007
 #, c-format
 msgid "cannot parse PCI slot '%s'"
 msgstr "无法解析 PCI 插槽 '%s'"
 
-#: src/xenxs/xen_sxpr.c:1043
+#: src/xenxs/xen_sxpr.c:1012
 #, c-format
 msgid "cannot parse PCI func '%s'"
 msgstr "无法解析 PCI 功能 '%s'"
 
-#: src/xenxs/xen_sxpr.c:1114 src/xenxs/xen_sxpr.c:1121
+#: src/xen/xend_internal.c:905 src/xenxs/xen_sxpr.c:1086
+#: src/xenxs/xen_sxpr.c:1093
 msgid "domain information incomplete, missing name"
 msgstr "域信息不完全，缺少名称"
 
-#: src/xenxs/xen_sxpr.c:1177 src/xenxs/xen_sxpr.c:1187
-#: src/xenxs/xen_sxpr.c:1197
+#: src/xenxs/xen_sxpr.c:1160 src/xenxs/xen_sxpr.c:1170
+#: src/xenxs/xen_sxpr.c:1180
 #, c-format
 msgid "unknown lifecycle type %s"
 msgstr "未知周期类型 %s"
 
-#: src/xenxs/xen_sxpr.c:1223 src/xenxs/xen_sxpr.c:1263
+#: src/xenxs/xen_sxpr.c:1225 src/xenxs/xen_sxpr.c:1265
 #, c-format
 msgid "unknown localtime offset %s"
 msgstr "未知本地时间偏移 %s"
 
-#: src/xenxs/xen_sxpr.c:1529 src/xenxs/xen_sxpr.c:1588
+#: src/xenxs/xen_sxpr.c:1473 src/xenxs/xen_sxpr.c:1521
 #, c-format
 msgid "unexpected graphics type %d"
 msgstr "意外的图形类型 %d"
 
-#: src/xenxs/xen_sxpr.c:1642
+#: src/libxl/libxl_conf.c:775 src/xenxs/xen_sxpr.c:1564
 msgid "unexpected chr device type"
 msgstr "意外的字符设备类型"
 
-#: src/xenxs/xen_sxpr.c:1698
+#: src/xenxs/xen_sxpr.c:1620
 #, c-format
 msgid "unsupported chr device type '%s'"
 msgstr "不支持的 chr 设备类型 '%s'"
 
-#: src/xenxs/xen_sxpr.c:1737
+#: src/xenxs/xen_sxpr.c:1660
 #, c-format
 msgid "Cannot directly attach floppy %s"
 msgstr "无法直接附加软盘 %s"
 
-#: src/xenxs/xen_sxpr.c:1749
+#: src/xenxs/xen_sxpr.c:1672
 #, c-format
 msgid "Cannot directly attach CDROM %s"
 msgstr "无法直接附加光驱 %s"
 
-#: src/xenxs/xen_sxpr.c:1814 src/xenxs/xen_xm.c:1215
+#: src/xenxs/xen_sxpr.c:1732 src/xenxs/xen_xm.c:1166
 #, c-format
 msgid "unsupported disk type %s"
 msgstr "不支持的磁盘类型 %s"
 
-#: src/xenxs/xen_sxpr.c:1872 src/xenxs/xen_xm.c:1357
+#: src/xenxs/xen_sxpr.c:1786 src/xenxs/xen_xm.c:1316
 #, c-format
 msgid "unsupported network type %d"
 msgstr "不支持的网络类型 %d"
 
-#: src/xenxs/xen_sxpr.c:1918 src/xenxs/xen_xm.c:1345
+#: src/xenxs/xen_sxpr.c:1827 src/xenxs/xen_xm.c:1304
 #, c-format
 msgid "network %s is not active"
 msgstr "网络 %s 不活跃"
 
-#: src/xenxs/xen_sxpr.c:2020 src/xenxs/xen_sxpr.c:2080
+#: src/xenxs/xen_sxpr.c:1906 src/xenxs/xen_sxpr.c:1956
 msgid "managed PCI devices not supported with XenD"
 msgstr "XenD 不支持管理的 PCI 设备"
 
-#: src/xenxs/xen_sxpr.c:2228 src/xenxs/xen_sxpr.c:2235
-#: src/xenxs/xen_sxpr.c:2242
+#: src/xenxs/xen_sxpr.c:2083 src/xenxs/xen_sxpr.c:2090
+#: src/xenxs/xen_sxpr.c:2097
 #, c-format
 msgid "unexpected lifecycle value %d"
 msgstr "意外的周期值 %d"
 
-#: src/xenxs/xen_sxpr.c:2260
+#: src/xenxs/xen_sxpr.c:2130
 msgid "no HVM domain loader"
 msgstr "无 HVM 域装载程序"
 
-#: src/xenxs/xen_sxpr.c:2450 src/xenxs/xen_sxpr.c:2490
-#: src/xenxs/xen_sxpr.c:2506 src/xenxs/xen_xm.c:1652 src/xenxs/xen_xm.c:1685
-#: src/xenxs/xen_xm.c:1702
+#: src/xenxs/xen_sxpr.c:2461 src/xenxs/xen_sxpr.c:2501
+#: src/xenxs/xen_sxpr.c:2517 src/xenxs/xen_xm.c:1656 src/xenxs/xen_xm.c:1689
+#: src/xenxs/xen_xm.c:1706
 #, c-format
 msgid "unsupported clock offset='%s'"
 msgstr "不支持的 clock offset='%s'"
 
-#: src/xenxs/xen_sxpr.c:2473 src/xenxs/xen_sxpr.c:2482 src/xenxs/xen_xm.c:1668
-#: src/xenxs/xen_xm.c:1677
+#: src/xenxs/xen_sxpr.c:2484 src/xenxs/xen_sxpr.c:2493 src/xenxs/xen_xm.c:1672
+#: src/xenxs/xen_xm.c:1681
 msgid "unsupported clock adjustment='reset'"
 msgstr "不支持的 clock adjustment='reset'"
 
-#: src/xenxs/xen_xm.c:62 src/xenxs/xen_xm.c:89 src/xenxs/xen_xm.c:94
-#: src/xenxs/xen_xm.c:121 src/xenxs/xen_xm.c:126 src/xenxs/xen_xm.c:148
+#: src/xenxs/xen_xm.c:60 src/xenxs/xen_xm.c:87 src/xenxs/xen_xm.c:92
+#: src/xenxs/xen_xm.c:114
 #, c-format
 msgid "config value %s was malformed"
 msgstr "config 值 %s 被破坏了"
 
-#: src/xenxs/xen_xm.c:169 src/xenxs/xen_xm.c:182
+#: src/xenxs/xen_xm.c:135 src/xenxs/xen_xm.c:148 src/xenxs/xen_xm.c:186
 #, c-format
 msgid "config value %s was missing"
 msgstr "缺少 config 值 %s"
 
-#: src/xenxs/xen_xm.c:175
+#: src/xenxs/xen_xm.c:141
 #, c-format
 msgid "config value %s was not a string"
 msgstr "config 值 %s 不是字符串"
 
-#: src/xenxs/xen_xm.c:209
+#: src/xenxs/xen_xm.c:180
 msgid "Arguments must be non null"
 msgstr "参数不能为空"
 
-#: src/xenxs/xen_xm.c:225
+#: src/xenxs/xen_xm.c:192
 #, c-format
 msgid "config value %s not a string"
 msgstr "配置值 %s 不是一个字符串"
 
-#: src/xenxs/xen_xm.c:231
+#: src/xenxs/xen_xm.c:198
 #, c-format
 msgid "%s can't be empty"
 msgstr "%s 不能为空。"
 
-#: src/xenxs/xen_xm.c:237
+#: src/xenxs/xen_xm.c:204
 #, c-format
 msgid "%s not parseable"
 msgstr "%s 无法解析"
 
-#: src/xenxs/xen_xm.c:375
+#: src/xenxs/xen_xm.c:351
 #, c-format
 msgid "unexpected value %s for on_poweroff"
 msgstr "on_poweroff 的意外值 %s"
 
-#: src/xenxs/xen_xm.c:383
+#: src/xenxs/xen_xm.c:359
 #, c-format
 msgid "unexpected value %s for on_reboot"
 msgstr "on_reboot 中的意外值 %s"
 
-#: src/xenxs/xen_xm.c:391
+#: src/xenxs/xen_xm.c:367
 #, c-format
 msgid "unexpected value %s for on_crash"
 msgstr "on_crash 中的意外值 %s"
 
-#: src/xenxs/xen_xm.c:503
+#: src/xenxs/xen_xm.c:461
 #, c-format
 msgid "Source file %s too big for destination"
 msgstr "对于目的地来说源文件 %s 太大"
 
-#: src/xenxs/xen_xm.c:522
+#: src/xenxs/xen_xm.c:480
 #, c-format
 msgid "Dest file %s too big for destination"
 msgstr "对于目的地来说目的文件 %s 太大"
 
-#: src/xenxs/xen_xm.c:682
+#: src/xenxs/xen_xm.c:633
 #, c-format
 msgid "MAC address %s too big for destination"
 msgstr "对于目的地来说 MAC 地址 %s 太大"
 
-#: src/xenxs/xen_xm.c:690
+#: src/xenxs/xen_xm.c:641
 #, c-format
 msgid "Bridge %s too big for destination"
 msgstr "对于目的地来说桥接 %s 太大"
 
-#: src/xenxs/xen_xm.c:710
+#: src/xenxs/xen_xm.c:662
 #, c-format
 msgid "Type %s too big for destination"
 msgstr "对于目的地来说类型 %s 太大"
 
-#: src/xenxs/xen_xm.c:717
+#: src/xenxs/xen_xm.c:669
 #, c-format
 msgid "Vifname %s too big for destination"
 msgstr "对于目的地来说 vifname %s 太大"
 
-#: src/xenxs/xen_xm.c:725
+#: src/xenxs/xen_xm.c:677
 #, c-format
 msgid "IP %s too big for destination"
 msgstr "对于目的地来说 IP %s 太大"
 
-#: src/xenxs/xen_xm.c:819
+#: src/xenxs/xen_xm.c:777
 #, c-format
 msgid "Domain %s too big for destination"
 msgstr "对于目的地来说域 %s 太大"
 
-#: src/xenxs/xen_xm.c:829
+#: src/xenxs/xen_xm.c:787
 #, c-format
 msgid "Bus %s too big for destination"
 msgstr "对于目的地来说总线 %s 太大"
 
-#: src/xenxs/xen_xm.c:839
+#: src/xenxs/xen_xm.c:797
 #, c-format
 msgid "Slot %s too big for destination"
 msgstr "对于目的地来说插槽 %s 太大"
 
-#: src/xenxs/xen_xm.c:849
+#: src/xenxs/xen_xm.c:807
 #, c-format
 msgid "Function %s too big for destination"
 msgstr "对于目的地来说功能 %s 太大"
 
-#: src/xenxs/xen_xm.c:975
+#: src/xenxs/xen_xm.c:931
 #, c-format
 msgid "VFB %s too big for destination"
 msgstr "对于目的地来说 VFB %s 太大"
 
-#: src/xenxs/xen_xm.c:1153
+#: src/xenxs/xen_xm.c:1157
 #, c-format
 msgid "failed to store %lld to %s"
 msgstr "将 %lld 恢复为 %s 失败"
 
-#: src/xenxs/xen_xm.c:1714 src/xenxs/xen_xm.c:1723 src/xenxs/xen_xm.c:1732
+#: src/xenxs/xen_xm.c:1625 src/xenxs/xen_xm.c:1634 src/xenxs/xen_xm.c:1643
 #, c-format
 msgid "unexpected lifecycle action %d"
 msgstr "意外的周期动作 %d"
 
-#: tools/libvirt-guests.sh.in:92
+#: tools/libvirt-guests.sh.in:98
+#, sh-format
+msgid "Unable to connect to libvirt currently. Retrying .. $i"
+msgstr ""
+
+#: tools/libvirt-guests.sh.in:100
 #, sh-format
 msgid "Can't connect to $uri. Skipping."
 msgstr "无法连接到 $uri。跳过。"
 
-#: tools/libvirt-guests.sh.in:156
+#: tools/libvirt-guests.init.sh:139
 msgid "libvirt-guests is configured not to start any guests on boot"
 msgstr "将 libvirt-guests 配置未在引导时启动任意虚拟机"
 
-#: tools/libvirt-guests.sh.in:178
+#: tools/libvirt-guests.init.sh:161
 #, sh-format
 msgid "Ignoring guests on $uri URI"
 msgstr "忽略 $uri URI 中的虚拟机"
 
-#: tools/libvirt-guests.sh.in:184
+#: tools/libvirt-guests.init.sh:165
 #, sh-format
 msgid "Resuming guests on $uri URI..."
 msgstr "恢复 $uri URI 中的虚拟机"
 
-#: tools/libvirt-guests.sh.in:187
+#: tools/libvirt-guests.init.sh:168
 #, sh-format
 msgid "Resuming guest $name: "
 msgstr "恢复虚拟机 $name: "
 
-#: tools/libvirt-guests.sh.in:190
+#: tools/libvirt-guests.init.sh:171
 msgid "already active"
 msgstr "已活跃"
 
-#: tools/libvirt-guests.sh.in:199 tools/libvirt-guests.sh.in:240
+#: tools/libvirt-guests.init.sh:180 tools/libvirt-guests.init.sh:213
+#: tools/libvirt-guests.init.sh:239
 msgid "done"
 msgstr "完成"
 
-#: tools/libvirt-guests.sh.in:218
+#: tools/libvirt-guests.init.sh:196
 #, sh-format
 msgid "Suspending $name: "
 msgstr "挂起 $name: "
 
-#: tools/libvirt-guests.sh.in:252 tools/libvirt-guests.sh.in:301
+#: tools/libvirt-guests.sh.in:259 tools/libvirt-guests.sh.in:308
 #, sh-format
 msgid "Starting shutdown on guest: $name"
 msgstr "在 guest: $name 中启动关机"
 
-#: tools/libvirt-guests.sh.in:259
+#: tools/libvirt-guests.sh.in:266
 #, sh-format
 msgid "Waiting for guest %s to shut down, %d seconds left\\n"
 msgstr "等待虚拟机 %s 关闭，还剩 %d 秒\\n"
 
-#: tools/libvirt-guests.sh.in:262
+#: tools/libvirt-guests.sh.in:269
 #, sh-format
 msgid "Waiting for guest %s to shut down\\n"
 msgstr "等待虚拟机 %s 关闭\\n"
 
-#: tools/libvirt-guests.sh.in:284
+#: tools/libvirt-guests.sh.in:291
 #, sh-format
 msgid "Shutdown of guest $name failed to complete in time."
 msgstr "关闭无法及时完成的虚拟机 $name失败。"
 
-#: tools/libvirt-guests.sh.in:286 tools/libvirt-guests.sh.in:351
+#: tools/libvirt-guests.sh.in:293 tools/libvirt-guests.sh.in:358
 #, sh-format
 msgid "Shutdown of guest $name complete."
 msgstr "完成关闭虚拟机 $name。"
 
-#: tools/libvirt-guests.sh.in:325
+#: tools/libvirt-guests.sh.in:332
 #, sh-format
 msgid "Failed to determine state of guest: $guest. Not tracking it anymore."
 msgstr "确定 guest: $guest 状态失败。不再跟踪它。"
 
-#: tools/libvirt-guests.sh.in:368
+#: tools/libvirt-guests.sh.in:375
 #, sh-format
 msgid "Waiting for %d guests to shut down, %d seconds left\\n"
 msgstr "等待 %d 虚拟机关闭，还剩 %d 秒 \\n"
 
-#: tools/libvirt-guests.sh.in:371
+#: tools/libvirt-guests.sh.in:378
 #, sh-format
 msgid "Waiting for %d guests to shut down\\n"
 msgstr "等待 %d 虚拟机关闭 \\n"
 
-#: tools/libvirt-guests.sh.in:396
+#: tools/libvirt-guests.sh.in:403
 #, sh-format
 msgid "Timeout expired while shutting down domains"
 msgstr "关闭域超时"
 
-#: tools/libvirt-guests.sh.in:423
+#: tools/libvirt-guests.sh.in:430
 msgid "SHUTDOWN_TIMEOUT must be equal or greater than 0"
 msgstr "SHUTDOWN_TIMEOUT 必须大于等于 0"
 
-#: tools/libvirt-guests.sh.in:437
+#: tools/libvirt-guests.init.sh:263
 #, sh-format
 msgid "Running guests on $uri URI: "
 msgstr "在 $uri URI 中运行虚拟机 "
 
-#: tools/libvirt-guests.sh.in:449
+#: tools/libvirt-guests.init.sh:279
 msgid "no running guests."
 msgstr "无虚拟机运行。"
 
-#: tools/libvirt-guests.sh.in:460
+#: tools/libvirt-guests.sh.in:467
 #, sh-format
 msgid "Not suspending transient guests on URI: $uri: "
 msgstr "URI 中没有挂起的临时虚拟机：$uri: "
 
-#: tools/libvirt-guests.sh.in:471
+#: tools/libvirt-guests.sh.in:478
 #, sh-format
 msgid "Failed to list persistent guests on $uri"
 msgstr "无法在 $uri 中列出持久虚拟机"
 
-#: tools/libvirt-guests.sh.in:478
+#: tools/libvirt-guests.sh.in:485
 msgid "Failed to list transient guests"
 msgstr "列出临时虚拟机失败"
 
-#: tools/libvirt-guests.sh.in:495
+#: tools/libvirt-guests.init.sh:290
 #, sh-format
 msgid "Suspending guests on $uri URI..."
 msgstr "在 $uri URI 中挂起虚拟机"
 
-#: tools/libvirt-guests.sh.in:497
+#: tools/libvirt-guests.init.sh:292
 #, sh-format
 msgid "Shutting down guests on $uri URI..."
 msgstr "关闭 $uri URI 中的虚拟机"
 
-#: tools/libvirt-guests.sh.in:538
+#: tools/libvirt-guests.init.sh:323
 msgid "stopped, with saved guests"
 msgstr "保存虚拟机并停止"
 
-#: tools/libvirt-guests.sh.in:542
+#: tools/libvirt-guests.init.sh:327
 msgid "started"
 msgstr "已启动"
 
-#: tools/libvirt-guests.sh.in:545
+#: tools/libvirt-guests.init.sh:329
 msgid "stopped, with no saved guests"
 msgstr "停止，无保存的虚拟机"
 
-#: tools/libvirt-guests.sh.in:555
+#: tools/libvirt-guests.init.sh:339
 #, sh-format
 msgid ""
 "Usage: $program_name {start|stop|status|restart|condrestart|try-"
@@ -27286,93 +27641,93 @@
 "用法：$program_name {start|stop|status|restart|condrestart|try-"
 "restart|reload|force-reload|gueststatus|shutdown}"
 
-#: tools/virsh.c:102 tools/virsh.c:116
+#: tools/virsh.c:412 tools/virsh.c:424
 #, c-format
 msgid "%s: %d: failed to allocate %d bytes"
 msgstr "%s: %d: 分配 %d 字节失败"
 
-#: tools/virsh.c:128
+#: tools/virsh.c:438
 #, c-format
 msgid "%s: %d: failed to allocate %lu bytes"
 msgstr "%s: %d: 分配 %lu字节失败"
 
-#: tools/virsh.c:331 tools/virsh.c:397 tools/virsh.c:2891
+#: tools/virsh.c:337 tools/virsh.c:403 tools/virsh.c:3068
 msgid "Failed to disconnect from the hypervisor"
 msgstr "从管理程序断开连接失败"
 
-#: tools/virsh.c:333 tools/virsh.c:399 tools/virsh.c:2893
+#: tools/virsh.c:339 tools/virsh.c:405 tools/virsh.c:3070
 msgid ""
 "One or more references were leaked after disconnect from the hypervisor"
 msgstr ""
 
-#: tools/virsh.c:342
+#: tools/virsh.c:610
 msgid "Failed to reconnect to the hypervisor"
 msgstr "重新连接到 hypervisor 失败"
 
-#: tools/virsh.c:344
+#: tools/virsh.c:17128
 msgid "failed to connect to the hypervisor"
 msgstr "连接到管理程序失败"
 
-#: tools/virsh.c:348 tools/virsh.c:424
+#: tools/virsh.c:354 tools/virsh.c:430
 msgid "Unable to register disconnect callback"
 msgstr "无法注册断开的回叫"
 
-#: tools/virsh.c:350
+#: tools/virsh.c:612
 msgid "Reconnected to the hypervisor"
 msgstr "重新连接到 hypervisor 失败"
 
-#: tools/virsh.c:363
+#: tools/virsh.c:727
 msgid "(re)connect to hypervisor"
 msgstr "连接（重新连接）到 hypervisor"
 
-#: tools/virsh.c:366
+#: tools/virsh.c:729
 msgid ""
 "Connect to local hypervisor. This is built-in command after shell start up."
 msgstr "连接到本地管理程序。这是在 shell 启动后内建的命令。"
 
-#: tools/virsh.c:376
+#: tools/virsh.c:735
 msgid "hypervisor connection URI"
 msgstr "管理程序连接 URI"
 
-#: tools/virsh.c:380
+#: tools/virsh.c:736
 msgid "read-only connection"
 msgstr "只读连接"
 
-#: tools/virsh.c:418
+#: tools/virsh.c:770
 msgid "Failed to connect to the hypervisor"
 msgstr "连接到管理程序失败"
 
 #. TRANSLATORS: For now, we aren't using LC_MESSAGES, and the user
 #. * choices really are limited to just 'y', 'n', 'f' and '?'
-#: tools/virsh.c:473
+#: tools/virsh.c:479
 msgid "Try again? [y,n,f,?]:"
 msgstr "再试一次？ [y,n,f,?]:"
 
-#: tools/virsh.c:479
+#: tools/virsh.c:485
 msgid "y - yes, start editor again"
 msgstr "y - yes, 再次启动编辑器"
 
-#: tools/virsh.c:480
+#: tools/virsh.c:486
 msgid "n - no, throw away my changes"
 msgstr "n - no, 不进行任何更改"
 
-#: tools/virsh.c:481
+#: tools/virsh.c:487
 msgid "f - force, try to redefine again"
 msgstr "f - force, 尝试重新定义"
 
-#: tools/virsh.c:482
+#: tools/virsh.c:488
 msgid "? - print this help"
 msgstr "? - 输出这个帮助信息"
 
-#: tools/virsh.c:499
+#: tools/virsh.c:505
 msgid "This function is not supported on WIN32 platform"
 msgstr "WIN32 平台不支持这个功能"
 
-#: tools/virsh.c:523
+#: tools/virsh.c:627
 msgid "print help"
 msgstr "打印帮助"
 
-#: tools/virsh.c:526
+#: tools/virsh.c:628
 msgid ""
 "Prints global help, command specific help, or help for a\n"
 "    group of related commands"
@@ -27380,13 +27735,13 @@
 "输出全局帮助，具体命令帮助或者与相关\n"
 "命令关联的组帮助"
 
-#: tools/virsh.c:535
+#: tools/virsh.c:635
 msgid ""
 "Prints global help, command specific help, or help for a group of related "
 "commands"
 msgstr "输出全局帮助，具体命令帮助或者与相关命令关联的组帮助"
 
-#: tools/virsh.c:549
+#: tools/virsh.c:648
 msgid ""
 "Grouped commands:\n"
 "\n"
@@ -27394,165 +27749,165 @@
 "分组的命令：\n"
 "\n"
 
-#: tools/virsh.c:552 tools/virsh.c:1212
+#: tools/virsh.c:651 tools/virsh.c:15574
 #, c-format
 msgid " %s (help keyword '%s'):\n"
 msgstr " %s (help keyword '%s'):\n"
 
-#: tools/virsh.c:573
+#: tools/virsh.c:669
 #, c-format
 msgid "command or command group '%s' doesn't exist"
 msgstr "命令或者命令组 '%s' 不存在"
 
-#: tools/virsh.c:659
+#: tools/virsh.c:665
 msgid "Failed to complete tree listing"
 msgstr "完成列出树结构失败"
 
-#: tools/virsh.c:681
+#: tools/virsh.c:687
 #, c-format
 msgid "mkostemps: failed to create temporary file: %s"
 msgstr ""
 
-#: tools/virsh.c:688
+#: tools/virsh.c:13323
 #, c-format
 msgid "write: %s: failed to write to temporary file: %s"
 msgstr "写入：%s：写入临时文件失败：%s"
 
-#: tools/virsh.c:696
+#: tools/virsh.c:13331
 #, c-format
 msgid "close: %s: failed to write or close temporary file: %s"
 msgstr "关闭：%s：写入或者关闭临时文件失败：%s"
 
-#: tools/virsh.c:737
+#: tools/virsh.c:13372
 #, c-format
 msgid ""
 "%s: temporary filename contains shell meta or other unacceptable characters "
 "(is $TMPDIR wrong?)"
 msgstr "%s：临时文件名包含 shell 元数据或者其它不能接受的字符（$TMPDIR 错了吗？）"
 
-#: tools/virsh.c:771
+#: tools/virsh.c:13405
 #, c-format
 msgid "%s: failed to read temporary file: %s"
 msgstr "%s：读取临时文件失败：%s"
 
-#: tools/virsh.c:784
+#: tools/virsh.c:13417
 msgid "change the current directory"
 msgstr "更改当前目录"
 
-#: tools/virsh.c:787
+#: tools/virsh.c:13418
 msgid "Change the current directory."
 msgstr "更改当前目录。"
 
-#: tools/virsh.c:795
+#: tools/virsh.c:13423
 msgid "directory to switch to (default: home or else root)"
 msgstr "要切换到的目录（默认为 home 或者 root）"
 
-#: tools/virsh.c:809
+#: tools/virsh.c:13435
 msgid "cd: command valid only in interactive mode"
 msgstr "cd：只在互动模式中使用的命令"
 
-#: tools/virsh.c:820
+#: tools/virsh.c:13447
 #, c-format
 msgid "cd: %s: %s"
 msgstr "cd: %s: %s"
 
-#: tools/virsh.c:834
+#: tools/virsh.c:13459
 msgid "print the current directory"
 msgstr "输出当前目录"
 
-#: tools/virsh.c:837
+#: tools/virsh.c:13460
 msgid "Print the current directory."
 msgstr "输出当前目录。"
 
-#: tools/virsh.c:851
+#: tools/virsh.c:13472
 #, c-format
 msgid "pwd: cannot get current directory: %s"
 msgstr "pwd: 无法获取当前目录: %s"
 
-#: tools/virsh.c:855 tools/virsh-domain.c:6383
+#: tools/virsh.c:13476
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
-#: tools/virsh.c:867
+#: tools/virsh.c:13487
 msgid "echo arguments"
 msgstr "echo 参数"
 
-#: tools/virsh.c:870
+#: tools/virsh.c:13488
 msgid "Echo back arguments, possibly with quoting."
 msgstr "Echo 回参数，可能有引号。"
 
-#: tools/virsh.c:878
+#: tools/virsh.c:13493
 msgid "escape for shell use"
 msgstr "退出 shell"
 
-#: tools/virsh.c:882
+#: tools/virsh.c:13494
 msgid "escape for XML use"
 msgstr "退出 XML"
 
-#: tools/virsh.c:894
+#: tools/virsh.c:13495
 msgid "arguments to echo"
 msgstr "要 echo 的参数"
 
-#: tools/virsh.c:929 tools/virsh.c:946 tools/virsh-domain.c:653
-#: tools/virsh-domain.c:920 tools/virsh-pool.c:279 tools/virsh-volume.c:282
-#: tools/virsh-volume.c:559
+#: tools/virsh.c:8497 tools/virsh.c:9717 tools/virsh.c:10016
+#: tools/virsh.c:12468 tools/virsh.c:12948 tools/virsh.c:13529
+#: tools/virsh.c:13546
 msgid "Failed to allocate XML buffer"
 msgstr "分配 XML 缓冲失败"
 
-#: tools/virsh.c:961
+#: tools/virsh.c:13695
 msgid "quit this interactive terminal"
 msgstr "退出这个非交互式终端"
 
-#: tools/virsh.c:1065
+#: tools/virsh.c:1071
 msgid "print help for this function"
 msgstr "输出这个功能的帮助"
 
-#: tools/virsh.c:1097 tools/virsh.c:1919
+#: tools/virsh.c:16507
 #, c-format
 msgid "invalid '=' after option --%s"
 msgstr "选项 --%s 后的无效 '='"
 
-#: tools/virsh.c:1107
+#: tools/virsh.c:15474
 #, c-format
 msgid "option --%s already seen"
 msgstr "已看到选项 --%s"
 
-#: tools/virsh.c:1118
+#: tools/virsh.c:15483
 #, c-format
 msgid "command '%s' doesn't support option --%s"
 msgstr "命令 '%s' 不支持选项 --%s"
 
-#: tools/virsh.c:1165
+#: tools/virsh.c:15527
 #, c-format
 msgid "command '%s' requires <%s> option"
 msgstr "命令 '%s' 需要 <%s> 选项"
 
-#: tools/virsh.c:1166
+#: tools/virsh.c:15528
 #, c-format
 msgid "command '%s' requires --%s option"
 msgstr "命令 '%s' 需要 --%s 选项"
 
-#: tools/virsh.c:1209
+#: tools/virsh.c:15571
 #, c-format
 msgid "command group '%s' doesn't exist"
 msgstr "命令组 '%s' 不存在"
 
-#: tools/virsh.c:1232
+#: tools/virsh.c:15592
 #, c-format
 msgid "command '%s' doesn't exist"
 msgstr "命令 '%s' 不存在"
 
-#: tools/virsh.c:1244 tools/virsh.c:1871
+#: tools/virsh.c:15604 tools/virsh.c:16463
 #, c-format
 msgid "internal error: bad options in command: '%s'"
 msgstr "内部错误：命令中有坏选项：'%s'"
 
-#: tools/virsh.c:1249
+#: tools/virsh.c:15609
 msgid "  NAME\n"
 msgstr "  NAME\n"
 
-#: tools/virsh.c:1252
+#: tools/virsh.c:15612
 msgid ""
 "\n"
 "  SYNOPSIS\n"
@@ -27560,37 +27915,37 @@
 "\n"
 "  SYNOPSIS\n"
 
-#: tools/virsh.c:1265
+#: tools/virsh.c:15625
 #, c-format
 msgid "[--%s <number>]"
 msgstr "[--%s <number>]"
 
-#: tools/virsh.c:1271
+#: tools/virsh.c:15631
 #, c-format
 msgid "[--%s <string>]"
 msgstr "[--%s <string>]"
 
-#: tools/virsh.c:1284
+#: tools/virsh.c:15644
 #, c-format
 msgid "{[--%s] <string>}..."
 msgstr "{[--%s] <string>}..."
 
-#: tools/virsh.c:1285
+#: tools/virsh.c:15645
 #, c-format
 msgid "[[--%s] <string>]..."
 msgstr "[[--%s] <string>]..."
 
-#: tools/virsh.c:1287
+#: tools/virsh.c:15647
 #, c-format
 msgid "<%s>..."
 msgstr "<%s>..."
 
-#: tools/virsh.c:1288
+#: tools/virsh.c:15648
 #, c-format
 msgid "[<%s>]..."
 msgstr "[<%s>]..."
 
-#: tools/virsh.c:1303
+#: tools/virsh.c:15662
 msgid ""
 "\n"
 "  DESCRIPTION\n"
@@ -27598,7 +27953,7 @@
 "\n"
 "  DESCRIPTION\n"
 
-#: tools/virsh.c:1309
+#: tools/virsh.c:15668
 msgid ""
 "\n"
 "  OPTIONS\n"
@@ -27606,54 +27961,62 @@
 "\n"
 "  OPTIONS\n"
 
-#: tools/virsh.c:1317
+#: tools/virsh.c:15676
 #, c-format
 msgid "[--%s] <number>"
 msgstr "[--%s] <number>"
 
-#: tools/virsh.c:1318
+#: tools/virsh.c:15677
 #, c-format
 msgid "--%s <number>"
 msgstr "--%s <number>"
 
-#: tools/virsh.c:1322
+#: tools/virsh.c:15681
 #, c-format
 msgid "--%s <string>"
 msgstr "--%s <string>"
 
-#: tools/virsh.c:1325 tools/virsh.c:1330
+#: tools/virsh.c:15684 tools/virsh.c:15689
 #, c-format
 msgid "[--%s] <string>"
 msgstr "[--%s] <string>"
 
-#: tools/virsh.c:1330
+#: tools/virsh.c:15689
 #, c-format
 msgid "<%s>"
 msgstr "<%s>"
 
-#: tools/virsh.c:1564
+#: tools/virsh.c:1570
 msgid "Mandatory option not present"
 msgstr ""
 
-#: tools/virsh.c:1566
+#: tools/virsh.c:1572
 msgid "Option argument is empty"
 msgstr ""
 
-#: tools/virsh.c:1569
+#: tools/virsh.c:1575
 #, c-format
 msgid "Failed to get option '%s': %s"
 msgstr ""
 
-#: tools/virsh.c:1719
+#: tools/virsh.c:16052
 #, c-format
 msgid "internal error: virsh %s: no %s VSH_OT_DATA option"
 msgstr "内部错误：virsh %s：没有 %s VSH_OT_DATA 选项"
 
-#: tools/virsh.c:1729
+#: tools/virsh.c:1739
+msgid "invalid timeout"
+msgstr "无效超时"
+
+#: tools/virsh.c:1745
+msgid "timeout is too big"
+msgstr "超时太大"
+
+#: tools/virsh.c:16961
 msgid "no valid connection"
 msgstr "无效的连接"
 
-#: tools/virsh.c:1794
+#: tools/virsh.c:16387
 #, c-format
 msgid ""
 "\n"
@@ -27664,129 +28027,135 @@
 "(Time: %.3f ms)\n"
 "\n"
 
-#: tools/virsh.c:1865
+#: tools/virsh.c:16457
 #, c-format
 msgid "unknown command: '%s'"
 msgstr "未知的命令：'%s'"
 
-#: tools/virsh.c:1908
+#: tools/virsh.c:16496
 #, c-format
 msgid "expected syntax: --%s <%s>"
 msgstr "期望的使用方法：--%s <%s>"
 
-#: tools/virsh.c:1911
+#: tools/virsh.c:16499
 msgid "number"
 msgstr "数字"
 
-#: tools/virsh.c:1911
+#: tools/virsh.c:16499
 msgid "string"
 msgstr "字符串"
 
-#: tools/virsh.c:1935
+#: tools/virsh.c:16521
 #, c-format
 msgid "unexpected data '%s'"
 msgstr "非期望的数据 '%s'"
 
-#: tools/virsh.c:1957
+#: tools/virsh.c:16543
 msgid "optdata"
 msgstr "optdata"
 
-#: tools/virsh.c:1957
+#: tools/virsh.c:16543
 msgid "bool"
 msgstr "bool"
 
-#: tools/virsh.c:1958
+#: tools/virsh.c:16544
 msgid "(none)"
 msgstr "(none)"
 
-#: tools/virsh.c:2093
+#: tools/virsh.c:16660
 msgid "dangling \\"
 msgstr "dangling \\"
 
-#: tools/virsh.c:2106
+#: tools/virsh.c:16673
 msgid "missing \""
 msgstr "缺少 \""
 
-#: tools/virsh.c:2190 tools/virsh-domain-monitor.c:1276
-#: tools/virsh-domain-monitor.c:1289 tools/virsh-network.c:377
-#: tools/virsh-network.c:383 tools/virsh-network.c:388
-#: tools/virsh-network.c:705 tools/virsh-network.c:711 tools/virsh-pool.c:1064
-#: tools/virsh-pool.c:1075 tools/virsh-pool.c:1558 tools/virsh-pool.c:1564
-#: tools/virsh-snapshot.c:938 tools/virsh-snapshot.c:1023
+#: tools/virsh.c:3373 tools/virsh.c:3386 tools/virsh.c:6686 tools/virsh.c:6692
+#: tools/virsh.c:6697 tools/virsh.c:6893 tools/virsh.c:6916 tools/virsh.c:8966
+#: tools/virsh.c:8977 tools/virsh.c:9452 tools/virsh.c:9461
+#: tools/virsh.c:16889
 msgid "yes"
 msgstr "是"
 
-#: tools/virsh.c:2190 tools/virsh-domain-monitor.c:1276
-#: tools/virsh-domain-monitor.c:1289 tools/virsh-network.c:377
-#: tools/virsh-network.c:383 tools/virsh-network.c:388
-#: tools/virsh-network.c:705 tools/virsh-network.c:711 tools/virsh-pool.c:1064
-#: tools/virsh-pool.c:1075 tools/virsh-pool.c:1558 tools/virsh-pool.c:1564
-#: tools/virsh-snapshot.c:938 tools/virsh-snapshot.c:1023
+#: tools/virsh.c:3373 tools/virsh.c:3386 tools/virsh.c:6686 tools/virsh.c:6692
+#: tools/virsh.c:6697 tools/virsh.c:6893 tools/virsh.c:6916 tools/virsh.c:8966
+#: tools/virsh.c:8977 tools/virsh.c:9452 tools/virsh.c:9461
+#: tools/virsh.c:16889
 msgid "no"
 msgstr "否"
 
-#: tools/virsh.c:2198
+#: tools/virsh.c:2228
 #, c-format
 msgid "unimplemented parameter type %d"
 msgstr "未使用的参数类型 %d"
 
-#: tools/virsh.c:2343
+#: tools/virsh.c:2373
 msgid "unable to make terminal raw: console isn't a tty"
 msgstr ""
 
-#: tools/virsh.c:2353
+#: tools/console.c:326
 #, c-format
 msgid "unable to set tty attributes: %s"
 msgstr "无法设置 tty 属性：%s"
 
-#: tools/virsh.c:2379
+#: tools/virsh.c:17032
 msgid "error: "
 msgstr "错误： "
 
-#: tools/virsh.c:2429
+#: tools/virsh.c:2500
+#, c-format
+msgid "failed to create pipe: %s"
+msgstr ""
+
+#: tools/virsh.c:2558
+#, c-format
+msgid "failed to determine loop exit status: %s"
+msgstr ""
+
+#: tools/virsh.c:17085
 msgid "VIRSH_DEBUG not set with a valid numeric value"
 msgstr "未使用有效数字值设置 VIRSH_DEBUG"
 
-#: tools/virsh.c:2508
+#: tools/virsh.c:17158
 msgid "failed to get the log file information"
 msgstr "获得日志文件信息失败"
 
-#: tools/virsh.c:2513
+#: tools/virsh.c:17163
 msgid "the log path is not a file"
 msgstr "日志路径不是一个文件"
 
-#: tools/virsh.c:2521
+#: tools/virsh.c:17171
 msgid "failed to open the log file. check the log file path"
 msgstr "打开日志文件失败,检查日志文件路径"
 
-#: tools/virsh.c:2604
+#: tools/virsh.c:17253
 msgid "failed to write the log file"
 msgstr "写入日志文件失败"
 
-#: tools/virsh.c:2621
+#: tools/virsh.c:17268
 #, c-format
 msgid "%s: failed to write log file: %s"
 msgstr "%s：写入日志文件失败：%s"
 
-#: tools/virsh.c:2772
+#: tools/virsh.c:2949
 msgid "Bad $VIRSH_HISTSIZE value."
 msgstr ""
 
-#: tools/virsh.c:2776
+#: tools/virsh.c:2953
 #, c-format
 msgid "$VIRSH_HISTSIZE value should be between 0 and %d"
 msgstr ""
 
-#: tools/virsh.c:2788
+#: tools/virsh.c:17416
 msgid "Could not determine home directory"
 msgstr "无法确定主目录"
 
-#: tools/virsh.c:2818
+#: tools/virsh.c:17445
 #, c-format
 msgid "Failed to create '%s': %s"
 msgstr "生成 '%s' 失败：%s"
 
-#: tools/virsh.c:2929
+#: tools/virsh.c:17551
 #, c-format
 msgid ""
 "\n"
@@ -27829,12 +28198,12 @@
 "  commands (non interactive mode):\n"
 "\n"
 
-#: tools/virsh.c:2946
+#: tools/virsh.c:17568
 #, c-format
 msgid " %s (help keyword '%s')\n"
 msgstr " %s (help keyword '%s')\n"
 
-#: tools/virsh.c:2959
+#: tools/virsh.c:17578
 msgid ""
 "\n"
 "  (specify help <group> for details about the commands in the group)\n"
@@ -27842,7 +28211,7 @@
 "\n"
 "  (指定 help <group> 获取组中命令的详情)\n"
 
-#: tools/virsh.c:2961
+#: tools/virsh.c:17580
 msgid ""
 "\n"
 "  (specify help <command> for details about the command)\n"
@@ -27852,12 +28221,12 @@
 "  (使用 --help <command> 来获得这个命令的详细信息)\n"
 "\n"
 
-#: tools/virsh.c:2972
+#: tools/virsh.c:17591
 #, c-format
 msgid "Virsh command line tool of libvirt %s\n"
 msgstr "libvirt %s 的 virsh 命令行工具\n"
 
-#: tools/virsh.c:2973
+#: tools/virsh.c:17592
 #, c-format
 msgid ""
 "See web site at %s\n"
@@ -27866,74 +28235,74 @@
 "查看网页 %s\n"
 "\n"
 
-#: tools/virsh.c:2975
+#: tools/virsh.c:17594
 msgid "Compiled with support for:\n"
 msgstr "编译支持：\n"
 
-#: tools/virsh.c:2976
+#: tools/virsh.c:17595
 msgid " Hypervisors:"
 msgstr " Hypervisors:"
 
-#: tools/virsh.c:3018
+#: tools/virsh.c:17631
 msgid " Networking:"
 msgstr " 联网："
 
-#: tools/virsh.c:3044
+#: tools/virsh.c:17658
 msgid " Storage:"
 msgstr " 存储："
 
-#: tools/virsh.c:3077
+#: tools/virsh.c:17682
 msgid " Miscellaneous:"
 msgstr " 其他："
 
-#: tools/virsh.c:3148
+#: tools/virsh.c:3328
 #, c-format
 msgid "option %s takes a numeric argument"
 msgstr ""
 
-#: tools/virsh.c:3153
+#: tools/virsh.c:3333
 #, c-format
 msgid "ignoring debug level %d out of range [%d-%d]"
 msgstr "忽略 [%d-%d] 范围以外的调试级别 %d"
 
-#: tools/virsh.c:3197
+#: tools/virsh.c:17774
 #, c-format
 msgid "Invalid string '%s' for escape sequence"
 msgstr "换码字序列的无效字符串 '%s'"
 
-#: tools/virsh.c:3208
+#: tools/virsh.c:3388
 #, c-format
 msgid "option '-%c'/'--%s' requires an argument"
 msgstr ""
 
-#: tools/virsh.c:3211
+#: tools/virsh.c:3391
 #, c-format
 msgid "option '-%c' requires an argument"
 msgstr "选项 '-%c' 需要参数"
 
-#: tools/virsh.c:3215
+#: tools/virsh.c:17780
 #, c-format
 msgid "unsupported option '-%c'. See --help."
 msgstr "不支持选项 '-%c'。参阅 --help。"
 
-#: tools/virsh.c:3217
+#: tools/virsh.c:3397
 #, c-format
 msgid "unsupported option '%s'. See --help."
 msgstr ""
 
-#: tools/virsh.c:3220
+#: tools/virsh.c:3400
 msgid "unknown option"
 msgstr ""
 
-#: tools/virsh.c:3338
+#: tools/virsh.c:17837
 msgid "Failed to initialize mutex"
 msgstr "初始化互斥失败"
 
-#: tools/virsh.c:3343
+#: tools/virsh.c:17842
 msgid "Failed to initialize libvirt"
 msgstr "初始化 libvirt 失败"
 
-#: tools/virsh.c:3370
+#: tools/virsh.c:17871
 #, c-format
 msgid ""
 "Welcome to %s, the virtualization interactive terminal.\n"
@@ -27942,7 +28311,7 @@
 "欢迎使用 %s，虚拟化的交互式终端。\n"
 "\n"
 
-#: tools/virsh.c:3373
+#: tools/virsh.c:17874
 msgid ""
 "Type:  'help' for help with commands\n"
 "       'quit' to quit\n"
@@ -27952,1044 +28321,987 @@
 "       'quit' 退出\n"
 "\n"
 
-#: tools/virsh.h:411
+#: tools/virsh.h:426
 #, c-format
 msgid "Options --%s and --%s are mutually exclusive"
 msgstr ""
 
-#: tools/virsh-console.c:378
+#: tools/console.c:379
 msgid "unable to wait on console condition"
 msgstr "无法在控制台环境中等待"
 
-#: tools/virsh-domain-monitor.c:50
+#: tools/virsh-domain-monitor.c:47
 msgid "unspecified error"
 msgstr "未指定的错误"
 
-#: tools/virsh-domain-monitor.c:52
+#: tools/virsh-domain-monitor.c:48
 msgid "no space"
 msgstr "无空间"
 
-#: tools/virsh-domain-monitor.c:95
+#: tools/virsh-domain-monitor.c:92
 msgid "Failed to retrieve domain XML"
 msgstr "检索域 XML 失败"
 
-#: tools/virsh-domain-monitor.c:100
+#: tools/virsh-domain-monitor.c:97
 msgid "Couldn't parse domain XML"
 msgstr "无法解析域 XML"
 
-#: tools/virsh-domain-monitor.c:124
+#: tools/virsh.c:16926
 msgid "ok"
 msgstr "确定"
 
-#: tools/virsh-domain-monitor.c:126
+#: tools/virsh.c:16928
 msgid "background job"
 msgstr "背景任务"
 
-#: tools/virsh-domain-monitor.c:128
+#: tools/virsh.c:16930
 msgid "occupied"
 msgstr "已占用"
 
-#: tools/virsh-domain-monitor.c:135 tools/virsh-domain-monitor.c:293
-#: tools/virsh-domain-monitor.c:1274 tools/virsh-domain-monitor.c:1286
-#: tools/virsh-network.c:381 tools/virsh-pool.c:1072 tools/virsh-pool.c:1087
-#: tools/virsh-pool.c:1089 tools/virsh-pool.c:1090 tools/virsh-pool.c:1091
-#: tools/virsh-pool.c:1556 tools/virsh-volume.c:970 tools/virsh-volume.c:1378
-#: tools/virsh-volume.c:1385 tools/virsh-volume.c:1386
-#: tools/virsh-volume.c:1387
+#: tools/virsh.c:3371 tools/virsh.c:3383 tools/virsh.c:6690 tools/virsh.c:8974
+#: tools/virsh.c:8989 tools/virsh.c:8991 tools/virsh.c:8992 tools/virsh.c:8993
+#: tools/virsh.c:9450 tools/virsh.c:10372 tools/virsh.c:10514
+#: tools/virsh.c:10521 tools/virsh.c:10522 tools/virsh.c:10523
+#: tools/virsh.c:10539 tools/virsh.c:16855 tools/virsh.c:16935
 msgid "unknown"
 msgstr "未知"
 
-#: tools/virsh-domain-monitor.c:145 tools/virsh-domain.c:123
-#: tools/virsh-pool.c:1106 tools/virsh-pool.c:1539
+#: tools/virsh.c:16749 tools/virsh.c:16951
+msgid "no state"
+msgstr "没有状态"
+
+#: tools/virsh.c:9008 tools/virsh.c:9433 tools/virsh.c:16734
+#: tools/virsh.c:16947
 msgid "running"
 msgstr "running"
 
-#: tools/virsh-domain-monitor.c:147 tools/virsh-domain.c:121
+#: tools/virsh.c:16736 tools/virsh.c:16945
 msgid "idle"
 msgstr "闲置"
 
-#: tools/virsh-domain-monitor.c:149
+#: tools/virsh.c:16738
 msgid "paused"
 msgstr "暂停"
 
-#: tools/virsh-domain-monitor.c:151
+#: tools/virsh.c:16740
 msgid "in shutdown"
 msgstr "关闭"
 
-#: tools/virsh-domain-monitor.c:153
+#: tools/virsh.c:16742
 msgid "shut off"
 msgstr "关闭"
 
-#: tools/virsh-domain-monitor.c:155 tools/virsh-domain-monitor.c:196
-#: tools/virsh-domain-monitor.c:232 tools/virsh-domain-monitor.c:256
+#: tools/virsh.c:16744 tools/virsh.c:16830
 msgid "crashed"
 msgstr "崩溃"
 
-#: tools/virsh-domain-monitor.c:157
+#: tools/virsh-domain-monitor.c:141
 msgid "pmsuspended"
 msgstr "pmsuspended"
 
-#: tools/virsh-domain-monitor.c:162 tools/virsh-domain.c:127
-msgid "no state"
-msgstr "没有状态"
-
-#: tools/virsh-domain-monitor.c:180
+#: tools/virsh.c:16766
 msgid "booted"
 msgstr "已引导"
 
-#: tools/virsh-domain-monitor.c:182 tools/virsh-domain-monitor.c:258
+#: tools/virsh.c:16768 tools/virsh.c:16832
 msgid "migrated"
 msgstr "已迁移"
 
-#: tools/virsh-domain-monitor.c:184
+#: tools/virsh.c:16770
 msgid "restored"
 msgstr "已恢复"
 
-#: tools/virsh-domain-monitor.c:186 tools/virsh-domain-monitor.c:226
-#: tools/virsh-domain-monitor.c:264
+#: tools/virsh.c:16772 tools/virsh.c:16806 tools/virsh.c:16838
 msgid "from snapshot"
 msgstr "使用快照"
 
-#: tools/virsh-domain-monitor.c:188
+#: tools/virsh.c:16774
 msgid "unpaused"
 msgstr "已取消暂停"
 
-#: tools/virsh-domain-monitor.c:190
+#: tools/virsh.c:16776
 msgid "migration canceled"
 msgstr "取消迁移"
 
-#: tools/virsh-domain-monitor.c:192
+#: tools/virsh.c:16778
 msgid "save canceled"
 msgstr "取消保存"
 
-#: tools/virsh-domain-monitor.c:194
+#: tools/virsh-domain-monitor.c:166
 msgid "event wakeup"
 msgstr "事件唤醒"
 
-#: tools/virsh-domain-monitor.c:214 tools/virsh-domain-monitor.c:242
+#: tools/virsh.c:16794 tools/virsh.c:16817
 msgid "user"
 msgstr "用户"
 
-#: tools/virsh-domain-monitor.c:216
+#: tools/virsh.c:16796
 msgid "migrating"
 msgstr "迁移中"
 
-#: tools/virsh-domain-monitor.c:218
+#: tools/virsh.c:16798
 msgid "saving"
 msgstr "保存中"
 
-#: tools/virsh-domain-monitor.c:220
+#: tools/virsh.c:16800
 msgid "dumping"
 msgstr "转储中"
 
-#: tools/virsh-domain-monitor.c:222
+#: tools/virsh.c:16802
 msgid "I/O error"
 msgstr "I/O 错误"
 
-#: tools/virsh-domain-monitor.c:224
+#: tools/virsh.c:16804
 msgid "watchdog"
 msgstr "watchdog"
 
-#: tools/virsh-domain-monitor.c:228
+#: tools/virsh.c:16808
 msgid "shutting down"
 msgstr "关机"
 
-#: tools/virsh-domain-monitor.c:230
+#: tools/virsh-domain-monitor.c:186
 msgid "creating snapshot"
 msgstr ""
 
-#: tools/virsh-domain-monitor.c:252
+#: tools/virsh.c:16826
 msgid "shutdown"
 msgstr "关闭"
 
-#: tools/virsh-domain-monitor.c:254
+#: tools/virsh.c:16828
 msgid "destroyed"
 msgstr "已销毁"
 
-#: tools/virsh-domain-monitor.c:260 tools/virsh-domain-monitor.c:1847
-#: tools/virsh-domain-monitor.c:1854
+#: tools/virsh.c:953 tools/virsh.c:16834
 msgid "saved"
 msgstr "已保存"
 
-#: tools/virsh-domain-monitor.c:262
+#: tools/virsh.c:16836
 msgid "failed"
 msgstr "失败"
 
-#: tools/virsh-domain-monitor.c:274
+#: tools/virsh-domain-monitor.c:211
 msgid "panicked"
 msgstr ""
 
-#: tools/virsh-domain-monitor.c:301
+#: tools/virsh.c:1584
 msgid "get memory statistics for a domain"
 msgstr "获取域的内存统计"
 
-#: tools/virsh-domain-monitor.c:304
+#: tools/virsh-domain-monitor.c:262
 msgid "Get memory statistics for a running domain."
 msgstr "获取运行域的内存统计"
 
-#: tools/virsh-domain-monitor.c:313 tools/virsh-domain-monitor.c:437
-#: tools/virsh-domain-monitor.c:492 tools/virsh-domain-monitor.c:606
-#: tools/virsh-domain-monitor.c:711 tools/virsh-domain-monitor.c:826
-#: tools/virsh-domain-monitor.c:879 tools/virsh-domain-monitor.c:1062
-#: tools/virsh-domain-monitor.c:1204 tools/virsh-domain-monitor.c:1346
-#: tools/virsh-domain.c:168 tools/virsh-domain.c:270 tools/virsh-domain.c:709
-#: tools/virsh-domain.c:963 tools/virsh-domain.c:1019
-#: tools/virsh-domain.c:1243 tools/virsh-domain.c:1506
-#: tools/virsh-domain.c:1685 tools/virsh-domain.c:1891
-#: tools/virsh-domain.c:1989 tools/virsh-domain.c:2155
-#: tools/virsh-domain.c:2225 tools/virsh-domain.c:2322
-#: tools/virsh-domain.c:2509 tools/virsh-domain.c:2696
-#: tools/virsh-domain.c:2742 tools/virsh-domain.c:2826
-#: tools/virsh-domain.c:3452 tools/virsh-domain.c:3921
-#: tools/virsh-domain.c:4041 tools/virsh-domain.c:4100
-#: tools/virsh-domain.c:4443 tools/virsh-domain.c:4573
-#: tools/virsh-domain.c:4721 tools/virsh-domain.c:4764
-#: tools/virsh-domain.c:4850 tools/virsh-domain.c:4931
-#: tools/virsh-domain.c:4974 tools/virsh-domain.c:5187
-#: tools/virsh-domain.c:5225 tools/virsh-domain.c:5436
-#: tools/virsh-domain.c:5545 tools/virsh-domain.c:5832
-#: tools/virsh-domain.c:5951 tools/virsh-domain.c:6272
-#: tools/virsh-domain.c:6603 tools/virsh-domain.c:6660
-#: tools/virsh-domain.c:6832 tools/virsh-domain.c:6989
-#: tools/virsh-domain.c:7027 tools/virsh-domain.c:7129
-#: tools/virsh-domain.c:7244 tools/virsh-domain.c:7341
-#: tools/virsh-domain.c:7443 tools/virsh-domain.c:7642
-#: tools/virsh-domain.c:7789 tools/virsh-domain.c:7939
-#: tools/virsh-domain.c:8068 tools/virsh-domain.c:8206
-#: tools/virsh-domain.c:8574 tools/virsh-domain.c:8852
-#: tools/virsh-domain.c:8906 tools/virsh-domain.c:8968
-#: tools/virsh-domain.c:9020 tools/virsh-domain.c:9064
-#: tools/virsh-domain.c:9251 tools/virsh-domain.c:9324
-#: tools/virsh-domain.c:9384 tools/virsh-domain.c:9547
-#: tools/virsh-domain.c:9648 tools/virsh-domain.c:9750
-#: tools/virsh-domain.c:10120 tools/virsh-domain.c:10235
-#: tools/virsh-domain.c:10295 tools/virsh-domain.c:10446
-#: tools/virsh-snapshot.c:128 tools/virsh-snapshot.c:331
-#: tools/virsh-snapshot.c:523 tools/virsh-snapshot.c:645
-#: tools/virsh-snapshot.c:881 tools/virsh-snapshot.c:1438
-#: tools/virsh-snapshot.c:1702 tools/virsh-snapshot.c:1770
-#: tools/virsh-snapshot.c:1838 tools/virsh-snapshot.c:1931
+#: tools/virsh.c:685 tools/virsh.c:788 tools/virsh.c:973 tools/virsh.c:1021
+#: tools/virsh.c:1068 tools/virsh.c:1243 tools/virsh.c:1309 tools/virsh.c:1474
+#: tools/virsh.c:1590 tools/virsh.c:1646 tools/virsh.c:1693 tools/virsh.c:1773
+#: tools/virsh.c:2199 tools/virsh.c:2473 tools/virsh.c:2523 tools/virsh.c:2577
+#: tools/virsh.c:2905 tools/virsh.c:2958 tools/virsh.c:3108 tools/virsh.c:3146
+#: tools/virsh.c:3184 tools/virsh.c:3222 tools/virsh.c:3261 tools/virsh.c:3299
+#: tools/virsh.c:3437 tools/virsh.c:3520 tools/virsh.c:3717 tools/virsh.c:3925
+#: tools/virsh.c:4031 tools/virsh.c:4275 tools/virsh.c:4369 tools/virsh.c:4403
+#: tools/virsh.c:4490 tools/virsh.c:4580 tools/virsh.c:4660 tools/virsh.c:4837
+#: tools/virsh.c:5338 tools/virsh.c:5595 tools/virsh.c:5886 tools/virsh.c:5931
+#: tools/virsh.c:5974 tools/virsh.c:6058 tools/virsh.c:6082 tools/virsh.c:6138
+#: tools/virsh.c:6245 tools/virsh.c:11728 tools/virsh.c:11797
+#: tools/virsh.c:11852 tools/virsh.c:12161 tools/virsh.c:12240
+#: tools/virsh.c:12310 tools/virsh.c:12509 tools/virsh.c:12644
+#: tools/virsh.c:12989 tools/virsh.c:13566 tools/virsh.c:13785
+#: tools/virsh.c:13915 tools/virsh.c:14047 tools/virsh.c:14185
+#: tools/virsh.c:14358 tools/virsh.c:14722 tools/virsh.c:14784
+#: tools/virsh.c:14841 tools/virsh.c:14915 tools/virsh.c:14986
 msgid "domain name, id or uuid"
 msgstr "域名，id 或 uuid"
 
-#: tools/virsh-domain-monitor.c:318
+#: tools/virsh-domain-monitor.c:276
 msgid "period in seconds to set collection"
 msgstr ""
 
-#: tools/virsh-domain-monitor.c:322 tools/virsh-domain.c:181
-#: tools/virsh-domain.c:340 tools/virsh-domain.c:751 tools/virsh-domain.c:1076
-#: tools/virsh-domain.c:1255 tools/virsh-domain.c:2340
-#: tools/virsh-domain.c:2526 tools/virsh-domain.c:5558
-#: tools/virsh-domain.c:5841 tools/virsh-domain.c:5964
-#: tools/virsh-domain.c:7257 tools/virsh-domain.c:7354
-#: tools/virsh-domain.c:7463 tools/virsh-domain.c:7654
-#: tools/virsh-domain.c:9560 tools/virsh-domain.c:9661
-#: tools/virsh-domain.c:9767 tools/virsh-domain.c:10133
+#: tools/virsh.c:4035 tools/virsh.c:4278 tools/virsh.c:4492 tools/virsh.c:4582
+#: tools/virsh.c:4665 tools/virsh.c:4846 tools/virsh.c:6259
 msgid "affect next boot"
 msgstr "影响下一次引导"
 
-#: tools/virsh-domain-monitor.c:326 tools/virsh-domain.c:185
-#: tools/virsh-domain.c:344 tools/virsh-domain.c:755 tools/virsh-domain.c:1080
-#: tools/virsh-domain.c:1259 tools/virsh-domain.c:2530
-#: tools/virsh-domain.c:5562 tools/virsh-domain.c:5845
-#: tools/virsh-domain.c:5968 tools/virsh-domain.c:7261
-#: tools/virsh-domain.c:7358 tools/virsh-domain.c:7467
-#: tools/virsh-domain.c:7658 tools/virsh-domain.c:9564
-#: tools/virsh-domain.c:9665 tools/virsh-domain.c:9771
-#: tools/virsh-domain.c:10137
+#: tools/virsh.c:4036 tools/virsh.c:4279 tools/virsh.c:4493 tools/virsh.c:4583
+#: tools/virsh.c:4666 tools/virsh.c:4847 tools/virsh.c:6260
 msgid "affect running domain"
 msgstr "影响运行的域"
 
-#: tools/virsh-domain-monitor.c:330 tools/virsh-domain.c:189
-#: tools/virsh-domain.c:348 tools/virsh-domain.c:759 tools/virsh-domain.c:1084
-#: tools/virsh-domain.c:1263 tools/virsh-domain.c:2534
-#: tools/virsh-domain.c:5566 tools/virsh-domain.c:5849
-#: tools/virsh-domain.c:5972 tools/virsh-domain.c:7265
-#: tools/virsh-domain.c:7362 tools/virsh-domain.c:7471
-#: tools/virsh-domain.c:7662 tools/virsh-domain.c:9568
-#: tools/virsh-domain.c:9669 tools/virsh-domain.c:9775
-#: tools/virsh-domain.c:10141
+#: tools/virsh.c:4037 tools/virsh.c:4280 tools/virsh.c:4494 tools/virsh.c:4584
+#: tools/virsh.c:4667 tools/virsh.c:4848 tools/virsh.c:6261
 msgid "affect current domain"
 msgstr "影响当前域"
 
-#: tools/virsh-domain-monitor.c:371
+#: tools/virsh-domain-monitor.c:329
 msgid "Unable to parse integer parameter."
 msgstr ""
 
-#: tools/virsh-domain-monitor.c:376
+#: tools/virsh-domain-monitor.c:334
 #, c-format
 msgid "Invalid collection period value '%d'"
 msgstr ""
 
-#: tools/virsh-domain-monitor.c:382
+#: tools/virsh-domain-monitor.c:340
 msgid "Unable to change balloon collection period."
 msgstr ""
 
-#: tools/virsh-domain-monitor.c:391
+#: tools/virsh.c:1610
 #, c-format
 msgid "Failed to get memory statistics for domain %s"
 msgstr "获取域 %s 的内存统计失败"
 
-#: tools/virsh-domain-monitor.c:425
+#: tools/virsh.c:1640
 msgid "domain block device size information"
 msgstr "域块设备大小信息"
 
-#: tools/virsh-domain-monitor.c:428
+#: tools/virsh.c:1641
 msgid "Get block device size info for a domain."
 msgstr "获取域块设备大小信息"
 
-#: tools/virsh-domain-monitor.c:442 tools/virsh-domain-monitor.c:884
-#: tools/virsh-domain.c:1024
+#: tools/virsh.c:1069 tools/virsh.c:1647 tools/virsh.c:6246
 msgid "block device"
 msgstr "阻止设备"
 
-#: tools/virsh-domain-monitor.c:464 tools/virsh-pool.c:1569
-#: tools/virsh-volume.c:1020
+#: tools/virsh.c:1675 tools/virsh.c:9466 tools/virsh.c:10376
 msgid "Capacity:"
 msgstr "容量："
 
-#: tools/virsh-domain-monitor.c:465 tools/virsh-pool.c:1572
-#: tools/virsh-volume.c:1023
+#: tools/virsh.c:1676 tools/virsh.c:9469 tools/virsh.c:10379
 msgid "Allocation:"
 msgstr "分配："
 
-#: tools/virsh-domain-monitor.c:466
+#: tools/virsh.c:1677
 msgid "Physical:"
 msgstr "物理："
 
-#: tools/virsh-domain-monitor.c:480
+#: tools/virsh.c:1687
 msgid "list all domain blocks"
 msgstr "列出所有域块"
 
-#: tools/virsh-domain-monitor.c:483
+#: tools/virsh-domain-monitor.c:441
 msgid "Get the summary of block devices for a domain."
 msgstr "获取域块设备小结"
 
-#: tools/virsh-domain-monitor.c:496 tools/virsh-domain-monitor.c:610
+#: tools/virsh.c:1695
 msgid "get inactive rather than running configuration"
 msgstr "获取不活跃而不是运行的配置"
 
-#: tools/virsh-domain-monitor.c:500
+#: tools/virsh-domain-monitor.c:458
 msgid "additionally display the type and device value"
 msgstr "type 和 device 值的附加显示"
 
-#: tools/virsh-domain-monitor.c:540 tools/virsh-domain-monitor.c:646
-#: tools/virsh-volume.c:1480 tools/virsh-volume.c:1520
+#: tools/virsh.c:10629 tools/virsh.c:10669
 msgid "Type"
 msgstr "类型"
 
-#: tools/virsh-domain-monitor.c:541
+#: tools/virsh-domain-monitor.c:499
 msgid "Device"
 msgstr "Device"
 
-#: tools/virsh-domain-monitor.c:541 tools/virsh-domain-monitor.c:543
+#: tools/virsh.c:1733
 msgid "Target"
 msgstr "目标"
 
-#: tools/virsh-domain-monitor.c:541 tools/virsh-domain-monitor.c:543
-#: tools/virsh-domain-monitor.c:647
+#: tools/virsh.c:1733
 msgid "Source"
 msgstr "源"
 
-#: tools/virsh-domain-monitor.c:597
+#: tools/virsh-domain-monitor.c:563
 msgid "list all domain virtual interfaces"
 msgstr "列出所有域虚拟接口"
 
-#: tools/virsh-domain-monitor.c:598
+#: tools/virsh-domain-monitor.c:564
 msgid "Get the summary of virtual interfaces for a domain."
 msgstr "获取域虚拟接口小结"
 
-#: tools/virsh-domain-monitor.c:646
+#: tools/virsh-domain-monitor.c:612
 msgid "Interface"
 msgstr "接口"
 
-#: tools/virsh-domain-monitor.c:647
+#: tools/virsh-domain-monitor.c:613
 msgid "Model"
 msgstr "型号"
 
-#: tools/virsh-domain-monitor.c:647
+#: tools/virsh-domain-monitor.c:613
 msgid "MAC"
 msgstr "MAC"
 
-#: tools/virsh-domain-monitor.c:699
+#: tools/virsh.c:1468
 msgid "get link state of a virtual interface"
 msgstr "获取虚拟接口链接状态"
 
-#: tools/virsh-domain-monitor.c:702
+#: tools/virsh.c:1469
 msgid "Get link state of a domain's virtual interface."
 msgstr "获取域虚拟接口链接状态"
 
-#: tools/virsh-domain-monitor.c:716 tools/virsh-domain.c:2327
-#: tools/virsh-domain.c:2514
+#: tools/virsh.c:1310 tools/virsh.c:1475
 msgid "interface device (MAC Address)"
 msgstr "接口失败 (MAC 地址)"
 
-#: tools/virsh-domain-monitor.c:724
+#: tools/virsh.c:1476
 msgid "Get persistent interface state"
 msgstr "获取持续接口状态"
 
-#: tools/virsh-domain-monitor.c:756 tools/virsh-domain.c:2383
+#: tools/virsh.c:1356 tools/virsh.c:1512
 msgid "Failed to get domain description xml"
 msgstr "获取域描述 xml 失败"
 
-#: tools/virsh-domain-monitor.c:761 tools/virsh-domain.c:2399
+#: tools/virsh.c:1372 tools/virsh.c:1519
 msgid "Failed to parse domain description xml"
 msgstr "解释域描述 xml 失败"
 
-#: tools/virsh-domain-monitor.c:775
+#: tools/virsh-domain-monitor.c:741
 msgid "Failed to extract interface information"
 msgstr ""
 
-#: tools/virsh-domain-monitor.c:781
+#: tools/virsh-domain-monitor.c:747
 #, c-format
 msgid "Interface (mac: %s) not found."
 msgstr ""
 
-#: tools/virsh-domain-monitor.c:783
+#: tools/virsh-domain-monitor.c:749
 #, c-format
 msgid "Interface (dev: %s) not found."
 msgstr ""
 
-#: tools/virsh-domain-monitor.c:814
+#: tools/virsh.c:1015
 msgid "domain control interface state"
 msgstr "域控制接口状态"
 
-#: tools/virsh-domain-monitor.c:817
+#: tools/virsh.c:1016
 msgid "Returns state of a control interface to the domain."
 msgstr "向域返回控制接口状态"
 
-#: tools/virsh-domain-monitor.c:866
+#: tools/virsh.c:1061
 msgid "get device block stats for a domain"
 msgstr "获得域设备块状态"
 
-#: tools/virsh-domain-monitor.c:869
+#: tools/virsh.c:1062
 msgid ""
 "Get device block stats for a running domain. See man page or use --human for "
 "explanation of fields"
 msgstr "在运行的域中获取设备块状态。各字段的解释清参考 man page 或者使用 --human。"
 
-#: tools/virsh-domain-monitor.c:888
+#: tools/virsh.c:1070
 msgid "print a more human readable output"
 msgstr "输出多个可读输出结果"
 
-#: tools/virsh-domain-monitor.c:903
+#: tools/virsh.c:1084
 msgid "number of read operations:"
 msgstr "读取操作数："
 
-#: tools/virsh-domain-monitor.c:905
+#: tools/virsh.c:1086
 msgid "number of bytes read:"
 msgstr "读取字节数："
 
-#: tools/virsh-domain-monitor.c:907
+#: tools/virsh.c:1088
 msgid "number of write operations:"
 msgstr "写入操作数："
 
-#: tools/virsh-domain-monitor.c:909
+#: tools/virsh.c:1090
 msgid "number of bytes written:"
 msgstr "写入字节数："
 
-#: tools/virsh-domain-monitor.c:911
+#: tools/virsh.c:1092
 msgid "error count:"
 msgstr "错误计数："
 
-#: tools/virsh-domain-monitor.c:913
+#: tools/virsh.c:1094
 msgid "number of flush operations:"
 msgstr "flush 操作数："
 
-#: tools/virsh-domain-monitor.c:915
+#: tools/virsh.c:1096
 msgid "total duration of reads (ns):"
 msgstr "读取总计消耗时间 (ns)："
 
-#: tools/virsh-domain-monitor.c:917
+#: tools/virsh.c:1098
 msgid "total duration of writes (ns):"
 msgstr "写入总计消耗时间 (ns)："
 
-#: tools/virsh-domain-monitor.c:919
+#: tools/virsh.c:1100
 msgid "total duration of flushes (ns):"
 msgstr "Flush 总计消耗时间 (ns)："
 
-#: tools/virsh-domain-monitor.c:967 tools/virsh-domain-monitor.c:987
+#: tools/virsh.c:1152 tools/virsh.c:1172
 #, c-format
 msgid "Failed to get block stats %s %s"
 msgstr "无法获得块状态 %s %s"
 
-#: tools/virsh-domain-monitor.c:974 tools/virsh-domain-monitor.c:993
+#: tools/virsh.c:1159 tools/virsh.c:1178
 #, c-format
 msgid "Device: %s\n"
 msgstr "失败：%s\n"
 
-#: tools/virsh-domain-monitor.c:1050
+#: tools/virsh-domain-monitor.c:960
+#, c-format
+msgid "Failed to get block stats for domain '%s' device '%s'"
+msgstr ""
+
+#: tools/virsh.c:1237
 msgid "get network interface stats for a domain"
 msgstr "获得域网络接口状态"
 
-#: tools/virsh-domain-monitor.c:1053
+#: tools/virsh.c:1238
 msgid "Get network interface stats for a running domain."
 msgstr "获得运行域的网络接口状态。"
 
-#: tools/virsh-domain-monitor.c:1067
+#: tools/virsh.c:1244
 msgid "interface device"
 msgstr "接口设备"
 
-#: tools/virsh-domain-monitor.c:1087
+#: tools/virsh.c:1267
 #, c-format
 msgid "Failed to get interface stats %s %s"
 msgstr "无法获得接口状态 %s %s"
 
-#: tools/virsh-domain-monitor.c:1127
+#: tools/virsh-domain-monitor.c:1100
 msgid "Show errors on block devices"
 msgstr "在块设备中显示错误"
 
-#: tools/virsh-domain-monitor.c:1130
+#: tools/virsh-domain-monitor.c:1103
 msgid "Show block device errors"
 msgstr "显示块设备错误"
 
-#: tools/virsh-domain-monitor.c:1139
+#: tools/virsh-domain-monitor.c:1112
 msgid "domain name, id, or uuid"
 msgstr "域名，id 或者 uuid"
 
-#: tools/virsh-domain-monitor.c:1170
+#: tools/virsh-domain-monitor.c:1143
 msgid "No errors found\n"
 msgstr "未找到错误\n"
 
-#: tools/virsh-domain-monitor.c:1192
+#: tools/virsh.c:3293
 msgid "domain information"
 msgstr "域信息"
 
-#: tools/virsh-domain-monitor.c:1195
+#: tools/virsh.c:3294
 msgid "Returns basic information about the domain."
 msgstr "返回这个域的基本信息。"
 
-#: tools/virsh-domain-monitor.c:1228 tools/virsh-domain-monitor.c:1230
+#: tools/virsh.c:3325 tools/virsh.c:3327
 msgid "Id:"
 msgstr "Id:"
 
-#: tools/virsh-domain-monitor.c:1231 tools/virsh-network.c:370
-#: tools/virsh-pool.c:1520 tools/virsh-snapshot.c:920
-#: tools/virsh-volume.c:1010
+#: tools/virsh.c:3328 tools/virsh.c:9414 tools/virsh.c:10353
 msgid "Name:"
 msgstr "名称："
 
-#: tools/virsh-domain-monitor.c:1234 tools/virsh-network.c:373
-#: tools/virsh-pool.c:1523
+#: tools/virsh.c:3331 tools/virsh.c:9417
 msgid "UUID:"
 msgstr "UUID:"
 
-#: tools/virsh-domain-monitor.c:1237
+#: tools/virsh.c:3334
 msgid "OS Type:"
 msgstr "OS 类型："
 
-#: tools/virsh-domain-monitor.c:1242 tools/virsh-domain.c:5476
-#: tools/virsh-domain.c:5505 tools/virsh-pool.c:1530 tools/virsh-pool.c:1534
-#: tools/virsh-pool.c:1538 tools/virsh-pool.c:1542 tools/virsh-pool.c:1546
-#: tools/virsh-snapshot.c:956
+#: tools/virsh.c:3339 tools/virsh.c:3969 tools/virsh.c:3998 tools/virsh.c:9424
+#: tools/virsh.c:9428 tools/virsh.c:9432 tools/virsh.c:9436 tools/virsh.c:9440
 msgid "State:"
 msgstr "状态："
 
-#: tools/virsh-domain-monitor.c:1245 tools/virsh-host.c:256
+#: tools/virsh.c:3342 tools/virsh.c:5037
 msgid "CPU(s):"
 msgstr "CPU："
 
-#: tools/virsh-domain-monitor.c:1252 tools/virsh-domain.c:5483
+#: tools/virsh.c:3349 tools/virsh.c:3976
 msgid "CPU time:"
 msgstr "CPU 时间："
 
-#: tools/virsh-domain-monitor.c:1256 tools/virsh-domain-monitor.c:1259
+#: tools/virsh.c:3353 tools/virsh.c:3356
 msgid "Max memory:"
 msgstr "最大内存："
 
-#: tools/virsh-domain-monitor.c:1260
+#: tools/virsh.c:3357
 msgid "no limit"
 msgstr "没有限制"
 
-#: tools/virsh-domain-monitor.c:1262
+#: tools/virsh.c:3359
 msgid "Used memory:"
 msgstr "使用的内存："
 
-#: tools/virsh-domain-monitor.c:1274 tools/virsh-domain-monitor.c:1276
-#: tools/virsh-network.c:381 tools/virsh-network.c:383 tools/virsh-pool.c:1556
-#: tools/virsh-pool.c:1558
+#: tools/virsh.c:3371 tools/virsh.c:3373 tools/virsh.c:6690 tools/virsh.c:6692
+#: tools/virsh.c:9450 tools/virsh.c:9452
 msgid "Persistent:"
 msgstr "持久："
 
-#: tools/virsh-domain-monitor.c:1280 tools/virsh-network.c:386
-#: tools/virsh-network.c:388 tools/virsh-pool.c:1562 tools/virsh-pool.c:1564
+#: tools/virsh.c:3377 tools/virsh.c:6695 tools/virsh.c:6697 tools/virsh.c:9459
+#: tools/virsh.c:9461
 msgid "Autostart:"
 msgstr "自动启动："
 
-#: tools/virsh-domain-monitor.c:1281
+#: tools/virsh.c:3378
 msgid "enable"
 msgstr "启用"
 
-#: tools/virsh-domain-monitor.c:1281
+#: tools/virsh.c:3378
 msgid "disable"
 msgstr "禁用"
 
-#: tools/virsh-domain-monitor.c:1286 tools/virsh-domain-monitor.c:1288
+#: tools/virsh.c:3383 tools/virsh.c:3385
 msgid "Managed save:"
 msgstr "管理的保存："
 
-#: tools/virsh-domain-monitor.c:1303
+#: tools/virsh.c:3401
 msgid "Security model:"
 msgstr "安全性模式："
 
-#: tools/virsh-domain-monitor.c:1304
+#: tools/virsh.c:3402
 msgid "Security DOI:"
 msgstr "安全性 DOI："
 
-#: tools/virsh-domain-monitor.c:1318
+#: tools/virsh.c:3416
 msgid "Security label:"
 msgstr "安全性标签："
 
-#: tools/virsh-domain-monitor.c:1334
+#: tools/virsh.c:967
 msgid "domain state"
 msgstr "域状态"
 
-#: tools/virsh-domain-monitor.c:1337
+#: tools/virsh.c:968
 msgid "Returns state about a domain."
 msgstr "返回某个域的状态。"
 
-#: tools/virsh-domain-monitor.c:1350
+#: tools/virsh.c:974
 msgid "also print reason for the state"
 msgstr "同时输出状态原因"
 
-#: tools/virsh-domain-monitor.c:1390
+#: tools/virsh.c:851
 msgid "list domains"
 msgstr "列出域"
 
-#: tools/virsh-domain-monitor.c:1393
+#: tools/virsh.c:852
 msgid "Returns list of domains."
 msgstr "返回域列表"
 
-#: tools/virsh-domain-monitor.c:1500
+#: tools/virsh-domain-monitor.c:1473
 msgid "Failed to list domains"
 msgstr "列出域失败"
 
-#: tools/virsh-domain-monitor.c:1512 tools/virsh-domain-monitor.c:1520
+#: tools/virsh.c:885 tools/virsh.c:892
 msgid "Failed to list active domains"
 msgstr "列出活跃的域失败"
 
-#: tools/virsh-domain-monitor.c:1529 tools/virsh-domain-monitor.c:1538
+#: tools/virsh.c:903 tools/virsh.c:911
 msgid "Failed to list inactive domains"
 msgstr "列出不活跃的域失败"
 
-#: tools/virsh-domain-monitor.c:1572
+#: tools/virsh-domain-monitor.c:1545
 msgid "Failed to get domain persistence info"
 msgstr "获取域持久信息失败"
 
-#: tools/virsh-domain-monitor.c:1584
+#: tools/virsh-domain-monitor.c:1557
 msgid "Failed to get domain state"
 msgstr "获取域状态失败"
 
-#: tools/virsh-domain-monitor.c:1604
+#: tools/virsh-domain-monitor.c:1577
 msgid "Failed to get domain autostart state"
 msgstr "获取域 autostart 状态失败"
 
-#: tools/virsh-domain-monitor.c:1617
+#: tools/virsh-domain-monitor.c:1590
 msgid "Failed to check for managed save image"
 msgstr "检查管理保存映像失败"
 
-#: tools/virsh-domain-monitor.c:1629
+#: tools/virsh-domain-monitor.c:1602
 msgid "Failed to get snapshot count"
 msgstr "获取快照计数失败"
 
-#: tools/virsh-domain-monitor.c:1676
+#: tools/virsh.c:857
 msgid "list inactive domains"
 msgstr "列出不活跃的域"
 
-#: tools/virsh-domain-monitor.c:1680
+#: tools/virsh.c:858
 msgid "list inactive & active domains"
 msgstr "不活跃和活跃的域列表"
 
-#: tools/virsh-domain-monitor.c:1684
+#: tools/virsh-domain-monitor.c:1657
 msgid "list transient domains"
 msgstr "列出临时域"
 
-#: tools/virsh-domain-monitor.c:1688
+#: tools/virsh-domain-monitor.c:1661
 msgid "list persistent domains"
 msgstr "列出持久域"
 
-#: tools/virsh-domain-monitor.c:1692
+#: tools/virsh-domain-monitor.c:1665
 msgid "list domains with existing snapshot"
 msgstr "列出有现有快照的域"
 
-#: tools/virsh-domain-monitor.c:1696
+#: tools/virsh-domain-monitor.c:1669
 msgid "list domains without a snapshot"
 msgstr "列出没有快照的域"
 
-#: tools/virsh-domain-monitor.c:1700
+#: tools/virsh-domain-monitor.c:1673
 msgid "list domains in running state"
 msgstr "列出处于运行状态的域"
 
-#: tools/virsh-domain-monitor.c:1704
+#: tools/virsh-domain-monitor.c:1677
 msgid "list domains in paused state"
 msgstr "列出处于暂停状态的域"
 
-#: tools/virsh-domain-monitor.c:1708
+#: tools/virsh-domain-monitor.c:1681
 msgid "list domains in shutoff state"
 msgstr "列出处于关闭状态的域"
 
-#: tools/virsh-domain-monitor.c:1712
+#: tools/virsh-domain-monitor.c:1685
 msgid "list domains in other states"
 msgstr "列出处于其他状态的域"
 
-#: tools/virsh-domain-monitor.c:1716
+#: tools/virsh-domain-monitor.c:1689
 msgid "list domains with autostart enabled"
 msgstr "列出启用 autostart 的域"
 
-#: tools/virsh-domain-monitor.c:1720
+#: tools/virsh-domain-monitor.c:1693
 msgid "list domains with autostart disabled"
 msgstr "列出禁用 autostart 的域"
 
-#: tools/virsh-domain-monitor.c:1724
+#: tools/virsh-domain-monitor.c:1697
 msgid "list domains with managed save state"
 msgstr "列出使用管理保存状态的域"
 
-#: tools/virsh-domain-monitor.c:1728
+#: tools/virsh-domain-monitor.c:1701
 msgid "list domains without managed save"
 msgstr "列出没有管理保存状态的域"
 
-#: tools/virsh-domain-monitor.c:1732
+#: tools/virsh-domain-monitor.c:1705
 msgid "list uuid's only"
 msgstr "只列出 uuid"
 
-#: tools/virsh-domain-monitor.c:1736
+#: tools/virsh-domain-monitor.c:1709
 msgid "list domain names only"
 msgstr "只列出域名"
 
-#: tools/virsh-domain-monitor.c:1740
+#: tools/virsh-domain-monitor.c:1713
 msgid "list table (default)"
 msgstr "列出表格（默认）"
 
-#: tools/virsh-domain-monitor.c:1744
+#: tools/virsh-domain-monitor.c:1717
 msgid "mark inactive domains with managed save state"
 msgstr "使用管理保存状态标记不活跃域"
 
-#: tools/virsh-domain-monitor.c:1748
+#: tools/virsh-domain-monitor.c:1721
 msgid "show short domain description"
 msgstr "显示简要域描述"
 
-#: tools/virsh-domain-monitor.c:1802
+#: tools/virsh-domain-monitor.c:1775
 msgid "Only one argument from --table, --name and --uuid may be specified."
 msgstr "只能制定 --table, --name 和 --uuid 参数中的一个。"
 
-#: tools/virsh-domain-monitor.c:1817 tools/virsh-domain-monitor.c:1822
+#: tools/virsh.c:920
 msgid "Id"
 msgstr "Id"
 
-#: tools/virsh-domain-monitor.c:1817 tools/virsh-domain-monitor.c:1822
-#: tools/virsh-interface.c:363 tools/virsh-network.c:692
-#: tools/virsh-nwfilter.c:373 tools/virsh-pool.c:1200 tools/virsh-pool.c:1221
-#: tools/virsh-pool.c:1289 tools/virsh-snapshot.c:1595
-#: tools/virsh-snapshot.c:1599 tools/virsh-volume.c:1454
-#: tools/virsh-volume.c:1470 tools/virsh-volume.c:1520
+#: tools/virsh.c:920 tools/virsh.c:6679 tools/virsh.c:6874 tools/virsh.c:7147
+#: tools/virsh.c:8118 tools/virsh.c:9108 tools/virsh.c:9128 tools/virsh.c:9197
+#: tools/virsh.c:10604 tools/virsh.c:10619 tools/virsh.c:10669
+#: tools/virsh.c:14496 tools/virsh.c:14500
 msgid "Name"
 msgstr "名称"
 
-#: tools/virsh-domain-monitor.c:1817 tools/virsh-domain-monitor.c:1822
-#: tools/virsh-interface.c:363 tools/virsh-network.c:692
-#: tools/virsh-pool.c:1200 tools/virsh-pool.c:1226 tools/virsh-pool.c:1289
-#: tools/virsh-snapshot.c:1595 tools/virsh-snapshot.c:1599
+#: tools/virsh.c:920 tools/virsh.c:6874 tools/virsh.c:7147 tools/virsh.c:9108
+#: tools/virsh.c:9133 tools/virsh.c:9197 tools/virsh.c:14496
+#: tools/virsh.c:14500
 msgid "State"
 msgstr "状态"
 
-#: tools/virsh-domain-monitor.c:1817
+#: tools/virsh-domain-monitor.c:1790
 msgid "Title"
 msgstr "标题"
 
-#: tools/virsh-domain-monitor.c:1858
+#: tools/virsh-domain-monitor.c:1831
 msgid "Failed to get domain's UUID"
 msgstr "获取域 UUID 失败"
 
-#: tools/virsh-domain.c:109
+#: tools/virsh.c:16100
 #, c-format
 msgid "failed to get domain '%s'"
 msgstr "获得域 '%s' 失败"
 
-#: tools/virsh-domain.c:119
+#: tools/virsh.c:16943
 msgid "offline"
 msgstr "离线"
 
-#: tools/virsh-domain.c:156
+#: tools/virsh-domain.c:119
+msgid "blocked"
+msgstr "阻塞"
+
+#: tools/virsh.c:11846
 msgid "attach device from an XML file"
 msgstr "从一个XML文件附加装置"
 
-#: tools/virsh-domain.c:159
+#: tools/virsh.c:11847
 msgid "Attach device from an XML <file>."
 msgstr "从一个XML文件附加装置."
 
-#: tools/virsh-domain.c:173 tools/virsh-domain.c:9552
-#: tools/virsh-domain.c:9653
+#: tools/virsh.c:11853 tools/virsh.c:12162 tools/virsh.c:12241
 msgid "XML file"
 msgstr "XML 文件"
 
-#: tools/virsh-domain.c:177 tools/virsh-domain.c:336 tools/virsh-domain.c:747
-#: tools/virsh-domain.c:9556 tools/virsh-domain.c:9657
-#: tools/virsh-domain.c:9763 tools/virsh-domain.c:10129
+#: tools/virsh-domain.c:175 tools/virsh-domain.c:334 tools/virsh-domain.c:745
+#: tools/virsh-domain.c:9588 tools/virsh-domain.c:9689
+#: tools/virsh-domain.c:9795 tools/virsh-domain.c:10161
 msgid "make live change persistent"
 msgstr ""
 
-#: tools/virsh-domain.c:241
+#: tools/virsh.c:11895
 #, c-format
 msgid "Failed to attach device from %s"
 msgstr "从 %s 获得设备失败"
 
-#: tools/virsh-domain.c:245
+#: tools/virsh.c:11899
 msgid "Device attached successfully\n"
 msgstr "成功附加设备\n"
 
-#: tools/virsh-domain.c:258
+#: tools/virsh.c:12638
 msgid "attach disk device"
 msgstr "附加磁盘设备"
 
-#: tools/virsh-domain.c:261
+#: tools/virsh.c:12639
 msgid "Attach new disk device."
 msgstr "附加新磁盘设备."
 
-#: tools/virsh-domain.c:275
+#: tools/virsh.c:12646
 msgid "source of disk device"
 msgstr "磁盘设备源"
 
-#: tools/virsh-domain.c:280 tools/virsh-domain.c:10125
+#: tools/virsh.c:12647 tools/virsh.c:12990
 msgid "target of disk device"
 msgstr "磁盘设备目标"
 
-#: tools/virsh-domain.c:284
+#: tools/virsh.c:12648
 msgid "driver of disk device"
 msgstr "磁盘设备驱动"
 
-#: tools/virsh-domain.c:288
+#: tools/virsh.c:12649
 msgid "subdriver of disk device"
 msgstr "磁盘设备副驱动"
 
-#: tools/virsh-domain.c:292
+#: tools/virsh.c:12650
 msgid "cache mode of disk device"
 msgstr "磁盘设备的缓存模式"
 
-#: tools/virsh-domain.c:296
+#: tools/virsh.c:12651
 msgid "target device type"
 msgstr "目标设备类型"
 
-#: tools/virsh-domain.c:304
+#: tools/virsh.c:12652
 msgid "mode of device reading and writing"
 msgstr "设备读写模式"
 
-#: tools/virsh-domain.c:308
+#: tools/virsh.c:12654
 msgid "type of source (block|file)"
 msgstr "源类型  (block|file)"
 
-#: tools/virsh-domain.c:312
+#: tools/virsh.c:12655
 msgid "serial of disk device"
 msgstr "磁盘设备序列号"
 
-#: tools/virsh-domain.c:316
+#: tools/virsh-domain.c:314
 msgid "wwn of disk device"
 msgstr "磁盘设备的 wwn"
 
-#: tools/virsh-domain.c:320
+#: tools/virsh-domain.c:318
 msgid "needs rawio capability"
 msgstr "需要 rawio 容量"
 
-#: tools/virsh-domain.c:324
+#: tools/virsh.c:12657
 msgid "address of disk device"
 msgstr "磁盘设备地址"
 
-#: tools/virsh-domain.c:328
+#: tools/virsh-domain.c:326
 msgid "use multifunction pci under specified address"
 msgstr "在指定地址中使用多功能 pci"
 
-#: tools/virsh-domain.c:332
+#: tools/virsh-domain.c:330
 msgid "print XML document rather than attach the disk"
 msgstr ""
 
-#: tools/virsh-domain.c:554
+#: tools/virsh.c:12857
 #, c-format
 msgid "Unknown source type: '%s'"
 msgstr "未知源类型：'%s'"
 
-#: tools/virsh-domain.c:560
+#: tools/virsh.c:12863
 #, c-format
 msgid "No support for %s in command 'attach-disk'"
 msgstr "'attach-disk' 命令中部支持 %s"
 
-#: tools/virsh-domain.c:607
+#: tools/virsh.c:12905
 msgid "Invalid address."
 msgstr "无效地址。"
 
-#: tools/virsh-domain.c:622
+#: tools/virsh.c:12917
 msgid "expecting a pci:0000.00.00.00 address."
 msgstr "应为 pci:0000.00.00.00 地址。"
 
-#: tools/virsh-domain.c:633
+#: tools/virsh.c:12928
 msgid "expecting a scsi:00.00.00 address."
 msgstr "应为 scsi:00.00.00 地址。"
 
-#: tools/virsh-domain.c:644
+#: tools/virsh.c:12939
 msgid "expecting an ide:00.00.00 address."
 msgstr "应为 ide:00.00.00 地址。"
 
-#: tools/virsh-domain.c:678
+#: tools/virsh.c:12966
 msgid "Failed to attach disk"
 msgstr "附加磁盘失败"
 
-#: tools/virsh-domain.c:680
+#: tools/virsh.c:12968
 msgid "Disk attached successfully\n"
 msgstr "成功附加磁盘\n"
 
-#: tools/virsh-domain.c:697
+#: tools/virsh.c:12304
 msgid "attach network interface"
 msgstr "获得网络界面"
 
-#: tools/virsh-domain.c:700
+#: tools/virsh.c:12305
 msgid "Attach new network interface."
 msgstr "附加新网络界面."
 
-#: tools/virsh-domain.c:714 tools/virsh-domain.c:9755
+#: tools/virsh.c:12311 tools/virsh.c:12510
 msgid "network interface type"
 msgstr "网络界面类型"
 
-#: tools/virsh-domain.c:719
+#: tools/virsh.c:12312
 msgid "source of network interface"
 msgstr "网络界面源"
 
-#: tools/virsh-domain.c:723
+#: tools/virsh.c:12313
 msgid "target network name"
 msgstr "目标网络名称"
 
-#: tools/virsh-domain.c:727 tools/virsh-domain.c:9759
+#: tools/virsh.c:12314 tools/virsh.c:12511
 msgid "MAC address"
 msgstr "MAC 地址"
 
-#: tools/virsh-domain.c:731
+#: tools/virsh.c:12315
 msgid "script used to bridge network interface"
 msgstr "构建网络界面用脚本"
 
-#: tools/virsh-domain.c:735
+#: tools/virsh.c:12316
 msgid "model type"
 msgstr "模型类型"
 
-#: tools/virsh-domain.c:739 tools/virsh-domain.c:2518
+#: tools/virsh.c:12318
 msgid "control domain's incoming traffics"
 msgstr "控制域的进入流量"
 
-#: tools/virsh-domain.c:743 tools/virsh-domain.c:2522
+#: tools/virsh.c:12319
 msgid "control domain's outgoing traffics"
 msgstr "控制域的外出流量"
 
-#: tools/virsh-domain.c:851
+#: tools/virsh.c:12399
 #, c-format
 msgid "No support for %s in command 'attach-interface'"
 msgstr "'attach-interface' 命令中不支持 %s"
 
-#: tools/virsh-domain.c:859 tools/virsh-domain.c:2579
+#: tools/virsh.c:12407
 msgid "inbound format is incorrect"
 msgstr "入站格式不正确"
 
-#: tools/virsh-domain.c:863 tools/virsh-domain.c:2583
+#: tools/virsh.c:12411
 msgid "inbound average is mandatory"
 msgstr "入站平均值为强制"
 
-#: tools/virsh-domain.c:870 tools/virsh-domain.c:2607
+#: tools/virsh.c:12418
 msgid "outbound format is incorrect"
 msgstr "出站格式不正确"
 
-#: tools/virsh-domain.c:874 tools/virsh-domain.c:2611
+#: tools/virsh.c:12422
 msgid "outbound average is mandatory"
 msgstr "出站平均值为强制"
 
-#: tools/virsh-domain.c:934
+#: tools/virsh.c:12486
 msgid "Failed to attach interface"
 msgstr "附加接口失败"
 
-#: tools/virsh-domain.c:936
+#: tools/virsh.c:12488
 msgid "Interface attached successfully\n"
 msgstr "成功附加接口\n"
 
-#: tools/virsh-domain.c:951
+#: tools/virsh.c:678
 msgid "autostart a domain"
 msgstr "自动开始一个域"
 
-#: tools/virsh-domain.c:954
+#: tools/virsh.c:680
 msgid "Configure a domain to be automatically started at boot."
 msgstr "设置一个域在启动时自动开始."
 
-#: tools/virsh-domain.c:967 tools/virsh-network.c:102 tools/virsh-pool.c:99
+#: tools/virsh.c:686 tools/virsh.c:6198 tools/virsh.c:8255
 msgid "disable autostarting"
 msgstr "禁止自动启动"
 
-#: tools/virsh-domain.c:986
+#: tools/virsh.c:707
 #, c-format
 msgid "Failed to mark domain %s as autostarted"
 msgstr "把域 %s标记为自动开始失败"
 
-#: tools/virsh-domain.c:988
+#: tools/virsh.c:709
 #, c-format
 msgid "Failed to unmark domain %s as autostarted"
 msgstr "把域 %s取消标记为自动开始失败"
 
-#: tools/virsh-domain.c:994
+#: tools/virsh.c:715
 #, c-format
 msgid "Domain %s marked as autostarted\n"
 msgstr "域 %s标记为自动开始\n"
 
-#: tools/virsh-domain.c:996
+#: tools/virsh.c:717
 #, c-format
 msgid "Domain %s unmarked as autostarted\n"
 msgstr "域 %s取消标记为自动开始\n"
 
-#: tools/virsh-domain.c:1007
+#: tools/virsh.c:6239
 msgid "Set or query a block device I/O tuning parameters."
 msgstr "设定或者查询块设备 I/O 调节参数。"
 
-#: tools/virsh-domain.c:1010
+#: tools/virsh.c:6240
 msgid "Set or query disk I/O parameters such as block throttling."
 msgstr "设定或者查询块设备 I/O 调节参数，比如块节流。"
 
-#: tools/virsh-domain.c:1032
+#: tools/virsh.c:6248
 msgid "total throughput limit in bytes per second"
 msgstr "以每秒字节数位单位的总流量限制"
 
-#: tools/virsh-domain.c:1040
+#: tools/virsh.c:6250
 msgid "read throughput limit in bytes per second"
 msgstr "以每秒字节数位单位的读取流量限制"
 
-#: tools/virsh-domain.c:1048
+#: tools/virsh.c:6252
 msgid "write throughput limit in bytes per second"
 msgstr "以每秒字节数位单位的写入流量限制"
 
-#: tools/virsh-domain.c:1056
+#: tools/virsh.c:6254
 msgid "total I/O operations limit per second"
 msgstr "以每秒字节数位单位的总 I/O 操作限制"
 
-#: tools/virsh-domain.c:1064
+#: tools/virsh.c:6256
 msgid "read I/O operations limit per second"
 msgstr "以每秒字节数位单位的读取 I/O 操作限制"
 
-#: tools/virsh-domain.c:1072
+#: tools/virsh.c:6258
 msgid "write I/O operations limit per second"
 msgstr "以每秒字节数位单位的写入 I/O 限制"
 
-#: tools/virsh-domain.c:1177
+#: tools/virsh.c:6355
 msgid "Unable to get number of block I/O throttle parameters"
 msgstr "无法获取块 I/O 节流参数数量"
 
-#: tools/virsh-domain.c:1190
+#: tools/virsh.c:6368
 msgid "Unable to get block I/O throttle parameters"
 msgstr "无法获取块 I/O 节流参数"
 
-#: tools/virsh-domain.c:1215
+#: tools/virsh.c:6465
 msgid "Unable to change block I/O throttle"
 msgstr "无法更改块 I/O 节流"
 
-#: tools/virsh-domain.c:1219 tools/virsh-domain.c:1297
-#: tools/virsh-domain.c:7532
+#: tools/virsh.c:4708 tools/virsh.c:4891 tools/virsh.c:6305 tools/virsh.c:6313
+#: tools/virsh.c:6321 tools/virsh.c:6329 tools/virsh.c:6337 tools/virsh.c:6345
 msgid "Unable to parse integer parameter"
 msgstr "无法解析整数参数"
 
-#: tools/virsh-domain.c:1228
+#: tools/virsh.c:4651
 msgid "Get or set blkio parameters"
 msgstr "获取或者数值 blkio 参数"
 
-#: tools/virsh-domain.c:1231
+#: tools/virsh.c:4652
 msgid ""
 "Get or set the current blkio parameters for a guest domain.\n"
 "    To get the blkio parameters use following command: \n"
@@ -29001,598 +29313,613 @@
 "\n"
 "    virsh # blkiotune <domain>"
 
-#: tools/virsh-domain.c:1247
+#: tools/virsh.c:4662
 msgid "IO Weight in range [100, 1000]"
 msgstr "IO 加权范围为 [100, 1000]"
 
-#: tools/virsh-domain.c:1251
+#: tools/virsh.c:4664
 msgid "per-device IO Weights, in the form of /path/to/device,weight,..."
 msgstr "per-device IO 加权，格式为 /path/to/device,weight,..."
 
-#: tools/virsh-domain.c:1301
+#: tools/virsh-domain.c:1253
+msgid ""
+"per-device read I/O limit per second, in the form of "
+"/path/to/device,read_iops_sec,..."
+msgstr ""
+
+#: tools/virsh-domain.c:1257
+msgid ""
+"per-device write I/O limit per second, in the form of "
+"/path/to/device,write_iops_sec,..."
+msgstr ""
+
+#: tools/virsh-domain.c:1261
+msgid ""
+"per-device bytes read per second, in the form of "
+"/path/to/device,read_bytes_sec,..."
+msgstr ""
+
+#: tools/virsh-domain.c:1265
+msgid ""
+"per-device bytes wrote per second, in the form of "
+"/path/to/device,write_bytes_sec,..."
+msgstr ""
+
+#: tools/virsh.c:4715
 #, c-format
 msgid "Invalid value of %d for I/O weight"
 msgstr "I/O 加权的无效 %d 值"
 
-#: tools/virsh-domain.c:1311
+#: tools/virsh.c:4723
 msgid "Unable to parse string parameter"
 msgstr "无法解析字符串参数"
 
-#: tools/virsh-domain.c:1324
+#: tools/virsh.c:4734
 msgid "Unable to get number of blkio parameters"
 msgstr "无法获取 blkio 参数数值"
 
-#: tools/virsh-domain.c:1337
+#: tools/virsh.c:4747
 msgid "Unable to get blkio parameters"
 msgstr "无法获取 blkio 参数"
 
-#: tools/virsh-domain.c:1362
+#: tools/virsh.c:4810
 msgid "Unable to change blkio parameters"
 msgstr "无法更改 blkio 参数"
 
-#: tools/virsh-domain.c:1395
+#: tools/virsh.c:6029
 msgid "bandwidth must be a number"
 msgstr "带宽必须是一个数字"
 
-#: tools/virsh-domain.c:1494
+#: tools/virsh-domain.c:1556
 msgid "Start a block commit operation."
 msgstr "开始块提交操作。"
 
-#: tools/virsh-domain.c:1497
+#: tools/virsh-domain.c:1559
 msgid "Commit changes from a snapshot down to its backing image."
 msgstr "提交快照及其备份映像的更改"
 
-#: tools/virsh-domain.c:1511 tools/virsh-domain.c:1690
-#: tools/virsh-domain.c:1896 tools/virsh-domain.c:1994
+#: tools/virsh-domain.c:1573 tools/virsh-domain.c:1741
+#: tools/virsh-domain.c:1936 tools/virsh-domain.c:2037
 msgid "fully-qualified path of disk"
 msgstr "磁盘的完全限定路径"
 
-#: tools/virsh-domain.c:1515 tools/virsh-domain.c:1699
-#: tools/virsh-domain.c:1998
+#: tools/virsh-domain.c:1577 tools/virsh-domain.c:1750
+#: tools/virsh-domain.c:2041
 msgid "bandwidth limit in MiB/s"
 msgstr "以 MiB/s 限制带宽"
 
-#: tools/virsh-domain.c:1519
+#: tools/virsh-domain.c:1581
 msgid "path of base file to commit into (default bottom of chain)"
 msgstr "要提交到的路径基本文件（默认是链的底部）"
 
-#: tools/virsh-domain.c:1523
+#: tools/virsh-domain.c:1585
 msgid "use backing file of top as base"
 msgstr "使用基底的顶端备份文件"
 
-#: tools/virsh-domain.c:1527
+#: tools/virsh-domain.c:1589
 msgid "path of top file to commit from (default top of chain)"
 msgstr "要提交到的顶部文件路径（默认为链的顶部）"
 
-#: tools/virsh-domain.c:1531
+#: tools/virsh-domain.c:1593
 msgid "delete files that were successfully committed"
 msgstr "删除成功提交的文件"
 
-#: tools/virsh-domain.c:1535
+#: tools/virsh-domain.c:1597
 msgid "wait for job to complete"
 msgstr "等待任务完成"
 
-#: tools/virsh-domain.c:1539 tools/virsh-domain.c:1719
-#: tools/virsh-domain.c:2010
+#: tools/virsh-domain.c:1601 tools/virsh-domain.c:1770
+#: tools/virsh-domain.c:2053
 msgid "with --wait, display the progress"
 msgstr "使用 --wait 显示进程"
 
-#: tools/virsh-domain.c:1543 tools/virsh-domain.c:1723
+#: tools/virsh-domain.c:1605 tools/virsh-domain.c:1774
 msgid "with --wait, abort if copy exceeds timeout (in seconds)"
 msgstr "使用 --wait，如果复制超过时限（秒）则中止"
 
-#: tools/virsh-domain.c:1547 tools/virsh-domain.c:1735
-#: tools/virsh-domain.c:2018
+#: tools/virsh-domain.c:1609 tools/virsh-domain.c:1786
+#: tools/virsh-domain.c:2061
 msgid "with --wait, don't wait for cancel to finish"
 msgstr "使用 --wait，无法等待取消完成"
 
-#: tools/virsh-domain.c:1573 tools/virsh-domain.c:1767
-#: tools/virsh-domain.c:2044
-msgid "invalid timeout"
-msgstr "无效超时"
-
-#: tools/virsh-domain.c:1578 tools/virsh-domain.c:1772
-#: tools/virsh-domain.c:2049
-msgid "timeout is too big"
-msgstr "超时太大"
-
-#: tools/virsh-domain.c:1600 tools/virsh-domain.c:1794
-#: tools/virsh-domain.c:2071
+#: tools/virsh-domain.c:1651 tools/virsh-domain.c:1834
+#: tools/virsh-domain.c:2103
 msgid "missing --wait option"
 msgstr "缺少 --wait 选项"
 
-#: tools/virsh-domain.c:1608
+#: tools/virsh-domain.c:1659
 msgid "Block Commit started"
 msgstr "启动块提交"
 
-#: tools/virsh-domain.c:1622 tools/virsh-domain.c:1816
-#: tools/virsh-domain.c:2093
+#: tools/virsh-domain.c:1673 tools/virsh-domain.c:1856
+#: tools/virsh-domain.c:2125
 #, c-format
 msgid "failed to query job for disk %s"
 msgstr "为磁盘 %s 查询任务失败"
 
-#: tools/virsh-domain.c:1629 tools/virsh-domain.c:1655
+#: tools/virsh-domain.c:1680 tools/virsh-domain.c:1706
+#: tools/virsh-domain.c:1967
 msgid "Block Commit"
 msgstr "块提交"
 
-#: tools/virsh-domain.c:1643 tools/virsh-domain.c:1838
-#: tools/virsh-domain.c:2113
+#: tools/virsh-domain.c:1694 tools/virsh-domain.c:1878
+#: tools/virsh-domain.c:2145
 #, c-format
 msgid "failed to abort job for disk %s"
 msgstr "为磁盘 %s 中止任务失败"
 
-#: tools/virsh-domain.c:1657
+#: tools/virsh-domain.c:1708
 msgid "Commit aborted"
 msgstr "中止提交"
 
-#: tools/virsh-domain.c:1657
+#: tools/virsh-domain.c:1708
 msgid "Commit complete"
 msgstr "提交完成"
 
-#: tools/virsh-domain.c:1673
+#: tools/virsh-domain.c:1724
 msgid "Start a block copy operation."
 msgstr "开始块复制操作。"
 
-#: tools/virsh-domain.c:1676
+#: tools/virsh-domain.c:1727
 msgid "Copy a disk backing image chain to dest."
 msgstr ""
 
-#: tools/virsh-domain.c:1695
+#: tools/virsh-domain.c:1746
 msgid "path of the copy to create"
 msgstr "要生成的复制路径"
 
-#: tools/virsh-domain.c:1703
+#: tools/virsh-domain.c:1754
 msgid "make the copy share a backing chain"
 msgstr "让复制共享后端链"
 
-#: tools/virsh-domain.c:1707
+#: tools/virsh-domain.c:1758
 msgid "reuse existing destination"
 msgstr "重复使用现有目的地"
 
-#: tools/virsh-domain.c:1711
+#: tools/virsh-domain.c:1762
 msgid "use raw destination file"
 msgstr "使用原始目的文件"
 
-#: tools/virsh-domain.c:1715
+#: tools/virsh-domain.c:1766
 msgid "wait for job to reach mirroring phase"
 msgstr "等待任务到达镜像阶段"
 
-#: tools/virsh-domain.c:1727
+#: tools/virsh-domain.c:1778
 msgid "with --wait, pivot when mirroring starts"
 msgstr "使用 --wait，启动映射同步时使用 pivot"
 
-#: tools/virsh-domain.c:1731
+#: tools/virsh-domain.c:1782
 msgid "with --wait, quit when mirroring starts"
 msgstr "使用 --wait，启动映射同步时退出"
 
-#: tools/virsh-domain.c:1762
+#: tools/virsh-domain.c:1812
 msgid "cannot mix --pivot and --finish"
 msgstr "不能混合 --pivot 和 --finish"
 
-#: tools/virsh-domain.c:1802
+#: tools/virsh-domain.c:1842
 msgid "Block Copy started"
 msgstr "已启动快复制"
 
-#: tools/virsh-domain.c:1823 tools/virsh-domain.c:1959
+#: tools/virsh-domain.c:1863 tools/virsh-domain.c:1966
 msgid "Block Copy"
 msgstr "块复制"
 
-#: tools/virsh-domain.c:1851
+#: tools/virsh-domain.c:1891
 #, c-format
 msgid "failed to pivot job for disk %s"
 msgstr "为磁盘 %s pivot 任务失败"
 
-#: tools/virsh-domain.c:1856
+#: tools/virsh-domain.c:1896
 #, c-format
 msgid "failed to finish job for disk %s"
 msgstr "为磁盘 %s 完成任务失败"
 
-#: tools/virsh-domain.c:1860
+#: tools/virsh-domain.c:1900
 msgid "Copy aborted"
 msgstr "中止复制"
 
-#: tools/virsh-domain.c:1861
+#: tools/virsh-domain.c:1901
 msgid "Successfully pivoted"
 msgstr "成功 pivot"
 
-#: tools/virsh-domain.c:1862
+#: tools/virsh-domain.c:1902
 msgid "Successfully copied"
 msgstr "成功复制"
 
-#: tools/virsh-domain.c:1863
+#: tools/virsh-domain.c:1903
 msgid "Now in mirroring phase"
 msgstr "现处于映射同步阶段"
 
-#: tools/virsh-domain.c:1879
+#: tools/virsh-domain.c:1919
 msgid "Manage active block operations"
 msgstr "管理活跃块操作"
 
-#: tools/virsh-domain.c:1882
+#: tools/virsh-domain.c:1922
 msgid "Query, adjust speed, or cancel active block operations."
 msgstr "查询、调整速度或者取消活跃块操作。"
 
-#: tools/virsh-domain.c:1900
+#: tools/virsh-domain.c:1940
 msgid "abort the active job on the specified disk"
 msgstr "中止指定磁盘中的活跃任务"
 
-#: tools/virsh-domain.c:1904
+#: tools/virsh-domain.c:1944
 msgid "don't wait for --abort to complete"
 msgstr "不要等待 --abort 完成"
 
-#: tools/virsh-domain.c:1908
+#: tools/virsh-domain.c:1948
 msgid "conclude and pivot a copy job"
 msgstr "完成并挖掘复制任务"
 
-#: tools/virsh-domain.c:1912
+#: tools/virsh-domain.c:1952
 msgid "get active job information for the specified disk"
 msgstr "获取指定磁盘的活跃任务信息"
 
-#: tools/virsh-domain.c:1916
+#: tools/virsh-domain.c:1956
 msgid "set the Bandwidth limit in MiB/s"
 msgstr "以 MiB/s 设定带宽"
 
-#: tools/virsh-domain.c:1936
-msgid "conflict between --abort, --info, and --bandwidth modes"
-msgstr "--abort, --info, 以及 --bandwidth 模式间的冲突"
+#: tools/virsh-domain.c:1964 tools/virsh-domain.c:1973
+msgid "Unknown job"
+msgstr "未知任务"
 
-#: tools/virsh-domain.c:1956 tools/virsh-domain.c:2100
-#: tools/virsh-domain.c:2125
+#: tools/virsh-domain.c:1965 tools/virsh-domain.c:2132
+#: tools/virsh-domain.c:2157
 msgid "Block Pull"
 msgstr "块提取"
 
-#: tools/virsh-domain.c:1962
-msgid "Unknown job"
-msgstr "未知任务"
+#: tools/virsh-domain.c:1990
+msgid "conflict between --abort, --info, and --bandwidth modes"
+msgstr "--abort, --info, 以及 --bandwidth 模式间的冲突"
 
-#: tools/virsh-domain.c:1968
+#: tools/virsh-domain.c:2011
 #, c-format
 msgid "    Bandwidth limit: %lu MiB/s\n"
 msgstr "    带宽限制：%lu MiB/s\n"
 
-#: tools/virsh-domain.c:1977 tools/virsh-domain.c:1980
+#: tools/virsh.c:6052 tools/virsh.c:6053
 msgid "Populate a disk from its backing image."
 msgstr "使用其后端映像填充磁盘。"
 
-#: tools/virsh-domain.c:2002
+#: tools/virsh-domain.c:2045
 msgid "path of backing file in chain for a partial pull"
 msgstr "具体提取过程的链中的后端文件路径"
 
-#: tools/virsh-domain.c:2006
+#: tools/virsh-domain.c:2049
 msgid "wait for job to finish"
 msgstr "等待任务完成"
 
-#: tools/virsh-domain.c:2014
+#: tools/virsh-domain.c:2057
 msgid "with --wait, abort if pull exceeds timeout (in seconds)"
 msgstr "使用 --wait，如果提取超过时限（秒）则中止"
 
-#: tools/virsh-domain.c:2079
+#: tools/virsh-domain.c:2111
 msgid "Block Pull started"
 msgstr "已启动块提取"
 
-#: tools/virsh-domain.c:2127
+#: tools/virsh-domain.c:2159
 msgid "Pull aborted"
 msgstr "已中止提取"
 
-#: tools/virsh-domain.c:2127
+#: tools/virsh-domain.c:2159
 msgid "Pull complete"
 msgstr "提取完成"
 
-#: tools/virsh-domain.c:2143 tools/virsh-domain.c:2146
+#: tools/virsh.c:6132 tools/virsh.c:6133
 msgid "Resize block device of domain."
 msgstr "创新定义域块设备大小"
 
-#: tools/virsh-domain.c:2160
+#: tools/virsh.c:6139
 msgid "Fully-qualified path of block device"
 msgstr "块设备的完全限定路径"
 
-#: tools/virsh-domain.c:2165
+#: tools/virsh-domain.c:2197
 msgid "New size of the block device, as scaled integer (default KiB)"
 msgstr "新块设备大小，以整数计（默认为 KiB）"
 
-#: tools/virsh-domain.c:2183 tools/virsh-volume.c:648 tools/virsh-volume.c:653
-#: tools/virsh-volume.c:758 tools/virsh-volume.c:763
+#: tools/virsh.c:6163 tools/virsh.c:10088 tools/virsh.c:10093
+#: tools/virsh.c:10180 tools/virsh.c:10185
 msgid "Unable to parse integer"
 msgstr "无法解析整数"
 
-#: tools/virsh-domain.c:2197
+#: tools/virsh.c:6176
 #, c-format
 msgid "Failed to resize block device '%s'"
 msgstr "为块设备 '%s' 重新定义大小失败"
 
-#: tools/virsh-domain.c:2199
+#: tools/virsh.c:6178
 #, c-format
 msgid "Block device '%s' is resized"
 msgstr "重新定义 '%s' 块设备大小"
 
-#: tools/virsh-domain.c:2213
+#: tools/virsh.c:781
 msgid "connect to the guest console"
 msgstr "连接到客户会话"
 
-#: tools/virsh-domain.c:2216
+#: tools/virsh.c:783
 msgid "Connect the virtual serial console for the guest"
 msgstr "连接客户真实串行控制台"
 
-#: tools/virsh-domain.c:2229
+#: tools/virsh.c:789
 msgid "character device name"
 msgstr "字符设备名称"
 
-#: tools/virsh-domain.c:2233
+#: tools/virsh-domain.c:2265
 msgid "force console connection (disconnect already connected sessions)"
 msgstr "强制控制台连接（断开已连接的会话）"
 
-#: tools/virsh-domain.c:2237
+#: tools/virsh-domain.c:2269
 msgid "only connect if safe console handling is supported"
 msgstr "只有在支持安全控制台处理时方可连接"
 
-#: tools/virsh-domain.c:2251
+#: tools/virsh.c:800
 msgid "Unable to get domain status"
 msgstr "无法获取域状态"
 
-#: tools/virsh-domain.c:2256
+#: tools/virsh.c:805
 msgid "The domain is not running"
 msgstr "域未运行"
 
-#: tools/virsh-domain.c:2261
+#: tools/virsh-domain.c:2293
 msgid "Cannot run interactive console without a controlling TTY"
 msgstr "没有控制的 TTY 则不能运行互动控制台"
 
-#: tools/virsh-domain.c:2265
+#: tools/virsh.c:809
 #, c-format
 msgid "Connected to domain %s\n"
 msgstr "连接到域 %s\n"
 
-#: tools/virsh-domain.c:2266
+#: tools/virsh.c:810
 #, c-format
 msgid "Escape character is %s\n"
 msgstr "换码符为 %s\n"
 
-#: tools/virsh-domain.c:2309
+#: tools/virsh.c:1303
 msgid "set link state of a virtual interface"
 msgstr "设定虚拟接口的链接状态"
 
-#: tools/virsh-domain.c:2312
+#: tools/virsh.c:1304
 msgid ""
 "Set link state of a domain's virtual interface. This command wraps usage of "
 "update-device command."
 msgstr "设定域虚拟接口的链接状态。这个命令集成了 update-device 命令的用法。"
 
-#: tools/virsh-domain.c:2332
+#: tools/virsh.c:1311
 msgid "new state of the device"
 msgstr "设备的新状态"
 
-#: tools/virsh-domain.c:2376
+#: tools/virsh.c:1349
 #, c-format
 msgid "invalid link state '%s'"
 msgstr "无效链接状态 '%s'"
 
-#: tools/virsh-domain.c:2406
+#: tools/virsh.c:1379 tools/virsh.c:1526
 msgid "Failed to extract interface information or no interfaces found"
 msgstr "提取接口信息失败或者未找到接口"
 
-#: tools/virsh-domain.c:2437
+#: tools/virsh-domain.c:2469
 #, c-format
 msgid "interface (%s: %s) not found"
 msgstr "未找到接口 (%s: %s)"
 
-#: tools/virsh-domain.c:2471
+#: tools/virsh.c:1441 tools/virsh.c:12602 tools/virsh.c:13065
 msgid "Failed to create XML"
 msgstr "创建XML失败"
 
-#: tools/virsh-domain.c:2476
+#: tools/virsh.c:1446
 msgid "Failed to update interface link state"
 msgstr "更新接口链接状态失败"
 
-#: tools/virsh-domain.c:2479 tools/virsh-domain.c:9724
+#: tools/virsh.c:1449 tools/virsh.c:12292
 msgid "Device updated successfully\n"
 msgstr "成功更新设备\n"
 
-#: tools/virsh-domain.c:2497
+#: tools/virsh-domain.c:2529
 msgid "get/set parameters of a virtual interface"
 msgstr "获取/设定虚拟接口参数"
 
-#: tools/virsh-domain.c:2500
+#: tools/virsh-domain.c:2532
 msgid "Get/set parameters of a domain's virtual interface."
 msgstr "获取/设定域虚拟接口参数"
 
-#: tools/virsh-domain.c:2637
+#: tools/virsh-domain.c:2669
 msgid "Unable to get number of interface parameters"
 msgstr "无法获取接口参数值"
 
-#: tools/virsh-domain.c:2650
+#: tools/virsh-domain.c:2682
 msgid "Unable to get interface parameters"
 msgstr "无法获取接口参数"
 
-#: tools/virsh-domain.c:2675
+#: tools/virsh-domain.c:2707
 msgid "Unable to set interface parameters"
 msgstr "无法设定接口参数"
 
-#: tools/virsh-domain.c:2684
+#: tools/virsh.c:1767
 msgid "suspend a domain"
 msgstr "挂起一个域"
 
-#: tools/virsh-domain.c:2687
+#: tools/virsh.c:1768
 msgid "Suspend a running domain."
 msgstr "挂起一个运行的域。"
 
-#: tools/virsh-domain.c:2712
+#: tools/virsh.c:1791
 #, c-format
 msgid "Domain %s suspended\n"
 msgstr "域 %s 被挂起\n"
 
-#: tools/virsh-domain.c:2714
+#: tools/virsh.c:1793
 #, c-format
 msgid "Failed to suspend domain %s"
 msgstr "挂起 %s 域失败"
 
-#: tools/virsh-domain.c:2727
+#: tools/virsh-domain.c:2759
 msgid "suspend a domain gracefully using power management functions"
 msgstr "使用电源管理功能正常挂起域"
 
-#: tools/virsh-domain.c:2731
+#: tools/virsh-domain.c:2763
 msgid ""
 "Suspends a running domain using guest OS's power management. (Note: This "
 "requires a guest agent configured and running in the guest OS)."
 msgstr "使用虚拟机操作系统的电源管理挂起运行的域。（注：这要求配置虚拟机代理并使其在虚拟机操作系统中运行）。"
 
-#: tools/virsh-domain.c:2747
+#: tools/virsh-domain.c:2779
 msgid "duration in seconds"
 msgstr "持续时间（单位秒）"
 
-#: tools/virsh-domain.c:2752 tools/virsh-host.c:528
+#: tools/virsh.c:5249
 msgid "mem(Suspend-to-RAM), disk(Suspend-to-Disk), hybrid(Hybrid-Suspend)"
 msgstr "mem(Suspend-to-RAM), disk(Suspend-to-Disk), hybrid(Hybrid-Suspend)"
 
-#: tools/virsh-domain.c:2773 tools/virsh-host.c:550
+#: tools/virsh-domain.c:2805 tools/virsh-host.c:559
 msgid "Invalid duration argument"
 msgstr "无效阶段参数"
 
-#: tools/virsh-domain.c:2787 tools/virsh-host.c:561
+#: tools/virsh.c:5283
 msgid "Invalid target"
 msgstr "无效目标"
 
-#: tools/virsh-domain.c:2792
+#: tools/virsh-domain.c:2824
 #, c-format
 msgid "Domain %s could not be suspended"
 msgstr "无法挂起域 %s"
 
-#: tools/virsh-domain.c:2797
+#: tools/virsh-domain.c:2829
 #, c-format
 msgid "Domain %s successfully suspended"
 msgstr "成功挂起域 %s"
 
-#: tools/virsh-domain.c:2813
+#: tools/virsh-domain.c:2845
 msgid "wakeup a domain from pmsuspended state"
 msgstr "将域从 pmsuspended 状态中唤醒"
 
-#: tools/virsh-domain.c:2816
+#: tools/virsh-domain.c:2848
 msgid "Wakeup a domain that was previously suspended by power management."
 msgstr "唤醒之前由电源管理挂起的域"
 
-#: tools/virsh-domain.c:2843
+#: tools/virsh-domain.c:2875
 #, c-format
 msgid "Domain %s could not be woken up"
 msgstr "无法唤醒域 %s"
 
-#: tools/virsh-domain.c:2848
+#: tools/virsh-domain.c:2880
 #, c-format
 msgid "Domain %s successfully woken up"
 msgstr "成功唤醒域 %s"
 
-#: tools/virsh-domain.c:2863
+#: tools/virsh.c:1913
 msgid "undefine a domain"
 msgstr "取消定义一个域"
 
-#: tools/virsh-domain.c:2866
+#: tools/virsh.c:1915
 msgid "Undefine an inactive domain, or convert persistent to transient."
 msgstr "取消定义一个域或者将持久转换为临时。"
 
-#: tools/virsh-domain.c:2875 tools/virsh-domain.c:8428
+#: tools/virsh.c:1920 tools/virsh.c:5513
 msgid "domain name or uuid"
 msgstr "域名或 uuid"
 
-#: tools/virsh-domain.c:2879
+#: tools/virsh.c:1921
 msgid "remove domain managed state file"
 msgstr "删除域管理的状态文件"
 
-#: tools/virsh-domain.c:2883
+#: tools/virsh-domain.c:2915
 msgid ""
 "remove associated storage volumes (comma separated list of targets or source "
 "paths) (see domblklist)"
 msgstr "删除关联的存储卷（用逗号分开的目标或者源路径列表）（查看 domblklist）"
 
-#: tools/virsh-domain.c:2888
+#: tools/virsh-domain.c:2920
 msgid "remove all associated storage volumes (use with caution)"
 msgstr "删除关联的存储卷（小心使用）"
 
-#: tools/virsh-domain.c:2892
+#: tools/virsh-domain.c:2924
 msgid "wipe data on the removed volumes"
 msgstr "擦除删除卷中的数据"
 
-#: tools/virsh-domain.c:2896
+#: tools/virsh.c:1923
 msgid "remove all domain snapshot metadata, if inactive"
 msgstr "如果不活跃则删除所有域快照元数据"
 
-#: tools/virsh-domain.c:3018
+#: tools/virsh-domain.c:3050
 msgid "Storage volume deletion is supported only on stopped domains"
 msgstr "只在停止的域中支持存储卷"
 
-#: tools/virsh-domain.c:3025
+#: tools/virsh-domain.c:3057
 msgid "Specified both --storage and --remove-all-storage"
 msgstr "同时指定 --storage 和 --remove-all-storage"
 
-#: tools/virsh-domain.c:3030
+#: tools/virsh-domain.c:3062
 msgid "Could not retrieve domain XML description"
 msgstr "无法检索域 XML 描述"
 
-#: tools/virsh-domain.c:3088
+#: tools/virsh-domain.c:3120
 #, c-format
 msgid "Missing storage volume name for disk '%s'"
 msgstr ""
 
-#: tools/virsh-domain.c:3096
+#: tools/virsh-domain.c:3128
 #, c-format
 msgid "Storage pool '%s' for volume '%s' not found."
 msgstr ""
 
-#: tools/virsh-domain.c:3111
+#: tools/virsh-domain.c:3143
 #, c-format
 msgid ""
 "Storage volume '%s'(%s) is not managed by libvirt. Remove it manually.\n"
 msgstr "存储卷 '%s'(%s) 不是由 libvirt 管理。手动删除它。\n"
 
-#: tools/virsh-domain.c:3131
+#: tools/virsh-domain.c:3163
 #, c-format
 msgid "Volume '%s' was not found in domain's definition.\n"
 msgstr "在域定义中未发现卷 '%s'。\n"
 
-#: tools/virsh-domain.c:3176
+#: tools/virsh.c:2060
 #, c-format
 msgid "Unable to remove metadata of %d snapshots"
 msgstr "无法删除 %d 快照的元数据"
 
-#: tools/virsh-domain.c:3177
+#: tools/virsh.c:2061
 #, c-format
 msgid "Refusing to undefine while %d snapshots exist"
 msgstr "%d 快照存在时拒绝取消定义"
 
-#: tools/virsh-domain.c:3186
+#: tools/virsh.c:2070
 #, c-format
 msgid "Domain %s has been undefined\n"
 msgstr "域 %s 已经被取消定义\n"
 
-#: tools/virsh-domain.c:3189
+#: tools/virsh.c:2073
 #, c-format
 msgid "Failed to undefine domain %s"
 msgstr "取消定义域 %s 失败"
 
-#: tools/virsh-domain.c:3197
+#: tools/virsh-domain.c:3229
 #, c-format
 msgid "Wiping volume '%s'(%s) ... "
 msgstr "擦除卷 '%s'(%s) ... "
 
-#: tools/virsh-domain.c:3201
+#: tools/virsh-domain.c:3233
 msgid "Failed! Volume not removed."
 msgstr "失败！卷已被删除。"
 
-#: tools/virsh-domain.c:3205
+#: tools/virsh-domain.c:3237
 msgid "Done.\n"
 msgstr "完成。\n"
 
-#: tools/virsh-domain.c:3211
+#: tools/virsh-domain.c:3243
 #, c-format
 msgid "Failed to remove storage volume '%s'(%s)"
 msgstr "删除存储卷 '%s'(%s) 失败"
 
-#: tools/virsh-domain.c:3215
+#: tools/virsh-domain.c:3247
 #, c-format
 msgid "Volume '%s'(%s) removed.\n"
 msgstr "已删除 '%s'(%s)。\n"
 
-#: tools/virsh-domain.c:3254
+#: tools/virsh.c:2086
 msgid "start a (previously defined) inactive domain"
 msgstr "开始一个（以前定义的）非活跃的域"
 
-#: tools/virsh-domain.c:3257
+#: tools/virsh.c:2087
 msgid ""
 "Start a domain, either from the last managedsave\n"
 "    state, or via a fresh boot if no managedsave state\n"
@@ -29602,107 +29929,104 @@
 "  state，如果没有 managedsave state，\n"
 "    也可以从全新引导中启动。"
 
-#: tools/virsh-domain.c:3268
+#: tools/virsh.c:2094
 msgid "name of the inactive domain"
 msgstr "非活跃域的名称"
 
-#: tools/virsh-domain.c:3273 tools/virsh-domain.c:6468
+#: tools/virsh.c:1813 tools/virsh.c:2096
 msgid "attach to console after creation"
 msgstr "创建后附加到控制台"
 
-#: tools/virsh-domain.c:3278 tools/virsh-domain.c:6473
+#: tools/virsh.c:1815 tools/virsh.c:2098
 msgid "leave the guest paused after creation"
 msgstr "生成后让虚拟机保持暂停状态"
 
-#: tools/virsh-domain.c:3282 tools/virsh-domain.c:6477
+#: tools/virsh.c:1816 tools/virsh.c:2100
 msgid "automatically destroy the guest when virsh disconnects"
 msgstr "virsh 断开连接时自动销毁虚拟机"
 
-#: tools/virsh-domain.c:3286
+#: tools/virsh.c:2102
 msgid "avoid file system cache when loading"
 msgstr "载入时避免文件系统缓存"
 
-#: tools/virsh-domain.c:3290
+#: tools/virsh.c:2104
 msgid "force fresh boot by discarding any managed save"
 msgstr "采用忽略所有管理保存的方式强制刷新引导"
 
-#: tools/virsh-domain.c:3294 tools/virsh-domain.c:6481
+#: tools/virsh-domain.c:3326 tools/virsh-domain.c:6521
 msgid "pass file descriptors N,M,... to the guest"
 msgstr ""
 
-#: tools/virsh-domain.c:3318
+#: tools/virsh-domain.c:3350
 #, c-format
 msgid "Unable to split FD list '%s'"
 msgstr ""
 
-#: tools/virsh-domain.c:3325
+#: tools/virsh-domain.c:3357
 #, c-format
 msgid "Unable to parse FD number '%s'"
 msgstr ""
 
-#: tools/virsh-domain.c:3329
+#: tools/virsh-domain.c:3361
 msgid "Unable to allocate FD list"
 msgstr ""
 
-#: tools/virsh-domain.c:3365
+#: tools/virsh.c:2127
 msgid "Domain is already active"
 msgstr "域已经活跃"
 
-#: tools/virsh-domain.c:3411
+#: tools/virsh.c:2169
 #, c-format
 msgid "Failed to start domain %s"
 msgstr "开始域 %s 失败"
 
-#: tools/virsh-domain.c:3416
+#: tools/virsh.c:2174
 #, c-format
 msgid "Domain %s started\n"
 msgstr "域 %s 已开始\n"
 
-#: tools/virsh-domain.c:3436
+#: tools/virsh.c:2192
 msgid "save a domain state to a file"
 msgstr "把一个域的状态保存到一个文件"
 
-#: tools/virsh-domain.c:3439
+#: tools/virsh.c:2193
 msgid "Save the RAM state of a running domain."
 msgstr "保存运行中的域 的 RAM 状态"
 
-#: tools/virsh-domain.c:3447 tools/virsh-domain.c:3916
+#: tools/virsh.c:2198 tools/virsh.c:2472 tools/virsh.c:2903
 msgid "avoid file system cache when saving"
 msgstr "保存时避免文件系统缓存"
 
-#: tools/virsh-domain.c:3457
+#: tools/virsh.c:2200
 msgid "where to save the data"
 msgstr "数据存到什么地方"
 
-#: tools/virsh-domain.c:3461 tools/virsh-domain.c:3775
-#: tools/virsh-domain.c:4356 tools/virsh-domain.c:8603
+#: tools/virsh.c:2202 tools/virsh.c:2317 tools/virsh.c:2838 tools/virsh.c:5600
 msgid "filename containing updated XML for the target"
 msgstr "包含为目标更新的 XML 的文件名"
 
-#: tools/virsh-domain.c:3465 tools/virsh-domain.c:3779
-#: tools/virsh-domain.c:3845
+#: tools/virsh.c:2203 tools/virsh.c:2318 tools/virsh.c:2375
 msgid "set domain to be running on restore"
 msgstr "设定要在还原中运行的域"
 
-#: tools/virsh-domain.c:3469 tools/virsh-domain.c:3783
-#: tools/virsh-domain.c:3849
+#: tools/virsh.c:2204 tools/virsh.c:2319 tools/virsh.c:2376
 msgid "set domain to be paused on restore"
 msgstr "设定要在还原中暂停的域"
 
-#: tools/virsh-domain.c:3473 tools/virsh-domain.c:3933
+#: tools/virsh-domain.c:3504 tools/virsh-domain.c:3964
 msgid "display the progress of save"
 msgstr "显示保存进程"
 
-#: tools/virsh-domain.c:3523
+#: tools/virsh.c:2247
 #, c-format
 msgid "Failed to save domain %s to %s"
 msgstr "把域 %s 存到 %s 失败"
 
-#: tools/virsh-domain.c:3688
+#: tools/virsh-domain.c:3719
 msgid "Save"
 msgstr "保存"
 
-#: tools/virsh-domain.c:3693
+#: tools/virsh-domain.c:3724
 #, c-format
 msgid ""
 "\n"
@@ -29711,76 +30035,76 @@
 "\n"
 "保存到 %s 的域 %s\n"
 
-#: tools/virsh-domain.c:3706
+#: tools/virsh.c:2264
 msgid "saved state domain information in XML"
 msgstr "在 XML 中保存状态域信息"
 
-#: tools/virsh-domain.c:3709
+#: tools/virsh-domain.c:3740
 msgid "Dump XML of domain information for a saved state file to stdout."
 msgstr "将保存状态文件的域信息 XML 转储到标准输出"
 
-#: tools/virsh-domain.c:3718
+#: tools/virsh.c:2271
 msgid "saved state file to read"
 msgstr "用来读取的保存的状态文件"
 
-#: tools/virsh-domain.c:3722 tools/virsh-domain.c:8214
-#: tools/virsh-snapshot.c:653 tools/virsh-snapshot.c:1711
+#: tools/virsh.c:2272 tools/virsh.c:5340 tools/virsh.c:14188
+#: tools/virsh.c:14725
 msgid "include security sensitive information in XML dump"
 msgstr "包括 XML 转储中与安全性相关的信息"
 
-#: tools/virsh-domain.c:3758
+#: tools/virsh.c:2309
 msgid "redefine the XML for a domain's saved state file"
 msgstr "为域的保存状态文件重新定义 XML"
 
-#: tools/virsh-domain.c:3761
+#: tools/virsh.c:2310
 msgid "Replace the domain XML associated with a saved state file"
 msgstr "替换与域 XML 关联的保存的状态文件"
 
-#: tools/virsh-domain.c:3770
+#: tools/virsh.c:2315
 msgid "saved state file to modify"
 msgstr "要修改的保存的状态文件"
 
-#: tools/virsh-domain.c:3812 tools/virsh-snapshot.c:619
+#: tools/virsh.c:2352 tools/virsh.c:2442 tools/virsh.c:14129
 #, c-format
 msgid "Failed to update %s"
 msgstr "更新 %s 失败"
 
-#: tools/virsh-domain.c:3816
+#: tools/virsh.c:2356
 #, c-format
 msgid "State file %s updated.\n"
 msgstr "已更新状态文件 %s\n"
 
-#: tools/virsh-domain.c:3829
+#: tools/virsh.c:2368
 msgid "edit XML for a domain's saved state file"
 msgstr "为域保存状态文件编辑 XML"
 
-#: tools/virsh-domain.c:3832
+#: tools/virsh.c:2369
 msgid "Edit the domain XML associated with a saved state file"
 msgstr "编辑与保存的状态文件关联的域 XML"
 
-#: tools/virsh-domain.c:3841
+#: tools/virsh.c:2374
 msgid "saved state file to edit"
 msgstr "要编辑的保存的状态文件"
 
-#: tools/virsh-domain.c:3872
+#: tools/virsh-domain.c:3903
 msgid "--running and --paused are mutually exclusive"
 msgstr ""
 
-#: tools/virsh-domain.c:3882
+#: tools/virsh.c:2433
 #, c-format
 msgid "Saved image %s XML configuration not changed.\n"
 msgstr "未更改保存的映像 %s XML 配置。\n"
 
-#: tools/virsh-domain.c:3890
+#: tools/virsh.c:2446
 #, c-format
 msgid "State file %s edited.\n"
 msgstr "已编辑状态文件 %s。\n"
 
-#: tools/virsh-domain.c:3902
+#: tools/virsh.c:2463
 msgid "managed save of a domain state"
 msgstr "管理域状态的保存"
 
-#: tools/virsh-domain.c:3905
+#: tools/virsh.c:2464
 msgid ""
 "Save and destroy a running domain, so it can be restarted from\n"
 "    the same state at a later time.  When the virsh 'start'\n"
@@ -29792,24 +30116,24 @@
 "    命令是该域要运行的第二个命令时，看以这个\n"
 "    保存的状态自动重启。"
 
-#: tools/virsh-domain.c:3925
+#: tools/virsh.c:2474
 msgid "set domain to be running on next start"
 msgstr "设定要在下一个启动中运行的域"
 
-#: tools/virsh-domain.c:3929
+#: tools/virsh.c:2475
 msgid "set domain to be paused on next start"
 msgstr "设定要在下一个启动中暂停的域"
 
-#: tools/virsh-domain.c:3966
+#: tools/virsh.c:2501
 #, c-format
 msgid "Failed to save domain %s state"
 msgstr "保存域 %s 状态失败"
 
-#: tools/virsh-domain.c:4010
+#: tools/virsh-domain.c:4041
 msgid "Managedsave"
 msgstr "Managedsave"
 
-#: tools/virsh-domain.c:4015
+#: tools/virsh-domain.c:4046
 #, c-format
 msgid ""
 "\n"
@@ -29818,166 +30142,166 @@
 "\n"
 "由 libvirt 保存的域 %s 状态\n"
 
-#: tools/virsh-domain.c:4029
+#: tools/virsh.c:2517
 msgid "Remove managed save of a domain"
 msgstr "删除域的管理保存"
 
-#: tools/virsh-domain.c:4032
+#: tools/virsh.c:2518
 msgid "Remove an existing managed save state file from a domain"
 msgstr "从域中删除现有管理保存状态文件"
 
-#: tools/virsh-domain.c:4059
+#: tools/virsh.c:2543
 msgid "Failed to check for domain managed save image"
 msgstr "检查域管理保存映像失败"
 
-#: tools/virsh-domain.c:4065
+#: tools/virsh.c:2549
 #, c-format
 msgid "Failed to remove managed save image for domain %s"
 msgstr "从域 %s 中删除管理保存映像失败"
 
-#: tools/virsh-domain.c:4070
+#: tools/virsh.c:2554
 #, c-format
 msgid "Removed managedsave image for domain %s"
 msgstr "从域 %s 中删除的 managedsave 映像"
 
-#: tools/virsh-domain.c:4073
+#: tools/virsh.c:2557
 #, c-format
 msgid "Domain %s has no manage save image; removal skipped"
 msgstr "域 %s 没有管理保存映像；跳过删除步骤。"
 
-#: tools/virsh-domain.c:4088
+#: tools/virsh.c:2571
 msgid "show/set scheduler parameters"
 msgstr "显示/设置日程安排变量"
 
-#: tools/virsh-domain.c:4091
+#: tools/virsh.c:2572
 msgid "Show/Set scheduler parameters."
 msgstr "显示/设置日程安排变量"
 
-#: tools/virsh-domain.c:4105
+#: tools/virsh.c:2579
 msgid "weight for XEN_CREDIT"
 msgstr "XEN_CREDIT 重量"
 
-#: tools/virsh-domain.c:4110
+#: tools/virsh.c:2580
 msgid "cap for XEN_CREDIT"
 msgstr "XEN_CREDIT的cap"
 
-#: tools/virsh-domain.c:4114
+#: tools/virsh.c:2581
 msgid "get/set current scheduler info"
 msgstr "获取/设定当前调度程序信息"
 
-#: tools/virsh-domain.c:4118
+#: tools/virsh.c:2582
 msgid "get/set value to be used on next boot"
 msgstr "下一次引导时要使用的 get/set 值"
 
-#: tools/virsh-domain.c:4122
+#: tools/virsh.c:2583
 msgid "get/set value from running domain"
 msgstr "运行域的 get/set 值"
 
-#: tools/virsh-domain.c:4127
+#: tools/virsh.c:2578
 msgid "parameter=value"
 msgstr "parameter=value"
 
-#: tools/virsh-domain.c:4160
+#: tools/virsh.c:2779
 #, c-format
 msgid "invalid scheduler option: %s"
 msgstr "无效调度程序选项：%s"
 
-#: tools/virsh-domain.c:4184
+#: tools/virsh.c:2625
 msgid "Invalid syntax for --set, expecting name=value"
 msgstr "--set 的无效语法，应为 name=value"
 
-#: tools/virsh-domain.c:4257 tools/virsh-domain.c:4260
+#: tools/virsh.c:2718 tools/virsh.c:2722
 msgid "Scheduler"
 msgstr "调度程序"
 
-#: tools/virsh-domain.c:4260
+#: tools/virsh.c:2722
 msgid "Unknown"
 msgstr "未知"
 
-#: tools/virsh-domain.c:4311
+#: tools/virsh.c:2786
 msgid "cannot query both live and config at once"
 msgstr "无法同时查询 live 和配置"
 
-#: tools/virsh-domain.c:4336
+#: tools/virsh.c:2828
 msgid "restore a domain from a saved state in a file"
 msgstr "从一个存在一个文件中的状态恢复一个域"
 
-#: tools/virsh-domain.c:4339
+#: tools/virsh.c:2829
 msgid "Restore a domain."
 msgstr "恢复一个域。"
 
-#: tools/virsh-domain.c:4348
+#: tools/virsh.c:2834
 msgid "the state to restore"
 msgstr "恢复的状态"
 
-#: tools/virsh-domain.c:4352
+#: tools/virsh.c:2836
 msgid "avoid file system cache when restoring"
 msgstr "恢复时避免文件系统缓存"
 
-#: tools/virsh-domain.c:4360
+#: tools/virsh.c:2839
 msgid "restore domain into running state"
 msgstr "将域恢复为运行状态"
 
-#: tools/virsh-domain.c:4364
+#: tools/virsh.c:2840
 msgid "restore domain into paused state"
 msgstr "将域恢复为暂停状态"
 
-#: tools/virsh-domain.c:4398
+#: tools/virsh.c:2878
 #, c-format
 msgid "Failed to restore domain from %s"
 msgstr "从 %s 恢复域失败"
 
-#: tools/virsh-domain.c:4402
+#: tools/virsh.c:2882
 #, c-format
 msgid "Domain restored from %s\n"
 msgstr "从 %s 恢复域\n"
 
-#: tools/virsh-domain.c:4415
+#: tools/virsh.c:2894
 msgid "dump the core of a domain to a file for analysis"
 msgstr "把一个域的内核 dump 到一个文件中以方便分析"
 
-#: tools/virsh-domain.c:4418
+#: tools/virsh.c:2895
 msgid "Core dump a domain."
 msgstr "内核 dump 一个域。"
 
-#: tools/virsh-domain.c:4426
+#: tools/virsh.c:2900
 msgid "perform a live core dump if supported"
 msgstr "如果支持则执行 live core 转储"
 
-#: tools/virsh-domain.c:4430
+#: tools/virsh.c:2901
 msgid "crash the domain after core dump"
 msgstr "core 转储后破坏该域"
 
-#: tools/virsh-domain.c:4434
+#: tools/virsh-domain.c:4465
 msgid "avoid file system cache when dumping"
 msgstr ""
 
-#: tools/virsh-domain.c:4438
+#: tools/virsh.c:2904
 msgid "reset the domain after core dump"
 msgstr "core 转储后重新设定该域"
 
-#: tools/virsh-domain.c:4448
+#: tools/virsh.c:2906
 msgid "where to dump the core"
 msgstr "内核 dump 到什么地方"
 
-#: tools/virsh-domain.c:4452
+#: tools/virsh-domain.c:4483
 msgid "display the progress of dump"
 msgstr "显示转储进程"
 
-#: tools/virsh-domain.c:4456
+#: tools/virsh-domain.c:4487
 msgid "dump domain's memory only"
 msgstr "只转储域内存"
 
-#: tools/virsh-domain.c:4497
+#: tools/virsh.c:2938
 #, c-format
 msgid "Failed to core dump domain %s to %s"
 msgstr "将域 %s 核转储到 %s 失败"
 
-#: tools/virsh-domain.c:4544
+#: tools/virsh-domain.c:4575
 msgid "Dump"
 msgstr "转储"
 
-#: tools/virsh-domain.c:4549
+#: tools/virsh-domain.c:4580
 #, c-format
 msgid ""
 "\n"
@@ -29986,816 +30310,822 @@
 "\n"
 "转储到 %s 的域 %s\n"
 
-#: tools/virsh-domain.c:4560
+#: tools/virsh.c:2951
 msgid ""
 "take a screenshot of a current domain console and store it into a file"
 msgstr "提取当前域控制台快照并保存到文件中"
 
-#: tools/virsh-domain.c:4564
+#: tools/virsh.c:2953
 msgid "screenshot of a current domain console"
 msgstr "当前域控制台截屏"
 
-#: tools/virsh-domain.c:4577
+#: tools/virsh.c:2959
 msgid "where to store the screenshot"
 msgstr "在哪里保存截屏"
 
-#: tools/virsh-domain.c:4581
+#: tools/virsh.c:2960
 msgid "ID of a screen to take screenshot of"
 msgstr "所提取截屏的页面 ID"
 
-#: tools/virsh-domain.c:4599
+#: tools/virsh.c:2990
 msgid "Invalid domain supplied"
 msgstr "提供无效的域"
 
-#: tools/virsh-domain.c:4641
+#: tools/virsh.c:3037
 msgid "invalid screen ID"
 msgstr "无效页面 ID"
 
-#: tools/virsh-domain.c:4653
+#: tools/virsh.c:3048
 #, c-format
 msgid "could not take a screenshot of %s"
 msgstr "无法提取 %s 的快照"
 
-#: tools/virsh-domain.c:4666
+#: tools/virsh.c:3061
 #, c-format
 msgid "cannot create file %s"
 msgstr "无法生成文件 %s"
 
-#: tools/virsh-domain.c:4674
+#: tools/virsh.c:3069
 #, c-format
 msgid "could not receive data from domain %s"
 msgstr "无法从域 %s 中接收数据"
 
-#: tools/virsh-domain.c:4679 tools/virsh-volume.c:685 tools/virsh-volume.c:799
+#: tools/virsh.c:3074 tools/virsh.c:10123 tools/virsh.c:10219
 #, c-format
 msgid "cannot close file %s"
 msgstr "无法关闭文件 %s"
 
-#: tools/virsh-domain.c:4684
+#: tools/virsh.c:3079
 #, c-format
 msgid "cannot close stream on domain %s"
 msgstr "无法关闭域 %s 中的流"
 
-#: tools/virsh-domain.c:4688
+#: tools/virsh.c:3083
 #, c-format
 msgid "Screenshot saved to %s, with type of %s"
 msgstr "截屏保存为 %s，类型为 %s。"
 
-#: tools/virsh-domain.c:4709
+#: tools/virsh.c:3102
 msgid "resume a domain"
 msgstr "重新恢复一个域"
 
-#: tools/virsh-domain.c:4712
+#: tools/virsh.c:3103
 msgid "Resume a previously suspended domain."
 msgstr "重新恢复一个以前被挂起的域。"
 
-#: tools/virsh-domain.c:4737
+#: tools/virsh.c:3126
 #, c-format
 msgid "Domain %s resumed\n"
 msgstr "域 %s 被重新恢复\n"
 
-#: tools/virsh-domain.c:4739
+#: tools/virsh.c:3128
 #, c-format
 msgid "Failed to resume domain %s"
 msgstr "恢复域 %s 失败"
 
-#: tools/virsh-domain.c:4752
+#: tools/virsh.c:3140
 msgid "gracefully shutdown a domain"
 msgstr "关闭一个域"
 
-#: tools/virsh-domain.c:4755
+#: tools/virsh.c:3141
 msgid "Run shutdown in the target domain."
 msgstr "在目标域中执行关闭行为。"
 
-#: tools/virsh-domain.c:4768 tools/virsh-domain.c:4854
+#: tools/virsh-domain.c:4799 tools/virsh-domain.c:4885
 msgid "shutdown mode: acpi|agent|initctl|signal"
 msgstr ""
 
-#: tools/virsh-domain.c:4788 tools/virsh-domain.c:4873
+#: tools/virsh-domain.c:4819 tools/virsh-domain.c:4904
 msgid "Cannot parse mode string"
 msgstr ""
 
-#: tools/virsh-domain.c:4804 tools/virsh-domain.c:4889
+#: tools/virsh-domain.c:4835 tools/virsh-domain.c:4920
 #, c-format
 msgid ""
 "Unknown mode %s value, expecting 'acpi', 'agent', 'initctl' or 'signal'"
 msgstr ""
 
-#: tools/virsh-domain.c:4819
+#: tools/virsh.c:3164
 #, c-format
 msgid "Domain %s is being shutdown\n"
 msgstr "域 %s 被关闭\n"
 
-#: tools/virsh-domain.c:4821
+#: tools/virsh.c:3166
 #, c-format
 msgid "Failed to shutdown domain %s"
 msgstr "关闭域 %s 失败"
 
-#: tools/virsh-domain.c:4838
+#: tools/virsh.c:3178
 msgid "reboot a domain"
 msgstr "重新启动一个域"
 
-#: tools/virsh-domain.c:4841
+#: tools/virsh.c:3179
 msgid "Run a reboot command in the target domain."
 msgstr "在目标域中执行重新启动命令。"
 
-#: tools/virsh-domain.c:4900
+#: tools/virsh.c:3202
 #, c-format
 msgid "Domain %s is being rebooted\n"
 msgstr "域 %s 正在被重新启动\n"
 
-#: tools/virsh-domain.c:4902
+#: tools/virsh.c:3204
 #, c-format
 msgid "Failed to reboot domain %s"
 msgstr "重新启动域 %s 失败"
 
-#: tools/virsh-domain.c:4919
+#: tools/virsh.c:3216
 msgid "reset a domain"
 msgstr "重新设定域"
 
-#: tools/virsh-domain.c:4922
+#: tools/virsh.c:3217
 msgid "Reset the target domain as if by power button"
 msgstr "如同使用电源按钮重新设定目标域"
 
-#: tools/virsh-domain.c:4947
+#: tools/virsh.c:3240
 #, c-format
 msgid "Domain %s was reset\n"
 msgstr "重新设定域 %s\n"
 
-#: tools/virsh-domain.c:4949
+#: tools/virsh.c:3242
 #, c-format
 msgid "Failed to reset domain %s"
 msgstr "重新设定域 %s 失败"
 
-#: tools/virsh-domain.c:4962
+#: tools/virsh.c:3431
 msgid "domain job information"
 msgstr "域任务信息"
 
-#: tools/virsh-domain.c:4965
+#: tools/virsh.c:3432
 msgid "Returns information about jobs running on a domain."
 msgstr "返回有关在域中运行的任务信息。"
 
-#: tools/virsh-domain.c:5041
-msgid "Job type:"
-msgstr "任务类型："
+#: tools/virsh.c:3471
+msgid "None"
+msgstr "无"
 
-#: tools/virsh-domain.c:5044
+#: tools/virsh.c:3462
 msgid "Bounded"
 msgstr "已捆绑"
 
-#: tools/virsh-domain.c:5048
+#: tools/virsh.c:3466
 msgid "Unbounded"
 msgstr "未捆绑"
 
-#: tools/virsh-domain.c:5053
-msgid "None"
-msgstr "无"
+#: tools/virsh-domain.c:5016
+msgid "Completed"
+msgstr ""
+
+#: tools/virsh-domain.c:5018
+msgid "Cancelled"
+msgstr ""
+
+#: tools/virsh.c:3459
+msgid "Job type:"
+msgstr "任务类型："
 
-#: tools/virsh-domain.c:5058
+#: tools/virsh.c:3475
 msgid "Time elapsed:"
 msgstr "消耗的时间："
 
-#: tools/virsh-domain.c:5060
+#: tools/virsh.c:3477
 msgid "Time remaining:"
 msgstr "剩余时间："
 
-#: tools/virsh-domain.c:5064
+#: tools/virsh.c:3480
 msgid "Data processed:"
 msgstr "处理的数据："
 
-#: tools/virsh-domain.c:5066
+#: tools/virsh.c:3482
 msgid "Data remaining:"
 msgstr "剩余数据："
 
-#: tools/virsh-domain.c:5068
+#: tools/virsh.c:3484
 msgid "Data total:"
 msgstr "数据总量："
 
-#: tools/virsh-domain.c:5073
+#: tools/virsh.c:3488
 msgid "Memory processed:"
 msgstr "处理的内存："
 
-#: tools/virsh-domain.c:5075
+#: tools/virsh.c:3490
 msgid "Memory remaining:"
 msgstr "剩余内存："
 
-#: tools/virsh-domain.c:5077
+#: tools/virsh.c:3492
 msgid "Memory total:"
 msgstr "内存总量："
 
-#: tools/virsh-domain.c:5082
+#: tools/virsh.c:3496
 msgid "File processed:"
 msgstr "处理的文件："
 
-#: tools/virsh-domain.c:5084
+#: tools/virsh.c:3498
 msgid "File remaining:"
 msgstr "剩余文件："
 
-#: tools/virsh-domain.c:5086
+#: tools/virsh.c:3500
 msgid "File total:"
 msgstr "文件总数："
 
-#: tools/virsh-domain.c:5094
+#: tools/virsh-domain.c:5134
 msgid "Constant pages:"
 msgstr ""
 
-#: tools/virsh-domain.c:5101
+#: tools/virsh-domain.c:5141
 msgid "Normal pages:"
 msgstr ""
 
-#: tools/virsh-domain.c:5109
+#: tools/virsh-domain.c:5149
 msgid "Normal data:"
 msgstr ""
 
-#: tools/virsh-domain.c:5117
+#: tools/virsh-domain.c:5157
 msgid "Expected downtime:"
 msgstr ""
 
-#: tools/virsh-domain.c:5126
+#: tools/virsh-domain.c:5166
 msgid "Compression cache:"
 msgstr ""
 
-#: tools/virsh-domain.c:5134
+#: tools/virsh-domain.c:5174
 msgid "Compressed data:"
 msgstr ""
 
-#: tools/virsh-domain.c:5141
+#: tools/virsh-domain.c:5181
 msgid "Compressed pages:"
 msgstr ""
 
-#: tools/virsh-domain.c:5148
+#: tools/virsh-domain.c:5188
 msgid "Compression cache misses:"
 msgstr ""
 
-#: tools/virsh-domain.c:5155
+#: tools/virsh-domain.c:5195
 msgid "Compression overflows:"
 msgstr ""
 
-#: tools/virsh-domain.c:5175
+#: tools/virsh.c:3514
 msgid "abort active domain job"
 msgstr "忽略活跃域任务"
 
-#: tools/virsh-domain.c:5178
+#: tools/virsh.c:3515
 msgid "Aborts the currently running domain job"
 msgstr "忽略目前正在运行的域任务"
 
-#: tools/virsh-domain.c:5213
+#: tools/virsh.c:3711
 msgid "domain vcpu counts"
 msgstr "域 vcpu 计数"
 
-#: tools/virsh-domain.c:5216
+#: tools/virsh.c:3712
 msgid "Returns the number of virtual CPUs used by the domain."
 msgstr "返回该域使用的虚拟 CPU 数"
 
-#: tools/virsh-domain.c:5229
+#: tools/virsh-domain.c:5269
 msgid "get maximum count of vcpus"
 msgstr ""
 
-#: tools/virsh-domain.c:5233
+#: tools/virsh.c:3719
 msgid "get number of currently active vcpus"
 msgstr "获取目前活跃 vcpu 的数量"
 
-#: tools/virsh-domain.c:5237
+#: tools/virsh.c:3720
 msgid "get value from running domain"
 msgstr "从运行的域中获取数值"
 
-#: tools/virsh-domain.c:5241
+#: tools/virsh.c:3721
 msgid "get value to be used on next boot"
 msgstr "获取下次引导中使用的数值"
 
-#: tools/virsh-domain.c:5245
+#: tools/virsh.c:3723
 msgid "get value according to current domain state"
 msgstr "根据当前域状态获取数值"
 
-#: tools/virsh-domain.c:5249
+#: tools/virsh-domain.c:5289
 msgid "retrieve vcpu count from the guest instead of the hypervisor"
 msgstr "在虚拟机而不是 hypervisor 中检索 vcpu 计数"
 
-#: tools/virsh-domain.c:5294
+#: tools/virsh-domain.c:5334
 msgid "Failed to retrieve vCPU count from the guest"
 msgstr "从虚拟机中检索 vCPU 计数失败"
 
-#: tools/virsh-domain.c:5322
+#: tools/virsh-domain.c:5362
 msgid "Failed to retrieve maximum vcpu count"
 msgstr ""
 
-#: tools/virsh-domain.c:5328
+#: tools/virsh-domain.c:5368
 msgid "Failed to retrieve current vcpu count"
 msgstr ""
 
-#: tools/virsh-domain.c:5397 tools/virsh-domain.c:5398
+#: tools/virsh.c:3822 tools/virsh.c:3843
 msgid "maximum"
 msgstr "最大值"
 
-#: tools/virsh-domain.c:5397 tools/virsh-domain.c:5399
+#: tools/virsh.c:3822 tools/virsh.c:3880
 msgid "config"
 msgstr "配置"
 
-#: tools/virsh-domain.c:5398 tools/virsh-domain.c:5400
+#: tools/virsh.c:3843 tools/virsh.c:3902
 msgid "live"
 msgstr "live"
 
-#: tools/virsh-domain.c:5399 tools/virsh-domain.c:5400
+#: tools/virsh.c:3880 tools/virsh.c:3902
 msgid "current"
 msgstr "当前"
 
-#: tools/virsh-domain.c:5424
+#: tools/virsh.c:3919
 msgid "detailed domain vcpu information"
 msgstr "详细的域 vcpu 信息"
 
-#: tools/virsh-domain.c:5427
+#: tools/virsh.c:3920
 msgid "Returns basic information about the domain virtual CPUs."
 msgstr "恢复这个域虚拟 CPU 的基本信息。"
 
-#: tools/virsh-domain.c:5474 tools/virsh-domain.c:5503
-#: tools/virsh-domain.c:5778
+#: tools/virsh.c:3967 tools/virsh.c:3996 tools/virsh.c:4131
 msgid "VCPU:"
 msgstr "VCPU:"
 
-#: tools/virsh-domain.c:5475 tools/virsh-domain.c:5504
+#: tools/virsh.c:3968 tools/virsh.c:3997
 msgid "CPU:"
 msgstr "CPU:"
 
-#: tools/virsh-domain.c:5485 tools/virsh-domain.c:5507
+#: tools/virsh.c:3978 tools/virsh.c:4000
 msgid "CPU Affinity:"
 msgstr "CPU关系:"
 
-#: tools/virsh-domain.c:5504 tools/virsh-domain.c:5505
-#: tools/virsh-domain.c:5506
+#: tools/virsh.c:3997 tools/virsh.c:3998 tools/virsh.c:3999
 msgid "N/A"
 msgstr "N/A"
 
-#: tools/virsh-domain.c:5506
+#: tools/virsh.c:3999
 msgid "CPU time"
 msgstr "CPU 时间"
 
-#: tools/virsh-domain.c:5533
+#: tools/virsh.c:4025
 msgid "control or query domain vcpu affinity"
 msgstr "控制或者查询域 vcpu 亲和性"
 
-#: tools/virsh-domain.c:5536
+#: tools/virsh.c:4026
 msgid "Pin domain VCPUs to host physical CPUs."
 msgstr "把域 VCPU 插入到主机的物理 CPU 中。"
 
-#: tools/virsh-domain.c:5549
+#: tools/virsh.c:4032
 msgid "vcpu number"
 msgstr "vcpu 号"
 
-#: tools/virsh-domain.c:5554 tools/virsh-domain.c:5837
+#: tools/virsh.c:4034
 msgid "host cpu number(s) to set, or omit option to query"
 msgstr "要设定的主机 cpu 数或者要省略的查询选项"
 
-#: tools/virsh-domain.c:5647 tools/virsh-domain.c:5672
+#: tools/virsh.c:4200 tools/virsh.c:4224
 #, c-format
 msgid "Physical CPU %d doesn't exist."
 msgstr "物理 CPU %d 不存在."
 
-#: tools/virsh-domain.c:5696
+#: tools/virsh.c:4260
 msgid "cpulist: Invalid format."
 msgstr "cpulist: 无效格式。"
 
-#: tools/virsh-domain.c:5743
+#: tools/virsh.c:4095
 msgid "vcpupin: Invalid or missing vCPU number."
 msgstr "vcpupin：无效或者丢失的 vCPU 号。"
 
-#: tools/virsh-domain.c:5754
+#: tools/virsh.c:4106
 msgid "vcpupin: failed to get domain information."
 msgstr "vcpupin: 获取域信息失败。"
 
-#: tools/virsh-domain.c:5760
+#: tools/virsh.c:4112
 msgid "vcpupin: Invalid vCPU number."
 msgstr "vcpupin：无效 vCPU 号。"
 
-#: tools/virsh-domain.c:5778 tools/virsh-domain.c:5907
+#: tools/virsh.c:4131
 msgid "CPU Affinity"
 msgstr "CPU 亲和性"
 
-#: tools/virsh-domain.c:5820
+#: tools/virsh-domain.c:5860
 msgid "control or query domain emulator affinity"
 msgstr "控制或者查询域模拟程序亲和性"
 
-#: tools/virsh-domain.c:5823
+#: tools/virsh-domain.c:5863
 msgid "Pin domain emulator threads to host physical CPUs."
 msgstr "Pin 域模拟程序线程到主机物理 CPU。"
 
-#: tools/virsh-domain.c:5907
+#: tools/virsh-domain.c:5947
 msgid "emulator:"
 msgstr "模拟程序："
 
-#: tools/virsh-domain.c:5939
+#: tools/virsh.c:4269
 msgid "change number of virtual CPUs"
 msgstr "改变虚拟 CPU 的号"
 
-#: tools/virsh-domain.c:5942
+#: tools/virsh.c:4270
 msgid "Change the number of virtual CPUs in the guest domain."
 msgstr "在客户域中修改虚拟 CPU 号。"
 
-#: tools/virsh-domain.c:5956
+#: tools/virsh.c:4276
 msgid "number of virtual CPUs"
 msgstr "虚拟 CPU 号"
 
-#: tools/virsh-domain.c:5960
+#: tools/virsh.c:4277
 msgid "set maximum limit on next boot"
 msgstr "设定下一次引导的上限"
 
-#: tools/virsh-domain.c:5976
+#: tools/virsh-domain.c:6016
 msgid "modify cpu state in the guest"
 msgstr "在虚拟机中修改 cpu 状态"
 
-#: tools/virsh-domain.c:6012
+#: tools/virsh.c:4319
 msgid "Invalid number of virtual CPUs"
 msgstr "虚拟 CPU 的无效数字"
 
-#: tools/virsh-domain.c:6034
+#: tools/virsh.c:4342
 msgid "--maximum must be used with --config only"
 msgstr "--maximum 只能与 --config 同用"
 
-#: tools/virsh-domain.c:6056
+#: tools/virsh.c:13101
 msgid "compare host CPU with a CPU described by an XML file"
 msgstr "使用 XML 文件中描述的 CPU 与主机 CPU 进行对比"
 
-#: tools/virsh-domain.c:6059
+#: tools/virsh.c:13102
 msgid "compare CPU with host CPU"
 msgstr "将 CPU 与主机 CPU 进行对比"
 
-#: tools/virsh-domain.c:6068
+#: tools/virsh.c:13107
 msgid "file containing an XML CPU description"
 msgstr "包含 XML CPU 描述的文件"
 
-#: tools/virsh-domain.c:6104
+#: tools/virsh.c:13156
 #, c-format
 msgid ""
 "File '%s' does not contain a <cpu> element or is not a valid domain or "
 "capabilities XML"
 msgstr "文件 '%s' 不包含 <cpu> 元素或者不适有效域或者功能 XML"
 
-#: tools/virsh-domain.c:6113
+#: tools/virsh.c:13165
 #, c-format
 msgid "CPU described in %s is incompatible with host CPU\n"
 msgstr "%s 中描述的 CPU 与主机 CPU 不兼容\n"
 
-#: tools/virsh-domain.c:6119
+#: tools/virsh.c:13171
 #, c-format
 msgid "CPU described in %s is identical to host CPU\n"
 msgstr "%s 中描述的 CPU 与主机 CPU 不相同\n"
 
-#: tools/virsh-domain.c:6124
+#: tools/virsh.c:13176
 #, c-format
 msgid "Host CPU is a superset of CPU described in %s\n"
 msgstr "主机 CPU 是 %s 中描述的 CPU 超集\n"
 
-#: tools/virsh-domain.c:6130
+#: tools/virsh.c:13182
 #, c-format
 msgid "Failed to compare host CPU with %s"
 msgstr "将主机 CPU 与 %s 对比失败"
 
-#: tools/virsh-domain.c:6150
+#: tools/virsh.c:13201
 msgid "compute baseline CPU"
 msgstr "计算基线 CPU"
 
-#: tools/virsh-domain.c:6153
+#: tools/virsh.c:13202
 msgid "Compute baseline CPU for a set of given CPUs."
 msgstr "为给定的 CPU 组计算基线 CPU"
 
-#: tools/virsh-domain.c:6162
+#: tools/virsh.c:13207
 msgid "file containing XML CPU descriptions"
 msgstr "包含 XML CPU 描述的文件"
 
-#: tools/virsh-domain.c:6166
+#: tools/virsh-domain.c:6206
 msgid "Show features that are part of the CPU model type"
 msgstr ""
 
-#: tools/virsh-domain.c:6214
+#: tools/virsh.c:13254
 #, c-format
 msgid "No host CPU specified in '%s'"
 msgstr "'%s' 中未指定主机 CPU"
 
-#: tools/virsh-domain.c:6260
+#: tools/virsh-domain.c:6300
 msgid "show domain cpu statistics"
 msgstr "显示域 cpu 统计数据"
 
-#: tools/virsh-domain.c:6263
+#: tools/virsh-domain.c:6303
 msgid "Display per-CPU and total statistics about the domain's CPUs"
 msgstr "显示域 CPU 的每个 CPU 以及总体统计数据"
 
-#: tools/virsh-domain.c:6276
+#: tools/virsh-domain.c:6316
 msgid "Show total statistics only"
 msgstr "只显示总体统计数据"
 
-#: tools/virsh-domain.c:6280
+#: tools/virsh-domain.c:6320
 msgid "Show statistics from this CPU"
 msgstr "显示这个 CPU 的统计数据"
 
-#: tools/virsh-domain.c:6284
+#: tools/virsh-domain.c:6324
 msgid "Number of shown CPUs at most"
 msgstr "最多可显示的 CPU 数"
 
-#: tools/virsh-domain.c:6307
+#: tools/virsh-domain.c:6347
 msgid "Unable to parse integer parameter for start"
 msgstr ""
 
-#: tools/virsh-domain.c:6311
+#: tools/virsh-domain.c:6351
 msgid "Invalid value for start CPU"
 msgstr ""
 
-#: tools/virsh-domain.c:6319
+#: tools/virsh-domain.c:6359
 msgid "Unable to parse integer parameter for CPUs to show"
 msgstr ""
 
-#: tools/virsh-domain.c:6323
+#: tools/virsh-domain.c:6363
 msgid "Invalid value for number of CPUs to show"
 msgstr ""
 
-#: tools/virsh-domain.c:6343
+#: tools/virsh-domain.c:6383
 #, c-format
 msgid "Only %d CPUs available to show\n"
 msgstr ""
 
-#: tools/virsh-domain.c:6352
+#: tools/virsh-domain.c:6392
 msgid "No per-CPU stats available"
 msgstr "没有可用的每个 CPU 统计数据"
 
-#: tools/virsh-domain.c:6405
+#: tools/virsh-domain.c:6445
 msgid "No total stats available"
 msgstr "没有可用的总体统计数据"
 
-#: tools/virsh-domain.c:6416
+#: tools/virsh-domain.c:6456
 msgid "Total:\n"
 msgstr "总计：\n"
 
-#: tools/virsh-domain.c:6441
+#: tools/virsh-domain.c:6481
 #, c-format
 msgid "Failed to retrieve CPU statistics for domain '%s'"
 msgstr ""
 
-#: tools/virsh-domain.c:6451
+#: tools/virsh.c:1805
 msgid "create a domain from an XML file"
 msgstr "从一个 XML 文件创建一个域"
 
-#: tools/virsh-domain.c:6454
+#: tools/virsh.c:1806
 msgid "Create a domain."
 msgstr "创建一个域"
 
-#: tools/virsh-domain.c:6463 tools/virsh-domain.c:6553
+#: tools/virsh.c:1811 tools/virsh.c:1874
 msgid "file containing an XML domain description"
 msgstr "文件包括一个 XML 域描述"
 
-#: tools/virsh-domain.c:6521
-#, c-format
-msgid "Domain %s created from %s\n"
-msgstr "域 %s 被创建（从 %s）\n"
-
-#: tools/virsh-domain.c:6529
+#: tools/virsh.c:1858
 #, c-format
 msgid "Failed to create domain from %s"
 msgstr "从 %s 创建域失败"
 
-#: tools/virsh-domain.c:6541
+#: tools/virsh.c:1850
+#, c-format
+msgid "Domain %s created from %s\n"
+msgstr "域 %s 被创建（从 %s）\n"
+
+#: tools/virsh.c:1868
 msgid "define (but don't start) a domain from an XML file"
 msgstr "从一个 XML 文件定义（但不开始）一个域"
 
-#: tools/virsh-domain.c:6544
+#: tools/virsh.c:1869
 msgid "Define a domain."
 msgstr "定义一个域。"
 
-#: tools/virsh-domain.c:6576
+#: tools/virsh.c:1899
 #, c-format
 msgid "Domain %s defined from %s\n"
 msgstr "定义域 %s（从 %s）\n"
 
-#: tools/virsh-domain.c:6580
+#: tools/virsh.c:1903
 #, c-format
 msgid "Failed to define domain from %s"
 msgstr "从 %s 定义域失败"
 
-#: tools/virsh-domain.c:6591
+#: tools/virsh.c:3254
 msgid "destroy (stop) a domain"
 msgstr "销毁（停止）域"
 
-#: tools/virsh-domain.c:6594
+#: tools/virsh.c:3256
 msgid "Forcefully stop a given domain, but leave its resources intact."
 msgstr "强制停止给定域，但保持其资源完整。"
 
-#: tools/virsh-domain.c:6607
+#: tools/virsh-domain.c:6650
 msgid "terminate gracefully"
 msgstr "优雅地终止"
 
-#: tools/virsh-domain.c:6633
+#: tools/virsh.c:3279
 #, c-format
 msgid "Domain %s destroyed\n"
 msgstr "域 %s 被删除\n"
 
-#: tools/virsh-domain.c:6635
+#: tools/virsh.c:3281
 #, c-format
 msgid "Failed to destroy domain %s"
 msgstr "删除域 %s 失败"
 
-#: tools/virsh-domain.c:6648
+#: tools/virsh-domain.c:6691
 msgid "show or set domain's description or title"
 msgstr "显示或者设定域描述或者标题"
 
-#: tools/virsh-domain.c:6651
+#: tools/virsh-domain.c:6694
 msgid "Allows to show or modify description or title of a domain."
 msgstr "允许显示或者修改域的描述或者标题"
 
-#: tools/virsh-domain.c:6664 tools/virsh-domain.c:6836
+#: tools/virsh-domain.c:6707 tools/virsh-domain.c:6879
 msgid "modify/get running state"
 msgstr "修改/获取运行状态"
 
-#: tools/virsh-domain.c:6668 tools/virsh-domain.c:6840
+#: tools/virsh-domain.c:6711 tools/virsh-domain.c:6883
 msgid "modify/get persistent configuration"
 msgstr "修改/获取持久配置"
 
-#: tools/virsh-domain.c:6672 tools/virsh-domain.c:6844
+#: tools/virsh-domain.c:6715 tools/virsh-domain.c:6887
 msgid "modify/get current state configuration"
 msgstr "修改/获取当前状态配置"
 
-#: tools/virsh-domain.c:6676
+#: tools/virsh-domain.c:6719
 msgid "modify/get the title instead of description"
 msgstr "修改/获取标题而不是描述"
 
-#: tools/virsh-domain.c:6680
+#: tools/virsh-domain.c:6723
 msgid "open an editor to modify the description"
 msgstr "打开编辑器修改描述"
 
-#: tools/virsh-domain.c:6684
+#: tools/virsh-domain.c:6727
 msgid "message"
 msgstr "信息"
 
-#: tools/virsh-domain.c:6739
+#: tools/virsh-domain.c:6782
 msgid "Failed to collect new description/title"
 msgstr "收集新描述/标题失败"
 
-#: tools/virsh-domain.c:6775
+#: tools/virsh-domain.c:6818
 msgid "Domain description not changed.\n"
 msgstr "未更改域描述。\n"
 
-#: tools/virsh-domain.c:6787
+#: tools/virsh-domain.c:6830
 msgid "Failed to set new domain description"
 msgstr "设定新域描述失败"
 
-#: tools/virsh-domain.c:6790
+#: tools/virsh-domain.c:6833
 msgid "Domain description updated successfully"
 msgstr "成功更新域描述"
 
-#: tools/virsh-domain.c:6800
+#: tools/virsh-domain.c:6843
 #, c-format
 msgid "No description for domain: %s"
 msgstr "没有域描述：%s"
 
-#: tools/virsh-domain.c:6820
+#: tools/virsh-domain.c:6863
 msgid "show or set domain's custom XML metadata"
 msgstr ""
 
-#: tools/virsh-domain.c:6823
+#: tools/virsh-domain.c:6866
 msgid "Shows or modifies the XML metadata of a domain."
 msgstr ""
 
-#: tools/virsh-domain.c:6848
+#: tools/virsh-domain.c:6891
 msgid "use an editor to change the metadata"
 msgstr ""
 
-#: tools/virsh-domain.c:6853
+#: tools/virsh-domain.c:6896
 msgid "URI of the namespace"
 msgstr ""
 
-#: tools/virsh-domain.c:6857
+#: tools/virsh-domain.c:6900
 msgid "key to be used as a namespace identifier"
 msgstr ""
 
-#: tools/virsh-domain.c:6861
+#: tools/virsh-domain.c:6904
 msgid "new metadata to set"
 msgstr ""
 
-#: tools/virsh-domain.c:6865
+#: tools/virsh-domain.c:6908
 msgid "remove the metadata corresponding to an uri"
 msgstr ""
 
-#: tools/virsh-domain.c:6926
+#: tools/virsh-domain.c:6969
 msgid "namespace key is required when modifying metadata"
 msgstr ""
 
-#: tools/virsh-domain.c:6936
+#: tools/virsh-domain.c:6979
 msgid "Metadata removed"
 msgstr ""
 
-#: tools/virsh-domain.c:6938 tools/virsh-domain.c:6952
+#: tools/virsh-domain.c:6981 tools/virsh-domain.c:6995
 msgid "Metadata modified"
 msgstr ""
 
-#: tools/virsh-domain.c:6943
+#: tools/virsh-domain.c:6986
 msgid "Metadata not changed"
 msgstr ""
 
-#: tools/virsh-domain.c:6977
+#: tools/virsh.c:4363
 msgid "Inject NMI to the guest"
 msgstr "在虚拟机中输入 NMI"
 
-#: tools/virsh-domain.c:6980
+#: tools/virsh.c:4364
 msgid "Inject NMI to the guest domain."
 msgstr "在虚拟机域中输入 NMI"
 
-#: tools/virsh-domain.c:7015
+#: tools/virsh.c:4397
 msgid "Send keycodes to the guest"
 msgstr "向虚拟机发送序列号"
 
-#: tools/virsh-domain.c:7018
+#: tools/virsh.c:4398
 msgid "Send keycodes (integers or symbolic names) to the guest"
 msgstr "向虚拟机发送序列号  (整数或者符号名称)"
 
-#: tools/virsh-domain.c:7032
+#: tools/virsh.c:4405
 msgid "the codeset of keycodes, default:linux"
 msgstr "序列号代码集，默认：linux"
 
-#: tools/virsh-domain.c:7037
+#: tools/virsh.c:4407
 msgid "the time (in milliseconds) how long the keys will be held"
 msgstr "按住按键的时间长度 (以毫秒为单位)"
 
-#: tools/virsh-domain.c:7042
+#: tools/virsh.c:4408
 msgid "the key code"
 msgstr "序列号"
 
-#: tools/virsh-domain.c:7077
+#: tools/virsh-domain.c:7120
 msgid "invalid value of --holdtime"
 msgstr ""
 
-#: tools/virsh-domain.c:7083
+#: tools/virsh.c:4451
 #, c-format
 msgid "unknown codeset: '%s'"
 msgstr "未知代码集：'%s'"
 
-#: tools/virsh-domain.c:7089
+#: tools/virsh.c:4457
 msgid "too many keycodes"
 msgstr "太多序列号"
 
-#: tools/virsh-domain.c:7095
+#: tools/virsh.c:4463
 #, c-format
 msgid "invalid keycode: '%s'"
 msgstr "无效序列号：'%s'"
 
-#: tools/virsh-domain.c:7117
+#: tools/virsh-domain.c:7160
 msgid "Send signals to processes"
 msgstr ""
 
-#: tools/virsh-domain.c:7120
+#: tools/virsh-domain.c:7163
 msgid "Send signals to processes in the guest"
 msgstr ""
 
-#: tools/virsh-domain.c:7134
+#: tools/virsh-domain.c:7177
 msgid "the process ID"
 msgstr ""
 
-#: tools/virsh-domain.c:7139
+#: tools/virsh-domain.c:7182
 msgid "the signal number or name"
 msgstr ""
 
-#: tools/virsh-domain.c:7208
+#: tools/virsh-domain.c:7251
 #, c-format
 msgid "malformed PID value: %s"
 msgstr ""
 
-#: tools/virsh-domain.c:7213
+#: tools/virsh-domain.c:7256
 #, c-format
 msgid "malformed signal name: %s"
 msgstr ""
 
-#: tools/virsh-domain.c:7232
+#: tools/virsh.c:4484
 msgid "change memory allocation"
 msgstr "改变内存的分配"
 
-#: tools/virsh-domain.c:7235
+#: tools/virsh.c:4485
 msgid "Change the current memory allocation in the guest domain."
 msgstr "改变当前在 guest 域中的内存分配。"
 
-#: tools/virsh-domain.c:7253
+#: tools/virsh-domain.c:7296
 msgid "new memory size, as scaled integer (default KiB)"
 msgstr "新内存大小，以整数计（默认为 KiB）"
 
-#: tools/virsh-domain.c:7304 tools/virsh-domain.c:7401
+#: tools/virsh.c:4533 tools/virsh.c:4621
 msgid "memory size has to be a number"
 msgstr "内存大小必须是一个数字"
 
-#: tools/virsh-domain.c:7329
+#: tools/virsh.c:4574
 msgid "change maximum memory limit"
 msgstr "改变最大内存限制值"
 
-#: tools/virsh-domain.c:7332
+#: tools/virsh.c:4575
 msgid "Change the maximum memory allocation limit in the guest domain."
 msgstr "改变在客户域中的最大内存分配限制。"
 
-#: tools/virsh-domain.c:7350
+#: tools/virsh-domain.c:7393
 msgid "new maximum memory size, as scaled integer (default KiB)"
 msgstr "新的最大内存大小，以整数计（默认为 KiB）"
 
-#: tools/virsh-domain.c:7409 tools/virsh-domain.c:7414
+#: tools/virsh.c:4633 tools/virsh.c:4638
 msgid "Unable to change MaxMemorySize"
 msgstr "不能改变最大内存大小"
 
-#: tools/virsh-domain.c:7428
+#: tools/virsh.c:4828
 msgid "Get or set memory parameters"
 msgstr "获取或者数值内存参数"
 
-#: tools/virsh-domain.c:7431
+#: tools/virsh.c:4829
 msgid ""
 "Get or set the current memory parameters for a guest domain.\n"
 "    To get the memory parameters use following command: \n"
@@ -30807,43 +31137,43 @@
 "\n"
 "virsh # memtune <domain>"
 
-#: tools/virsh-domain.c:7447
+#: tools/virsh-domain.c:7490
 msgid "Max memory, as scaled integer (default KiB)"
 msgstr "最大内存，以整数计（默认为 KiB）"
 
-#: tools/virsh-domain.c:7451
+#: tools/virsh-domain.c:7494
 msgid "Memory during contention, as scaled integer (default KiB)"
 msgstr "竞争过程中的内存，以整数计（默认为 KiB）"
 
-#: tools/virsh-domain.c:7455
+#: tools/virsh-domain.c:7498
 msgid "Max memory plus swap, as scaled integer (default KiB)"
 msgstr "最大内存加上 swap，以整数计（默认为 KiB）"
 
-#: tools/virsh-domain.c:7459
+#: tools/virsh-domain.c:7502
 msgid "Min guaranteed memory, as scaled integer (default KiB)"
 msgstr "最小保证的内存，以整数计（默认为 KiB）"
 
-#: tools/virsh-domain.c:7576 tools/virsh-domain.c:7725 tools/virsh-host.c:890
+#: tools/virsh.c:4911
 msgid "Unable to get number of memory parameters"
 msgstr "无法获取内存参数值"
 
-#: tools/virsh-domain.c:7589 tools/virsh-host.c:902
+#: tools/virsh.c:4924
 msgid "Unable to get memory parameters"
 msgstr "无法获取内存参数"
 
-#: tools/virsh-domain.c:7596
+#: tools/virsh-domain.c:7639
 msgid "unlimited"
 msgstr "无限制"
 
-#: tools/virsh-domain.c:7618 tools/virsh-host.c:929
+#: tools/virsh.c:5004
 msgid "Unable to change memory parameters"
 msgstr "无法更改内存参数"
 
-#: tools/virsh-domain.c:7627
+#: tools/virsh-domain.c:7670
 msgid "Get or set numa parameters"
 msgstr "获取或者数值 numa 参数"
 
-#: tools/virsh-domain.c:7630
+#: tools/virsh-domain.c:7673
 msgid ""
 "Get or set the current numa parameters for a guest domain.\n"
 "    To get the numa parameters use following command: \n"
@@ -30855,667 +31185,963 @@
 "\n"
 "virsh # numatune <domain>"
 
-#: tools/virsh-domain.c:7646
+#: tools/virsh-domain.c:7689
 msgid "NUMA mode, one of strict, preferred and interleave"
 msgstr "NUMA 模式，可在 strict，preferred 以及 interleave 中选一个。"
 
-#: tools/virsh-domain.c:7650
+#: tools/virsh-domain.c:7693
 msgid "NUMA node selections to set"
 msgstr "要设定的 NUMA 节点选择"
 
-#: tools/virsh-domain.c:7712
+#: tools/virsh-domain.c:7755
 #, c-format
 msgid "Invalid mode: %s"
 msgstr "无效模式：%s"
 
-#: tools/virsh-domain.c:7738
+#: tools/virsh-domain.c:7781
 msgid "Unable to get numa parameters"
 msgstr "无法获取 numa 参数"
 
-#: tools/virsh-domain.c:7768
+#: tools/virsh-domain.c:7811
 msgid "Unable to change numa parameters"
 msgstr "无法更改 numa 参数"
 
-#: tools/virsh-domain.c:7777 tools/virsh-domain.c:7780
+#: tools/virsh.c:14980 tools/virsh.c:14981
 msgid "QEMU Monitor Command"
 msgstr "QEMU 监控程序命令"
 
-#: tools/virsh-domain.c:7793
+#: tools/virsh.c:14987
 msgid "command is in human monitor protocol"
 msgstr "采用认同监控协议的命令"
 
-#: tools/virsh-domain.c:7797
+#: tools/virsh-domain.c:7840
 msgid "pretty-print any qemu monitor protocol output"
 msgstr "详细输出所有 qemu 监控程序协议输出结果"
 
-#: tools/virsh-domain.c:7802 tools/virsh-domain.c:7961
+#: tools/virsh.c:14988
 msgid "command"
 msgstr "命令"
 
-#: tools/virsh-domain.c:7831 tools/virsh-domain.c:7992
+#: tools/virsh.c:15018
 msgid "Failed to collect command"
 msgstr "收集命令失败"
 
-#: tools/virsh-domain.c:7838
+#: tools/virsh-domain.c:7881
 msgid "--hmp and --pretty are not compatible"
 msgstr "--hmp 和 --pretty 不兼容"
 
-#: tools/virsh-domain.c:7876 tools/virsh-domain.c:7879
+#: tools/virsh.c:15046 tools/virsh.c:15047
 msgid "QEMU Attach"
 msgstr "QEMU 附加"
 
-#: tools/virsh-domain.c:7888
+#: tools/virsh.c:15052
 msgid "pid"
 msgstr "pid"
 
-#: tools/virsh-domain.c:7902
+#: tools/virsh.c:15068
 msgid "missing pid value"
 msgstr "缺少 pid 值"
 
-#: tools/virsh-domain.c:7910
+#: tools/virsh.c:15076
 #, c-format
 msgid "Domain %s attached to pid %u\n"
 msgstr "附加到 pid  %s 的域 %u\n"
 
-#: tools/virsh-domain.c:7915
+#: tools/virsh.c:15081
 #, c-format
 msgid "Failed to attach to pid %u"
 msgstr "附加到 pid %u 失败"
 
-#: tools/virsh-domain.c:7927
+#: tools/virsh-domain.c:7970
 msgid "QEMU Guest Agent Command"
 msgstr "QEMU 虚拟机代理命令"
 
-#: tools/virsh-domain.c:7930
+#: tools/virsh-domain.c:7973
 msgid "Run an arbitrary qemu guest agent command; use at your own risk"
 msgstr "运行随机 qemu 虚拟机代理命令；风险自担。"
 
-#: tools/virsh-domain.c:7944
+#: tools/virsh-domain.c:7987
 msgid "timeout seconds. must be positive."
 msgstr "超时秒数。必须为正值。"
 
-#: tools/virsh-domain.c:7948
+#: tools/virsh-domain.c:7991
 msgid "execute command without waiting for timeout"
 msgstr "执行命令无需等待超时"
 
-#: tools/virsh-domain.c:7952
+#: tools/virsh-domain.c:7995
 msgid "execute command without timeout"
 msgstr "无超时执行命令"
 
-#: tools/virsh-domain.c:7956
+#: tools/virsh-domain.c:7999
 msgid "pretty-print the output"
 msgstr "输出结果的美化格式"
 
-#: tools/virsh-domain.c:7999
+#: tools/virsh-domain.c:8042
 msgid "timeout number has to be a number"
 msgstr "超时数必须为一个数字"
 
-#: tools/virsh-domain.c:8005
+#: tools/virsh-domain.c:8048
 msgid "timeout must be positive"
 msgstr "超时必须为正数"
 
-#: tools/virsh-domain.c:8019
+#: tools/virsh-domain.c:8062
 msgid "timeout, async and block options are exclusive"
 msgstr "超时，异步以及块选项为专用的"
 
-#: tools/virsh-domain.c:8056
+#: tools/virsh-domain.c:8099
 msgid "LXC Guest Enter Namespace"
 msgstr ""
 
-#: tools/virsh-domain.c:8059
+#: tools/virsh-domain.c:8102
 msgid "Run an arbitrary lxc guest enter namespace; use at your own risk"
 msgstr ""
 
-#: tools/virsh-domain.c:8072
+#: tools/virsh-domain.c:8115
 msgid "Do not change process security label"
 msgstr ""
 
-#: tools/virsh-domain.c:8077
+#: tools/virsh-domain.c:8120
 msgid "namespace"
 msgstr ""
 
-#: tools/virsh-domain.c:8107 tools/virsh-domain.c:8113
+#: tools/virsh-domain.c:8150 tools/virsh-domain.c:8156
 #, c-format
 msgid "%s: %d: failed to allocate argv"
 msgstr ""
 
-#: tools/virsh-domain.c:8123
+#: tools/virsh-domain.c:8166
 msgid "Failed to allocate security model"
 msgstr ""
 
-#: tools/virsh-domain.c:8127
+#: tools/virsh-domain.c:8170
 msgid "Failed to allocate security label"
 msgstr ""
 
-#: tools/virsh-domain.c:8194
+#: tools/virsh.c:5332
 msgid "domain information in XML"
 msgstr "XML 中的域信息"
 
-#: tools/virsh-domain.c:8197
+#: tools/virsh.c:5333
 msgid "Output the domain information as an XML dump to stdout."
 msgstr "把域信息作为一个 XML 输出到 stdout。"
 
-#: tools/virsh-domain.c:8210 tools/virsh-interface.c:473
-#: tools/virsh-pool.c:637
+#: tools/virsh.c:5339 tools/virsh.c:7262
 msgid "show inactive defined XML"
 msgstr "显示不活跃定义的 XML"
 
-#: tools/virsh-domain.c:8218
+#: tools/virsh.c:5341
 msgid "update guest CPU according to host CPU"
 msgstr "根据主机 CPU 更新虚拟机 CPU"
 
-#: tools/virsh-domain.c:8222
+#: tools/virsh-domain.c:8265
 msgid "provide XML suitable for migrations"
 msgstr "为迁移提供可用 XML"
 
-#: tools/virsh-domain.c:8268
+#: tools/virsh.c:5385
 msgid "Convert native config to domain XML"
 msgstr "将原始配置转换为域 XML"
 
-#: tools/virsh-domain.c:8271
+#: tools/virsh.c:5386
 msgid "Convert native guest configuration format to domain XML format."
 msgstr "将原始虚拟机配置格式转换为域 XML 格式。"
 
-#: tools/virsh-domain.c:8280
+#: tools/virsh.c:5391
 msgid "source config data format"
 msgstr "源配置数据格式"
 
-#: tools/virsh-domain.c:8285
+#: tools/virsh.c:5392
 msgid "config data file to import from"
 msgstr "从中导出的配置数据文件"
 
-#: tools/virsh-domain.c:8324
+#: tools/virsh.c:5431
 msgid "Convert domain XML to native config"
 msgstr "将域 XML 转换为原始配置"
 
-#: tools/virsh-domain.c:8327
+#: tools/virsh.c:5432
 msgid "Convert domain XML config to a native guest configuration format."
 msgstr "将域 XML 配置转换为原始虚拟机配置格式"
 
-#: tools/virsh-domain.c:8336
+#: tools/virsh.c:5437
 msgid "target config data type format"
 msgstr "目标配置数据类型格式"
 
-#: tools/virsh-domain.c:8341
+#: tools/virsh.c:5438
 msgid "xml data file to export from"
 msgstr "要从中导出的 xml 数据文件"
 
-#: tools/virsh-domain.c:8380
+#: tools/virsh.c:5477
 msgid "convert a domain id or UUID to domain name"
 msgstr "将域 id 或 UUID 转换为域名"
 
-#: tools/virsh-domain.c:8392
+#: tools/virsh.c:5483
 msgid "domain id or uuid"
 msgstr "域 id 或 uuid"
 
-#: tools/virsh-domain.c:8416
+#: tools/virsh.c:5507
 msgid "convert a domain name or UUID to domain id"
 msgstr "把一个域名或 UUID 转换为域 id"
 
-#: tools/virsh-domain.c:8457
+#: tools/virsh.c:5542
 msgid "convert a domain name or id to domain UUID"
 msgstr "把一个域名或 id 转换为域 UUID"
 
-#: tools/virsh-domain.c:8469
+#: tools/virsh.c:5548
 msgid "domain id or name"
 msgstr "域 id 或域名"
 
-#: tools/virsh-domain.c:8487
+#: tools/virsh.c:5567
 msgid "failed to get domain UUID"
 msgstr "获得域 UUID 失败"
 
-#: tools/virsh-domain.c:8498
+#: tools/virsh.c:5577
 msgid "migrate domain to another host"
 msgstr "将域迁移到另一个主机中"
 
-#: tools/virsh-domain.c:8501
+#: tools/virsh.c:5578
 msgid "Migrate domain to another host.  Add --live for live migration."
 msgstr "将域迁移到另一个主机中。热迁移时添加 --live。"
 
-#: tools/virsh-domain.c:8509
+#: tools/virsh.c:5583
 msgid "live migration"
 msgstr "热迁移"
 
-#: tools/virsh-domain.c:8513
+#: tools/virsh-domain.c:8556
 msgid "offline migration"
 msgstr ""
 
-#: tools/virsh-domain.c:8517
+#: tools/virsh.c:5584
 msgid "peer-2-peer migration"
 msgstr "点对点迁移"
 
-#: tools/virsh-domain.c:8521
+#: tools/virsh.c:5585
 msgid "direct migration"
 msgstr "直接迁移"
 
-#: tools/virsh-domain.c:8529
+#: tools/virsh.c:5586
 msgid "tunnelled migration"
 msgstr "管道迁移"
 
-#: tools/virsh-domain.c:8533
+#: tools/virsh.c:5587
 msgid "persist VM on destination"
 msgstr "目的地中的持久 VM"
 
-#: tools/virsh-domain.c:8537
+#: tools/virsh.c:5588
 msgid "undefine VM on source"
 msgstr "在源中取消定义 VM"
 
-#: tools/virsh-domain.c:8541
+#: tools/virsh.c:5589
 msgid "do not restart the domain on the destination host"
 msgstr "部启用目的地主机中的域"
 
-#: tools/virsh-domain.c:8545
+#: tools/virsh.c:5590
 msgid "migration with non-shared storage with full disk copy"
 msgstr "使用全磁盘复制的非共享存储进行迁移"
 
-#: tools/virsh-domain.c:8549
+#: tools/virsh.c:5591
 msgid ""
 "migration with non-shared storage with incremental copy (same base image "
 "shared between source and destination)"
 msgstr "使用增值复制（源和目的地共享同一基础映像）的非共享存储进行迁移"
 
-#: tools/virsh-domain.c:8553
+#: tools/virsh-domain.c:8596
 msgid "prevent any configuration changes to domain until migration ends"
 msgstr ""
 
-#: tools/virsh-domain.c:8557
+#: tools/virsh-domain.c:8600
 msgid "force migration even if it may be unsafe"
 msgstr "即使不安全也强制迁移"
 
-#: tools/virsh-domain.c:8561
+#: tools/virsh.c:5594
 msgid "display the progress of migration"
 msgstr "显示迁移进程"
 
-#: tools/virsh-domain.c:8565
+#: tools/virsh-domain.c:8608
 msgid "compress repeated pages during live migration"
 msgstr ""
 
-#: tools/virsh-domain.c:8569
+#: tools/virsh-domain.c:8612
 msgid "abort on soft errors during migration"
 msgstr "在迁移过程中忽略软错误"
 
-#: tools/virsh-domain.c:8579
+#: tools/virsh.c:5596
 msgid ""
 "connection URI of the destination host as seen from the client(normal "
 "migration) or source(p2p migration)"
 msgstr "客户端（常规迁移）或者源（p2p 迁移）中看到到目的地主机连接 URI"
 
-#: tools/virsh-domain.c:8583
+#: tools/virsh.c:5597
 msgid "migration URI, usually can be omitted"
 msgstr "迁移 URI， 通常可省略"
 
-#: tools/virsh-domain.c:8587
+#: tools/virsh-domain.c:8630
 msgid "graphics URI to be used for seamless graphics migration"
 msgstr "无空隙图形迁移中使用的图形 URI"
 
-#: tools/virsh-domain.c:8591
+#: tools/virsh-domain.c:8634
 msgid "listen address that destination should bind to for incoming migration"
 msgstr ""
 
-#: tools/virsh-domain.c:8595
+#: tools/virsh.c:5598
 msgid "rename to new name during migration (if supported)"
 msgstr "在迁移过长中重新命名为一个新名称（如果支持）"
 
-#: tools/virsh-domain.c:8599
+#: tools/virsh.c:5599
 msgid "force guest to suspend if live migration exceeds timeout (in seconds)"
 msgstr "如果 live 迁移超时（以秒计）则强制虚拟机挂起"
 
-#: tools/virsh-domain.c:8669
+#: tools/virsh-domain.c:8712
 #, c-format
 msgid "cannot read file '%s'"
 msgstr "无法读取文件 '%s'"
 
-#: tools/virsh-domain.c:8725
+#: tools/virsh.c:5684
 msgid "migrate: Unexpected migrateuri for peer2peer/direct migration"
 msgstr "迁移：点对点/直接迁移的意外迁移 uri"
 
-#: tools/virsh-domain.c:8795
-msgid "migrate: Invalid timeout"
-msgstr "迁移：无效超时"
-
-#: tools/virsh-domain.c:8800
+#: tools/virsh.c:5775
 msgid "migrate: Unexpected timeout for offline migration"
 msgstr "迁移：离线迁移的意外超时"
 
-#: tools/virsh-domain.c:8806
-msgid "migrate: Timeout is too big"
-msgstr "迁移：超时值太大"
-
-#: tools/virsh-domain.c:8824
+#: tools/virsh-domain.c:8856
 msgid "Migration"
 msgstr "迁移"
 
-#: tools/virsh-domain.c:8840
+#: tools/virsh.c:5880
 msgid "set maximum tolerable downtime"
 msgstr "设定最大可耐受故障时间"
 
-#: tools/virsh-domain.c:8843
+#: tools/virsh.c:5881
 msgid ""
 "Set maximum tolerable downtime of a domain which is being live-migrated to "
 "another host."
 msgstr "设定在进行 live 迁移到另一台主机时域的最大可耐受故障时间。"
 
-#: tools/virsh-domain.c:8857
+#: tools/virsh.c:5887
 msgid "maximum tolerable downtime (in milliseconds) for migration"
 msgstr "迁移的最大可耐受故障时间（单位为秒）"
 
-#: tools/virsh-domain.c:8874
+#: tools/virsh.c:5906
 msgid "migrate: Invalid downtime"
 msgstr "迁移：无效故障时间"
 
-#: tools/virsh-domain.c:8893
+#: tools/virsh-domain.c:8925
 msgid "get/set compression cache size"
 msgstr ""
 
-#: tools/virsh-domain.c:8896
+#: tools/virsh-domain.c:8928
 msgid ""
 "Get/set size of the cache (in bytes) used for compressing repeatedly "
 "transferred memory pages during live migration."
 msgstr ""
 
-#: tools/virsh-domain.c:8911
+#: tools/virsh-domain.c:8943
 msgid "requested size of the cache (in bytes) used for compression"
 msgstr ""
 
-#: tools/virsh-domain.c:8931
+#: tools/virsh-domain.c:8963
 msgid "Unable to parse size parameter"
 msgstr ""
 
-#: tools/virsh-domain.c:8942
+#: tools/virsh-domain.c:8974
 #, c-format
 msgid "Compression cache: %.3lf %s"
 msgstr ""
 
-#: tools/virsh-domain.c:8955
+#: tools/virsh.c:5924
 msgid "Set the maximum migration bandwidth"
 msgstr "设定迁移带宽的最大值"
 
-#: tools/virsh-domain.c:8958
+#: tools/virsh-domain.c:8990
 msgid ""
 "Set the maximum migration bandwidth (in MiB/s) for a domain which is being "
 "migrated to another host."
 msgstr "为要迁移到另一台主机的域设定最大迁移带宽  (in MiB/s) 。"
 
-#: tools/virsh-domain.c:8973
+#: tools/virsh-domain.c:9005
 msgid "migration bandwidth limit in MiB/s"
 msgstr "以 MiB/s 为单位的迁移带宽限制"
 
-#: tools/virsh-domain.c:8989
+#: tools/virsh.c:5950
 msgid "migrate: Invalid bandwidth"
 msgstr "迁移：无效带宽"
 
-#: tools/virsh-domain.c:9008
+#: tools/virsh.c:5968
 msgid "Get the maximum migration bandwidth"
 msgstr "获取最长迁移带宽"
 
-#: tools/virsh-domain.c:9011
+#: tools/virsh-domain.c:9043
 msgid "Get the maximum migration bandwidth (in MiB/s) for a domain."
 msgstr "为域获取最大迁移带宽  (in MiB/s) 。"
 
-#: tools/virsh-domain.c:9052
+#: tools/virsh-domain.c:9084
 msgid "domain display connection URI"
 msgstr "域显示连接 URI"
 
-#: tools/virsh-domain.c:9055
+#: tools/virsh-domain.c:9087
 msgid "Output the IP address and port number for the graphical display."
 msgstr "为图形显示输出IP地址和端口号。"
 
-#: tools/virsh-domain.c:9068
+#: tools/virsh-domain.c:9100
 msgid "includes the password into the connection URI if available"
 msgstr "可能的情况下在连接 URI 中添加密码"
 
-#: tools/virsh-domain.c:9209
+#: tools/virsh-domain.c:9241
 msgid "Failed to create display URI"
 msgstr "生成显示 URI 失败"
 
-#: tools/virsh-domain.c:9239
+#: tools/virsh.c:11722
 msgid "vnc display"
 msgstr "vnc 显示"
 
-#: tools/virsh-domain.c:9242
+#: tools/virsh.c:11723
 msgid "Output the IP address and port number for the VNC display."
 msgstr "为VNC 显示输出IP地址和端口号."
 
-#: tools/virsh-domain.c:9285
+#: tools/virsh-domain.c:9317
 msgid "Failed to get VNC port. Is this domain using VNC?"
 msgstr "获取 VNC 端口失败。这个域使用 VNC 吗？"
 
-#: tools/virsh-domain.c:9312
+#: tools/virsh.c:11791
 msgid "tty console"
 msgstr "tty 控制台"
 
-#: tools/virsh-domain.c:9315
+#: tools/virsh.c:11792
 msgid "Output the device for the TTY console."
 msgstr "为 TTY 控制台输出设备。"
 
-#: tools/virsh-domain.c:9372
+#: tools/virsh-domain.c:9404
 msgid "print the domain's hostname"
 msgstr "输出域主机名"
 
-#: tools/virsh-domain.c:9401 tools/virsh-host.c:627
+#: tools/virsh.c:11649
 msgid "failed to get hostname"
 msgstr "获得主机名失败"
 
-#: tools/virsh-domain.c:9489 tools/virsh-domain.c:9502
+#: tools/virsh.c:11982 tools/virsh.c:11995
 msgid "Bad child elements counting."
 msgstr "坏的 child 元素计数。"
 
-#: tools/virsh-domain.c:9535
+#: tools/virsh.c:12155
 msgid "detach device from an XML file"
 msgstr "从一个 XML 文件分离设备"
 
-#: tools/virsh-domain.c:9538
+#: tools/virsh.c:12156
 msgid "Detach device from an XML <file>"
 msgstr "从一个 XML 文件分离设备"
 
-#: tools/virsh-domain.c:9618
+#: tools/virsh.c:12215
 #, c-format
 msgid "Failed to detach device from %s"
 msgstr "为域 %s 分离设备失败"
 
-#: tools/virsh-domain.c:9622
+#: tools/virsh.c:12219
 msgid "Device detached successfully\n"
 msgstr "成功分离设备\n"
 
-#: tools/virsh-domain.c:9636
+#: tools/virsh.c:12234
 msgid "update device from an XML file"
 msgstr "从 XML 文件中关系设备"
 
-#: tools/virsh-domain.c:9639
+#: tools/virsh.c:12235
 msgid "Update device from an XML <file>."
 msgstr "从 XML <file> 中关系设备"
 
-#: tools/virsh-domain.c:9673
+#: tools/virsh.c:12243
 msgid "force device update"
 msgstr "强制设备更新"
 
-#: tools/virsh-domain.c:9720
+#: tools/virsh.c:12288
 #, c-format
 msgid "Failed to update device from %s"
 msgstr "从 %s 中更新设备失败"
 
-#: tools/virsh-domain.c:9738
+#: tools/virsh.c:12503
 msgid "detach network interface"
 msgstr "分离网络界面"
 
-#: tools/virsh-domain.c:9741
+#: tools/virsh.c:12504
 msgid "Detach network interface."
 msgstr "分离网络界面。"
 
-#: tools/virsh-domain.c:9829
+#: tools/virsh.c:12554
 msgid "Failed to get interface information"
 msgstr "获得界面信息失败"
 
-#: tools/virsh-domain.c:9837
+#: tools/virsh-domain.c:9869
 #, c-format
 msgid "No interface found whose type is %s"
 msgstr ""
 
-#: tools/virsh-domain.c:9842
+#: tools/virsh.c:12567
 #, c-format
 msgid ""
 "Domain has %d interfaces. Please specify which one to detach using --mac"
 msgstr "域有 %d 个接口。请使用 --mac 指定要分离的接口。"
 
-#: tools/virsh-domain.c:9864
+#: tools/virsh-domain.c:9896
 #, c-format
 msgid ""
 "Domain has multiple interfaces matching MAC address %s. You must use detach-"
 "device and specify the device pci address to remove it."
 msgstr "域有多个匹配 MAC 地址 %s 的接口。您必须使用 detach-device 并指定该设备 pci 地址方可删除它。"
 
-#: tools/virsh-domain.c:9877
+#: tools/virsh-domain.c:9909
 #, c-format
 msgid "No interface with MAC address %s was found"
 msgstr "未找到 MAC 地址为 %s 的界面"
 
-#: tools/virsh-domain.c:9893
+#: tools/virsh.c:12618
 msgid "Failed to detach interface"
 msgstr "分离接口失败"
 
-#: tools/virsh-domain.c:9895
+#: tools/virsh.c:12620
 msgid "Interface detached successfully\n"
 msgstr "成功分离接口\n"
 
-#: tools/virsh-domain.c:9933 tools/virsh-domain.c:9942
+#: tools/virsh.c:13027 tools/virsh.c:13034
 msgid "Failed to get disk information"
 msgstr "获得磁盘信息失败"
 
-#: tools/virsh-domain.c:9995
+#: tools/virsh-domain.c:10027
 #, c-format
 msgid "No disk found whose source path or target is %s"
 msgstr ""
 
-#: tools/virsh-domain.c:10050
+#: tools/virsh-domain.c:10082
 #, c-format
 msgid "The disk device '%s' doesn't have media"
 msgstr "磁盘失败 '%s' 无介质"
 
-#: tools/virsh-domain.c:10063
+#: tools/virsh-domain.c:10095
 msgid "No source is specified for inserting media"
 msgstr "插入的介质没有指定源"
 
-#: tools/virsh-domain.c:10066
+#: tools/virsh-domain.c:10098
 msgid "No source is specified for updating media"
 msgstr "没有为更新的介质指定源"
 
-#: tools/virsh-domain.c:10073
+#: tools/virsh-domain.c:10105
 #, c-format
 msgid "The disk device '%s' already has media"
 msgstr "磁盘失败 '%s' 已有介质"
 
-#: tools/virsh-domain.c:10108
+#: tools/virsh.c:12983
 msgid "detach disk device"
 msgstr "分离磁盘设备"
 
-#: tools/virsh-domain.c:10111
+#: tools/virsh.c:12984
 msgid "Detach disk device."
 msgstr "分离磁盘设备。"
 
-#: tools/virsh-domain.c:10203
+#: tools/virsh.c:13081
 msgid "Failed to detach disk"
 msgstr "分离磁盘失败"
 
-#: tools/virsh-domain.c:10207
+#: tools/virsh.c:13083
 msgid "Disk detached successfully\n"
 msgstr "成功分离磁盘\n"
 
-#: tools/virsh-domain.c:10223
+#: tools/virsh.c:13560
 msgid "edit XML configuration for a domain"
 msgstr "编辑某个域的 XML 配置"
 
-#: tools/virsh-domain.c:10226
+#: tools/virsh.c:13561
 msgid "Edit the XML configuration for a domain."
 msgstr "编辑某个域的 XML 配置。"
 
-#: tools/virsh-domain.c:10254
+#: tools/virsh.c:13609
 #, c-format
 msgid "Domain %s XML configuration not changed.\n"
 msgstr "没有更改域 %s XML 配置。\n"
 
-#: tools/virsh-domain.c:10264
+#: tools/virsh.c:13635
 #, c-format
 msgid "Domain %s XML configuration edited.\n"
 msgstr "编辑了域 %s XML 配置。\n"
 
-#: tools/virsh-domain.c:10283
+#: tools/virsh-domain.c:10317 tools/virsh-network.c:1140
+msgid "Defined"
+msgstr ""
+
+#: tools/virsh-domain.c:10318 tools/virsh-network.c:1141
+msgid "Undefined"
+msgstr ""
+
+#: tools/virsh-domain.c:10319 tools/virsh-network.c:1142
+msgid "Started"
+msgstr ""
+
+#: tools/virsh-domain.c:10320
+msgid "Suspended"
+msgstr ""
+
+#: tools/virsh-domain.c:10321
+msgid "Resumed"
+msgstr ""
+
+#: tools/virsh-domain.c:10322 tools/virsh-network.c:1143
+msgid "Stopped"
+msgstr ""
+
+#: tools/virsh-domain.c:10323 tools/virsh-domain.c:10375
+msgid "Shutdown"
+msgstr ""
+
+#: tools/virsh-domain.c:10324
+msgid "PMSuspended"
+msgstr ""
+
+#: tools/virsh-domain.c:10325 tools/virsh-domain.c:10377
+msgid "Crashed"
+msgstr ""
+
+#: tools/virsh-domain.c:10337
+msgid "Added"
+msgstr ""
+
+#: tools/virsh-domain.c:10338
+msgid "Updated"
+msgstr ""
+
+#: tools/virsh-domain.c:10343
+msgid "Removed"
+msgstr ""
+
+#: tools/virsh-domain.c:10348
+msgid "Booted"
+msgstr ""
+
+#: tools/virsh-domain.c:10349 tools/virsh-domain.c:10358
+#: tools/virsh-domain.c:10369 tools/virsh-domain.c:10378
+msgid "Migrated"
+msgstr ""
+
+#: tools/virsh-domain.c:10350 tools/virsh-domain.c:10361
+msgid "Restored"
+msgstr ""
+
+#: tools/virsh-domain.c:10351 tools/virsh-domain.c:10362
+#: tools/virsh-domain.c:10370 tools/virsh-domain.c:10381
+msgid "Snapshot"
+msgstr ""
+
+#: tools/virsh-domain.c:10352
+msgid "Event wakeup"
+msgstr ""
+
+#: tools/virsh-domain.c:10357
+msgid "Paused"
+msgstr ""
+
+#: tools/virsh-domain.c:10359
+msgid "I/O Error"
+msgstr ""
+
+#: tools/virsh-domain.c:10360
+msgid "Watchdog"
+msgstr ""
+
+#: tools/virsh-domain.c:10363
+msgid "API error"
+msgstr ""
+
+#: tools/virsh-domain.c:10368
+msgid "Unpaused"
+msgstr ""
+
+#: tools/virsh-domain.c:10376
+msgid "Destroyed"
+msgstr ""
+
+#: tools/virsh-domain.c:10379
+msgid "Saved"
+msgstr ""
+
+#: tools/virsh-domain.c:10386
+msgid "Finished"
+msgstr ""
+
+#: tools/virsh-domain.c:10391
+msgid "Memory"
+msgstr ""
+
+#: tools/virsh-domain.c:10392
+msgid "Disk"
+msgstr ""
+
+#: tools/virsh-domain.c:10397
+msgid "Panicked"
+msgstr ""
+
+#: tools/virsh-domain.c:10440 tools/virsh-domain.c:10457
+msgid "none"
+msgstr ""
+
+#: tools/virsh-domain.c:10441 tools/virsh-domain.c:10458
+msgid "pause"
+msgstr ""
+
+#: tools/virsh-domain.c:10442
+msgid "reset"
+msgstr ""
+
+#: tools/virsh-domain.c:10443
+msgid "poweroff"
+msgstr ""
+
+#: tools/virsh-domain.c:10445
+msgid "debug"
+msgstr ""
+
+#: tools/virsh-domain.c:10459
+msgid "report"
+msgstr ""
+
+#: tools/virsh-domain.c:10471
+msgid "connect"
+msgstr ""
+
+#: tools/virsh-domain.c:10472
+msgid "initialize"
+msgstr ""
+
+#: tools/virsh-domain.c:10473
+msgid "disconnect"
+msgstr ""
+
+#: tools/virsh-domain.c:10485
+msgid "IPv4"
+msgstr ""
+
+#: tools/virsh-domain.c:10486
+msgid "IPv6"
+msgstr ""
+
+#: tools/virsh-domain.c:10487
+msgid "unix"
+msgstr ""
+
+#: tools/virsh-domain.c:10499
+msgid "completed"
+msgstr ""
+
+#: tools/virsh-domain.c:10501
+msgid "canceled"
+msgstr ""
+
+#: tools/virsh-domain.c:10502
+msgid "ready"
+msgstr ""
+
+#: tools/virsh-domain.c:10514
+msgid "changed"
+msgstr ""
+
+#: tools/virsh-domain.c:10515
+msgid "dropped"
+msgstr ""
+
+#: tools/virsh-domain.c:10527
+msgid "opened"
+msgstr ""
+
+#: tools/virsh-domain.c:10528
+msgid "closed"
+msgstr ""
+
+#: tools/virsh-domain.c:10561
+#, c-format
+msgid "event '%s' for domain %s\n"
+msgstr ""
+
+#: tools/virsh-domain.c:10579
+#, c-format
+msgid "event 'lifecycle' for domain %s: %s %s\n"
+msgstr ""
+
+#: tools/virsh-domain.c:10597
+#, c-format
+msgid "event 'rtc-change' for domain %s: %lld\n"
+msgstr ""
+
+#: tools/virsh-domain.c:10614
+#, c-format
+msgid "event 'watchdog' for domain %s: %s\n"
+msgstr ""
+
+#: tools/virsh-domain.c:10633
+#, c-format
+msgid "event 'io-error' for domain %s: %s (%s) %s\n"
+msgstr ""
+
+#: tools/virsh-domain.c:10656
+#, c-format
+msgid ""
+"event 'graphics' for domain %s: %s local[%s %s %s] remote[%s %s %s] %s"
+msgstr ""
+
+#: tools/virsh-domain.c:10686
+#, c-format
+msgid "event 'io-error-reason' for domain %s: %s (%s) %s due to %s\n"
+msgstr ""
+
+#: tools/virsh-domain.c:10707
+#, c-format
+msgid "event 'block-job' for domain %s: %s for %s %s\n"
+msgstr ""
+
+#: tools/virsh-domain.c:10729
+#, c-format
+msgid "event 'disk-change' for domain %s disk %s: %s -> %s: %s\n"
+msgstr ""
+
+#: tools/virsh-domain.c:10749
+#, c-format
+msgid "event 'disk-change' for domain %s disk %s: %s\n"
+msgstr ""
+
+#: tools/virsh-domain.c:10779
+#, c-format
+msgid "event 'balloon-change' for domain %s: %lluKiB\n"
+msgstr ""
+
+#: tools/virsh-domain.c:10797
+#, c-format
+msgid "event 'device-removed' for domain %s: %s\n"
+msgstr ""
+
+#: tools/virsh-domain.c:10840
+msgid "Domain Events"
+msgstr ""
+
+#: tools/virsh-domain.c:10843
+msgid "List event types, or wait for domain events to occur"
+msgstr ""
+
+#: tools/virsh-domain.c:10851
+msgid "filter by domain name, id, or uuid"
+msgstr ""
+
+#: tools/virsh-domain.c:10855 tools/virsh-network.c:1199
+msgid "which event type to wait for"
+msgstr ""
+
+#: tools/virsh-domain.c:10859
+msgid "wait for all events instead of just one type"
+msgstr ""
+
+#: tools/virsh-domain.c:10863 tools/virsh-network.c:1203
+msgid "loop until timeout or interrupt, rather than one-shot"
+msgstr ""
+
+#: tools/virsh-domain.c:10867 tools/virsh-network.c:1207
+msgid "timeout seconds"
+msgstr ""
+
+#: tools/virsh-domain.c:10871 tools/virsh-network.c:1211
+msgid "list valid event types"
+msgstr ""
+
+#: tools/virsh-domain.c:10903 tools/virsh-network.c:1242
+#, c-format
+msgid "unknown event type %s"
+msgstr ""
+
+#: tools/virsh-domain.c:10908
+msgid "one of --list, --all, or event type is required"
+msgstr ""
+
+#: tools/virsh-domain.c:10957 tools/virsh-network.c:1263
+msgid "event loop interrupted\n"
+msgstr ""
+
+#: tools/virsh-domain.c:10960 tools/virsh-network.c:1266
+msgid "event loop timed out\n"
+msgstr ""
+
+#: tools/virsh-domain.c:10967 tools/virsh-network.c:1273
+#, c-format
+msgid "events received: %d\n"
+msgstr ""
+
+#: tools/virsh-domain.c:10992
 msgid "Change media of CD or floppy drive"
 msgstr "更改 CD 或者软驱节制"
 
-#: tools/virsh-domain.c:10286
+#: tools/virsh-domain.c:10995
 msgid "Change media of CD or floppy drive."
 msgstr "更改 CD 或者软驱介质。"
 
-#: tools/virsh-domain.c:10300
+#: tools/virsh-domain.c:11009
 msgid "Fully-qualified path or target of disk device"
 msgstr "磁盘设备的完全限定路径或者目标"
 
-#: tools/virsh-domain.c:10304
+#: tools/virsh-domain.c:11013
 msgid "source of the media"
 msgstr "介质的源"
 
-#: tools/virsh-domain.c:10308
+#: tools/virsh-domain.c:11017
 msgid "Eject the media"
 msgstr "弹出介质"
 
-#: tools/virsh-domain.c:10312
+#: tools/virsh-domain.c:11021
 msgid "Insert the media"
 msgstr "插入介质"
 
-#: tools/virsh-domain.c:10316
+#: tools/virsh-domain.c:11025
 msgid "Update the media"
 msgstr "更新介质"
 
-#: tools/virsh-domain.c:10320
+#: tools/virsh-domain.c:11029
 msgid ""
 "can be either or both of --live and --config, depends on implementation of "
 "hypervisor driver"
 msgstr "可以是 --live 和 --config 之一或者同时使用，具体要看使用的 hypervisor 驱动程序。"
 
-#: tools/virsh-domain.c:10325
+#: tools/virsh-domain.c:11034
 msgid "alter live configuration of running domain"
 msgstr "更改运行域的 live 配置"
 
-#: tools/virsh-domain.c:10329
+#: tools/virsh-domain.c:11038
 msgid "alter persistent configuration, effect observed on next boot"
 msgstr "更改持久配置，下次引导时会看到效果。"
 
-#: tools/virsh-domain.c:10333
+#: tools/virsh-domain.c:11042
 msgid "force media changing"
 msgstr "强制介质更改"
 
-#: tools/virsh-domain.c:10398
+#: tools/virsh-domain.c:11107
 msgid "No disk source specified for inserting"
 msgstr "没有为插入指定磁盘源"
 
-#: tools/virsh-domain.c:10416
+#: tools/virsh-domain.c:11125
 #, c-format
 msgid "Failed to complete action %s on media"
 msgstr "在介质中完成动作 %s 失败"
 
-#: tools/virsh-domain.c:10420
+#: tools/virsh-domain.c:11129
 #, c-format
 msgid "succeeded to complete action %s on media\n"
 msgstr "成功在介质中完成动作 %s\n"
 
-#: tools/virsh-domain.c:10434 tools/virsh-domain.c:10437
+#: tools/virsh-domain.c:11143 tools/virsh-domain.c:11146
 msgid "Invoke fstrim on domain's mounted filesystems."
 msgstr ""
 
-#: tools/virsh-domain.c:10450
+#: tools/virsh-domain.c:11159
 msgid ""
 "Just a hint to ignore contiguous free ranges smaller than this (Bytes)"
 msgstr ""
 
-#: tools/virsh-domain.c:10455
+#: tools/virsh-domain.c:11164
 msgid "which mount point to trim"
 msgstr ""
 
-#: tools/virsh-domain.c:10472
+#: tools/virsh-domain.c:11181
 msgid "Unable to parse integer parameter minimum"
 msgstr ""
 
-#: tools/virsh-domain.c:10480
+#: tools/virsh-domain.c:11189
 msgid "Unable to invoke fstrim"
 msgstr ""
 
@@ -31527,112 +32153,112 @@
 msgid "Failed."
 msgstr "失败。"
 
-#: tools/virsh-host.c:47
+#: tools/virsh.c:5305
 msgid "capabilities"
 msgstr "性能"
 
-#: tools/virsh-host.c:50
+#: tools/virsh.c:5306
 msgid "Returns capabilities of hypervisor/driver."
 msgstr "返回 管理程序/驱动器性能."
 
-#: tools/virsh-host.c:61
+#: tools/virsh.c:5319
 msgid "failed to get capabilities"
 msgstr "获得性能失败"
 
-#: tools/virsh-host.c:75
+#: tools/virsh.c:3547
 msgid "NUMA free memory"
 msgstr "NUMA可用内存"
 
-#: tools/virsh-host.c:78
+#: tools/virsh.c:3548
 msgid "display available free memory for the NUMA cell."
 msgstr "显示可用的NUMA单元空闲内存"
 
-#: tools/virsh-host.c:86
+#: tools/virsh.c:3553
 msgid "NUMA cell number"
 msgstr "NUMA 单元 数"
 
-#: tools/virsh-host.c:90
+#: tools/virsh.c:3554
 msgid "show free memory for all NUMA cells"
 msgstr "显示所有 NUMA 单元的可用内存"
 
-#: tools/virsh-host.c:115
+#: tools/virsh.c:3580
 msgid "cell number has to be a number"
 msgstr "单元数必须是一个数字"
 
-#: tools/virsh-host.c:121 tools/virsh-host.c:127
+#: tools/virsh.c:3594 tools/virsh.c:3600
 msgid "unable to get node capabilities"
 msgstr "无法获取节点功能"
 
-#: tools/virsh-host.c:125
+#: tools/virsh.c:3598
 msgid "(capabilities)"
 msgstr "(功能)"
 
-#: tools/virsh-host.c:135
+#: tools/virsh.c:3607
 msgid "could not get information about NUMA topology"
 msgstr "无法获取 NUMA 拓扑信息"
 
-#: tools/virsh-host.c:147
+#: tools/virsh.c:3619
 msgid "conversion from string failed"
 msgstr "从字符串转换失败"
 
-#: tools/virsh-host.c:155
+#: tools/virsh.c:3627
 #, c-format
 msgid "failed to get free memory for NUMA node number: %lu"
 msgstr "为 NUMA 节点号获取可用内存失败：%lu"
 
-#: tools/virsh-host.c:168 tools/virsh-host.c:179
+#: tools/virsh.c:3641 tools/virsh.c:3654
 msgid "Total"
 msgstr "总量"
 
-#: tools/virsh-host.c:200
+#: tools/virsh.c:3675
 msgid "connection vcpu maximum"
 msgstr "连接 vcpu 最大值"
 
-#: tools/virsh-host.c:203
+#: tools/virsh.c:3676
 msgid "Show maximum number of virtual CPUs for guests on this connection."
 msgstr "显示这个连接的虚拟机中最多虚拟 CPU 数"
 
-#: tools/virsh-host.c:211
+#: tools/virsh.c:3681
 msgid "domain type"
 msgstr "域类型"
 
-#: tools/virsh-host.c:238
+#: tools/virsh.c:5019
 msgid "node information"
 msgstr "节点信息"
 
-#: tools/virsh-host.c:241
+#: tools/virsh.c:5020
 msgid "Returns basic information about the node."
 msgstr "返回关于这个节点的基本信息。"
 
-#: tools/virsh-host.c:252
+#: tools/virsh.c:5033
 msgid "failed to get node information"
 msgstr "获得节点信息失败"
 
-#: tools/virsh-host.c:255
+#: tools/virsh.c:5036
 msgid "CPU model:"
 msgstr "CPU 型号："
 
-#: tools/virsh-host.c:257
+#: tools/virsh.c:5038
 msgid "CPU frequency:"
 msgstr "CPU 频率："
 
-#: tools/virsh-host.c:258
+#: tools/virsh.c:5039
 msgid "CPU socket(s):"
 msgstr "CPU socket："
 
-#: tools/virsh-host.c:259
+#: tools/virsh.c:5040
 msgid "Core(s) per socket:"
 msgstr "每个 socket 的内核数："
 
-#: tools/virsh-host.c:260
+#: tools/virsh.c:5041
 msgid "Thread(s) per core:"
 msgstr "每个内核的线程数："
 
-#: tools/virsh-host.c:261
+#: tools/virsh.c:5042
 msgid "NUMA cell(s):"
 msgstr "NUMA 单元："
 
-#: tools/virsh-host.c:262
+#: tools/virsh.c:5043
 msgid "Memory size:"
 msgstr "内存大小："
 
@@ -31662,203 +32288,207 @@
 msgid "CPU map:"
 msgstr "CPU 映射："
 
-#: tools/virsh-host.c:315
+#: tools/virsh.c:5052
 msgid "Prints cpu stats of the node."
 msgstr "输出节点的 cpu 状统计数据。"
 
-#: tools/virsh-host.c:318
+#: tools/virsh.c:5053
 msgid "Returns cpu stats of the node, in nanoseconds."
 msgstr "以纳秒为单位返回节点的 cpu 统计数据。"
 
-#: tools/virsh-host.c:326
+#: tools/virsh.c:5058
 msgid "prints specified cpu statistics only."
 msgstr "只输出指定 cpu 的统计数据。"
 
-#: tools/virsh-host.c:330
+#: tools/virsh.c:5059
 msgid "prints by percentage during 1 second."
 msgstr "输出一秒内的百分比。"
 
-#: tools/virsh-host.c:356
-msgid "Invalid value of cpuNum"
-msgstr "cpuNum 的无效值"
-
-#: tools/virsh-host.c:362
-msgid "Unable to get number of cpu stats"
-msgstr "无法获取 cpu 统计数据值"
-
-#: tools/virsh-host.c:378
-msgid "Unable to get node cpu stats"
-msgstr "无法获取节点 cpu 统计数据"
-
-#: tools/virsh-host.c:405 tools/virsh-host.c:428
+#: tools/virsh.c:5137 tools/virsh.c:5160
 msgid "user:"
 msgstr "用户："
 
-#: tools/virsh-host.c:406 tools/virsh-host.c:430
+#: tools/virsh.c:5138 tools/virsh.c:5162
 msgid "system:"
 msgstr "系统："
 
-#: tools/virsh-host.c:407 tools/virsh-host.c:415 tools/virsh-host.c:432
+#: tools/virsh.c:5139 tools/virsh.c:5147 tools/virsh.c:5164
 msgid "idle:"
 msgstr "闲置："
 
-#: tools/virsh-host.c:408 tools/virsh-host.c:434
+#: tools/virsh.c:5140 tools/virsh.c:5166
 msgid "iowait:"
 msgstr "iowait:"
 
-#: tools/virsh-host.c:414 tools/virsh-host.c:426
+#: tools/virsh-host.c:359
+msgid "intr:"
+msgstr ""
+
+#: tools/virsh.c:5146 tools/virsh.c:5158
 msgid "usage:"
 msgstr "用量："
 
-#: tools/virsh-host.c:450
+#: tools/virsh.c:5087
+msgid "Invalid value of cpuNum"
+msgstr "cpuNum 的无效值"
+
+#: tools/virsh.c:5093
+msgid "Unable to get number of cpu stats"
+msgstr "无法获取 cpu 统计数据值"
+
+#: tools/virsh.c:5107
+msgid "Unable to get node cpu stats"
+msgstr "无法获取节点 cpu 统计数据"
+
+#: tools/virsh.c:5181
 msgid "Prints memory stats of the node."
 msgstr "输出节点的内存状统计数据。"
 
-#: tools/virsh-host.c:453
+#: tools/virsh.c:5182
 msgid "Returns memory stats of the node, in kilobytes."
 msgstr "以 kb 为单位返回节点的内存统计数据。"
 
-#: tools/virsh-host.c:461
+#: tools/virsh.c:5187
 msgid "prints specified cell statistics only."
 msgstr "只输出指定单元的统计数据。"
 
-#: tools/virsh-host.c:476
+#: tools/virsh.c:5204
 msgid "Invalid value of cellNum"
 msgstr "cellNum 的无效值"
 
-#: tools/virsh-host.c:483
+#: tools/virsh.c:5211
 msgid "Unable to get number of memory stats"
 msgstr "无法获取内存统计数据值"
 
-#: tools/virsh-host.c:496
+#: tools/virsh.c:5224
 msgid "Unable to get memory stats"
 msgstr "无法获取内存统计数据"
 
-#: tools/virsh-host.c:515
+#: tools/virsh.c:5242
 msgid "suspend the host node for a given time duration"
 msgstr "在给定时间段挂起主机节点"
 
-#: tools/virsh-host.c:518
+#: tools/virsh.c:5243
 msgid ""
 "Suspend the host node for a given time duration and attempt to resume "
 "thereafter."
 msgstr "在给定时间段挂起主机节点并尝试随即恢复"
 
-#: tools/virsh-host.c:534
+#: tools/virsh-host.c:543
 msgid "Suspend duration in seconds, at least 60"
 msgstr "以秒为单位的挂起阶段，至少为 60."
 
-#: tools/virsh-host.c:566
+#: tools/virsh.c:5288
 msgid "Invalid duration"
 msgstr "无效阶段"
 
-#: tools/virsh-host.c:571
+#: tools/virsh.c:5294
 msgid "The host was not suspended"
 msgstr "主机未挂起"
 
-#: tools/virsh-host.c:582
+#: tools/virsh.c:11692
 msgid "print the hypervisor sysinfo"
 msgstr "输出 hypervisor sysinfo"
 
-#: tools/virsh-host.c:585
+#: tools/virsh.c:11694
 msgid "output an XML string for the hypervisor sysinfo, if available"
 msgstr "在可能的情况下为 hypervisor sysinfo 输出 XML 字符串"
 
-#: tools/virsh-host.c:597
+#: tools/virsh.c:11708
 msgid "failed to get sysinfo"
 msgstr "获取系统信息失败"
 
-#: tools/virsh-host.c:612
+#: tools/virsh.c:11634
 msgid "print the hypervisor hostname"
 msgstr "打印管理程序主机名"
 
-#: tools/virsh-host.c:642
+#: tools/virsh.c:11663
 msgid "print the hypervisor canonical URI"
 msgstr "打印管理程序典型的URI"
 
-#: tools/virsh-host.c:657
+#: tools/virsh.c:11678
 msgid "failed to get URI"
 msgstr "获得URI失败"
 
-#: tools/virsh-host.c:672
+#: tools/virsh-host.c:681
 msgid "CPU models"
 msgstr ""
 
-#: tools/virsh-host.c:675
+#: tools/virsh-host.c:684
 msgid "Get the CPU models for an arch."
 msgstr ""
 
-#: tools/virsh-host.c:684
+#: tools/virsh-host.c:693
 msgid "architecture"
 msgstr ""
 
-#: tools/virsh-host.c:702
+#: tools/virsh-host.c:711
 msgid "failed to get CPU model names"
 msgstr ""
 
-#: tools/virsh-host.c:720
+#: tools/virsh.c:11202
 msgid "show version"
 msgstr "显示版本"
 
-#: tools/virsh-host.c:723
+#: tools/virsh.c:11203
 msgid "Display the system version information."
 msgstr "显示系统版本信息。"
 
-#: tools/virsh-host.c:731
+#: tools/virsh.c:11208
 msgid "report daemon version too"
 msgstr "也报告守护进程版本"
 
-#: tools/virsh-host.c:752
+#: tools/virsh.c:11231
 msgid "failed to get hypervisor type"
 msgstr "获得管理程序类型失败"
 
-#: tools/virsh-host.c:761
+#: tools/virsh-host.c:770
 #, c-format
 msgid "Compiled against library: libvirt %d.%d.%d\n"
 msgstr "根据库编译： libvirt %d.%d.%d\n"
 
-#: tools/virsh-host.c:766
+#: tools/virsh.c:11245
 msgid "failed to get the library version"
 msgstr "获得库函数信息失败"
 
-#: tools/virsh-host.c:773
+#: tools/virsh-host.c:782
 #, c-format
 msgid "Using library: libvirt %d.%d.%d\n"
 msgstr "使用库: libvirt %d.%d.%d\n"
 
-#: tools/virsh-host.c:780
+#: tools/virsh.c:11259
 #, c-format
 msgid "Using API: %s %d.%d.%d\n"
 msgstr "使用的 API: %s %d.%d.%d\n"
 
-#: tools/virsh-host.c:785
+#: tools/virsh.c:11264
 msgid "failed to get the hypervisor version"
 msgstr "获得管理程序版本失败"
 
-#: tools/virsh-host.c:790
+#: tools/virsh.c:11269
 #, c-format
 msgid "Cannot extract running %s hypervisor version\n"
 msgstr "无法提取运行的 %s管理程序版本\n"
 
-#: tools/virsh-host.c:797
+#: tools/virsh.c:11276
 #, c-format
 msgid "Running hypervisor: %s %d.%d.%d\n"
 msgstr "运行管理程序: %s %d.%d.%d\n"
 
-#: tools/virsh-host.c:804
+#: tools/virsh.c:11283
 msgid "failed to get the daemon version"
 msgstr "获取守护进程版本失败"
 
-#: tools/virsh-host.c:810
+#: tools/virsh.c:11289
 #, c-format
 msgid "Running against daemon: %d.%d.%d\n"
 msgstr "根据守护进程运行：%d.%d.%d\n"
 
-#: tools/virsh-host.c:819
+#: tools/virsh-host.c:828
 msgid "Get or set node memory parameters"
 msgstr "获取或者设定节点内存参数"
 
-#: tools/virsh-host.c:820
+#: tools/virsh-host.c:829
 msgid ""
 "Get or set node memory parameters\n"
 "    To get the memory parameters, use following command: \n"
@@ -31866,61 +32496,60 @@
 "    virsh # node-memory-tune"
 msgstr ""
 
-#: tools/virsh-host.c:829
+#: tools/virsh-host.c:838
 msgid ""
 "number of pages to scan before the shared memory service goes to sleep"
 msgstr "共享内存服务进入睡眠状态前要扫描的页数"
 
-#: tools/virsh-host.c:834
+#: tools/virsh-host.c:843
 msgid ""
 "number of millisecs the shared memory service should sleep before next scan"
 msgstr "下次扫描前共享内存服务应该进入睡眠状态的毫秒数"
 
-#: tools/virsh-host.c:839
+#: tools/virsh-host.c:848
 msgid "Specifies if pages from different numa nodes can be merged"
 msgstr "指定来自不同 numa 代码的页面是否可以合并"
 
-#: tools/virsh-host.c:857
+#: tools/virsh-host.c:866
 msgid "invalid shm-pages-to-scan number"
 msgstr "无效 shm-pages-to-scan 数"
 
-#: tools/virsh-host.c:867
+#: tools/virsh-host.c:876
 msgid "invalid shm-sleep-millisecs number"
 msgstr "无效 shm-sleep-millisecs 数"
 
-#: tools/virsh-host.c:877
+#: tools/virsh-host.c:886
 msgid "invalid shm-merge-across-nodes number"
 msgstr "无效 shm-merge-across-nodes 数"
 
-#: tools/virsh-host.c:909
+#: tools/virsh-host.c:918
 msgid "Shared memory:\n"
 msgstr "共享内存：\n"
 
-#: tools/virsh-interface.c:85
+#: tools/virsh.c:16218
 #, c-format
 msgid "failed to get interface '%s'"
 msgstr "获取接口 '%s' 失败"
 
-#: tools/virsh-interface.c:95
+#: tools/virsh.c:6712
 msgid "edit XML configuration for a physical host interface"
 msgstr "为物理主机界面编辑 XML 配置"
 
-#: tools/virsh-interface.c:98
+#: tools/virsh.c:6713
 msgid "Edit the XML configuration for a physical host interface."
 msgstr "为物理主机界面编辑 XML 配置"
 
-#: tools/virsh-interface.c:107 tools/virsh-interface.c:469
-#: tools/virsh-interface.c:572 tools/virsh-interface.c:615
-#: tools/virsh-interface.c:658
+#: tools/virsh.c:6718 tools/virsh.c:7261 tools/virsh.c:7351 tools/virsh.c:7389
+#: tools/virsh.c:7427
 msgid "interface name or MAC address"
 msgstr "MAC 地址的接口名称"
 
-#: tools/virsh-interface.c:126
+#: tools/virsh.c:6758
 #, c-format
 msgid "Interface %s XML configuration not changed.\n"
 msgstr "未更改 %s XML 配置。\n"
 
-#: tools/virsh-interface.c:136
+#: tools/virsh.c:6784
 #, c-format
 msgid "Interface %s XML configuration edited.\n"
 msgstr "未编辑 %s XML 配置。\n"
@@ -31929,141 +32558,140 @@
 msgid "Failed to list interfaces"
 msgstr "列出接口失败"
 
-#: tools/virsh-interface.c:227 tools/virsh-interface.c:235
+#: tools/virsh.c:7109 tools/virsh.c:7117
 msgid "Failed to list active interfaces"
 msgstr "列出活跃接口失败"
 
-#: tools/virsh-interface.c:244 tools/virsh-interface.c:253
+#: tools/virsh.c:7128 tools/virsh.c:7138
 msgid "Failed to list inactive interfaces"
 msgstr "列出不活跃接口失败"
 
-#: tools/virsh-interface.c:325
+#: tools/virsh.c:7083
 msgid "list physical host interfaces"
 msgstr "物理主机接口列表"
 
-#: tools/virsh-interface.c:328
+#: tools/virsh.c:7084
 msgid "Returns list of physical host interfaces."
 msgstr "返回物理主机接口列表。"
 
-#: tools/virsh-interface.c:336
+#: tools/virsh.c:7089
 msgid "list inactive interfaces"
 msgstr "不活跃接口列表"
 
-#: tools/virsh-interface.c:340
+#: tools/virsh.c:7090
 msgid "list inactive & active interfaces"
 msgstr "活跃 & 不活跃接口列表"
 
-#: tools/virsh-interface.c:364
+#: tools/virsh.c:7148
 msgid "MAC Address"
 msgstr "MAC 地址"
 
-#: tools/virsh-interface.c:372 tools/virsh-network.c:709
-#: tools/virsh-pool.c:1170
+#: tools/virsh.c:6897 tools/virsh.c:7163 tools/virsh.c:9077
 msgid "active"
 msgstr "活动"
 
-#: tools/virsh-interface.c:372 tools/virsh-network.c:709
-#: tools/virsh-pool.c:1100 tools/virsh-pool.c:1172 tools/virsh-pool.c:1531
+#: tools/virsh.c:6920 tools/virsh.c:7180 tools/virsh.c:9002 tools/virsh.c:9075
+#: tools/virsh.c:9425
 msgid "inactive"
 msgstr "不活跃"
 
-#: tools/virsh-interface.c:385
+#: tools/virsh.c:7195
 msgid "convert an interface MAC address to interface name"
 msgstr "将接口 MAC 地址转换为接口名称"
 
-#: tools/virsh-interface.c:397
+#: tools/virsh.c:7201
 msgid "interface mac"
 msgstr "接口 mac"
 
-#: tools/virsh-interface.c:421
+#: tools/virsh.c:7225
 msgid "convert an interface name to interface MAC address"
 msgstr "将接口名称转换为接口 MAC 地址"
 
-#: tools/virsh-interface.c:433
+#: tools/virsh.c:7231
 msgid "interface name"
 msgstr "接口名称"
 
-#: tools/virsh-interface.c:457
+#: tools/virsh.c:7255
 msgid "interface information in XML"
 msgstr "XML 中的接口信息"
 
-#: tools/virsh-interface.c:460
+#: tools/virsh.c:7256
 msgid ""
 "Output the physical host interface information as an XML dump to stdout."
 msgstr "将物理主机接口信息输出为 XML 转储到标准输出"
 
-#: tools/virsh-interface.c:510
+#: tools/virsh.c:7300
 msgid "define (but don't start) a physical host interface from an XML file"
 msgstr "定义（但不启动）XML 文件中的物理主机接口"
 
-#: tools/virsh-interface.c:513
+#: tools/virsh.c:7301
 msgid "Define a physical host interface."
 msgstr "定义物理主机接口"
 
-#: tools/virsh-interface.c:522
+#: tools/virsh.c:7306
 msgid "file containing an XML interface description"
 msgstr "包含 XML 接口描述的文件"
 
-#: tools/virsh-interface.c:545
+#: tools/virsh.c:7331
 #, c-format
 msgid "Interface %s defined from %s\n"
 msgstr "使用 %s 定义的接口 %s\n"
 
-#: tools/virsh-interface.c:549
+#: tools/virsh.c:7335
 #, c-format
 msgid "Failed to define interface from %s"
 msgstr "使用 %s 定义接口失败"
 
-#: tools/virsh-interface.c:560
+#: tools/virsh.c:7345
 msgid "undefine a physical host interface (remove it from configuration)"
 msgstr "取消定义物理主机接口（从配置中删除）"
 
-#: tools/virsh-interface.c:563
+#: tools/virsh.c:7346
 msgid "undefine an interface."
 msgstr "取消定义接口。"
 
-#: tools/virsh-interface.c:588
+#: tools/virsh.c:7369
 #, c-format
 msgid "Interface %s undefined\n"
 msgstr "接口 %s 被取消定义\n"
 
-#: tools/virsh-interface.c:590
+#: tools/virsh.c:7371
 #, c-format
 msgid "Failed to undefine interface %s"
 msgstr "取消定义接口 %s 失败。"
 
-#: tools/virsh-interface.c:603
+#: tools/virsh.c:7383
 msgid "start a physical host interface (enable it / \"if-up\")"
 msgstr "启动物理主机接口（启用它请执行 \"if-up\"）"
 
-#: tools/virsh-interface.c:606
+#: tools/virsh.c:7384
 msgid "start a physical host interface."
 msgstr "启动物理主机接口。"
 
-#: tools/virsh-interface.c:631 tools/virsh-interface.c:1190
+#: tools/virsh.c:7407 tools/virsh.c:7936
 #, c-format
 msgid "Interface %s started\n"
 msgstr "已启动接口 %s\n"
 
-#: tools/virsh-interface.c:633 tools/virsh-interface.c:1187
+#: tools/virsh.c:7409 tools/virsh.c:7933
 #, c-format
 msgid "Failed to start interface %s"
 msgstr "启动接口 %s 失败"
 
-#: tools/virsh-interface.c:646
+#: tools/virsh.c:7421
 msgid "destroy a physical host interface (disable it / \"if-down\")"
 msgstr "删除物理主机接口（启用它请执行 \"if-down\"）"
 
-#: tools/virsh-interface.c:649
+#: tools/virsh.c:7422
 msgid "forcefully stop a physical host interface."
 msgstr "强制停止物理主机接口。"
 
-#: tools/virsh-interface.c:674
+#: tools/virsh.c:7445
 #, c-format
 msgid "Interface %s destroyed\n"
 msgstr "删除接口 %s\n"
 
-#: tools/virsh-interface.c:676
+#: tools/virsh.c:7447
 #, c-format
 msgid "Failed to destroy interface %s"
 msgstr "删除接口 %s 失败"
@@ -32074,203 +32702,203 @@
 "committed (iface-commit) or restored (iface-rollback)"
 msgstr "生成当前接口设置快照，可在今后用于提交 (iface-commit) 或者恢复 (iface-rollback)"
 
-#: tools/virsh-interface.c:694
+#: tools/virsh.c:7462
 msgid "Create a restore point for interfaces settings"
 msgstr "为接口设置生成恢复点"
 
-#: tools/virsh-interface.c:707
+#: tools/virsh.c:7477
 msgid "Failed to begin network config change transaction"
 msgstr "启动网络配置更改事务失败"
 
-#: tools/virsh-interface.c:711
+#: tools/virsh.c:7481
 msgid "Network config change transaction started\n"
 msgstr "已开始网络配置更改事务\n"
 
-#: tools/virsh-interface.c:720
+#: tools/virsh.c:7489
 msgid "commit changes made since iface-begin and free restore point"
 msgstr "提交 iface-begin 后的更改并释放恢复点"
 
-#: tools/virsh-interface.c:723
+#: tools/virsh.c:7490
 msgid "commit changes and free restore point"
 msgstr "提交更改并释放恢复点"
 
-#: tools/virsh-interface.c:736
+#: tools/virsh.c:7505
 msgid "Failed to commit network config change transaction"
 msgstr "提交网络更改事务失败"
 
-#: tools/virsh-interface.c:740
+#: tools/virsh.c:7509
 msgid "Network config change transaction committed\n"
 msgstr "已提交网络配置更改事务\n"
 
-#: tools/virsh-interface.c:749
+#: tools/virsh.c:7517
 msgid "rollback to previous saved configuration created via iface-begin"
 msgstr "恢复到之前保存的使用 iface-begin 生成的更改"
 
-#: tools/virsh-interface.c:752
+#: tools/virsh.c:7518
 msgid "rollback to previous restore point"
 msgstr "返回到之前的恢复点"
 
-#: tools/virsh-interface.c:765
+#: tools/virsh.c:7533
 msgid "Failed to rollback network config change transaction"
 msgstr "返回到网络配置更改事务失败"
 
-#: tools/virsh-interface.c:769
+#: tools/virsh.c:7537
 msgid "Network config change transaction rolled back\n"
 msgstr "返回到网络配置更改事务\n"
 
-#: tools/virsh-interface.c:778
+#: tools/virsh.c:7545
 msgid "create a bridge device and attach an existing network device to it"
 msgstr "生成桥接设备并为其附加一个现有网络设备"
 
-#: tools/virsh-interface.c:781
+#: tools/virsh.c:7546
 msgid "bridge an existing network device"
 msgstr "桥接现有网络设备"
 
-#: tools/virsh-interface.c:790
+#: tools/virsh.c:7551
 msgid "existing interface name"
 msgstr "现有接口名称"
 
-#: tools/virsh-interface.c:795
+#: tools/virsh.c:7552
 msgid "new bridge device name"
 msgstr "新桥接设备名称"
 
-#: tools/virsh-interface.c:799
+#: tools/virsh.c:7553
 msgid "do not enable STP for this bridge"
 msgstr "无法为这个桥接启用 STP"
 
-#: tools/virsh-interface.c:803
+#: tools/virsh.c:7555
 msgid "number of seconds to squelch traffic on newly connected ports"
 msgstr "在新连接的端口中 squelch 流量的秒数"
 
-#: tools/virsh-interface.c:807
+#: tools/virsh.c:7556
 msgid "don't start the bridge immediately"
 msgstr "不要立即启动桥接"
 
-#: tools/virsh-interface.c:840
+#: tools/virsh.c:7593
 #, c-format
 msgid "Network device %s already exists"
 msgstr "桥接设备 %s 已存在"
 
-#: tools/virsh-interface.c:848
+#: tools/virsh.c:7601
 msgid "Unable to parse delay parameter"
 msgstr "无法解析延迟参数"
 
-#: tools/virsh-interface.c:858
+#: tools/virsh.c:7611
 msgid "(interface definition)"
 msgstr "(接口定义)"
 
-#: tools/virsh-interface.c:859 tools/virsh-interface.c:1064
+#: tools/virsh.c:7612 tools/virsh.c:7810
 #, c-format
 msgid "Failed to parse configuration of %s"
 msgstr "解析 %s 配置失败"
 
-#: tools/virsh-interface.c:866 tools/virsh-interface.c:1071
+#: tools/virsh.c:7619 tools/virsh.c:7817
 #, c-format
 msgid "Existing device %s has no type"
 msgstr "现有设备 %s 没有类型"
 
-#: tools/virsh-interface.c:871
+#: tools/virsh.c:7624
 #, c-format
 msgid "Existing device %s is already a bridge"
 msgstr "现有设备 %s 已经是一个桥接"
 
-#: tools/virsh-interface.c:878 tools/virsh-interface.c:1084
+#: tools/virsh.c:7631 tools/virsh.c:7830
 #, c-format
 msgid "Interface name from config %s doesn't match given supplied name %s"
 msgstr "配置 %s 中的桥接名称与给定的名称 %s 不匹配"
 
-#: tools/virsh-interface.c:885
+#: tools/virsh.c:7638
 msgid "Failed to create bridge node in xml document"
 msgstr "在 xml 文档中生成桥接节点失败"
 
-#: tools/virsh-interface.c:893
+#: tools/virsh.c:7646
 msgid "Failed to set stp attribute in xml document"
 msgstr "在 xml 文档中设定 stp 属性失败"
 
-#: tools/virsh-interface.c:900
+#: tools/virsh.c:7653
 #, c-format
 msgid "Failed to set bridge delay %d in xml document"
 msgstr "在 xml 文档中设定桥接延迟 %d 失败"
 
-#: tools/virsh-interface.c:908
+#: tools/virsh.c:7661
 msgid "Failed to set bridge interface type to 'bridge' in xml document"
 msgstr "在 xml 文档中将桥接接口设定为 'bridge' 失败"
 
-#: tools/virsh-interface.c:913
+#: tools/virsh.c:7666
 #, c-format
 msgid "Failed to set master bridge interface name to '%s' in xml document"
 msgstr "在 xml 文档中将主桥接接口名称设定为 '%s' 失败"
 
-#: tools/virsh-interface.c:922
+#: tools/virsh.c:7675
 msgid "Failed to create interface node under bridge node in xml document"
 msgstr "在 xml 文档中在桥接接口下生成接口节点失败"
 
-#: tools/virsh-interface.c:930
+#: tools/virsh.c:7683
 #, c-format
 msgid "Failed to set new slave interface type to '%s' in xml document"
 msgstr "在 xml 文档中将新的辅助接口类型设定为 '%s' 失败"
 
-#: tools/virsh-interface.c:936
+#: tools/virsh.c:7689
 #, c-format
 msgid "Failed to set new slave interface name to '%s' in xml document"
 msgstr "在 xml 文档中将新的辅助接口名称设定为 '%s' 失败"
 
-#: tools/virsh-interface.c:956 tools/virsh-interface.c:1146
+#: tools/virsh.c:7709 tools/virsh.c:7892
 #, c-format
 msgid "Failed to move '%s' element in xml document"
 msgstr "在 xml 文档中删除 '%s' 元素失败"
 
-#: tools/virsh-interface.c:967
+#: tools/virsh.c:7720
 #, c-format
 msgid "Failed to format new xml document for bridge %s"
 msgstr "为桥接 %s 格式化新的 xml 文档失败"
 
-#: tools/virsh-interface.c:976
+#: tools/virsh.c:7729
 #, c-format
 msgid "Failed to define new bridge interface %s"
 msgstr "为接口 %s 定义新桥接接口失败"
 
-#: tools/virsh-interface.c:981
+#: tools/virsh.c:7734
 #, c-format
 msgid "Created bridge %s with attached device %s\n"
 msgstr "使用附加设备 %s 生成桥接 %s 失败\n"
 
-#: tools/virsh-interface.c:987
+#: tools/virsh.c:7740
 #, c-format
 msgid "Failed to start bridge interface %s"
 msgstr "启动桥接接口 %s 失败"
 
-#: tools/virsh-interface.c:990
+#: tools/virsh.c:7743
 #, c-format
 msgid "Bridge interface %s started\n"
 msgstr "已启动桥接接口 %s\n"
 
-#: tools/virsh-interface.c:1014
+#: tools/virsh.c:7766
 msgid "undefine a bridge device after detaching its slave device"
 msgstr "分离其辅助设备后取消定义桥接设备"
 
-#: tools/virsh-interface.c:1017
+#: tools/virsh.c:7767
 msgid "unbridge a network device"
 msgstr "取消定义网络设备"
 
-#: tools/virsh-interface.c:1026
+#: tools/virsh.c:7772
 msgid "current bridge device name"
 msgstr "当前桥接设备名称"
 
-#: tools/virsh-interface.c:1030
+#: tools/virsh.c:7774
 msgid "don't start the un-slaved interface immediately (not recommended)"
 msgstr "不要立即启动非辅助接口（不推荐）"
 
-#: tools/virsh-interface.c:1062
+#: tools/virsh.c:7808
 msgid "(bridge interface definition)"
 msgstr "(桥接接口定义)"
 
-#: tools/virsh-interface.c:1076
+#: tools/virsh.c:7822
 #, c-format
 msgid "Device %s is not a bridge"
 msgstr "失败 %s 不是一个桥接"
 
-#: tools/virsh-interface.c:1092
+#: tools/virsh.c:7838
 msgid "No bridge node in xml document"
 msgstr "xml 文档中没有桥接节点"
 
@@ -32278,158 +32906,156 @@
 msgid "Multiple interfaces attached to bridge"
 msgstr "附加到桥接的多个接口"
 
-#: tools/virsh-interface.c:1102
+#: tools/virsh.c:7848
 msgid "No interface attached to bridge"
 msgstr "没有附加要桥接的接口"
 
-#: tools/virsh-interface.c:1110
+#: tools/virsh.c:7856
 #, c-format
 msgid "Device attached to bridge %s has no name"
 msgstr "附加到桥接 %s 的设备没有名称"
 
-#: tools/virsh-interface.c:1115
+#: tools/virsh.c:7861
 #, c-format
 msgid "Attached device %s has no type"
 msgstr "附加设备 %s 没有类型"
 
-#: tools/virsh-interface.c:1120
+#: tools/virsh.c:7866
 #, c-format
 msgid "Failed to set interface type to '%s' in xml document"
 msgstr "在 xml 文档在获奖接口类型设定为 '%s' 失败"
 
-#: tools/virsh-interface.c:1126
+#: tools/virsh.c:7872
 #, c-format
 msgid "Failed to set interface name to '%s' in xml document"
 msgstr "在 xml 文档在获奖接口名称设定为 '%s' 失败"
 
-#: tools/virsh-interface.c:1157
+#: tools/virsh.c:7903
 #, c-format
 msgid "Failed to format new xml document for un-enslaved interface %s"
 msgstr "为非辅助接口 %s 格式化新 xml 文档失败"
 
-#: tools/virsh-interface.c:1166
+#: tools/virsh.c:7912
 #, c-format
 msgid "Failed to destroy bridge interface %s"
 msgstr "删除桥接接口 %s 失败"
 
-#: tools/virsh-interface.c:1170
+#: tools/virsh.c:7916
 #, c-format
 msgid "Failed to undefine bridge interface %s"
 msgstr "取消定义桥接接口 %s 失败。"
 
-#: tools/virsh-interface.c:1177
+#: tools/virsh.c:7923
 #, c-format
 msgid "Failed to define new interface %s"
 msgstr "定义新接口 %s 失败。"
 
-#: tools/virsh-interface.c:1181
+#: tools/virsh.c:7927
 #, c-format
 msgid "Device %s un-attached from bridge %s\n"
 msgstr "从桥接 %s 中分离设备 %s\n"
 
-#: tools/virsh-network.c:76
+#: tools/virsh.c:16138
 #, c-format
 msgid "failed to get network '%s'"
 msgstr "获得网络 '%s' 失败"
 
-#: tools/virsh-network.c:86
+#: tools/virsh.c:6190
 msgid "autostart a network"
 msgstr "自动开始网络"
 
-#: tools/virsh-network.c:89
+#: tools/virsh.c:6192
 msgid "Configure a network to be automatically started at boot."
 msgstr "设置一个网络在启动时自动开始."
 
-#: tools/virsh-network.c:98 tools/virsh-network.c:254
-#: tools/virsh-network.c:297 tools/virsh-network.c:352
-#: tools/virsh-network.c:771 tools/virsh-network.c:813
-#: tools/virsh-network.c:856 tools/virsh-network.c:1075
+#: tools/virsh.c:6197 tools/virsh.c:6580 tools/virsh.c:6619 tools/virsh.c:7012
+#: tools/virsh.c:13667
 msgid "network name or uuid"
 msgstr "网络名或 uuid"
 
-#: tools/virsh-network.c:121
+#: tools/virsh.c:6219
 #, c-format
 msgid "failed to mark network %s as autostarted"
 msgstr "把网络%s标记为自动启动失败"
 
-#: tools/virsh-network.c:123
+#: tools/virsh.c:6221
 #, c-format
 msgid "failed to unmark network %s as autostarted"
 msgstr "把网络%s取消标记为自动启动失败"
 
-#: tools/virsh-network.c:129
+#: tools/virsh.c:6227
 #, c-format
 msgid "Network %s marked as autostarted\n"
 msgstr "网络%s标记为自动启动\n"
 
-#: tools/virsh-network.c:131
+#: tools/virsh.c:6229
 #, c-format
 msgid "Network %s unmarked as autostarted\n"
 msgstr "网络%s取消标记为自动启动\n"
 
-#: tools/virsh-network.c:142
+#: tools/virsh.c:6482
 msgid "create a network from an XML file"
 msgstr "从一个 XML 文件创建一个网络"
 
-#: tools/virsh-network.c:145
+#: tools/virsh.c:6483
 msgid "Create a network."
 msgstr "创建一个网络"
 
-#: tools/virsh-network.c:154 tools/virsh-network.c:204
+#: tools/virsh.c:6488 tools/virsh.c:6534
 msgid "file containing an XML network description"
 msgstr "文件包括一个 XML网络描述"
 
-#: tools/virsh-network.c:177
+#: tools/virsh.c:6513
 #, c-format
 msgid "Network %s created from %s\n"
 msgstr "从%s创建网络%s\n"
 
-#: tools/virsh-network.c:181
+#: tools/virsh.c:6517
 #, c-format
 msgid "Failed to create network from %s"
 msgstr "从 %s 创建网络失败"
 
-#: tools/virsh-network.c:192
+#: tools/virsh.c:6528
 msgid "define (but don't start) a network from an XML file"
 msgstr "从一个 XML 文件定义(但不开始)一个网络"
 
-#: tools/virsh-network.c:195
+#: tools/virsh.c:6529
 msgid "Define a network."
 msgstr "定义一个网络."
 
-#: tools/virsh-network.c:227
+#: tools/virsh.c:6559
 #, c-format
 msgid "Network %s defined from %s\n"
 msgstr "从 %s定义网络%s\n"
 
-#: tools/virsh-network.c:231
+#: tools/virsh.c:6563
 #, c-format
 msgid "Failed to define network from %s"
 msgstr "从 %s 定义网络失败"
 
-#: tools/virsh-network.c:242
+#: tools/virsh.c:6574
 msgid "destroy (stop) a network"
 msgstr "销毁（停止）网络"
 
-#: tools/virsh-network.c:245
+#: tools/virsh.c:6575
 msgid "Forcefully stop a given network."
 msgstr "强制停止给定网络。"
 
-#: tools/virsh-network.c:270
+#: tools/virsh.c:6598
 #, c-format
 msgid "Network %s destroyed\n"
 msgstr "网络 %s 被删除\n"
 
-#: tools/virsh-network.c:272
+#: tools/virsh.c:6600
 #, c-format
 msgid "Failed to destroy network %s"
 msgstr "删除网络 %s 失败"
 
-#: tools/virsh-network.c:285
+#: tools/virsh.c:6613
 msgid "network information in XML"
 msgstr "XML 中的网络信息"
 
-#: tools/virsh-network.c:288
+#: tools/virsh.c:6614
 msgid "Output the network information as an XML dump to stdout."
 msgstr "把网络信息作为一个 XML 输出到 stdout。"
 
@@ -32437,24 +33063,24 @@
 msgid "network information of an inactive domain"
 msgstr "不活跃域的网络信息"
 
-#: tools/virsh-network.c:340
+#: tools/virsh.c:6652
 msgid "network information"
 msgstr "网络信息"
 
-#: tools/virsh-network.c:343
+#: tools/virsh.c:6653
 msgid "Returns basic information about the network"
 msgstr "返回关于这个网络的基本信息。"
 
-#: tools/virsh-network.c:377
+#: tools/virsh.c:6686
 msgid "Active:"
 msgstr "活跃："
 
-#: tools/virsh-network.c:386 tools/virsh-network.c:703 tools/virsh-pool.c:1061
-#: tools/virsh-pool.c:1562
+#: tools/virsh.c:6695 tools/virsh.c:6891 tools/virsh.c:6914 tools/virsh.c:8963
+#: tools/virsh.c:9459
 msgid "no autostart"
 msgstr "不自动开始"
 
-#: tools/virsh-network.c:392
+#: tools/virsh.c:6701
 msgid "Bridge:"
 msgstr "桥接："
 
@@ -32470,11 +33096,11 @@
 msgid "Failed to get the number of inactive networks"
 msgstr "获取不活跃的网络数失败"
 
-#: tools/virsh-network.c:517
+#: tools/virsh.c:6836 tools/virsh.c:6844
 msgid "Failed to list active networks"
 msgstr "列出活跃的网络失败"
 
-#: tools/virsh-network.c:528
+#: tools/virsh.c:6855 tools/virsh.c:6865
 msgid "Failed to list inactive networks"
 msgstr "列出不活跃的网络失败"
 
@@ -32486,19 +33112,19 @@
 msgid "Failed to get network autostart state"
 msgstr "获取网络 autostart 状态失败"
 
-#: tools/virsh-network.c:621
+#: tools/virsh.c:6809
 msgid "list networks"
 msgstr "列出网络"
 
-#: tools/virsh-network.c:624
+#: tools/virsh.c:6810
 msgid "Returns list of networks."
 msgstr "返回网络列表"
 
-#: tools/virsh-network.c:632
+#: tools/virsh.c:6815
 msgid "list inactive networks"
 msgstr "列出不活跃的网络"
 
-#: tools/virsh-network.c:636
+#: tools/virsh.c:6816
 msgid "list inactive & active networks"
 msgstr "列出不活跃和活跃的网络"
 
@@ -32518,55 +33144,54 @@
 msgid "list networks with autostart disabled"
 msgstr "列出禁用 autostart 的网络"
 
-#: tools/virsh-network.c:693 tools/virsh-pool.c:1201 tools/virsh-pool.c:1231
-#: tools/virsh-pool.c:1289
+#: tools/virsh.c:6875 tools/virsh.c:9109 tools/virsh.c:9138 tools/virsh.c:9197
 msgid "Autostart"
 msgstr "自动开始"
 
-#: tools/virsh-network.c:693 tools/virsh-pool.c:1236 tools/virsh-pool.c:1290
+#: tools/virsh.c:9143 tools/virsh.c:9198
 msgid "Persistent"
 msgstr "持久"
 
-#: tools/virsh-network.c:723
+#: tools/virsh.c:6936
 msgid "convert a network UUID to network name"
 msgstr "把一个网络UUID 转换为网络名"
 
-#: tools/virsh-network.c:735
+#: tools/virsh.c:6942
 msgid "network uuid"
 msgstr "网络uuid"
 
-#: tools/virsh-network.c:759
+#: tools/virsh.c:6967
 msgid "start a (previously defined) inactive network"
 msgstr "开始一个(以前定义的)不活跃的网络"
 
-#: tools/virsh-network.c:762
+#: tools/virsh.c:6968
 msgid "Start a network."
 msgstr "开始一个网络."
 
-#: tools/virsh-network.c:787
+#: tools/virsh.c:6990
 #, c-format
 msgid "Network %s started\n"
 msgstr "网络 %s 已开始\n"
 
-#: tools/virsh-network.c:789
+#: tools/virsh.c:6993
 #, c-format
 msgid "Failed to start network %s"
 msgstr "开始网络 %s 失败"
 
-#: tools/virsh-network.c:801
+#: tools/virsh.c:7006
 msgid "undefine an inactive network"
 msgstr "取消定义一个非活跃的网络"
 
-#: tools/virsh-network.c:804
+#: tools/virsh.c:7007
 msgid "Undefine the configuration for an inactive network."
 msgstr "取消定义一个非活跃网络配置。"
 
-#: tools/virsh-network.c:829
+#: tools/virsh.c:7030
 #, c-format
 msgid "Network %s has been undefined\n"
 msgstr "网络 %s 已经被取消定义\n"
 
-#: tools/virsh-network.c:831
+#: tools/virsh.c:7032
 #, c-format
 msgid "Failed to undefine network %s"
 msgstr "取消定义网络 %s 失败"
@@ -32619,7 +33244,8 @@
 msgid "malformed parent-index argument"
 msgstr "畸形的上级索引参数"
 
-#: tools/virsh-network.c:976
+#: tools/virsh.c:2698 tools/virsh.c:4065 tools/virsh.c:4298 tools/virsh.c:4512
+#: tools/virsh.c:4601 tools/virsh.c:4689 tools/virsh.c:4869 tools/virsh.c:6283
 msgid "--current must be specified exclusively"
 msgstr "必须单独指定 --current"
 
@@ -32645,23 +33271,23 @@
 msgid "Updated network %s %s"
 msgstr "更新的网络 %s%s"
 
-#: tools/virsh-network.c:1022
+#: tools/virsh.c:7045
 msgid "convert a network name to network UUID"
 msgstr "把一个网络名转换为网络UUID"
 
-#: tools/virsh-network.c:1034
+#: tools/virsh.c:6658 tools/virsh.c:7051
 msgid "network name"
 msgstr "网络名"
 
-#: tools/virsh-network.c:1052
+#: tools/virsh.c:7071
 msgid "failed to get network UUID"
 msgstr "获得网络UUID 失败"
 
-#: tools/virsh-network.c:1063
+#: tools/virsh.c:13661
 msgid "edit XML configuration for a network"
 msgstr "为网络编辑 XML 配置"
 
-#: tools/virsh-network.c:1066
+#: tools/virsh.c:13662
 msgid "Edit the XML configuration for a network."
 msgstr "为网络编辑 XML 配置。"
 
@@ -32675,35 +33301,56 @@
 msgid "Network %s XML configuration edited.\n"
 msgstr "已编辑网络 %s XML 配置。\n"
 
-#: tools/virsh-nodedev.c:46
+#: tools/virsh-network.c:1175
+#, c-format
+msgid "event 'lifecycle' for network %s: %s\n"
+msgstr ""
+
+#: tools/virsh-network.c:1184
+msgid "Network Events"
+msgstr ""
+
+#: tools/virsh-network.c:1187
+msgid "List event types, or wait for network events to occur"
+msgstr ""
+
+#: tools/virsh-network.c:1195
+msgid "filter by network name or uuid"
+msgstr ""
+
+#: tools/virsh-network.c:1238
+msgid "either --list or event type is required"
+msgstr ""
+
+#: tools/virsh.c:8343
 msgid "create a device defined by an XML file on the node"
 msgstr "根据节点中的 XML 文件定义生成设备"
 
-#: tools/virsh-nodedev.c:50
+#: tools/virsh.c:8345
 msgid ""
 "Create a device on the node.  Note that this command creates devices on the "
 "physical host that can then be assigned to a virtual machine."
 msgstr "在该节点中生成设备。注：这个命令在物理主机中生成的设备可随后被分配到虚拟机中。"
 
-#: tools/virsh-nodedev.c:61
+#: tools/virsh.c:8353
 msgid "file containing an XML description of the device"
 msgstr "包含设备 XML 描述的文件"
 
-#: tools/virsh-nodedev.c:84
+#: tools/virsh.c:8378
 #, c-format
 msgid "Node device %s created from %s\n"
 msgstr "使用 %s 生成的节点设备 %s\n"
 
-#: tools/virsh-nodedev.c:88
+#: tools/virsh.c:8382
 #, c-format
 msgid "Failed to create node device from %s"
 msgstr "使用 %s 生成的节点设备失败"
 
-#: tools/virsh-nodedev.c:101
+#: tools/virsh.c:8394
 msgid "destroy (stop) a device on the node"
 msgstr "销毁（停止）节点中的设备"
 
-#: tools/virsh-nodedev.c:104
+#: tools/virsh.c:8395
 msgid ""
 "Destroy a device on the node.  Note that this command destroys devices on "
 "the physical host"
@@ -32718,25 +33365,26 @@
 msgid "Malformed device value '%s'"
 msgstr ""
 
-#: tools/virsh-nodedev.c:151 tools/virsh-nodedev.c:561
+#: tools/virsh.c:11491 tools/virsh.c:11534 tools/virsh.c:11575
+#: tools/virsh.c:11616
 msgid "Could not find matching device"
 msgstr "无法找到匹配的设备"
 
-#: tools/virsh-nodedev.c:156
+#: tools/virsh.c:8423
 #, c-format
 msgid "Destroyed node device '%s'\n"
 msgstr "已删除的节点设备 '%s'\n"
 
-#: tools/virsh-nodedev.c:158
+#: tools/virsh.c:8425
 #, c-format
 msgid "Failed to destroy node device '%s'"
 msgstr "删除的节点设备 '%s' 失败"
 
-#: tools/virsh-nodedev.c:248 tools/virsh-nodedev.c:269
+#: tools/virsh.c:11418
 msgid "Failed to list node devices"
 msgstr "列出节点设备失败"
 
-#: tools/virsh-nodedev.c:258
+#: tools/virsh.c:11408
 msgid "Failed to count node devices"
 msgstr "节点设备计数失败"
 
@@ -32748,11 +33396,11 @@
 msgid "Failed to get capability names of the device"
 msgstr "获取该设备性能名称失败"
 
-#: tools/virsh-nodedev.c:369
+#: tools/virsh.c:11301
 msgid "enumerate devices on this host"
 msgstr "这台主机中中的枚举设备"
 
-#: tools/virsh-nodedev.c:380
+#: tools/virsh.c:11307
 msgid "list devices in a tree"
 msgstr "在某个树中列出设备"
 
@@ -32768,11 +33416,11 @@
 msgid "Invalid capability type"
 msgstr "无效性能类型"
 
-#: tools/virsh-nodedev.c:514
+#: tools/virsh.c:11468
 msgid "node device details in XML"
 msgstr "XML 中的节点设备详情"
 
-#: tools/virsh-nodedev.c:517
+#: tools/virsh.c:11469
 msgid "Output the node device details as an XML dump to stdout."
 msgstr "将节点设备详情作为 XML 转储到 stdout。"
 
@@ -32785,8 +33433,8 @@
 "Detach node device from its device driver before assigning to a domain."
 msgstr "将其分配到某个域前从其设备驱动程序中分离节点设备"
 
-#: tools/virsh-nodedev.c:596 tools/virsh-nodedev.c:661
-#: tools/virsh-nodedev.c:710
+#: tools/virsh.c:11475 tools/virsh.c:11518 tools/virsh.c:11559
+#: tools/virsh.c:11600
 msgid "device key"
 msgstr "设备密钥"
 
@@ -32810,98 +33458,97 @@
 msgid "Failed to detach device %s"
 msgstr "分离设备 %s 失败"
 
-#: tools/virsh-nodedev.c:648
+#: tools/virsh.c:11552
 msgid "reattach node device to its device driver"
 msgstr "重新将节点设备附加到他的设备驱动程序中"
 
-#: tools/virsh-nodedev.c:651
+#: tools/virsh.c:11553
 msgid ""
 "Reattach node device to its device driver once released by the domain."
 msgstr "当从该域中释放后重新将节点设备附加到他的设备驱动程序中。"
 
-#: tools/virsh-nodedev.c:682
+#: tools/virsh.c:11580
 #, c-format
 msgid "Device %s re-attached\n"
 msgstr "重新附加设备 %s\n"
 
-#: tools/virsh-nodedev.c:684
+#: tools/virsh.c:11582
 #, c-format
 msgid "Failed to re-attach device %s"
 msgstr "重新附加设备 %s 失败"
 
-#: tools/virsh-nodedev.c:697
+#: tools/virsh.c:11593
 msgid "reset node device"
 msgstr "重置节点设备"
 
-#: tools/virsh-nodedev.c:700
+#: tools/virsh.c:11594
 msgid "Reset node device before or after assigning to a domain."
 msgstr "在分配到某个域之前或者之后重置节点设备。"
 
-#: tools/virsh-nodedev.c:731
+#: tools/virsh.c:11621
 #, c-format
 msgid "Device %s reset\n"
 msgstr "重置设备 %s\n"
 
-#: tools/virsh-nodedev.c:733
+#: tools/virsh.c:11623
 #, c-format
 msgid "Failed to reset device %s"
 msgstr "重置设备 %s 失败"
 
-#: tools/virsh-nwfilter.c:76
+#: tools/virsh.c:16177
 #, c-format
 msgid "failed to get nwfilter '%s'"
 msgstr "获取 nwfilter '%s' 失败"
 
-#: tools/virsh-nwfilter.c:86
+#: tools/virsh.c:7958
 msgid "define or update a network filter from an XML file"
 msgstr "使用 XML 文件定义或者更新网络过滤器"
 
-#: tools/virsh-nwfilter.c:89
+#: tools/virsh.c:7959
 msgid "Define a new network filter or update an existing one."
 msgstr "定义新网络过滤器或者更新现有过滤器。"
 
-#: tools/virsh-nwfilter.c:98
+#: tools/virsh.c:7964
 msgid "file containing an XML network filter description"
 msgstr "包含 XML 网络过滤器描述的文件"
 
-#: tools/virsh-nwfilter.c:121
+#: tools/virsh.c:7989
 #, c-format
 msgid "Network filter %s defined from %s\n"
 msgstr "使用 %s 定义的网络过滤器 %s\n"
 
-#: tools/virsh-nwfilter.c:125
+#: tools/virsh.c:7993
 #, c-format
 msgid "Failed to define network filter from %s"
 msgstr "使用 %s 定义的网络过滤器失败"
 
-#: tools/virsh-nwfilter.c:136
+#: tools/virsh.c:8004
 msgid "undefine a network filter"
 msgstr "取消定义网络过滤器"
 
-#: tools/virsh-nwfilter.c:139
+#: tools/virsh.c:8005
 msgid "Undefine a given network filter."
 msgstr "取消定义给定网络过滤器。"
 
-#: tools/virsh-nwfilter.c:148 tools/virsh-nwfilter.c:191
-#: tools/virsh-nwfilter.c:407
+#: tools/virsh.c:8010 tools/virsh.c:8049 tools/virsh.c:8155
 msgid "network filter name or uuid"
 msgstr "网络过滤器名称或者 uuid"
 
-#: tools/virsh-nwfilter.c:164
+#: tools/virsh.c:8028
 #, c-format
 msgid "Network filter %s undefined\n"
 msgstr "取消定义网络过滤器 %s\n"
 
-#: tools/virsh-nwfilter.c:166
+#: tools/virsh.c:8030
 #, c-format
 msgid "Failed to undefine network filter %s"
 msgstr "取消定义网络过滤器 %s 失败"
 
-#: tools/virsh-nwfilter.c:179
+#: tools/virsh.c:8043
 msgid "network filter information in XML"
 msgstr "XML 中的网络过滤器信息"
 
-#: tools/virsh-nwfilter.c:182
+#: tools/virsh.c:8044
 msgid "Output the network filter information as an XML dump to stdout."
 msgstr "将网络过滤器信息输出作为 XML 转储到标准输出。"
 
@@ -32913,273 +33560,271 @@
 msgid "Failed to count network filters"
 msgstr "计算网络过滤器失败"
 
-#: tools/virsh-nwfilter.c:304
+#: tools/virsh.c:8103 tools/virsh.c:8111
 msgid "Failed to list network filters"
 msgstr "列出网络过滤器失败"
 
-#: tools/virsh-nwfilter.c:351
+#: tools/virsh.c:8082
 msgid "list network filters"
 msgstr "列出网络过滤器"
 
-#: tools/virsh-nwfilter.c:354
+#: tools/virsh.c:8083
 msgid "Returns list of network filters."
 msgstr "返回网络过滤器列表。"
 
-#: tools/virsh-nwfilter.c:373 tools/virsh-secret.c:535
+#: tools/virsh.c:6682 tools/virsh.c:8118 tools/virsh.c:11164
 msgid "UUID"
 msgstr "UUID"
 
-#: tools/virsh-nwfilter.c:395
+#: tools/virsh.c:8149
 msgid "edit XML configuration for a network filter"
 msgstr "为网络过滤器编辑 XML 配置"
 
-#: tools/virsh-nwfilter.c:398
+#: tools/virsh.c:8150
 msgid "Edit the XML configuration for a network filter."
 msgstr "为网络过滤器编辑 XML 配置"
 
-#: tools/virsh-nwfilter.c:425
+#: tools/virsh.c:8194
 #, c-format
 msgid "Network filter %s XML configuration not changed.\n"
 msgstr "未更改为网络过滤器  %s XML 配置\n"
 
-#: tools/virsh-nwfilter.c:436
+#: tools/virsh.c:8220
 #, c-format
 msgid "Network filter %s XML configuration edited.\n"
 msgstr "已编辑网络过滤器 %s XML 配置\n"
 
-#: tools/virsh-pool.c:73
+#: tools/virsh.c:16253
 #, c-format
 msgid "failed to get pool '%s'"
 msgstr "获得池 '%s' 失败"
 
-#: tools/virsh-pool.c:83
+#: tools/virsh.c:8247
 msgid "autostart a pool"
 msgstr "自动启动某个池"
 
-#: tools/virsh-pool.c:86
+#: tools/virsh.c:8249
 msgid "Configure a pool to be automatically started at boot."
 msgstr "将某个池设置为在引导时自动启动。"
 
-#: tools/virsh-pool.c:95 tools/virsh-pool.c:443 tools/virsh-pool.c:504
-#: tools/virsh-pool.c:547 tools/virsh-pool.c:590 tools/virsh-pool.c:633
-#: tools/virsh-pool.c:1502 tools/virsh-pool.c:1681 tools/virsh-pool.c:1765
-#: tools/virsh-volume.c:391 tools/virsh-volume.c:518 tools/virsh-volume.c:614
-#: tools/virsh-volume.c:732 tools/virsh-volume.c:843 tools/virsh-volume.c:891
-#: tools/virsh-volume.c:995 tools/virsh-volume.c:1058
-#: tools/virsh-volume.c:1156 tools/virsh-volume.c:1326
-#: tools/virsh-volume.c:1699 tools/virsh-volume.c:1738
+#: tools/virsh.c:8254 tools/virsh.c:8650 tools/virsh.c:8701 tools/virsh.c:8740
+#: tools/virsh.c:8779 tools/virsh.c:8818 tools/virsh.c:9394 tools/virsh.c:9751
+#: tools/virsh.c:9981 tools/virsh.c:10058 tools/virsh.c:10158
+#: tools/virsh.c:10254 tools/virsh.c:10295 tools/virsh.c:10336
+#: tools/virsh.c:10400 tools/virsh.c:10440 tools/virsh.c:10828
+#: tools/virsh.c:10861 tools/virsh.c:13684
 msgid "pool name or uuid"
 msgstr "池名或 uuid"
 
-#: tools/virsh-pool.c:118
+#: tools/virsh.c:8276
 #, c-format
 msgid "failed to mark pool %s as autostarted"
 msgstr "将池 %s 标记为自动启动失败"
 
-#: tools/virsh-pool.c:120
+#: tools/virsh.c:8278
 #, c-format
 msgid "failed to unmark pool %s as autostarted"
 msgstr "取消将池 %s 标记为自动启动失败"
 
-#: tools/virsh-pool.c:126
+#: tools/virsh.c:8284
 #, c-format
 msgid "Pool %s marked as autostarted\n"
 msgstr "池 %s 标记为自动启动\n"
 
-#: tools/virsh-pool.c:128
+#: tools/virsh.c:8286
 #, c-format
 msgid "Pool %s unmarked as autostarted\n"
 msgstr "取消将池 %s 标记为自动启动\n"
 
-#: tools/virsh-pool.c:139
+#: tools/virsh.c:8296
 msgid "create a pool from an XML file"
 msgstr "从一个 XML 文件中创建一个池"
 
-#: tools/virsh-pool.c:142 tools/virsh-pool.c:300
+#: tools/virsh.c:8297 tools/virsh.c:8515
 msgid "Create a pool."
 msgstr "创建一个池。"
 
-#: tools/virsh-pool.c:151 tools/virsh-pool.c:351
+#: tools/virsh.c:8303 tools/virsh.c:8562
 msgid "file containing an XML pool description"
 msgstr "包含 XML 池描述的文件"
 
-#: tools/virsh-pool.c:174
+#: tools/virsh.c:8328
 #, c-format
 msgid "Pool %s created from %s\n"
 msgstr "从 %s 中创建池 %s\n"
 
-#: tools/virsh-pool.c:178
+#: tools/virsh.c:8332
 #, c-format
 msgid "Failed to create pool from %s"
 msgstr "从 %s 创建池失败"
 
-#: tools/virsh-pool.c:191
+#: tools/virsh.c:8438
 msgid "name of the pool"
 msgstr "池的名称"
 
-#: tools/virsh-pool.c:195
+#: tools/virsh.c:8439
 msgid "print XML document, but don't define/create"
 msgstr "打印 XML 文档，但不能定义/创建"
 
-#: tools/virsh-pool.c:200
+#: tools/virsh.c:8440
 msgid "type of the pool"
 msgstr "池类型"
 
-#: tools/virsh-pool.c:204
+#: tools/virsh.c:8441
 msgid "source-host for underlying storage"
 msgstr "基本存储的源主机"
 
-#: tools/virsh-pool.c:208
+#: tools/virsh.c:8442
 msgid "source path for underlying storage"
 msgstr "基本存储的源路径"
 
-#: tools/virsh-pool.c:212
+#: tools/virsh.c:8443
 msgid "source device for underlying storage"
 msgstr "基本存储的源设备"
 
-#: tools/virsh-pool.c:216
+#: tools/virsh.c:8444
 msgid "source name for underlying storage"
 msgstr "基本存储的源路径名称"
 
-#: tools/virsh-pool.c:220
+#: tools/virsh.c:8445
 msgid "target for underlying storage"
 msgstr "基本存储的目标"
 
-#: tools/virsh-pool.c:224
+#: tools/virsh.c:8446
 msgid "format for underlying storage"
 msgstr "基础存储的格式"
 
-#: tools/virsh-pool.c:297
+#: tools/virsh.c:8514
 msgid "create a pool from a set of args"
 msgstr "从一组变量中创建一个池"
 
-#: tools/virsh-pool.c:324
+#: tools/virsh.c:8541
 #, c-format
 msgid "Pool %s created\n"
 msgstr "创建池 %s\n"
 
-#: tools/virsh-pool.c:327
+#: tools/virsh.c:8544
 #, c-format
 msgid "Failed to create pool %s"
 msgstr "创建池 %s 失败"
 
-#: tools/virsh-pool.c:339
+#: tools/virsh.c:8556
 msgid "define (but don't start) a pool from an XML file"
 msgstr "在一个 XML 文件中定义（但不启动）一个池"
 
-#: tools/virsh-pool.c:342 tools/virsh-pool.c:392
+#: tools/virsh.c:8557 tools/virsh.c:8603
 msgid "Define a pool."
 msgstr "定义池。"
 
-#: tools/virsh-pool.c:374
+#: tools/virsh.c:8587
 #, c-format
 msgid "Pool %s defined from %s\n"
 msgstr "在 %s 中定义池 %s\n"
 
-#: tools/virsh-pool.c:378
+#: tools/virsh.c:8591
 #, c-format
 msgid "Failed to define pool from %s"
 msgstr "在 %s 中定义池失败"
 
-#: tools/virsh-pool.c:389
+#: tools/virsh.c:8602
 msgid "define a pool from a set of args"
 msgstr "在一组变量中定义池"
 
-#: tools/virsh-pool.c:416
+#: tools/virsh.c:8629
 #, c-format
 msgid "Pool %s defined\n"
 msgstr "定义池 %s\n"
 
-#: tools/virsh-pool.c:419
+#: tools/virsh.c:8632
 #, c-format
 msgid "Failed to define pool %s"
 msgstr "定义池 %s 失败"
 
-#: tools/virsh-pool.c:431
+#: tools/virsh.c:8644
 msgid "build a pool"
 msgstr "建立池"
 
-#: tools/virsh-pool.c:434
+#: tools/virsh.c:8645
 msgid "Build a given pool."
 msgstr "建立一个给定的池。"
 
-#: tools/virsh-pool.c:447
+#: tools/virsh.c:8651
 msgid "do not overwrite an existing pool of this type"
 msgstr "不能写入这个类型的现有池"
 
-#: tools/virsh-pool.c:451
+#: tools/virsh.c:8652
 msgid "overwrite any existing data"
 msgstr "覆盖现有数据"
 
-#: tools/virsh-pool.c:476
+#: tools/virsh.c:8679
 #, c-format
 msgid "Pool %s built\n"
 msgstr "构建池 %s\n"
 
-#: tools/virsh-pool.c:478
+#: tools/virsh.c:8681
 #, c-format
 msgid "Failed to build pool %s"
 msgstr "构建池 %s 失败"
 
-#: tools/virsh-pool.c:492
+#: tools/virsh.c:8694
 msgid "destroy (stop) a pool"
 msgstr "销毁（删除）池"
 
-#: tools/virsh-pool.c:495
+#: tools/virsh.c:8696
 msgid "Forcefully stop a given pool. Raw data in the pool is untouched"
 msgstr "强制停止给定的池。不损坏该池中的原始数据。"
 
-#: tools/virsh-pool.c:520
+#: tools/virsh.c:8719
 #, c-format
 msgid "Pool %s destroyed\n"
 msgstr "销毁池 %s\n"
 
-#: tools/virsh-pool.c:522
+#: tools/virsh.c:8721
 #, c-format
 msgid "Failed to destroy pool %s"
 msgstr "销毁池 %s 失败"
 
-#: tools/virsh-pool.c:535
+#: tools/virsh.c:8734
 msgid "delete a pool"
 msgstr "删除池"
 
-#: tools/virsh-pool.c:538
+#: tools/virsh.c:8735
 msgid "Delete a given pool."
 msgstr "删除一个给定的池。"
 
-#: tools/virsh-pool.c:563
+#: tools/virsh.c:8758
 #, c-format
 msgid "Pool %s deleted\n"
 msgstr "池 %s 被删除\n"
 
-#: tools/virsh-pool.c:565
+#: tools/virsh.c:8760
 #, c-format
 msgid "Failed to delete pool %s"
 msgstr "删除池 %s 失败"
 
-#: tools/virsh-pool.c:578
+#: tools/virsh.c:8773
 msgid "refresh a pool"
 msgstr "刷新池"
 
-#: tools/virsh-pool.c:581
+#: tools/virsh.c:8774
 msgid "Refresh a given pool."
 msgstr "刷新给定的池。"
 
-#: tools/virsh-pool.c:606
+#: tools/virsh.c:8797
 #, c-format
 msgid "Pool %s refreshed\n"
 msgstr "池 %s 被刷新\n"
 
-#: tools/virsh-pool.c:608
+#: tools/virsh.c:8799
 #, c-format
 msgid "Failed to refresh pool %s"
 msgstr "刷新池 %s 失败"
 
-#: tools/virsh-pool.c:621
+#: tools/virsh.c:8812
 msgid "pool information in XML"
 msgstr "XML 中的池信息"
 
-#: tools/virsh-pool.c:624
+#: tools/virsh.c:8813
 msgid "Output the pool information as an XML dump to stdout."
 msgstr "把池信息作为 XML 转储输出到 stdout。"
 
@@ -33199,11 +33844,11 @@
 msgid "Failed to get the number of inactive pools"
 msgstr "获取不活跃的池数失败"
 
-#: tools/virsh-pool.c:793
+#: tools/virsh.c:8901 tools/virsh.c:8927
 msgid "Failed to list active pools"
 msgstr "列出活跃的池失败"
 
-#: tools/virsh-pool.c:804
+#: tools/virsh.c:8910 tools/virsh.c:8939
 msgid "Failed to list inactive pools"
 msgstr "列出不活跃的池失败"
 
@@ -33215,318 +33860,315 @@
 msgid "Failed to get pool autostart state"
 msgstr "获取池 autostart 状态失败"
 
-#: tools/virsh-pool.c:898
+#: tools/virsh.c:9005 tools/virsh.c:9429
+msgid "building"
+msgstr "building"
+
+#: tools/virsh.c:9011 tools/virsh.c:9437
+msgid "degraded"
+msgstr "degraded"
+
+#: tools/virsh.c:9014 tools/virsh.c:9441
+msgid "inaccessible"
+msgstr "无法访问"
+
+#: tools/virsh.c:8852
 msgid "list pools"
 msgstr "列出池"
 
-#: tools/virsh-pool.c:901
+#: tools/virsh.c:8853
 msgid "Returns list of pools."
 msgstr "返回池列表"
 
-#: tools/virsh-pool.c:909
+#: tools/virsh.c:8858
 msgid "list inactive pools"
 msgstr "列出不活跃的池"
 
-#: tools/virsh-pool.c:913
+#: tools/virsh.c:8859
 msgid "list inactive & active pools"
 msgstr "不活跃和活跃的池"
 
-#: tools/virsh-pool.c:917
+#: tools/virsh-pool.c:935
 msgid "list transient pools"
 msgstr "列出临时池"
 
-#: tools/virsh-pool.c:921
+#: tools/virsh-pool.c:939
 msgid "list persistent pools"
 msgstr "列出持久池"
 
-#: tools/virsh-pool.c:925
+#: tools/virsh-pool.c:943
 msgid "list pools with autostart enabled"
 msgstr "列出启用 autostart 的池"
 
-#: tools/virsh-pool.c:929
+#: tools/virsh-pool.c:947
 msgid "list pools with autostart disabled"
 msgstr "列出禁用 autostart 的池"
 
-#: tools/virsh-pool.c:933
+#: tools/virsh-pool.c:951
 msgid "only list pool of specified type(s) (if supported)"
 msgstr "只列出指定类型的池（如果支持）"
 
-#: tools/virsh-pool.c:937
+#: tools/virsh.c:8860
 msgid "display extended details for pools"
 msgstr "为池显示扩展的详情"
 
-#: tools/virsh-pool.c:1004
+#: tools/virsh-pool.c:1021
 #, c-format
 msgid "Invalid pool type '%s'"
 msgstr ""
 
-#: tools/virsh-pool.c:1086
+#: tools/virsh.c:8988
 msgid "Could not retrieve pool information"
 msgstr "无法检索池信息"
 
-#: tools/virsh-pool.c:1103 tools/virsh-pool.c:1535
-msgid "building"
-msgstr "building"
-
-#: tools/virsh-pool.c:1109 tools/virsh-pool.c:1543
-msgid "degraded"
-msgstr "degraded"
-
-#: tools/virsh-pool.c:1112 tools/virsh-pool.c:1547
-msgid "inaccessible"
-msgstr "无法访问"
-
-#: tools/virsh-pool.c:1147 tools/virsh-pool.c:1148 tools/virsh-pool.c:1149
+#: tools/virsh.c:9052 tools/virsh.c:9053 tools/virsh.c:9054
 msgid "-"
 msgstr "-"
 
-#: tools/virsh-pool.c:1241 tools/virsh-pool.c:1290 tools/virsh-volume.c:1485
+#: tools/virsh.c:9148 tools/virsh.c:9198 tools/virsh.c:10634
 msgid "Capacity"
 msgstr "容量"
 
-#: tools/virsh-pool.c:1246 tools/virsh-pool.c:1290 tools/virsh-volume.c:1490
-#: tools/virsh-volume.c:1521
+#: tools/virsh.c:9153 tools/virsh.c:9198 tools/virsh.c:10639
+#: tools/virsh.c:10670
 msgid "Allocation"
 msgstr "分配"
 
-#: tools/virsh-pool.c:1251 tools/virsh-pool.c:1290
+#: tools/virsh.c:9158 tools/virsh.c:9198
 msgid "Available"
 msgstr "可用"
 
-#: tools/virsh-pool.c:1323 tools/virsh-volume.c:1552
-#, c-format
-msgid "virAsprintf failed (errno %d)"
-msgstr "virAsprintf 失败（errno %d）"
-
-#: tools/virsh-pool.c:1350
+#: tools/virsh.c:9262
 msgid "find potential storage pool sources"
 msgstr "找到潜在存储池源"
 
-#: tools/virsh-pool.c:1353 tools/virsh-pool.c:1439
+#: tools/virsh.c:9263 tools/virsh.c:9339
 msgid "Returns XML <sources> document."
 msgstr "返回 XML <sources> 文档"
 
-#: tools/virsh-pool.c:1362
+#: tools/virsh.c:9269
 msgid "type of storage pool sources to find"
 msgstr "要查找的存储池源类型"
 
-#: tools/virsh-pool.c:1366
+#: tools/virsh.c:9270
 msgid "optional host to query"
 msgstr "要查询的可选主机"
 
-#: tools/virsh-pool.c:1370
+#: tools/virsh.c:9271
 msgid "optional port to query"
 msgstr "要查询的可选端口"
 
-#: tools/virsh-pool.c:1374
+#: tools/virsh.c:9272
 msgid "optional initiator IQN to use for query"
 msgstr "查询中使用的可选启动程序 IQN"
 
-#: tools/virsh-pool.c:1397
+#: tools/virsh.c:5640 tools/virsh.c:8467 tools/virsh.c:9287 tools/virsh.c:9299
+#: tools/virsh.c:9638
 msgid "missing argument"
 msgstr "缺少参数"
 
-#: tools/virsh-pool.c:1422 tools/virsh-pool.c:1476
+#: tools/virsh.c:9324 tools/virsh.c:9374
 #, c-format
 msgid "Failed to find any %s pool sources"
 msgstr "查找任意 %s 池源失败"
 
-#: tools/virsh-pool.c:1436
+#: tools/virsh.c:9338
 msgid "discover potential storage pool sources"
 msgstr "发现潜在存储池源"
 
-#: tools/virsh-pool.c:1448
+#: tools/virsh.c:9345
 msgid "type of storage pool sources to discover"
 msgstr "要发现的存储池源类型"
 
-#: tools/virsh-pool.c:1452
+#: tools/virsh.c:9347
 msgid "optional file of source xml to query for pools"
 msgstr "用来查询池的源 xml 可选文件"
 
-#: tools/virsh-pool.c:1490
+#: tools/virsh.c:9388
 msgid "storage pool information"
 msgstr "存储池信息"
 
-#: tools/virsh-pool.c:1493
+#: tools/virsh.c:9389
 msgid "Returns basic information about the storage pool."
 msgstr "返回关于这个存储池的基本信息。"
 
-#: tools/virsh-pool.c:1575
+#: tools/virsh.c:9472
 msgid "Available:"
 msgstr "可用："
 
-#: tools/virsh-pool.c:1590
+#: tools/virsh.c:9487
 msgid "convert a pool UUID to pool name"
 msgstr "将池 UUID 转换为池名称"
 
-#: tools/virsh-pool.c:1602
+#: tools/virsh.c:9493
 msgid "pool uuid"
 msgstr "池 uuid"
 
-#: tools/virsh-pool.c:1626
+#: tools/virsh.c:9518
 msgid "start a (previously defined) inactive pool"
 msgstr "启动一个（以前定义的）非活跃的池"
 
-#: tools/virsh-pool.c:1629
+#: tools/virsh.c:9519
 msgid "Start a pool."
 msgstr "启动一个池。"
 
-#: tools/virsh-pool.c:1638
+#: tools/virsh-pool.c:1593
 msgid "name or uuid of the inactive pool"
 msgstr "不活跃池的名称或者 uuid"
 
-#: tools/virsh-pool.c:1654
+#: tools/virsh.c:9541
 #, c-format
 msgid "Pool %s started\n"
 msgstr "池 %s 已启动\n"
 
-#: tools/virsh-pool.c:1656
+#: tools/virsh.c:9544
 #, c-format
 msgid "Failed to start pool %s"
 msgstr "启动池 %s 失败"
 
-#: tools/virsh-pool.c:1669
+#: tools/virsh.c:9745
 msgid "undefine an inactive pool"
 msgstr "取消定义一个不活跃的池"
 
-#: tools/virsh-pool.c:1672
+#: tools/virsh.c:9746
 msgid "Undefine the configuration for an inactive pool."
 msgstr "取消定义一个不活跃池的配置。"
 
-#: tools/virsh-pool.c:1697
+#: tools/virsh.c:9769
 #, c-format
 msgid "Pool %s has been undefined\n"
 msgstr "池 %s 已经被取消定义\n"
 
-#: tools/virsh-pool.c:1699
+#: tools/virsh.c:9771
 #, c-format
 msgid "Failed to undefine pool %s"
 msgstr "取消定义池 %s 失败"
 
-#: tools/virsh-pool.c:1712
+#: tools/virsh.c:9784
 msgid "convert a pool name to pool UUID"
 msgstr "把一个池名称转换为池 UUID"
 
-#: tools/virsh-pool.c:1724 tools/virsh-volume.c:122 tools/virsh-volume.c:322
+#: tools/virsh.c:9563 tools/virsh.c:9790 tools/virsh.c:9827 tools/virsh.c:9884
 msgid "pool name"
 msgstr "卷名称"
 
-#: tools/virsh-pool.c:1742
+#: tools/virsh.c:9810
 msgid "failed to get pool UUID"
 msgstr "获得池 UUID 失败"
 
-#: tools/virsh-pool.c:1753
+#: tools/virsh.c:13678
 msgid "edit XML configuration for a storage pool"
 msgstr "为存储池编辑 XML 配置"
 
-#: tools/virsh-pool.c:1756
+#: tools/virsh.c:13679
 msgid "Edit the XML configuration for a storage pool."
 msgstr "为存储池编辑 XML 配置。"
 
-#: tools/virsh-pool.c:1797
+#: tools/virsh-pool.c:1752
 #, c-format
 msgid "Pool %s XML configuration not changed.\n"
 msgstr "没有更改池 %s XML 配置。\n"
 
-#: tools/virsh-pool.c:1807
+#: tools/virsh-pool.c:1762
 #, c-format
 msgid "Pool %s XML configuration edited.\n"
 msgstr "编辑了池 %s XML 配置。\n"
 
-#: tools/virsh-secret.c:65
+#: tools/virsh.c:16340
 #, c-format
 msgid "failed to get secret '%s'"
 msgstr "获取 secret '%s' 失败"
 
-#: tools/virsh-secret.c:75
+#: tools/virsh.c:10894
 msgid "define or modify a secret from an XML file"
 msgstr "定义或者修改 XML 中的 secret"
 
-#: tools/virsh-secret.c:78
+#: tools/virsh.c:10895
 msgid "Define or modify a secret."
 msgstr "定义或者修改 secret"
 
-#: tools/virsh-secret.c:87
+#: tools/virsh.c:10900
 msgid "file containing secret attributes in XML"
 msgstr "XML 中包含 secret 属性的文件"
 
-#: tools/virsh-secret.c:108
+#: tools/virsh.c:10925
 #, c-format
 msgid "Failed to set attributes from %s"
 msgstr "使用 %s 设定属性失败"
 
-#: tools/virsh-secret.c:113
+#: tools/virsh.c:10929
 msgid "Failed to get UUID of created secret"
 msgstr "获取生成的 secret 的 UUID 失败"
 
-#: tools/virsh-secret.c:117
+#: tools/virsh.c:10933
 #, c-format
 msgid "Secret %s created\n"
 msgstr "生成 secret %s\n"
 
-#: tools/virsh-secret.c:132
+#: tools/virsh.c:10942
 msgid "secret attributes in XML"
 msgstr "XML 中的 secret 属性"
 
-#: tools/virsh-secret.c:135
+#: tools/virsh.c:10943
 msgid "Output attributes of a secret as an XML dump to stdout."
 msgstr "将 secret 属性输出作为 XML 转储到标准输出。"
 
-#: tools/virsh-secret.c:144 tools/virsh-secret.c:189 tools/virsh-secret.c:257
-#: tools/virsh-secret.c:314
+#: tools/virsh.c:10948 tools/virsh.c:10988 tools/virsh.c:11048
+#: tools/virsh.c:11100
 msgid "secret UUID"
 msgstr "secret UUID"
 
-#: tools/virsh-secret.c:177
+#: tools/virsh.c:10982
 msgid "set a secret value"
 msgstr "设定 secret 值"
 
-#: tools/virsh-secret.c:180
+#: tools/virsh.c:10983
 msgid "Set a secret value."
 msgstr "设定 secret 值"
 
-#: tools/virsh-secret.c:194
+#: tools/virsh.c:10989
 msgid "base64-encoded secret value"
 msgstr "使用 base64 编码的 secret 值"
 
-#: tools/virsh-secret.c:216
+#: tools/virsh.c:11014
 msgid "Invalid base64 data"
 msgstr "无效 base64 数据"
 
-#: tools/virsh-secret.c:220 tools/virsh-secret.c:284
+#: tools/virsh.c:1436 tools/virsh.c:11018 tools/virsh.c:11077
+#: tools/virsh.c:12597 tools/virsh.c:13060
 msgid "Failed to allocate memory"
 msgstr "分配内存失败"
 
-#: tools/virsh-secret.c:229
+#: tools/virsh.c:11027
 msgid "Failed to set secret value"
 msgstr "设定 secret 值失败"
 
-#: tools/virsh-secret.c:232
+#: tools/virsh.c:11030
 msgid "Secret value set\n"
 msgstr "secret 值设定\n"
 
-#: tools/virsh-secret.c:245
+#: tools/virsh.c:11042
 msgid "Output a secret value"
 msgstr "secret 值输出"
 
-#: tools/virsh-secret.c:248
+#: tools/virsh.c:11043
 msgid "Output a secret value to stdout."
 msgstr "secret 值输出到标准输出。"
 
-#: tools/virsh-secret.c:302
+#: tools/virsh.c:11094
 msgid "undefine a secret"
 msgstr "取消定义 secret"
 
-#: tools/virsh-secret.c:305
+#: tools/virsh.c:11095
 msgid "Undefine a secret."
 msgstr "取消定义 secret。"
 
-#: tools/virsh-secret.c:331
+#: tools/virsh.c:11119
 #, c-format
 msgid "Failed to delete secret %s"
 msgstr "删除 secret %s 失败"
 
-#: tools/virsh-secret.c:334
+#: tools/virsh.c:11122
 #, c-format
 msgid "Secret %s deleted\n"
 msgstr "已删除 secret %s\n"
@@ -33543,15 +34185,15 @@
 msgid "Failed to count secrets"
 msgstr "计算 secret 失败"
 
-#: tools/virsh-secret.c:435
+#: tools/virsh.c:11150 tools/virsh.c:11157
 msgid "Failed to list secrets"
 msgstr "列出 secret 失败"
 
-#: tools/virsh-secret.c:484
+#: tools/virsh.c:11134
 msgid "list secrets"
 msgstr "列出 secret"
 
-#: tools/virsh-secret.c:487
+#: tools/virsh.c:11135
 msgid "Returns a list of secrets"
 msgstr "返回 secret 列表"
 
@@ -33571,7 +34213,7 @@
 msgid "list non-private secrets"
 msgstr "列出非专用 secret"
 
-#: tools/virsh-secret.c:535
+#: tools/virsh.c:11164
 msgid "Usage"
 msgstr "用量"
 
@@ -33579,57 +34221,57 @@
 msgid "Failed to get uuid of secret"
 msgstr "获取 secret 的 uuid 失败"
 
-#: tools/virsh-secret.c:556
+#: tools/virsh.c:11188
 msgid "Unused"
 msgstr "已使用"
 
-#: tools/virsh-snapshot.c:72
+#: tools/virsh.c:13736
 msgid "cannot halt after snapshot of transient domain"
 msgstr "无法在临时域提取快照后停止"
 
-#: tools/virsh-snapshot.c:91 tools/virsh-snapshot.c:1201
+#: tools/virsh.c:13755
 msgid "Could not get snapshot name"
 msgstr "无法获取快照名称"
 
-#: tools/virsh-snapshot.c:96
+#: tools/virsh.c:13760
 #, c-format
 msgid "Domain snapshot %s created from '%s'"
 msgstr "使用 '%s' 生成域快照 %s"
 
-#: tools/virsh-snapshot.c:98
+#: tools/virsh.c:13762
 #, c-format
 msgid "Domain snapshot %s created"
 msgstr "已生成域快照 %s"
 
-#: tools/virsh-snapshot.c:116
+#: tools/virsh.c:13779
 msgid "Create a snapshot from XML"
 msgstr "使用 XML 生成快照"
 
-#: tools/virsh-snapshot.c:119
+#: tools/virsh.c:13780
 msgid "Create a snapshot (disk and RAM) from XML"
 msgstr "使用 XML 生成快照（磁盘和 RAM）"
 
-#: tools/virsh-snapshot.c:132
+#: tools/virsh.c:13786
 msgid "domain snapshot XML"
 msgstr "域快照 XML"
 
-#: tools/virsh-snapshot.c:136
+#: tools/virsh.c:13787
 msgid "redefine metadata for existing snapshot"
 msgstr "重新定义现有快照元数据"
 
-#: tools/virsh-snapshot.c:140
+#: tools/virsh.c:13788
 msgid "with redefine, set current snapshot"
 msgstr "使用 redefice 设定当前快照"
 
-#: tools/virsh-snapshot.c:144 tools/virsh-snapshot.c:347
+#: tools/virsh.c:13789 tools/virsh.c:13919
 msgid "take snapshot but create no metadata"
 msgstr "提取快照但不生成元数据"
 
-#: tools/virsh-snapshot.c:148 tools/virsh-snapshot.c:351
+#: tools/virsh.c:13790 tools/virsh.c:13920
 msgid "halt domain after snapshot is created"
 msgstr "生成快照后停止域"
 
-#: tools/virsh-snapshot.c:152 tools/virsh-snapshot.c:355
+#: tools/virsh.c:13791 tools/virsh.c:13921
 msgid "capture disk state but not vm state"
 msgstr "捕获磁盘状态而不是 vm 状态"
 
@@ -33654,28 +34296,28 @@
 msgid "unable to parse memspec: %s"
 msgstr ""
 
-#: tools/virsh-snapshot.c:312
+#: tools/virsh.c:13903
 #, c-format
 msgid "unable to parse diskspec: %s"
 msgstr "无法解析 diskspec：%s"
 
-#: tools/virsh-snapshot.c:319
+#: tools/virsh.c:13909
 msgid "Create a snapshot from a set of args"
 msgstr "使用一组参数生成快照"
 
-#: tools/virsh-snapshot.c:322
+#: tools/virsh.c:13910
 msgid "Create a snapshot (disk and RAM) from arguments"
 msgstr "使用一组参数生成快照（磁盘和 RAM）"
 
-#: tools/virsh-snapshot.c:335
+#: tools/virsh.c:13916
 msgid "name of snapshot"
 msgstr "快照名称"
 
-#: tools/virsh-snapshot.c:339
+#: tools/virsh.c:13917
 msgid "description of snapshot"
 msgstr "快照描述"
 
-#: tools/virsh-snapshot.c:343
+#: tools/virsh.c:13918
 msgid "print XML document rather than create"
 msgstr "输出 XML 文档而不是生成 XML"
 
@@ -33683,7 +34325,7 @@
 msgid "memory attributes: [file=]name[,snapshot=type]"
 msgstr ""
 
-#: tools/virsh-snapshot.c:380
+#: tools/virsh.c:13923
 msgid "disk attributes: disk[,snapshot=type][,driver=type][,file=name]"
 msgstr "磁盘属性: disk[,snapshot=type][,driver=type][,file=name]"
 
@@ -33691,90 +34333,89 @@
 msgid "--print-xml is incompatible with --no-metadata"
 msgstr ""
 
-#: tools/virsh-snapshot.c:485
+#: tools/virsh.c:14016
 #, c-format
 msgid "--%s and --current are mutually exclusive"
 msgstr "--%s 和 --current 互斥"
 
-#: tools/virsh-snapshot.c:494
+#: tools/virsh.c:14025
 #, c-format
 msgid "--%s or --current is required"
 msgstr "需要 --%s 或者 --current"
 
-#: tools/virsh-snapshot.c:511
+#: tools/virsh.c:14041
 msgid "edit XML for a snapshot"
 msgstr "编辑快照 XML"
 
-#: tools/virsh-snapshot.c:514
+#: tools/virsh.c:14042
 msgid "Edit the domain snapshot XML for a named snapshot"
 msgstr "为命名快照编辑域快照 XML"
 
-#: tools/virsh-snapshot.c:527 tools/virsh-snapshot.c:885
-#: tools/virsh-snapshot.c:1707 tools/virsh-snapshot.c:1842
-#: tools/virsh-snapshot.c:1935
+#: tools/virsh.c:14048 tools/virsh.c:14723 tools/virsh.c:14842
+#: tools/virsh.c:14916
 msgid "snapshot name"
 msgstr "快照名称"
 
-#: tools/virsh-snapshot.c:531
+#: tools/virsh.c:14049
 msgid "also set edited snapshot as current"
 msgstr "也将编辑的快照设定为 current"
 
-#: tools/virsh-snapshot.c:535
+#: tools/virsh.c:14050
 msgid "allow renaming an existing snapshot"
 msgstr "允许对现有快照创新命名"
 
-#: tools/virsh-snapshot.c:539
+#: tools/virsh.c:14051
 msgid "allow cloning to new name"
 msgstr "允许克隆为新名称"
 
-#: tools/virsh-snapshot.c:577
+#: tools/virsh.c:14120
 #, c-format
 msgid "Snapshot %s XML configuration not changed.\n"
 msgstr "没有更改快照 %s XML 配置。\n"
 
-#: tools/virsh-snapshot.c:593
+#: tools/virsh.c:14135
 #, c-format
 msgid "Snapshot %s edited.\n"
 msgstr "已编辑快照 %s。\n"
 
-#: tools/virsh-snapshot.c:595
+#: tools/virsh.c:14137
 #, c-format
 msgid "Snapshot %s cloned to %s.\n"
 msgstr "克隆为 %s 的快照 %s\n"
 
-#: tools/virsh-snapshot.c:604
+#: tools/virsh.c:14146
 #, c-format
 msgid "Failed to clean up %s"
 msgstr "清除 %s 失败"
 
-#: tools/virsh-snapshot.c:609
+#: tools/virsh.c:14151
 #, c-format
 msgid "Must use --rename or --clone to change %s to %s"
 msgstr "必须红烧鱼 --rename 或者 --clone 将 %s 改为 %s"
 
-#: tools/virsh-snapshot.c:633 tools/virsh-snapshot.c:636
+#: tools/virsh.c:14179 tools/virsh.c:14180
 msgid "Get or set the current snapshot"
 msgstr "获取或者设定当前快照"
 
-#: tools/virsh-snapshot.c:649
+#: tools/virsh.c:14186
 msgid "list the name, rather than the full xml"
 msgstr "列出名称儿不是完整 xml"
 
-#: tools/virsh-snapshot.c:657
+#: tools/virsh.c:14190
 msgid "name of existing snapshot to make current"
 msgstr "要设定为 current 的当前快照名称"
 
-#: tools/virsh-snapshot.c:705
+#: tools/virsh.c:14243
 #, c-format
 msgid "Snapshot %s set as current"
 msgstr "已将快照 %s 设定为 current"
 
-#: tools/virsh-snapshot.c:714
+#: tools/virsh.c:14252
 #, c-format
 msgid "domain '%s' has no current snapshot"
 msgstr "域 '%s' 无当前快照"
 
-#: tools/virsh-snapshot.c:795
+#: tools/virsh.c:14335
 msgid "unable to determine if snapshot has parent"
 msgstr "无法确定快照是否有上级"
 
@@ -33838,28 +34479,28 @@
 msgid "failed to collect snapshot list"
 msgstr "收集快照列表失败"
 
-#: tools/virsh-snapshot.c:1319
+#: tools/virsh.c:14586
 #, c-format
 msgid "snapshot %s disappeared from list"
 msgstr "快照 %s 从列表中消失"
 
-#: tools/virsh-snapshot.c:1426
+#: tools/virsh.c:14352
 msgid "List snapshots for a domain"
 msgstr "为域列出快照"
 
-#: tools/virsh-snapshot.c:1429
+#: tools/virsh.c:14353
 msgid "Snapshot List"
 msgstr "快照列表"
 
-#: tools/virsh-snapshot.c:1442
+#: tools/virsh.c:14359
 msgid "add a column showing parent snapshot"
 msgstr "添加一列显示上级快照"
 
-#: tools/virsh-snapshot.c:1446
+#: tools/virsh.c:14360
 msgid "list only snapshots without parents"
 msgstr "只列出快照不列出其上级"
 
-#: tools/virsh-snapshot.c:1450
+#: tools/virsh.c:14361
 msgid "list only snapshots without children"
 msgstr "列出没有下级的快照"
 
@@ -33867,7 +34508,7 @@
 msgid "list only snapshots that are not leaves (with children)"
 msgstr "只列出不离开（下级）的快照"
 
-#: tools/virsh-snapshot.c:1458
+#: tools/virsh.c:14363
 msgid "list only snapshots that have metadata that would prevent undefine"
 msgstr "只列出可防止取消定义的元数据的快照"
 
@@ -33895,19 +34536,19 @@
 msgid "filter by external snapshots"
 msgstr ""
 
-#: tools/virsh-snapshot.c:1486
+#: tools/virsh.c:14364
 msgid "list snapshots in a tree"
 msgstr "列出树中的快照"
 
-#: tools/virsh-snapshot.c:1490
+#: tools/virsh.c:14365
 msgid "limit list to children of given snapshot"
 msgstr "将列表限制为给定快照的下级"
 
-#: tools/virsh-snapshot.c:1494
+#: tools/virsh.c:14367
 msgid "limit list to children of current snapshot"
 msgstr "将列表限制为当前快照的下级"
 
-#: tools/virsh-snapshot.c:1498
+#: tools/virsh.c:14368
 msgid "with --from, list all descendants"
 msgstr "使用 --from 列出所有下级"
 
@@ -33924,129 +34565,129 @@
 msgid "--descendants requires either --from or --current"
 msgstr "--descendants 需要 --from 或者 --current"
 
-#: tools/virsh-snapshot.c:1595 tools/virsh-snapshot.c:1599
+#: tools/virsh.c:14496 tools/virsh.c:14500
 msgid "Creation Time"
 msgstr "生成时间"
 
-#: tools/virsh-snapshot.c:1596
+#: tools/virsh.c:14497
 msgid "Parent"
 msgstr "上级"
 
-#: tools/virsh-snapshot.c:1654
+#: tools/virsh.c:14671
 msgid "time_t overflow"
 msgstr "time_t 溢出"
 
-#: tools/virsh-snapshot.c:1690
+#: tools/virsh.c:14716
 msgid "Dump XML for a domain snapshot"
 msgstr "为域快照转储 XML"
 
-#: tools/virsh-snapshot.c:1693
+#: tools/virsh.c:14717
 msgid "Snapshot Dump XML"
 msgstr "快照转储 XML"
 
-#: tools/virsh-snapshot.c:1758
+#: tools/virsh.c:14778
 msgid "Get the name of the parent of a snapshot"
 msgstr "获取快照的上级快照名称"
 
-#: tools/virsh-snapshot.c:1761
+#: tools/virsh.c:14779
 msgid "Extract the snapshot's parent, if any"
 msgstr "如果有则提取快照上级"
 
-#: tools/virsh-snapshot.c:1774
+#: tools/virsh.c:14785
 msgid "find parent of snapshot name"
 msgstr "查找快照名称上级"
 
-#: tools/virsh-snapshot.c:1778
+#: tools/virsh.c:14786
 msgid "find parent of current snapshot"
 msgstr "查找当前快照名称上级"
 
-#: tools/virsh-snapshot.c:1803
+#: tools/virsh.c:14813
 #, c-format
 msgid "snapshot '%s' has no parent"
 msgstr "快照 '%s' 没有上级"
 
-#: tools/virsh-snapshot.c:1826
+#: tools/virsh.c:14835
 msgid "Revert a domain to a snapshot"
 msgstr "将域转换为快照"
 
-#: tools/virsh-snapshot.c:1829
+#: tools/virsh.c:14836
 msgid "Revert domain to snapshot"
 msgstr "将域转换为快照"
 
-#: tools/virsh-snapshot.c:1846
+#: tools/virsh.c:14843
 msgid "revert to current snapshot"
 msgstr "转换为当前快照"
 
-#: tools/virsh-snapshot.c:1850
+#: tools/virsh.c:14844
 msgid "after reverting, change state to running"
 msgstr "转换后将状态改为 running"
 
-#: tools/virsh-snapshot.c:1854
+#: tools/virsh.c:14845
 msgid "after reverting, change state to paused"
 msgstr "转换后将状态改为 paused"
 
-#: tools/virsh-snapshot.c:1858
+#: tools/virsh.c:14846
 msgid "try harder on risky reverts"
 msgstr "更努力地尝试有风险的转换"
 
-#: tools/virsh-snapshot.c:1919
+#: tools/virsh.c:14909
 msgid "Delete a domain snapshot"
 msgstr "删除域快照"
 
-#: tools/virsh-snapshot.c:1922
+#: tools/virsh.c:14910
 msgid "Snapshot Delete"
 msgstr "删除快照"
 
-#: tools/virsh-snapshot.c:1939
+#: tools/virsh.c:14917
 msgid "delete current snapshot"
 msgstr "删除当前快照"
 
-#: tools/virsh-snapshot.c:1943
+#: tools/virsh.c:14918
 msgid "delete snapshot and all children"
 msgstr "删除快照及所有子快照"
 
-#: tools/virsh-snapshot.c:1947
+#: tools/virsh.c:14919
 msgid "delete children but not snapshot"
 msgstr "删除子快照而不是快照本身"
 
-#: tools/virsh-snapshot.c:1951
+#: tools/virsh.c:14921
 msgid "delete only libvirt metadata, leaving snapshot contents behind"
 msgstr "只删除 libvirt 元数据，留下快照内容。"
 
-#: tools/virsh-snapshot.c:1985
+#: tools/virsh.c:14957
 #, c-format
 msgid "Domain snapshot %s children deleted\n"
 msgstr "已删除域快照 %s 子快照\n"
 
-#: tools/virsh-snapshot.c:1987
+#: tools/virsh.c:14959
 #, c-format
 msgid "Domain snapshot %s deleted\n"
 msgstr "已删除域快照 %s\n"
 
-#: tools/virsh-snapshot.c:1989
+#: tools/virsh.c:14961
 #, c-format
 msgid "Failed to delete snapshot %s"
 msgstr "删除快照失败：%s"
 
-#: tools/virsh-volume.c:93 tools/virsh-volume.c:256
+#: tools/virsh.c:9692 tools/virsh.c:16306
 #, c-format
 msgid "failed to get vol '%s'"
 msgstr "获得卷 '%s' 失败"
 
-#: tools/virsh-volume.c:95
+#: tools/virsh.c:16308
 #, c-format
 msgid "failed to get vol '%s', specifying --%s might help"
 msgstr "获取卷 '%s' 失败，指定 --%s 可能有帮助"
 
-#: tools/virsh-volume.c:110
+#: tools/virsh.c:9557
 msgid "create a volume from a set of args"
 msgstr "从一组变量中创建卷"
 
-#: tools/virsh-volume.c:113 tools/virsh-volume.c:313
+#: tools/virsh.c:9558 tools/virsh.c:9822
 msgid "Create a vol."
 msgstr "创建一个卷。"
 
-#: tools/virsh-volume.c:127
+#: tools/virsh.c:9564
 msgid "name of the volume"
 msgstr "卷的名称"
 
@@ -34062,11 +34703,11 @@
 msgid "file format type raw,bochs,qcow,qcow2,qed,vmdk"
 msgstr "文件格式类型 raw,bochs,qcow,qcow2,qed,vmdk"
 
-#: tools/virsh-volume.c:144
+#: tools/virsh.c:9568
 msgid "the backing volume if taking a snapshot"
 msgstr "提取快照时的后端卷"
 
-#: tools/virsh-volume.c:148
+#: tools/virsh.c:9569
 msgid "format of backing volume if taking a snapshot"
 msgstr "提取快照时的后端卷格式"
 
@@ -34075,90 +34716,90 @@
 msgid "preallocate metadata (for qcow2 instead of full allocation)"
 msgstr ""
 
-#: tools/virsh-volume.c:190 tools/virsh-volume.c:196 tools/virsh-volume.c:1112
+#: tools/virsh.c:9628 tools/virsh.c:9632
 #, c-format
 msgid "Malformed size %s"
 msgstr "畸形的大小 %s"
 
-#: tools/virsh-volume.c:291
+#: tools/virsh.c:9726
 #, c-format
 msgid "Vol %s created\n"
 msgstr "创建卷 %s\n"
 
-#: tools/virsh-volume.c:295
+#: tools/virsh.c:9730
 #, c-format
 msgid "Failed to create vol %s"
 msgstr "创建卷 %s 失败"
 
-#: tools/virsh-volume.c:310
+#: tools/virsh.c:9821
 msgid "create a vol from an XML file"
 msgstr "从一个 XML 文件创建一个卷"
 
-#: tools/virsh-volume.c:327 tools/virsh-volume.c:396
+#: tools/virsh.c:9828 tools/virsh.c:9885
 msgid "file containing an XML vol description"
 msgstr "包含 XML 卷描述的文件"
 
-#: tools/virsh-volume.c:360
+#: tools/virsh.c:9864
 #, c-format
 msgid "Vol %s created from %s\n"
 msgstr "在 %s 中创建卷 %s\n"
 
-#: tools/virsh-volume.c:365 tools/virsh-volume.c:447
+#: tools/virsh.c:9868 tools/virsh.c:9924
 #, c-format
 msgid "Failed to create vol from %s"
 msgstr "在 %s 中创建卷失败"
 
-#: tools/virsh-volume.c:379
+#: tools/virsh.c:9878
 msgid "create a vol, using another volume as input"
 msgstr "生成卷，使用另一个卷作为输入。"
 
-#: tools/virsh-volume.c:382
+#: tools/virsh.c:9879
 msgid "Create a vol from an existing volume."
 msgstr "为现有卷生成卷"
 
-#: tools/virsh-volume.c:401
+#: tools/virsh.c:9886
 msgid "input vol name or key"
 msgstr "输入卷名称或者密钥"
 
-#: tools/virsh-volume.c:405
+#: tools/virsh.c:9887
 msgid "pool name or uuid of the input volume's pool"
 msgstr "输入卷的池的池名称或者 uuid"
 
-#: tools/virsh-volume.c:444
+#: tools/virsh.c:9921
 #, c-format
 msgid "Vol %s created from input vol %s\n"
 msgstr "使用输入卷 %s 生成的卷 %s\n"
 
-#: tools/virsh-volume.c:473
+#: tools/virsh.c:9950
 msgid "(volume_definition)"
 msgstr "(volume_definition)"
 
-#: tools/virsh-volume.c:497
+#: tools/virsh.c:9973
 msgid "clone a volume."
 msgstr "克隆卷。"
 
-#: tools/virsh-volume.c:500
+#: tools/virsh.c:9974
 msgid "Clone an existing volume."
 msgstr "克隆现有卷。"
 
-#: tools/virsh-volume.c:509
+#: tools/virsh.c:9979
 msgid "orig vol name or key"
 msgstr "原始卷名称或者密钥"
 
-#: tools/virsh-volume.c:514
+#: tools/virsh.c:9980
 msgid "clone name"
 msgstr "克隆名称"
 
-#: tools/virsh-volume.c:546 tools/virsh-volume.c:1657
+#: tools/virsh.c:10003 tools/virsh.c:10795
 msgid "failed to get parent pool"
 msgstr "获取上级池失败"
 
-#: tools/virsh-volume.c:566
+#: tools/virsh.c:10023
 #, c-format
 msgid "Vol %s cloned from %s\n"
 msgstr "使用 %s 克隆的卷 %s\n"
 
-#: tools/virsh-volume.c:569
+#: tools/virsh.c:10026
 #, c-format
 msgid "Failed to clone vol from %s"
 msgstr "使用 %s 克隆卷失败"
@@ -34171,21 +34812,21 @@
 msgid "Upload file contents to a volume"
 msgstr ""
 
-#: tools/virsh-volume.c:605 tools/virsh-volume.c:723 tools/virsh-volume.c:839
-#: tools/virsh-volume.c:887 tools/virsh-volume.c:991 tools/virsh-volume.c:1049
-#: tools/virsh-volume.c:1152
+#: tools/virsh.c:10056 tools/virsh.c:10156 tools/virsh.c:10253
+#: tools/virsh.c:10294 tools/virsh.c:10335 tools/virsh.c:10399
 msgid "vol name, key or path"
 msgstr "卷名称、密钥或者路径"
 
-#: tools/virsh-volume.c:610 tools/virsh-volume.c:728 tools/virsh-volume.c:952
+#: tools/virsh.c:10057 tools/virsh.c:10157 tools/virsh.c:10360
+#: tools/virsh.c:10530
 msgid "file"
 msgstr "文件"
 
-#: tools/virsh-volume.c:618
+#: tools/virsh.c:10059
 msgid "volume offset to upload to"
 msgstr "要上传的卷偏移"
 
-#: tools/virsh-volume.c:622
+#: tools/virsh.c:10060
 msgid "amount of data to upload"
 msgstr "要上传的数据量"
 
@@ -34193,17 +34834,17 @@
 msgid "cannot create a new stream"
 msgstr ""
 
-#: tools/virsh-volume.c:675
+#: tools/virsh.c:10113
 #, c-format
 msgid "cannot upload to volume %s"
 msgstr "无法上传卷 %s"
 
-#: tools/virsh-volume.c:680
+#: tools/virsh.c:10118
 #, c-format
 msgid "cannot send data to volume %s"
 msgstr "无法向卷 %s 发送数据"
 
-#: tools/virsh-volume.c:691 tools/virsh-volume.c:805
+#: tools/virsh.c:10129 tools/virsh.c:10225
 #, c-format
 msgid "cannot close volume %s"
 msgstr "无法关闭卷 %s"
@@ -34216,52 +34857,52 @@
 msgid "Download volume contents to a file"
 msgstr ""
 
-#: tools/virsh-volume.c:736
+#: tools/virsh.c:10159
 msgid "volume offset to download from"
 msgstr "要下载的卷偏移"
 
-#: tools/virsh-volume.c:740
+#: tools/virsh.c:10160
 msgid "amount of data to download"
 msgstr "要下载的数据量"
 
-#: tools/virsh-volume.c:776
+#: tools/virsh.c:10200
 #, c-format
 msgid "cannot create %s"
 msgstr "无法生成 %s"
 
-#: tools/virsh-volume.c:789
+#: tools/virsh.c:10209
 #, c-format
 msgid "cannot download from volume %s"
 msgstr "无法从卷 %s 中下载"
 
-#: tools/virsh-volume.c:794
+#: tools/virsh.c:10214
 #, c-format
 msgid "cannot receive data from volume %s"
 msgstr "无法从卷 %s 中检索数据"
 
-#: tools/virsh-volume.c:827
+#: tools/virsh.c:10247
 msgid "delete a vol"
 msgstr "删除卷"
 
-#: tools/virsh-volume.c:830
+#: tools/virsh.c:10248
 msgid "Delete a given vol."
 msgstr "删除一个给定的卷。"
 
-#: tools/virsh-volume.c:860
+#: tools/virsh.c:10273
 #, c-format
 msgid "Vol %s deleted\n"
 msgstr "卷 %s 被删除\n"
 
-#: tools/virsh-volume.c:862
+#: tools/virsh.c:10275
 #, c-format
 msgid "Failed to delete vol %s"
 msgstr "删除卷 %s 失败"
 
-#: tools/virsh-volume.c:875
+#: tools/virsh.c:10288
 msgid "wipe a vol"
 msgstr "擦除卷"
 
-#: tools/virsh-volume.c:878
+#: tools/virsh.c:10289
 msgid "Ensure data previously on a volume is not accessible to future reads"
 msgstr "保证之前位于卷中的数据今后无法读取"
 
@@ -34274,154 +34915,154 @@
 msgid "Unsupported algorithm '%s'"
 msgstr "不支持的算法 '%s'"
 
-#: tools/virsh-volume.c:935
+#: tools/virsh.c:10316
 #, c-format
 msgid "Failed to wipe vol %s"
 msgstr "擦除卷 %s 失败"
 
-#: tools/virsh-volume.c:939
+#: tools/virsh.c:10314
 #, c-format
 msgid "Vol %s wiped\n"
 msgstr "擦除卷 %s\n"
 
-#: tools/virsh-volume.c:955
+#: tools/virsh.c:10364 tools/virsh.c:10533
 msgid "block"
 msgstr "块"
 
-#: tools/virsh-volume.c:958
+#: tools/virsh.c:10368 tools/virsh.c:10536
 msgid "dir"
 msgstr "dir"
 
-#: tools/virsh-volume.c:961
+#: tools/virsh-volume.c:953
 msgid "network"
 msgstr "网络"
 
-#: tools/virsh-volume.c:964
+#: tools/virsh-volume.c:954
 msgid "netdir"
 msgstr ""
 
-#: tools/virsh-volume.c:979
+#: tools/virsh.c:10329
 msgid "storage vol information"
 msgstr "存储卷信息"
 
-#: tools/virsh-volume.c:982
+#: tools/virsh.c:10330
 msgid "Returns basic information about the storage vol."
 msgstr "返回关于这个存储卷的基本信息。"
 
-#: tools/virsh-volume.c:1016
+#: tools/virsh.c:10360 tools/virsh.c:10364 tools/virsh.c:10368
+#: tools/virsh.c:10372
 msgid "Type:"
 msgstr "类型："
 
-#: tools/virsh-volume.c:1037
+#: tools/virsh-volume.c:1027
 msgid "resize a vol"
 msgstr "创新定义卷大小"
 
-#: tools/virsh-volume.c:1040
+#: tools/virsh-volume.c:1030
 msgid "Resizes a storage volume."
 msgstr "创新定义存储卷大小。"
 
-#: tools/virsh-volume.c:1054
+#: tools/virsh-volume.c:1044
 msgid "new capacity for the vol, as scaled integer (default bytes)"
 msgstr "卷的新大小，以整数计（默认为 KiB）"
 
-#: tools/virsh-volume.c:1062
+#: tools/virsh-volume.c:1052
 msgid "allocate the new capacity, rather than leaving it sparse"
 msgstr "分配新容量而不是稀释它"
 
-#: tools/virsh-volume.c:1066
+#: tools/virsh-volume.c:1056
 msgid "use capacity as a delta to current size, rather than the new size"
 msgstr "在当前大小中使用容量作为 delta，而不是使用新大小。"
 
-#: tools/virsh-volume.c:1070
+#: tools/virsh-volume.c:1060
 msgid "allow the resize to shrink the volume"
 msgstr "允许创新定义大小来缩小卷"
 
-#: tools/virsh-volume.c:1107
+#: tools/virsh-volume.c:1097
 msgid "negative size requires --delta and --shrink"
 msgstr "负数大小需要 --delta 和 --shrink"
 
-#: tools/virsh-volume.c:1118
+#: tools/virsh-volume.c:1108
 #, c-format
 msgid "Size of volume '%s' successfully changed by %s\n"
 msgstr "%s 成功更改卷 '%s' 大小\n"
 
-#: tools/virsh-volume.c:1119
+#: tools/virsh-volume.c:1109
 #, c-format
 msgid "Size of volume '%s' successfully changed to %s\n"
 msgstr "成功将卷 '%s' 大小改为 %s\n"
 
-#: tools/virsh-volume.c:1124
+#: tools/virsh-volume.c:1114
 #, c-format
 msgid "Failed to change size of volume '%s' by %s\n"
 msgstr "%s 更改卷 '%s' 大小失败\n"
 
-#: tools/virsh-volume.c:1125
+#: tools/virsh-volume.c:1115
 #, c-format
 msgid "Failed to change size of volume '%s' to %s\n"
 msgstr "将卷 '%s' 大小改为 %s 失败\n"
 
-#: tools/virsh-volume.c:1140
+#: tools/virsh.c:10393
 msgid "vol information in XML"
 msgstr "XML 中的卷信息"
 
-#: tools/virsh-volume.c:1143
+#: tools/virsh.c:10394
 msgid "Output the vol information as an XML dump to stdout."
 msgstr "将卷信息作为一个 XML 转储输出到 stdout。"
 
-#: tools/virsh-volume.c:1247
+#: tools/virsh-volume.c:1237
 msgid "Failed to list volumes"
 msgstr "列出卷失败"
 
-#: tools/virsh-volume.c:1256 tools/virsh-volume.c:1268
+#: tools/virsh.c:10482
 msgid "Failed to list storage volumes"
 msgstr "列出存储卷失败"
 
-#: tools/virsh-volume.c:1314
+#: tools/virsh.c:10434
 msgid "list vols"
 msgstr "列出卷"
 
-#: tools/virsh-volume.c:1317
+#: tools/virsh.c:10435
 msgid "Returns list of vols by pool."
 msgstr "根据池返回卷列表"
 
-#: tools/virsh-volume.c:1330
+#: tools/virsh.c:10441
 msgid "display extended details for volumes"
 msgstr "显示卷的扩展详情"
 
-#: tools/virsh-volume.c:1454 tools/virsh-volume.c:1475
-#: tools/virsh-volume.c:1520
+#: tools/virsh.c:10604 tools/virsh.c:10624 tools/virsh.c:10669
 msgid "Path"
 msgstr "路径"
 
-#: tools/virsh-volume.c:1584
+#: tools/virsh.c:10732
 msgid "returns the volume name for a given volume key or path"
 msgstr "为给定密钥或者路径返回卷名"
 
-#: tools/virsh-volume.c:1596 tools/virsh-volume.c:1636
+#: tools/virsh.c:10738 tools/virsh.c:10771
 msgid "volume key or path"
 msgstr "卷密钥或者路径"
 
-#: tools/virsh-volume.c:1620
+#: tools/virsh.c:10764
 msgid "returns the storage pool for a given volume key or path"
 msgstr "为给定密钥或者路径返回存储池"
 
-#: tools/virsh-volume.c:1631
+#: tools/virsh.c:10770
 msgid "return the pool uuid rather than pool name"
 msgstr "返回池 uuid 而不是池名称"
 
-#: tools/virsh-volume.c:1683
+#: tools/virsh.c:10821
 msgid "returns the volume key for a given volume name or path"
 msgstr "为给定密钥或者路径返回卷密钥"
 
-#: tools/virsh-volume.c:1695
+#: tools/virsh.c:10827
 msgid "volume name or path"
 msgstr "卷名或者路径"
 
-#: tools/virsh-volume.c:1722
+#: tools/virsh.c:10854
 msgid "returns the volume path for a given volume name or key"
 msgstr "为给定密钥或者路径返回卷路径"
 
-#: tools/virsh-volume.c:1734
+#: tools/virsh.c:10860
 msgid "volume name or key"
 msgstr "卷名称或者密钥"
 
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/libvisual-0.4.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/libvisual-0.4.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/libvisual-0.4.po	2014-02-24 08:24:38.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/libvisual-0.4.po	2014-03-24 09:42:45.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:27+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:47+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: libvisual/lv_libvisual.c:137
 msgid "Show info for"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/libvisual-plugins-0.4.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/libvisual-plugins-0.4.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/libvisual-plugins-0.4.po	2014-02-24 08:24:38.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/libvisual-plugins-0.4.po	2014-03-24 09:42:45.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:27+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:47+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: plugins/actor/bumpscope/actor_bumpscope.c:62
 msgid ""
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/lightdm.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/lightdm.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/lightdm.po	2014-02-24 08:24:46.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/lightdm.po	2014-03-24 09:42:53.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: lightdm\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-02-17 14:49+0000\n"
+"POT-Creation-Date: 2014-03-17 04:43+0000\n"
 "PO-Revision-Date: 2012-09-17 13:09+0000\n"
 "Last-Translator: 朱涛 <bill_zt@sina.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:32+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 14:08+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: ../debian/guest-session-auto.sh:22
 msgid "Temporary Guest Session"
@@ -36,52 +36,52 @@
 msgstr ""
 
 #. Help string for command line --config flag
-#: ../src/lightdm.c:995
+#: ../src/lightdm.c:997
 msgid "Use configuration file"
 msgstr "使用配置文件"
 
 #. Help string for command line --debug flag
-#: ../src/lightdm.c:998
+#: ../src/lightdm.c:1000
 msgid "Print debugging messages"
 msgstr "打印调试信息"
 
 #. Help string for command line --test-mode flag
-#: ../src/lightdm.c:1001
+#: ../src/lightdm.c:1003
 msgid "Run as unprivileged user, skipping things that require root access"
 msgstr "以非特权用户运行，跳过需要 root 权限的操作"
 
 #. Help string for command line --pid-file flag
-#: ../src/lightdm.c:1004
+#: ../src/lightdm.c:1006
 msgid "File to write PID into"
 msgstr "要写入 PID 的文件"
 
 #. Help string for command line --log-dir flag
-#: ../src/lightdm.c:1007
+#: ../src/lightdm.c:1009
 msgid "Directory to write logs to"
 msgstr "写入日志的目录"
 
 #. Help string for command line --run-dir flag
-#: ../src/lightdm.c:1010
+#: ../src/lightdm.c:1012
 msgid "Directory to store running state"
 msgstr "存储运行状态的目录"
 
 #. Help string for command line --cache-dir flag
-#: ../src/lightdm.c:1013
+#: ../src/lightdm.c:1015
 msgid "Directory to cache information"
 msgstr "用于缓存信息的目录"
 
 #. Help string for command line --version flag
-#: ../src/lightdm.c:1016
+#: ../src/lightdm.c:1018
 msgid "Show release version"
 msgstr "显示版本信息"
 
 #. Arguments and description for --help test
-#: ../src/lightdm.c:1035
+#: ../src/lightdm.c:1037
 msgid "- Display Manager"
 msgstr "- 显示管理器"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/lightdm.c:1045
+#: ../src/lightdm.c:1047
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "运行“%s --help”来查看可用命令行选项的完整列表。"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/Linux-PAM.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/Linux-PAM.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/Linux-PAM.po	2014-02-24 08:24:32.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/Linux-PAM.po	2014-03-24 09:42:39.000000000 +0000
@@ -19,8 +19,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:39+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 11:51+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: libpam_misc/misc_conv.c:33
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/ltsp-live.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/ltsp-live.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/ltsp-live.po	2014-02-24 08:24:38.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/ltsp-live.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,123 +0,0 @@
-# Chinese (Simplified) translation for ltsp
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the ltsp package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: ltsp\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-18 13:50-0400\n"
-"PO-Revision-Date: 2013-09-26 19:54+0000\n"
-"Last-Translator: snowdream <yanghui1986527@gmail.com>\n"
-"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-12 14:57+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
-"Language: \n"
-
-#: ../ltsp-live:45
-msgid "Unable to parse config"
-msgstr "无法分析配置"
-
-#: ../ltsp-live:111
-msgid "Restarting Network Manager"
-msgstr ""
-
-#: ../ltsp-live:119
-msgid "Adding LTSP network to Network Manager"
-msgstr ""
-
-#: ../ltsp-live:124
-msgid "Enabling LTSP network in Network Manager"
-msgstr ""
-
-#: ../ltsp-live:127 ../ltsp-live:363
-msgid "Failed"
-msgstr ""
-
-#: ../ltsp-live:131
-msgid "Installing the required packages"
-msgstr ""
-
-#: ../ltsp-live:139
-msgid "Starting OpenSSH server"
-msgstr ""
-
-#: ../ltsp-live:151
-msgid "Restarting openbsd-inetd"
-msgstr ""
-
-#: ../ltsp-live:158
-msgid "Configuring LTSP"
-msgstr ""
-
-#: ../ltsp-live:189
-msgid "Creating the guest users"
-msgstr ""
-
-#: ../ltsp-live:203
-msgid "Configuring DNSmasq"
-msgstr ""
-
-#: ../ltsp-live:222
-msgid "Starting DNSmasq"
-msgstr ""
-
-#: ../ltsp-live:229
-msgid "Extracting thin client kernel and initrd"
-msgstr ""
-
-#: ../ltsp-live:255
-msgid "Starting NBD server"
-msgstr ""
-
-#: ../ltsp-live:261 ../ltsp-live:353
-msgid "Ready"
-msgstr ""
-
-#: ../ltsp-live:316
-msgid "None"
-msgstr "无"
-
-#: ../ltsp-live:358
-msgid "LTSP-Live should now be ready to use!"
-msgstr ""
-
-#: ../ltsp-live:368
-msgid "Unable to configure Network Manager"
-msgstr ""
-
-#: ../ltsp-live:388
-msgid ""
-"The selected network interface is already in use.\n"
-"Are you sure you want to use it?"
-msgstr "被选中的网络接口正在使用中。"
-
-#: ../ltsp-live.xml:6
-msgid "LTSP-Live configuration"
-msgstr "LTSP-Live 配置"
-
-#: ../ltsp-live.xml:21
-msgid ""
-"Welcome to LTSP Live.\n"
-"Please choose a network interface below and click OK."
-msgstr "欢迎来到 LTSP 直播。"
-
-#: ../ltsp-live.xml:41
-msgid "Network devices"
-msgstr "网络设备"
-
-#: ../ltsp-live.xml:86
-msgid "Status"
-msgstr ""
-
-#: ../ltsp-live.desktop
-msgid "Start LTSP-Live"
-msgstr ""
-
-#: ../ltsp-live.desktop
-msgid "Starts an LTSP server from the live CD"
-msgstr ""
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/ltsp-login.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/ltsp-login.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/ltsp-login.po	2014-02-24 08:24:38.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/ltsp-login.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-# Simplified Chinese translation for ltsp
-# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the ltsp package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: ltsp\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2008-03-07 14:47+0200\n"
-"PO-Revision-Date: 2009-09-24 17:07+0000\n"
-"Last-Translator: Tao Wei <weitao1979@gmail.com>\n"
-"Language-Team: Simplified Chinese <zh_CN@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-12 12:53+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
-
-#: ltsp-login.sh:17
-#, sh-format
-msgid "Login Error"
-msgstr "登录错误"
-
-#: ltsp-login.sh:20 ltsp-login.sh:28
-#, sh-format
-msgid "Continue"
-msgstr "继续"
-
-#: ltsp-login.sh:21
-#, sh-format
-msgid "Cancel"
-msgstr "取消"
-
-#: ltsp-login.sh:22 ltsp-login.sh:29
-#, sh-format
-msgid "User"
-msgstr "用户"
-
-#: ltsp-login.sh:22 ltsp-login.sh:29
-#, sh-format
-msgid "already logged in!"
-msgstr "已经登录了！"
-
-#: ltsp-login.sh:25
-#, sh-format
-msgid "Login Warning"
-msgstr "登录警告"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/ltsp.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/ltsp.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/ltsp.po	2014-02-24 08:24:38.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/ltsp.po	2014-03-24 09:42:44.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ltsp 5.2.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-17 14:48+0000\n"
+"POT-Creation-Date: 2014-03-14 13:45+0000\n"
 "PO-Revision-Date: 2010-08-01 02:42+0000\n"
 "Last-Translator: YunQiang Su <wzssyqa@gmail.com>\n"
 "Language-Team: Chinese (simplified) <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:19+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:38+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: ../server/ALTLinux/configs/ltsp-login.sh:30
@@ -531,6 +531,12 @@
 "to disk"
 msgstr ""
 
+#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3
+#: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4
+#, sh-format
+msgid "set the update mirror location"
+msgstr "设置升级镜像的地址"
+
 #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/040-copy-package-lists:3
 #, sh-format
 msgid "copy apt Packages files from server"
@@ -549,8 +555,9 @@
 
 #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-distribution-specific:5
 #, sh-format
-msgid "NOTE: disabling security APT source for sid.  It does not exist."
-msgstr "注意：将禁用 sid 的安全 apt 源，因为其不存在。"
+msgid ""
+"NOTE: disabling security and updates APT sources for sid.  They do not exist."
+msgstr ""
 
 #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/015-sources-list:3
 #, sh-format
@@ -577,11 +584,6 @@
 msgid "set the security mirror location"
 msgstr "设置安全镜像的地址"
 
-#: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4
-#, sh-format
-msgid "set the update mirror location"
-msgstr "设置升级镜像的地址"
-
 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/095-update-image:3
 #, sh-format
 msgid "force to skip the squashfs build (for debian-installer)"
@@ -614,32 +616,37 @@
 msgid "display help for all available commandline options"
 msgstr "显示所有可用的命令行选项的帮助。"
 
-#: ../server/ltsp-build-client:194
+#: ../server/ltsp-build-client:191
+#, sh-format
+msgid "output version information and exit"
+msgstr ""
+
+#: ../server/ltsp-build-client:195
 #, sh-format
 msgid "LTSP Build Client usage:"
 msgstr "LTSP 构建客户端用法："
 
-#: ../server/ltsp-build-client:200
+#: ../server/ltsp-build-client:201
 #, sh-format
 msgid "  Regular options:"
 msgstr "  常规选项："
 
-#: ../server/ltsp-build-client:204
+#: ../server/ltsp-build-client:205
 #, sh-format
 msgid "  Advanced options:"
 msgstr "  高级选项："
 
-#: ../server/ltsp-build-client:216
+#: ../server/ltsp-build-client:217
 #, sh-format
 msgid "info: LTSP client installation completed successfully"
 msgstr "通知：LTSP 客户端安装成功完成"
 
-#: ../server/ltsp-build-client:218
+#: ../server/ltsp-build-client:219
 #, sh-format
 msgid "error: LTSP client installation ended abnormally"
 msgstr "错误：LTSP 客户端安装非正常结束"
 
-#: ../common/ltsp-common-functions:182
+#: ../common/ltsp-common-functions:191
 #, sh-format
 msgid "translator-credits"
 msgstr ""
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/lvm2.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/lvm2.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/lvm2.po	2014-02-24 08:24:33.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/lvm2.po	2014-03-24 09:42:39.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:44+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 11:58+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: activate/activate.c:44
 msgid "LVM1 proc global snprintf failed"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/lynx.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/lynx.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/lynx.po	2014-02-24 08:24:37.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/lynx.po	2014-03-24 09:42:43.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:12+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:31+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. ******************************************************************
 #. * The following definitions are for status line prompts, messages, or
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/m17n-db.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/m17n-db.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/m17n-db.po	2014-02-24 08:24:37.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/m17n-db.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,366 +0,0 @@
-# Simplified Chinese translation for m17n-db
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the m17n-db package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: m17n-db\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-26 16:18+0900\n"
-"PO-Revision-Date: 2009-04-11 05:09+0000\n"
-"Last-Translator: zhangmiao <mymzhang@gmail.com>\n"
-"Language-Team: Simplified Chinese <zh_CN@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-12 12:46+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
-
-#: MIM/cmc-kbd.mim:26
-msgid ""
-"Cham input method simulating Cham keyboard.\n"
-"Cham characters are encoded in logical order in memory and in files.\n"
-"But, you can type Cham text in visual order with this input method.\n"
-"Backspace and Delete also work in the manner of visual order."
-msgstr ""
-
-#: MIM/fr-azerty.mim:26
-#, lisp-format
-msgid ""
-"Simulating Azerty keyboard on English keyboard.\n"
-"\n"
-"     &1  é2  \"3  '4  (5  -6  è7  _8  ç9  à0  )°  =_  ²~\n"
-"      aA  zZ  eE  rR  tT  yY  uU  iI  oO  pP  ^¨  $£\n"
-"       qQ  sS  dD  fF  gG  hH  jJ  kK  lL  mM  ù%  *|\n"
-"        wW  xX  cC  vV  bB  nN  ,?  ;.  :/  !§\n"
-"\n"
-"'[' and '{' are used as a dead key to type a character with the\n"
-"circumflex and diaeresis respectively (e.g. '[' 'e' -> \"ê\").\n"
-"\n"
-"'Alt-2' and 'Alt-7' are used as a dead key to type a character\n"
-"with tilde and grave respectively (e.g. 'Alt-2' 'n' -> \"ñ\").\n"
-"\n"
-"'Ctrl-Alt-2' and 'Ctrl-Alt-7' can be used as 'Alt-2' and 'Alt-7'\n"
-"respectively.\n"
-"\n"
-"Azerty keyboard has one more key at the bottom left corner for\n"
-"inputting \"<\" and \">\".  As a normal English keyboard doesn't\n"
-"have such a key left, type '<' and '>' twice for \"<\" and \">\"\n"
-"respectively."
-msgstr ""
-
-#: MIM/global.mim:25
-msgid ""
-"Global variable and command definitions.\n"
-"This is actually not an input method, but provides documents,\n"
-"default values of global variables, and default key-bindings of\n"
-"global commands."
-msgstr ""
-
-#: MIM/global.mim:32
-msgid ""
-"Maxmum number of candidates in a candidate group.\n"
-"Value must be an integer.\n"
-"If the value is not positive, number of candidates in a group is decided\n"
-"by how candiates are grouped in an input method source file."
-msgstr ""
-
-#: MIM/global.mim:39
-msgid ""
-"Character set to limit candidates.\n"
-"Value must be a symbol representing a charater set, or nil.\n"
-"If the value is not nil, a candidate containing a character not belonging\n"
-"to the specified character set is ignored."
-msgstr ""
-
-#: MIM/global.mim:48
-msgid ""
-"Commit\n"
-"Commit the preedit text"
-msgstr ""
-
-#: MIM/global.mim:52
-msgid ""
-"Convert\n"
-"Convert the preedit text"
-msgstr ""
-
-#: MIM/global.mim:56
-msgid ""
-"Revert\n"
-"Revert the conversion"
-msgstr ""
-"恢复\n"
-"恢复转换"
-
-#: MIM/global.mim:60
-msgid ""
-"Previous candidate\n"
-"Spot the previous candidate"
-msgstr ""
-
-#: MIM/global.mim:64
-msgid ""
-"Next candidate\n"
-"Spot the next candidate"
-msgstr ""
-
-#: MIM/global.mim:68
-msgid ""
-"First candidate\n"
-"Spot the first candidate in the current group"
-msgstr ""
-
-#: MIM/global.mim:72
-msgid ""
-"Last candidate\n"
-"Spot the last candidate in the current group"
-msgstr ""
-
-#: MIM/global.mim:76
-msgid ""
-"Previous candidate group\n"
-"Move to the previous candidate group"
-msgstr ""
-
-#: MIM/global.mim:80
-msgid ""
-"Next candidate group\n"
-"Move to the next candidate group"
-msgstr ""
-"下一个候选组\n"
-"移动到下一个候选组"
-
-#: MIM/global.mim:84
-msgid ""
-"Select the 1st candidate\n"
-"Select the first candidate in the current group"
-msgstr ""
-
-#: MIM/global.mim:88
-msgid ""
-"Select the 2nd candidate\n"
-"Select the second candidate in the current group"
-msgstr ""
-
-#: MIM/global.mim:92
-msgid ""
-"Select the 3rd candidate\n"
-"Select the third candidate in the current group"
-msgstr ""
-
-#: MIM/global.mim:96
-msgid ""
-"Select the 4th candidate\n"
-"Select the fourth candidate in the current group"
-msgstr ""
-
-#: MIM/global.mim:100
-msgid ""
-"Select the 5th candidate\n"
-"Select the fifth candidate in the current group"
-msgstr ""
-
-#: MIM/global.mim:104
-msgid ""
-"Select the 6th candidate\n"
-"Select the sixth candidate in the current group"
-msgstr ""
-
-#: MIM/global.mim:108
-msgid ""
-"Select the 7th candidate\n"
-"Select the seventh candidate in the current group"
-msgstr ""
-
-#: MIM/global.mim:112
-msgid ""
-"select the 8th candidate\n"
-"Select the eighth candidate in the current group"
-msgstr ""
-
-#: MIM/global.mim:116
-msgid ""
-"Select the 9th candidate\n"
-"Select the ninth candidate in the current group"
-msgstr ""
-
-#: MIM/global.mim:120
-msgid ""
-"Select the 10th candidate\n"
-"Select the tenth candidate in the current group"
-msgstr ""
-
-#: MIM/global.mim:124
-msgid ""
-"Previous character\n"
-"Move to the previous character in the preedit text"
-msgstr ""
-
-#: MIM/global.mim:128
-msgid ""
-"Next character\n"
-"Move to the next character in the preedit text"
-msgstr ""
-
-#: MIM/global.mim:132
-msgid ""
-"Fist character\n"
-"Move to the first character in the preedit text"
-msgstr ""
-
-#: MIM/global.mim:136
-msgid ""
-"Last character\n"
-"Move to the last character in the preedit text"
-msgstr ""
-
-#: MIM/global.mim:140
-msgid ""
-"Delete char backward\n"
-"Delete the previous character in the preedit text"
-msgstr ""
-
-#: MIM/global.mim:144
-msgid ""
-"Delete char\n"
-"Delete the following character in the preedit text"
-msgstr ""
-
-#: MIM/global.mim:148
-msgid ""
-"Previous segment\n"
-"Move to the previous segment in the preedit text"
-msgstr ""
-
-#: MIM/global.mim:152
-msgid ""
-"Next segment\n"
-"Move to the next segment in the preedit text"
-msgstr ""
-
-#: MIM/global.mim:156
-msgid ""
-"First segment\n"
-"Move to the first segment in the preedit text"
-msgstr ""
-
-#: MIM/global.mim:160
-msgid ""
-"Last segment\n"
-"Move to the last segment in the preedit text"
-msgstr ""
-
-#: MIM/global.mim:164
-msgid ""
-"Extend segment\n"
-"Extend the current segment length to the tail"
-msgstr ""
-
-#: MIM/global.mim:168
-msgid ""
-"Shrink segment\n"
-"Shrink the current segment length from the tail"
-msgstr ""
-
-#: MIM/global.mim:172
-msgid ""
-"Reload input method\n"
-"Reload the input method (and configulation if any) and freshly start it.\n"
-"Note that the length of key-sequence bound for this command must be 1.\n"
-"This is one of special commands reserved by the m17n library, and\n"
-"should not be used in a map of an input method."
-msgstr ""
-
-#: MIM/si-wijesekera.mim:36
-msgid ""
-"Surrounding text vs. preedit.\n"
-"If 1, try to use surrounding text.  Otherwise, use preedit."
-msgstr ""
-
-#: MIM/ta-lk-renganathan.mim:33
-msgid ""
-"Surrounding text vs. preedit\n"
-"If 1, try to use surrounding text.  Otherwise, use preedit."
-msgstr ""
-
-#: MIM/th-kesmanee.mim:35 MIM/th-pattachote.mim:35 MIM/th-tis820.mim:35
-msgid ""
-"Acceptance level\n"
-"The level of character sequence acceptance defined in WTT 2.0.\n"
-"0 accepts any key sequence.  2 accepts only orthographic ones.\n"
-"1 is somewhere between."
-msgstr ""
-
-#: MIM/unicode.mim:26
-msgid ""
-"Input method for Unicode BMP characters using hexadigits.\n"
-"Type C-u followed by four hexadecimal numbers [0-9A-Fa-f]\n"
-"of a Unicode character code.\n"
-msgstr ""
-
-#: MIM/unicode.mim:34
-msgid ""
-"Preedit prompt\n"
-"Prompt string shown in the preedit area while typing hexadecimal numbers."
-msgstr ""
-
-#: MIM/unicode.mim:38
-msgid ""
-"Start Unicode\n"
-"Start typing hexadecimal numbers of Unicode character."
-msgstr ""
-
-#: MIM/vi-tcvn.mim:26
-msgid ""
-"Vietnames input method using the TCVN6064 sequence.\n"
-"Typing Backslash ('\\') toggles the normal mode and English mode.\n"
-"The following variables are customizable:\n"
-"  tone-mark-on-last: control tone mark position in equivocal cases\n"
-"  backspace-is-undo: control the action of Backspace key (delete or undo)"
-msgstr ""
-
-#: MIM/vi-tcvn.mim:36 MIM/vi-telex.mim:36 MIM/vi-viqr.mim:36 MIM/vi-vni.mim:36
-msgid ""
-"Flag to control tone mark position in equivocal cases.\n"
-"If this variable is 0 (the default), put tone mark on the first vowel\n"
-"in such equivocal cases as \"oa\", \"oe\", \"uy\".\n"
-"Otherwise, put tone mark on the last vowel."
-msgstr ""
-
-#: MIM/vi-tcvn.mim:43 MIM/vi-telex.mim:43 MIM/vi-viqr.mim:43 MIM/vi-vni.mim:43
-msgid ""
-"Flag to control the action of Backspace key (delete or undo).\n"
-"If this variable is 0 (the default), Backspace key deletes the previous\n"
-"character (e.g. \"q u a i s BS\" => \"quá\").\n"
-"If the value is 1, Backspace key undoes the previous key\n"
-"(e.g. \"q u a i s BS\" => \"quai\")."
-msgstr ""
-
-#: MIM/vi-telex.mim:26
-msgid ""
-"Vietnames input method using the TELEX key sequence.\n"
-"Typing Backslash ('\\') toggles the normal mode and English mode.\n"
-"The following variables are customizable:\n"
-"  tone-mark-on-last: control tone mark position in equivocal cases\n"
-"  backspace-is-undo: control the action of Backspace key (delete or undo)"
-msgstr ""
-
-#: MIM/vi-viqr.mim:26
-msgid ""
-"Vietnames input method using the VIQR key sequence.\n"
-"Typing Backslash ('\\') toggles the normal mode and English mode.\n"
-"The following variables are customizable:\n"
-"  tone-mark-on-last: control tone mark position in equivocal cases\n"
-"  backspace-is-undo: control the action of Backspace key (delete or undo)"
-msgstr ""
-
-#: MIM/vi-vni.mim:26
-msgid ""
-"Vietnames input method using the VNI key sequence.\n"
-"Typing Backslash ('\\') toggles the normal mode and English mode.\n"
-"The following variables are customizable:\n"
-"  tone-mark-on-last: control tone mark position in equivocal cases\n"
-"  backspace-is-undo: control the action of Backspace key (delete or undo)"
-msgstr ""
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/mailman.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/mailman.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/mailman.po	2014-02-24 08:24:33.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/mailman.po	2014-03-24 09:42:40.000000000 +0000
@@ -9,8 +9,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:45+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 11:59+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Generated-By: pygettext.py 1.4\n"
 
 #: Mailman/Archiver/HyperArch.py:123
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/make.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/make.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/make.po	2014-02-24 08:24:39.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/make.po	2014-03-24 09:42:46.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:34+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:56+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: ar.c:53
 #, c-format
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/man-db-gnulib.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/man-db-gnulib.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/man-db-gnulib.po	2014-02-24 08:24:33.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/man-db-gnulib.po	2014-03-24 09:42:40.000000000 +0000
@@ -17,8 +17,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:46+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 11:59+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: gnulib/lib/argp-help.c:158
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/man-db.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/man-db.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/man-db.po	2014-02-24 08:24:33.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/man-db.po	2014-03-24 09:42:40.000000000 +0000
@@ -26,8 +26,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:45+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 11:59+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #  need-proofread
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/mlocate.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/mlocate.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/mlocate.po	2014-02-24 08:24:43.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/mlocate.po	2014-03-24 09:42:50.000000000 +0000
@@ -18,8 +18,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:04+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:35+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: src/conf.c:241
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/MoinMoin.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/MoinMoin.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/MoinMoin.po	2014-02-24 08:24:33.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/MoinMoin.po	2014-03-24 09:42:40.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:46+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:00+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #, python-format
 msgid "The package needs a newer version of MoinMoin (at least %s)."
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/mono-tools.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/mono-tools.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/mono-tools.po	2014-02-24 08:24:38.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/mono-tools.po	2014-03-24 09:42:46.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:27+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:47+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: ../docbrowser/browser.glade:8
 msgid "Mono Documentation Library"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/mountall.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/mountall.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/mountall.po	2014-02-24 08:24:45.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/mountall.po	2014-03-24 09:42:52.000000000 +0000
@@ -9,15 +9,15 @@
 msgstr ""
 "Project-Id-Version: mountall\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-02-17 09:56+0000\n"
+"POT-Creation-Date: 2014-02-22 01:41+0000\n"
 "PO-Revision-Date: 2012-10-01 12:58+0000\n"
 "Last-Translator: Aron Xu <Unknown>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:20+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:55+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: \n"
 
 #: src/mountall.c:785
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/mutt.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/mutt.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/mutt.po	2014-02-24 08:24:33.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/mutt.po	2014-03-24 09:42:40.000000000 +0000
@@ -17,8 +17,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:47+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:01+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: account.c:163
 #, c-format
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/nabi.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/nabi.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/nabi.po	2014-02-24 08:24:33.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/nabi.po	2014-03-24 09:42:40.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:47+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:01+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: src/candidate.c:367
 msgid "hanja"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/nagios-plugins.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/nagios-plugins.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/nagios-plugins.po	2014-02-24 08:24:33.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/nagios-plugins.po	2014-03-24 09:42:40.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:47+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:02+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: plugins/check_by_ssh.c:86 plugins/check_cluster.c:76 plugins/check_dig.c:88
 #: plugins/check_disk.c:194 plugins/check_dns.c:102 plugins/check_dummy.c:52
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/nano.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/nano.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/nano.po	2014-02-24 08:24:33.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/nano.po	2014-03-24 09:42:41.000000000 +0000
@@ -16,8 +16,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:48+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:02+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: src/browser.c:220
 msgid "Go To Directory"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/neon.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/neon.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/neon.po	2014-02-24 08:24:43.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/neon.po	2014-03-24 09:42:50.000000000 +0000
@@ -16,8 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:02+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:33+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: \n"
 
 #: src/ne_207.c:198
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/net-tools.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/net-tools.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/net-tools.po	2014-02-24 08:24:33.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/net-tools.po	2014-03-24 09:42:41.000000000 +0000
@@ -17,8 +17,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:48+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:03+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: ../arp.c:112 ../arp.c:279
 #, c-format
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/NetworkManager.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/NetworkManager.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/NetworkManager.po	2014-02-24 08:24:38.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/NetworkManager.po	2014-03-24 09:42:44.000000000 +0000
@@ -13,15 +13,15 @@
 "Report-Msgid-Bugs-To: "
 "http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&component=gene"
 "ral\n"
-"POT-Creation-Date: 2014-02-17 15:57+0000\n"
+"POT-Creation-Date: 2014-03-06 21:14+0000\n"
 "PO-Revision-Date: 2011-06-01 00:01+0000\n"
 "Last-Translator: Aron Xu <Unknown>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:20+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:38+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: ../cli/src/common.c:32 ../cli/src/common.c:44 ../cli/src/common.c:52
 #: ../cli/src/common.c:63 ../cli/src/connections.c:133
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/newt.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/newt.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/newt.po	2014-02-24 08:24:31.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/newt.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-# Simplified Chinese translations for newt
-# Copyright (C) 2003 Free Software Foundation
-# This file is distributed under the same license as the newt package.
-# Alastair McKinstry <mckinstry@debian.org>, 2003.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: newt 0.51.4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-14 16:03+0200\n"
-"PO-Revision-Date: 2006-05-19 12:38+0000\n"
-"Last-Translator: Carlos Z.F. Liu <Unknown>\n"
-"Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-12 12:04+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
-
-#: ../dialogboxes.c:43 ../dialogboxes.c:48 ../dialogboxes.c:493
-msgid "Ok"
-msgstr "确定"
-
-#: ../dialogboxes.c:51
-msgid "Cancel"
-msgstr "取消"
-
-#: ../dialogboxes.c:498
-msgid "Yes"
-msgstr "是"
-
-#: ../dialogboxes.c:500
-msgid "No"
-msgstr "否"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/nova.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/nova.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/nova.po	2014-02-24 08:24:46.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/nova.po	2014-03-24 09:42:53.000000000 +0000
@@ -7,28 +7,28 @@
 msgstr ""
 "Project-Id-Version: nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-01-05 06:08+0000\n"
+"POT-Creation-Date: 2014-02-27 06:16+0000\n"
 "PO-Revision-Date: 2013-12-15 04:21+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:31+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 14:08+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Generated-By: Babel 1.3\n"
 
-#: nova/block_device.py:503 nova/virt/hyperv/basevolumeutils.py:92
+#: nova/block_device.py:496 nova/virt/hyperv/basevolumeutils.py:92
 #, python-format
 msgid "block_device_list %s"
 msgstr "块设备列表 block_device_list %s"
 
-#: nova/context.py:66
+#: nova/context.py:64
 #, python-format
 msgid "Arguments dropped when creating context: %s"
 msgstr ""
 
-#: nova/context.py:111
+#: nova/context.py:109
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
@@ -106,9 +106,9 @@
 msgid "Virtual Interface creation failed"
 msgstr "虚拟接口创建失败"
 
-#: nova/exception.py:157
-msgid "5 attempts to create virtual interfacewith unique mac address failed"
-msgstr "用唯一mac地址5次尝试创建虚拟接口失败"
+#: nova/exception.py:155
+msgid "Creation of virtual interface with unique mac address failed"
+msgstr ""
 
 #: nova/exception.py:162
 #, python-format
@@ -195,95 +195,97 @@
 msgid "Attribute not supported: %(attr)s"
 msgstr ""
 
-#: nova/exception.py:257
+#: nova/exception.py:253
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr "卷 %(volume_id)s 没有附加任何东西"
 
-#: nova/exception.py:261
+#: nova/exception.py:257
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:268 nova/tests/compute/test_keypairs.py:125
-msgid "Keypair data is invalid"
-msgstr "密钥对数据无效"
+#: nova/exception.py:266
+#, python-format
+msgid "Keypair data is invalid: %(reason)s"
+msgstr ""
 
-#: nova/exception.py:272
+#: nova/exception.py:268
 msgid "The request is invalid."
 msgstr "请求无效。"
 
-#: nova/exception.py:276
-msgid "Invalid input received"
-msgstr "收到无效的输入"
-
-#: nova/exception.py:281
-msgid "Invalid volume"
-msgstr "无效的卷"
+#: nova/exception.py:274
+#, python-format
+msgid "Invalid input received: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:279
+#, python-format
+msgid "Invalid volume: %(reason)s"
+msgstr ""
 
-#: nova/exception.py:285
+#: nova/exception.py:283
 msgid "Invalid volume access mode"
 msgstr ""
 
-#: nova/exception.py:289 nova/api/openstack/compute/servers.py:1397
-#: nova/api/openstack/compute/contrib/admin_actions.py:276
-#: nova/api/openstack/compute/plugins/v3/admin_actions.py:253
-#: nova/api/openstack/compute/plugins/v3/servers.py:1211
-msgid "Invalid metadata"
-msgstr "无效的元数据"
+#: nova/exception.py:287
+#, python-format
+msgid "Invalid metadata: %(reason)s"
+msgstr ""
 
-#: nova/exception.py:293
-msgid "Invalid metadata size"
+#: nova/exception.py:291
+#, python-format
+msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:298
+#: nova/exception.py:290
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr "无效的端口范围 %(from_port)s:%(to_port)s. %(msg)s"
 
-#: nova/exception.py:302
+#: nova/exception.py:294
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "无效的IP协议 %(protocol)s。"
 
-#: nova/exception.py:306
+#: nova/exception.py:298
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "无效的内容类型 %(content_type)s。"
 
-#: nova/exception.py:310
+#: nova/exception.py:302
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr "无效的cidr %(cidr)s。"
 
-#: nova/exception.py:314 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:306 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:322
+#: nova/exception.py:314
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: nova/exception.py:326
+#: nova/exception.py:318
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason: "
 "%(reason)s."
 msgstr "无法执行action '%(action)s' 于聚合 %(aggregate_id)s 上。原因： %(reason)s。"
 
-#: nova/exception.py:331
+#: nova/exception.py:323
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:335 nova/openstack/common/db/sqlalchemy/utils.py:58
+#: nova/exception.py:327 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:331
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while "
@@ -291,138 +293,144 @@
 msgstr ""
 "实例 %(instance_uuid)s 处于%(attr)s %(state)s 中。该实例在这种状态下不能执行 %(method)s。"
 
-#: nova/exception.py:344
+#: nova/exception.py:336
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "实例 %(instance_id)s 没有运行。"
 
-#: nova/exception.py:348
+#: nova/exception.py:340
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr "实例 %(instance_id)s 不在救援模式。"
 
-#: nova/exception.py:352
+#: nova/exception.py:344
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:356
+#: nova/exception.py:348
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:360
-msgid "Failed to suspend instance"
-msgstr "挂起实例失败"
+#: nova/exception.py:358
+#, python-format
+msgid "Failed to suspend instance: %(reason)s"
+msgstr ""
 
-#: nova/exception.py:364
+#: nova/exception.py:362
 #, python-format
-msgid "Failed to resume instance: %(reason)s."
+msgid "Failed to resume instance: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:368
+#: nova/exception.py:366
 #, python-format
-msgid "Failed to power on instance: %(reason)s."
+msgid "Failed to power on instance: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:372
+#: nova/exception.py:370
 #, python-format
-msgid "Failed to power off instance: %(reason)s."
+msgid "Failed to power off instance: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:376
-msgid "Failed to reboot instance"
-msgstr "重新启动实例失败"
+#: nova/exception.py:374
+#, python-format
+msgid "Failed to reboot instance: %(reason)s"
+msgstr ""
 
-#: nova/exception.py:380
-msgid "Failed to terminate instance"
+#: nova/exception.py:378
+#, python-format
+msgid "Failed to terminate instance: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:384
-msgid "Failed to deploy instance"
+#: nova/exception.py:382
+#, python-format
+msgid "Failed to deploy instance: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:388
-msgid "Failed to launch instances"
+#: nova/exception.py:386
+#, python-format
+msgid "Failed to launch instances: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:392
+#: nova/exception.py:384
 msgid "Service is unavailable at this time."
 msgstr "此时的付不可用。"
 
-#: nova/exception.py:396
+#: nova/exception.py:388
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:400
+#: nova/exception.py:398
 #, python-format
 msgid "Connection to the hypervisor is broken on host: %(host)s"
 msgstr ""
 
-#: nova/exception.py:404
+#: nova/exception.py:392
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:408
+#: nova/exception.py:406
 #, python-format
 msgid "Compute service of %(host)s is still in use."
 msgstr ""
 
-#: nova/exception.py:412
+#: nova/exception.py:396
 #, python-format
 msgid ""
 "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr "无法把实例 (%(instance_id)s) 迁移到当前主机 (%(host)s)。"
 
-#: nova/exception.py:417
+#: nova/exception.py:401
 msgid "The supplied hypervisor type of is invalid."
 msgstr "提供的虚拟机管理程序类型无效。"
 
-#: nova/exception.py:421
+#: nova/exception.py:405
 msgid ""
 "The instance requires a newer hypervisor version than has been provided."
 msgstr "该实例需要比当前版本更新的虚拟机管理程序。"
 
-#: nova/exception.py:426
+#: nova/exception.py:410
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr "提供的磁盘路径 (%(path)s) 已经存在，预计是不存在的。"
 
-#: nova/exception.py:431
+#: nova/exception.py:415
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr "提供的设备路径 (%(path)s) 是无效的。"
 
-#: nova/exception.py:435
+#: nova/exception.py:419
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:424
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:444
-msgid "Unacceptable CPU info"
-msgstr "无法接受的CPU信息"
+#: nova/exception.py:442
+#, python-format
+msgid "Unacceptable CPU info: %(reason)s"
+msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:432
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr "%(address)s 不是有效的IP v4/6地址。"
 
-#: nova/exception.py:452
+#: nova/exception.py:436
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN tag "
 "is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr "VLAN标签对于端口组%(bridge)s 是不适合的。预计的VLAN标签是 %(tag)s，但与端口组关联的是 %(pgroup)s。"
 
-#: nova/exception.py:458
+#: nova/exception.py:442
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with the "
@@ -432,92 +440,101 @@
 "包含端口组 %(bridge)s 的vSwitch没有与预计的物理适配器关联。预计的vSwitch是 %(expected)s，但关联的是 "
 "%(actual)s。"
 
-#: nova/exception.py:465
+#: nova/exception.py:449
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr "磁盘格式 %(disk_format)s 不能接受"
 
-#: nova/exception.py:469
+#: nova/exception.py:453
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr "镜像 %(image_id)s 无法接受，原因是： %(reason)s"
 
-#: nova/exception.py:473
+#: nova/exception.py:457
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr "实例 %(instance_id)s 无法接受，原因是： %(reason)s"
 
-#: nova/exception.py:477
+#: nova/exception.py:461
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr "Ec2 id %(ec2_id)s 无法接受。"
 
-#: nova/exception.py:481
+#: nova/exception.py:465
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:485
+#: nova/exception.py:469
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:489
+#: nova/exception.py:473
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:494
+#: nova/exception.py:478
 msgid "Resource could not be found."
 msgstr "资源没有找到。"
 
-#: nova/exception.py:499
+#: nova/exception.py:483
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:503
+#: nova/exception.py:487
 #, python-format
 msgid ""
 "Agent-build with hypervisor %(hypervisor)s os %(os)s architecture "
 "%(architecture)s exists."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:493
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr "卷 %(volume_id)s 没有找到。"
 
-#: nova/exception.py:514
+#: nova/exception.py:511
+#, python-format
+msgid "No volume Block Device Mapping with id %(volume_id)s."
+msgstr ""
+
+#: nova/exception.py:498
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr "快照 %(snapshot_id)s 没有找到。"
 
-#: nova/exception.py:518
+#: nova/exception.py:502
 #, python-format
 msgid "No disk at %(location)s"
 msgstr "在 %(location)s 没有磁盘"
 
-#: nova/exception.py:522
+#: nova/exception.py:506
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr "无法为 %(driver_type)s 卷找到句柄。"
 
-#: nova/exception.py:526
+#: nova/exception.py:510
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr "无效的镜像href %(image_href)s。"
 
-#: nova/exception.py:530
+#: nova/exception.py:514
 #, python-format
 msgid "Requested image %(image)s has automatic disk resize disabled."
 msgstr ""
 
-#: nova/exception.py:535
+#: nova/exception.py:519
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr "镜像 %(image_id)s 没有找到。"
 
-#: nova/exception.py:540
+#: nova/exception.py:541
+msgid "The current driver does not support preserving ephemeral partitions."
+msgstr ""
+
+#: nova/exception.py:524
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids "
@@ -525,394 +542,394 @@
 "ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:547
+#: nova/exception.py:531
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr "项目 %(project_id)s 没有找到。"
 
-#: nova/exception.py:551
+#: nova/exception.py:535
 msgid "Cannot find SR to read/write VDI."
 msgstr "没有找到存储库来读写VDI。"
 
-#: nova/exception.py:555
+#: nova/exception.py:539
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:559
+#: nova/exception.py:543
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:563
+#: nova/exception.py:547
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr "创建网络 %(req)s  是必要的。"
 
-#: nova/exception.py:567
+#: nova/exception.py:551
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr "网络 %(network_id)s 没有找到。"
 
-#: nova/exception.py:571
+#: nova/exception.py:555
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:575
+#: nova/exception.py:559
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr "无法为桥 %(bridge)s 找到网络"
 
-#: nova/exception.py:579
+#: nova/exception.py:563
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr "无法为uuid %(uuid)s 找到网络"
 
-#: nova/exception.py:583
+#: nova/exception.py:567
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr "无法为cidr %(cidr)s 找到网络。"
 
-#: nova/exception.py:587
+#: nova/exception.py:571
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr "无法为实例 %(instance_id)s 找到网络。"
 
-#: nova/exception.py:591
+#: nova/exception.py:575
 msgid "No networks defined."
 msgstr "没有网络定义。"
 
-#: nova/exception.py:595
+#: nova/exception.py:602
 msgid "No more available networks."
 msgstr ""
 
-#: nova/exception.py:599
+#: nova/exception.py:606
 #, python-format
 msgid ""
 "Either network uuid %(network_uuid)s is not present or is not assigned to "
 "the project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:604
+#: nova/exception.py:584
 msgid ""
 "More than one possible network found. Specify network ID(s) to select which "
 "one(s) to connect to,"
 msgstr ""
 
-#: nova/exception.py:609
+#: nova/exception.py:589
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr "无法找到虚拟机使用的数据存储引用。"
 
-#: nova/exception.py:613
+#: nova/exception.py:593
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:617
+#: nova/exception.py:597
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:621
+#: nova/exception.py:601
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:625
+#: nova/exception.py:605
 #, python-format
 msgid "Fixed ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:629
+#: nova/exception.py:609
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr "没有固定IP与id %(id)s 关联。"
 
-#: nova/exception.py:633
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr "没有为地址 %(address)s 找到固定IP。"
 
-#: nova/exception.py:637
+#: nova/exception.py:617
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:641
+#: nova/exception.py:621
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr "网络主机 %(host)s 在网络 %(network_id)s 中没有固定ip。"
 
-#: nova/exception.py:646
+#: nova/exception.py:626
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:650
+#: nova/exception.py:630
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network (%(network_uuid)s)."
 msgstr "固定IP地址 (%(address)s) 在网络 (%(network_uuid)s) 中不存在。"
 
-#: nova/exception.py:655
+#: nova/exception.py:635
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance %(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:660
+#: nova/exception.py:640
 #, python-format
 msgid ""
 "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:645
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr "固定IP地址 %(address)s 无效。"
 
-#: nova/exception.py:670
+#: nova/exception.py:650
 msgid "Zero fixed ips available."
 msgstr "没有固定ip可用。"
 
-#: nova/exception.py:674
+#: nova/exception.py:654
 msgid "Zero fixed ips could be found."
 msgstr "找不到固定IP。"
 
-#: nova/exception.py:678
+#: nova/exception.py:658
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:683
+#: nova/exception.py:663
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr "找不到适合id %(id)s 的浮动IP。"
 
-#: nova/exception.py:687
+#: nova/exception.py:667
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr "DNS 入口 %(name)s 已经在域中 %(domain)s 存在。"
 
-#: nova/exception.py:691
+#: nova/exception.py:671
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr "找不到适合地址 %(address)s 的浮动ip。"
 
-#: nova/exception.py:695
+#: nova/exception.py:675
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr "没有为主机 %(host)s 找到浮动IP。"
 
-#: nova/exception.py:699
+#: nova/exception.py:679
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:703
+#: nova/exception.py:683
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:708
+#: nova/exception.py:688
 msgid "Zero floating ips available."
 msgstr "没有浮动IP可用。"
 
-#: nova/exception.py:714
+#: nova/exception.py:694
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr "浮动ip %(address)s 已被关联。"
 
-#: nova/exception.py:718
+#: nova/exception.py:698
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr "浮动ip %(address)s 没有被关联。"
 
-#: nova/exception.py:722
+#: nova/exception.py:702
 msgid "Zero floating ips exist."
 msgstr "没有浮动ip存在。"
 
-#: nova/exception.py:727
+#: nova/exception.py:707
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr "接口 %(interface)s没有找到。"
 
-#: nova/exception.py:732 nova/api/openstack/compute/contrib/floating_ips.py:98
+#: nova/exception.py:712 nova/api/openstack/compute/contrib/floating_ips.py:98
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/exception.py:737
+#: nova/exception.py:717
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr "密钥对 %(name)s 没有为用户 %(user_id)s 找到。"
 
-#: nova/exception.py:741
+#: nova/exception.py:721
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr "服务 %(service_id)s 没有找到。"
 
-#: nova/exception.py:745
+#: nova/exception.py:725
 #, python-format
 msgid "Service with host %(host)s binary %(binary)s exists."
 msgstr ""
 
-#: nova/exception.py:749
+#: nova/exception.py:729
 #, python-format
 msgid "Service with host %(host)s topic %(topic)s exists."
 msgstr ""
 
-#: nova/exception.py:753
+#: nova/exception.py:733
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr "主机 %(host)s 没有找到。"
 
-#: nova/exception.py:757
+#: nova/exception.py:737
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr "计算主机 %(host)s 没有找到。"
 
-#: nova/exception.py:761
+#: nova/exception.py:741
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr "没有找到二进制 %(binary)s 在主机 %(host)s 上。"
 
-#: nova/exception.py:765
+#: nova/exception.py:745
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:769
+#: nova/exception.py:749
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/exception.py:774
+#: nova/exception.py:754
 msgid "Quota could not be found"
 msgstr "配额没有找到。"
 
-#: nova/exception.py:778
+#: nova/exception.py:758
 #, python-format
 msgid "Quota exists for project %(project_id)s, resource %(resource)s"
 msgstr ""
 
-#: nova/exception.py:783
+#: nova/exception.py:763
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:787
+#: nova/exception.py:767
 #, python-format
 msgid ""
 "Quota for user %(user_id)s in project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:792
+#: nova/exception.py:772
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr "没有为项目 %(project_id)s 找到配额。"
 
-#: nova/exception.py:796
+#: nova/exception.py:776
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:800
+#: nova/exception.py:780
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:804
+#: nova/exception.py:784
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:808
+#: nova/exception.py:788
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:792
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr "安全组 %(security_group_id)s 没有找到。"
 
-#: nova/exception.py:816
+#: nova/exception.py:796
 #, python-format
 msgid ""
 "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr "没有找到安全组 %(security_group_id)s 针对项目 %(project_id)s 。"
 
-#: nova/exception.py:821
+#: nova/exception.py:801
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr "带有规则 %(rule_id)s 的安全组没有找到。"
 
-#: nova/exception.py:826
+#: nova/exception.py:806
 #, python-format
 msgid ""
 "Security group %(security_group_name)s already exists for project "
 "%(project_id)s."
 msgstr ""
 
-#: nova/exception.py:831
+#: nova/exception.py:811
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the instance "
 "%(instance_id)s"
 msgstr "安全组 %(security_group_id)s 已经与实例 %(instance_id)s 关联。"
 
-#: nova/exception.py:836
+#: nova/exception.py:816
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr "安全组 %(security_group_id)s 没有与实例 %(instance_id)s 关联。"
 
-#: nova/exception.py:841
+#: nova/exception.py:821
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:825
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:851
+#: nova/exception.py:831
 #, python-format
 msgid "Rule already exists in group: %(rule)s"
 msgstr ""
 
-#: nova/exception.py:855
+#: nova/exception.py:835
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:860
+#: nova/exception.py:840
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr "迁移 %(migration_id)s 没有找到。"
 
-#: nova/exception.py:864
+#: nova/exception.py:844
 #, python-format
 msgid ""
 "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr "没有为实例 %(instance_id)s 找到迁移其状态为 %(status)s 。"
 
-#: nova/exception.py:869
+#: nova/exception.py:849
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr "控制台池 %(pool_id)s 没有找到。"
 
-#: nova/exception.py:873
+#: nova/exception.py:853
 #, python-format
 msgid ""
 "Console pool with host %(host)s, console_type %(console_type)s and "
 "compute_host %(compute_host)s already exists."
 msgstr ""
 
-#: nova/exception.py:879
+#: nova/exception.py:859
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s on "
@@ -920,706 +937,726 @@
 msgstr ""
 "没有找到类型是 %(console_type)s 的控制台池针对计算主机 %(compute_host)s 在代理主机 %(host)s 上。"
 
-#: nova/exception.py:885
+#: nova/exception.py:865
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr "控制台%(console_id)s 没有找到。"
 
-#: nova/exception.py:889
+#: nova/exception.py:869
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:898
+#: nova/exception.py:878
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:902
+#: nova/exception.py:882
 #, python-format
 msgid "Unavailable console type %(console_type)s."
 msgstr ""
 
-#: nova/exception.py:906
+#: nova/exception.py:913
+#, python-format
+msgid "The console port range %(min_port)d-%(max_port)d is exhausted."
+msgstr ""
+
+#: nova/exception.py:895
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr "类型 %(flavor_id)s 没有找到。"
 
-#: nova/exception.py:910
+#: nova/exception.py:922
 #, python-format
 msgid "Flavor with name %(flavor_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:899
 #, python-format
 msgid ""
 "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:919
+#: nova/exception.py:904
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:923
+#: nova/exception.py:908
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:927
+#: nova/exception.py:912
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:931
+#: nova/exception.py:916
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:935
+#: nova/exception.py:920
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:939
+#: nova/exception.py:924
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:943
+#: nova/exception.py:928
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:947
+#: nova/exception.py:932
 msgid "Cannot update cells configuration file."
 msgstr ""
 
-#: nova/exception.py:951
+#: nova/exception.py:936
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:955
+#: nova/exception.py:940
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr "调度器主机过滤器 %(filter_name)s 没有找到。"
 
-#: nova/exception.py:959
+#: nova/exception.py:971
 #, python-format
 msgid "Flavor %(flavor_id)s has no extra specs with key %(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:976
 #, python-format
 msgid ""
 "Metric %(name)s could not be found on the compute host node "
 "%(host)s.%(node)s."
 msgstr ""
 
-#: nova/exception.py:969
+#: nova/exception.py:949
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr "找不到文件 %(file_path)s。"
 
-#: nova/exception.py:973
+#: nova/exception.py:953
 msgid "Zero files could be found."
 msgstr "没找到文件"
 
-#: nova/exception.py:977
+#: nova/exception.py:957
 #, python-format
 msgid ""
 "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr "未找到与网络适配器 %(adapter)s 关联的虚拟交换机。"
 
-#: nova/exception.py:982
+#: nova/exception.py:962
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr "未找到网络适配器 %(adapter)s。"
 
-#: nova/exception.py:986
+#: nova/exception.py:966
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr "找不到类 %(class_name)s ：异常 %(exception)s"
 
-#: nova/exception.py:990
+#: nova/exception.py:970
 msgid "Action not allowed."
 msgstr "操作不允许。"
 
-#: nova/exception.py:994
+#: nova/exception.py:974
 msgid "Rotation is not allowed for snapshots"
 msgstr "快照不允许循环。"
 
-#: nova/exception.py:998
+#: nova/exception.py:978
 msgid "Rotation param is required for backup image_type"
 msgstr "备份 image_type 要求循环参数。"
 
-#: nova/exception.py:1003 nova/tests/compute/test_keypairs.py:146
+#: nova/exception.py:983 nova/tests/compute/test_keypairs.py:124
 #, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr ""
 
-#: nova/exception.py:1007
+#: nova/exception.py:987
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr "实例 %(name)s 已经存在。"
 
-#: nova/exception.py:1011
+#: nova/exception.py:1023
 #, python-format
 msgid "Flavor with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1015
+#: nova/exception.py:1027
 #, python-format
 msgid "Flavor with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:1019
+#: nova/exception.py:999
 #, python-format
 msgid ""
 "Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1004
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1028
+#: nova/exception.py:1008
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1032
-msgid "Migration error"
-msgstr "迁移错误"
+#: nova/exception.py:1044
+#, python-format
+msgid "Migration error: %(reason)s"
+msgstr ""
 
-#: nova/exception.py:1036
-msgid "Migration pre-check error"
+#: nova/exception.py:1048
+#, python-format
+msgid "Migration pre-check error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1040
+#: nova/exception.py:1020
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr "错误格式的消息体： %(reason)s"
 
-#: nova/exception.py:1046
+#: nova/exception.py:1026
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr "在 %(path)s 找不到配置文件。"
 
-#: nova/exception.py:1050
+#: nova/exception.py:1030
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr "无法从路径 %(path)s 中加载应用 '%(name)s'"
 
-#: nova/exception.py:1054
+#: nova/exception.py:1034
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1038
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1042
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1078
 msgid "Flavor's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:1070
+#: nova/exception.py:1082
 msgid "Flavor's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:1074
+#: nova/exception.py:1054
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr "没有足够的可用内存来启动计算节点  %(uuid)s。"
 
-#: nova/exception.py:1078
+#: nova/exception.py:1058
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr "找不到有效主机，原因是 %(reason)s。"
 
-#: nova/exception.py:1083
-msgid "Quota exceeded"
-msgstr "超出配额"
+#: nova/exception.py:1095
+#, python-format
+msgid "Quota exceeded: code=%(code)s"
+msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1070
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used %(used)d "
 "of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1095
+#: nova/exception.py:1075
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1099
+#: nova/exception.py:1079
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1103
+#: nova/exception.py:1083
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1107
+#: nova/exception.py:1087
 msgid "Personality file limit exceeded"
 msgstr "超过个性化文件限制"
 
-#: nova/exception.py:1111
+#: nova/exception.py:1091
 msgid "Personality file path too long"
 msgstr "个性化文件路径太长"
 
-#: nova/exception.py:1115
+#: nova/exception.py:1095
 msgid "Personality file content too long"
 msgstr "个性化文件内容太长"
 
-#: nova/exception.py:1119 nova/tests/compute/test_keypairs.py:157
+#: nova/exception.py:1099 nova/tests/compute/test_keypairs.py:135
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1124
+#: nova/exception.py:1104
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1128
+#: nova/exception.py:1108
 msgid "Maximum number of ports exceeded"
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1112
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:1137
+#: nova/exception.py:1117
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr "找不到聚合 %(aggregate_id)s。"
 
-#: nova/exception.py:1141
+#: nova/exception.py:1121
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr "聚合 %(aggregate_name)s 已经存在。"
 
-#: nova/exception.py:1145
+#: nova/exception.py:1125
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr "聚合 %(aggregate_id)s没有主机 %(host)s。"
 
-#: nova/exception.py:1149
+#: nova/exception.py:1129
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr "聚合 %(aggregate_id)s 没有键为 %(metadata_key)s 的元数据。"
 
-#: nova/exception.py:1154
+#: nova/exception.py:1134
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr "聚合 %(aggregate_id)s已经有主机 %(host)s。"
 
-#: nova/exception.py:1158
+#: nova/exception.py:1170
 msgid "Unable to create flavor"
 msgstr ""
 
-#: nova/exception.py:1162
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1148
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1172
+#: nova/exception.py:1152
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1178
+#: nova/exception.py:1158
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "实例 %(instance_id)s 没有找到。"
 
-#: nova/exception.py:1182
+#: nova/exception.py:1162
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1187
+#: nova/exception.py:1167
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1171
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1175
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1180
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1204
+#: nova/exception.py:1184
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1208
+#: nova/exception.py:1188
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1212
+#: nova/exception.py:1192
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1216
+#: nova/exception.py:1196
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1220
+#: nova/exception.py:1200
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1224
+#: nova/exception.py:1204
 #, python-format
 msgid "Invalid value for Config Drive option: %(option)s"
 msgstr ""
 
-#: nova/exception.py:1228
+#: nova/exception.py:1208
 #, python-format
 msgid ""
 "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1213
 #, python-format
 msgid ""
 "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1238
+#: nova/exception.py:1218
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1242
+#: nova/exception.py:1222
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1246
+#: nova/exception.py:1226
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes once "
 "base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1252
+#: nova/exception.py:1232
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1268
 #, python-format
 msgid ""
 "Unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1265
+#: nova/exception.py:1241
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/exception.py:1270
+#: nova/exception.py:1246
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1274
+#: nova/exception.py:1286
 #, python-format
 msgid ""
 "Unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1279
+#: nova/exception.py:1255
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1283
+#: nova/exception.py:1259
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1287
-msgid "Instance recreate is not implemented by this virt driver."
+#: nova/exception.py:1299
+msgid "Instance recreate is not supported."
 msgstr ""
 
-#: nova/exception.py:1291
+#: nova/exception.py:1267
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1296
+#: nova/exception.py:1272
 #, python-format
 msgid ""
 "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1301
+#: nova/exception.py:1277
 #, python-format
 msgid ""
 "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1306
+#: nova/exception.py:1282
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt driver"
 msgstr ""
 
-#: nova/exception.py:1311
+#: nova/exception.py:1287
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1315
+#: nova/exception.py:1291
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1319
+#: nova/exception.py:1295
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1324
+#: nova/exception.py:1300
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1329
+#: nova/exception.py:1305
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1335
+#: nova/exception.py:1311
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1339
+#: nova/exception.py:1315
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1343
+#: nova/exception.py:1319
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1347
+#: nova/exception.py:1323
 #, python-format
 msgid "Object action %(action)s failed because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1351
+#: nova/exception.py:1327
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1355
+#: nova/exception.py:1331
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1359
+#: nova/exception.py:1335
 #, python-format
 msgid ""
 "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1364
+#: nova/exception.py:1340
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1368
+#: nova/exception.py:1344
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1372
+#: nova/exception.py:1348
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1376
+#: nova/exception.py:1352
 #, python-format
 msgid ""
 "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1381
+#: nova/exception.py:1357
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1386
+#: nova/exception.py:1362
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
 
-#: nova/exception.py:1390
+#: nova/exception.py:1366
 #, python-format
 msgid "Number of retries to plugin (%(num_retries)d) exceeded."
 msgstr ""
 
-#: nova/exception.py:1394
+#: nova/exception.py:1370
 #, python-format
 msgid "There was an error with the download module %(module)s. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1399
+#: nova/exception.py:1375
 #, python-format
 msgid ""
 "The metadata for this location will not work with this module %(module)s.  "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1404
+#: nova/exception.py:1380
 #, python-format
 msgid "The method %(method_name)s is not implemented."
 msgstr ""
 
-#: nova/exception.py:1408
+#: nova/exception.py:1384
 #, python-format
 msgid "The module %(module)s is misconfigured: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:1412
+#: nova/exception.py:1424
 #, python-format
 msgid "Error when creating resource monitor: %(monitor)s"
 msgstr ""
 
-#: nova/exception.py:1416
+#: nova/exception.py:1388
 #, python-format
 msgid "The PCI address %(address)s has an incorrect format."
 msgstr ""
 
-#: nova/exception.py:1420
+#: nova/exception.py:1392
 #, python-format
 msgid "PCI device %(id)s not found"
 msgstr ""
 
-#: nova/exception.py:1424
+#: nova/exception.py:1396
 #, python-format
 msgid "PCI Device %(node_id)s:%(address)s not found."
 msgstr ""
 
-#: nova/exception.py:1428
+#: nova/exception.py:1440
 #, python-format
 msgid ""
 "PCI device %(compute_node_id)s:%(address)s is %(status)s instead of "
 "%(hopestatus)s"
 msgstr ""
 
-#: nova/exception.py:1434
+#: nova/exception.py:1446
 #, python-format
 msgid ""
 "PCI device %(compute_node_id)s:%(address)s is owned by %(owner)s instead of "
 "%(hopeowner)s"
 msgstr ""
 
-#: nova/exception.py:1440
+#: nova/exception.py:1452
 #, python-format
 msgid "PCI device request (%requests)s failed"
 msgstr ""
 
-#: nova/exception.py:1445
+#: nova/exception.py:1457
 #, python-format
 msgid ""
 "Attempt to consume PCI device %(compute_node_id)s:%(address)s from empty pool"
 msgstr ""
 
-#: nova/exception.py:1451
+#: nova/exception.py:1423
 #, python-format
 msgid "Invalid PCI alias definition: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1455
+#: nova/exception.py:1427
 #, python-format
 msgid "PCI alias %(alias)s is not defined"
 msgstr ""
 
-#: nova/exception.py:1460
+#: nova/exception.py:1432
 #, python-format
 msgid "Not enough parameters: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1465
+#: nova/exception.py:1437
 #, python-format
 msgid "Invalid PCI devices Whitelist config %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1469
+#: nova/exception.py:1441
 #, python-format
 msgid "Cannot change %(node_id)s to %(new_node_id)s"
 msgstr ""
 
-#: nova/exception.py:1479
+#: nova/exception.py:1451
 #, python-format
 msgid ""
 "Failed to prepare PCI device %(id)s for instance %(instance_uuid)s: "
 "%(reason)s"
 msgstr ""
 
-#: nova/exception.py:1484
+#: nova/exception.py:1456
 #, python-format
 msgid "Failed to detach PCI device %(dev)s: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1488
+#: nova/exception.py:1460
 #, python-format
 msgid "%(type)s hypervisor does not support PCI devices"
 msgstr ""
 
-#: nova/exception.py:1492
+#: nova/exception.py:1504
 #, python-format
 msgid "Key manager error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1496
+#: nova/exception.py:1508
 #, python-format
 msgid "Provided video model (%(model)s) is not supported."
 msgstr ""
 
+#: nova/exception.py:1512
+#, python-format
+msgid "The provided RNG device path: (%(path)s) is not present on the host."
+msgstr ""
+
+#: nova/exception.py:1517
+#, python-format
+msgid ""
+"The requested amount of video memory %(req_vram)d is higherthan the maximum "
+"allowed by flavor %(max_vram)d."
+msgstr ""
+
 #: nova/filters.py:70
 #, python-format
 msgid "Starting with %d host(s)"
@@ -1635,7 +1672,7 @@
 msgid "Filter %s returned 0 hosts"
 msgstr ""
 
-#: nova/filters.py:86
+#: nova/filters.py:83
 #, python-format
 msgid "Filter %(cls_name)s returned %(obj_len)d host(s)"
 msgstr ""
@@ -1666,218 +1703,229 @@
 msgid "Rule checked when requested rule is not found"
 msgstr "请求的规则找不到时的检查缺省规则。"
 
-#: nova/quota.py:1274
+#: nova/quota.py:1256
 #, python-format
 msgid "Created reservations %s"
 msgstr ""
 
-#: nova/quota.py:1297
+#: nova/quota.py:1279
 #, python-format
 msgid "Failed to commit reservations %s"
 msgstr ""
 
-#: nova/quota.py:1299
+#: nova/quota.py:1281
 #, python-format
 msgid "Committed reservations %s"
 msgstr ""
 
-#: nova/quota.py:1320
+#: nova/quota.py:1302
 #, python-format
 msgid "Failed to roll back reservations %s"
 msgstr ""
 
-#: nova/quota.py:1323
+#: nova/quota.py:1305
 #, python-format
 msgid "Rolled back reservations %s"
 msgstr ""
 
-#: nova/service.py:169
+#: nova/service.py:151
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:188 nova/openstack/common/rpc/service.py:49
+#: nova/service.py:201
 #, python-format
-msgid "Creating Consumer connection for Service %s"
-msgstr "为服务 %s 创建消费者"
+msgid "Creating RPC server for service %s"
+msgstr ""
 
-#: nova/service.py:206
+#: nova/service.py:188
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:273
+#: nova/service.py:285
 #, python-format
 msgid "Listening on %(host)s:%(port)s for debug connection"
 msgstr ""
 
-#: nova/service.py:280
+#: nova/service.py:292
 msgid ""
 "WARNING: Using the remote debug option changes how Nova uses the eventlet "
 "library to support async IO. This could result in failures that do not occur "
 "under normal operation. Use at your own risk."
 msgstr ""
 
-#: nova/service.py:301
+#: nova/service.py:268
 msgid "Service killed that has no database entry"
 msgstr "因无数据库记录，服务已被中止"
 
-#: nova/service.py:323
+#: nova/service.py:290
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:425
+#: nova/service.py:360
+#, python-format
+msgid ""
+"%(worker_name)s value of %(workers)s is invalid, must be greater than 0"
+msgstr ""
+
+#: nova/service.py:392
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:159
+#: nova/utils.py:161
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:365
+#: nova/utils.py:376
 #, python-format
 msgid "Couldn't get IPv4 : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:381
+#: nova/utils.py:392
 #, python-format
 msgid "IPv4 address is not found.: %s"
 msgstr ""
 
-#: nova/utils.py:384
+#: nova/utils.py:395
 #, python-format
 msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:399
+#: nova/utils.py:410
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "本地IP地址没有找到：%s"
 
-#: nova/utils.py:402
+#: nova/utils.py:413
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "无法连接到 %(interface)s 的本地IP：%(ex)s"
 
-#: nova/utils.py:423
+#: nova/utils.py:452
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "无效的后台：%s"
 
-#: nova/utils.py:468
+#: nova/utils.py:604
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "期望的对象类型：%s"
 
-#: nova/utils.py:497
+#: nova/utils.py:633
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr "不正确的server_string：%s"
 
-#: nova/utils.py:670 nova/openstack/common/fileutils.py:63
+#: nova/utils.py:829 nova/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:784 nova/virt/configdrive.py:178
+#: nova/utils.py:951 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:953
+#: nova/utils.py:1120
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:957
+#: nova/utils.py:1124
 #, python-format
 msgid "%(name)s has a minimum character requirement of %(min_length)s."
 msgstr ""
 
-#: nova/utils.py:962
+#: nova/utils.py:1129
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/utils.py:972
+#: nova/utils.py:1139
 #, python-format
 msgid "%(value_name)s must be an integer"
 msgstr ""
 
-#: nova/utils.py:978
+#: nova/utils.py:1145
 #, python-format
 msgid "%(value_name)s must be >= %(min_value)d"
 msgstr ""
 
-#: nova/utils.py:984
+#: nova/utils.py:1151
 #, python-format
 msgid "%(value_name)s must be <= %(max_value)d"
 msgstr ""
 
-#: nova/version.py:67
+#: nova/version.py:65
 #, python-format
 msgid "Failed to load %(cfgfile)s: %(ex)s"
 msgstr ""
 
-#: nova/wsgi.py:128
+#: nova/wsgi.py:132
+#, python-format
+msgid "Could not bind to %(host)s:%(port)s"
+msgstr ""
+
+#: nova/wsgi.py:125
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:143 nova/openstack/common/sslutils.py:52
+#: nova/wsgi.py:140 nova/openstack/common/sslutils.py:52
 #, python-format
 msgid "Unable to find cert_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:147 nova/openstack/common/sslutils.py:55
+#: nova/wsgi.py:144 nova/openstack/common/sslutils.py:55
 #, python-format
 msgid "Unable to find ca_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:151 nova/openstack/common/sslutils.py:58
+#: nova/wsgi.py:148 nova/openstack/common/sslutils.py:58
 #, python-format
 msgid "Unable to find key_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:155 nova/openstack/common/sslutils.py:61
+#: nova/wsgi.py:152 nova/openstack/common/sslutils.py:61
 msgid ""
 "When running server in SSL mode, you must specify both a cert_file and "
 "key_file option value in your configuration file"
 msgstr ""
 
-#: nova/wsgi.py:186
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:213
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr "关闭WSGI服务器"
 
-#: nova/wsgi.py:232
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr "WSGI服务器已经停止。"
 
-#: nova/wsgi.py:301
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr "你必须执行 __call__"
 
-#: nova/wsgi.py:490
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
 
-#: nova/api/auth.py:73
+#: nova/api/auth.py:71
 msgid "ratelimit_v3 is removed from v3 api."
 msgstr ""
 
-#: nova/api/auth.py:134
+#: nova/api/auth.py:117
 msgid "Invalid service catalog json."
 msgstr ""
 
-#: nova/api/auth.py:157
+#: nova/api/auth.py:140
 msgid "Sourcing roles from deprecated X-Role HTTP header"
 msgstr ""
 
@@ -1886,90 +1934,90 @@
 msgid "Request is too large."
 msgstr ""
 
-#: nova/api/validator.py:134
+#: nova/api/validator.py:132
 #, python-format
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:90
+#: nova/api/ec2/__init__.py:89
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr "FaultWrapper: %s"
 
-#: nova/api/ec2/__init__.py:161
+#: nova/api/ec2/__init__.py:160
 msgid "Too many failed authentications."
 msgstr "认证失败过多"
 
-#: nova/api/ec2/__init__.py:170
+#: nova/api/ec2/__init__.py:169
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and "
 "will be locked out for %(lock_mins)d minutes."
 msgstr "访问密钥 %(access_key)s 有错误 %(failures)d，认证失败将被锁定 %(lock_mins)d 分钟。"
 
-#: nova/api/ec2/__init__.py:189
+#: nova/api/ec2/__init__.py:188
 msgid "Signature not provided"
 msgstr "签名没有提供"
 
-#: nova/api/ec2/__init__.py:194
+#: nova/api/ec2/__init__.py:193
 msgid "Access key not provided"
 msgstr "访问密钥没有提供"
 
-#: nova/api/ec2/__init__.py:230 nova/api/ec2/__init__.py:246
+#: nova/api/ec2/__init__.py:229 nova/api/ec2/__init__.py:245
 msgid "Failure communicating with keystone"
 msgstr "与keystone交流失败"
 
-#: nova/api/ec2/__init__.py:245
+#: nova/api/ec2/__init__.py:244
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:306
+#: nova/api/ec2/__init__.py:305
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:326
+#: nova/api/ec2/__init__.py:325
 #, python-format
 msgid "action: %s"
 msgstr "执行: %s"
 
-#: nova/api/ec2/__init__.py:328
+#: nova/api/ec2/__init__.py:327
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr "arg: %(key)s\t\tval: %(value)s"
 
-#: nova/api/ec2/__init__.py:404
+#: nova/api/ec2/__init__.py:403
 #, python-format
 msgid ""
 "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr "为controller=%(controller)s 以及 action=%(action)s未验证的请求"
 
-#: nova/api/ec2/__init__.py:496
+#: nova/api/ec2/__init__.py:495
 #, python-format
 msgid "Unexpected %(ex_name)s raised: %(ex_str)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:498
+#: nova/api/ec2/__init__.py:497
 #, python-format
 msgid "Unexpected %(ex_name)s raised"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:502
+#: nova/api/ec2/__init__.py:501
 #, python-format
 msgid "%(ex_name)s raised: %(ex_str)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:504
+#: nova/api/ec2/__init__.py:503
 #, python-format
 msgid "%(ex_name)s raised"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:527
+#: nova/api/ec2/__init__.py:526
 #, python-format
 msgid "Environment: %s"
 msgstr "Environment: %s"
 
-#: nova/api/ec2/__init__.py:529
+#: nova/api/ec2/__init__.py:526
 msgid "Unknown error occurred."
 msgstr ""
 
@@ -1979,220 +2027,225 @@
 "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr "不支持的API请求：controller = %(controller)s，action = %(action)s"
 
-#: nova/api/ec2/cloud.py:394
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr "创建卷 %s 的快照"
 
-#: nova/api/ec2/cloud.py:419
+#: nova/api/ec2/cloud.py:427
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:435
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr "创建密钥对 %s"
 
-#: nova/api/ec2/cloud.py:447
+#: nova/api/ec2/cloud.py:455
 #, python-format
 msgid "Import key %s"
 msgstr "导入密钥 %s"
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:468
 #, python-format
 msgid "Delete key pair %s"
 msgstr "删除密钥对 %s"
 
-#: nova/api/ec2/cloud.py:602 nova/api/ec2/cloud.py:726
+#: nova/api/ec2/cloud.py:610 nova/api/ec2/cloud.py:734
 msgid "need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:607
+#: nova/api/ec2/cloud.py:615
 msgid "can't build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:615
+#: nova/api/ec2/cloud.py:623
 #, python-format
 msgid "Invalid IP protocol %(protocol)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:646 nova/api/ec2/cloud.py:679
+#: nova/api/ec2/cloud.py:654 nova/api/ec2/cloud.py:687
 msgid "No rule for the specified parameters."
 msgstr "对给定的参数无特定规则。"
 
-#: nova/api/ec2/cloud.py:754
+#: nova/api/ec2/cloud.py:762
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "获取实例 %s 控制台输出"
 
-#: nova/api/ec2/cloud.py:825
+#: nova/api/ec2/cloud.py:833
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr "从快照 %s 创建卷"
 
-#: nova/api/ec2/cloud.py:829 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:837 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "创建 %s GB的卷"
 
-#: nova/api/ec2/cloud.py:865
+#: nova/api/ec2/cloud.py:873
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr "把卷 %(volume_id)s 附加到实例 %(instance_id)s 上位置在 %(device)s"
 
-#: nova/api/ec2/cloud.py:894 nova/api/openstack/compute/contrib/volumes.py:490
+#: nova/api/ec2/cloud.py:902 nova/api/openstack/compute/contrib/volumes.py:490
 #, python-format
 msgid "Detach volume %s"
 msgstr "分离卷 %s"
 
-#: nova/api/ec2/cloud.py:1055
+#: nova/api/ec2/cloud.py:1062
 #, python-format
 msgid "vol = %s\n"
 msgstr "vol = %s\n"
 
-#: nova/api/ec2/cloud.py:1221
+#: nova/api/ec2/cloud.py:1222
 msgid "Allocate address"
 msgstr "分配地址"
 
-#: nova/api/ec2/cloud.py:1226
+#: nova/api/ec2/cloud.py:1227
 #, python-format
 msgid "Release address %s"
 msgstr "释放地址 %s"
 
-#: nova/api/ec2/cloud.py:1231
+#: nova/api/ec2/cloud.py:1232
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr "把地址 %(public_ip)s 关联到实例 %(instance_id)s"
 
-#: nova/api/ec2/cloud.py:1241
+#: nova/api/ec2/cloud.py:1242
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1250
 #: nova/api/openstack/compute/contrib/floating_ips.py:249
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1262
+#: nova/api/ec2/cloud.py:1263
 #, python-format
 msgid "Disassociate address %s"
 msgstr "取消地址 %s 的关联"
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/openstack/compute/servers.py:883
+#: nova/api/openstack/compute/plugins/v3/multiple_create.py:64
+msgid "min_count must be <= max_count"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1300
 msgid "Image must be available"
 msgstr "镜像必须可用。"
 
-#: nova/api/ec2/cloud.py:1388
+#: nova/api/ec2/cloud.py:1381
 msgid "Going to start terminating instances"
 msgstr "准备开始终止实例"
 
-#: nova/api/ec2/cloud.py:1399
+#: nova/api/ec2/cloud.py:1392
 #, python-format
 msgid "Reboot instance %r"
 msgstr "重启实例 %r"
 
-#: nova/api/ec2/cloud.py:1409
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to stop instances"
 msgstr "准备停止实例"
 
-#: nova/api/ec2/cloud.py:1419
+#: nova/api/ec2/cloud.py:1412
 msgid "Going to start instances"
 msgstr "准备启动实例"
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1503
 #, python-format
 msgid "De-registering image %s"
 msgstr "解除镜像 %s 的注册"
 
-#: nova/api/ec2/cloud.py:1526
+#: nova/api/ec2/cloud.py:1519
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1546
+#: nova/api/ec2/cloud.py:1539
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr "用id %(image_id)s 注册镜像 %(image_location)s"
 
-#: nova/api/ec2/cloud.py:1607
+#: nova/api/ec2/cloud.py:1600
 msgid "user or group not specified"
 msgstr "用户或者组没有确定"
 
-#: nova/api/ec2/cloud.py:1610
+#: nova/api/ec2/cloud.py:1603
 msgid "only group \"all\" is supported"
 msgstr "仅仅支持组\"all\""
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1606
 msgid "operation_type must be add or remove"
 msgstr "operation_type必须添加或者移除"
 
-#: nova/api/ec2/cloud.py:1615
+#: nova/api/ec2/cloud.py:1608
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "正在更新镜像 %s 的 publicity 属性"
 
-#: nova/api/ec2/cloud.py:1628
+#: nova/api/ec2/cloud.py:1621
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1654
+#: nova/api/ec2/cloud.py:1650
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not have a "
 "volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1685
+#: nova/api/ec2/cloud.py:1681
 #, python-format
 msgid "Couldn't stop instance within %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1704
+#: nova/api/ec2/cloud.py:1700
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1729 nova/api/ec2/cloud.py:1778
+#: nova/api/ec2/cloud.py:1725 nova/api/ec2/cloud.py:1774
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1733 nova/api/ec2/cloud.py:1782
+#: nova/api/ec2/cloud.py:1729 nova/api/ec2/cloud.py:1778
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1738 nova/api/ec2/cloud.py:1787
-#: nova/api/ec2/cloud.py:1844
+#: nova/api/ec2/cloud.py:1734 nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1840
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1742 nova/api/ec2/cloud.py:1791
+#: nova/api/ec2/cloud.py:1738 nova/api/ec2/cloud.py:1787
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1748 nova/api/ec2/cloud.py:1799
+#: nova/api/ec2/cloud.py:1744 nova/api/ec2/cloud.py:1795
 msgid "Expecting tagSet to be key/value pairs"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1755
+#: nova/api/ec2/cloud.py:1751
 msgid "Expecting both key and value to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1804
+#: nova/api/ec2/cloud.py:1800
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1878
+#: nova/api/ec2/cloud.py:1874
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/ec2utils.py:257
+#: nova/api/ec2/ec2utils.py:256
 msgid ""
 "Request must include either Timestamp or Expires, but cannot contain both"
 msgstr ""
 
-#: nova/api/ec2/ec2utils.py:275
+#: nova/api/ec2/ec2utils.py:274
 msgid "Timestamp is invalid."
 msgstr ""
 
@@ -2201,24 +2254,24 @@
 msgid "EC2 error response: %(code)s: %(message)s"
 msgstr ""
 
-#: nova/api/metadata/base.py:393
+#: nova/api/metadata/base.py:379
 #, python-format
 msgid "future versions %s hidden in version list"
 msgstr ""
 
-#: nova/api/metadata/handler.py:110
+#: nova/api/metadata/handler.py:111
 msgid ""
 "X-Instance-ID present in request headers. The "
 "'service_neutron_metadata_proxy' option must be enabled to process this "
 "header."
 msgstr ""
 
-#: nova/api/metadata/handler.py:136 nova/api/metadata/handler.py:143
+#: nova/api/metadata/handler.py:137 nova/api/metadata/handler.py:144
 #, python-format
 msgid "Failed to get metadata for ip: %s"
 msgstr "为ip： %s获取元数据失败"
 
-#: nova/api/metadata/handler.py:138 nova/api/metadata/handler.py:194
+#: nova/api/metadata/handler.py:139 nova/api/metadata/handler.py:190
 msgid "An unknown error has occurred. Please try your request again."
 msgstr "发生了一个未知的错误. 请重试你的请求."
 
@@ -2226,19 +2279,19 @@
 msgid "X-Instance-ID header is missing from request."
 msgstr ""
 
-#: nova/api/metadata/handler.py:158
+#: nova/api/metadata/handler.py:156
 msgid "X-Tenant-ID header is missing from request."
 msgstr ""
 
-#: nova/api/metadata/handler.py:160
+#: nova/api/metadata/handler.py:158
 msgid "Multiple X-Instance-ID headers found within request."
 msgstr ""
 
-#: nova/api/metadata/handler.py:162
+#: nova/api/metadata/handler.py:160
 msgid "Multiple X-Tenant-ID headers found within request."
 msgstr ""
 
-#: nova/api/metadata/handler.py:176
+#: nova/api/metadata/handler.py:172
 #, python-format
 msgid ""
 "X-Instance-ID-Signature: %(signature)s does not match the expected value: "
@@ -2246,16 +2299,16 @@
 "%(remote_address)s"
 msgstr ""
 
-#: nova/api/metadata/handler.py:185
+#: nova/api/metadata/handler.py:181
 msgid "Invalid proxy request signature."
 msgstr ""
 
-#: nova/api/metadata/handler.py:192 nova/api/metadata/handler.py:199
+#: nova/api/metadata/handler.py:188 nova/api/metadata/handler.py:195
 #, python-format
 msgid "Failed to get metadata for instance id: %s"
 msgstr ""
 
-#: nova/api/metadata/handler.py:203
+#: nova/api/metadata/handler.py:201
 #, python-format
 msgid ""
 "Tenant_id %(tenant_id)s does not match tenant_id of instance %(instance_id)s."
@@ -2273,234 +2326,242 @@
 msgid "failed to load json"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:85
+#: nova/api/openstack/__init__.py:83
 #, python-format
 msgid "Caught error: %s"
 msgstr "抓到错误：%s"
 
-#: nova/api/openstack/__init__.py:94
+#: nova/api/openstack/__init__.py:92
 #, python-format
 msgid "%(url)s returned with HTTP %(status)d"
 msgstr "%(url)s 随HTTP %(status)d返回"
 
-#: nova/api/openstack/__init__.py:187
+#: nova/api/openstack/__init__.py:185
 msgid "Must specify an ExtensionManager class"
 msgstr "必须明确一个ExtensionManager类"
 
-#: nova/api/openstack/__init__.py:198 nova/api/openstack/__init__.py:361
+#: nova/api/openstack/__init__.py:202
 #, python-format
-msgid "Extended resource: %s"
-msgstr "扩展资源：%s"
+msgid "Extending resource: %s"
+msgstr ""
 
-#: nova/api/openstack/__init__.py:233 nova/api/openstack/__init__.py:408
+#: nova/api/openstack/__init__.py:231 nova/api/openstack/__init__.py:406
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr "扩展%(ext_name)s：无法扩展资源 %(collection)s：没有那种资源"
 
-#: nova/api/openstack/__init__.py:238 nova/api/openstack/__init__.py:413
+#: nova/api/openstack/__init__.py:242
 #, python-format
-msgid "Extension %(ext_name)s extending resource: %(collection)s"
-msgstr "扩展资源的扩展 %(ext_name)s：%(collection)s"
+msgid "Extension %(ext_name)s extended resource: %(collection)s"
+msgstr ""
 
-#: nova/api/openstack/__init__.py:281
-#: nova/api/openstack/compute/plugins/v3/servers.py:349
+#: nova/api/openstack/__init__.py:279
+#: nova/api/openstack/compute/plugins/v3/servers.py:354
 #, python-format
 msgid "Not loading %s because it is in the blacklist"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:286
-#: nova/api/openstack/compute/plugins/v3/servers.py:354
+#: nova/api/openstack/__init__.py:284
+#: nova/api/openstack/compute/plugins/v3/servers.py:359
 #, python-format
 msgid "Not loading %s because it is not in the whitelist"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:297
+#: nova/api/openstack/__init__.py:295
 #, python-format
 msgid "v3 API Extension Blacklist: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:299
+#: nova/api/openstack/__init__.py:297
 #, python-format
 msgid "v3 API Extension Whitelist: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:306
+#: nova/api/openstack/__init__.py:304
 #, python-format
 msgid "Extensions in both blacklist and whitelist: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:330
+#: nova/api/openstack/__init__.py:328
 #, python-format
 msgid "Missing core API extensions: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:358
+#: nova/api/openstack/__init__.py:356
 #, python-format
 msgid "Running _register_resources on %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:400
+#: nova/api/openstack/__init__.py:196 nova/api/openstack/__init__.py:359
+#, python-format
+msgid "Extended resource: %s"
+msgstr "扩展资源：%s"
+
+#: nova/api/openstack/__init__.py:398
 #, python-format
 msgid "Running _register_controllers on %s"
 msgstr ""
 
-#: nova/api/openstack/common.py:123
+#: nova/api/openstack/__init__.py:236 nova/api/openstack/__init__.py:411
+#, python-format
+msgid "Extension %(ext_name)s extending resource: %(collection)s"
+msgstr "扩展资源的扩展 %(ext_name)s：%(collection)s"
+
+#: nova/api/openstack/common.py:119
 #, python-format
 msgid ""
 "status is UNKNOWN from vm_state=%(vm_state)s task_state=%(task_state)s. Bad "
 "upgrade or db corrupted?"
 msgstr ""
 
-#: nova/api/openstack/common.py:173
+#: nova/api/openstack/common.py:166
 #, python-format
 msgid "%s param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:176
+#: nova/api/openstack/common.py:169
 #, python-format
 msgid "%s param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:201
+#: nova/api/openstack/common.py:194
 msgid "offset param must be an integer"
 msgstr "offset 参数必须是整数"
 
-#: nova/api/openstack/common.py:207
+#: nova/api/openstack/common.py:200
 msgid "limit param must be an integer"
 msgstr "limit 参数必须是整数"
 
-#: nova/api/openstack/common.py:211
+#: nova/api/openstack/common.py:204
 msgid "limit param must be positive"
 msgstr "limit参数必须是正数"
 
-#: nova/api/openstack/common.py:215
+#: nova/api/openstack/common.py:208
 msgid "offset param must be positive"
 msgstr "offset 参数必须是正数"
 
-#: nova/api/openstack/common.py:250 nova/api/openstack/compute/flavors.py:148
-#: nova/api/openstack/compute/servers.py:590
-#: nova/api/openstack/compute/plugins/v3/flavors.py:156
-#: nova/api/openstack/compute/plugins/v3/servers.py:587
+#: nova/api/openstack/common.py:243 nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/plugins/v3/servers.py:561
 #, python-format
 msgid "marker [%s] not found"
 msgstr "没有找到标记 [%s]"
 
-#: nova/api/openstack/common.py:290
+#: nova/api/openstack/common.py:283
 #, python-format
 msgid "href %s does not contain version"
 msgstr "href %s 不包含版本"
 
-#: nova/api/openstack/common.py:305
+#: nova/api/openstack/common.py:298
 msgid "Image metadata limit exceeded"
 msgstr "超过镜像元数据限制"
 
-#: nova/api/openstack/common.py:313
+#: nova/api/openstack/common.py:306
 msgid "Image metadata key cannot be blank"
 msgstr ""
 
-#: nova/api/openstack/common.py:316
+#: nova/api/openstack/common.py:309
 msgid "Image metadata key too long"
 msgstr ""
 
-#: nova/api/openstack/common.py:319
+#: nova/api/openstack/common.py:312
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:382
+#: nova/api/openstack/common.py:375
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr "'%(action)s' 针对处于 %(attr)s %(state)s 的实例是无法进行"
 
-#: nova/api/openstack/common.py:385
+#: nova/api/openstack/common.py:378
 #, python-format
 msgid "Cannot '%s' an instance which has never been active"
 msgstr ""
 
-#: nova/api/openstack/common.py:388
+#: nova/api/openstack/common.py:381
 #, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:468
+#: nova/api/openstack/common.py:461
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr "拒绝快照请求，快照当前未被激活"
 
-#: nova/api/openstack/common.py:470
+#: nova/api/openstack/common.py:463
 msgid "Instance snapshots are not permitted at this time."
 msgstr "该时刻实例快照是不允许的。"
 
-#: nova/api/openstack/extensions.py:199
+#: nova/api/openstack/extensions.py:198
 #, python-format
 msgid "Loaded extension: %s"
 msgstr "加载的扩展：%s"
 
-#: nova/api/openstack/extensions.py:238
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext name: %s"
 msgstr "Ext name: %s"
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext alias: %s"
 msgstr "Ext alias: %s"
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:239
 #: nova/api/openstack/compute/plugins/__init__.py:49
 #, python-format
 msgid "Ext description: %s"
 msgstr "Ext 描述: %s"
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:241
 #: nova/api/openstack/compute/plugins/__init__.py:51
 #, python-format
 msgid "Ext namespace: %s"
 msgstr "Ext 命名空间: %s"
 
-#: nova/api/openstack/extensions.py:243
+#: nova/api/openstack/extensions.py:242
 #, python-format
 msgid "Ext updated: %s"
 msgstr "Ext updated: %s"
 
-#: nova/api/openstack/extensions.py:245
+#: nova/api/openstack/extensions.py:244
 #: nova/api/openstack/compute/plugins/__init__.py:54
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr "加载扩展发生异常：%s"
 
-#: nova/api/openstack/extensions.py:259
+#: nova/api/openstack/extensions.py:258
 #, python-format
 msgid "Loading extension %s"
 msgstr "正在加载扩展 %s"
 
-#: nova/api/openstack/extensions.py:268
+#: nova/api/openstack/extensions.py:267
 #, python-format
 msgid "Calling extension factory %s"
 msgstr "调用扩展工厂 %s"
 
-#: nova/api/openstack/extensions.py:280
+#: nova/api/openstack/extensions.py:279
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr "加载扩展 %(ext_factory)s 失败：%(exc)s"
 
-#: nova/api/openstack/extensions.py:351
+#: nova/api/openstack/extensions.py:350
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr "加载扩展 %(classpath)s 失败：%(exc)s"
 
-#: nova/api/openstack/extensions.py:374
+#: nova/api/openstack/extensions.py:373
 #, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:492
+#: nova/api/openstack/extensions.py:486
 msgid "Unexpected exception in API method"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:493
+#: nova/api/openstack/extensions.py:487
 #, python-format
 msgid ""
 "Unexpected API Error. Please report this at http://bugs.launchpad.net/nova/ "
@@ -2508,94 +2569,94 @@
 "%s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:240 nova/api/openstack/wsgi.py:658
+#: nova/api/openstack/wsgi.py:222 nova/api/openstack/wsgi.py:640
 msgid "cannot understand JSON"
 msgstr "无法理解JSON"
 
-#: nova/api/openstack/wsgi.py:663
+#: nova/api/openstack/wsgi.py:645
 msgid "too many body keys"
 msgstr "过多主体密钥"
 
-#: nova/api/openstack/wsgi.py:707
+#: nova/api/openstack/wsgi.py:689
 #, python-format
 msgid "Exception handling resource: %s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:711
+#: nova/api/openstack/wsgi.py:693
 #, python-format
 msgid "Fault thrown: %s"
 msgstr "错误抛出: %s"
 
-#: nova/api/openstack/wsgi.py:714
+#: nova/api/openstack/wsgi.py:696
 #, python-format
 msgid "HTTP exception thrown: %s"
 msgstr "HTTP 异常抛出：%s"
 
-#: nova/api/openstack/wsgi.py:828
+#: nova/api/openstack/wsgi.py:810
 msgid "Unrecognized Content-Type provided in request"
 msgstr "请求中提供了无法识别的 Content-Type"
 
-#: nova/api/openstack/wsgi.py:943
+#: nova/api/openstack/wsgi.py:930
 #, python-format
 msgid "There is no such action: %s"
 msgstr "没有该动作：%s"
 
-#: nova/api/openstack/wsgi.py:946 nova/api/openstack/wsgi.py:969
+#: nova/api/openstack/wsgi.py:933 nova/api/openstack/wsgi.py:953
 #: nova/api/openstack/compute/server_metadata.py:59
 #: nova/api/openstack/compute/server_metadata.py:77
 #: nova/api/openstack/compute/server_metadata.py:102
 #: nova/api/openstack/compute/server_metadata.py:127
-#: nova/api/openstack/compute/contrib/admin_actions.py:245
-#: nova/api/openstack/compute/contrib/evacuate.py:48
-#: nova/api/openstack/compute/plugins/v3/admin_actions.py:222
-#: nova/api/openstack/compute/plugins/v3/evacuate.py:50
+#: nova/api/openstack/compute/contrib/admin_actions.py:224
+#: nova/api/openstack/compute/contrib/evacuate.py:49
+#: nova/api/openstack/compute/plugins/v3/admin_actions.py:217
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:51
 #: nova/api/openstack/compute/plugins/v3/server_metadata.py:87
 #: nova/api/openstack/compute/plugins/v3/server_metadata.py:104
 #: nova/api/openstack/compute/plugins/v3/server_metadata.py:128
 msgid "Malformed request body"
 msgstr "错误格式的请求主体"
 
-#: nova/api/openstack/wsgi.py:950
+#: nova/api/openstack/wsgi.py:937
 #, python-format
 msgid "Action: '%(action)s', body: %(body)s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:954
+#: nova/api/openstack/wsgi.py:941
 #, python-format
 msgid "Calling method %s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:966
+#: nova/api/openstack/wsgi.py:950
 msgid "Unsupported Content-Type"
 msgstr "不支持的Content-Type"
 
-#: nova/api/openstack/wsgi.py:978
+#: nova/api/openstack/wsgi.py:962
 #, python-format
 msgid ""
 "Malformed request URL: URL's project_id '%(project_id)s' doesn't match "
 "Context's project_id '%(context_project_id)s'"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:1217
+#: nova/api/openstack/wsgi.py:1202
 #, python-format
 msgid "Returning %(code)s to user: %(explanation)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:278
+#: nova/api/openstack/xmlutil.py:271
 msgid "element is not a child"
 msgstr "元素不是子节点"
 
-#: nova/api/openstack/xmlutil.py:436
+#: nova/api/openstack/xmlutil.py:420
 msgid "root element selecting a list"
 msgstr "根元素选择列表"
 
-#: nova/api/openstack/xmlutil.py:759
+#: nova/api/openstack/xmlutil.py:743
 #, python-format
 msgid ""
 "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr "模板数不匹配；把slave %(slavetag)s 添加到master %(mastertag)s"
 
-#: nova/api/openstack/xmlutil.py:879
+#: nova/api/openstack/xmlutil.py:863
 msgid "subclasses must implement construct()!"
 msgstr "subclasses必须执行construct()!"
 
@@ -2604,7 +2665,7 @@
 msgstr "正在初始化扩展管理员。"
 
 #: nova/api/openstack/compute/flavors.py:109
-#: nova/api/openstack/compute/plugins/v3/flavors.py:116
+#: nova/api/openstack/compute/plugins/v3/flavors.py:117
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
@@ -2631,16 +2692,16 @@
 
 #: nova/api/openstack/compute/image_metadata.py:84
 #: nova/api/openstack/compute/server_metadata.py:81
-#: nova/api/openstack/compute/contrib/flavorextraspecs.py:87
-#: nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py:97
+#: nova/api/openstack/compute/contrib/flavorextraspecs.py:86
+#: nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py:90
 #: nova/api/openstack/compute/plugins/v3/server_metadata.py:108
 msgid "Request body and URI mismatch"
 msgstr "请求主体和URI不匹配"
 
 #: nova/api/openstack/compute/image_metadata.py:87
 #: nova/api/openstack/compute/server_metadata.py:85
-#: nova/api/openstack/compute/contrib/flavorextraspecs.py:90
-#: nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py:100
+#: nova/api/openstack/compute/contrib/flavorextraspecs.py:89
+#: nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py:93
 #: nova/api/openstack/compute/plugins/v3/server_metadata.py:112
 msgid "Request body contains too many items"
 msgstr "请求主体包含太多items"
@@ -2664,6 +2725,7 @@
 msgstr "实例并不是指定网络的成员"
 
 #: nova/api/openstack/compute/limits.py:164
+#: nova/api/openstack/compute/plugins/v3/limits.py:147
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
@@ -2671,6 +2733,7 @@
 msgstr "只能有 %(value)s 个 %(verb)s 请求发送给 %(uri)s 限定是每一个 %(unit_string)s。"
 
 #: nova/api/openstack/compute/limits.py:292
+#: nova/api/openstack/compute/plugins/v3/limits.py:274
 msgid "This request was rate-limited."
 msgstr "这个请求受到频率限制。"
 
@@ -2690,378 +2753,399 @@
 msgid "Metadata item was not found"
 msgstr "元数据项目未找到"
 
-#: nova/api/openstack/compute/servers.py:538
-#: nova/api/openstack/compute/contrib/cells.py:405
-#: nova/api/openstack/compute/plugins/v3/cells.py:413
+#: nova/api/openstack/compute/servers.py:81
+msgid ""
+"XML support has been deprecated and will be removed in the Juno release."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:534
+#: nova/api/openstack/compute/contrib/cells.py:401
+#: nova/api/openstack/compute/plugins/v3/cells.py:409
 msgid "Invalid changes-since value"
 msgstr "无效的changes-since值"
 
-#: nova/api/openstack/compute/servers.py:557
-#: nova/api/openstack/compute/plugins/v3/servers.py:539
+#: nova/api/openstack/compute/servers.py:553
+#: nova/api/openstack/compute/plugins/v3/servers.py:544
 msgid "Only administrators may list deleted instances"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:593
-#: nova/api/openstack/compute/plugins/v3/servers.py:590
+#: nova/api/openstack/compute/servers.py:573
+#: nova/api/openstack/compute/plugins/v3/servers.py:564
 #, python-format
 msgid "Flavor '%s' could not be found "
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:611
-#: nova/api/openstack/compute/servers.py:757
-#: nova/api/openstack/compute/servers.py:1061
-#: nova/api/openstack/compute/servers.py:1174
-#: nova/api/openstack/compute/servers.py:1349
-#: nova/api/openstack/compute/plugins/v3/servers.py:608
-#: nova/api/openstack/compute/plugins/v3/servers.py:723
-#: nova/api/openstack/compute/plugins/v3/servers.py:929
-#: nova/api/openstack/compute/plugins/v3/servers.py:1041
-#: nova/api/openstack/compute/plugins/v3/servers.py:1163
+#: nova/api/openstack/compute/servers.py:591
+#: nova/api/openstack/compute/servers.py:737
+#: nova/api/openstack/compute/servers.py:1038
+#: nova/api/openstack/compute/servers.py:1143
+#: nova/api/openstack/compute/servers.py:1320
+#: nova/api/openstack/compute/plugins/v3/servers.py:582
+#: nova/api/openstack/compute/plugins/v3/servers.py:707
+#: nova/api/openstack/compute/plugins/v3/servers.py:934
+#: nova/api/openstack/compute/plugins/v3/servers.py:1039
+#: nova/api/openstack/compute/plugins/v3/servers.py:1183
 msgid "Instance could not be found"
 msgstr "无法找到实例"
 
-#: nova/api/openstack/compute/servers.py:642
+#: nova/api/openstack/compute/servers.py:622
+#: nova/api/openstack/compute/plugins/v3/personalities.py:88
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr "错误的个性化格式：丢失 %s"
 
-#: nova/api/openstack/compute/servers.py:645
+#: nova/api/openstack/compute/servers.py:625
+#: nova/api/openstack/compute/plugins/v3/personalities.py:91
 msgid "Bad personality format"
 msgstr "损坏的个性化格式"
 
-#: nova/api/openstack/compute/servers.py:648
+#: nova/api/openstack/compute/servers.py:628
+#: nova/api/openstack/compute/plugins/v3/personalities.py:94
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr "个性化 %s 的内容无法解码"
 
-#: nova/api/openstack/compute/servers.py:663
+#: nova/api/openstack/compute/servers.py:676
 msgid "Unknown argument : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:666
-#: nova/api/openstack/compute/plugins/v3/servers.py:653
+#: nova/api/openstack/compute/servers.py:646
+#: nova/api/openstack/compute/plugins/v3/servers.py:627
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:676
-#: nova/api/openstack/compute/plugins/v3/servers.py:669
+#: nova/api/openstack/compute/servers.py:656
+#: nova/api/openstack/compute/plugins/v3/servers.py:643
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr "损坏的网络格式：网络 uuid 格式不正确 (%s)"
 
-#: nova/api/openstack/compute/servers.py:686
-#: nova/api/openstack/compute/plugins/v3/servers.py:642
+#: nova/api/openstack/compute/servers.py:666
+#: nova/api/openstack/compute/plugins/v3/servers.py:616
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr "不正确的固定 IP 地址(%s)"
 
-#: nova/api/openstack/compute/servers.py:699
-#: nova/api/openstack/compute/plugins/v3/servers.py:684
+#: nova/api/openstack/compute/servers.py:679
+#: nova/api/openstack/compute/plugins/v3/servers.py:658
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr "不允许重复的网络(%s)"
 
-#: nova/api/openstack/compute/servers.py:705
-#: nova/api/openstack/compute/plugins/v3/servers.py:690
+#: nova/api/openstack/compute/servers.py:685
+#: nova/api/openstack/compute/plugins/v3/servers.py:664
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr "错误的网络格式：丢失%s"
 
-#: nova/api/openstack/compute/servers.py:708
-#: nova/api/openstack/compute/servers.py:809
-#: nova/api/openstack/compute/plugins/v3/servers.py:693
+#: nova/api/openstack/compute/servers.py:688
+#: nova/api/openstack/compute/servers.py:789
+#: nova/api/openstack/compute/plugins/v3/servers.py:667
 msgid "Bad networks format"
 msgstr "错误的网络格式"
 
-#: nova/api/openstack/compute/servers.py:734
+#: nova/api/openstack/compute/servers.py:714
 msgid "Userdata content cannot be decoded"
 msgstr "Userdata 内容无法解码"
 
-#: nova/api/openstack/compute/servers.py:739
+#: nova/api/openstack/compute/servers.py:719
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr "accessIPv4 不是正确的IPv4格式"
 
-#: nova/api/openstack/compute/servers.py:744
+#: nova/api/openstack/compute/servers.py:724
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:773
-#: nova/api/openstack/compute/plugins/v3/servers.py:739
+#: nova/api/openstack/compute/servers.py:753
+#: nova/api/openstack/compute/plugins/v3/servers.py:723
 msgid "Server name is not defined"
 msgstr "服务器名称未定义"
 
-#: nova/api/openstack/compute/servers.py:825
-#: nova/api/openstack/compute/servers.py:953
+#: nova/api/openstack/compute/servers.py:805
+#: nova/api/openstack/compute/servers.py:932
 msgid "Invalid flavorRef provided."
 msgstr "提供了无效的flavorRef。"
 
-#: nova/api/openstack/compute/servers.py:865
+#: nova/api/openstack/compute/servers.py:845
 msgid ""
 "Using different block_device_mapping syntaxes is not allowed in the same "
 "request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:903
-#: nova/api/openstack/compute/plugins/v3/multiple_create.py:66
-msgid "min_count must be <= max_count"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:950
-#: nova/api/openstack/compute/plugins/v3/servers.py:815
+#: nova/api/openstack/compute/servers.py:929
+#: nova/api/openstack/compute/plugins/v3/servers.py:808
 msgid "Can not find requested image"
 msgstr "无法找到请求的镜像"
 
-#: nova/api/openstack/compute/servers.py:956
-#: nova/api/openstack/compute/plugins/v3/servers.py:821
+#: nova/api/openstack/compute/servers.py:935
+#: nova/api/openstack/compute/plugins/v3/servers.py:814
 msgid "Invalid key_name provided."
 msgstr "提供了无效的key_name。"
 
-#: nova/api/openstack/compute/servers.py:959
-#: nova/api/openstack/compute/plugins/v3/servers.py:824
+#: nova/api/openstack/compute/servers.py:938
+#: nova/api/openstack/compute/plugins/v3/servers.py:817
 msgid "Invalid config_drive provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1023
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1050
+#: nova/api/openstack/compute/servers.py:1027
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1076
-#: nova/api/openstack/compute/servers.py:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:944
-#: nova/api/openstack/compute/plugins/v3/servers.py:960
+#: nova/api/openstack/compute/servers.py:1053
+#: nova/api/openstack/compute/servers.py:1070
+#: nova/api/openstack/compute/plugins/v3/servers.py:949
+#: nova/api/openstack/compute/plugins/v3/servers.py:966
 msgid "Instance has not been resized."
 msgstr "实例还没有调整大小。"
 
-#: nova/api/openstack/compute/servers.py:1096
-#: nova/api/openstack/compute/plugins/v3/servers.py:963
+#: nova/api/openstack/compute/servers.py:1073
+#: nova/api/openstack/compute/plugins/v3/servers.py:969
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1110
-#: nova/api/openstack/compute/plugins/v3/servers.py:977
+#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/plugins/v3/servers.py:662
 msgid "Argument 'type' for reboot must be a string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/plugins/v3/servers.py:983
+#: nova/api/openstack/compute/servers.py:1089
+#: nova/api/openstack/compute/plugins/v3/servers.py:985
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr "重启的参数'type'既不是HARD也不是SOFT"
 
-#: nova/api/openstack/compute/servers.py:1120
-#: nova/api/openstack/compute/plugins/v3/servers.py:987
+#: nova/api/openstack/compute/servers.py:1093
+#: nova/api/openstack/compute/plugins/v3/servers.py:989
 msgid "Missing argument 'type' for reboot"
 msgstr "缺少重启的参数'type'"
 
-#: nova/api/openstack/compute/servers.py:1146
-#: nova/api/openstack/compute/plugins/v3/servers.py:1013
+#: nova/api/openstack/compute/servers.py:1115
+#: nova/api/openstack/compute/plugins/v3/servers.py:1011
 msgid "Unable to locate requested flavor."
 msgstr "无法找到请求的类型。"
 
-#: nova/api/openstack/compute/servers.py:1149
-#: nova/api/openstack/compute/plugins/v3/servers.py:1016
+#: nova/api/openstack/compute/servers.py:1118
+#: nova/api/openstack/compute/plugins/v3/servers.py:1014
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1155
-#: nova/api/openstack/compute/plugins/v3/servers.py:1022
+#: nova/api/openstack/compute/servers.py:1124
+#: nova/api/openstack/compute/plugins/v3/servers.py:1020
 msgid ""
 "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1159
-#: nova/api/openstack/compute/plugins/v3/servers.py:1026
+#: nova/api/openstack/compute/servers.py:1128
+#: nova/api/openstack/compute/plugins/v3/servers.py:1024
 msgid "Image that the instance was started with could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1163
-#: nova/api/openstack/compute/plugins/v3/servers.py:1030
+#: nova/api/openstack/compute/servers.py:1132
+#: nova/api/openstack/compute/plugins/v3/servers.py:1028
 msgid "Invalid instance image."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1184
+#: nova/api/openstack/compute/servers.py:1153
 msgid "Missing imageRef attribute"
 msgstr "缺少属性imageRef"
 
-#: nova/api/openstack/compute/servers.py:1193
+#: nova/api/openstack/compute/servers.py:1162
 msgid "Invalid imageRef provided."
 msgstr "提供了无效的imageRef。"
 
-#: nova/api/openstack/compute/servers.py:1224
+#: nova/api/openstack/compute/servers.py:1193
 msgid "Missing flavorRef attribute"
 msgstr "缺少属性flavorRef"
 
-#: nova/api/openstack/compute/servers.py:1237
+#: nova/api/openstack/compute/servers.py:1206
 msgid "No adminPass was specified"
 msgstr "没有确定adminPass"
 
-#: nova/api/openstack/compute/servers.py:1245
-#: nova/api/openstack/compute/plugins/v3/admin_password.py:78
+#: nova/api/openstack/compute/servers.py:1216
+#: nova/api/openstack/compute/plugins/v3/admin_password.py:76
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1254
+#: nova/api/openstack/compute/servers.py:1225
+#: nova/api/openstack/compute/plugins/v3/servers.py:1087
 msgid "Unable to parse metadata key/value pairs."
 msgstr "无法解析元数据键/值对"
 
-#: nova/api/openstack/compute/servers.py:1267
+#: nova/api/openstack/compute/servers.py:1238
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr "调整大小请求中的属性'flavorRef'无效。"
 
-#: nova/api/openstack/compute/servers.py:1270
+#: nova/api/openstack/compute/servers.py:1241
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr "调整大小请求要求有属性'flavorRef'。"
 
-#: nova/api/openstack/compute/servers.py:1288
+#: nova/api/openstack/compute/servers.py:1259
 #: nova/api/openstack/compute/contrib/aggregates.py:160
+#: nova/api/openstack/compute/contrib/coverage_ext.py:286
 #: nova/api/openstack/compute/contrib/flavormanage.py:59
 #: nova/api/openstack/compute/contrib/keypairs.py:89
-#: nova/api/openstack/compute/plugins/v3/aggregates.py:46
-#: nova/api/openstack/compute/plugins/v3/aggregates.py:80
-#: nova/api/openstack/compute/plugins/v3/aggregates.py:118
-#: nova/api/openstack/compute/plugins/v3/aggregates.py:199
+#: nova/api/openstack/compute/plugins/v3/aggregates.py:45
+#: nova/api/openstack/compute/plugins/v3/aggregates.py:79
+#: nova/api/openstack/compute/plugins/v3/aggregates.py:117
+#: nova/api/openstack/compute/plugins/v3/aggregates.py:198
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:91
-#: nova/api/openstack/compute/plugins/v3/servers.py:1117
+#: nova/api/openstack/compute/plugins/v3/servers.py:1124
 msgid "Invalid request body"
 msgstr "无效的请求主体"
 
-#: nova/api/openstack/compute/servers.py:1294
+#: nova/api/openstack/compute/servers.py:1265
 msgid "Could not parse imageRef from request."
 msgstr "无法解析请求中的imageRef。"
 
-#: nova/api/openstack/compute/servers.py:1355
-#: nova/api/openstack/compute/plugins/v3/servers.py:1169
+#: nova/api/openstack/compute/servers.py:1326
+#: nova/api/openstack/compute/plugins/v3/servers.py:1189
 msgid "Cannot find image for rebuild"
 msgstr "无法找到用来重新创建的镜像"
 
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1359
 msgid "createImage entity requires name attribute"
 msgstr "实体createImage需要属性name"
 
-#: nova/api/openstack/compute/servers.py:1458
+#: nova/exception.py:281 nova/api/openstack/compute/servers.py:1368
+#: nova/api/openstack/compute/contrib/admin_actions.py:255
+#: nova/api/openstack/compute/plugins/v3/admin_actions.py:248
+#: nova/api/openstack/compute/plugins/v3/servers.py:1231
+msgid "Invalid metadata"
+msgstr "无效的元数据"
+
+#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1427
 msgid "Invalid adminPass"
 msgstr "无效的adminPass"
 
-#: nova/api/openstack/compute/servers.py:1484
-#: nova/api/openstack/compute/plugins/v3/servers.py:1367
+#: nova/api/openstack/compute/servers.py:1453
+#: nova/api/openstack/compute/plugins/v3/servers.py:1388
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:63
-#: nova/api/openstack/compute/contrib/admin_actions.py:84
-#: nova/api/openstack/compute/contrib/admin_actions.py:105
-#: nova/api/openstack/compute/contrib/admin_actions.py:126
-#: nova/api/openstack/compute/contrib/admin_actions.py:166
-#: nova/api/openstack/compute/contrib/admin_actions.py:184
-#: nova/api/openstack/compute/contrib/admin_actions.py:202
-#: nova/api/openstack/compute/contrib/admin_actions.py:220
-#: nova/api/openstack/compute/contrib/admin_actions.py:375
+#: nova/api/openstack/compute/contrib/admin_actions.py:60
+#: nova/api/openstack/compute/contrib/admin_actions.py:79
+#: nova/api/openstack/compute/contrib/admin_actions.py:98
+#: nova/api/openstack/compute/contrib/admin_actions.py:117
+#: nova/api/openstack/compute/contrib/admin_actions.py:149
+#: nova/api/openstack/compute/contrib/admin_actions.py:165
+#: nova/api/openstack/compute/contrib/admin_actions.py:181
+#: nova/api/openstack/compute/contrib/admin_actions.py:199
+#: nova/api/openstack/compute/contrib/admin_actions.py:337
 #: nova/api/openstack/compute/contrib/multinic.py:42
 #: nova/api/openstack/compute/contrib/rescue.py:43
 #: nova/api/openstack/compute/contrib/shelve.py:43
-#: nova/api/openstack/compute/plugins/v3/rescue.py:47
+#: nova/api/openstack/compute/plugins/v3/rescue.py:44
 msgid "Server not found"
 msgstr "没有找到服务器"
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:66
+#: nova/api/openstack/compute/contrib/admin_actions.py:65
+msgid "Virt driver does not implement pause function."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:63
 #, python-format
 msgid "Compute.api::pause %s"
 msgstr "Compute.api::暂停 %s"
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:87
+#: nova/api/openstack/compute/contrib/admin_actions.py:89
+msgid "Virt driver does not implement unpause function."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:82
 #, python-format
 msgid "Compute.api::unpause %s"
 msgstr "Compute.api::取消暂停 %s"
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:108
+#: nova/api/openstack/compute/contrib/admin_actions.py:101
 #, python-format
 msgid "compute.api::suspend %s"
 msgstr "compute.api::挂起 %s"
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:129
+#: nova/api/openstack/compute/contrib/admin_actions.py:120
 #, python-format
 msgid "compute.api::resume %s"
 msgstr "compute.api::resume %s"
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:153
+#: nova/api/openstack/compute/contrib/admin_actions.py:136
 #, python-format
 msgid "Error in migrate %s"
 msgstr "迁移错误 %s"
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:171
+#: nova/api/openstack/compute/contrib/admin_actions.py:152
 #, python-format
 msgid "Compute.api::reset_network %s"
 msgstr "Compute.api::reset_network %s"
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:189
+#: nova/api/openstack/compute/contrib/admin_actions.py:168
 #, python-format
 msgid "Compute.api::inject_network_info %s"
 msgstr "Compute.api::inject_network_info %s"
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:205
+#: nova/api/openstack/compute/contrib/admin_actions.py:184
 #, python-format
 msgid "Compute.api::lock %s"
 msgstr "compute.api::加锁 %s"
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:223
+#: nova/api/openstack/compute/contrib/admin_actions.py:202
 #, python-format
 msgid "Compute.api::unlock %s"
 msgstr "compute.api::解锁 %s"
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:253
+#: nova/api/openstack/compute/contrib/admin_actions.py:232
 #, python-format
 msgid "createBackup entity requires %s attribute"
 msgstr "实体createBackup需要有属性 %s"
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:257
+#: nova/api/openstack/compute/contrib/admin_actions.py:236
 msgid "Malformed createBackup entity"
 msgstr "错误格式的实体createBackup"
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:263
+#: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "createBackup attribute 'rotation' must be an integer"
 msgstr "createBackup的属性 'rotation'必须是整数"
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:266
+#: nova/api/openstack/compute/contrib/admin_actions.py:245
 msgid ""
 "createBackup attribute 'rotation' must be greater than or equal to zero"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:282
+#: nova/api/openstack/compute/contrib/admin_actions.py:261
 #: nova/api/openstack/compute/contrib/console_output.py:46
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:48
 #: nova/api/openstack/compute/contrib/server_start_stop.py:42
 msgid "Instance not found"
 msgstr "没有找到实例"
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:312
-#: nova/api/openstack/compute/plugins/v3/admin_actions.py:290
+#: nova/api/openstack/compute/contrib/admin_actions.py:291
+#: nova/api/openstack/compute/plugins/v3/admin_actions.py:285
 msgid ""
 "host, block_migration and disk_over_commit must be specified for live "
 "migration."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:344
+#: nova/api/openstack/compute/contrib/admin_actions.py:306
 #, python-format
 msgid "Live migration of instance %s to another host failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:347
+#: nova/api/openstack/compute/contrib/admin_actions.py:309
 #, python-format
 msgid "Live migration of instance %(id)s to host %(host)s failed"
 msgstr "实例 %(id)s 到主机 %(host)s 的动态迁移失败"
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:365
-#: nova/api/openstack/compute/plugins/v3/admin_actions.py:333
+#: nova/api/openstack/compute/contrib/admin_actions.py:327
+#: nova/api/openstack/compute/plugins/v3/admin_actions.py:320
 #, python-format
 msgid "Desired state must be specified.  Valid states are: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/admin_actions.py:378
+#: nova/api/openstack/compute/contrib/admin_actions.py:340
 #, python-format
 msgid "Compute.api::resetState %s"
 msgstr ""
@@ -3094,8 +3178,8 @@
 
 #: nova/api/openstack/compute/contrib/aggregates.py:189
 #: nova/api/openstack/compute/contrib/aggregates.py:193
-#: nova/api/openstack/compute/plugins/v3/aggregates.py:183
-#: nova/api/openstack/compute/plugins/v3/aggregates.py:187
+#: nova/api/openstack/compute/plugins/v3/aggregates.py:182
+#: nova/api/openstack/compute/plugins/v3/aggregates.py:186
 #, python-format
 msgid "Cannot remove host %(host)s in aggregate %(id)s"
 msgstr ""
@@ -3147,7 +3231,7 @@
 msgid "Must specify address in the form of xx:xx:xx:xx:xx:xx"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/baremetal_nodes.py:227
+#: nova/api/openstack/compute/contrib/baremetal_nodes.py:193
 msgid "Must specify id or address"
 msgstr ""
 
@@ -3171,24 +3255,24 @@
 msgid "Cell type must be 'parent' or 'child'"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/cells.py:341
-#: nova/api/openstack/compute/contrib/cells.py:364
-#: nova/api/openstack/compute/plugins/v3/cells.py:346
-#: nova/api/openstack/compute/plugins/v3/cells.py:370
+#: nova/api/openstack/compute/contrib/cells.py:338
+#: nova/api/openstack/compute/contrib/cells.py:361
+#: nova/api/openstack/compute/plugins/v3/cells.py:343
+#: nova/api/openstack/compute/plugins/v3/cells.py:367
 msgid "No cell information in request"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/cells.py:346
-#: nova/api/openstack/compute/plugins/v3/cells.py:351
+#: nova/api/openstack/compute/contrib/cells.py:343
+#: nova/api/openstack/compute/plugins/v3/cells.py:348
 msgid "No cell name in request"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/cells.py:398
-#: nova/api/openstack/compute/plugins/v3/cells.py:406
+#: nova/api/openstack/compute/contrib/cells.py:405
+#: nova/api/openstack/compute/plugins/v3/cells.py:314
 msgid "Only 'updated_since', 'project_id' and 'deleted' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:61
+#: nova/api/openstack/compute/contrib/certificates.py:63
 #: nova/api/openstack/compute/plugins/v3/certificates.py:66
 msgid "Only root certificate can be retrieved."
 msgstr "只有根证书能被获取。"
@@ -3217,8 +3301,8 @@
 msgid "Unable to get console"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/console_output.py:74
-#: nova/api/openstack/compute/plugins/v3/console_output.py:73
+#: nova/api/openstack/compute/contrib/console_output.py:72
+#: nova/api/openstack/compute/plugins/v3/console_output.py:55
 msgid "Unable to get console log, functionality not implemented"
 msgstr ""
 
@@ -3226,28 +3310,38 @@
 msgid "Instance not yet ready"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/consoles.py:54
-#: nova/api/openstack/compute/plugins/v3/remote_consoles.py:57
+#: nova/api/openstack/compute/contrib/consoles.py:52
+#: nova/api/openstack/compute/plugins/v3/remote_consoles.py:59
 msgid "Unable to get vnc console, functionality not implemented"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/disk_config.py:44
-#: nova/api/openstack/compute/plugins/v3/disk_config.py:45
-#, python-format
+#: nova/api/openstack/compute/contrib/consoles.py:76
+#: nova/api/openstack/compute/plugins/v3/remote_consoles.py:89
+msgid "Unable to get spice console, functionality not implemented"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/consoles.py:101
+#: nova/api/openstack/compute/plugins/v3/remote_consoles.py:122
+msgid "Unable to get rdp console, functionality not implemented"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/disk_config.py:44
+#: nova/api/openstack/compute/plugins/v3/disk_config.py:45
+#, python-format
 msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr "%s 必须是'MANUAL' 或者 'AUTO'。"
 
-#: nova/api/openstack/compute/contrib/evacuate.py:56
+#: nova/api/openstack/compute/contrib/evacuate.py:69
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:64
-#: nova/api/openstack/compute/plugins/v3/evacuate.py:66
+#: nova/api/openstack/compute/contrib/evacuate.py:61
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:63
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:74
-#: nova/api/openstack/compute/plugins/v3/evacuate.py:76
+#: nova/api/openstack/compute/contrib/evacuate.py:75
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:77
 #, python-format
 msgid "Compute host %s not found."
 msgstr ""
@@ -3262,21 +3356,22 @@
 msgid "Fixed IP %s not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/flavor_access.py:96
+#: nova/api/openstack/compute/contrib/flavor_access.py:77
+#: nova/api/openstack/compute/contrib/flavor_access.py:101
 msgid "Flavor not found."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/flavor_access.py:101
-#: nova/api/openstack/compute/plugins/v3/flavor_access.py:101
+#: nova/api/openstack/compute/contrib/flavor_access.py:106
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:104
 msgid "Access list not available for public flavors."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/flavor_access.py:113
+#: nova/api/openstack/compute/contrib/flavor_access.py:118
 msgid "No request body"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/flavorextraspecs.py:57
-#: nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py:59
+#: nova/api/openstack/compute/contrib/flavorextraspecs.py:56
+#: nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py:58
 msgid "No Request Body"
 msgstr "没有请求主体"
 
@@ -3306,7 +3401,7 @@
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:217
 #: nova/api/openstack/compute/contrib/floating_ips.py:282
-#: nova/api/openstack/compute/contrib/security_groups.py:461
+#: nova/api/openstack/compute/contrib/security_groups.py:458
 msgid "Missing parameter dict"
 msgstr "缺少参数 dict"
 
@@ -3354,7 +3449,7 @@
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:147
-#: nova/cmd/manage.py:416
+#: nova/cmd/manage.py:415
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3424,22 +3519,22 @@
 msgid "Describe-resource is admin only functionality"
 msgstr "Describe-resource是只有管理员才能执行的功能。"
 
-#: nova/api/openstack/compute/contrib/hypervisors.py:187
-#: nova/api/openstack/compute/contrib/hypervisors.py:199
-#: nova/api/openstack/compute/plugins/v3/hypervisors.py:188
-#: nova/api/openstack/compute/plugins/v3/hypervisors.py:201
-#: nova/api/openstack/compute/plugins/v3/hypervisors.py:238
+#: nova/api/openstack/compute/contrib/hypervisors.py:184
+#: nova/api/openstack/compute/contrib/hypervisors.py:195
+#: nova/api/openstack/compute/plugins/v3/hypervisors.py:185
+#: nova/api/openstack/compute/plugins/v3/hypervisors.py:197
+#: nova/api/openstack/compute/plugins/v3/hypervisors.py:234
 #, python-format
 msgid "Hypervisor with ID '%s' could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hypervisors.py:207
-#: nova/api/openstack/compute/plugins/v3/hypervisors.py:209
+#: nova/api/openstack/compute/contrib/hypervisors.py:203
+#: nova/api/openstack/compute/plugins/v3/hypervisors.py:205
 msgid "Virt driver does not implement uptime function."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hypervisors.py:223
-#: nova/api/openstack/compute/contrib/hypervisors.py:233
+#: nova/api/openstack/compute/contrib/hypervisors.py:219
+#: nova/api/openstack/compute/contrib/hypervisors.py:229
 #, python-format
 msgid "No hypervisor matching '%s' could be found."
 msgstr ""
@@ -3468,23 +3563,23 @@
 msgid "Unable to find address %r"
 msgstr "无法找到地址 %r"
 
-#: nova/api/openstack/compute/contrib/networks_associate.py:36
+#: nova/api/openstack/compute/contrib/networks_associate.py:24
 #, python-format
 msgid "Disassociating host with network with id %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/networks_associate.py:40
+#: nova/api/openstack/compute/contrib/networks_associate.py:28
+#: nova/api/openstack/compute/contrib/networks_associate.py:39
 #: nova/api/openstack/compute/contrib/networks_associate.py:51
-#: nova/api/openstack/compute/contrib/networks_associate.py:63
 #: nova/api/openstack/compute/contrib/os_networks.py:80
 #: nova/api/openstack/compute/contrib/os_networks.py:90
 #: nova/api/openstack/compute/contrib/os_networks.py:100
-#: nova/api/openstack/compute/contrib/os_tenant_networks.py:112
-#: nova/api/openstack/compute/contrib/os_tenant_networks.py:134
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:114
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:136
 msgid "Network not found"
 msgstr "没有找到网络"
 
-#: nova/api/openstack/compute/contrib/networks_associate.py:47
+#: nova/api/openstack/compute/contrib/networks_associate.py:35
 #, python-format
 msgid "Disassociating project with network with id %s"
 msgstr ""
@@ -3495,13 +3590,13 @@
 msgstr "为id是 %s 的网络解除关联"
 
 #: nova/api/openstack/compute/contrib/os_networks.py:86
-#: nova/api/openstack/compute/contrib/os_tenant_networks.py:108
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:110
 #, python-format
 msgid "Showing network with id %s"
 msgstr "显示id是 %s 的网络"
 
 #: nova/api/openstack/compute/contrib/os_networks.py:96
-#: nova/api/openstack/compute/contrib/os_tenant_networks.py:126
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:128
 #, python-format
 msgid "Deleting network with id %s"
 msgstr "正在删除id是 %s 的网络"
@@ -3538,31 +3633,35 @@
 "Cannot associate network %(network)s with project %(project)s: %(message)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/os_tenant_networks.py:123
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:83
+msgid "Failed to get default networks"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:125
 msgid "Failed to update usages deallocating network."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/os_tenant_networks.py:153
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:155
 msgid "No CIDR requested"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/os_tenant_networks.py:159
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:161
 msgid "Requested network does not contain enough (2+) usable hosts"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/os_tenant_networks.py:163
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:165
 msgid "CIDR is malformed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/os_tenant_networks.py:166
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:168
 msgid "Address could not be converted."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/os_tenant_networks.py:174
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:176
 msgid "Quota exceeded, too many networks."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/os_tenant_networks.py:185
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:187
 msgid "Create networks failed"
 msgstr ""
 
@@ -3570,50 +3669,50 @@
 msgid "quota_class_set not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:74
-#: nova/api/openstack/compute/plugins/v3/quota_sets.py:88
-#: nova/cmd/manage.py:253
+#: nova/api/openstack/compute/contrib/quotas.py:73
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:83
+#: nova/cmd/manage.py:252
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:78
-#: nova/api/openstack/compute/plugins/v3/quota_sets.py:92
-#: nova/cmd/manage.py:257
+#: nova/api/openstack/compute/contrib/quotas.py:76
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:60
+#: nova/cmd/manage.py:256
 #, python-format
-msgid "Quota limit must greater than %s."
+msgid "Quota limit must be greater than %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:81
-#: nova/api/openstack/compute/plugins/v3/quota_sets.py:95
-#: nova/cmd/manage.py:260
+#: nova/api/openstack/compute/contrib/quotas.py:79
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:63
+#: nova/cmd/manage.py:259
 #, python-format
-msgid "Quota limit must less than %s."
+msgid "Quota limit must be less than %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:142
-#: nova/api/openstack/compute/plugins/v3/quota_sets.py:153
+#: nova/api/openstack/compute/contrib/quotas.py:140
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:118
 msgid "quota_set not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:162
+#: nova/api/openstack/compute/contrib/quotas.py:158
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:165
-#: nova/api/openstack/compute/plugins/v3/quota_sets.py:174
+#: nova/api/openstack/compute/contrib/quotas.py:161
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:186
-#: nova/api/openstack/compute/plugins/v3/quota_sets.py:203
+#: nova/api/openstack/compute/contrib/quotas.py:182
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:190
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:191
-#: nova/api/openstack/compute/plugins/v3/quota_sets.py:208
+#: nova/api/openstack/compute/contrib/quotas.py:189
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:173
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are less than already used and reserved "
@@ -3626,7 +3725,7 @@
 msgstr "错误格式的 scheduler_hints 属性"
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:375
+#: nova/api/openstack/compute/contrib/security_groups.py:372
 msgid "Not enough parameters to build a valid rule."
 msgstr "参数不够创建有效规则。"
 
@@ -3643,32 +3742,39 @@
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:383
+#: nova/api/openstack/compute/contrib/security_groups.py:380
 #, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:464
+#: nova/api/openstack/compute/contrib/security_groups.py:461
 msgid "Security group not specified"
 msgstr "没有指定安全组"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:468
+#: nova/api/openstack/compute/contrib/security_groups.py:465
 msgid "Security group name cannot be empty"
 msgstr "安全组名称不能是空"
 
 #: nova/api/openstack/compute/contrib/server_start_stop.py:50
-#: nova/api/openstack/compute/plugins/v3/servers.py:1338
+#: nova/api/openstack/compute/plugins/v3/servers.py:1359
 msgid "start instance"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/server_start_stop.py:62
-#: nova/api/openstack/compute/plugins/v3/servers.py:1351
+#: nova/api/openstack/compute/plugins/v3/servers.py:1372
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:177
-#: nova/api/openstack/compute/plugins/v3/services.py:159
-msgid "Disabled reason contains invalid characters or is too long"
+#: nova/api/openstack/compute/contrib/services.py:146
+#: nova/api/openstack/compute/plugins/v3/services.py:99
+#, python-format
+msgid "Service %s not found."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:193
+msgid ""
+"The string containing the reason for disabling the service contains invalid "
+"characters or is too long."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/services.py:184
@@ -3738,65 +3844,57 @@
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/access_ips.py:165
+#: nova/api/openstack/compute/plugins/v3/servers.py:690
 msgid "access_ip_v4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/access_ips.py:170
+#: nova/api/openstack/compute/plugins/v3/servers.py:695
 msgid "access_ip_v6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/admin_actions.py:230
+#: nova/api/openstack/compute/plugins/v3/admin_actions.py:225
 #, python-format
 msgid "create_backup entity requires %s attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/admin_actions.py:234
+#: nova/api/openstack/compute/plugins/v3/admin_actions.py:229
 msgid "Malformed create_backup entity"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/admin_actions.py:240
+#: nova/api/openstack/compute/plugins/v3/admin_actions.py:235
 msgid "create_backup attribute 'rotation' must be an integer"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/admin_actions.py:243
+#: nova/api/openstack/compute/plugins/v3/admin_actions.py:238
 msgid ""
 "create_backup attribute 'rotation' must be greater than or equal to zero"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/admin_password.py:60
-msgid "No admin_password was specified"
+#: nova/api/openstack/compute/plugins/v3/aggregates.py:49
+msgid "Could not find host to be set in request body"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/admin_password.py:64
-msgid "Invalid admin password"
+#: nova/api/openstack/compute/plugins/v3/aggregates.py:53
+msgid "The value of host must be a string"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/agents.py:109
-#: nova/api/openstack/compute/plugins/v3/agents.py:160
-#: nova/api/openstack/compute/plugins/v3/aggregates.py:86
+#: nova/api/openstack/compute/plugins/v3/agents.py:108
+#: nova/api/openstack/compute/plugins/v3/agents.py:152
+#: nova/api/openstack/compute/plugins/v3/aggregates.py:85
 #, python-format
 msgid "Could not find %s parameter in the request"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/aggregates.py:50
-msgid "Could not find host to be set in request body"
-msgstr ""
-
-#: nova/api/openstack/compute/plugins/v3/aggregates.py:54
-msgid "The value of host must be a string"
-msgstr ""
-
-#: nova/api/openstack/compute/plugins/v3/aggregates.py:122
+#: nova/api/openstack/compute/plugins/v3/aggregates.py:121
 msgid "Request body is empty"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/aggregates.py:125
+#: nova/api/openstack/compute/plugins/v3/aggregates.py:124
 #, python-format
 msgid "Invalid key %s in request body."
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/aggregates.py:202
+#: nova/api/openstack/compute/plugins/v3/aggregates.py:201
 msgid "Invalid request format for metadata"
 msgstr ""
 
@@ -3810,25 +3908,6 @@
 msgid "Cell %s doesn't exist."
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/console_output.py:52
-msgid "get_console_output malformed or missing from request body"
-msgstr ""
-
-#: nova/api/openstack/compute/plugins/v3/evacuate.py:58
-msgid "host and on_shared_storage must be specified."
-msgstr ""
-
-#: nova/api/openstack/compute/plugins/v3/extended_volumes.py:147
-#: nova/api/openstack/compute/plugins/v3/extended_volumes.py:189
-#: nova/api/openstack/compute/plugins/v3/hosts.py:143
-msgid "The request body invalid"
-msgstr ""
-
-#: nova/api/openstack/compute/plugins/v3/extended_volumes.py:152
-#: nova/api/openstack/compute/plugins/v3/extended_volumes.py:193
-msgid "Could not find volume_id from requestparameter"
-msgstr ""
-
 #: nova/api/openstack/compute/plugins/v3/extended_volumes.py:196
 #, python-format
 msgid "Detach volume %(volume_id)s from instance %(server_id)s"
@@ -3845,36 +3924,32 @@
 msgid "Filter out extension %s from discover list"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/flavor_access.py:164
-#: nova/api/openstack/compute/plugins/v3/flavor_access.py:192
-msgid "Invalid request"
-msgstr ""
-
-#: nova/api/openstack/compute/plugins/v3/flavor_access.py:171
-#: nova/api/openstack/compute/plugins/v3/flavor_access.py:199
-msgid "tenant_id is required"
-msgstr ""
-
-#: nova/api/openstack/compute/plugins/v3/flavors.py:140
+#: nova/api/openstack/compute/plugins/v3/flavors.py:141
 #, python-format
 msgid "Invalid min_ram filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/flavors.py:147
+#: nova/api/openstack/compute/plugins/v3/flavors.py:148
 #, python-format
 msgid "Invalid min_disk filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py:79
+#: nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py:76
 msgid "No or bad extra_specs provided"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py:84
-#: nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py:106
+#: nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py:72
+#: nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py:93
 msgid "Concurrent transaction has been committed, try again"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/hypervisors.py:222
+#: nova/api/openstack/compute/plugins/v3/extended_volumes.py:147
+#: nova/api/openstack/compute/plugins/v3/extended_volumes.py:189
+#: nova/api/openstack/compute/plugins/v3/hosts.py:143
+msgid "The request body invalid"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/hypervisors.py:218
 msgid "Need parameter 'query' to specify which hypervisor to filter on"
 msgstr ""
 
@@ -3883,293 +3958,257 @@
 msgid "Action %s not found"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/multinic.py:53
-msgid "Missing 'network_id' argument for add_fixed_ip"
-msgstr ""
-
-#: nova/api/openstack/compute/plugins/v3/multinic.py:69
-msgid "Missing 'address' argument for remove_fixed_ip"
-msgstr ""
-
-#: nova/api/openstack/compute/plugins/v3/quota_sets.py:189
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:176
 #, python-format
 msgid "Force update quotas: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:367
+#: nova/api/openstack/compute/plugins/v3/servers.py:372
 #, python-format
 msgid ""
 "extension %(ext_alias)s detected by servers extension for function %(func)s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:374
+#: nova/api/openstack/compute/plugins/v3/servers.py:379
 #, python-format
 msgid "extension %(ext_alias)s is missing %(func)s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:395
+#: nova/api/openstack/compute/plugins/v3/servers.py:400
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:408
-msgid "Did not find any server create xml deserializer extensions"
-msgstr ""
-
-#: nova/api/openstack/compute/plugins/v3/servers.py:420
+#: nova/api/openstack/compute/plugins/v3/servers.py:425
 msgid "Did not find any server rebuild extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:433
-msgid "Did not find any server rebuild xml deserializer extensions"
-msgstr ""
-
-#: nova/api/openstack/compute/plugins/v3/servers.py:445
-msgid "Did not find any server resize extensions"
-msgstr ""
-
-#: nova/api/openstack/compute/plugins/v3/servers.py:458
-msgid "Did not find any server resize xml deserializer extensions"
-msgstr ""
-
-#: nova/api/openstack/compute/plugins/v3/servers.py:470
+#: nova/api/openstack/compute/plugins/v3/servers.py:475
 msgid "Did not find any server update extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:517
+#: nova/api/openstack/compute/plugins/v3/servers.py:522
 msgid "Invalid changes_since value"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:629
+#: nova/api/openstack/compute/plugins/v3/servers.py:603
 msgid "Device name cannot include spaces."
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:650
+#: nova/api/openstack/compute/plugins/v3/servers.py:624
 msgid "Unknown argument: port"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:658
+#: nova/api/openstack/compute/plugins/v3/servers.py:632
 #, python-format
 msgid ""
 "Specified Fixed IP '%(addr)s' cannot be used with port '%(port)s': port "
 "already has a Fixed IP allocated."
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:732
-#: nova/api/openstack/compute/plugins/v3/servers.py:904
+#: nova/api/openstack/compute/plugins/v3/servers.py:418
+#: nova/api/openstack/compute/plugins/v3/servers.py:588
 msgid "The request body is invalid"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:790
-#: nova/api/openstack/compute/plugins/v3/servers.py:818
+#: nova/api/openstack/compute/plugins/v3/servers.py:782
+#: nova/api/openstack/compute/plugins/v3/servers.py:811
 msgid "Invalid flavor_ref provided."
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:866
+#: nova/api/openstack/compute/plugins/v3/servers.py:857
 #, python-format
 msgid "Running _create_extension_point for %s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:872
+#: nova/api/openstack/compute/plugins/v3/servers.py:863
 #, python-format
 msgid "Running _rebuild_extension_point for %s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:878
+#: nova/api/openstack/compute/plugins/v3/servers.py:869
 #, python-format
 msgid "Running _resize_extension_point for %s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:884
+#: nova/api/openstack/compute/plugins/v3/servers.py:875
 #, python-format
 msgid "Running _update_extension_point for %s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:915
+#: nova/api/openstack/compute/plugins/v3/servers.py:921
 msgid "host_id cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1053
+#: nova/api/openstack/compute/plugins/v3/servers.py:1051
 msgid "Invalid image_ref provided."
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1072
+#: nova/api/openstack/compute/plugins/v3/servers.py:1070
 msgid "Missing image_ref attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1079
+#: nova/api/openstack/compute/plugins/v3/servers.py:1077
 msgid "Missing flavor_ref attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1094
+#: nova/api/openstack/compute/plugins/v3/servers.py:1101
 msgid "Resize request has invalid 'flavor_ref' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1097
+#: nova/api/openstack/compute/plugins/v3/servers.py:1104
 msgid "Resize requests require 'flavor_ref' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1123
+#: nova/api/openstack/compute/plugins/v3/servers.py:1130
 msgid "Could not parse image_ref from request."
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1202
+#: nova/api/openstack/compute/plugins/v3/servers.py:1222
 msgid "create_image entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1269
+#: nova/api/openstack/compute/plugins/v3/servers.py:954
 msgid "Invalid admin_password"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1285
-#, python-format
-msgid "Running create xml deserialize ep for %s"
-msgstr ""
-
-#: nova/api/openstack/compute/plugins/v3/servers.py:1300
-#: nova/api/openstack/compute/plugins/v3/servers.py:1314
-#, python-format
-msgid "Running rebuild xml deserialize ep for %s"
-msgstr ""
-
-#: nova/api/openstack/compute/plugins/v3/simple_tenant_usage.py:228
-#, python-format
-msgid "Start time is invalid format, valid formats are %s"
-msgstr ""
-
-#: nova/api/openstack/compute/plugins/v3/simple_tenant_usage.py:233
-#, python-format
-msgid "Stop time is invalid format, valid formats are %s"
+#: nova/api/openstack/compute/contrib/services.py:177
+#: nova/api/openstack/compute/plugins/v3/services.py:159
+msgid "Disabled reason contains invalid characters or is too long"
 msgstr ""
 
-#: nova/api/openstack/compute/views/servers.py:189
+#: nova/api/openstack/compute/views/servers.py:186
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/api/validation/validators.py:63
+#: nova/api/validation/validators.py:61
 #, python-format
 msgid ""
 "Invalid input for field/attribute %(path)s. Value: %(value)s. %(message)s"
 msgstr ""
 
-#: nova/cells/messaging.py:210
+#: nova/cells/manager.py:77
+msgid ""
+"The cells feature of Nova is considered experimental by the OpenStack "
+"project because it receives much less testing than the rest of Nova. This "
+"may change in the future, but current deployers should be aware that the use "
+"of it in production right now may be risky."
+msgstr ""
+
+#: nova/cells/messaging.py:209
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:371 nova/cells/messaging.py:379
+#: nova/cells/messaging.py:370 nova/cells/messaging.py:378
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:391
+#: nova/cells/messaging.py:390
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:415
+#: nova/cells/messaging.py:414
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:442
+#: nova/cells/messaging.py:441
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:521
+#: nova/cells/messaging.py:520
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:541
+#: nova/cells/messaging.py:540
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:559
+#: nova/cells/messaging.py:558
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:674
+#: nova/cells/messaging.py:673
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:704
+#: nova/cells/messaging.py:703
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:714
+#: nova/cells/messaging.py:713
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1023
+#: nova/cells/messaging.py:966
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1059
+#: nova/cells/messaging.py:1010
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:1074
+#: nova/cells/messaging.py:1025
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:1088
+#: nova/cells/messaging.py:1039
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1109
+#: nova/cells/messaging.py:1060
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1188
+#: nova/cells/messaging.py:1139
 #, python-format
 msgid "No match when trying to update BDM: %(bdm)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1372
+#: nova/cells/messaging.py:1323
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1392
+#: nova/cells/messaging.py:1343
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1664
+#: nova/cells/messaging.py:1615
 #, python-format
 msgid "No cell_name for %(method)s() from API"
 msgstr ""
 
-#: nova/cells/messaging.py:1681
+#: nova/cells/messaging.py:1632
 msgid "No cell_name for instance update from API"
 msgstr ""
 
-#: nova/cells/rpc_driver.py:205
+#: nova/openstack/common/rpc/common.py:289
 #, python-format
-msgid "Unable to handle transport URL scheme %s"
-msgstr ""
-
-#: nova/cells/rpc_driver.py:212
-msgid "Cannot comply with query string in transport URL"
-msgstr ""
+msgid "Returning exception %s to caller"
+msgstr "返回 %s 异常给调用者"
 
-#: nova/cells/rpcapi.py:357
+#: nova/cells/rpcapi.py:350
 msgid "Failed to notify cells of BDM update/create."
 msgstr ""
 
-#: nova/cells/rpcapi.py:373
+#: nova/cells/rpcapi.py:366
 msgid "Failed to notify cells of BDM destroy."
 msgstr ""
 
@@ -4238,119 +4277,119 @@
 "%(cell)s has not been seen since %(last_seen)s and is being treated as mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:49
+#: nova/cloudpipe/pipelib.py:51
 msgid "Flavor for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:52
+#: nova/cloudpipe/pipelib.py:54
 msgid "Template for cloudpipe instance boot script"
 msgstr "cloudpipe实例的启动脚本模板"
 
-#: nova/cloudpipe/pipelib.py:55
+#: nova/cloudpipe/pipelib.py:57
 msgid "Network to push into openvpn config"
 msgstr "网络地址已存入openvpn配置"
 
-#: nova/cloudpipe/pipelib.py:58
+#: nova/cloudpipe/pipelib.py:60
 msgid "Netmask to push into openvpn config"
 msgstr "子网掩码已存入openvpn配置"
 
-#: nova/cloudpipe/pipelib.py:127
+#: nova/cloudpipe/pipelib.py:129
 #, python-format
 msgid "Launching VPN for %s"
 msgstr "启动VPN %s"
 
-#: nova/cmd/all.py:63 nova/cmd/all.py:69 nova/cmd/all.py:92
+#: nova/cmd/all.py:61 nova/cmd/all.py:67 nova/cmd/all.py:90
 #, python-format
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:198
+#: nova/cmd/baremetal_deploy_helper.py:181
 #, python-format
 msgid "parent device '%s' not found"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:202
+#: nova/cmd/baremetal_deploy_helper.py:185
 #, python-format
 msgid "root device '%s' not found"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:205
+#: nova/cmd/baremetal_deploy_helper.py:188
 #, python-format
 msgid "swap device '%s' not found"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:210
+#: nova/cmd/baremetal_deploy_helper.py:217
 #, python-format
 msgid "ephemeral device '%s' not found"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:218
+#: nova/cmd/baremetal_deploy_helper.py:197
 msgid "Failed to detect root device UUID."
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:237
+#: nova/cmd/baremetal_deploy_helper.py:215
 #, python-format
 msgid "Cmd     : %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:238
+#: nova/cmd/baremetal_deploy_helper.py:216
 #, python-format
 msgid "StdOut  : %r"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:239
+#: nova/cmd/baremetal_deploy_helper.py:217
 #, python-format
 msgid "StdErr  : %r"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:267
+#: nova/cmd/baremetal_deploy_helper.py:245
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:276
+#: nova/cmd/baremetal_deploy_helper.py:254
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:280
+#: nova/cmd/baremetal_deploy_helper.py:258
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:302
+#: nova/cmd/baremetal_deploy_helper.py:280
 #, python-format
 msgid "post: environ=%s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:321
+#: nova/cmd/baremetal_deploy_helper.py:299
 #, python-format
 msgid "Deploy agent error message: %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:344
+#: nova/cmd/baremetal_deploy_helper.py:321
 #, python-format
 msgid "request is queued: node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1331
+#: nova/cmd/baremetal_manage.py:159 nova/cmd/manage.py:1330
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1335
+#: nova/cmd/baremetal_manage.py:163 nova/cmd/manage.py:1334
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:166 nova/cmd/manage.py:1337
+#: nova/cmd/baremetal_manage.py:165 nova/cmd/manage.py:1336
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:206 nova/cmd/manage.py:1382
+#: nova/cmd/baremetal_manage.py:205 nova/cmd/manage.py:1381
 msgid "Command failed, please check log for more info"
 msgstr ""
 
-#: nova/cmd/compute.py:50
+#: nova/cmd/compute.py:48
 #, python-format
 msgid "No db access allowed in nova-compute: %s"
 msgstr ""
@@ -4364,486 +4403,506 @@
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:211
+#: nova/cmd/manage.py:210
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:269
+#: nova/cmd/manage.py:268
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:275
+#: nova/cmd/manage.py:274
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:276
+#: nova/cmd/manage.py:275
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:277
+#: nova/cmd/manage.py:276
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:278
+#: nova/cmd/manage.py:277
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:321 nova/cmd/manage.py:396 nova/cmd/manage.py:721
-#: nova/cmd/manage.py:735 nova/cmd/manage.py:805
+#: nova/cmd/manage.py:320 nova/cmd/manage.py:395 nova/cmd/manage.py:720
+#: nova/cmd/manage.py:734 nova/cmd/manage.py:804
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:329
+#: nova/cmd/manage.py:328
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:331
+#: nova/cmd/manage.py:330
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:332 nova/cmd/manage.py:861
+#: nova/cmd/manage.py:331 nova/cmd/manage.py:860
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:344 nova/cmd/manage.py:368
+#: nova/cmd/manage.py:343 nova/cmd/manage.py:367
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:360
+#: nova/cmd/manage.py:359
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:423
+#: nova/cmd/manage.py:422
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce the "
 "number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:474
+#: nova/cmd/manage.py:473
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:536 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:535 nova/tests/test_nova_manage.py:213
 msgid "id"
 msgstr "id"
 
-#: nova/cmd/manage.py:537 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:536 nova/tests/test_nova_manage.py:214
 msgid "IPv4"
 msgstr "IPv4"
 
-#: nova/cmd/manage.py:538 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:537 nova/tests/test_nova_manage.py:215
 msgid "IPv6"
 msgstr "IPv6"
 
-#: nova/cmd/manage.py:539 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:538 nova/tests/test_nova_manage.py:216
 msgid "start address"
 msgstr "起始地址"
 
-#: nova/cmd/manage.py:540 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:539 nova/tests/test_nova_manage.py:217
 msgid "DNS1"
 msgstr "DNS1"
 
-#: nova/cmd/manage.py:541 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:540 nova/tests/test_nova_manage.py:218
 msgid "DNS2"
 msgstr "DNS2"
 
-#: nova/cmd/manage.py:542 nova/tests/test_nova_manage.py:219
+#: nova/cmd/manage.py:541 nova/tests/test_nova_manage.py:219
 msgid "VlanID"
 msgstr "VlanID"
 
-#: nova/cmd/manage.py:543 nova/cmd/manage.py:649
+#: nova/cmd/manage.py:542 nova/cmd/manage.py:648
 #: nova/tests/test_nova_manage.py:220
 msgid "project"
 msgstr "项目"
 
-#: nova/cmd/manage.py:544 nova/tests/test_nova_manage.py:221
+#: nova/cmd/manage.py:543 nova/tests/test_nova_manage.py:221
 msgid "uuid"
 msgstr "uuid"
 
-#: nova/cmd/manage.py:551
+#: nova/cmd/manage.py:550
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:570
+#: nova/cmd/manage.py:569
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:575
+#: nova/cmd/manage.py:574
 msgid "UUID is required to delete Neutron Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:578
+#: nova/cmd/manage.py:577
 msgid "Deleting by fixed_range is not supported with the NeutronManager"
 msgstr ""
 
-#: nova/cmd/manage.py:641
+#: nova/cmd/manage.py:640
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:642
+#: nova/cmd/manage.py:641
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:643
+#: nova/cmd/manage.py:642
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:644
+#: nova/cmd/manage.py:643
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:645
+#: nova/cmd/manage.py:644
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:646
+#: nova/cmd/manage.py:645
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:647
+#: nova/cmd/manage.py:646
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:648
+#: nova/cmd/manage.py:647
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:650
+#: nova/cmd/manage.py:649
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:651 nova/cmd/manage.py:862
+#: nova/cmd/manage.py:650 nova/cmd/manage.py:861
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:652
+#: nova/cmd/manage.py:651
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:695
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:697
+#: nova/cmd/manage.py:696
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:698
+#: nova/cmd/manage.py:697
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:699
+#: nova/cmd/manage.py:698
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:700
+#: nova/cmd/manage.py:699
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:701
+#: nova/cmd/manage.py:700
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:723
+#: nova/cmd/manage.py:722
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:737
+#: nova/cmd/manage.py:736
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:809
+#: nova/cmd/manage.py:808
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:810
+#: nova/cmd/manage.py:809
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:814
+#: nova/cmd/manage.py:813
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:815
+#: nova/cmd/manage.py:814
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:816
+#: nova/cmd/manage.py:815
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:817
+#: nova/cmd/manage.py:816
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:818
+#: nova/cmd/manage.py:817
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:901
+#: nova/cmd/manage.py:900
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:943
+#: nova/cmd/manage.py:942
 msgid "Must supply valid parameters to create flavor"
 msgstr ""
 
-#: nova/cmd/manage.py:947
+#: nova/cmd/manage.py:946
 msgid "Flavor exists."
 msgstr ""
 
-#: nova/cmd/manage.py:948
+#: nova/cmd/manage.py:947
 msgid "Please ensure flavor name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:950
+#: nova/cmd/manage.py:949
 msgid "Currently defined flavor names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:955
+#: nova/cmd/manage.py:954
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:958
+#: nova/cmd/manage.py:957
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:966
+#: nova/cmd/manage.py:965
 msgid "Valid flavor name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:969
+#: nova/cmd/manage.py:968
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:974
+#: nova/cmd/manage.py:973
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:1010
+#: nova/cmd/manage.py:1009
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1033
+#: nova/cmd/manage.py:1032
 #, python-format
 msgid "Key %(key)s on flavor %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1093
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1143
+#: nova/cmd/manage.py:1142
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1146
+#: nova/cmd/manage.py:1145
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1160
+#: nova/cmd/manage.py:1159
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1164
+#: nova/cmd/manage.py:1163
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1173
+#: nova/cmd/manage.py:1172
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:363
+#: nova/compute/api.py:349
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:370
+#: nova/compute/api.py:356
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:382
+#: nova/compute/api.py:368
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)d instances. "
 "%(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:386
+#: nova/compute/api.py:372
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run between %(min_count)d and "
 "%(max_count)d instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:407
+#: nova/compute/api.py:409
 msgid "Metadata type should be dict."
 msgstr ""
 
-#: nova/compute/api.py:413
+#: nova/compute/api.py:396
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata properties"
 msgstr "%(pid)s 已经超过配额，试图设置 %(num_metadata)s 个元数据属性"
 
-#: nova/compute/api.py:425
+#: nova/compute/api.py:427
 #, python-format
 msgid "Metadata property key '%s' is not a string."
 msgstr ""
 
-#: nova/compute/api.py:428
+#: nova/compute/api.py:430
 #, python-format
 msgid "Metadata property value '%(v)s' for key '%(k)s' is not a string."
 msgstr ""
 
-#: nova/compute/api.py:432
+#: nova/compute/api.py:408
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:435
+#: nova/compute/api.py:412
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:438
+#: nova/compute/api.py:416
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:549
 msgid ""
 "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:641
+#: nova/compute/api.py:608
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:685
+#: nova/compute/api.py:651
 msgid "The requested availability zone is not available"
 msgstr ""
 
-#: nova/compute/api.py:786
+#: nova/compute/api.py:746
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "准备运行 %s 个实例"
 
-#: nova/compute/api.py:911
+#: nova/compute/api.py:938
 #, python-format
 msgid ""
 "max count reduced from %(max_count)d to %(max_net_count)d due to network "
 "port quota"
 msgstr ""
 
-#: nova/compute/api.py:960
+#: nova/compute/api.py:906
 #, python-format
 msgid "Image bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:999
+#: nova/compute/api.py:945
 #, python-format
 msgid "block_device_mapping %s"
 msgstr "block_device_mapping %s"
 
-#: nova/compute/api.py:1062
+#: nova/compute/api.py:1008
 msgid "More than one swap drive requested."
 msgstr ""
 
-#: nova/compute/api.py:1227
-#: nova/tests/api/openstack/compute/test_servers.py:3031
-#: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:2362
+#: nova/compute/api.py:1178
+#: nova/tests/api/openstack/compute/test_servers.py:2894
+#: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:2284
 msgid ""
 "Unable to launch multiple instances with a single configured port ID. Please "
 "launch your instance one by one with different ports."
 msgstr ""
 
-#: nova/compute/api.py:1330
+#: nova/compute/api.py:1282
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1447
+#: nova/compute/api.py:1380
 #, python-format
+msgid "Working on deleting snapshot %s from shelved instance..."
+msgstr ""
+
+#: nova/compute/api.py:1387
+#, python-format
+msgid "Failed to delete snapshot from shelved instance (%s)."
+msgstr ""
+
+#: nova/compute/api.py:1391
 msgid ""
-"Found an unconfirmed migration during delete, id: %(id)s, status: %(status)s"
+"Something wrong happened when trying to delete snapshot from shelved "
+"instance."
 msgstr ""
 
 #: nova/compute/api.py:1457
+msgid "Instance is already in deleting state, ignoring this request"
+msgstr ""
+
+#: nova/compute/api.py:1378
+#, python-format
+msgid ""
+"Found an unconfirmed migration during delete, id: %(id)s, status: %(status)s"
+msgstr ""
+
+#: nova/compute/api.py:1388
 msgid "Instance may have been confirmed during delete"
 msgstr ""
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1405
 #, python-format
 msgid "Migration %s may have been confirmed during delete"
 msgstr ""
 
-#: nova/compute/api.py:1511
+#: nova/compute/api.py:1569
 #, python-format
 msgid "Flavor %d not found"
 msgstr ""
 
-#: nova/compute/api.py:1516
+#: nova/compute/api.py:1448
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1527
+#: nova/compute/api.py:1459
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1554 nova/compute/manager.py:1952
+#: nova/compute/manager.py:1742
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/api.py:1594
+#: nova/compute/api.py:1524
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1612
+#: nova/compute/api.py:1542
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1656
+#: nova/compute/api.py:1586
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1684
+#: nova/compute/api.py:1614
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1756
+#: nova/compute/api.py:1689
 #, python-format
 msgid "Searching by: %s"
 msgstr "搜索条件： %s"
 
-#: nova/compute/api.py:1966
+#: nova/compute/api.py:1924
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2303
+#: nova/compute/api.py:2248
 msgid "flavor_id is None. Assuming migration."
 msgstr "flavor_id为空。假定在迁移。"
 
-#: nova/compute/api.py:2312
+#: nova/compute/api.py:2257
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
@@ -4851,147 +4910,151 @@
 msgstr ""
 "旧的实例类型 %(current_instance_type_name)s，新的实例类型 %(new_instance_type_name)s"
 
-#: nova/compute/api.py:2348
+#: nova/compute/api.py:2298
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2514
+#: nova/compute/api.py:2465
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2623
+#: nova/compute/api.py:2574
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2640
+#: nova/compute/api.py:2591
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2716
+#: nova/compute/api.py:2667
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2737
+#: nova/compute/api.py:2688
 msgid "Old volume is attached to a different instance."
 msgstr ""
 
-#: nova/compute/api.py:2740
+#: nova/compute/api.py:2691
 msgid "New volume must be detached in order to swap."
 msgstr ""
 
-#: nova/compute/api.py:2743
+#: nova/compute/api.py:2694
 msgid "New volume must be the same size or larger."
 msgstr ""
 
-#: nova/compute/api.py:2923
+#: nova/compute/api.py:2882
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2942
+#: nova/compute/api.py:2901
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2946
+#: nova/compute/api.py:2905
 #, python-format
 msgid ""
 "Instance compute service state on %s expected to be down, but it was up."
 msgstr ""
 
-#: nova/compute/api.py:3239
+#: nova/compute/api.py:3256
+msgid "This aggregate contains hosts in an existing availability zone"
+msgstr ""
+
+#: nova/compute/api.py:3321
 #, python-format
 msgid "Host already in availability zone %s"
 msgstr ""
 
-#: nova/compute/api.py:3315 nova/tests/compute/test_keypairs.py:137
+#: nova/compute/api.py:3235 nova/tests/compute/test_keypairs.py:115
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:3319 nova/tests/compute/test_keypairs.py:129
-#: nova/tests/compute/test_keypairs.py:133
+#: nova/compute/api.py:3239 nova/tests/compute/test_keypairs.py:107
+#: nova/tests/compute/test_keypairs.py:111
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr "密钥对名称长度必须在1到255个字符之间"
 
-#: nova/compute/api.py:3409
+#: nova/compute/api.py:3316
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr "安全组 %s 既不是字符串也不是unicode"
 
-#: nova/compute/api.py:3412
+#: nova/compute/api.py:3319
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr "安全组 %s 不能为空。"
 
-#: nova/compute/api.py:3420
+#: nova/compute/api.py:3327
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)s'."
 msgstr ""
 
-#: nova/compute/api.py:3426
+#: nova/compute/api.py:3333
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr "安全组 %s 不能比255个字符更长。"
 
-#: nova/compute/api.py:3444
+#: nova/compute/api.py:3351
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:3447
+#: nova/compute/api.py:3354
 #, python-format
 msgid "Create Security Group %s"
 msgstr "创建安全组 %s"
 
-#: nova/compute/api.py:3459
+#: nova/compute/api.py:3366
 #, python-format
 msgid "Security group %s already exists"
 msgstr "安全组 %s 已经存在"
 
-#: nova/compute/api.py:3472
+#: nova/compute/api.py:3379
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3534
+#: nova/compute/api.py:3439
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3539
+#: nova/compute/api.py:3444
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3547
+#: nova/compute/api.py:3452
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3550
+#: nova/compute/api.py:3455
 #, python-format
 msgid "Delete security group %s"
 msgstr "删除安全组 %s"
 
-#: nova/compute/api.py:3627 nova/compute/api.py:3701
+#: nova/compute/api.py:3532 nova/compute/api.py:3606
 #, python-format
 msgid "Rule (%s) not found"
 msgstr "没有找到规则 (%s)"
 
-#: nova/compute/api.py:3643
+#: nova/compute/api.py:3548
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3646
+#: nova/compute/api.py:3551
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "授权 %s 安全组入口权限"
 
-#: nova/compute/api.py:3655
+#: nova/compute/api.py:3560
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "撤销 %s 安全组入口权限"
 
-#: nova/compute/api.py:3708
+#: nova/compute/api.py:3613
 msgid "Security group id should be integer"
 msgstr "安全组id应该是整数"
 
@@ -5049,40 +5112,46 @@
 "%(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:101
+#: nova/compute/flavors.py:102
 msgid ""
 "Flavor names can only contain alphanumeric characters, periods, dashes, "
 "underscores and spaces."
 msgstr ""
 
-#: nova/compute/flavors.py:111
+#: nova/compute/flavors.py:104
 msgid "id cannot contain leading and/or trailing whitespace(s)"
 msgstr ""
 
-#: nova/compute/flavors.py:121
+#: nova/compute/flavors.py:122
 msgid ""
 "Flavor id can only contain letters from A-Z (both cases), periods, dashes, "
 "underscores and spaces."
 msgstr ""
 
-#: nova/compute/flavors.py:141
+#: nova/compute/flavors.py:144
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:151
+#: nova/compute/flavors.py:154
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:156
+#: nova/compute/flavors.py:159
 #, python-format
 msgid "DB error: %s"
 msgstr "数据库错误：%s"
 
-#: nova/compute/flavors.py:167
+#: nova/compute/flavors.py:170
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr "未找到要删除的实例类型 %s"
 
+#: nova/compute/flavors.py:318
+msgid ""
+"Key Names can only contain alphanumeric characters, periods, dashes, "
+"underscores, colons and spaces."
+msgstr ""
+
 #: nova/compute/manager.py:235
 #, python-format
 msgid "Task possibly preempted: %s"
@@ -5098,612 +5167,624 @@
 msgid "Error while trying to clean up image %s"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:459
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:483 nova/compute/manager.py:492
+#: nova/compute/manager.py:486 nova/compute/manager.py:495
 msgid ""
 "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:539
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our host "
 "(%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:555
+#: nova/compute/manager.py:561
 msgid ""
 "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:582
 msgid ""
 "Hypervisor driver does not support instance shared storage check, assuming "
 "it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:588
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:650
+#: nova/compute/manager.py:647
+#, python-format
+msgid "Instance is in %s state."
+msgstr ""
+
+#: nova/compute/manager.py:659
 msgid "Failed to complete a deletion"
 msgstr ""
 
-#: nova/compute/manager.py:664
+#: nova/compute/manager.py:670
 msgid "Instance failed to spawn correctly, setting to ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:675
+#: nova/compute/manager.py:682
 #, python-format
 msgid "Instance in transitional state %s at start-up clearing task state"
 msgstr ""
 
-#: nova/compute/manager.py:702
+#: nova/compute/manager.py:690
+msgid ""
+"Service started deleting the instance during the previous run, but did not "
+"finish. Restarting the deletion now."
+msgstr ""
+
+#: nova/compute/manager.py:684
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:705
+#: nova/compute/manager.py:687
 msgid ""
 "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:716
+#: nova/compute/manager.py:698
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr "当前状态是 %(drv_state)s，数据库状态是 %(db_state)s。"
 
-#: nova/compute/manager.py:722
+#: nova/compute/manager.py:704
 msgid "Rebooting instance after nova-compute restart."
 msgstr "nova-compute重启后，实例正在重启。"
 
-#: nova/compute/manager.py:733
+#: nova/compute/manager.py:715
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:738
+#: nova/compute/manager.py:720
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:747
+#: nova/compute/manager.py:729
 msgid "Hypervisor driver does not support firewall rules"
 msgstr "虚拟机管理程序驱动不支持防火墙规则"
 
-#: nova/compute/manager.py:751
+#: nova/compute/manager.py:733
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:767
+#: nova/compute/manager.py:749
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:780
+#: nova/compute/manager.py:762
 #, python-format
 msgid ""
 "Event %s arrived for non-existent instance. The instance was probably "
 "deleted."
 msgstr ""
 
-#: nova/compute/manager.py:783
+#: nova/compute/manager.py:765
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:818
+#: nova/compute/manager.py:800
 msgid "Checking state"
 msgstr "正在检查状态"
 
-#: nova/compute/manager.py:906
+#: nova/compute/manager.py:892
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:961 nova/compute/manager.py:1680
+#: nova/compute/manager.py:947
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:985
+#: nova/compute/manager.py:970
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:1012 nova/compute/manager.py:1609
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:997 nova/compute/manager.py:1545
+#: nova/compute/manager.py:2917
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1058
+#: nova/compute/manager.py:1041
 msgid "Instance disappeared during build"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1047
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1090
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1118
+#: nova/compute/manager.py:1107
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1145 nova/compute/manager.py:3077
+#: nova/compute/manager.py:1134 nova/compute/manager.py:2976
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1158
+#: nova/compute/manager.py:1147
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1163
+#: nova/compute/manager.py:1152
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1169
+#: nova/compute/manager.py:1158
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1198
+#: nova/compute/manager.py:1187
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1208 nova/compute/manager.py:1587
+#: nova/compute/manager.py:1197
 msgid "Starting instance..."
 msgstr "正在启动虚拟机"
 
-#: nova/compute/manager.py:1222
+#: nova/compute/manager.py:1211
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1226
+#: nova/compute/manager.py:1215
 #, python-format
 msgid ""
 "Treating negative config value (%(retries)s) for 'network_allocate_retries' "
 "as 0."
 msgstr ""
 
-#: nova/compute/manager.py:1239
+#: nova/compute/manager.py:1229
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr "实例的network_info：|%s|"
 
-#: nova/compute/manager.py:1247
+#: nova/compute/manager.py:1237
 #, python-format
 msgid "Instance failed network setup after %(attempts)d attempt(s)"
 msgstr ""
 
-#: nova/compute/manager.py:1251
+#: nova/compute/manager.py:1241
 #, python-format
 msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1437
+#: nova/compute/manager.py:1392
 msgid "Instance failed block device setup"
 msgstr "实例块设备设置失败"
 
-#: nova/compute/manager.py:1456 nova/compute/manager.py:1771
-#: nova/compute/manager.py:3548
+#: nova/compute/manager.py:1410 nova/compute/manager.py:3455
 msgid "Instance failed to spawn"
 msgstr "实例生产失败"
 
-#: nova/compute/manager.py:1507
+#: nova/compute/manager.py:1461
 msgid "Deallocating network for instance"
 msgstr "释放实例的网络"
 
-#: nova/compute/manager.py:1594
+#: nova/compute/manager.py:1616
 msgid "Instance disappeared before build."
 msgstr ""
 
-#: nova/compute/manager.py:1631
+#: nova/compute/manager.py:1577
 msgid "Instance disappeared during build."
 msgstr ""
 
-#: nova/compute/manager.py:1644
+#: nova/compute/manager.py:1667
 msgid "Unexpected build failure, not rescheduling build."
 msgstr ""
 
-#: nova/compute/manager.py:1709
+#: nova/compute/manager.py:1732
 msgid "Failed to allocate network(s)"
 msgstr ""
 
-#: nova/compute/manager.py:1714 nova/compute/manager.py:1748
+#: nova/compute/manager.py:1737 nova/compute/manager.py:1775
 msgid "Failed to allocate the network(s), not rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1761
+#: nova/compute/manager.py:1799
 msgid "Failure prepping block device"
 msgstr ""
 
-#: nova/compute/manager.py:1763
+#: nova/compute/manager.py:1801
 msgid "Failure prepping block device."
 msgstr ""
 
-#: nova/compute/manager.py:1780
+#: nova/compute/manager.py:1818
 msgid "Could not clean up failed build, not rescheduling"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1830
 msgid "Failed to deallocate networks"
 msgstr ""
 
-#: nova/compute/manager.py:1801
+#: nova/compute/manager.py:1841
 msgid "Failed to cleanup volumes for failed build, not rescheduling"
 msgstr ""
 
-#: nova/compute/manager.py:1832
+#: nova/compute/manager.py:1622
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1840
+#: nova/compute/manager.py:1630
 #, python-format
 msgid "%(action_str)s instance"
 msgstr "%(action_str)s 实例"
 
-#: nova/compute/manager.py:1886
+#: nova/compute/manager.py:1676
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr "忽略异常 DiskNotFound: %s"
 
-#: nova/compute/manager.py:1889
+#: nova/compute/manager.py:1679
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1898
+#: nova/compute/manager.py:1688
 #, python-format
 msgid "terminating bdm %s"
 msgstr "终止bdm %s"
 
-#: nova/compute/manager.py:1993 nova/compute/manager.py:3238
-#: nova/compute/manager.py:5111
+#: nova/compute/manager.py:2033
+msgid "Instance disappeared during terminate"
+msgstr ""
+
+#: nova/compute/manager.py:1786 nova/compute/manager.py:3146
+#: nova/compute/manager.py:4987
 msgid "Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:2136
+#: nova/compute/manager.py:1951
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:2149
+#: nova/compute/manager.py:1964
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:2153
+#: nova/compute/manager.py:1968
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:2157
+#: nova/compute/manager.py:1972
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2168 nova/compute/manager.py:4302
+#: nova/compute/manager.py:1983 nova/compute/manager.py:4203
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:2246
+#: nova/compute/manager.py:2068
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2277
+#: nova/compute/manager.py:2099
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2293
+#: nova/compute/manager.py:2118
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:2310
+#: nova/compute/manager.py:2135
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2346
+#: nova/compute/manager.py:2171
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:2349
+#: nova/compute/manager.py:2174
 #, python-format
 msgid "Cannot reboot instance: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2362
+#: nova/compute/manager.py:2187
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:2404
+#: nova/compute/manager.py:2478
 #, python-format
 msgid "Instance not found, could not set state %s for instance."
 msgstr ""
 
-#: nova/compute/manager.py:2410
+#: nova/compute/manager.py:2484
 msgid "Instance being deleted, snapshot cannot continue"
 msgstr ""
 
-#: nova/compute/manager.py:2426
+#: nova/compute/manager.py:2304
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:2432
+#: nova/compute/manager.py:2215 nova/compute/manager.py:2310
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2457
+#: nova/compute/manager.py:2334
 msgid "Instance disappeared during snapshot"
 msgstr ""
 
-#: nova/compute/manager.py:2460
-msgid "Image not found"
+#: nova/compute/manager.py:2536
+msgid "Image not found during snapshot"
 msgstr ""
 
-#: nova/compute/manager.py:2497
+#: nova/compute/manager.py:2381
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr "找到 %(num_images)d 个镜像 (rotation: %(rotation)d)"
 
-#: nova/compute/manager.py:2505
+#: nova/compute/manager.py:2389
 #, python-format
 msgid "Rotating out %d backups"
 msgstr "轮换出%d个备份"
 
-#: nova/compute/manager.py:2510
+#: nova/compute/manager.py:2394
 #, python-format
 msgid "Deleting image %s"
 msgstr "正在删除镜像 %s"
 
-#: nova/compute/manager.py:2538
+#: nova/compute/manager.py:2422
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr "设置管理员密码失败。实例 %s 没有运行"
 
-#: nova/compute/manager.py:2545
+#: nova/compute/manager.py:2429
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2552
+#: nova/compute/manager.py:2436
 msgid ""
 "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2567
+#: nova/compute/manager.py:2451
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2574
+#: nova/compute/manager.py:2458
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2587
+#: nova/compute/manager.py:2471
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2592
+#: nova/compute/manager.py:2476
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2610
+#: nova/compute/manager.py:2494
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2632
+#: nova/compute/manager.py:2516
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2539
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2659
+#: nova/compute/manager.py:2543
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2680
+#: nova/compute/manager.py:2564
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2706
+#: nova/compute/manager.py:2590
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2740
+#: nova/compute/manager.py:2626
 #, python-format
 msgid "Going to confirm migration %s"
 msgstr ""
 
-#: nova/compute/manager.py:2748
+#: nova/compute/manager.py:2632
 #, python-format
 msgid "Migration %s is not found during confirmation"
 msgstr ""
 
-#: nova/compute/manager.py:2753
+#: nova/compute/manager.py:2637
 #, python-format
 msgid "Migration %s is already confirmed"
 msgstr ""
 
-#: nova/compute/manager.py:2757
+#: nova/compute/manager.py:2641
 #, python-format
 msgid ""
 "Unexpected confirmation status '%(status)s' of migration %(id)s, exit "
 "confirmation process"
 msgstr ""
 
-#: nova/compute/manager.py:2770
+#: nova/compute/manager.py:2654
 msgid "Instance is not found during confirmation"
 msgstr ""
 
-#: nova/compute/manager.py:2819
+#: nova/compute/manager.py:2893
 #, python-format
 msgid "Resized/migrated instance is powered off. Setting vm_state to '%s'."
 msgstr ""
 
-#: nova/compute/manager.py:2939
+#: nova/compute/manager.py:2836
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2977
+#: nova/compute/manager.py:2874
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2983
+#: nova/compute/manager.py:2880
 msgid "destination same as source!"
 msgstr "目标与来源一样。"
 
-#: nova/compute/manager.py:2993
+#: nova/compute/manager.py:3067
 #, python-format
 msgid "Stashing vm_state: %s"
 msgstr ""
 
-#: nova/compute/manager.py:3001
+#: nova/compute/manager.py:2898
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:3244
+#: nova/compute/manager.py:3152
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:3308
+#: nova/compute/manager.py:3217
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:3325
+#: nova/compute/manager.py:3235
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:3365
+#: nova/compute/manager.py:3273
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:3394
+#: nova/compute/manager.py:3304
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:3566
+#: nova/compute/manager.py:3474
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:3571
+#: nova/compute/manager.py:3479
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:3574
+#: nova/compute/manager.py:3482
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr "将注入的network_info：|%s|"
 
-#: nova/compute/manager.py:3594
+#: nova/compute/manager.py:3500
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:3623
+#: nova/compute/manager.py:3527
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:3659
+#: nova/compute/manager.py:3562
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3740
+#: nova/compute/manager.py:3787
+msgid "Getting RDP console"
+msgstr ""
+
+#: nova/compute/manager.py:3642
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr "正在把卷 %(volume_id)s 附加到 %(mountpoint)s"
 
-#: nova/compute/manager.py:3750
+#: nova/compute/manager.py:3888
 #, python-format
-msgid ""
-"Failed to connect to volume %(volume_id)s while attaching at %(mountpoint)s"
-msgstr ""
-
-#: nova/compute/manager.py:3771
-#, python-format
-msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
+msgid "Failed to attach %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3805
+#: nova/compute/manager.py:3706
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr "卷 %(volume_id)s 从挂载点 %(mp)s 分离"
 
-#: nova/compute/manager.py:3816
+#: nova/compute/manager.py:3717
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3828
+#: nova/compute/manager.py:3728
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3852
+#: nova/compute/manager.py:3752
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3886
+#: nova/compute/manager.py:3807
 #, python-format
-msgid ""
-"Failed to connect to volume %(volume_id)s with volume at %(mountpoint)s"
+msgid "Failed to swap volume %(old_volume_id)s for %(new_volume_id)s"
 msgstr ""
 
-#: nova/compute/manager.py:3907
+#: nova/compute/manager.py:3786
 #, python-format
-msgid "Failed to swap volume %(old_volume_id)s for %(new_volume_id)s"
+msgid ""
+"Failed to connect to volume %(volume_id)s with volume at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3970
+#: nova/compute/manager.py:3871
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3993
+#: nova/compute/manager.py:3894
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:4006 nova/tests/compute/test_compute.py:9510
+#: nova/compute/manager.py:3907 nova/tests/compute/test_compute.py:9179
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:4148
+#: nova/compute/manager.py:4052
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:4177
+#: nova/compute/manager.py:4081
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:4245
+#: nova/compute/manager.py:4146
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:4247
+#: nova/compute/manager.py:4148
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
@@ -5711,326 +5792,330 @@
 "你会看到错误“libvirt: QEMU error: Domain not found: no domain with matching "
 "name。”这个错误可以放心的忽略。"
 
-#: nova/compute/manager.py:4270
+#: nova/compute/manager.py:4171
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:4439
+#: nova/compute/manager.py:4339
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:4442
+#: nova/compute/manager.py:4567
 msgid "An error occurred"
 msgstr ""
 
-#: nova/compute/manager.py:4491
+#: nova/compute/manager.py:4391
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr "发现 %(migration_count)d 个超过 %(confirm_window)d 秒未经确认的迁移"
 
-#: nova/compute/manager.py:4496
+#: nova/compute/manager.py:4396
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:4505
+#: nova/compute/manager.py:4405
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:4515
+#: nova/compute/manager.py:4414
 #, python-format
 msgid "Instance %s not found"
 msgstr "实例 %s 没有找到"
 
-#: nova/compute/manager.py:4520
+#: nova/compute/manager.py:4419
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:4527
+#: nova/compute/manager.py:4426
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:4538
+#: nova/compute/manager.py:4437
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:4564
+#: nova/compute/manager.py:4463
 msgid "Periodic task failed to offload instance."
 msgstr ""
 
-#: nova/compute/manager.py:4584
+#: nova/compute/manager.py:4483
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:4604
+#: nova/compute/manager.py:4503
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4628
+#: nova/compute/manager.py:4527
 msgid "Updating bandwidth usage cache"
 msgstr "更新带宽使用缓存"
 
-#: nova/compute/manager.py:4740
+#: nova/compute/manager.py:4781
+msgid "Bandwidth usage not supported by hypervisor."
+msgstr ""
+
+#: nova/compute/manager.py:4639
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:4768
+#: nova/compute/manager.py:4666
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on the "
 "hypervisor."
 msgstr "在数据库中找到 %(num_db_instances)s个实例，在虚拟机管理程序找到 %(num_vm_instances)s 个实例。"
 
-#: nova/compute/manager.py:4775 nova/compute/manager.py:4836
+#: nova/compute/manager.py:4673 nova/compute/manager.py:4732
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:4797
+#: nova/compute/manager.py:4694
 msgid ""
 "Periodic sync_power_state task had an error while processing an instance."
 msgstr ""
 
-#: nova/compute/manager.py:4823
+#: nova/compute/manager.py:4719
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to "
 "host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4860
+#: nova/compute/manager.py:4756
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4872 nova/compute/manager.py:4881
-#: nova/compute/manager.py:4912
+#: nova/compute/manager.py:4768 nova/compute/manager.py:4777
+#: nova/compute/manager.py:4808
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4876
+#: nova/compute/manager.py:4772
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4892
+#: nova/compute/manager.py:4788
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4898
+#: nova/compute/manager.py:4794
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4904
+#: nova/compute/manager.py:4800
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4921
+#: nova/compute/manager.py:4817
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4929
+#: nova/compute/manager.py:4825
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4943
+#: nova/compute/manager.py:4839
 msgid "Reclaiming deleted instance"
 msgstr "回收删除的实例"
 
-#: nova/compute/manager.py:4950
+#: nova/compute/manager.py:4846
 #, python-format
 msgid "Periodic reclaim failed to delete instance: %s"
 msgstr ""
 
-#: nova/compute/manager.py:4975
+#: nova/compute/manager.py:4871
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4985 nova/compute/resource_tracker.py:399
+#: nova/compute/manager.py:4881 nova/compute/resource_tracker.py:371
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:5027
+#: nova/compute/manager.py:4921
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but still "
 "present on host."
 msgstr ""
 
-#: nova/compute/manager.py:5033
+#: nova/compute/manager.py:5174
 #, python-format
 msgid ""
 "Powering off instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:5042
+#: nova/compute/manager.py:5183
 msgid "set_bootable is not implemented for the current driver"
 msgstr ""
 
-#: nova/compute/manager.py:5047
+#: nova/compute/manager.py:5188
 msgid "Failed to power off instance"
 msgstr ""
 
-#: nova/compute/manager.py:5051
+#: nova/compute/manager.py:4927
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:5060
+#: nova/compute/manager.py:4936
 #, python-format
 msgid "Periodic cleanup failed to delete instance: %s"
 msgstr ""
 
-#: nova/compute/manager.py:5064
+#: nova/compute/manager.py:4940
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:5095
+#: nova/compute/manager.py:4971
 #, python-format
 msgid "Setting instance back to %(state)s after: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:5104
+#: nova/compute/manager.py:4980
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
 
-#: nova/compute/manager.py:5125
+#: nova/compute/manager.py:5265
 msgid "Hypervisor driver does not support add_aggregate_host"
 msgstr ""
 
-#: nova/compute/manager.py:5142
+#: nova/compute/manager.py:5282
 msgid "Hypervisor driver does not support remove_aggregate_host"
 msgstr ""
 
-#: nova/compute/manager.py:5186
+#: nova/compute/manager.py:5062
 msgid "Cleaning up deleted instances"
 msgstr ""
 
-#: nova/compute/manager.py:5195
+#: nova/compute/manager.py:5071
 #, python-format
 msgid "There are %d instances to clean"
 msgstr ""
 
-#: nova/compute/manager.py:5199
+#: nova/compute/manager.py:5075
 #, python-format
 msgid "Instance has had %(attempts)s of %(max)s cleanup attempts"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:104
+#: nova/compute/resource_tracker.py:100
 msgid ""
 "Host field should not be set on the instance until resources have been "
 "claimed."
 msgstr ""
 
-#: nova/compute/resource_tracker.py:109
+#: nova/compute/resource_tracker.py:105
 msgid ""
 "Node field should not be set on the instance until resources have been "
 "claimed."
 msgstr ""
 
-#: nova/compute/resource_tracker.py:115 nova/compute/resource_tracker.py:159
+#: nova/compute/resource_tracker.py:111 nova/compute/resource_tracker.py:154
 #, python-format
 msgid "Memory overhead for %(flavor)d MB instance; %(overhead)d MB"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:279
+#: nova/compute/resource_tracker.py:280
 #, python-format
 msgid "Cannot get the metrics from %s."
 msgstr ""
 
-#: nova/compute/resource_tracker.py:299
+#: nova/compute/resource_tracker.py:273
 msgid "Auditing locally available compute resources"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:304
+#: nova/compute/resource_tracker.py:278
 msgid ""
 "Virt driver does not support 'get_available_resource'  Compute tracking is "
 "disabled."
 msgstr ""
 
-#: nova/compute/resource_tracker.py:379
+#: nova/compute/resource_tracker.py:351
 #, python-format
 msgid "Compute_service record created for %(host)s:%(node)s"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:385
+#: nova/compute/resource_tracker.py:357
 #, python-format
 msgid "Compute_service record updated for %(host)s:%(node)s"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:416
+#: nova/compute/resource_tracker.py:388
 #, python-format
 msgid "Hypervisor: free ram (MB): %s"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:417
+#: nova/compute/resource_tracker.py:389
 #, python-format
 msgid "Hypervisor: free disk (GB): %s"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:422
+#: nova/compute/resource_tracker.py:394
 #, python-format
 msgid "Hypervisor: free VCPUs: %s"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:424
+#: nova/compute/resource_tracker.py:396
 msgid "Hypervisor: VCPU information unavailable"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:428
+#: nova/compute/resource_tracker.py:400
 #, python-format
 msgid "Hypervisor: assignable PCI devices: %s"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:431
+#: nova/compute/resource_tracker.py:403
 msgid "Hypervisor: no assignable PCI devices"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:438
+#: nova/compute/resource_tracker.py:410
 #, python-format
 msgid "Free ram (MB): %s"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:439
+#: nova/compute/resource_tracker.py:411
 #, python-format
 msgid "Free disk (GB): %s"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:444
+#: nova/compute/resource_tracker.py:416
 #, python-format
 msgid "Free VCPUS: %s"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:446
+#: nova/compute/resource_tracker.py:418
 msgid "Free VCPU information unavailable"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:449
+#: nova/compute/resource_tracker.py:421
 #, python-format
 msgid "Free PCI devices: %s"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:485
+#: nova/compute/resource_tracker.py:457
 #, python-format
 msgid "Updating from migration %s"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:552
+#: nova/compute/resource_tracker.py:524
 msgid "Instance not resizing, skipping migration."
 msgstr ""
 
@@ -6038,14 +6123,14 @@
 msgid "Flavor could not be found, skipping migration."
 msgstr ""
 
-#: nova/compute/resource_tracker.py:657
+#: nova/compute/resource_tracker.py:629
 #, python-format
 msgid ""
 "Detected running orphan instance: %(uuid)s (consuming %(memory_mb)s MB "
 "memory)"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:671
+#: nova/compute/resource_tracker.py:643
 #, python-format
 msgid "Missing keys: %s"
 msgstr ""
@@ -6069,42 +6154,42 @@
 msgid "Can't access image %(image_id)s: %(error)s"
 msgstr ""
 
-#: nova/compute/utils.py:336
+#: nova/compute/utils.py:337
 msgid ""
 "No aggregate id or name specified for this notification and it will be "
 "ignored"
 msgstr ""
 
-#: nova/compute/utils.py:357
+#: nova/compute/utils.py:355
 #, python-format
 msgid ""
 "No host name specified for the notification of HostAPI.%s and it will be "
 "ignored"
 msgstr ""
 
-#: nova/compute/monitors/__init__.py:149
+#: nova/compute/monitors/__init__.py:182
 #, python-format
 msgid ""
 "Excluding monitor %(monitor_name)s due to metric name overlap; overlapping "
 "metrics: %(overlap)s"
 msgstr ""
 
-#: nova/compute/monitors/__init__.py:157
+#: nova/compute/monitors/__init__.py:190
 #, python-format
 msgid "Monitor %(monitor_name)s cannot be used: %(ex)s"
 msgstr ""
 
-#: nova/compute/monitors/__init__.py:163
+#: nova/compute/monitors/__init__.py:196
 #, python-format
 msgid "The following monitors have been disabled: %s"
 msgstr ""
 
-#: nova/compute/monitors/virt/cpu_monitor.py:138
+#: nova/compute/monitors/virt/cpu_monitor.py:112
 #, python-format
 msgid "Not all properties needed are implemented in the compute driver: %s"
 msgstr ""
 
-#: nova/conductor/api.py:385
+#: nova/conductor/api.py:405
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -6115,29 +6200,29 @@
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:345
+#: nova/conductor/manager.py:339
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
-#: nova/conductor/manager.py:696
+#: nova/conductor/manager.py:662
 msgid "No valid host found for cold migrate"
 msgstr ""
 
-#: nova/conductor/manager.py:759
+#: nova/conductor/manager.py:763
 #, python-format
 msgid ""
 "Migration of instance %(instance_id)s to host %(dest)s unexpectedly failed."
 msgstr ""
 
-#: nova/conductor/manager.py:816 nova/conductor/manager.py:839
+#: nova/conductor/manager.py:783 nova/conductor/manager.py:793
 msgid "Unshelve attempted but vm_state not SHELVED or SHELVED_OFFLOADED"
 msgstr ""
 
-#: nova/conductor/manager.py:835
+#: nova/conductor/manager.py:843
 msgid "No valid host found for unshelve instance"
 msgstr ""
 
-#: nova/conductor/tasks/live_migrate.py:115
+#: nova/conductor/tasks/live_migrate.py:116
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -6149,18 +6234,18 @@
 msgid "Skipping host: %(host)s because: %(e)s"
 msgstr ""
 
-#: nova/conductor/tasks/live_migrate.py:179
+#: nova/conductor/tasks/live_migrate.py:191
 #, python-format
 msgid ""
 "Exceeded max scheduling retries %(max_retries)d for instance "
 "%(instance_uuid)s during live migration"
 msgstr ""
 
-#: nova/console/manager.py:81 nova/console/vmrc_manager.py:64
+#: nova/console/manager.py:82 nova/console/vmrc_manager.py:64
 msgid "Adding console"
 msgstr "正在添加控制台"
 
-#: nova/console/manager.py:99 nova/console/vmrc_manager.py:114
+#: nova/console/manager.py:102 nova/console/vmrc_manager.py:114
 #, python-format
 msgid "Tried to remove non-existent console %(console_id)s."
 msgstr "尝试删除不存在的控制台%(console_id)s。"
@@ -6216,84 +6301,88 @@
 msgid "Failed to run xvp."
 msgstr ""
 
-#: nova/consoleauth/manager.py:92
+#: nova/consoleauth/manager.py:93
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s"
 msgstr ""
 
-#: nova/consoleauth/manager.py:117
+#: nova/consoleauth/manager.py:118
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s"
 msgstr ""
 
-#: nova/db/api.py:627
+#: nova/db/api.py:598
 msgid "Failed to notify cells of instance destroy"
 msgstr ""
 
-#: nova/db/api.py:712 nova/db/api.py:740
+#: nova/db/api.py:681 nova/db/api.py:709
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1638
+#: nova/db/api.py:1647
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1783
+#: nova/db/api.py:1792
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:170
+#: nova/db/sqlalchemy/api.py:166
 #, python-format
 msgid "Deadlock detected when running '%(func_name)s': Retrying..."
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:211
+#: nova/db/sqlalchemy/api.py:201
 msgid "model or base_model parameter should be subclass of NovaBase"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:224 nova/virt/baremetal/db/sqlalchemy/api.py:62
+#: nova/db/sqlalchemy/api.py:214 nova/virt/baremetal/db/sqlalchemy/api.py:62
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr "无法识别的 read_deleted 取值”%s“"
 
-#: nova/db/sqlalchemy/api.py:783
+#: nova/db/sqlalchemy/api.py:767
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1004
+#: nova/db/sqlalchemy/api.py:808
+msgid "Failed to update usages bulk deallocating floating IP"
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:988
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1296 nova/db/sqlalchemy/api.py:1336
+#: nova/db/sqlalchemy/api.py:1280 nova/db/sqlalchemy/api.py:1320
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1471
+#: nova/db/sqlalchemy/api.py:1455
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1564
+#: nova/db/sqlalchemy/api.py:1548
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be empty, "
 "\"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1723
+#: nova/db/sqlalchemy/api.py:1706
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1987
+#: nova/db/sqlalchemy/api.py:1967
 #, python-format
 msgid "Invalid field name: %s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:3145
+#: nova/db/sqlalchemy/api.py:3107
 #, python-format
 msgid ""
 "quota_usages out of sync, updating. project_id: %(project_id)s, user_id: "
@@ -6301,160 +6390,121 @@
 "usage: %(in_use)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:3233
+#: nova/db/sqlalchemy/api.py:3203
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4859
+#: nova/db/sqlalchemy/api.py:4790
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must have "
 "been rebooted or crashed. Updating totals."
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:5216
+#: nova/db/sqlalchemy/api.py:5147
 #, python-format
 msgid "Add metadata failed for aggregate %(id)s after %(retries)s retries"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:5598
+#: nova/db/sqlalchemy/api.py:5569
 #, python-format
 msgid "IntegrityError detected when archiving table %s"
 msgstr ""
 
-#: nova/db/sqlalchemy/migration.py:41
-#: nova/virt/baremetal/db/sqlalchemy/migration.py:39
+#: nova/db/sqlalchemy/migration.py:70
+#: nova/virt/baremetal/db/sqlalchemy/migration.py:67
 msgid "version should be an integer"
 msgstr "version应该是整数"
 
-#: nova/db/sqlalchemy/migration.py:68
-#: nova/virt/baremetal/db/sqlalchemy/migration.py:67
+#: nova/db/sqlalchemy/migration.py:97
+#: nova/virt/baremetal/db/sqlalchemy/migration.py:95
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:96
-#: nova/openstack/common/db/sqlalchemy/utils.py:194
+#: nova/db/sqlalchemy/utils.py:78
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:102
-#: nova/openstack/common/db/sqlalchemy/utils.py:200
+#: nova/db/sqlalchemy/utils.py:84
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column %s "
 "It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:245
+#: nova/db/sqlalchemy/utils.py:227
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:261
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:285
+#: nova/db/sqlalchemy/utils.py:267
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:294
+#: nova/db/sqlalchemy/utils.py:276
 #, python-format
 msgid "Extra column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:316
+#: nova/db/sqlalchemy/utils.py:296
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:319
+#: nova/db/sqlalchemy/utils.py:299
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:342 nova/db/sqlalchemy/utils.py:346
-#: nova/db/sqlalchemy/migrate_repo/versions/180_havana.py:111
-#: nova/db/sqlalchemy/migrate_repo/versions/180_havana.py:1094
+#: nova/db/sqlalchemy/utils.py:321 nova/db/sqlalchemy/utils.py:325
+#: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:928
+#: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:59
 #: nova/db/sqlalchemy/migrate_repo/versions/193_cinder_cleanup.py:167
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:354
-#: nova/openstack/common/db/sqlalchemy/utils.py:301
+#: nova/db/sqlalchemy/utils.py:333
 msgid "Unsupported id columns type"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/180_havana.py:138
+#: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:63
 msgid "Exception while seeding instance_types table"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/186_new_bdm_format.py:187
-#, python-format
-msgid ""
-"Got an unexpected block device %s that cannot be converted to v2 format"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/200_add_transport_url_to_cell.py:141
-#, python-format
-msgid "Failed to downgrade cell %(name)s: %(error)s"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/203_make_user_quotas_key_and_value.py:135
-msgid "project_user_quotas table not dropped"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/203_make_user_quotas_key_and_value.py:143
-#, python-format
-msgid "%s table not dropped"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/213_add_pci_devices.py:72
-msgid "Exception while creating table 'pci_devices'."
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/213_add_pci_devices.py:83
-msgid "Exception for adding pci stats to compute node."
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/213_add_pci_devices.py:97
-msgid "Exception while dropping 'pci_devices' tables."
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/213_add_pci_devices.py:107
-msgid "Exception for dropping pci stats from compute node."
-msgstr ""
-
-#: nova/image/glance.py:218
+#: nova/image/glance.py:217
 #, python-format
 msgid ""
 "Error contacting glance server '%(host)s:%(port)s' for '%(method)s', "
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:251
+#: nova/image/glance.py:250
 #, python-format
 msgid ""
 "When loading the module %(module_str)s the following error occurred: %(ex)s"
 msgstr ""
 
-#: nova/image/glance.py:324
+#: nova/image/glance.py:323
 #, python-format
 msgid "Failed to instantiate the download handler for %(scheme)s"
 msgstr ""
 
-#: nova/image/glance.py:340
+#: nova/image/glance.py:339
 #, python-format
 msgid "Successfully transferred using %s"
 msgstr ""
 
-#: nova/image/glance.py:576
+#: nova/image/glance.py:575
 #, python-format
 msgid "fetching image %s from glance"
 msgstr ""
@@ -6510,10 +6560,10 @@
 "used."
 msgstr ""
 
-#: nova/image/download/file.py:32
+#: nova/image/download/file.py:30
 msgid ""
-"A list of filesystems that will be configured in this file under the "
-"sections image_file_url:<list entry name>"
+"List of file systems that are configured in this file in the "
+"image_file_url:<list entry name> sections"
 msgstr ""
 
 #: nova/image/download/file.py:79
@@ -6565,17 +6615,17 @@
 msgid "Copied %(source_file)s using %(module_str)s"
 msgstr ""
 
-#: nova/ipv6/account_identifier.py:41 nova/ipv6/rfc2462.py:36
+#: nova/ipv6/account_identifier.py:40 nova/ipv6/rfc2462.py:36
 #, python-format
 msgid "Bad mac for to_global_ipv6: %s"
 msgstr "错误的to_global_ipv6 mac：%s"
 
-#: nova/ipv6/account_identifier.py:43 nova/ipv6/rfc2462.py:38
+#: nova/ipv6/account_identifier.py:42 nova/ipv6/rfc2462.py:38
 #, python-format
 msgid "Bad prefix for to_global_ipv6: %s"
 msgstr "错误的to_global_ipv6前缀：%s"
 
-#: nova/ipv6/account_identifier.py:45
+#: nova/ipv6/account_identifier.py:44
 #, python-format
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr "错误的to_global_ipv6 oject_id；%s"
@@ -6599,20 +6649,20 @@
 msgid "Not deleting key %s"
 msgstr ""
 
-#: nova/network/api.py:58
+#: nova/network/api.py:57
 msgid "instance is a required argument to use @refresh_cache"
 msgstr ""
 
-#: nova/network/api.py:72
+#: nova/network/api.py:70
 #, python-format
 msgid "Updating cache with info: %s"
 msgstr ""
 
-#: nova/network/api.py:86
+#: nova/network/api.py:83
 msgid "Failed storing info cache"
 msgstr ""
 
-#: nova/network/api.py:249 nova/network/neutronv2/api.py:661
+#: nova/network/api.py:244 nova/network/neutronv2/api.py:648
 #, python-format
 msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
 msgstr ""
@@ -6735,115 +6785,115 @@
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
-#: nova/network/linux_net.py:226
+#: nova/network/linux_net.py:221
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr "试图移除不存在的链 %s。"
 
-#: nova/network/linux_net.py:262
+#: nova/network/linux_net.py:257
 #, python-format
 msgid "Unknown chain: %r"
 msgstr "未知链：%r"
 
-#: nova/network/linux_net.py:269
+#: nova/network/linux_net.py:264
 msgid "Skipping duplicate iptables rule addition"
 msgstr ""
 
-#: nova/network/linux_net.py:293
+#: nova/network/linux_net.py:288
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r %(top)r"
 msgstr "试图移除不存在的规则：%(chain)r %(rule)r %(wrap)r %(top)r"
 
-#: nova/network/linux_net.py:428
+#: nova/network/linux_net.py:423
 msgid "Skipping apply due to lack of new rules"
 msgstr ""
 
-#: nova/network/linux_net.py:456
+#: nova/network/linux_net.py:451
 msgid "IPTablesManager.apply completed with success"
 msgstr "IPTablesManager.apply成功完成"
 
-#: nova/network/linux_net.py:711
+#: nova/network/linux_net.py:706
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:761
+#: nova/network/linux_net.py:756
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:809
+#: nova/network/linux_net.py:804
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1011
+#: nova/network/linux_net.py:1006
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1056
+#: nova/network/linux_net.py:1051
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr "挂起进程 dnsmasq 时抛出 %s"
 
-#: nova/network/linux_net.py:1058
+#: nova/network/linux_net.py:1053
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr "Pid %d 过期了，重新启动dnsmasq"
 
-#: nova/network/linux_net.py:1138
+#: nova/network/linux_net.py:1133
 #, python-format
 msgid "killing radvd threw %s"
 msgstr "杀掉进程 radvd 时抛出 %s"
 
-#: nova/network/linux_net.py:1140
+#: nova/network/linux_net.py:1135
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d 过期了，重新启动radvd"
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1301
 #, python-format
 msgid "Unable to execute %(cmd)s. Exception: %(exception)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1338
+#: nova/network/linux_net.py:1323
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1341
+#: nova/network/linux_net.py:1326
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1459
+#: nova/network/linux_net.py:1444
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr "正在开启VLAN接口 %s"
 
-#: nova/network/linux_net.py:1505
+#: nova/network/linux_net.py:1490
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1517
+#: nova/network/linux_net.py:1502
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1555
+#: nova/network/linux_net.py:1540
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1789
+#: nova/network/linux_net.py:1777
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1797
+#: nova/network/linux_net.py:1785
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -6870,116 +6920,117 @@
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:810
+#: nova/network/manager.py:805
 #, python-format
 msgid "instance-dns-zone not found |%s|."
 msgstr ""
 
-#: nova/network/manager.py:817
+#: nova/network/manager.py:812
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone |%(zone)s|. "
 "Instance is in zone |%(zone2)s|. No DNS record will be created."
 msgstr ""
 
-#: nova/network/manager.py:842
+#: nova/network/manager.py:837
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:902
+#: nova/network/manager.py:897
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:928
+#: nova/network/manager.py:923
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:967
+#: nova/network/manager.py:962
 #, python-format
 msgid "Leased IP |%s|"
 msgstr ""
 
-#: nova/network/manager.py:971
+#: nova/network/manager.py:966
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr "没有关联的IP %s 被租用了"
 
-#: nova/network/manager.py:980
+#: nova/network/manager.py:975
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr "没有分配的IP |%s| 被租用了"
 
-#: nova/network/manager.py:985
+#: nova/network/manager.py:980
 #, python-format
 msgid "Released IP |%s|"
 msgstr ""
 
-#: nova/network/manager.py:989
+#: nova/network/manager.py:984
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr "没有关联的IP %s 被释放了"
 
-#: nova/network/manager.py:993
+#: nova/network/manager.py:988
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr "没有租用的IP %s 被释放了"
 
-#: nova/network/manager.py:1012
+#: nova/network/manager.py:1007
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1036
+#: nova/network/manager.py:1031
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1056
+#: nova/network/manager.py:1051
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify network_size "
 "flag."
 msgstr ""
 
-#: nova/network/manager.py:1139
+#: nova/network/manager.py:1134
 msgid "cidr already in use"
 msgstr "cidr 已经在使用"
 
-#: nova/network/manager.py:1142
+#: nova/network/manager.py:1137
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr "请求的cidr (%(cidr)s) 与已存在的超网络 (%(super)s) 冲突"
 
-#: nova/network/manager.py:1153
+#: nova/network/manager.py:1148
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr (%(smaller)s)"
 msgstr "请求的cidr (%(cidr)s) 与已存在的较小的cidr (%(smaller)s) 冲突"
 
-#: nova/network/manager.py:1219
-msgid "Network already exists!"
-msgstr "网络已经存在。"
-
-#: nova/network/manager.py:1238
+#: nova/network/manager.py:1233
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr "网路在删除前必须与项目 %s 解除关联"
 
-#: nova/network/manager.py:1837
+#: nova/network/manager.py:1832
 msgid ""
 "The sum between the number of networks and the vlan start cannot be greater "
 "than 4094"
 msgstr "网络数量与VLAN起始数之和不能大于4049"
 
-#: nova/network/manager.py:1844
+#: nova/network/manager.py:1839
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
 "Network size is %(network_size)s"
 msgstr ""
 
+#: nova/network/manager.py:1898
+#, python-format
+msgid "Remove unused gateway %s"
+msgstr ""
+
 #: nova/network/minidns.py:49
 #, python-format
 msgid "minidns file is |%s|"
@@ -7008,172 +7059,210 @@
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:82
+#: nova/network/model.py:80
 #, python-format
 msgid "Invalid IP format %s"
 msgstr ""
 
-#: nova/network/neutronv2/api.py:171
+#: nova/network/neutronv2/api.py:183
 #, python-format
 msgid "Successfully created port: %s"
 msgstr ""
 
-#: nova/network/neutronv2/api.py:175
+#: nova/network/neutronv2/api.py:177
+msgid "Neutron error: quota exceeded"
+msgstr ""
+
+#: nova/network/neutronv2/api.py:187
 #, python-format
 msgid "Neutron error creating port on network %s"
 msgstr ""
 
-#: nova/network/neutronv2/api.py:210
+#: nova/network/neutronv2/api.py:224
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/neutronv2/api.py:213
+#: nova/network/neutronv2/api.py:227
 #, python-format
 msgid "empty project id for instance %s"
 msgstr ""
 
-#: nova/network/neutronv2/api.py:248
+#: nova/network/neutronv2/api.py:265
 msgid "No network configured!"
 msgstr ""
 
-#: nova/network/neutronv2/api.py:267
+#: nova/network/neutronv2/api.py:284
 #, python-format
 msgid ""
 "Multiple security groups found matching '%s'. Use an ID to be more specific."
 msgstr ""
 
-#: nova/network/neutronv2/api.py:333
+#: nova/network/neutronv2/api.py:350
 #, python-format
 msgid "Failed to update port %s"
 msgstr ""
 
-#: nova/network/neutronv2/api.py:340
+#: nova/network/neutronv2/api.py:357
 #, python-format
 msgid "Failed to delete port %s"
 msgstr ""
 
-#: nova/network/neutronv2/api.py:386
+#: nova/network/neutronv2/api.py:402
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/neutronv2/api.py:400
+#: nova/network/neutronv2/api.py:404
 #, python-format
-msgid "Failed to delete neutron port %(portid)s"
+msgid "Port %s does not exist"
 msgstr ""
 
-#: nova/network/neutronv2/api.py:417
+#: nova/network/neutronv2/api.py:438
 #, python-format
 msgid "Failed to delete neutron port %s"
 msgstr ""
 
-#: nova/network/neutronv2/api.py:445
+#: nova/network/neutronv2/api.py:461
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/neutronv2/api.py:475
+#: nova/network/neutronv2/api.py:493
 #, python-format
 msgid ""
 "Unable to update port %(portid)s on subnet %(subnet_id)s with failure: "
 "%(exception)s"
 msgstr ""
 
-#: nova/network/neutronv2/api.py:504
+#: nova/network/neutronv2/api.py:523
 #, python-format
 msgid "Unable to update port %(portid)s with failure: %(exception)s"
 msgstr ""
 
-#: nova/network/neutronv2/api.py:518
+#: nova/network/neutronv2/api.py:533
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/neutronv2/api.py:531
+#: nova/network/neutronv2/api.py:542
 msgid ""
 "Multiple possible networks found, use a Network ID to be more specific."
 msgstr ""
 
-#: nova/network/neutronv2/api.py:825
+#: nova/network/neutronv2/api.py:556
+#, python-format
+msgid "Failed to access port %s"
+msgstr ""
+
+#: nova/network/neutronv2/api.py:747
+#, python-format
+msgid "Unable to access floating IP %s"
+msgstr ""
+
+#: nova/network/neutronv2/api.py:810
 #, python-format
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
 
-#: nova/network/neutronv2/api.py:921
+#: nova/network/neutronv2/api.py:875
+#, python-format
+msgid "Unable to access floating IP %(fixed_ip)s for port %(port_id)"
+msgstr ""
+
+#: nova/network/neutronv2/api.py:906
 #, python-format
 msgid "Unable to update host of port %s"
 msgstr ""
 
-#: nova/network/security_group/neutron_driver.py:64
+#: nova/network/neutronv2/api.py:970
+#, python-format
+msgid ""
+"Network %(id)s not matched with the tenants network! The ports tenant "
+"%(tenant_id)s will be used."
+msgstr ""
+
+#: nova/network/security_group/neutron_driver.py:58
 #, python-format
 msgid "Neutron Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/neutron_driver.py:85
+#: nova/network/security_group/neutron_driver.py:79
 #, python-format
 msgid "Neutron Error updating security group %s"
 msgstr ""
 
-#: nova/network/security_group/neutron_driver.py:141
+#: nova/network/security_group/neutron_driver.py:133
 #, python-format
 msgid "Neutron security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/neutron_driver.py:144
-#: nova/network/security_group/neutron_driver.py:191
-#: nova/network/security_group/neutron_driver.py:286
+#: nova/network/security_group/neutron_driver.py:136
+#: nova/network/security_group/neutron_driver.py:183
+#: nova/network/security_group/neutron_driver.py:278
 #, python-format
 msgid "Neutron Error: %s"
 msgstr ""
 
-#: nova/network/security_group/neutron_driver.py:165
+#: nova/network/security_group/neutron_driver.py:157
 msgid "Neutron Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/neutron_driver.py:174
+#: nova/network/security_group/neutron_driver.py:166
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/neutron_driver.py:211
+#: nova/network/security_group/neutron_driver.py:203
 #, python-format
 msgid "Neutron Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/neutron_driver.py:215
+#: nova/network/security_group/neutron_driver.py:207
 #, python-format
 msgid "Neutron Error adding rules to security group %s"
 msgstr ""
 
-#: nova/network/security_group/neutron_driver.py:219
-#: nova/network/security_group/neutron_driver.py:413
-#: nova/network/security_group/neutron_driver.py:420
-#: nova/network/security_group/neutron_driver.py:446
-#: nova/network/security_group/neutron_driver.py:462
-#: nova/network/security_group/neutron_driver.py:469
-#: nova/network/security_group/neutron_driver.py:498
+#: nova/network/security_group/neutron_driver.py:211
+#: nova/network/security_group/neutron_driver.py:374
+#: nova/network/security_group/neutron_driver.py:381
+#: nova/network/security_group/neutron_driver.py:407
+#: nova/network/security_group/neutron_driver.py:423
+#: nova/network/security_group/neutron_driver.py:430
+#: nova/network/security_group/neutron_driver.py:459
 msgid "Neutron Error:"
 msgstr ""
 
-#: nova/network/security_group/neutron_driver.py:273
+#: nova/network/security_group/neutron_driver.py:265
 #, python-format
 msgid "Neutron Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/neutron_driver.py:283
+#: nova/network/security_group/neutron_driver.py:275
 #, python-format
 msgid "Neutron security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/neutron_driver.py:429
+#: nova/network/security_group/neutron_driver.py:405
+#: nova/network/security_group/neutron_driver.py:456
+#, python-format
+msgid "Security group %(name)s is not found for project %(project)s"
+msgstr ""
+
+#: nova/network/security_group/neutron_driver.py:421
+#: nova/network/security_group/neutron_driver.py:472
+#, python-format
+msgid "instance_id %s could not be found as device id on any ports"
+msgstr ""
+
+#: nova/network/security_group/neutron_driver.py:390
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/neutron_driver.py:439
-#: nova/network/security_group/neutron_driver.py:490
+#: nova/network/security_group/neutron_driver.py:400
+#: nova/network/security_group/neutron_driver.py:451
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
@@ -7181,7 +7270,7 @@
 #: nova/network/security_group/neutron_driver.py:500
 #, python-format
 msgid ""
-"Security group %(security_group_name)s not assocaited with the instance "
+"Security group %(security_group_name)s not associated with the instance "
 "%(instance)s"
 msgstr ""
 
@@ -7190,26 +7279,31 @@
 msgid "This rule already exists in group %s"
 msgstr "这条规则已经存在于组%s 中"
 
-#: nova/objects/base.py:73
+#: nova/objects/base.py:69
 #, python-format
 msgid "Error setting %(attr)s"
 msgstr ""
 
-#: nova/objects/base.py:200
+#: nova/objects/base.py:212
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:316
+#: nova/objects/base.py:311
 #, python-format
 msgid "Cannot load '%s' in the base class"
 msgstr ""
 
-#: nova/objects/base.py:356
+#: nova/objects/base.py:351
 #, python-format
 msgid "%(objname)s object has no attribute '%(attrname)s'"
 msgstr ""
 
+#: nova/objects/instance.py:477
+#, python-format
+msgid "Lazy-loading `%(attr)s' on %(name)s uuid %(uuid)s"
+msgstr ""
+
 #: nova/objects/fields.py:30
 #, python-format
 msgid "Key %(key)s must be of type %(expected)s not %(actual)s"
@@ -7235,83 +7329,62 @@
 msgstr ""
 
 #: nova/objects/fields.py:286 nova/objects/fields.py:295
-#: nova/objects/fields.py:410
 #, python-format
 msgid "Network \"%s\" is not valid"
 msgstr ""
 
-#: nova/objects/fields.py:307
+#: nova/objects/fields.py:334
 msgid "A list is required here"
 msgstr ""
 
-#: nova/objects/fields.py:323
+#: nova/objects/fields.py:350
 msgid "A dict is required here"
 msgstr ""
 
-#: nova/objects/fields.py:362
+#: nova/objects/fields.py:389
 #, python-format
 msgid "An object of type %s is required here"
 msgstr ""
 
-#: nova/objects/fields.py:389
+#: nova/objects/fields.py:416
 msgid "A NetworkModel is required here"
 msgstr ""
 
-#: nova/objects/fields.py:406
+#: nova/objects/instance.py:422
 #, python-format
-msgid "CIDR \"%s\" is not in proper form"
+msgid "No save handler for %s"
 msgstr ""
 
-#: nova/objects/fields.py:415
-#, python-format
-msgid "Netmask length \"%s\" is not valid"
-msgstr ""
-
-#: nova/objects/fields.py:418
-#, python-format
-msgid "Netmask length \"%(length)s\" is not valid for IPv%(version)i address"
-msgstr ""
-
-#: nova/objects/instance.py:421
-#, python-format
-msgid "No save handler for %s"
-msgstr ""
-
-#: nova/objects/instance.py:490
-#, python-format
-msgid "Lazy-loading `%(attr)s' on %(name)s uuid %(uuid)s"
-msgstr ""
-
-#: nova/objects/instance_info_cache.py:82
+#: nova/objects/instance_info_cache.py:85
 msgid "Failed to notify cells of instance info cache update"
 msgstr ""
 
-#: nova/objects/service.py:76
+#: nova/objects/service.py:73
 #, python-format
 msgid "Lazy-loading `%(attr)s' on %(name)s id %(id)s"
 msgstr ""
 
-#: nova/objects/utils.py:61 nova/objects/utils.py:75
+#: nova/objects/utils.py:59 nova/objects/utils.py:73
 msgid "None is not valid here"
 msgstr ""
 
-#: nova/objects/utils.py:112
+#: nova/objects/utils.py:110
 msgid "A list of strings is required here"
 msgstr ""
 
-#: nova/objects/utils.py:114
+#: nova/objects/utils.py:112
 msgid "Invalid values found in list (strings are required)"
 msgstr ""
 
-#: nova/objects/utils.py:126
+#: nova/objects/utils.py:124
 msgid "A dict of strings is required here"
 msgstr ""
 
-#: nova/objects/utils.py:128
+#: nova/objects/utils.py:126
 msgid "Invalid keys found in dict (strings are required)"
 msgstr ""
 
-#: nova/objects/utils.py:131
+#: nova/objects/utils.py:129
 msgid "Invalid values found in dict (strings are required)"
 msgstr ""
 
@@ -7325,71 +7398,81 @@
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: nova/openstack/common/excutils.py:91
+#: nova/openstack/common/excutils.py:90
 #, python-format
 msgid "Unexpected exception occurred %d time(s)... retrying."
 msgstr ""
 
-#: nova/openstack/common/imageutils.py:96
+#: nova/openstack/common/gettextutils.py:263
+msgid "Message objects do not support addition."
+msgstr ""
+
+#: nova/openstack/common/gettextutils.py:272
+msgid ""
+"Message objects do not support str() because they may contain non-ascii "
+"characters. Please use unicode() or translate() instead."
+msgstr ""
+
+#: nova/virt/images.py:115
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:103
+#: nova/openstack/common/lockutils.py:100
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:168
+#: nova/openstack/common/lockutils.py:166
 #, python-format
 msgid "Got semaphore \"%(lock)s\""
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:177
+#: nova/openstack/common/lockutils.py:175
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\""
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:187
+#: nova/openstack/common/lockutils.py:185
 #, python-format
 msgid "Created lock path: %s"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:205
+#: nova/openstack/common/lockutils.py:203
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:209
+#: nova/openstack/common/lockutils.py:207
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:247
+#: nova/openstack/common/lockutils.py:244
 #, python-format
 msgid "Got semaphore / lock \"%(function)s\""
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:251
+#: nova/openstack/common/lockutils.py:248
 #, python-format
 msgid "Semaphore / lock released \"%(function)s\""
 msgstr ""
 
-#: nova/openstack/common/log.py:303
+#: nova/openstack/common/log.py:245
 #, python-format
 msgid "Deprecated: %s"
 msgstr ""
 
-#: nova/openstack/common/log.py:402
+#: nova/openstack/common/log.py:337
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: nova/openstack/common/log.py:453
+#: nova/openstack/common/log.py:387
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr "syslog设备必须作为一个 %s 。"
 
-#: nova/openstack/common/log.py:623
+#: nova/openstack/common/log.py:557
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -7412,27 +7495,27 @@
 msgid "in dynamic looping call"
 msgstr ""
 
-#: nova/openstack/common/periodic_task.py:43
+#: nova/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: nova/openstack/common/periodic_task.py:134
+#: nova/openstack/common/periodic_task.py:133
 #, python-format
 msgid "Skipping periodic task %(task)s because its interval is negative"
 msgstr ""
 
-#: nova/openstack/common/periodic_task.py:139
+#: nova/openstack/common/periodic_task.py:138
 #, python-format
 msgid "Skipping periodic task %(task)s because it is disabled"
 msgstr ""
 
-#: nova/openstack/common/periodic_task.py:177
+#: nova/openstack/common/periodic_task.py:176
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr "正在运行周期性任务 %(full_task_name)s"
 
-#: nova/openstack/common/periodic_task.py:186
+#: nova/openstack/common/periodic_task.py:184
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr "在 %(full_task_name)s 期间发生的错误：%(e)s"
@@ -7452,18 +7535,41 @@
 msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
+#: nova/openstack/common/processutils.py:58
+msgid "Unexpected error while running command."
+msgstr "运行命令时出现意外错误"
+
+#: nova/openstack/common/processutils.py:61
+#, python-format
+msgid ""
+"%(description)s\n"
+"Command: %(cmd)s\n"
+"Exit code: %(exit_code)s\n"
+"Stdout: %(stdout)r\n"
+"Stderr: %(stderr)r"
+msgstr ""
+"%(description)s\n"
+"命令：%(cmd)s\n"
+"退出代码：%(exit_code)s\n"
+"标准输出：%(stdout)r\n"
+"标准错误输出：%(stderr)r"
+
 #: nova/openstack/common/processutils.py:132
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr "发现未知的 utils.execute 关键字参数：%r"
 
+#: nova/openstack/common/processutils.py:145
+msgid "Command requested root, but did not specify a root helper."
+msgstr ""
+
 #: nova/openstack/common/processutils.py:147
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "正在运行cmd (subprocess)：%s"
 
 #: nova/openstack/common/processutils.py:172
-#: nova/openstack/common/processutils.py:244
+#: nova/openstack/common/processutils.py:244 nova/virt/powervm/common.py:118
 #, python-format
 msgid "Result was %s"
 msgstr "运行结果为 %s"
@@ -7486,11 +7592,11 @@
 msgid "process_input not supported over SSH"
 msgstr "SSH上不支持的进程输入参数。"
 
-#: nova/openstack/common/service.py:166 nova/openstack/common/service.py:378
+#: nova/openstack/common/service.py:113 nova/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: nova/openstack/common/service.py:175 nova/openstack/common/service.py:263
+#: nova/openstack/common/service.py:122 nova/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
@@ -7499,49 +7605,49 @@
 msgid "Exception during rpc cleanup."
 msgstr ""
 
-#: nova/openstack/common/service.py:232
+#: nova/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: nova/openstack/common/service.py:269
+#: nova/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: nova/openstack/common/service.py:302
+#: nova/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: nova/openstack/common/service.py:321
+#: nova/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: nova/openstack/common/service.py:331
+#: nova/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: nova/openstack/common/service.py:348
+#: nova/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
 
-#: nova/openstack/common/service.py:352
+#: nova/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: nova/openstack/common/service.py:356
+#: nova/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
 
-#: nova/openstack/common/service.py:386
+#: nova/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: nova/openstack/common/service.py:404
+#: nova/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -7566,497 +7672,73 @@
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/openstack/common/db/sqlalchemy/session.py:542
-msgid "DB exception wrapped."
-msgstr "数据库异常被包裹。"
-
-#: nova/openstack/common/db/sqlalchemy/session.py:604
-#, python-format
-msgid "Got mysql server has gone away: %s"
-msgstr ""
-
-#: nova/openstack/common/db/sqlalchemy/session.py:685
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: nova/openstack/common/db/sqlalchemy/utils.py:97
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: nova/openstack/common/db/sqlalchemy/utils.py:119
-msgid "Unknown sort direction, must be 'desc' or 'asc'"
-msgstr ""
-
-#: nova/openstack/common/db/sqlalchemy/utils.py:280
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: nova/openstack/common/middleware/notifier.py:40
-#, python-format
-msgid "An exception occurred processing the API call: %s "
-msgstr ""
-
-#: nova/openstack/common/notifier/api.py:129
-#, python-format
-msgid "%s not in valid priorities"
-msgstr "%s 不在有效的优先级"
-
-#: nova/openstack/common/notifier/api.py:145
-#, python-format
-msgid ""
-"Problem '%(e)s' attempting to send to notification system. "
-"Payload=%(payload)s"
-msgstr "Problem '%(e)s' 试图发送到通知系统。Payload=%(payload)s"
-
-#: nova/openstack/common/notifier/api.py:164
-#, python-format
-msgid "Failed to load notifier %s. These notifications will not be sent."
-msgstr ""
-
-#: nova/openstack/common/notifier/rabbit_notifier.py:27
-msgid ""
-"The rabbit_notifier is now deprecated. Please use rpc_notifier instead."
-msgstr ""
-
-#: nova/openstack/common/notifier/rpc_notifier.py:45
-#: nova/openstack/common/notifier/rpc_notifier2.py:51
-#, python-format
-msgid "Could not send notification to %(topic)s. Payload=%(message)s"
-msgstr ""
-
-#: nova/openstack/common/rpc/__init__.py:105
-#, python-format
-msgid ""
-"A RPC is being made while holding a lock. The locks currently held are "
-"%(locks)s. This is probably a bug. Please report it. Include the following: "
-"[%(stack)s]."
-msgstr ""
-
-#: nova/openstack/common/rpc/amqp.py:75
-msgid "Pool creating new connection"
-msgstr ""
-
-#: nova/openstack/common/rpc/amqp.py:202
-#, python-format
-msgid ""
-"No calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
-msgstr ""
-
-#: nova/openstack/common/rpc/amqp.py:205
-#, python-format
-msgid "_call_waiters: %s"
-msgstr ""
-
-#: nova/openstack/common/rpc/amqp.py:212
-#, python-format
-msgid ""
-"Number of call waiters is greater than warning threshhold: %d. There could "
-"be a MulticallProxyWaiter leak."
-msgstr ""
-
-#: nova/openstack/common/rpc/amqp.py:290
-#, python-format
-msgid "unpacked context: %s"
-msgstr "未打包的上下文：%s"
-
-#: nova/openstack/common/rpc/amqp.py:341
-#, python-format
-msgid "UNIQUE_ID is %s."
-msgstr ""
-
-#: nova/openstack/common/rpc/amqp.py:434
-#, python-format
-msgid "received %s"
-msgstr "已接收 %s"
-
-#: nova/openstack/common/rpc/amqp.py:442
-#, python-format
-msgid "no method for message: %s"
-msgstr "没有适用于消息的方法：%s"
-
-#: nova/openstack/common/rpc/amqp.py:443
-#, python-format
-msgid "No method for message: %s"
-msgstr "没有适用于消息的方法：%s"
-
-#: nova/openstack/common/rpc/amqp.py:471
-#: nova/openstack/common/rpc/impl_zmq.py:280
-#, python-format
-msgid "Expected exception during message handling (%s)"
-msgstr ""
-
-#: nova/openstack/common/rpc/amqp.py:479
-#: nova/openstack/common/rpc/impl_zmq.py:286
-msgid "Exception during message handling"
-msgstr ""
-
-#: nova/openstack/common/rpc/amqp.py:553
-#, python-format
-msgid "Making synchronous call on %s ..."
-msgstr ""
-
-#: nova/openstack/common/rpc/amqp.py:556
-#, python-format
-msgid "MSG_ID is %s"
-msgstr "消息ID(MSG_ID)是 %s"
-
-#: nova/openstack/common/rpc/amqp.py:582
-#, python-format
-msgid "Making asynchronous cast on %s..."
-msgstr "在 %s 做异步cast"
-
-#: nova/openstack/common/rpc/amqp.py:591
-msgid "Making asynchronous fanout cast..."
-msgstr "做异步fanout cast"
-
-#: nova/openstack/common/rpc/amqp.py:619
-#, python-format
-msgid "Sending %(event_type)s on %(topic)s"
-msgstr ""
-
-#: nova/openstack/common/rpc/common.py:77
-msgid "An unknown RPC related exception occurred."
-msgstr ""
-
-#: nova/openstack/common/rpc/common.py:107
+#: nova/openstack/common/db/sqlalchemy/migration.py:214
 #, python-format
 msgid ""
-"Remote error: %(exc_type)s %(value)s\n"
-"%(traceback)s."
+"Tables \"%s\" have non utf8 collation, please make sure all tables are "
+"CHARSET=utf8"
 msgstr ""
-"远程错误：%(exc_type)s %(value)s\n"
-"%(traceback)s。"
 
-#: nova/openstack/common/rpc/common.py:124
-#, python-format
+#: nova/openstack/common/db/sqlalchemy/migration.py:238
 msgid ""
-"Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method: "
-"\"%(method)s\" info: \"%(info)s\""
-msgstr ""
-
-#: nova/openstack/common/rpc/common.py:141
-#: nova/openstack/common/rpc/common.py:142
-#: nova/openstack/common/rpc/common.py:143
-msgid "<unknown>"
+"The database is not under version control, but has tables. Please stamp the "
+"current version of the schema manually."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:147
-#, python-format
-msgid "Found duplicate message(%(msg_id)s). Skipping it."
-msgstr ""
-
-#: nova/openstack/common/rpc/common.py:151
-msgid "Invalid reuse of an RPC connection."
-msgstr "无效的RPC连接重用。"
-
-#: nova/openstack/common/rpc/common.py:155
-#, python-format
-msgid "Specified RPC version, %(version)s, not supported by this endpoint."
-msgstr ""
-
-#: nova/openstack/common/rpc/common.py:160
-#, python-format
-msgid ""
-"Specified RPC envelope version, %(version)s, not supported by this endpoint."
-msgstr ""
-
-#: nova/openstack/common/rpc/common.py:165
-#, python-format
-msgid "Specified RPC version cap, %(version_cap)s, is too low"
-msgstr ""
-
-#: nova/openstack/common/rpc/common.py:289
-#, python-format
-msgid "Returning exception %s to caller"
-msgstr "返回 %s 异常给调用者"
-
-#: nova/openstack/common/rpc/impl_kombu.py:157
-msgid "Failed to process message ... skipping it."
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_kombu.py:161
-msgid "Failed to process message ... will requeue."
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_kombu.py:496
-#, python-format
-msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
-msgstr "正在重新连接位于 %(hostname)s:%(port)d 的AMQP服务器"
-
-#: nova/openstack/common/rpc/impl_kombu.py:518
-#, python-format
-msgid "Connected to AMQP server on %(hostname)s:%(port)d"
-msgstr "连接到位于 %(hostname)s:%(port)d 的AMQP服务器"
+#: nova/openstack/common/db/sqlalchemy/session.py:542
+msgid "DB exception wrapped."
+msgstr "数据库异常被包裹。"
 
-#: nova/openstack/common/rpc/impl_kombu.py:555
+#: nova/openstack/common/db/sqlalchemy/session.py:684
 #, python-format
-msgid ""
-"Unable to connect to AMQP server on %(hostname)s:%(port)d after "
-"%(max_retries)d tries: %(err_str)s"
+msgid "Database server has gone away: %s"
 msgstr ""
-"无法连接到位于%(hostname)s:%(port)d的AMQP server，尝试已经 %(max_retries)d 次：%(err_str)s"
 
-#: nova/openstack/common/rpc/impl_kombu.py:569
-#, python-format
+#: nova/openstack/common/db/sqlalchemy/session.py:764
 msgid ""
-"AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
-"again in %(sleep_time)d seconds."
-msgstr ""
-"位于%(hostname)s:%(port)d的AMQP服务器不可达：%(err_str)s。%(sleep_time)d 秒钟后请再尝试。"
-
-#: nova/openstack/common/rpc/impl_kombu.py:623
-#: nova/openstack/common/rpc/impl_qpid.py:574
-#, python-format
-msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
-msgstr "为topic '%(topic)s'声明消费者失败：%(err_str)s"
-
-#: nova/openstack/common/rpc/impl_kombu.py:641
-#: nova/openstack/common/rpc/impl_qpid.py:589
-#, python-format
-msgid "Timed out waiting for RPC response: %s"
-msgstr "等待RPC响应超时：%s"
-
-#: nova/openstack/common/rpc/impl_kombu.py:645
-#: nova/openstack/common/rpc/impl_qpid.py:593
-#, python-format
-msgid "Failed to consume message from queue: %s"
-msgstr "从队列中消费消息失败：%s"
-
-#: nova/openstack/common/rpc/impl_kombu.py:684
-#: nova/openstack/common/rpc/impl_qpid.py:628
-#, python-format
-msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
-msgstr "给topic '%(topic)s'发布消息失败：%(err_str)s"
-
-#: nova/openstack/common/rpc/impl_qpid.py:88
-#, python-format
-msgid "Invalid value for qpid_topology_version: %d"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_qpid.py:192
-msgid "Failed to process message... skipping it."
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_qpid.py:516
-#, python-format
-msgid "Unable to connect to AMQP server: %(e)s. Sleeping %(delay)s seconds"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_qpid.py:522
-#, python-format
-msgid "Connected to AMQP server on %s"
-msgstr "连接到 %s 的AMQP服务器"
-
-#: nova/openstack/common/rpc/impl_qpid.py:535
-msgid "Re-established AMQP queues"
-msgstr "重建AMQP队列"
-
-#: nova/openstack/common/rpc/impl_qpid.py:601
-msgid "Error processing message.  Skipping it."
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:96
-msgid "JSON serialization failed."
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:101
-#, python-format
-msgid "Deserializing: %s"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:136
-#, python-format
-msgid "Connecting to %(addr)s with %(type)s"
+"This application has not enabled MySQL traditional mode, which means silent "
+"data corruption may occur. Please encourage the application developers to "
+"enable this mode."
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:137
+#: nova/openstack/common/db/sqlalchemy/session.py:684
 #, python-format
-msgid "-> Subscribed to %(subscribe)s"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:138
-#, python-format
-msgid "-> bind: %(bind)s"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:146
-msgid "Could not open socket."
+msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:158
+#: nova/openstack/common/db/sqlalchemy/test_migrations.py:63
 #, python-format
-msgid "Subscribing to %s"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:200
-msgid "You cannot recv on this socket."
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:205
-msgid "You cannot send on this socket."
+msgid "Got lock \"%s\""
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:267
+#: nova/openstack/common/db/sqlalchemy/test_migrations.py:66
 #, python-format
-msgid "Running func with context: %s"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:305
-msgid "Sending reply"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:339
-msgid "RPC message did not include method."
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:371
-msgid "Registering reactor"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:383
-msgid "In reactor registered"
+msgid "Lock released \"%s\""
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:388
-msgid "Consuming socket"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:438
-#, python-format
-msgid "Creating proxy for topic: %s"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:444
-msgid "Topic contained dangerous characters."
+#: nova/openstack/common/db/sqlalchemy/utils.py:72
+msgid "Id not in sort_keys; is sort_keys unique?"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:476
-msgid "Topic socket file creation failed."
+#: nova/openstack/common/db/sqlalchemy/utils.py:120
+msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:482
+#: nova/openstack/common/db/sqlalchemy/utils.py:279
 #, python-format
-msgid ""
-"Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:498
+#: nova/openstack/common/middleware/notifier.py:40
 #, python-format
-msgid "Required IPC directory does not exist at %s"
+msgid "An exception occurred processing the API call: %s "
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:507
+#: nova/pci/pci_manager.py:154
 #, python-format
-msgid "Permission denied to IPC directory at %s"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:510
 msgid ""
-"Could not create ZeroMQ receiver daemon. Socket may already be in use."
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:544
-#, python-format
-msgid "CONSUMER RECEIVED DATA: %s"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:563
-msgid "ZMQ Envelope version unsupported or unknown."
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:591
-msgid "Skipping topic registration. Already registered."
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:598
-#, python-format
-msgid "Consumer is a zmq.%s"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:650
-msgid "Creating payload"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:663
-msgid "Creating queue socket for reply waiter"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:676
-msgid "Sending cast"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:679
-msgid "Cast sent; Waiting reply"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:682
-#, python-format
-msgid "Received message: %s"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:683
-msgid "Unpacking response"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:692
-msgid "Unsupported or unknown ZMQ envelope returned."
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:699
-msgid "RPC Message Invalid."
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:722
-#, python-format
-msgid "%(msg)s"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:725
-#, python-format
-msgid "Sending message(s) to: %s"
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:729
-msgid "No matchmaker results. Not casting."
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:732
-msgid "No match from matchmaker."
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:814
-#, python-format
-msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
-msgstr ""
-
-#: nova/openstack/common/rpc/matchmaker.py:47
-msgid "Match not found by MatchMaker."
-msgstr ""
-
-#: nova/openstack/common/rpc/matchmaker.py:81
-msgid "Matchmaker does not implement registration or heartbeat."
-msgstr ""
-
-#: nova/openstack/common/rpc/matchmaker.py:217
-#, python-format
-msgid "Matchmaker unregistered: %(key)s, %(host)s"
-msgstr ""
-
-#: nova/openstack/common/rpc/matchmaker.py:229
-msgid "Register before starting heartbeat."
-msgstr ""
-
-#: nova/openstack/common/rpc/matchmaker_ring.py:77
-#: nova/openstack/common/rpc/matchmaker_ring.py:95
-#, python-format
-msgid "No key defining hosts for topic '%s', see ringfile"
-msgstr ""
-
-#: nova/pci/pci_manager.py:156
-#, python-format
-msgid "Trying to remove device with %(status)sownership %(instance_uuid)s"
+"Trying to remove device with %(status)s ownership %(instance_uuid)s because "
+"of %(pci_exception)s"
 msgstr ""
 
 #: nova/scheduler/chance.py:57
@@ -8067,27 +7749,23 @@
 msgid "Could not find another compute"
 msgstr "无法找到另一个计算节点"
 
-#: nova/scheduler/driver.py:62
+#: nova/scheduler/driver.py:58
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:64 nova/scheduler/utils.py:81
+#: nova/scheduler/driver.py:60 nova/scheduler/utils.py:77
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:137
+#: nova/scheduler/driver.py:134
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:146
+#: nova/scheduler/driver.py:143
 msgid "Driver must implement select_destinations"
 msgstr ""
 
-#: nova/scheduler/driver.py:151
-msgid "Driver must implement select_hosts"
-msgstr ""
-
 #: nova/scheduler/filter_scheduler.py:78
 #, python-format
 msgid ""
@@ -8134,53 +7812,50 @@
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:176
+#: nova/scheduler/host_manager.py:177
 #, python-format
 msgid "Metric name unknown of %r"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:367
+#: nova/scheduler/host_manager.py:192
+#, python-format
+msgid ""
+"Host has more disk space than database expected (%(physical)sgb > "
+"%(database)sgb)"
+msgstr ""
+
+#: nova/scheduler/host_manager.py:337
 #, python-format
 msgid "Host filter ignoring hosts: %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:379
+#: nova/scheduler/host_manager.py:349
 #, python-format
 msgid "Host filter forcing available hosts to %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:382
+#: nova/scheduler/host_manager.py:352
 #, python-format
 msgid "No hosts matched due to not matching 'force_hosts' value of '%s'"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:395
+#: nova/scheduler/host_manager.py:365
 #, python-format
 msgid "Host filter forcing available nodes to %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:398
+#: nova/scheduler/host_manager.py:368
 #, python-format
 msgid "No nodes matched due to not matching 'force_nodes' value of '%s'"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:438
-#, python-format
-msgid "Ignoring %(service_name)s service update from %(host)s"
-msgstr ""
-
-#: nova/scheduler/host_manager.py:444
-#, python-format
-msgid "Received %(service_name)s service update from %(state_key)s."
-msgstr ""
-
-#: nova/scheduler/host_manager.py:464
+#: nova/scheduler/host_manager.py:434
 #: nova/scheduler/filters/trusted_filter.py:212
 #, python-format
 msgid "No service for compute ID %s"
 msgstr "计算节点 %s 没有服务"
 
-#: nova/scheduler/host_manager.py:486
+#: nova/scheduler/host_manager.py:456
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
@@ -8195,21 +7870,33 @@
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
-#: nova/scheduler/utils.py:63
+#: nova/scheduler/utils.py:59
 #, python-format
 msgid "Failed to %(service)s_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/filters/affinity_filter.py:109
+#: nova/scheduler/utils.py:165
+#, python-format
+msgid "Ignoring the invalid elements of the option %(name)s: %(options)s"
+msgstr ""
+
+#: nova/scheduler/filters/affinity_filter.py:108
 #, python-format
 msgid "Group anti affinity: check if %(host)s not in %(configured)s"
 msgstr ""
 
-#: nova/scheduler/filters/affinity_filter.py:125
+#: nova/scheduler/filters/affinity_filter.py:124
 #, python-format
 msgid "Group affinity: check if %(host)s in %(configured)s"
 msgstr ""
 
+#: nova/scheduler/filters/aggregate_image_properties_isolation.py:61
+#, python-format
+msgid ""
+"%(host_state)s fails image aggregate properties requirements. Property "
+"%(prop)s does not match %(options)s."
+msgstr ""
+
 #: nova/scheduler/filters/aggregate_instance_extra_specs.py:59
 #, python-format
 msgid ""
@@ -8246,7 +7933,7 @@
 
 #: nova/scheduler/filters/compute_filter.py:47
 #, python-format
-msgid "%(host_state)s has not been heard from in a  while"
+msgid "%(host_state)s has not been heard from in a while"
 msgstr ""
 
 #: nova/scheduler/filters/core_filter.py:51
@@ -8265,28 +7952,28 @@
 msgid "Could not decode cpu_allocation_ratio: '%s'"
 msgstr ""
 
-#: nova/scheduler/filters/disk_filter.py:49
+#: nova/scheduler/filters/disk_filter.py:48
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_disk)s MB usable disk, it only has "
 "%(usable_disk_mb)s MB usable disk."
 msgstr ""
 
-#: nova/scheduler/filters/image_props_filter.py:56
+#: nova/scheduler/filters/image_props_filter.py:53
 #, python-format
 msgid ""
 "Instance contains properties %(image_props)s, but no corresponding "
 "supported_instances are advertised by the compute node"
 msgstr ""
 
-#: nova/scheduler/filters/image_props_filter.py:80
+#: nova/scheduler/filters/image_props_filter.py:82
 #, python-format
 msgid ""
 "Instance properties %(image_props)s are satisfied by compute host hypervisor "
 "version %(hypervisor_version)s and supported instances %(supp_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/image_props_filter.py:89
+#: nova/scheduler/filters/image_props_filter.py:91
 #, python-format
 msgid ""
 "Instance contains properties %(image_props)s that are not provided by the "
@@ -8294,7 +7981,7 @@
 "%(hypervisor_version)s do not match"
 msgstr ""
 
-#: nova/scheduler/filters/image_props_filter.py:109
+#: nova/scheduler/filters/image_props_filter.py:91
 #, python-format
 msgid "%(host_state)s does not support requested instance_properties"
 msgstr ""
@@ -8305,6 +7992,11 @@
 "%(host_state)s fails I/O ops check: Max IOs per host is set to %(max_io_ops)s"
 msgstr ""
 
+#: nova/scheduler/filters/metrics_filter.py:50
+#, python-format
+msgid "%(host_state)s does not have the following metrics: %(metrics)s"
+msgstr ""
+
 #: nova/scheduler/filters/num_instances_filter.py:40
 #, python-format
 msgid ""
@@ -8329,11 +8021,6 @@
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/weights/metrics.py:75
-#, python-format
-msgid "Ignoring the invalid elements of metrics_weight_setting: %s"
-msgstr ""
-
 #: nova/servicegroup/api.py:61
 #, python-format
 msgid "ServiceGroup driver defined as an instance of %s"
@@ -8344,6 +8031,14 @@
 msgid "unknown ServiceGroup driver name: %s"
 msgstr ""
 
+#: nova/servicegroup/api.py:85
+#, python-format
+msgid ""
+"Report interval must be less than service down time. Current config: "
+"<service_down_time: %(service_down_time)s, report_interval: "
+"%(report_interval)s>. Setting service_down_time to: %(new_service_down_time)s"
+msgstr ""
+
 #: nova/servicegroup/api.py:84
 #, python-format
 msgid ""
@@ -8465,22 +8160,22 @@
 msgid "Attempted to instantiate singleton"
 msgstr "试图实例化单例"
 
-#: nova/tests/fake_processutils.py:73
+#: nova/tests/fake_processutils.py:72
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
 msgstr "伪执行命令（子进程）：%s"
 
-#: nova/tests/fake_processutils.py:81
+#: nova/tests/fake_processutils.py:80
 #, python-format
 msgid "Faked command matched %s"
 msgstr "伪命令匹配 %s"
 
-#: nova/tests/fake_processutils.py:97
+#: nova/tests/fake_processutils.py:96
 #, python-format
 msgid "Faked command raised an exception %s"
 msgstr "伪命令引起异常 %s"
 
-#: nova/tests/fake_processutils.py:100
+#: nova/tests/fake_processutils.py:99
 #, python-format
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr "伪命令的标准输出stdout='%(stdout)s' 标准错误输出 stderr='%(stderr)s'"
@@ -8501,64 +8196,68 @@
 msgid "already detached"
 msgstr "已经分离"
 
-#: nova/tests/api/test_auth.py:88
+#: nova/tests/api/test_auth.py:85
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3111
-#: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:2327
+#: nova/tests/api/openstack/compute/test_servers.py:3000
+#: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:2249
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3116
-#: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:2332
+#: nova/tests/api/openstack/compute/test_servers.py:3005
+#: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:2254
 msgid ""
 "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3121
-#: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:2337
+#: nova/tests/api/openstack/compute/test_servers.py:3010
+#: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:2259
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1503
-#: nova/tests/compute/test_compute.py:1530
+#: nova/tests/compute/test_compute.py:1441
+#: nova/tests/compute/test_compute.py:1466
+#: nova/tests/compute/test_compute.py:1523
+#: nova/tests/compute/test_compute.py:1548
 #: nova/tests/compute/test_compute.py:1591
-#: nova/tests/compute/test_compute.py:1618
-#: nova/tests/compute/test_compute.py:1665
-#: nova/tests/compute/test_compute.py:4986
+#: nova/tests/compute/test_compute.py:4728
 #, python-format
 msgid "Running instances: %s"
 msgstr "正在运行的实例：%s"
 
-#: nova/tests/compute/test_compute.py:1510
-#: nova/tests/compute/test_compute.py:1560
-#: nova/tests/compute/test_compute.py:1607
-#: nova/tests/compute/test_compute.py:1633
+#: nova/tests/compute/test_compute.py:1447
+#: nova/tests/compute/test_compute.py:1495
+#: nova/tests/compute/test_compute.py:1538
+#: nova/tests/compute/test_compute.py:1562
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "终止实例之后：%s"
 
-#: nova/tests/compute/test_compute.py:2436
+#: nova/tests/compute/test_compute.py:2289
 msgid "Internal error"
 msgstr "内部错误"
 
-#: nova/tests/compute/test_compute.py:4997
+#: nova/tests/compute/test_compute.py:4739
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr "强制杀死实例后：%s"
 
-#: nova/tests/compute/test_compute.py:5578
+#: nova/tests/compute/test_compute.py:5283
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9718
+#: nova/tests/compute/test_compute.py:9384
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:2594
+#: nova/exception.py:264 nova/tests/compute/test_keypairs.py:103
+msgid "Keypair data is invalid"
+msgstr "密钥对数据无效"
+
+#: nova/tests/db/test_migrations.py:3273
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -8567,12 +8266,12 @@
 "下面的迁移缺少了降级：\n"
 "\t%s"
 
-#: nova/tests/integrated/api_samples_test_base.py:117
+#: nova/tests/integrated/api_samples_test_base.py:116
 #, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/api_samples_test_base.py:131
+#: nova/tests/integrated/api_samples_test_base.py:130
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -8582,22 +8281,22 @@
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/api_samples_test_base.py:143
+#: nova/tests/integrated/api_samples_test_base.py:142
 #, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/api_samples_test_base.py:163
+#: nova/tests/integrated/api_samples_test_base.py:162
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/api_samples_test_base.py:167
+#: nova/tests/integrated/api_samples_test_base.py:166
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/api_samples_test_base.py:188
-#: nova/tests/integrated/api_samples_test_base.py:204
+#: nova/tests/integrated/api_samples_test_base.py:187
+#: nova/tests/integrated/api_samples_test_base.py:203
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -8662,318 +8361,330 @@
 msgid "Decoding JSON: %s"
 msgstr "解码JSON：%s"
 
-#: nova/tests/virt/hyperv/test_hypervapi.py:491
+#: nova/tests/virt/hyperv/test_hypervapi.py:488
 msgid "fake vswitch not found"
 msgstr ""
 
-#: nova/tests/virt/hyperv/test_hypervapi.py:952
+#: nova/tests/virt/hyperv/test_hypervapi.py:947
 msgid "Simulated failure"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:932
+#: nova/tests/virt/libvirt/fakelibvirt.py:909
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:936
+#: nova/tests/virt/libvirt/fakelibvirt.py:913
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:940
+#: nova/tests/virt/libvirt/fakelibvirt.py:917
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:953
+#: nova/tests/virt/libvirt/fakelibvirt.py:930
 msgid ""
 "virEventRegisterDefaultImpl() must be             called before connection "
 "is used."
 msgstr ""
 
-#: nova/tests/virt/vmwareapi/test_vmwareapi_vm_util.py:89
-#: nova/virt/vmwareapi/vm_util.py:957
+#: nova/tests/virt/vmwareapi/test_vmwareapi_vm_util.py:88
+#: nova/virt/vmwareapi/vm_util.py:899
 #, python-format
 msgid "Datastore regex %s did not match any datastores"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_vm_utils.py:495
-#: nova/virt/xenapi/vm_utils.py:2269
+#: nova/tests/virt/xenapi/test_vm_utils.py:485
+#: nova/virt/xenapi/vm_utils.py:2130
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left)s bytes left "
 "to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:940
+#: nova/tests/virt/xenapi/test_xenapi.py:969
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr "在%s 创建文件模拟客户代理"
 
-#: nova/tests/virt/xenapi/test_xenapi.py:951
+#: nova/tests/virt/xenapi/test_xenapi.py:980
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr "移除在 %s 的模拟的客户代理文件"
 
-#: nova/tests/virt/xenapi/image/test_bittorrent.py:132
-#: nova/virt/xenapi/image/bittorrent.py:94
-msgid "Cannot create default bittorrent URL without torrent_base_url set"
+#: nova/tests/virt/xenapi/image/test_bittorrent.py:133
+#: nova/virt/xenapi/image/bittorrent.py:98
+msgid ""
+"Cannot create default bittorrent URL without torrent_base_url set or torrent "
+"URL fetcher extension"
+msgstr ""
+
+#: nova/tests/virt/xenapi/image/test_bittorrent.py:167
+#: nova/virt/xenapi/image/bittorrent.py:102
+msgid "Multiple torrent URL fetcher extensions found. Failing."
 msgstr ""
 
-#: nova/tests/virt/xenapi/image/test_bittorrent.py:164
-#: nova/virt/xenapi/image/bittorrent.py:103
-msgid "Multiple torrent URL fetcher extension found. Failing."
+#: nova/virt/block_device.py:243
+#, python-format
+msgid "Driver failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/block_device.py:165
+#: nova/virt/block_device.py:162
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr "卷 %(volume_id)s 正在 %(mountpoint)s 上启动"
 
-#: nova/virt/configdrive.py:98
+#: nova/virt/configdrive.py:97
 #, python-format
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/cpu.py:60 nova/virt/cpu.py:64
+#: nova/virt/libvirt/driver.py:3304 nova/virt/libvirt/driver.py:3308
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/cpu.py:73
+#: nova/virt/libvirt/driver.py:3317
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/cpu.py:80
+#: nova/virt/libvirt/driver.py:3324
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/cpu.py:85
+#: nova/virt/libvirt/driver.py:3329
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/driver.py:1041
+#: nova/virt/driver.py:1009
 #, python-format
 msgid "Discarding event %s"
 msgstr ""
 
-#: nova/virt/driver.py:1046
+#: nova/virt/driver.py:1014
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:1049
+#: nova/virt/driver.py:1017
 #, python-format
 msgid "Emitting event %s"
 msgstr ""
 
-#: nova/virt/driver.py:1052
+#: nova/virt/driver.py:1020
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:1133
+#: nova/virt/driver.py:1101
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:1136
+#: nova/virt/driver.py:1104
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:1143
+#: nova/virt/driver.py:1111
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
-#: nova/virt/fake.py:211
+#: nova/virt/fake.py:215
 #, python-format
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:180 nova/virt/libvirt/firewall.py:318
+#: nova/virt/firewall.py:177 nova/virt/libvirt/firewall.py:327
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr "试图不过滤没有过滤的实例"
 
-#: nova/virt/firewall.py:188
+#: nova/virt/firewall.py:185
 msgid "Filters added to instance"
 msgstr ""
 
-#: nova/virt/firewall.py:190
+#: nova/virt/firewall.py:187
 msgid "Provider Firewall Rules refreshed"
 msgstr "提供者防火墙规则刷新"
 
-#: nova/virt/firewall.py:372
+#: nova/virt/firewall.py:368
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr "添加安全组规则：%r"
 
-#: nova/virt/firewall.py:503 nova/virt/xenapi/firewall.py:77
+#: nova/virt/firewall.py:496 nova/virt/xenapi/firewall.py:77
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr "添加提供者规则：%s"
 
-#: nova/virt/images.py:88
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr "'qemu-img info'解析失败"
 
-#: nova/virt/images.py:94
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr "fmt=%(fmt)s 由 %(backing_file)s 支持"
 
-#: nova/virt/images.py:107
+#: nova/virt/images.py:105
 #, python-format
 msgid ""
 "%(base)s virtual size %(disk_size)s larger than flavor root disk size "
 "%(size)s"
 msgstr ""
 
-#: nova/virt/images.py:124
+#: nova/virt/images.py:222
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr "转化为裸格式，但目前格式是 %s"
 
-#: nova/virt/baremetal/common.py:29
+#: nova/virt/storage_users.py:63 nova/virt/storage_users.py:101
+#, python-format
+msgid "Cannot decode JSON from %(id_path)s"
+msgstr ""
+
+#: nova/virt/baremetal/common.py:27
 msgid "Connection failed"
 msgstr ""
 
-#: nova/virt/baremetal/common.py:67
+#: nova/virt/baremetal/common.py:65
 msgid "Connection error"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:86
+#: nova/virt/baremetal/driver.py:85
 #, python-format
 msgid "Request for baremetal node %s sent to wrong service host"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:139
+#: nova/virt/baremetal/driver.py:140
 msgid "cpu_arch is not found in flavor_extra_specs"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:178
+#: nova/virt/baremetal/driver.py:177
 #, python-format
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:266
+#: nova/virt/baremetal/driver.py:254
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:293
+#: nova/virt/baremetal/driver.py:281
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:304
+#: nova/virt/baremetal/driver.py:293
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:322
+#: nova/virt/baremetal/driver.py:311
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:327
+#: nova/virt/baremetal/driver.py:316
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:337
+#: nova/virt/baremetal/driver.py:326
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:350
+#: nova/virt/baremetal/driver.py:339
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/iboot_pdu.py:53
+#: nova/virt/baremetal/iboot_pdu.py:51
 msgid "iboot PDU relay ID must be an integer."
 msgstr ""
 
-#: nova/virt/baremetal/iboot_pdu.py:64
+#: nova/virt/baremetal/iboot_pdu.py:62
 msgid "iboot PDU port must be an integer."
 msgstr ""
 
-#: nova/virt/baremetal/iboot_pdu.py:91
-#: nova/virt/baremetal/virtual_power_driver.py:159
+#: nova/virt/baremetal/iboot_pdu.py:89
+#: nova/virt/baremetal/virtual_power_driver.py:157
 #, python-format
 msgid "activate_node name %s"
 msgstr ""
 
-#: nova/virt/baremetal/iboot_pdu.py:103
+#: nova/virt/baremetal/iboot_pdu.py:101
 #, python-format
 msgid "reboot_node: %s"
 msgstr ""
 
-#: nova/virt/baremetal/iboot_pdu.py:116
-#: nova/virt/baremetal/virtual_power_driver.py:182
+#: nova/virt/baremetal/iboot_pdu.py:114
+#: nova/virt/baremetal/virtual_power_driver.py:180
 #, python-format
 msgid "deactivate_node name %s"
 msgstr ""
 
-#: nova/virt/baremetal/iboot_pdu.py:129
-#: nova/virt/baremetal/virtual_power_driver.py:195
+#: nova/virt/baremetal/iboot_pdu.py:127
+#: nova/virt/baremetal/virtual_power_driver.py:193
 #, python-format
 msgid "Checking if %s is running"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:89
+#: nova/virt/baremetal/ipmi.py:86
 #, python-format
 msgid "pid file %s does not contain any pid"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:112
+#: nova/virt/baremetal/ipmi.py:109
 msgid "Node id not supplied to IPMI"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:115
+#: nova/virt/baremetal/ipmi.py:112
 msgid "Address not supplied to IPMI"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:118
+#: nova/virt/baremetal/ipmi.py:115
 msgid "User not supplied to IPMI"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:121
+#: nova/virt/baremetal/ipmi.py:118
 msgid "Password not supplied to IPMI"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:138
+#: nova/virt/baremetal/ipmi.py:135
 #, python-format
 msgid "ipmitool stdout: '%(out)s', stderr: '%(err)s'"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:154
+#: nova/virt/baremetal/ipmi.py:151
 #, python-format
 msgid "IPMI power on failed after %d tries"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:164
+#: nova/virt/baremetal/ipmi.py:159
 msgid "IPMI power on failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:181
+#: nova/virt/baremetal/ipmi.py:175
 #, python-format
 msgid "IPMI power off failed after %d tries"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:191
+#: nova/virt/baremetal/ipmi.py:183
 msgid "IPMI power off failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:202
+#: nova/virt/baremetal/ipmi.py:193
 msgid "IPMI set next bootdev failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:214 nova/virt/baremetal/tilera_pdu.py:154
+#: nova/virt/baremetal/ipmi.py:205 nova/virt/baremetal/tilera_pdu.py:154
 #, python-format
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:110
+#: nova/virt/baremetal/pxe.py:106
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
@@ -9000,32 +8711,32 @@
 msgid "Injecting files into image for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:462 nova/virt/baremetal/tilera.py:320
+#: nova/virt/baremetal/pxe.py:453 nova/virt/baremetal/tilera.py:320
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:469
+#: nova/virt/baremetal/pxe.py:460
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:474
+#: nova/virt/baremetal/pxe.py:465
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:478
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:480 nova/virt/baremetal/tilera.py:345
+#: nova/virt/baremetal/pxe.py:471 nova/virt/baremetal/tilera.py:345
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:485
+#: nova/virt/baremetal/pxe.py:476
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
@@ -9136,7 +8847,7 @@
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:89
+#: nova/virt/baremetal/virtual_power_driver.py:87
 #, python-format
 msgid "Setting up %s commands."
 msgstr ""
@@ -9153,31 +8864,31 @@
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:137
+#: nova/virt/baremetal/virtual_power_driver.py:135
 msgid "Getting full node list."
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:143
+#: nova/virt/baremetal/virtual_power_driver.py:141
 #, python-format
 msgid "Looking up Name for Mac address %s."
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:171
+#: nova/virt/baremetal/virtual_power_driver.py:169
 #, python-format
 msgid "reset node: %s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:198
+#: nova/virt/baremetal/virtual_power_driver.py:197
 #, python-format
 msgid "Node \"%(name)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:232
+#: nova/virt/baremetal/virtual_power_driver.py:230
 #, python-format
 msgid "Result for run_command: %s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:235
+#: nova/virt/baremetal/virtual_power_driver.py:233
 #, python-format
 msgid "Error running command: %s"
 msgstr ""
@@ -9187,17 +8898,16 @@
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:195 nova/virt/hyperv/volumeops.py:185
-#: nova/virt/libvirt/driver.py:1065
+#: nova/virt/hyperv/volumeops.py:183 nova/virt/libvirt/driver.py:984
 msgid "Could not determine iscsi initiator name"
 msgstr "无法确定iscsi initiator名字"
 
-#: nova/virt/baremetal/volume_driver.py:234
+#: nova/virt/baremetal/volume_driver.py:228
 #, python-format
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:288
+#: nova/virt/baremetal/volume_driver.py:261
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -9227,39 +8937,51 @@
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
 
-#: nova/virt/disk/api.py:168
+#: nova/virt/disk/api.py:128
+#, python-format
+msgid ""
+"Checking the file system with e2fsck has failed, the resize will be aborted. "
+"(%s)"
+msgstr ""
+
+#: nova/virt/disk/api.py:162
+#, python-format
+msgid "Resizing the file system with resize2fs has failed with error: %s"
+msgstr ""
+
+#: nova/virt/disk/api.py:156
 #, python-format
 msgid "Checking if we can resize image %(image)s. size=%(size)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:174
+#: nova/virt/disk/api.py:162
 #, python-format
 msgid "Cannot resize image %s to a smaller size."
 msgstr ""
 
-#: nova/virt/disk/api.py:182
+#: nova/virt/disk/api.py:170
 #, python-format
 msgid ""
 "Checking if we can resize filesystem inside %(image)s. CoW=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:192
+#: nova/virt/disk/api.py:180
 #, python-format
 msgid "Unable to mount image %(image)s with error %(error)s. Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:202
+#: nova/virt/disk/api.py:218
 #, python-format
 msgid ""
 "Unable to determine label for image %(image)s with error %(error)s. Cannot "
 "resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:269
+#: nova/virt/disk/api.py:257
 msgid "image already mounted"
 msgstr "镜像已经挂载"
 
-#: nova/virt/disk/api.py:325
+#: nova/virt/disk/api.py:313
 #, python-format
 msgid ""
 "Inject data image=%(image)s key=%(key)s net=%(net)s metadata=%(metadata)s "
@@ -9267,77 +8989,77 @@
 "use_cow=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:345
+#: nova/virt/disk/api.py:331
 #, python-format
 msgid "Ignoring error injecting data into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:367
+#: nova/virt/disk/api.py:350
 #, python-format
 msgid ""
 "Failed to mount container filesystem '%(image)s' on '%(target)s': %(errors)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:389 nova/virt/disk/mount/loop.py:59
+#: nova/virt/disk/mount/loop.py:59
 #, python-format
 msgid "Release loop device %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:393 nova/virt/disk/mount/nbd.py:128
+#: nova/virt/disk/mount/nbd.py:128
 #, python-format
 msgid "Release nbd device %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:397
+#: nova/virt/disk/api.py:413
 #, python-format
 msgid "Failed to teardown container filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:410
+#: nova/virt/disk/api.py:380
 #, python-format
 msgid "Failed to umount container filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:435
+#: nova/virt/disk/api.py:405
 #, python-format
 msgid "Ignoring error injecting %(inject)s into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:447
+#: nova/virt/disk/api.py:417
 #, python-format
 msgid "Inject file fs=%(fs)s path=%(path)s append=%(append)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:456
+#: nova/virt/disk/api.py:426
 #, python-format
 msgid "Inject metadata fs=%(fs)s metadata=%(metadata)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:497
+#: nova/virt/disk/api.py:467
 #, python-format
 msgid "Inject key fs=%(fs)s key=%(key)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:525
+#: nova/virt/disk/api.py:495
 #, python-format
 msgid "Inject key fs=%(fs)s net=%(net)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:550
+#: nova/virt/disk/api.py:520
 #, python-format
 msgid "Inject admin password fs=%(fs)s admin_passwd=<SANITIZED>"
 msgstr ""
 
-#: nova/virt/disk/api.py:589
+#: nova/virt/disk/api.py:564
 msgid "Not implemented on Windows"
 msgstr ""
 
-#: nova/virt/disk/api.py:618
+#: nova/virt/disk/api.py:593
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:634
+#: nova/virt/disk/api.py:609
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -9409,12 +9131,12 @@
 msgid "Failed to mount filesystem: %s"
 msgstr "挂载文件系统失败：%s"
 
-#: nova/virt/disk/mount/api.py:209
+#: nova/virt/disk/mount/api.py:208
 #, python-format
 msgid "Umount %s"
 msgstr ""
 
-#: nova/virt/disk/mount/api.py:223
+#: nova/virt/disk/mount/api.py:219
 msgid "Fail to mount, tearing back down"
 msgstr ""
 
@@ -9433,6 +9155,11 @@
 msgid "Got loop device %s"
 msgstr ""
 
+#: nova/virt/disk/mount/nbd.py:57
+#, python-format
+msgid "NBD error - previous umount did not cleanup /var/lock/qemu-nbd-%s."
+msgstr ""
+
 #: nova/virt/disk/mount/nbd.py:56 nova/virt/disk/mount/nbd.py:70
 msgid "No free nbd devices"
 msgstr "没有空闲NBD设备"
@@ -9489,118 +9216,118 @@
 msgid "Falling back to VFSLocalFS"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:55
+#: nova/virt/disk/vfs/guestfs.py:56
 #, python-format
 msgid "Mount guest OS image %(imgfile)s partition %(part)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:64
+#: nova/virt/disk/vfs/guestfs.py:65
 #, python-format
 msgid "Inspecting guest OS image %s"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:68
+#: nova/virt/disk/vfs/guestfs.py:69
 #, python-format
 msgid "No operating system found in %s"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:72
+#: nova/virt/disk/vfs/guestfs.py:73
 #, python-format
 msgid "Multi-boot OS %(roots)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:74
+#: nova/virt/disk/vfs/guestfs.py:75
 #, python-format
 msgid "Multi-boot operating system found in %s"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:80
+#: nova/virt/disk/vfs/guestfs.py:81
 #, python-format
 msgid "Inspecting guest OS root filesystem %s"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:85
+#: nova/virt/disk/vfs/guestfs.py:86
 #, python-format
 msgid "No mount points found in %(root)s of %(imgfile)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:93
+#: nova/virt/disk/vfs/guestfs.py:94
 #, python-format
 msgid "Mounting %(dev)s at %(dir)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:99
+#: nova/virt/disk/vfs/guestfs.py:100
 #, python-format
 msgid ""
 "Error mounting %(device)s to %(dir)s in image %(imgfile)s with libguestfs "
 "(%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:109
+#: nova/virt/disk/vfs/guestfs.py:110
 #, python-format
 msgid "Setting up appliance for %(imgfile)s %(imgfmt)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:124
+#: nova/virt/disk/vfs/guestfs.py:128
 #, python-format
 msgid "Error mounting %(imgfile)s with libguestfs (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:131
+#: nova/virt/disk/vfs/guestfs.py:135
 msgid "Tearing down appliance"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:137
+#: nova/virt/disk/vfs/guestfs.py:141
 #, python-format
 msgid "Failed to close augeas %s"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:145
+#: nova/virt/disk/vfs/guestfs.py:149
 #, python-format
 msgid "Failed to shutdown appliance %s"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:153
+#: nova/virt/disk/vfs/guestfs.py:157
 #, python-format
 msgid "Failed to close guest handle %s"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:165 nova/virt/disk/vfs/localfs.py:103
+#: nova/virt/disk/vfs/guestfs.py:169 nova/virt/disk/vfs/localfs.py:103
 #, python-format
 msgid "Make directory path=%s"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:170 nova/virt/disk/vfs/localfs.py:108
+#: nova/virt/disk/vfs/guestfs.py:174 nova/virt/disk/vfs/localfs.py:108
 #, python-format
 msgid "Append file path=%s"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:175 nova/virt/disk/vfs/localfs.py:117
+#: nova/virt/disk/vfs/guestfs.py:179 nova/virt/disk/vfs/localfs.py:117
 #, python-format
 msgid "Replace file path=%s"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:180 nova/virt/disk/vfs/localfs.py:126
+#: nova/virt/disk/vfs/guestfs.py:184 nova/virt/disk/vfs/localfs.py:126
 #, python-format
 msgid "Read file path=%s"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:185 nova/virt/disk/vfs/localfs.py:132
+#: nova/virt/disk/vfs/guestfs.py:189 nova/virt/disk/vfs/localfs.py:132
 #, python-format
 msgid "Has file path=%s"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:194
+#: nova/virt/disk/vfs/guestfs.py:198
 #, python-format
 msgid "Set permissions path=%(path)s mode=%(mode)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:200
+#: nova/virt/disk/vfs/guestfs.py:204
 #, python-format
 msgid "Set ownership path=%(path)s user=%(user)s group=%(group)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/guestfs.py:214
+#: nova/virt/disk/vfs/guestfs.py:218
 #, python-format
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
@@ -9635,26 +9362,41 @@
 msgid "Set permissions path=%(path)s user=%(user)s group=%(group)s"
 msgstr ""
 
-#: nova/virt/docker/driver.py:46
+#: nova/virt/docker/client.py:73
+#, python-format
+msgid ""
+"Content-Type of response is not application/json (Docker bug?). Requested "
+"URL %s"
+msgstr ""
+
+#: nova/virt/docker/driver.py:45
 msgid "Default TCP port to find the docker-registry container"
 msgstr ""
 
-#: nova/virt/docker/driver.py:74
+#: nova/virt/docker/driver.py:73
+msgid ""
+"The docker driver does not meet the Nova project's requirements for quality "
+"verification and is planned for removal. This may change, but users should "
+"plan accordingly. Additional details here: "
+"https://wiki.openstack.org/wiki/HypervisorSupportMatrix/DeprecationPlan"
+msgstr ""
+
+#: nova/virt/docker/driver.py:76
 msgid ""
 "Docker daemon is not running or is not reachable (check the rights on "
 "/var/run/docker.sock)"
 msgstr ""
 
-#: nova/virt/docker/driver.py:100
+#: nova/virt/docker/driver.py:106
 msgid "VIF plugging is not supported by the Docker driver."
 msgstr ""
 
-#: nova/virt/docker/driver.py:105
+#: nova/virt/docker/driver.py:111
 msgid "VIF unplugging is not supported by the Docker driver."
 msgstr ""
 
-#: nova/virt/docker/driver.py:143 nova/virt/libvirt/driver.py:3665
-#: nova/virt/xenapi/host.py:191
+#: nova/virt/docker/driver.py:143 nova/virt/libvirt/driver.py:3494
+#: nova/virt/powervm/operator.py:639 nova/virt/xenapi/host.py:191
 #, python-format
 msgid ""
 "Hostname has changed from %(old)s to %(new)s. A restart is required to take "
@@ -9665,103 +9407,107 @@
 msgid "Cannot find any PID under container \"{0}\""
 msgstr ""
 
-#: nova/virt/docker/driver.py:228
-msgid "Cannot set fixed ip"
-msgstr ""
-
 #: nova/virt/docker/driver.py:253
 msgid "Failed to setup the network, rolling back"
 msgstr ""
 
-#: nova/virt/docker/driver.py:263
+#: nova/virt/docker/driver.py:267
 msgid "Image container format not supported ({0})"
 msgstr ""
 
-#: nova/virt/docker/driver.py:292
+#: nova/virt/docker/driver.py:296
 msgid "Image name \"{0}\" does not exist, fetching it..."
 msgstr ""
 
-#: nova/virt/docker/driver.py:297
+#: nova/virt/docker/driver.py:301
 msgid "Cannot pull missing image"
 msgstr ""
 
-#: nova/virt/docker/driver.py:302
+#: nova/virt/docker/driver.py:306
 msgid "Cannot create container"
 msgstr ""
 
-#: nova/virt/docker/driver.py:308
+#: nova/virt/docker/driver.py:312
 msgid "Cannot setup network: {0}"
 msgstr ""
 
-#: nova/virt/docker/driver.py:326
+#: nova/virt/docker/driver.py:330
 msgid "Cannot stop the container, please check docker logs"
 msgstr ""
 
-#: nova/virt/docker/driver.py:329
+#: nova/virt/docker/driver.py:333
 msgid "Cannot restart the container, please check docker logs"
 msgstr ""
 
+#: nova/virt/docker/network.py:34
+#, python-format
+msgid "Cannot remove network namespace, netns id: %s"
+msgstr ""
+
+#: nova/virt/docker/network.py:44
+msgid "Cannot find fixed ip"
+msgstr ""
+
+#: nova/virt/docker/network.py:51
+msgid "Cannot find gateway"
+msgstr ""
+
 #: nova/virt/hyperv/basevolumeutils.py:72
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:155
+#: nova/virt/hyperv/driver.py:165
 msgid "VIF plugging is not supported by the Hyper-V driver."
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:170
 msgid "VIF unplugging is not supported by the Hyper-V driver."
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:164
+#: nova/virt/hyperv/driver.py:160
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:168
+#: nova/virt/hyperv/driver.py:164
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:94
+#: nova/virt/hyperv/hostops.py:93
 #, python-format
 msgid "Windows version: %s "
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:106
+#: nova/virt/hyperv/hostops.py:105
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:140 nova/virt/libvirt/driver.py:4968
-#: nova/virt/xenapi/host.py:168
+#: nova/virt/hyperv/hostops.py:139 nova/virt/libvirt/driver.py:4800
+#: nova/virt/xenapi/host.py:167
 msgid "Updating host stats"
 msgstr "正在更新主机状态"
 
-#: nova/virt/hyperv/hostops.py:166
+#: nova/virt/hyperv/hostops.py:165
 msgid "get_host_stats called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:181
+#: nova/virt/hyperv/hostops.py:180
 #, python-format
 msgid "Host IP address is: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:51
-#, python-format
-msgid "The image is not a valid VHD: %s"
-msgstr ""
-
-#: nova/virt/hyperv/imagecache.py:81
+#: nova/virt/hyperv/imagecache.py:70
 #, python-format
 msgid ""
 "Cannot resize the image to a size smaller than the VHD max. internal size: "
 "%(vhd_size)s. Requested disk size: %(root_vhd_size)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:96
+#: nova/virt/hyperv/imagecache.py:85
 #, python-format
 msgid "Copying VHD %(vhd_path)s to %(resized_vhd_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:101
+#: nova/virt/hyperv/imagecache.py:90
 #, python-format
 msgid "Resizing VHD %(resized_vhd_path)s to new size %(root_vhd_size)s"
 msgstr ""
@@ -9827,12 +9573,12 @@
 msgid "Live migration networks are not configured on this host"
 msgstr ""
 
-#: nova/virt/hyperv/livemigrationutils.py:72 nova/virt/hyperv/vmutils.py:141
+#: nova/virt/hyperv/livemigrationutils.py:72 nova/virt/hyperv/vmutils.py:131
 #, python-format
 msgid "VM not found: %s"
 msgstr ""
 
-#: nova/virt/hyperv/livemigrationutils.py:74 nova/virt/hyperv/vmutils.py:150
+#: nova/virt/hyperv/livemigrationutils.py:74 nova/virt/hyperv/vmutils.py:140
 #, python-format
 msgid "Duplicate VM name found: %s"
 msgstr ""
@@ -9869,86 +9615,86 @@
 msgid "Getting live migration networks for remote host: %s"
 msgstr ""
 
-#: nova/virt/hyperv/migrationops.py:50
+#: nova/virt/hyperv/migrationops.py:49
 msgid "Migration target is the source host"
 msgstr ""
 
-#: nova/virt/hyperv/migrationops.py:52
+#: nova/virt/hyperv/migrationops.py:51
 #, python-format
 msgid "Migration target host: %s"
 msgstr ""
 
-#: nova/virt/hyperv/migrationops.py:73
+#: nova/virt/hyperv/migrationops.py:72
 #, python-format
 msgid "Copying disk \"%(disk_file)s\" to \"%(dest_path)s\""
 msgstr ""
 
-#: nova/virt/hyperv/migrationops.py:97
+#: nova/virt/hyperv/migrationops.py:96
 msgid "Cannot cleanup migration files"
 msgstr ""
 
-#: nova/virt/hyperv/migrationops.py:105
+#: nova/virt/hyperv/migrationops.py:104
 #, python-format
 msgid ""
 "Cannot resize the root disk to a smaller size. Current size: "
 "%(curr_root_gb)s GB. Requested size: %(new_root_gb)s GB"
 msgstr ""
 
-#: nova/virt/hyperv/migrationops.py:113
+#: nova/virt/hyperv/migrationops.py:112
 msgid "migrate_disk_and_power_off called"
 msgstr ""
 
-#: nova/virt/hyperv/migrationops.py:133
+#: nova/virt/hyperv/migrationops.py:132
 msgid "confirm_migration called"
 msgstr ""
 
-#: nova/virt/hyperv/migrationops.py:148
+#: nova/virt/hyperv/migrationops.py:147
 msgid "finish_revert_migration called"
 msgstr ""
 
-#: nova/virt/hyperv/migrationops.py:170
+#: nova/virt/hyperv/migrationops.py:169
 #, python-format
 msgid "Copying base disk %(base_vhd_path)s to %(base_vhd_copy_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/migrationops.py:176
+#: nova/virt/hyperv/migrationops.py:175
 #, python-format
 msgid ""
 "Reconnecting copied base VHD %(base_vhd_copy_path)s and diff VHD "
 "%(diff_vhd_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/migrationops.py:184
+#: nova/virt/hyperv/migrationops.py:183
 #, python-format
 msgid ""
 "Merging base disk %(base_vhd_copy_path)s and diff disk %(diff_vhd_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/migrationops.py:200
+#: nova/virt/hyperv/migrationops.py:199 nova/virt/hyperv/vmops.py:164
 msgid "Cannot resize a VHD to a smaller size"
 msgstr ""
 
-#: nova/virt/hyperv/migrationops.py:207
+#: nova/virt/hyperv/migrationops.py:206
 #, python-format
 msgid "Getting parent disk info for disk: %s"
 msgstr ""
 
-#: nova/virt/hyperv/migrationops.py:213
+#: nova/virt/hyperv/migrationops.py:212
 #, python-format
 msgid "Resizing disk \"%(vhd_path)s\" to new max size %(new_size)s"
 msgstr ""
 
-#: nova/virt/hyperv/migrationops.py:225
+#: nova/virt/hyperv/migrationops.py:224
 #, python-format
 msgid ""
 "Reconnecting copied base VHD %(base_vhd_path)s and diff VHD %(diff_vhd_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/migrationops.py:236
+#: nova/virt/hyperv/migrationops.py:235
 msgid "finish_migration called"
 msgstr ""
 
-#: nova/virt/hyperv/migrationops.py:245
+#: nova/virt/hyperv/migrationops.py:244
 #, python-format
 msgid "Cannot find boot VHD file for instance: %s"
 msgstr ""
@@ -9983,6 +9729,15 @@
 msgid "Removing directory: %s"
 msgstr ""
 
+#: nova/virt/hyperv/rdpconsoleops.py:31
+msgid "get_rdp_console called"
+msgstr ""
+
+#: nova/virt/hyperv/rdpconsoleops.py:36
+#, python-format
+msgid "RDP console: %(host)s:%(port)s, %(vm_id)s"
+msgstr ""
+
 #: nova/virt/hyperv/snapshotops.py:55
 #, python-format
 msgid "Creating snapshot for instance %s"
@@ -10038,213 +9793,211 @@
 msgid "Failed to remove snapshot for VM %s"
 msgstr ""
 
-#: nova/virt/hyperv/vhdutils.py:67 nova/virt/hyperv/vhdutilsv2.py:54
+#: nova/virt/hyperv/vhdutils.py:54 nova/virt/hyperv/vhdutilsv2.py:54
 #, python-format
 msgid "Unsupported disk format: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vhdutils.py:148
+#: nova/virt/hyperv/vhdutils.py:136
 #, python-format
 msgid "The %(vhd_type)s type VHD is not supported"
 msgstr ""
 
-#: nova/virt/hyperv/vhdutils.py:159
+#: nova/virt/hyperv/vhdutils.py:147
 #, python-format
 msgid "Unable to obtain block size from VHD %(vhd_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vhdutils.py:206
+#: nova/virt/hyperv/vhdutils.py:188
 msgid "Unsupported virtual disk format"
 msgstr ""
 
+#: nova/virt/hyperv/vhdutilsv2.py:134
+msgid "Differencing VHDX images are not supported"
+msgstr ""
+
+#: nova/virt/hyperv/vhdutilsv2.py:157
+#, python-format
+msgid ""
+"Unable to obtain internal size from VHDX: %(vhd_path)s. Exception: %(ex)s"
+msgstr ""
+
 #: nova/virt/hyperv/vif.py:74
 #, python-format
 msgid "Creating vswitch port for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:116
+#: nova/virt/hyperv/vmops.py:114
 #, python-format
 msgid "VIF driver not found for network_api_class: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:125
+#: nova/virt/hyperv/vmops.py:123
 msgid "get_info called for instance"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:148
+#: nova/virt/hyperv/vmops.py:146
 #, python-format
 msgid ""
 "Creating differencing VHD. Parent: %(base_vhd_path)s, Target: "
 "%(root_vhd_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:155
+#: nova/virt/hyperv/vmops.py:153
 #, python-format
 msgid "Copying VHD image %(base_vhd_path)s to target: %(root_vhd_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:175
+#: nova/virt/hyperv/vmops.py:169
 #, python-format
 msgid ""
 "Cannot resize a VHD to a smaller size, the original size is "
 "%(base_vhd_size)s, the newer size is %(root_vhd_size)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:182
+#: nova/virt/hyperv/vmops.py:167
 #, python-format
 msgid "Resizing VHD %(root_vhd_path)s to new size %(root_vhd_size)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:209
+#: nova/virt/hyperv/vmops.py:194
 msgid "Spawning new instance"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:237
+#: nova/virt/hyperv/vmops.py:222
 msgid "Spawn instance failed"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:272
-#, python-format
-msgid "Creating nic for instance: %s"
+#: nova/virt/hyperv/vmops.py:269
+msgid "Creating nic for instance"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:283 nova/virt/vmwareapi/vmops.py:563
+#: nova/virt/hyperv/vmops.py:268 nova/virt/vmwareapi/vmops.py:537
 #, python-format
 msgid "Invalid config_drive_format \"%s\""
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:286
-#, python-format
-msgid "Using config drive for instance: %s"
+#: nova/virt/vmwareapi/vmops.py:541
+msgid "Using config drive for instance"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:299 nova/virt/libvirt/driver.py:2537
+#: nova/virt/hyperv/vmops.py:284 nova/virt/libvirt/driver.py:2417
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:307 nova/virt/libvirt/driver.py:2544
-#: nova/virt/vmwareapi/vmops.py:592
+#: nova/virt/hyperv/vmops.py:292 nova/virt/libvirt/driver.py:2424
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:343
-#, python-format
-msgid "Got request to destroy instance: %s"
-msgstr ""
-
-#: nova/virt/hyperv/vmops.py:356
-#, python-format
-msgid "Instance not found: %s"
+#: nova/virt/hyperv/vmops.py:340
+msgid "Got request to destroy instance"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:362
+#: nova/virt/hyperv/vmops.py:347
 #, python-format
 msgid "Failed to destroy instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:367
-msgid "reboot instance"
-msgstr ""
-
-#: nova/virt/hyperv/vmops.py:373
+#: nova/virt/hyperv/vmops.py:358
 msgid "Pause instance"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:379
+#: nova/virt/hyperv/vmops.py:364
 msgid "Unpause instance"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:385
+#: nova/virt/hyperv/vmops.py:370
 msgid "Suspend instance"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:391
+#: nova/virt/hyperv/vmops.py:376
 msgid "Resume instance"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:397
+#: nova/virt/hyperv/vmops.py:382
 msgid "Power off instance"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:403
+#: nova/virt/hyperv/vmops.py:388
 msgid "Power on instance"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:410
+#: nova/virt/hyperv/vmops.py:395
 #, python-format
 msgid "Successfully changed state of VM %(vm_name)s to: %(req_state)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:415
+#: nova/virt/hyperv/vmops.py:400
 #, python-format
 msgid "Failed to change vm state of %(vm_name)s to %(req_state)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmutils.py:119
+#: nova/virt/hyperv/vmutils.py:109
 #, python-format
 msgid "Cannot get VM summary data for: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmutils.py:206
+#: nova/virt/hyperv/vmutils.py:196
 msgid ""
 "The Windows account running nova-compute on this Hyper-V host doesn't have "
 "the required permissions to create or operate the virtual machine."
 msgstr ""
 
-#: nova/virt/hyperv/vmutils.py:216
+#: nova/virt/hyperv/vmutils.py:206
 #, python-format
 msgid "Creating VM %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmutils.py:221
+#: nova/virt/hyperv/vmutils.py:211
 #, python-format
 msgid "Setting memory for vm %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmutils.py:224
+#: nova/virt/hyperv/vmutils.py:214
 #, python-format
 msgid "Set vCPUs for vm %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmutils.py:385
+#: nova/virt/hyperv/vmutils.py:373
 #, python-format
 msgid "Successfully changed vm state of %(vm_name)s to %(req_state)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmutils.py:430
+#: nova/virt/hyperv/vmutils.py:414
 #, python-format
 msgid "Operation failed with return value: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmutils.py:446
+#: nova/virt/hyperv/vmutils.py:430
 #, python-format
 msgid ""
 "WMI job failed with status %(job_state)d. Error details: %(err_sum_desc)s - "
 "%(err_desc)s - Error code: %(err_code)d"
 msgstr ""
 
-#: nova/virt/hyperv/vmutils.py:457
+#: nova/virt/hyperv/vmutils.py:441
 #, python-format
 msgid "WMI job failed with status %(job_state)d. Error details: %(error)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmutils.py:463
+#: nova/virt/hyperv/vmutils.py:447
 #, python-format
 msgid "WMI job failed with status %d. No error description available"
 msgstr ""
 
-#: nova/virt/hyperv/vmutils.py:469
+#: nova/virt/hyperv/vmutils.py:453
 #, python-format
 msgid "WMI job succeeded: %(desc)s, Elapsed=%(elap)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmutils.py:582
+#: nova/virt/hyperv/vmutils.py:561
 msgid "Metrics collection is not supported on this version of Hyper-V"
 msgstr ""
 
-#: nova/virt/hyperv/vmutilsv2.py:244
+#: nova/virt/hyperv/vmutilsv2.py:237
 #, python-format
 msgid "Metric not found: %s"
 msgstr ""
@@ -10263,42 +10016,49 @@
 "%(target_iqn)s, LUN: %(target_lun)s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:110
+#: nova/virt/hyperv/volumeops.py:109
 #, python-format
 msgid "Attach_volume: %(connection_info)s to %(instance_name)s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:141
+#: nova/virt/hyperv/volumeops.py:140
 #, python-format
 msgid "Attach volume failed: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:144
+#: nova/virt/hyperv/volumeops.py:142
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "无法附加卷到实例 %s"
 
-#: nova/virt/hyperv/volumeops.py:157
+#: nova/virt/hyperv/volumeops.py:155
 #, python-format
 msgid "Logging off storage target %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:162
+#: nova/virt/hyperv/volumeops.py:160
 #, python-format
 msgid "Detach_volume: %(connection_info)s from %(instance_name)s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:175
+#: nova/virt/hyperv/volumeops.py:173
 #, python-format
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:198 nova/virt/hyperv/volumeops.py:212
+#: nova/virt/hyperv/volumeops.py:209
+#, python-format
+msgid ""
+"Attempt %d to get device_number from get_device_number_for_target failed. "
+"Retrying..."
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:196 nova/virt/hyperv/volumeops.py:210
 #, python-format
 msgid "Unable to find a mounted disk for target_iqn: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:200
+#: nova/virt/hyperv/volumeops.py:198
 #, python-format
 msgid "Device number: %(device_number)s, target lun: %(target_lun)s"
 msgstr ""
@@ -10308,459 +10068,474 @@
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:146
+#: nova/virt/libvirt/blockinfo.py:140
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:194
+#: nova/virt/libvirt/blockinfo.py:188
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:290
+#: nova/virt/libvirt/blockinfo.py:280
 #, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/config.py:72
+#: nova/virt/libvirt/config.py:71
 #, python-format
 msgid "Generated XML %s "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:398
+#: nova/virt/libvirt/driver.py:360
 #, python-format
 msgid ""
 "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:526
+#: nova/virt/libvirt/driver.py:484
 #, python-format
 msgid "Event loop thread is not active, discarding event %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:557
 msgid "Starting native event thread"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:604
+#: nova/virt/libvirt/driver.py:562
 msgid "Starting green dispatch thread"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:615
+#: nova/virt/libvirt/driver.py:621
+#, python-format
+msgid ""
+"The libvirt driver is not tested on %(type)s/%(arch)s by the OpenStack "
+"project and thus its quality can not be ensured. For more information, see: "
+"https://wiki.openstack.org/wiki/HypervisorSupportMatrix"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:573
 #, python-format
 msgid ""
 "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:623
+#: nova/virt/libvirt/driver.py:584
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "正在连接 libvirt：%s"
 
-#: nova/virt/libvirt/driver.py:637
+#: nova/virt/libvirt/driver.py:595
 #, python-format
 msgid "Registering for lifecycle events %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:644
+#: nova/virt/libvirt/driver.py:668
 #, python-format
 msgid "URI %(uri)s does not support events: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:650
+#: nova/virt/libvirt/driver.py:608
 #, python-format
 msgid "Registering for connection events: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:655
+#: nova/virt/libvirt/driver.py:682
+#, python-format
+msgid ""
+"The version of python-libvirt does not support registerCloseCallback or is "
+"too old: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:685
 #, python-format
 msgid "URI %(uri)s does not support connection events: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:675
+#: nova/virt/libvirt/driver.py:623
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:692
+#: nova/virt/libvirt/driver.py:636
 msgid "Connection to libvirt broke"
 msgstr "连接 libvirt 失败"
 
-#: nova/virt/libvirt/driver.py:714 nova/virt/libvirt/driver.py:717
+#: nova/virt/libvirt/driver.py:658 nova/virt/libvirt/driver.py:661
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:740
+#: nova/virt/libvirt/driver.py:679
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:842
+#: nova/virt/libvirt/driver.py:780
 msgid "Cannot destroy instance, operation time out"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:844
+#: nova/virt/libvirt/driver.py:782
 msgid "operation time out"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:849
+#: nova/virt/libvirt/driver.py:787
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr "销毁时发生错误。Code=%(errcode)s Error=%(e)s"
 
-#: nova/virt/libvirt/driver.py:865
+#: nova/virt/libvirt/driver.py:803
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:870
+#: nova/virt/libvirt/driver.py:808
 msgid "Instance destroyed successfully."
 msgstr "实例销毁成功。"
 
-#: nova/virt/libvirt/driver.py:880
+#: nova/virt/libvirt/driver.py:818
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:890
+#: nova/virt/libvirt/driver.py:828
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:848
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:926
+#: nova/virt/libvirt/driver.py:864
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr "在 undefine 时 libvirt 发生错误。Code=%(errcode)s Error=%(e)s"
 
-#: nova/virt/libvirt/driver.py:946
+#: nova/virt/libvirt/driver.py:884
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:952
+#: nova/virt/libvirt/driver.py:890
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1001
+#: nova/virt/libvirt/driver.py:1042
 #, python-format
 msgid "Ignoring Volume Error on vol %(vol_id)s during delete %(exc)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1071
+#: nova/virt/libvirt/driver.py:990
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1078
+#: nova/virt/libvirt/driver.py:997
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1144
+#: nova/virt/libvirt/driver.py:1058
 #, python-format
 msgid ""
 "Volume sets block size, but the current libvirt hypervisor '%s' does not "
 "support custom block size"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1151
+#: nova/virt/libvirt/driver.py:1065
 #, python-format
 msgid "Volume sets block size, but libvirt '%s' or later is required."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1248
+#: nova/virt/libvirt/driver.py:1162
 msgid "Swap only supports host devices"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1316
+#: nova/virt/libvirt/driver.py:1230
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1340
+#: nova/virt/libvirt/driver.py:1255
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1361
+#: nova/virt/libvirt/driver.py:1277
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1365
+#: nova/virt/libvirt/driver.py:1281
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1473
+#: nova/virt/libvirt/driver.py:1381
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1476
+#: nova/virt/libvirt/driver.py:1384
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1506
+#: nova/virt/libvirt/driver.py:1417
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1518
+#: nova/virt/libvirt/driver.py:1429
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1525
+#: nova/virt/libvirt/driver.py:1436
 msgid "libvirt error while requesting blockjob info."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1609
+#: nova/virt/libvirt/driver.py:1520
 msgid "Failed to send updated snapshot status to volume service."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1659
+#: nova/virt/libvirt/driver.py:1570
 msgid "Found no disk to snapshot."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1682
+#: nova/virt/libvirt/driver.py:1594
 #, python-format
 msgid "snap xml: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1696
+#: nova/virt/libvirt/driver.py:1608
 msgid ""
 "Unable to create quiesced VM snapshot, attempting again with quiescing "
 "disabled."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1703
+#: nova/virt/libvirt/driver.py:1615
 msgid "Unable to create VM snapshot, failing volume_snapshot operation."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1723
+#: nova/virt/libvirt/driver.py:1765
 #, python-format
 msgid "volume_snapshot_create: create_info: %(c_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1732
+#: nova/virt/libvirt/driver.py:1645
 #, python-format
 msgid "Unknown type: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1737
+#: nova/virt/libvirt/driver.py:1650
 msgid "snapshot_id required in create_info"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1746
+#: nova/virt/libvirt/driver.py:1659
 msgid ""
 "Error occurred during volume_snapshot_create, sending error status to Cinder."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1785
+#: nova/virt/libvirt/driver.py:1698
 #, python-format
 msgid ""
 "Libvirt '%s' or later is required for online deletion of volume snapshots."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1789
+#: nova/virt/libvirt/driver.py:1702
 #, python-format
 msgid "volume_snapshot_delete: delete_info: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1792
+#: nova/virt/libvirt/driver.py:1705
 #, python-format
 msgid "Unknown delete_info type %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1822
+#: nova/virt/libvirt/driver.py:1735
 #, python-format
 msgid "Unable to locate disk matching id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1825
+#: nova/virt/libvirt/driver.py:1867
 #, python-format
 msgid "found dev, it's %(dev)s, with active disk: %(disk)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1838
+#: nova/virt/libvirt/driver.py:1751
 #, python-format
 msgid "disk: %(disk)s, base: %(base)s, bw: %(bw)s, flags: %(flags)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1849
+#: nova/virt/libvirt/driver.py:1762
 msgid "blockRebase started successfully"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1853
+#: nova/virt/libvirt/driver.py:1766
 msgid "waiting for blockRebase job completion"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1869
+#: nova/virt/libvirt/driver.py:1782
 msgid "blockCommit started successfully"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1873
+#: nova/virt/libvirt/driver.py:1786
 msgid "waiting for blockCommit job completion"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1883
+#: nova/virt/libvirt/driver.py:1796
 msgid ""
 "Error occurred during volume_snapshot_delete, sending error status to Cinder."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1899
+#: nova/virt/libvirt/driver.py:1812
 #, python-format
 msgid "Instance soft reboot failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1903
+#: nova/virt/libvirt/driver.py:1816
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1907
+#: nova/virt/libvirt/driver.py:1820
 msgid "Failed to soft reboot instance. Trying hard reboot."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1948
+#: nova/virt/libvirt/driver.py:1861
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1956
+#: nova/virt/libvirt/driver.py:1869
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2025
+#: nova/virt/libvirt/driver.py:1923
 msgid "Instance rebooted successfully."
 msgstr "实例成功重启。"
 
-#: nova/virt/libvirt/driver.py:2177
+#: nova/virt/libvirt/driver.py:2073
 msgid "Instance is running"
 msgstr "实例在运行"
 
-#: nova/virt/libvirt/driver.py:2184
+#: nova/virt/libvirt/driver.py:2080 nova/virt/powervm/operator.py:231
 msgid "Instance spawned successfully."
 msgstr "实例成功生产。"
 
-#: nova/virt/libvirt/driver.py:2200
+#: nova/virt/libvirt/driver.py:2096
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data：%(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/driver.py:2238 nova/virt/libvirt/driver.py:2264
+#: nova/virt/libvirt/driver.py:2134 nova/virt/libvirt/driver.py:2160
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2253 nova/virt/xenapi/vmops.py:1562
+#: nova/virt/libvirt/driver.py:2149 nova/virt/xenapi/vmops.py:1449
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2315
+#: nova/virt/libvirt/driver.py:2211
 msgid "This python runtime does not support direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2329
+#: nova/virt/libvirt/driver.py:2220
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2333
+#: nova/virt/libvirt/driver.py:2224
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2338 nova/virt/libvirt/driver.py:2343
+#: nova/virt/libvirt/driver.py:2229 nova/virt/libvirt/driver.py:2234
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2306
 msgid "Creating image"
 msgstr "正在创建镜像"
 
-#: nova/virt/libvirt/driver.py:2528
+#: nova/virt/libvirt/driver.py:2408
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2552
+#: nova/virt/libvirt/driver.py:2594
 msgid "File injection into a boot from volume instance is not supported"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2586
+#: nova/virt/libvirt/driver.py:2461
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2598
+#: nova/virt/libvirt/driver.py:2473
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644
+#: nova/virt/libvirt/driver.py:2519
 #, python-format
 msgid "Detaching PCI devices with libvirt < %(ver)s is not permitted"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2673
+#: nova/virt/libvirt/driver.py:2548
 msgid "Instance disappeared while detaching a PCI device from it."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2684
+#: nova/virt/libvirt/driver.py:2559
 #, python-format
 msgid "Attaching PCI devices %(dev)s to %(dom)s failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2725
+#: nova/virt/libvirt/driver.py:2763
 #, python-format
 msgid "Updating compute service status to %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2766
 #, python-format
 msgid "Not overriding manual compute service status with: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2733
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "Cannot update service status on host: %s,since it is not registered."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2736
+#: nova/virt/libvirt/driver.py:2773
 #, python-format
 msgid ""
 "Cannot update service status on host: %s,due to an unexpected exception."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2809
+#: nova/virt/libvirt/driver.py:2615
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt hypervisor "
 "'%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2815
+#: nova/virt/libvirt/driver.py:2621
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2819
+#: nova/virt/libvirt/driver.py:2625
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2823
+#: nova/virt/libvirt/driver.py:2629
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2839
+#: nova/virt/libvirt/driver.py:2645
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does not "
 "support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3088
+#: nova/virt/libvirt/driver.py:2896
 msgid "Configuring timezone for windows instance to localtime"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3214
+#: nova/virt/libvirt/driver.py:3002
 msgid "Qemu guest agent is enabled through image metadata"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3245
+#: nova/virt/libvirt/driver.py:3348
 #, python-format
 msgid ""
 "Start to_xml network_info=%(network_info)s disk_info=%(disk_info)s "
@@ -10768,115 +10543,116 @@
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3263
+#: nova/virt/libvirt/driver.py:3366
 #, python-format
 msgid "End to_xml xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3281
+#: nova/virt/libvirt/driver.py:3068
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3302
+#: nova/virt/libvirt/driver.py:3089
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr "查找 %(instance_name)s时libvirt出错：[错误代码 %(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/driver.py:3360
+#: nova/virt/libvirt/driver.py:3139
 #, python-format
 msgid "An error occurred while trying to define a domain with xml: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3369
+#: nova/virt/libvirt/driver.py:3148
 #, python-format
 msgid ""
 "An error occurred while trying to launch a defined domain with xml: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3377
+#: nova/virt/libvirt/driver.py:3156
 #, python-format
 msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3443 nova/virt/libvirt/driver.py:3584
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3222 nova/virt/libvirt/driver.py:3413
+#: nova/virt/libvirt/driver.py:3439
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3517
+#: nova/virt/libvirt/driver.py:3346
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented for "
 "this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3527
+#: nova/virt/libvirt/driver.py:3356
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3685
 #, python-format
-msgid "couldn't obtain the vpu count from domain id: %s"
+msgid ""
+"couldn't obtain the vpu count from domain id: %(id)s, exception: %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3651
+#: nova/virt/libvirt/driver.py:3480
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr "libvirt版本过旧(不支持getVersion)"
 
-#: nova/virt/libvirt/driver.py:3821
+#: nova/virt/libvirt/driver.py:3650
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3834
+#: nova/virt/libvirt/driver.py:3946
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, rd_req=%(rd_req)d, "
 "rd_bytes=%(rd_bytes)d, wr_req=%(wr_req)d, wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3851
+#: nova/virt/libvirt/driver.py:3681
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3857
+#: nova/virt/libvirt/driver.py:3687
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats for "
 "device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3911
+#: nova/virt/libvirt/driver.py:3741
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance is "
 "on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3995
+#: nova/virt/libvirt/driver.py:3822
 msgid "Block migration can not be used with shared storage."
 msgstr "块存储迁移无法在共享存储使用"
 
-#: nova/virt/libvirt/driver.py:4003
+#: nova/virt/libvirt/driver.py:3830
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4047
+#: nova/virt/libvirt/driver.py:3874
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too large(available "
 "on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4074
+#: nova/virt/libvirt/driver.py:3901
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
@@ -10885,7 +10661,7 @@
 "已启动实例的CPU信息：\n"
 "%s"
 
-#: nova/virt/libvirt/driver.py:4086
+#: nova/virt/libvirt/driver.py:3913
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -10900,120 +10676,123 @@
 "\n"
 "参考 %(u)s"
 
-#: nova/virt/libvirt/driver.py:4103
+#: nova/virt/libvirt/driver.py:3930
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should mount "
 "the same storage."
 msgstr "创建tmpfile %s 来通知其他的计算节点需要挂载相同的存储。"
 
-#: nova/virt/libvirt/driver.py:4153
+#: nova/virt/libvirt/driver.py:3980
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4225
+#: nova/virt/libvirt/driver.py:4052
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4326
+#: nova/virt/libvirt/driver.py:4153
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4445
+#: nova/virt/libvirt/driver.py:4268
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error "
 "Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4477
+#: nova/virt/libvirt/driver.py:4304
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4482
+#: nova/virt/libvirt/driver.py:4300
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4486
+#: nova/virt/libvirt/driver.py:4309
 #, python-format
 msgid "skipping disk %(path)s (%(target)s) as it is a volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4526
+#: nova/virt/libvirt/driver.py:4657
 #, python-format
-msgid "Getting disk size of %(i_name)s: %(e)s"
+msgid ""
+"Periodic task is updating the host stat, it is trying to get disk "
+"%(i_name)s, but disk file was removed by concurrent operations such as "
+"resize."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4605
+#: nova/virt/libvirt/driver.py:4419
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4674
+#: nova/virt/libvirt/driver.py:4488
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4680
+#: nova/virt/libvirt/driver.py:4494
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4750
+#: nova/virt/libvirt/driver.py:4565
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4858
+#: nova/virt/libvirt/driver.py:4992
 #, python-format
 msgid "Checking instance files accessibility %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4882
+#: nova/virt/libvirt/driver.py:4712
 #, python-format
 msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4887
+#: nova/virt/libvirt/driver.py:4717
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4894
+#: nova/virt/libvirt/driver.py:4724
 #, python-format
 msgid "Deletion of %s failed"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:4897
+#: nova/virt/libvirt/driver.py:4727
 #, python-format
 msgid "Deletion of %s complete"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:51
+#: nova/virt/libvirt/firewall.py:52
 msgid ""
 "Libvirt module could not be loaded. NWFilterFirewall will not work correctly."
 msgstr "Libvirt模块无法加载。NWFilterFirewall 无法正常工作。"
 
-#: nova/virt/libvirt/firewall.py:108
+#: nova/virt/libvirt/firewall.py:109
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr "在 nwfilter 里调用 setup_basic_filtering"
 
-#: nova/virt/libvirt/firewall.py:116
+#: nova/virt/libvirt/firewall.py:117
 msgid "Ensuring static filters"
 msgstr "正在确保静态过滤器"
 
-#: nova/virt/libvirt/firewall.py:259
+#: nova/virt/libvirt/firewall.py:268
 #, python-format
 msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:281
+#: nova/virt/libvirt/firewall.py:290
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr "名称为 %(name)s 的nwfilter(%(instance_filter_name)s) 未找到。"
 
-#: nova/virt/libvirt/firewall.py:299
+#: nova/virt/libvirt/firewall.py:308
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr "iptables 防火墙：设置基本的过滤规则"
 
@@ -11042,171 +10821,176 @@
 msgid "You should specify images_rbd_pool flag to use rbd images."
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:579
+#: nova/virt/libvirt/imagebackend.py:507
 msgid "rbd python libraries not found"
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:625
+#: nova/virt/libvirt/imagebackend.py:552
 #, python-format
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:134
+#: nova/virt/libvirt/imagecache.py:140
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:173
+#: nova/virt/libvirt/imagecache.py:179
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:195
+#: nova/virt/libvirt/imagecache.py:201
 #, python-format
 msgid "Writing stored info to %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:293
+#: nova/virt/libvirt/imagecache.py:330
 #, python-format
 msgid "%s is a valid instance name"
 msgstr "%s 是一个正确的实例名称"
 
-#: nova/virt/libvirt/imagecache.py:296
+#: nova/virt/libvirt/imagecache.py:333
 #, python-format
 msgid "%s has a disk file"
 msgstr "%s 有一个磁盘文件"
 
-#: nova/virt/libvirt/imagecache.py:298
+#: nova/virt/libvirt/imagecache.py:302
+#, python-format
+msgid "Failed to get disk backing file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:335
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr "实例 %(instance)s  由文件 %(backing)s 来备份"
 
-#: nova/virt/libvirt/imagecache.py:312
+#: nova/virt/libvirt/imagecache.py:348
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr "实例 %(instance)s 正在使用的备份文件 %(backing)s 没有出现在镜像服务里。"
 
-#: nova/virt/libvirt/imagecache.py:385
+#: nova/virt/libvirt/imagecache.py:423
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:395
+#: nova/virt/libvirt/imagecache.py:433
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:404
+#: nova/virt/libvirt/imagecache.py:442
 #, python-format
 msgid "%(id)s (%(base_file)s): generating checksum"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:419
+#: nova/virt/libvirt/imagecache.py:428
 #, python-format
-msgid "Cannot remove %(base_file)s, it does not exist"
+msgid "Cannot remove %s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:431
+#: nova/virt/libvirt/imagecache.py:469
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr "基文件太新不需要删除：%s"
 
-#: nova/virt/libvirt/imagecache.py:434
+#: nova/virt/libvirt/imagecache.py:472
 #, python-format
 msgid "Removing base file: %s"
 msgstr "正在删除基文件：%s"
 
-#: nova/virt/libvirt/imagecache.py:441
+#: nova/virt/libvirt/imagecache.py:479
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr "删除 %(base_file)s 失败，错误是 %(error)s"
 
-#: nova/virt/libvirt/imagecache.py:452
+#: nova/virt/libvirt/imagecache.py:490
 #, python-format
 msgid "image %(id)s at (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:476
+#: nova/virt/libvirt/imagecache.py:514
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): in use: on this node %(local)d local, "
 "%(remote)d on other nodes sharing this instance storage"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:488
+#: nova/virt/libvirt/imagecache.py:526
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:500
+#: nova/virt/libvirt/imagecache.py:538
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:507
+#: nova/virt/libvirt/imagecache.py:545
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:516
+#: nova/virt/libvirt/imagecache.py:573
 msgid "Verify base images"
 msgstr "验证基础镜像"
 
-#: nova/virt/libvirt/imagecache.py:520
+#: nova/virt/libvirt/imagecache.py:580
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:538
+#: nova/virt/libvirt/imagecache.py:598
 #, python-format
 msgid "Unknown base file: %s"
 msgstr "未知的基文件：%s"
 
-#: nova/virt/libvirt/imagecache.py:543
+#: nova/virt/libvirt/imagecache.py:603
 #, python-format
 msgid "Active base files: %s"
 msgstr "活跃的基文件：%s"
 
-#: nova/virt/libvirt/imagecache.py:546
+#: nova/virt/libvirt/imagecache.py:606
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr "损坏的基文件：%s"
 
-#: nova/virt/libvirt/imagecache.py:550
+#: nova/virt/libvirt/imagecache.py:610
 #, python-format
 msgid "Removable base files: %s"
 msgstr "可删除的基文件：%s"
 
-#: nova/virt/libvirt/imagecache.py:558
+#: nova/virt/libvirt/imagecache.py:618
 msgid "Verification complete"
 msgstr "确认完成"
 
-#: nova/virt/libvirt/imagecache.py:575
+#: nova/virt/libvirt/imagecache.py:569
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr "跳过验证，在 %s 上没有基础目录"
 
-#: nova/virt/libvirt/utils.py:81 nova/virt/libvirt/utils.py:87
+#: nova/virt/libvirt/utils.py:78 nova/virt/libvirt/utils.py:84
 msgid "systool is not installed"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:91
+#: nova/virt/libvirt/utils.py:88
 msgid "Cannot find any Fibre Channel HBAs"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:233
+#: nova/virt/libvirt/utils.py:230
 #, python-format
 msgid ""
 "Insufficient Space on Volume Group %(vg)s. Only %(free_space)db available, "
 "but %(size)db required by volume %(lv)s."
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:246
+#: nova/virt/libvirt/utils.py:243
 #, python-format
 msgid ""
 "Volume group %(vg)s will not be able to hold sparse volume %(lv)s. Virtual "
@@ -11214,242 +10998,285 @@
 "%(free_space)db."
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:285
+#: nova/virt/libvirt/utils.py:282
 #, python-format
 msgid "rbd remove %(name)s in pool %(pool)s failed"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:306
+#: nova/virt/libvirt/utils.py:303
 #, python-format
 msgid "vg %s must be LVM volume group"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:335
+#: nova/virt/libvirt/utils.py:332
 #, python-format
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:580
+#: nova/virt/libvirt/utils.py:394
+#, python-format
+msgid "ignoring unrecognized volume_clear='%s' value"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:415
+#, python-format
+msgid "volume_clear='%s' is not handled"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:607
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:336 nova/virt/libvirt/vif.py:580
-#: nova/virt/libvirt/vif.py:762
+#: nova/virt/libvirt/vif.py:318 nova/virt/libvirt/vif.py:541
+#: nova/virt/libvirt/vif.py:702
 #, python-format
 msgid "vif_type=%(vif_type)s instance=%(instance)s vif=%(vif)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:343 nova/virt/libvirt/vif.py:587
-#: nova/virt/libvirt/vif.py:769
+#: nova/virt/libvirt/vif.py:325 nova/virt/libvirt/vif.py:548
+#: nova/virt/libvirt/vif.py:709
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:387 nova/virt/libvirt/vif.py:607
-#: nova/virt/libvirt/vif.py:789
+#: nova/virt/libvirt/vif.py:364 nova/virt/libvirt/vif.py:566
+#: nova/virt/libvirt/vif.py:727
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:399
+#: nova/virt/libvirt/vif.py:376
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr "保证vlan %(vlan)s 和桥 %(bridge)s"
 
-#: nova/virt/libvirt/vif.py:410
+#: nova/virt/libvirt/vif.py:387
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr "保证桥 %s"
 
-#: nova/virt/libvirt/vif.py:527 nova/virt/libvirt/vif.py:551
-#: nova/virt/libvirt/vif.py:575
+#: nova/virt/libvirt/vif.py:504 nova/virt/libvirt/vif.py:536
 msgid "Failed while plugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:623 nova/virt/libvirt/vif.py:654
-#: nova/virt/libvirt/vif.py:672 nova/virt/libvirt/vif.py:693
-#: nova/virt/libvirt/vif.py:712 nova/virt/libvirt/vif.py:736
-#: nova/virt/libvirt/vif.py:757
+#: nova/virt/libvirt/vif.py:582 nova/virt/libvirt/vif.py:610
+#: nova/virt/libvirt/vif.py:628 nova/virt/libvirt/vif.py:649
+#: nova/virt/libvirt/vif.py:668 nova/virt/libvirt/vif.py:697
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:147
+#: nova/virt/libvirt/volume.py:131
 #, python-format
 msgid "Unknown content in connection_info/qos_specs: %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:156
+#: nova/virt/libvirt/volume.py:154
 #, python-format
 msgid "Unknown content in connection_info/access_mode: %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:249 nova/virt/libvirt/volume.py:526
+#: nova/virt/libvirt/volume.py:247 nova/virt/libvirt/volume.py:580
 #, python-format
 msgid "iscsiadm %(command)s: stdout=%(out)s stderr=%(err)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:301
+#: nova/virt/libvirt/volume.py:276
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr "在 %s 未找到iSCSI设备"
 
-#: nova/virt/libvirt/volume.py:304
+#: nova/virt/libvirt/volume.py:279
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:317
+#: nova/virt/libvirt/volume.py:292
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:373
+#: nova/virt/libvirt/volume.py:375
+#, python-format
+msgid "Unable to delete volume device %s"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:386
 #, python-format
 msgid ""
 "Failed to remove multipath device descriptor %(dev_mapper)s. Exception "
 "message: %(msg)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:536
+#: nova/virt/libvirt/volume.py:590
 #, python-format
 msgid "multipath %(command)s: stdout=%(out)s stderr=%(err)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:639 nova/virt/libvirt/volume.py:775
+#: nova/virt/libvirt/volume.py:736 nova/virt/libvirt/volume.py:872
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:687
+#: nova/virt/libvirt/volume.py:784
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:689
+#: nova/virt/libvirt/volume.py:786
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:801
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:846
+#: nova/virt/libvirt/volume.py:943
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:855
+#: nova/virt/libvirt/volume.py:952
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:865
+#: nova/virt/libvirt/volume.py:962
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:868
+#: nova/virt/libvirt/volume.py:965
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:885
+#: nova/virt/libvirt/volume.py:982
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:894
+#: nova/virt/libvirt/volume.py:991
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:927
+#: nova/virt/libvirt/volume.py:971
 #, python-format
 msgid "devices to remove = %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:971
+#: nova/virt/libvirt/volume.py:1068
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:982
+#: nova/virt/libvirt/volume.py:1079
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:988
+#: nova/virt/libvirt/volume.py:1085
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:1003
+#: nova/virt/libvirt/volume.py:1100
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:112
+#: nova/virt/vmwareapi/driver.py:93
+msgid ""
+"The VMware ESX driver is not tested by the OpenStack project and thus its "
+"quality can not be ensured. For more information, see: "
+"https://wiki.openstack.org/wiki/HypervisorSupportMatrix"
+msgstr ""
+
+#: nova/virt/vmwareapi/driver.py:149
 msgid ""
 "Must specify host_ip, host_username and host_password to use "
 "compute_driver=vmwareapi.VMwareESXDriver or vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:206
+#: nova/virt/vmwareapi/driver.py:420
+#, python-format
+msgid "Invalid Regular Expression %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/driver.py:243
 msgid "Instance cannot be found in host, or in an unknownstate."
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:362
+#: nova/virt/vmwareapi/driver.py:402
 #, python-format
 msgid "All clusters specified %s were not found in the vCenter"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:371
+#: nova/virt/vmwareapi/driver.py:411
 #, python-format
 msgid "The following clusters could not be found in the vCenter %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:380
-#, python-format
-msgid "Invalid Regular Expression %s"
-msgstr ""
-
-#: nova/virt/vmwareapi/driver.py:502
+#: nova/virt/vmwareapi/driver.py:538
 #, python-format
 msgid "The resource %s does not exist"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:548
+#: nova/virt/vmwareapi/driver.py:584
 #, python-format
 msgid "Invalid cluster or resource pool name : %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:571
+#: nova/virt/vmwareapi/driver.py:607
 #, python-format
 msgid "The available nodes are: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:757
+#: nova/virt/vmwareapi/driver.py:793
 #, python-format
 msgid ""
 "Unable to connect to server at %(server)s, sleeping for %(seconds)s seconds"
 msgstr ""
 
+#: nova/virt/vmwareapi/driver.py:768
+#, python-format
+msgid "Unable to validate session %s!"
+msgstr ""
+
+#: nova/virt/vmwareapi/driver.py:770
+#, python-format
+msgid "Exception: %(ex)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/driver.py:810
+#, python-format
+msgid "Session %s is inactive!"
+msgstr ""
+
 #: nova/virt/vmwareapi/driver.py:836
 #, python-format
-msgid "In vmwareapi:_call_method, got this exception: %s"
-msgstr "在vmwareapi：_call_method，得到这个异常：%s"
+msgid ""
+"_call_method(session=%(key)s) failed. Module: %(module)s. Method: "
+"%(method)s. args: %(args)s. kwargs: %(kwargs)s. Iteration: %(n)s. Exception: "
+"%(ex)s. "
+msgstr ""
+
+#: nova/virt/vmwareapi/driver.py:857
+#, python-format
+msgid "In vmwareapi: _call_method (session=%s)"
+msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:872
+#: nova/virt/vmwareapi/driver.py:916
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr "任务 [%(task_name)s] %(task_ref)s 状态：成功"
 
-#: nova/virt/vmwareapi/driver.py:878
+#: nova/virt/vmwareapi/driver.py:922
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr "任务 [%(task_name)s] %(task_ref)s 状态：错误 %(error_info)s"
 
-#: nova/virt/vmwareapi/driver.py:884
+#: nova/virt/vmwareapi/driver.py:928
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr "在vmwareapi：_poll_task，得到这个错误 %s"
@@ -11471,48 +11298,85 @@
 msgid "No default value for use_linked_clone found."
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:48 nova/virt/xenapi/fake.py:81
+#: nova/virt/vmwareapi/error_util.py:136
+msgid "Resource already exists."
+msgstr ""
+
+#: nova/virt/vmwareapi/error_util.py:141
+msgid "Cannot delete file."
+msgstr ""
+
+#: nova/virt/vmwareapi/error_util.py:146
+msgid "File already exists."
+msgstr ""
+
+#: nova/virt/vmwareapi/error_util.py:151
+msgid "File fault."
+msgstr ""
+
+#: nova/virt/vmwareapi/error_util.py:156
+msgid "File locked."
+msgstr ""
+
+#: nova/virt/vmwareapi/error_util.py:161
+msgid "File not found."
+msgstr ""
+
+#: nova/virt/vmwareapi/error_util.py:166
+msgid "Invalid property."
+msgstr ""
+
+#: nova/virt/vmwareapi/error_util.py:171
+msgid "Not Authenticated."
+msgstr ""
+
+#: nova/virt/vmwareapi/error_util.py:194
+#, python-format
+msgid "Fault %s not matched."
+msgstr ""
+
+#: nova/virt/vmwareapi/fake.py:47 nova/virt/xenapi/fake.py:80
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr "%(text)s: _db_content => %(content)s"
 
-#: nova/virt/vmwareapi/fake.py:238
+#: nova/virt/vmwareapi/fake.py:220
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:863
+#: nova/virt/vmwareapi/fake.py:753
 msgid "There is no VM registered"
 msgstr "没有虚拟机注册"
 
-#: nova/virt/vmwareapi/fake.py:865 nova/virt/vmwareapi/fake.py:1062
+#: nova/virt/vmwareapi/fake.py:755 nova/virt/vmwareapi/fake.py:948
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr "ref 为 %s 的虚拟机不存在"
 
-#: nova/virt/vmwareapi/fake.py:934
+#: nova/virt/vmwareapi/fake.py:824
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr "退出无效的会话或者已经退出了：%s"
 
-#: nova/virt/vmwareapi/fake.py:949
+#: nova/virt/vmwareapi/fake.py:839
 msgid "Session is faulty"
 msgstr "会话有错误"
 
-#: nova/virt/vmwareapi/fake.py:952
+#: nova/virt/vmwareapi/fake.py:842
 msgid "Session Invalid"
 msgstr "会话无效"
 
-#: nova/virt/vmwareapi/fake.py:1059
+#: nova/virt/vmwareapi/fake.py:945
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
-#: nova/virt/vmwareapi/host.py:42
+#: nova/virt/vmwareapi/host.py:40
 #, python-format
 msgid "%(action)s %(host)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/host.py:65
+#: nova/virt/vmwareapi/host.py:63
 #, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr ""
@@ -11538,6 +11402,11 @@
 msgid "Creating Port Group with name %s on the ESX host"
 msgstr "正在ESX主机上创建名称为 %s 的端口组"
 
+#: nova/virt/vmwareapi/network_util.py:170
+#, python-format
+msgid "Port Group %s already exists."
+msgstr ""
+
 #: nova/virt/vmwareapi/network_util.py:174
 #, python-format
 msgid "Created Port Group with name %s on the ESX host"
@@ -11549,139 +11418,166 @@
 "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vif.py:116
+#: nova/virt/vmwareapi/vif.py:114
 #, python-format
 msgid ""
 "No valid network found in %(opaque)s, from %(bridge)s or "
 "%(integration_bridge)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vim.py:111
+#: nova/virt/vmwareapi/vim.py:87
 msgid "Unable to import suds."
 msgstr "无法导入 suds。"
 
-#: nova/virt/vmwareapi/vim.py:202
+#: nova/virt/vmwareapi/vim.py:174
 #, python-format
 msgid "No such SOAP method '%s' provided by VI SDK"
 msgstr "VI SDK没有提供这样的SOAP方法 “%s”"
 
-#: nova/virt/vmwareapi/vim.py:207
+#: nova/virt/vmwareapi/vim.py:179
 #, python-format
 msgid "httplib error in %s: "
 msgstr "在 %s 中发生 httplib 错误： "
 
-#: nova/virt/vmwareapi/vim.py:214
+#: nova/virt/vmwareapi/vim.py:211
+#, python-format
+msgid "urllib2 error in  %s: "
+msgstr ""
+
+#: nova/virt/vmwareapi/vim.py:186
 #, python-format
 msgid "Socket error in %s: "
 msgstr "在 %s 套接字中发生错误 "
 
-#: nova/virt/vmwareapi/vim.py:219
+#: nova/virt/vmwareapi/vim.py:191
 #, python-format
 msgid "Type error in  %s: "
 msgstr "在%s里发生类型错误： "
 
-#: nova/virt/vmwareapi/vim.py:223
+#: nova/virt/vmwareapi/vim.py:195
 #, python-format
 msgid "Exception in %s "
 msgstr "在 %s 发生异常 "
 
-#: nova/virt/vmwareapi/vim_util.py:192
+#: nova/virt/vmwareapi/vim_util.py:190
 #, python-format
 msgid "Unable to retrieve value for %(path)s Reason: %(reason)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vm_util.py:836
+#: nova/virt/vmwareapi/vm_util.py:1031
 msgid "No host available on cluster"
 msgstr ""
 
-#: nova/virt/vmwareapi/vm_util.py:1028
+#: nova/virt/vmwareapi/vm_util.py:970
 #, python-format
 msgid "Failed to get cluster references %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vm_util.py:1040
+#: nova/virt/vmwareapi/vm_util.py:982
 #, python-format
 msgid "Failed to get resource pool references %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:106
+#: nova/virt/vmwareapi/vmops.py:101
 msgid "Getting list of instances"
 msgstr "获取实例列表"
 
-#: nova/virt/vmwareapi/vmops.py:132
+#: nova/virt/vmwareapi/vmops.py:127
 #, python-format
 msgid "Got total of %s instances"
 msgstr "总共获得 %s 个实例"
 
-#: nova/virt/vmwareapi/vmops.py:137
+#: nova/virt/vmwareapi/vmops.py:133
 #, python-format
 msgid "Extending root virtual disk to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:151
+#: nova/virt/vmwareapi/vmops.py:148
 #, python-format
 msgid "Extending virtual disk failed with error: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:158
+#: nova/virt/vmwareapi/vmops.py:144
 msgid "Extended root virtual disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:161
+#: nova/virt/vmwareapi/vmops.py:158
 #, python-format
 msgid "Deleting the datastore file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:172
+#: nova/virt/vmwareapi/vmops.py:175
+#, python-format
+msgid ""
+"Unable to delete %(ds)s. There may be more than one process or thread that "
+"tries to delete the file. Exception: %(ex)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:180
 msgid "Deleted the datastore file"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:198 nova/virt/xenapi/vmops.py:334
+#: nova/virt/xenapi/vmops.py:334
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:256
+#: nova/virt/vmwareapi/vmops.py:213
 msgid "Image disk size greater than requested disk size"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:293
+#: nova/virt/vmwareapi/vmops.py:251
 msgid "Creating VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:301
+#: nova/virt/vmwareapi/vmops.py:259
 msgid "Created VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:324
+#: nova/virt/vmwareapi/vmops.py:345
+#, python-format
+msgid "Creating temporary folder for %(folder)s on datastore %(datastore)s."
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:283
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter type "
 "%(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:343
+#: nova/virt/vmwareapi/vmops.py:302
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:353
+#: nova/virt/vmwareapi/vmops.py:379
+#, python-format
+msgid "Moving temporary folder %(tmp)s to cache folder %(cache)s."
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:399
+#, python-format
+msgid "File %(folder)s already exists on %(ds)s."
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:404
 #, python-format
 msgid ""
-"Downloading image file data %(image_ref)s to the ESX data store "
+"Downloading image file data %(image_ref)s to the data store "
 "%(data_store_name)s"
-msgstr "下载文件数据 %(image_ref)s 到ESX主机的数据存储 %(data_store_name)s 上"
+msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:373
+#: nova/virt/vmwareapi/vmops.py:424
 #, python-format
 msgid ""
-"Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the ESX "
-"data store %(data_store_name)s"
+"Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the data "
+"store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:387
+#: nova/virt/vmwareapi/vmops.py:367
 #, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type "
@@ -11689,308 +11585,301 @@
 "type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:408
+#: nova/virt/vmwareapi/vmops.py:388
 #, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:501
+#: nova/virt/vmwareapi/vmops.py:475
 #, python-format
 msgid "Copying root disk of size %sGb"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:551
-msgid "Powering on the VM instance"
+#: nova/virt/vmwareapi/vmops.py:582
+#, python-format
+msgid "Root disk file creation failed - %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:557
-msgid "Powered on the VM instance"
+#: nova/virt/vmwareapi/vmops.py:525
+msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:567
-msgid "Using config drive for instance"
+#: nova/virt/vmwareapi/vmops.py:531
+msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:606
+#: nova/virt/vmwareapi/vmops.py:582
 #, python-format
 msgid ""
 "Reconfiguring VM instance %(instance_name)s to attach cdrom %(file_path)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:614
+#: nova/virt/vmwareapi/vmops.py:590
 #, python-format
 msgid ""
 "Reconfigured VM instance %(instance_name)s to attach cdrom %(file_path)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:710
+#: nova/virt/vmwareapi/vmops.py:686
 msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:720
+#: nova/virt/vmwareapi/vmops.py:696
 msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:765
+#: nova/virt/vmwareapi/vmops.py:741
 msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:778
+#: nova/virt/vmwareapi/vmops.py:754
 msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:787
+#: nova/virt/vmwareapi/vmops.py:763
 #, python-format
 msgid "Uploading image %s"
 msgstr "上传镜像 %s"
 
-#: nova/virt/vmwareapi/vmops.py:802
+#: nova/virt/vmwareapi/vmops.py:777
 #, python-format
 msgid "Uploaded image %s"
 msgstr "已经上传镜像  %s"
 
-#: nova/virt/vmwareapi/vmops.py:858
+#: nova/virt/vmwareapi/vmops.py:840
 msgid "instance is not powered on"
 msgstr "实例未启动"
 
-#: nova/virt/vmwareapi/vmops.py:865
+#: nova/virt/vmwareapi/vmops.py:847
 msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:868
+#: nova/virt/vmwareapi/vmops.py:850
 msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:870
+#: nova/virt/vmwareapi/vmops.py:852
 msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:874
+#: nova/virt/vmwareapi/vmops.py:856
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:886 nova/virt/vmwareapi/vmops.py:1199
+#: nova/virt/vmwareapi/vmops.py:868 nova/virt/vmwareapi/vmops.py:1183
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:891 nova/virt/vmwareapi/vmops.py:1204
+#: nova/virt/vmwareapi/vmops.py:873 nova/virt/vmwareapi/vmops.py:1188
 msgid "Destroyed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:875
 #, python-format
 msgid ""
 "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:923 nova/virt/vmwareapi/vmops.py:1071
+#: nova/virt/vmwareapi/vmops.py:906 nova/virt/vmwareapi/vmops.py:1055
 msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:928 nova/virt/vmwareapi/vmops.py:1076
+#: nova/virt/vmwareapi/vmops.py:911 nova/virt/vmwareapi/vmops.py:1060
 msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:932
+#: nova/virt/vmwareapi/vmops.py:915
 msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:935
+#: nova/virt/vmwareapi/vmops.py:918
 msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:937
+#: nova/virt/vmwareapi/vmops.py:920
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the VM: "
 "%s"
 msgstr "注销虚拟机时在 vmwareapi:vmops:destroy 中发生异常：%s"
 
-#: nova/virt/vmwareapi/vmops.py:946
+#: nova/virt/vmwareapi/vmops.py:933
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:961
+#: nova/virt/vmwareapi/vmops.py:945
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:950
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr "当从磁盘删除虚拟机的内容时在 vmwareapi:vmops:destroy 里发生异常：%s"
 
-#: nova/virt/vmwareapi/vmops.py:974
+#: nova/virt/vmwareapi/vmops.py:958
 msgid "pause not supported for vmwareapi"
 msgstr "vmwareapi 不支持暂停"
 
-#: nova/virt/vmwareapi/vmops.py:978
+#: nova/virt/vmwareapi/vmops.py:962
 msgid "unpause not supported for vmwareapi"
 msgstr "vmwareapi 不支持取消暂停"
 
-#: nova/virt/vmwareapi/vmops.py:989
+#: nova/virt/vmwareapi/vmops.py:973
 msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:993
+#: nova/virt/vmwareapi/vmops.py:977
 msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:980
 msgid "instance is powered off and cannot be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:999
+#: nova/virt/vmwareapi/vmops.py:983
 msgid ""
 "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:993
 msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1014
+#: nova/virt/vmwareapi/vmops.py:998
 msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1016
+#: nova/virt/vmwareapi/vmops.py:1000
 msgid "instance is not in a suspended state"
 msgstr "实例不在挂起状态"
 
-#: nova/virt/vmwareapi/vmops.py:1079
+#: nova/virt/vmwareapi/vmops.py:1063
 msgid "instance is suspended and cannot be powered off."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1082
+#: nova/virt/vmwareapi/vmops.py:1066
 msgid ""
 "VM was already in powered off state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1093
+#: nova/virt/vmwareapi/vmops.py:1077
 msgid ""
 "VM was already in powered on state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1097
+#: nova/virt/vmwareapi/vmops.py:1081
 msgid "Powering on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1102
+#: nova/virt/vmwareapi/vmops.py:1086
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1122
+#: nova/virt/vmwareapi/vmops.py:1106
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr "将实例 '%(instance_uuid)s' 的进度更新到 %(progress)d"
 
-#: nova/virt/vmwareapi/vmops.py:1153
+#: nova/virt/vmwareapi/vmops.py:1137
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1143
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1175
+#: nova/virt/vmwareapi/vmops.py:1158
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1183
+#: nova/virt/vmwareapi/vmops.py:1166
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1195
+#: nova/virt/vmwareapi/vmops.py:1179
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1206
+#: nova/virt/vmwareapi/vmops.py:1190
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying "
 "the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1219
+#: nova/virt/vmwareapi/vmops.py:1206
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1225
+#: nova/virt/vmwareapi/vmops.py:1212
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1260
+#: nova/virt/vmwareapi/vmops.py:1237
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1272
+#: nova/virt/vmwareapi/vmops.py:1249
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1282 nova/virt/xenapi/vmops.py:1506
+#: nova/virt/vmwareapi/vmops.py:1259 nova/virt/xenapi/vmops.py:1393
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr "找到%(instance_count)d个超过%(timeout)d秒悬挂的重启"
 
-#: nova/virt/vmwareapi/vmops.py:1286 nova/virt/xenapi/vmops.py:1510
+#: nova/virt/vmwareapi/vmops.py:1263 nova/virt/xenapi/vmops.py:1397
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1364
+#: nova/virt/vmwareapi/vmops.py:1335
 #, python-format
 msgid "VM %(uuid)s is currently on host %(host_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1415
+#: nova/virt/vmwareapi/vmops.py:1386
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1421
+#: nova/virt/vmwareapi/vmops.py:1392
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1433
+#: nova/virt/vmwareapi/vmops.py:1404
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1440
+#: nova/virt/vmwareapi/vmops.py:1411
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1529
+#: nova/virt/vmwareapi/vmops.py:1509
 #, python-format
 msgid "Creating directory with path %s"
 msgstr "正在使用路径 %s 创建目录"
 
-#: nova/virt/vmwareapi/vmops.py:1535
+#: nova/virt/vmwareapi/vmops.py:1515
 #, python-format
 msgid "Created directory with path %s"
 msgstr "已经创建路径为 %s 的目录"
 
-#: nova/virt/vmwareapi/vmops.py:1562
-msgid "VIF plugging is not supported by the VMware driver."
-msgstr ""
-
-#: nova/virt/vmwareapi/vmops.py:1567
-msgid "VIF unplugging is not supported by the VMware driver."
-msgstr ""
-
-#: nova/virt/vmwareapi/vmops.py:1580
+#: nova/virt/vmwareapi/vmops.py:1560
 #, python-format
 msgid ""
 "Will copy while retaining adapter type %(adapter_type)s and disk type "
@@ -12027,36 +11916,31 @@
 msgid "Uploading image %s to the Glance image server"
 msgstr "正在向Glance镜像服务器上传镜像 %s"
 
-#: nova/virt/vmwareapi/vmware_images.py:172
+#: nova/virt/vmwareapi/vmware_images.py:170
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr "已经向Glance镜像服务器上传了镜像 %s"
 
-#: nova/virt/vmwareapi/vmware_images.py:183
+#: nova/virt/vmwareapi/vmware_images.py:181
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr "正在获取镜像 %s 的大小"
 
-#: nova/virt/vmwareapi/vmware_images.py:188
+#: nova/virt/vmwareapi/vmware_images.py:186
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr "获得大小为 %(size)s 的镜像目的为了 %(image)s"
 
-#: nova/virt/vmwareapi/volume_util.py:159
+#: nova/virt/vmwareapi/volume_util.py:164
 #, python-format
 msgid "Rescanning HBA %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volume_util.py:162
+#: nova/virt/vmwareapi/volume_util.py:167
 #, python-format
 msgid "Rescanned HBA %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/volume_util.py:174 nova/virt/xenapi/volume_utils.py:277
-#, python-format
-msgid "Mountpoint cannot be translated: %s"
-msgstr "挂载点无法被翻译：%s"
-
 #: nova/virt/vmwareapi/volumeops.py:62
 #, python-format
 msgid ""
@@ -12071,215 +11955,215 @@
 "device %(device_name)s with type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:125
+#: nova/virt/vmwareapi/volumeops.py:124
 #, python-format
 msgid ""
 "Reconfiguring VM instance %(instance_name)s to detach disk %(disk_key)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:133
+#: nova/virt/vmwareapi/volumeops.py:132
 #, python-format
 msgid ""
 "Reconfigured VM instance %(instance_name)s to detach disk %(disk_key)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:141
+#: nova/virt/vmwareapi/volumeops.py:140
 #, python-format
 msgid "Discovering iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:146
 msgid "Storage target found. No need to discover"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:155
+#: nova/virt/vmwareapi/volumeops.py:154
 #, python-format
 msgid "Discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:160
+#: nova/virt/vmwareapi/volumeops.py:159
 #, python-format
 msgid ""
 "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:233 nova/virt/vmwareapi/volumeops.py:268
+#: nova/virt/vmwareapi/volumeops.py:232 nova/virt/vmwareapi/volumeops.py:267
 #: nova/virt/xenapi/volumeops.py:61
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "挂载点 %(mountpoint)s 附加到实例 %(instance_name)s"
 
-#: nova/virt/vmwareapi/volumeops.py:242
+#: nova/virt/vmwareapi/volumeops.py:241
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 
-#: nova/virt/vmwareapi/volumeops.py:253 nova/virt/vmwareapi/volumeops.py:429
+#: nova/virt/vmwareapi/volumeops.py:252 nova/virt/vmwareapi/volumeops.py:427
 msgid "Unable to find iSCSI Target"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:275
+#: nova/virt/vmwareapi/volumeops.py:274
 #, python-format
 msgid "Volume attach. Driver type: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:346
+#: nova/virt/vmwareapi/volumeops.py:345
 #, python-format
 msgid ""
 "The volume has not been displaced from its original location: %s. No "
 "consolidation needed."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:353
+#: nova/virt/vmwareapi/volumeops.py:352
 #, python-format
 msgid ""
 "The volume's backing has been relocated to %s. Need to consolidate backing "
 "disk file."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:393 nova/virt/vmwareapi/volumeops.py:437
+#: nova/virt/vmwareapi/volumeops.py:391 nova/virt/vmwareapi/volumeops.py:435
 msgid "Unable to find volume"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:401 nova/virt/vmwareapi/volumeops.py:421
+#: nova/virt/vmwareapi/volumeops.py:399 nova/virt/vmwareapi/volumeops.py:419
 #: nova/virt/xenapi/volumeops.py:134
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "分离_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/virt/vmwareapi/volumeops.py:412 nova/virt/vmwareapi/volumeops.py:439
+#: nova/virt/vmwareapi/volumeops.py:410 nova/virt/vmwareapi/volumeops.py:437
 #: nova/virt/xenapi/volumeops.py:153
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "挂载点 %(mountpoint)s 从实例 %(instance_name)s 分离"
 
-#: nova/virt/vmwareapi/volumeops.py:446
+#: nova/virt/vmwareapi/volumeops.py:444
 #, python-format
 msgid "Volume detach. Driver type: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:459
+#: nova/virt/vmwareapi/volumeops.py:457
 #, python-format
 msgid "Root volume attach. Driver type: %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:126 nova/virt/xenapi/vmops.py:1781
+#: nova/virt/xenapi/agent.py:109 nova/virt/xenapi/vmops.py:1655
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:131 nova/virt/xenapi/vmops.py:1786
+#: nova/virt/xenapi/agent.py:114 nova/virt/xenapi/vmops.py:1660
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:136 nova/virt/xenapi/vmops.py:1791
+#: nova/virt/xenapi/agent.py:119 nova/virt/xenapi/vmops.py:1665
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:146
+#: nova/virt/xenapi/agent.py:129
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:136
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:159
+#: nova/virt/xenapi/agent.py:142
 #, python-format
 msgid "The agent call to %(method)s was successful: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:185
+#: nova/virt/xenapi/agent.py:183
 #, python-format
 msgid "Ignoring error while configuring instance with agent: %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208
+#: nova/virt/xenapi/agent.py:167
 msgid "Querying agent version"
 msgstr "查询代理版本"
 
-#: nova/virt/xenapi/agent.py:232
+#: nova/virt/xenapi/vmops.py:642
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is %(version)s"
 msgstr ""
 "%(hypervisor)s/%(os)s/%(architecture)s 最新的agent build 是 %(version)s 版本"
 
-#: nova/virt/xenapi/agent.py:235
+#: nova/virt/xenapi/vmops.py:645
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr "没有找到 %(hypervisor)s/%(os)s/%(architecture)s 的代理创建"
 
-#: nova/virt/xenapi/agent.py:246
+#: nova/virt/xenapi/agent.py:186
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:250
+#: nova/virt/xenapi/agent.py:248
 msgid "Skipping agent update."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:258
+#: nova/virt/xenapi/agent.py:195
 #, python-format
 msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:291
+#: nova/virt/xenapi/agent.py:227
 msgid "Setting admin password"
 msgstr "设置管理员密码"
 
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:244
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:318
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping agent ssh key injection for this image."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:266
 msgid "Skipping agent file injection for this image."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:342
+#: nova/virt/xenapi/agent.py:273
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:352
+#: nova/virt/xenapi/agent.py:283
 msgid "Resetting network"
 msgstr "重置网络"
 
-#: nova/virt/xenapi/agent.py:387
+#: nova/virt/xenapi/agent.py:318
 msgid ""
 "XenServer tools installed in this image are capable of network injection.  "
 "Networking files will not bemanipulated"
 msgstr "安装在该镜像的XenServer工具可以进行网络注入。网络文件不会被操作。"
 
-#: nova/virt/xenapi/agent.py:395
+#: nova/virt/xenapi/agent.py:326
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr "该镜像有XenServer工具，但是不能进行网络注入"
 
-#: nova/virt/xenapi/agent.py:399
+#: nova/virt/xenapi/agent.py:330
 msgid "XenServer tools are not installed in this image"
 msgstr "没有在该镜像上安装XenServer工具"
 
-#: nova/virt/xenapi/agent.py:413
+#: nova/virt/xenapi/agent.py:344
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:455
+#: nova/virt/xenapi/agent.py:386
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "OpenSSL错误：%s"
@@ -12290,68 +12174,80 @@
 "connection_password to use compute_driver=xenapi.XenAPIDriver"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:178
+#: nova/virt/xenapi/driver.py:172
+msgid ""
+"The xenapi driver does not meet the Nova project's requirements for quality "
+"verification and is planned for removal. This may change, but users should "
+"plan accordingly. Additional details here: "
+"https://wiki.openstack.org/wiki/HypervisorSupportMatrix/DeprecationPlan"
+msgstr ""
+
+#: nova/virt/xenapi/driver.py:164
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:407
+#: nova/virt/xenapi/driver.py:388
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:638
+#: nova/virt/xenapi/driver.py:608
 msgid "Host startup on XenServer is not supported."
 msgstr "不支持在XenServer启动主机"
 
-#: nova/virt/xenapi/fake.py:762 nova/virt/xenapi/fake.py:870
-#: nova/virt/xenapi/fake.py:889 nova/virt/xenapi/fake.py:957
+#: nova/virt/xenapi/fake.py:749 nova/virt/xenapi/fake.py:857
+#: nova/virt/xenapi/fake.py:876 nova/virt/xenapi/fake.py:944
 msgid "Raising NotImplemented"
 msgstr "产生 NotImplemented 错误"
 
-#: nova/virt/xenapi/fake.py:764
+#: nova/virt/xenapi/fake.py:751
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake 没有 %s 的实现"
 
-#: nova/virt/xenapi/fake.py:797
+#: nova/virt/xenapi/fake.py:784
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:803
+#: nova/virt/xenapi/fake.py:790
 #, python-format
 msgid "Calling getter %s"
 msgstr "调用 getter %s"
 
-#: nova/virt/xenapi/fake.py:806
+#: nova/virt/xenapi/fake.py:793
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:872
+#: nova/virt/xenapi/fake.py:859
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
 msgstr "xenapi.fake 没有 %s 的实现或者调用时用了错误数目的参数"
 
-#: nova/virt/xenapi/host.py:74
+#: nova/virt/xenapi/host.py:73
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database: "
 "assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:86
+#: nova/virt/xenapi/host.py:85
 #, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr ""
 
-#: nova/virt/xenapi/host.py:106
+#: nova/virt/xenapi/host.py:105
 #, python-format
 msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
+#: nova/virt/xenapi/host.py:196
+msgid "Failed to parse information about a pci device for passthrough"
+msgstr ""
+
 #: nova/virt/xenapi/host.py:211
 #, python-format
 msgid "Failed to extract instance support from %s"
@@ -12381,91 +12277,91 @@
 msgid "Found no network for bridge %s"
 msgstr "发现网桥 %s 没有网络"
 
-#: nova/virt/xenapi/pool.py:72
+#: nova/virt/xenapi/pool.py:71
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:155
+#: nova/virt/xenapi/pool.py:159
 #, python-format
 msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:170
+#: nova/virt/xenapi/pool.py:176
 #, python-format
 msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:187
+#: nova/virt/xenapi/pool.py:193
 #, python-format
 msgid "Pool-Join failed: %s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:190
+#: nova/virt/xenapi/pool.py:196
 #, python-format
 msgid "Unable to join %s in the pool"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:206
+#: nova/virt/xenapi/pool.py:212
 #, python-format
 msgid "Pool-eject failed: %s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:218
+#: nova/virt/xenapi/pool.py:224
 #, python-format
 msgid "Unable to set up pool: %s."
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:229
+#: nova/virt/xenapi/pool.py:235
 #, python-format
 msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vif.py:105
+#: nova/virt/xenapi/vif.py:102
 #, python-format
 msgid "Found no PIF for device %s"
 msgstr "没有找到设备 %s 的PIF"
 
-#: nova/virt/xenapi/vif.py:124
+#: nova/virt/xenapi/vif.py:121
 #, python-format
 msgid ""
 "PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. Expected "
 "%(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:236
+#: nova/virt/xenapi/vm_utils.py:234
 #, python-format
 msgid ""
 "Device id %(id)s specified is not supported by hypervisor version %(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:334
+#: nova/virt/xenapi/vm_utils.py:273
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:285
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:351 nova/virt/xenapi/vm_utils.py:366
+#: nova/virt/xenapi/vm_utils.py:290 nova/virt/xenapi/vm_utils.py:305
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:355
+#: nova/virt/xenapi/vm_utils.py:294
 msgid "Shutting down VM (cleanly)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:370
+#: nova/virt/xenapi/vm_utils.py:309
 msgid "Shutting down VM (hard)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:407
+#: nova/virt/xenapi/vm_utils.py:347
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr "没有在实例 %s 找到VBD"
 
-#: nova/virt/xenapi/vm_utils.py:434
+#: nova/virt/xenapi/vm_utils.py:364
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
@@ -12477,38 +12373,38 @@
 "%(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:444
+#: nova/virt/xenapi/vm_utils.py:374
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "无法移除 VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:447
+#: nova/virt/xenapi/vm_utils.py:379
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:458
+#: nova/virt/xenapi/vm_utils.py:390
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "无法销毁 VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:480
+#: nova/virt/xenapi/vm_utils.py:412
 #, python-format
 msgid ""
 "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:484
+#: nova/virt/xenapi/vm_utils.py:416
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "创建了VBD %(vbd_ref)s 目的是为了虚拟机 %(vm_ref)s，VDI %(vdi_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:511
+#: nova/virt/xenapi/vm_utils.py:443
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr "无法销毁 VDI %s"
 
-#: nova/virt/xenapi/vm_utils.py:538
+#: nova/virt/xenapi/vm_utils.py:470
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) on "
@@ -12517,21 +12413,21 @@
 "创建了 VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) 位置在 "
 "%(sr_ref)s。"
 
-#: nova/virt/xenapi/vm_utils.py:554
+#: nova/virt/xenapi/vm_utils.py:486
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:579
+#: nova/virt/xenapi/vm_utils.py:511
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:668
+#: nova/virt/xenapi/vm_utils.py:602
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr "克隆了 VDI %(vdi_ref)s 对象来自VDI %(vdi_to_clone_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:735
+#: nova/virt/xenapi/vm_utils.py:648
 #, python-format
 msgid "No primary VDI found for %s"
 msgstr ""
@@ -12540,371 +12436,389 @@
 msgid "Error while removing sm_config"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:777
+#: nova/virt/xenapi/vm_utils.py:660
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:827
+#: nova/virt/xenapi/vm_utils.py:705
 #, python-format
 msgid ""
 "Only file-based SRs (ext/NFS) are supported by this feature.  SR %(uuid)s is "
 "of type %(type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:851
+#: nova/virt/xenapi/vm_utils.py:729
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:906
+#: nova/virt/xenapi/vm_utils.py:905
 #, python-format
 msgid "Multiple base images for image: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:913 nova/virt/xenapi/vmops.py:1033
+#: nova/virt/xenapi/vm_utils.py:942
+#, python-format
+msgid ""
+"Resizing up VDI %(vdi_ref)s from %(virtual_size)d to %(new_disk_size)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:953
+msgid "No need to change vdi virtual size."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:960
+#, python-format
+msgid "VDI %s is bigger than requested resize up size."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:962
+msgid "VDI too big for requested resize up."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:784 nova/virt/xenapi/vmops.py:928
 msgid "Can't resize a disk to 0 GB."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:958
+#: nova/virt/xenapi/vm_utils.py:831
 msgid "Skipping auto_config_disk as destination size is 0GB"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:965
+#: nova/virt/xenapi/vm_utils.py:838
 msgid "Disk must have only one partition."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:973
+#: nova/virt/xenapi/vm_utils.py:846
 #, python-format
 msgid "Disk contains a filesystem we are unable to resize: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:982
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid "Attempted auto_configure_disk failed because: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1109
+#: nova/virt/xenapi/vm_utils.py:976
 #, python-format
 msgid ""
 "Error when generating ephemeral disk. Device: %(userdevice)s Size GB: "
 "%(size_gb)s Error: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1203
+#: nova/virt/xenapi/vm_utils.py:1070
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr "从 dom0 中移除内核/内存盘文件"
 
-#: nova/virt/xenapi/vm_utils.py:1218
+#: nova/virt/xenapi/vm_utils.py:1082
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on this "
 "system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1289
+#: nova/virt/xenapi/vm_utils.py:1139
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1323
+#: nova/virt/xenapi/vm_utils.py:1173
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1355
+#: nova/virt/xenapi/vm_utils.py:1422
 #, python-format
 msgid "Invalid value '%s' for torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1378
+#: nova/virt/xenapi/vm_utils.py:1445
 #, python-format
 msgid "Invalid value '%d' for image_compression_level"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1389
+#: nova/virt/xenapi/vm_utils.py:1239
 #, python-format
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1404
+#: nova/virt/xenapi/vm_utils.py:1254
 #, python-format
 msgid ""
 "Download handler '%(handler)s' raised an exception, falling back to default "
 "handler '%(default_handler)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1440
+#: nova/virt/xenapi/vm_utils.py:1290
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:1459
+#: nova/virt/xenapi/vm_utils.py:1525
 #, python-format
-msgid ""
-"Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
+msgid "Image size %(size)d exceeded flavor allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1483
+#: nova/virt/xenapi/vm_utils.py:1333
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1500
+#: nova/virt/xenapi/vm_utils.py:1350
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1510
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d bytes"
 msgstr "内核/内存盘镜像太大：%(vdi_size)d 字节，最大 %(max_size)d 字节"
 
-#: nova/virt/xenapi/vm_utils.py:1529
+#: nova/virt/xenapi/vm_utils.py:1379
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "将VDI %s 复制到dom0的/boot/guest下"
 
-#: nova/virt/xenapi/vm_utils.py:1543
+#: nova/virt/xenapi/vm_utils.py:1393
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "内核/内存盘 VDI %s 已销毁"
 
-#: nova/virt/xenapi/vm_utils.py:1552
+#: nova/virt/xenapi/vm_utils.py:1402
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1596
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr "检测到 %(image_type_str)s 格式，目标是镜像 %(image_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1647
+#: nova/virt/xenapi/vm_utils.py:1521
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s 依然可用"
 
-#: nova/virt/xenapi/vm_utils.py:1750
+#: nova/virt/xenapi/vm_utils.py:1624
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1769
+#: nova/virt/xenapi/vm_utils.py:1845
 #, python-format
 msgid "Scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1780
+#: nova/virt/xenapi/vm_utils.py:1856
 #, python-format
 msgid "Retry SR scan due to error: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1813
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr "标记sr_matching_filter '%s' 没有遵循格式要求"
 
-#: nova/virt/xenapi/vm_utils.py:1834
+#: nova/virt/xenapi/vm_utils.py:1684
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances on. "
 "Please check your configuration (e.g. set a default SR for the pool) and/or "
 "configure the flag 'sr_matching_filter'."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1847
+#: nova/virt/xenapi/vm_utils.py:1697
 msgid "Cannot find SR of content-type ISO"
 msgstr "无法找到content-type ISO的存储库"
 
-#: nova/virt/xenapi/vm_utils.py:1855
+#: nova/virt/xenapi/vm_utils.py:1705
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1857
+#: nova/virt/xenapi/vm_utils.py:1707
 msgid "ISO: not iso content"
 msgstr "ISO：非iso内容"
 
-#: nova/virt/xenapi/vm_utils.py:1860
+#: nova/virt/xenapi/vm_utils.py:1710
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr "ISO：iso content_type，没有 'i18n-key' 键"
 
-#: nova/virt/xenapi/vm_utils.py:1863
+#: nova/virt/xenapi/vm_utils.py:1713
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr "ISO：iso content_type，i18n-key的值不是 'local-storage-iso'"
 
-#: nova/virt/xenapi/vm_utils.py:1867
+#: nova/virt/xenapi/vm_utils.py:1717
 msgid "ISO: SR MATCHing our criteria"
 msgstr "ISO: 存储库符合标准"
 
-#: nova/virt/xenapi/vm_utils.py:1869
+#: nova/virt/xenapi/vm_utils.py:1719
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr "ISO: ISO, 正在查看是否是本地的主机"
 
-#: nova/virt/xenapi/vm_utils.py:1872
+#: nova/virt/xenapi/vm_utils.py:1722
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1875
+#: nova/virt/xenapi/vm_utils.py:1725
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr "ISO: PBD匹配, 想要 %(pbd_rec)s, 目前有 %(host)s"
 
-#: nova/virt/xenapi/vm_utils.py:1878
+#: nova/virt/xenapi/vm_utils.py:1728
 msgid "ISO: SR with local PBD"
 msgstr "ISO：含有本地PBD的存储库"
 
-#: nova/virt/xenapi/vm_utils.py:1900
+#: nova/virt/xenapi/vm_utils.py:1750
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: %(server)s."
 msgstr "无法为含服务器详细信息的虚拟机 %(vm_uuid)s 获取RRD XML：%(server)s。"
 
-#: nova/virt/xenapi/vm_utils.py:1934
+#: nova/virt/xenapi/vm_utils.py:1784
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2022
+#: nova/virt/xenapi/vm_utils.py:1874
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr "父标识 %(parent_uuid)s 和原先的父标识 %(original_parent_uuid)s 不匹配，正在等待合并..."
 
-#: nova/virt/xenapi/vm_utils.py:2034
+#: nova/virt/xenapi/vm_utils.py:1886
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2069
+#: nova/virt/xenapi/vm_utils.py:1921
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr "等待设备 %s 创建超时"
 
-#: nova/virt/xenapi/vm_utils.py:2089
+#: nova/virt/xenapi/vm_utils.py:1941
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2102
+#: nova/virt/xenapi/vm_utils.py:1954
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "插入VBD %s... "
 
-#: nova/virt/xenapi/vm_utils.py:2105
+#: nova/virt/xenapi/vm_utils.py:1957
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "插入VBD %s 完成。"
 
-#: nova/virt/xenapi/vm_utils.py:2107
+#: nova/virt/xenapi/vm_utils.py:1959
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr "VBD %(vbd_ref)s 作为 %(orig_dev)s 插入"
 
-#: nova/virt/xenapi/vm_utils.py:2111
+#: nova/virt/xenapi/vm_utils.py:1963
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr "VBD %(vbd_ref)s 插入错误的设备，重新映射为 %(dev)s"
 
-#: nova/virt/xenapi/vm_utils.py:2117
+#: nova/virt/xenapi/vm_utils.py:1969
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "正在销毁VDI为 %s 的 VBD "
 
-#: nova/virt/xenapi/vm_utils.py:2125
+#: nova/virt/xenapi/vm_utils.py:1977
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "已经销毁VDI为 %s 的 VBD"
 
-#: nova/virt/xenapi/vm_utils.py:2167
+#: nova/virt/xenapi/vm_utils.py:2019
 msgid "Partitions:"
 msgstr "分区："
 
-#: nova/virt/xenapi/vm_utils.py:2173
+#: nova/virt/xenapi/vm_utils.py:2025
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr "  %(num)s: %(ptype)s %(size)d sectors"
 
-#: nova/virt/xenapi/vm_utils.py:2199
+#: nova/virt/xenapi/vm_utils.py:2051
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to %(dev_path)s..."
 msgstr "将分区表 %(primary_first)d %(primary_last)d 写入到 %(dev_path)s..."
 
-#: nova/virt/xenapi/vm_utils.py:2208
+#: nova/virt/xenapi/vm_utils.py:2061
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "完成写入分区表 %s 。"
 
-#: nova/virt/xenapi/vm_utils.py:2244
+#: nova/virt/xenapi/vm_utils.py:2324
 msgid ""
 "Shrinking the filesystem down with resize2fs has failed, please check if you "
 "have enough free space on your disk."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2284
+#: nova/virt/xenapi/vm_utils.py:2145
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2320
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2373
+#: nova/virt/xenapi/vm_utils.py:2234
 msgid "Manipulating interface files directly"
 msgstr "直接操作接口文件"
 
-#: nova/virt/xenapi/vm_utils.py:2382
+#: nova/virt/xenapi/vm_utils.py:2243
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr "挂载文件系统失败(期望的是非Linux实例)：%s"
 
-#: nova/virt/xenapi/vm_utils.py:2494
+#: nova/virt/xenapi/vm_utils.py:2576
 msgid "This domU must be running on the host specified by connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2551
+#: nova/virt/xenapi/vmops.py:760
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2563
+#: nova/virt/xenapi/vmops.py:769
 msgid "Failed to transfer vhd to new host"
 msgstr "将 vhd 转移到新主机失败"
 
-#: nova/virt/xenapi/vm_utils.py:2589
+#: nova/virt/xenapi/vm_utils.py:2671
 msgid "ipxe_boot_menu_url not set, user will have to enter URL manually..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2595
+#: nova/virt/xenapi/vm_utils.py:2677
 msgid "ipxe_network_name not set, user will have to enter IP manually..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2606
+#: nova/virt/xenapi/vm_utils.py:2416
 #, python-format
 msgid ""
 "Unable to find network matching '%(network_name)s', user will have to enter "
 "IP manually..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2630
+#: nova/virt/xenapi/vm_utils.py:2440
 #, python-format
 msgid "ISO creation tool '%s' does not exist."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:172
+#: nova/virt/xenapi/vmops.py:179
 #, python-format
 msgid "Importing image upload handler: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:187
+#: nova/virt/xenapi/vmops.py:194
 msgid "Error: Agent is disabled"
 msgstr ""
 
@@ -12912,278 +12826,280 @@
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:414
+#: nova/virt/xenapi/vmops.py:413
 msgid "ipxe_boot is True but no ISO image found"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:507
+#: nova/virt/xenapi/vmops.py:504
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:547
+#: nova/virt/xenapi/vmops.py:567
 #, python-format
 msgid "Using PV kernel: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:574
+#: nova/virt/xenapi/vmops.py:593
 msgid "Auto configuring disk, attempting to resize root disk..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:627
+#: nova/virt/xenapi/vmops.py:626
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:658
 msgid "Skip agent setup, not enabled."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:646
+#: nova/virt/xenapi/vmops.py:665
 msgid "Skip agent setup, unable to contact agent."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:669
 #, python-format
 msgid "Detected agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:739
+#: nova/virt/xenapi/vmops.py:756
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:758
+#: nova/virt/xenapi/vmops.py:788
 #, python-format
 msgid "Updating progress to %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:765
+#: nova/virt/xenapi/vmops.py:795
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:769
+#: nova/virt/xenapi/vmops.py:799
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:803
 msgid "Unable to terminate instance."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:828
+#: nova/virt/xenapi/vmops.py:857
 #, python-format
 msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:879
+#: nova/virt/xenapi/vmops.py:897
 msgid "Migrated root base vhds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:895
+#: nova/virt/xenapi/vmops.py:913
 msgid "Migrated all base vhds."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:930
+#: nova/virt/xenapi/vmops.py:947
 #, python-format
 msgid "Read-only migrated for disk: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:985
+#: nova/virt/xenapi/vmops.py:998
 #, python-format
 msgid "_migrate_disk_resizing_up failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:992
+#: nova/virt/xenapi/vmops.py:1005
 #, python-format
 msgid "_migrate_disk_resizing_up failed to rollback: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1009
-msgid "Unable to resize ephemeral disks"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:1082
-#, python-format
-msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
-msgstr "将 VDI %(vdi_uuid)s 由 %(old_gb)dGB 调大到  %(new_gb)dGB"
-
-#: nova/virt/xenapi/vmops.py:1089
-msgid "Resize complete"
+#: nova/virt/xenapi/vmops.py:1022
+msgid "Can't resize down ephemeral disks."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1134
+#: nova/virt/xenapi/vmops.py:1029
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1140
+#: nova/virt/xenapi/vmops.py:1035
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting halted "
 "instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1219
+#: nova/virt/xenapi/vmops.py:1114
 msgid "Unable to update metadata, VM not found."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1262
+#: nova/virt/xenapi/vmops.py:1157
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1266
+#: nova/virt/xenapi/vmops.py:1161
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1293
+#: nova/virt/xenapi/vmops.py:1188
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1300
+#: nova/virt/xenapi/vmops.py:1195
 msgid "instance has a kernel or ramdisk but not both"
 msgstr "实例拥有内核或者内存盘，但不是二者均有"
 
-#: nova/virt/xenapi/vmops.py:1308
+#: nova/virt/xenapi/vmops.py:1203
 msgid "kernel/ramdisk files removed"
 msgstr "内核/内存盘文件移除了"
 
-#: nova/virt/xenapi/vmops.py:1335
+#: nova/virt/xenapi/vmops.py:1230
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1364
+#: nova/virt/xenapi/vmops.py:1259
 msgid "VM is not present, skipping destroy..."
 msgstr "虚拟机不存在，跳过销毁..."
 
-#: nova/virt/xenapi/vmops.py:1415
+#: nova/virt/xenapi/vmops.py:1310
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr "实例已处于救援模式：%s"
 
-#: nova/virt/xenapi/vmops.py:1457
+#: nova/virt/xenapi/vmops.py:1344
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1660
+#: nova/virt/xenapi/vmops.py:1547
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1682
+#: nova/virt/xenapi/vmops.py:1569
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1691
+#: nova/virt/xenapi/vmops.py:1578
 #, python-format
 msgid "Creating VIF for network %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1694
+#: nova/virt/xenapi/vmops.py:1581
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1729
+#: nova/virt/xenapi/vmops.py:1718
 #, python-format
 msgid "Injecting hostname (%s) into xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1739
+#: nova/virt/xenapi/vmops.py:1618
 msgid "Removing hostname from xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1847
+#: nova/virt/xenapi/vmops.py:1721
 #, python-format
 msgid ""
 "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1868
+#: nova/virt/xenapi/vmops.py:1742
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1874
+#: nova/virt/xenapi/vmops.py:1865
 #, python-format
 msgid "PIF %s does not contain IP address"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1887
+#: nova/virt/xenapi/vmops.py:1754
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1961
+#: nova/virt/xenapi/vmops.py:1952
 msgid "XAPI supporting relax-xsm-sr-check=true required"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1972
+#: nova/virt/xenapi/vmops.py:1963
 #, python-format
 msgid "assert_can_migrate failed because: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:2032
+#: nova/virt/xenapi/vmops.py:1892
 msgid "Migrate Send failed"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:53
+#: nova/virt/xenapi/volume_utils.py:52
 #, python-format
 msgid "Creating SR %s"
 msgstr "正在创建存储库 %s"
 
-#: nova/virt/xenapi/volume_utils.py:63
+#: nova/virt/xenapi/volume_utils.py:62
 #, python-format
 msgid "Introducing SR %s"
 msgstr "引入存储库 %s"
 
-#: nova/virt/xenapi/volume_utils.py:70
+#: nova/virt/xenapi/volume_utils.py:69
 msgid "Creating PBD for SR"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:73
+#: nova/virt/xenapi/volume_utils.py:72
 msgid "Plugging SR"
 msgstr "插入存储库"
 
-#: nova/virt/xenapi/volume_utils.py:84
+#: nova/virt/xenapi/volume_utils.py:83
 msgid "Forgetting SR..."
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:106
+#: nova/virt/xenapi/volume_utils.py:105
 #, python-format
 msgid "Unable to find SR from VBD %s"
 msgstr "无法在VBD %s找到存储库"
 
-#: nova/virt/xenapi/volume_utils.py:123
+#: nova/virt/xenapi/volume_utils.py:122
 #, python-format
 msgid "Ignoring exception %(exc)s when getting PBDs for %(sr_ref)s"
 msgstr "异常 %(exc)s 在为 %(sr_ref)s 得到PBDs时被忽略"
 
-#: nova/virt/xenapi/volume_utils.py:131
+#: nova/virt/xenapi/volume_utils.py:130
 #, python-format
 msgid "Ignoring exception %(exc)s when unplugging PBD %(pbd)s"
 msgstr "异常 %(exc)s 在拔开PBD %(pbd)s 时被忽略"
 
-#: nova/virt/xenapi/volume_utils.py:155
+#: nova/virt/xenapi/volume_utils.py:154
 #, python-format
 msgid "Unable to introduce VDI on SR %s"
 msgstr "无法在存储库 %s 上引入VDI"
 
-#: nova/virt/xenapi/volume_utils.py:163
+#: nova/virt/xenapi/volume_utils.py:176
+#, python-format
+msgid ""
+"VDI not found on SR %(sr)s (vdi_uuid %(vdi_uuid)s, target_lun %(target_lun)s)"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:162
 #, python-format
 msgid "Unable to get record of VDI %s on"
 msgstr "无法使得VDI %s 的记录运行"
 
-#: nova/virt/xenapi/volume_utils.py:185
+#: nova/virt/xenapi/volume_utils.py:184
 #, python-format
 msgid "Unable to introduce VDI for SR %s"
 msgstr "无法为存储库 %s 引入VDI"
 
-#: nova/virt/xenapi/volume_utils.py:195
+#: nova/virt/xenapi/volume_utils.py:194
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:204 nova/virt/xenapi/volume_utils.py:251
+#: nova/virt/xenapi/volume_utils.py:203 nova/virt/xenapi/volume_utils.py:250
 #, python-format
 msgid "Unable to obtain target information %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:245
+#: nova/virt/xenapi/volume_utils.py:244
 #, python-format
 msgid "(vol_id,host,port,iqn): (%(vol_id)s,%(host)s,%(port)s,%(iqn)s)"
 msgstr ""
 
+#: nova/virt/vmwareapi/volume_util.py:179 nova/virt/xenapi/volume_utils.py:276
+#, python-format
+msgid "Mountpoint cannot be translated: %s"
+msgstr "挂载点无法被翻译：%s"
+
 #: nova/virt/xenapi/volumeops.py:48
 #, python-format
 msgid ""
@@ -13200,7 +13116,7 @@
 msgid "Skipping detach because VBD for %s was not found"
 msgstr ""
 
-#: nova/virt/xenapi/client/session.py:69
+#: nova/virt/xenapi/driver.py:662
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr "无法登录到XenAPI(Dom0磁盘是空么？)"
 
@@ -13209,39 +13125,34 @@
 msgid "Plugin version mismatch (Expected %(exp)s, got %(got)s)"
 msgstr ""
 
-#: nova/virt/xenapi/client/session.py:121
+#: nova/virt/xenapi/driver.py:702
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/client/session.py:197
+#: nova/virt/xenapi/driver.py:787
 #, python-format
 msgid "%(plugin)s.%(fn)s attempt %(attempt)d/%(attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/client/session.py:211
+#: nova/virt/xenapi/driver.py:796
 #, python-format
 msgid "%(plugin)s.%(fn)s failed. Retrying call."
 msgstr ""
 
-#: nova/virt/xenapi/client/session.py:221
+#: nova/virt/xenapi/driver.py:809
 msgid "RetryableError, so retrying upload_vhd"
 msgstr ""
 
-#: nova/virt/xenapi/client/session.py:225
+#: nova/virt/xenapi/driver.py:813
 msgid "Error due to a signal, retrying upload_vhd"
 msgstr ""
 
-#: nova/virt/xenapi/client/session.py:243
-#: nova/virt/xenapi/client/session.py:257
+#: nova/virt/xenapi/driver.py:831 nova/virt/xenapi/driver.py:845
 #, python-format
 msgid "Got exception: %s"
 msgstr "得到异常：%s"
 
 #: nova/virt/xenapi/image/bittorrent.py:90
-msgid "No torrent URL fetcher extension found, using default."
-msgstr ""
-
-#: nova/virt/xenapi/image/bittorrent.py:107
 #, python-format
 msgid "Loading torrent URL fetcher from entry points %(ep)s"
 msgstr ""
@@ -13294,12 +13205,12 @@
 msgid "status must be 'available'"
 msgstr ""
 
-#: nova/volume/encryptors/__init__.py:44
+#: nova/volume/encryptors/__init__.py:45
 #, python-format
 msgid "Error instantiating %(provider)s: %(exception)s"
 msgstr ""
 
-#: nova/volume/encryptors/__init__.py:59
+#: nova/volume/encryptors/__init__.py:63
 #, python-format
 msgid ""
 "Failed to retrieve encryption metadata for volume %(volume_id)s: "
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/nss_db.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/nss_db.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/nss_db.po	2014-02-24 08:24:32.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/nss_db.po	2014-03-24 09:42:38.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:38+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 11:50+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: src/makedb.c:68
 msgid "Convert key to lower case"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/oneconf.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/oneconf.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/oneconf.po	2014-02-24 08:24:46.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/oneconf.po	2014-03-24 09:42:53.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: oneconf\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-08-28 00:08+0000\n"
+"POT-Creation-Date: 2014-03-18 14:34+0000\n"
 "PO-Revision-Date: 2013-10-09 15:41+0000\n"
 "Last-Translator: Z.X.Lyn <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-12 14:31+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2014-03-20 14:09+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: .././oneconf-service:70
 #, c-format
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/opcodes.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/opcodes.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/opcodes.po	2014-02-24 08:24:24.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/opcodes.po	2014-03-24 09:42:32.000000000 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: opcodes 2.15.96\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-06-21 15:51+0100\n"
-"PO-Revision-Date: 2014-02-19 02:53+0000\n"
+"PO-Revision-Date: 2014-03-05 07:53+0000\n"
 "Last-Translator: Meng Jie <Unknown>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 10:39+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 10:41+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. Invalid option.
 #. XXX - should break 'option' at following delimiter.
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/Parse-DebianChangelog.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/Parse-DebianChangelog.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/Parse-DebianChangelog.po	2014-02-24 08:24:38.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/Parse-DebianChangelog.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,195 +0,0 @@
-# Simplified Chinese translation for libparse-debianchangelog-perl
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the libparse-debianchangelog-perl package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: libparse-debianchangelog-perl\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2005-10-13 02:10+0200\n"
-"PO-Revision-Date: 2009-09-29 09:23+0000\n"
-"Last-Translator: Tao Wei <weitao1979@gmail.com>\n"
-"Language-Team: Simplified Chinese <zh_CN@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-12 13:03+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
-
-#: ../bin/parsechangelog:146
-#, perl-format
-msgid "changelog format %s not supported"
-msgstr "不支持更新日志格式 %s"
-
-#: ../bin/parsechangelog:151
-msgid "ignored option -L"
-msgstr "忽略的选项 -L"
-
-#: ../bin/parsechangelog:159
-#, perl-format
-msgid "output format %s not supported"
-msgstr "不支持输出格式 %s"
-
-#: ../bin/parsechangelog:168
-msgid "Copyright (C) 2005 by Frank Lichtenheld\n"
-msgstr "版权所有(C) 2005  Frank Lichtenheld\n"
-
-#: ../bin/parsechangelog:169
-msgid ""
-"This is free software; see the GNU General Public Licence version 2 or later "
-"for copying conditions. There is NO warranty."
-msgstr "这是自由软件；关于复制请查看 GNU General Public Licence 版本2 或更新版本。没有任何质量担保。"
-
-#: ../bin/parsechangelog:200
-msgid "too many arguments"
-msgstr "参数过多"
-
-#: ../bin/parsechangelog:204
-#, perl-format
-msgid "more than one file specified (%s and %s)"
-msgstr "指定了超过一个文件(%s 和 %s)"
-
-#: ../bin/parsechangelog:216 ../bin/parsechangelog:220
-#, perl-format
-msgid "fatal error occured while parsing %s"
-msgstr "解析 %s 时出现致使错误"
-
-#: ../lib/Parse/DebianChangelog.pm:219
-#, perl-format
-msgid ""
-"WARN: %s(l%s): %s\n"
-"LINE: %s\n"
-msgstr ""
-"警告：%s(l%s): %s\n"
-"行：%s\n"
-
-#: ../lib/Parse/DebianChangelog.pm:221
-#, perl-format
-msgid "WARN: %s(l%s): %s\n"
-msgstr "警告：%s(l%s): %s\n"
-
-#: ../lib/Parse/DebianChangelog.pm:232
-#, perl-format
-msgid "FATAL: %s"
-msgstr "致命：%s"
-
-#: ../lib/Parse/DebianChangelog.pm:279
-#, perl-format
-msgid "can't open file %s: %s"
-msgstr "无法打开文件 %s：%s"
-
-#: ../lib/Parse/DebianChangelog.pm:284
-#, perl-format
-msgid "can't lock file %s: %s"
-msgstr "无法锁定文件 %s: %s"
-
-#: ../lib/Parse/DebianChangelog.pm:291
-#, perl-format
-msgid "can't load IO::String: %s"
-msgstr "无法载入 IO::String: %s"
-
-#: ../lib/Parse/DebianChangelog.pm:298
-msgid "no changelog file specified"
-msgstr "没有指定更新日志文件"
-
-#: ../lib/Parse/DebianChangelog.pm:319
-#, perl-format
-msgid "found start of entry where expected %s"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:343
-#, perl-format
-msgid "bad key-value after `;': `%s'"
-msgstr "在 `;' 之后的键值无效: `%s'"
-
-#: ../lib/Parse/DebianChangelog.pm:347
-#, perl-format
-msgid "repeated key-value %s"
-msgstr "重复的键值 %s"
-
-#: ../lib/Parse/DebianChangelog.pm:351
-msgid "badly formatted urgency value"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:362
-#, perl-format
-msgid "unknown key-value key %s - copying to XS-%s"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:393
-msgid "badly formatted heading line"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:397
-#, perl-format
-msgid "found trailer where expected %s"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:401 ../lib/Parse/DebianChangelog.pm:416
-msgid "badly formatted trailer line"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:410
-#, perl-format
-msgid "couldn't parse date %s"
-msgstr "无法解析日期 %s"
-
-#: ../lib/Parse/DebianChangelog.pm:425 ../lib/Parse/DebianChangelog.pm:440
-#, perl-format
-msgid "found change data where expected %s"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:458
-#, perl-format
-msgid "found blank line where expected %s"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:462 ../lib/Parse/DebianChangelog.pm:477
-msgid "unrecognised line"
-msgstr "未识别的行"
-
-#: ../lib/Parse/DebianChangelog.pm:486
-#, perl-format
-msgid "found eof where expected %s"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:497
-#, perl-format
-msgid "can't close file %s: %s"
-msgstr "无法关闭文件 %s：%s"
-
-#: ../lib/Parse/DebianChangelog.pm:541
-msgid "you can't combine 'count' or 'offset' with any other range option"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:545
-msgid "you can only specify one of 'from' and 'since'"
-msgstr "您只能指定 'from' 和 'since' 之一。"
-
-#: ../lib/Parse/DebianChangelog.pm:549
-msgid "you can only specify one of 'to' and 'until'"
-msgstr "您只能指定 'to' 和 'until' 之一。"
-
-#: ../lib/Parse/DebianChangelog.pm:553
-msgid "'since' option specifies most recent version"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:557
-msgid "'until' option specifies oldest version"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/Util.pm:100
-#, perl-format
-msgid "field %s has newline then non whitespace >%s<"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/Util.pm:102
-#, perl-format
-msgid "field %s has blank lines >%s<"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/Util.pm:104
-#, perl-format
-msgid "field %s has trailing newline >%s<"
-msgstr ""
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/Parse-DebianChangelog-Pod.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/Parse-DebianChangelog-Pod.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/Parse-DebianChangelog-Pod.po	2014-02-24 08:24:38.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/Parse-DebianChangelog-Pod.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,1152 +0,0 @@
-# Simplified Chinese translation for libparse-debianchangelog-perl
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the libparse-debianchangelog-perl package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: libparse-debianchangelog-perl\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2005-10-13 02:09+0200\n"
-"PO-Revision-Date: 2009-10-19 14:25+0000\n"
-"Last-Translator: Wylmer Wang <Unknown>\n"
-"Language-Team: Simplified Chinese <zh_CN@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-12 13:03+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
-
-#: ../bin/parsechangelog:20 ../lib/Parse/DebianChangelog.pm:22
-#: ../lib/Parse/DebianChangelog/ChangesFilters.pm:21
-#: ../lib/Parse/DebianChangelog/Entry.pm:21
-#: ../lib/Parse/DebianChangelog/Util.pm:22 ../lib/Pod/UsageTrans.pm:30
-msgid "NAME"
-msgstr "名称"
-
-#: ../bin/parsechangelog:22
-msgid ""
-"parsechangelog - parse Debian changelogs and output them in other formats"
-msgstr ""
-
-#: ../bin/parsechangelog:24 ../lib/Parse/DebianChangelog.pm:26
-#: ../lib/Parse/DebianChangelog/ChangesFilters.pm:25
-#: ../lib/Parse/DebianChangelog/Entry.pm:25 ../lib/Pod/UsageTrans.pm:34
-msgid "SYNOPSIS"
-msgstr ""
-
-#: ../bin/parsechangelog:26
-msgid "parsechangelog [options] [changelogfile]"
-msgstr ""
-
-#: ../bin/parsechangelog:28
-#, no-wrap
-msgid ""
-" Options:\n"
-"    --help, -h                  print usage information\n"
-"    --version, -V               print version information\n"
-"    --file, -l <file>           changelog file to parse, defaults\n"
-"                                to 'debian/changelog'\n"
-"    -F<changelogformat>         ignored if changelogformat = 'debian'\n"
-"                                for compatibility with dpkg-dev\n"
-"    -L<libdir>                  ignored for compatibility with dpkg-dev\n"
-"    --format <outputformat>     see man page for list of available\n"
-"                                output formats, defaults to 'dpkg'\n"
-"                                for compatibility with dpkg-dev\n"
-"    --since, -s, -v <version>   include all changes later than version\n"
-"    --until, -u <version>       include all changes earlier than version\n"
-"    --from, -f <version>        include all changes equal or later\n"
-"                                than version\n"
-"    --to, -t <version>          include all changes up to or equal\n"
-"                                than version\n"
-"    --count, -c, -n <number>    include <number> entries from the top\n"
-"                                (or the tail if <number> is lower than 0)\n"
-"    --offset, -o <number>       change the starting point for --count,\n"
-"                                counted from the top (or the tail if\n"
-"                                <number> is lower than 0)\n"
-"    --all                       include all changes\n"
-"\n"
-msgstr ""
-
-#: ../bin/parsechangelog:52
-msgid ""
-"If neither C<changelogfile> nor C<-l E<lt>fileE<gt>> are specified, "
-"F<debian/changelog> will be used. If two different files are specified the "
-"program will abort."
-msgstr ""
-
-#: ../bin/parsechangelog:56
-msgid ""
-"If the filename is C<-> the program reads the changelog from standard input."
-msgstr ""
-
-#: ../bin/parsechangelog:59
-msgid ""
-"C<--all> overrides all other range selecting options. C<--count> overrides "
-"all other range selection options except for C<--all>.  The range selecting "
-"options can be mixed together, but only one of C<--since> and C<--from> and "
-"one of C<--until> and C<--to> can be specified at the same time."
-msgstr ""
-
-#: ../bin/parsechangelog:65
-msgid ""
-"The dpkg and rfc822 formats default to showing only the first entry when no "
-"other options are given with while the HTML and XML formats default to "
-"showing all entries."
-msgstr ""
-
-#: ../bin/parsechangelog:69
-msgid ""
-"For a more extensive documentation of the range selecting options and some "
-"(hopefully enlightening) examples see L<Parse::DebianChangelog/\"COMMON "
-"OUTPUT OPTIONS\">."
-msgstr ""
-
-#: ../bin/parsechangelog:73 ../lib/Parse/DebianChangelog.pm:42
-#: ../lib/Parse/DebianChangelog/ChangesFilters.pm:27
-#: ../lib/Parse/DebianChangelog/Entry.pm:27
-#: ../lib/Parse/DebianChangelog/Util.pm:26 ../lib/Pod/UsageTrans.pm:64
-msgid "DESCRIPTION"
-msgstr "描述"
-
-#: ../bin/parsechangelog:75
-msgid ""
-"parsechangelog parses Debian changelogs as described in the Debian policy "
-"(version 3.6.2.1 at the time of this writing) and converts them to other "
-"output formats. See section L<\"SEE ALSO\"> for locations where to find the "
-"full format definition."
-msgstr ""
-
-#: ../bin/parsechangelog:80
-msgid "The output formats supported are currently:"
-msgstr "目前支持的输出格式有："
-
-#: ../bin/parsechangelog:84 ../lib/Parse/DebianChangelog.pm:61
-#: ../lib/Parse/DebianChangelog.pm:627
-msgid "dpkg"
-msgstr "dpkg"
-
-#: ../bin/parsechangelog:86
-msgid ""
-"Format as known from L<dpkg-parsechangelog(1)>. All requested entries (see "
-"L<\"SYNOPSIS\"> on how to select specific entries) are returned in the usual "
-"Debian control format, merged in one stanza, ready to be used in a "
-"F<.changes> file."
-msgstr ""
-
-#: ../bin/parsechangelog:91 ../lib/Parse/DebianChangelog.pm:68
-#: ../lib/Parse/DebianChangelog.pm:740
-msgid "rfc822"
-msgstr "rfc822"
-
-#: ../bin/parsechangelog:93 ../lib/Parse/DebianChangelog.pm:70
-msgid ""
-"Similar to the C<dpkg> format, but the requested entries are returned as one "
-"stanza each, i.e. they are not merged. This is probably the format to use if "
-"you want a machine-usable representation of the changelog."
-msgstr ""
-
-#: ../bin/parsechangelog:97 ../lib/Parse/DebianChangelog.pm:74
-#: ../lib/Parse/DebianChangelog.pm:801
-msgid "xml"
-msgstr "xml"
-
-#: ../bin/parsechangelog:99 ../lib/Parse/DebianChangelog.pm:76
-msgid ""
-"Just a simple XML dump of the changelog data. Without any schema or DTD "
-"currently, just some made up XML. The actual format might still change. "
-"Comments and Improvements welcome."
-msgstr ""
-
-#: ../bin/parsechangelog:103 ../lib/Parse/DebianChangelog.pm:80
-#: ../lib/Parse/DebianChangelog.pm:880
-msgid "html"
-msgstr "html"
-
-#: ../bin/parsechangelog:105
-msgid ""
-"The changelog is converted to a somewhat nice looking HTML file with some "
-"nice features as a quick-link bar with direct links to every entry.  NOTE: "
-"This is not configurable yet and was specifically designed to be used on "
-"L<http://packages.debian.org/>. This is planned to be changed until version "
-"1.0. The used Parse::DebianChangelog module already supports configuration, "
-"however, this isn't exposed by this program yet."
-msgstr ""
-
-#: ../bin/parsechangelog:240 ../lib/Parse/DebianChangelog.pm:1251
-#: ../lib/Parse/DebianChangelog/ChangesFilters.pm:165
-#: ../lib/Parse/DebianChangelog/Entry.pm:149
-#: ../lib/Parse/DebianChangelog/Util.pm:158 ../lib/Pod/UsageTrans.pm:88
-msgid "SEE ALSO"
-msgstr "参见"
-
-#: ../bin/parsechangelog:242
-msgid "Parse::DebianChangelog, the underlying Perl module"
-msgstr ""
-
-#: ../bin/parsechangelog:244 ../lib/Parse/DebianChangelog.pm:1255
-msgid ""
-"Description of the Debian changelog format in the Debian policy: "
-"L<http://www.debian.org/doc/debian-policy/ch-source.html#s-dpkgchangelog>."
-msgstr ""
-
-#: ../bin/parsechangelog:247 ../lib/Parse/DebianChangelog.pm:1258
-#: ../lib/Parse/DebianChangelog/ChangesFilters.pm:169
-#: ../lib/Parse/DebianChangelog/Entry.pm:153
-#: ../lib/Parse/DebianChangelog/Util.pm:162 ../lib/Pod/UsageTrans.pm:92
-msgid "AUTHOR"
-msgstr "作者"
-
-#: ../bin/parsechangelog:249 ../lib/Parse/DebianChangelog.pm:1260
-#: ../lib/Parse/DebianChangelog/ChangesFilters.pm:171
-#: ../lib/Parse/DebianChangelog/Entry.pm:155
-#: ../lib/Parse/DebianChangelog/Util.pm:164 ../lib/Pod/UsageTrans.pm:94
-msgid "Frank Lichtenheld, E<lt>frank@lichtenheld.deE<gt>"
-msgstr "Frank Lichtenheld, E<lt>frank@lichtenheld.deE<gt>"
-
-#: ../bin/parsechangelog:251 ../lib/Parse/DebianChangelog.pm:1262
-#: ../lib/Parse/DebianChangelog/ChangesFilters.pm:173
-#: ../lib/Parse/DebianChangelog/Entry.pm:157
-#: ../lib/Parse/DebianChangelog/Util.pm:166
-msgid "COPYRIGHT AND LICENSE"
-msgstr "版权和许可"
-
-#: ../bin/parsechangelog:253 ../lib/Parse/DebianChangelog.pm:1264
-#: ../lib/Parse/DebianChangelog/ChangesFilters.pm:175
-#: ../lib/Parse/DebianChangelog/Entry.pm:159
-#: ../lib/Parse/DebianChangelog/Util.pm:168
-msgid "Copyright (C) 2005 by Frank Lichtenheld"
-msgstr "版权所有 (C) 2005 作者 Frank Lichtenheld"
-
-#: ../bin/parsechangelog:255 ../lib/Parse/DebianChangelog.pm:1266
-#: ../lib/Parse/DebianChangelog/ChangesFilters.pm:177
-#: ../lib/Parse/DebianChangelog/Entry.pm:161
-#: ../lib/Parse/DebianChangelog/Util.pm:170
-msgid ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version."
-msgstr ""
-"本程序是自由软件；您可以在自由软件基金会发布的 GNU 通用公共许可证的条款下重新分发和(或)修改它；您可以选择使用 GPL "
-"第二版，或(按照您的意愿)任何更新的版本。"
-
-#: ../bin/parsechangelog:260 ../lib/Parse/DebianChangelog.pm:1271
-#: ../lib/Parse/DebianChangelog/ChangesFilters.pm:182
-#: ../lib/Parse/DebianChangelog/Entry.pm:166
-#: ../lib/Parse/DebianChangelog/Util.pm:175
-msgid ""
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details."
-msgstr "发行本程序是希望它有所作用，但没有任何担保；没有任何暗示的担保或因某一特别目的而适用。更多细节请参见 GNU 通用公共许可证。"
-
-#: ../bin/parsechangelog:265 ../lib/Parse/DebianChangelog.pm:1276
-#: ../lib/Parse/DebianChangelog/ChangesFilters.pm:187
-#: ../lib/Parse/DebianChangelog/Entry.pm:171
-#: ../lib/Parse/DebianChangelog/Util.pm:180
-msgid ""
-"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin St, Fifth Floor, Boston, MA 02110-1301 USA"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:24
-msgid ""
-"Parse::DebianChangelog - parse Debian changelogs and output them in other "
-"formats"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:28
-#, no-wrap
-msgid ""
-"    use Parse::DebianChangelog;\n"
-"\n"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:30
-#, no-wrap
-msgid ""
-"    my $chglog = Parse::DebianChangelog->init( { infile => "
-"'debian/changelog',\n"
-"                                                 HTML => { outfile => "
-"'changelog.html' } );\n"
-"    $chglog->html;\n"
-"\n"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:34
-#, no-wrap
-msgid ""
-"    # the following is semantically equivalent\n"
-"    my $chglog = Parse::DebianChangelog->init();\n"
-"    $chglog->parse( { infile => 'debian/changelog' } );\n"
-"    $chglog->html( { outfile => 'changelog.html' } );\n"
-"\n"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:39
-#, no-wrap
-msgid ""
-"    my $changes = $chglog->dpkg_str( { since => '1.0-1' } );\n"
-"    print $changes;\n"
-"\n"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:44
-msgid ""
-"Parse::DebianChangelog parses Debian changelogs as described in the Debian "
-"policy (version 3.6.2.1 at the time of this writing). See section L<\"SEE "
-"ALSO\"> for locations where to find this definition."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:48
-msgid ""
-"The parser tries to ignore most cruft like # or /* */ style comments, CVS "
-"comments, vim variables, emacs local variables and stuff from older "
-"changelogs with other formats at the end of the file.  NOTE: most of these "
-"are ignored silently currently, there is no parser error issued for them. "
-"This should become configurable in the future."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:55
-msgid ""
-"Beside giving access to the details of the parsed file via the L<\"data\"> "
-"method, Parse::DebianChangelog also supports converting these changelogs to "
-"various other formats. These are currently:"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:63
-msgid ""
-"Format as known from L<dpkg-parsechangelog(1)>. All requested entries (see "
-"L<\"METHODS\"> for an explanation what this means) are returned in the usual "
-"Debian control format, merged in one stanza, ready to be used in a "
-"F<.changes> file."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:82
-msgid ""
-"The changelog is converted to a somewhat nice looking HTML file with some "
-"nice features as a quick-link bar with direct links to every entry.  NOTE: "
-"This is not very configurable yet and was specifically designed to be used "
-"on L<http://packages.debian.org/>. This is planned to be changed until "
-"version 1.0."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:90
-msgid "METHODS"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:110
-#: ../lib/Parse/DebianChangelog/Entry.pm:31
-msgid "init"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:112
-msgid ""
-"Creates a new object instance. Takes a reference to a hash as optional "
-"argument, which is interpreted as configuration options.  There are "
-"currently no supported general configuration options, but see the other "
-"methods for more specific configuration options which can also specified to "
-"C<init>."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:118
-msgid ""
-"If C<infile> or C<instring> are specified (see L<parse>), C<parse()> is "
-"called from C<init>. If a fatal error is encountered during parsing (e.g. "
-"the file can't be opened), C<init> will not return a valid object but "
-"C<undef>!"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:146
-msgid "reset_parse_errors"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:148
-msgid ""
-"Can be used to delete all information about errors ocurred during previous "
-"L<parse> runs. Note that C<parse()> also calls this method."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:177
-msgid "get_parse_errors"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:179
-msgid ""
-"Returns all error messages from the last L<parse> run.  If called in scalar "
-"context returns a human readable string representation. If called in list "
-"context returns an array of arrays. Each of these arrays contains"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:186
-msgid "1."
-msgstr "1."
-
-#: ../lib/Parse/DebianChangelog.pm:188
-msgid ""
-"the filename of the parsed file or C<String> if a string was parsed directly"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:191
-msgid "2."
-msgstr "2."
-
-#: ../lib/Parse/DebianChangelog.pm:193
-msgid "the line number where the error occurred"
-msgstr "出错位置的行号"
-
-#: ../lib/Parse/DebianChangelog.pm:195
-msgid "3."
-msgstr "3."
-
-#: ../lib/Parse/DebianChangelog.pm:197
-msgid "an error description"
-msgstr "一项错误描述"
-
-#: ../lib/Parse/DebianChangelog.pm:199
-msgid "4."
-msgstr "4."
-
-#: ../lib/Parse/DebianChangelog.pm:201
-msgid "the original line"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:205
-msgid ""
-"NOTE: This format isn't stable yet and may change in later versions of this "
-"module."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:237
-msgid "get_error"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:239
-msgid ""
-"Get the last non-parser error (e.g. the file to parse couldn't be opened)."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:251
-msgid "parse"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:253
-msgid ""
-"Parses either the file named in configuration item C<infile> or the string "
-"saved in configuration item C<instring>.  Accepts a hash ref as optional "
-"argument which can contain configuration items."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:258
-msgid ""
-"Returns C<undef> in case of error (e.g. \"file not found\", B<not> parse "
-"errors) and the object if successful. If C<undef> was returned, you can get "
-"the reason for the failure by calling the L<get_error> method."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:511
-msgid "data"
-msgstr "数据"
-
-#: ../lib/Parse/DebianChangelog.pm:513
-msgid ""
-"C<data> returns an array (if called in list context) or a reference to an "
-"array of Parse::DebianChangelog::Entry objects which each represent one "
-"entry of the changelog."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:517
-msgid ""
-"This is currently merely a placeholder to enable users to get to the raw "
-"data, expect changes to this API in the near future."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:520
-msgid ""
-"This method supports the common output options described in section "
-"L<\"COMMON OUTPUT OPTIONS\">."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:629
-msgid "(and B<dpkg_str>)"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:631
-msgid ""
-"C<dpkg> returns a hash (in list context) or a hash reference (in scalar "
-"context) where the keys are field names and the values are field values. The "
-"following fields are given:"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:637
-#: ../lib/Parse/DebianChangelog/Entry.pm:54
-msgid "Source"
-msgstr "源"
-
-#: ../lib/Parse/DebianChangelog.pm:639
-msgid "package name (in the first entry)"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:641
-#: ../lib/Parse/DebianChangelog/Entry.pm:58
-msgid "Version"
-msgstr "版本"
-
-#: ../lib/Parse/DebianChangelog.pm:643
-msgid "packages' version (from first entry)"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:645
-#: ../lib/Parse/DebianChangelog/Entry.pm:62
-msgid "Distribution"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:647
-msgid "target distribution (from first entry)"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:649
-#: ../lib/Parse/DebianChangelog/Entry.pm:66
-msgid "Urgency"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:651
-msgid "urgency (highest of all printed entries)"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:653
-msgid "Maintainer"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:655
-msgid "person that created the (first) entry"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:657
-#: ../lib/Parse/DebianChangelog/Entry.pm:94
-msgid "Date"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:659
-msgid "date of the (first) entry"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:661
-msgid "Closes"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:663
-msgid "bugs closed by the entry/entries, sorted by bug number"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:665
-msgid "Changes"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:667
-msgid "content of the the entry/entries"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:671
-msgid ""
-"C<dpkg_str> returns a stringified version of this hash which should look "
-"exactly like the output of L<dpkg-parsechangelog(1)>. The fields are ordered "
-"like in the list above."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:675 ../lib/Parse/DebianChangelog.pm:754
-msgid ""
-"Both methods only support the common output options described in section "
-"L<\"COMMON OUTPUT OPTIONS\">."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:678
-msgid "dpkg_str"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:680
-msgid "See L<dpkg>."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:742
-msgid "(and B<rfc822_str>)"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:744
-msgid ""
-"C<rfc822> returns an array of hashes (in list context) or a reference to "
-"this array (in scalar context) where each hash represents one entry in the "
-"changelog. For the format of such a hash see the description of the "
-"L<\"dpkg\"> method (while ignoring the remarks about which values are taken "
-"from the first entry)."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:750
-msgid ""
-"C<rfc822_str> returns a stringified version of this hash which looks similar "
-"to the output of dpkg-parsechangelog but instead of one stanza the output "
-"contains one stanza for each entry."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:757
-msgid "rfc822_str"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:759
-msgid "See L<rfc822>."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:803
-msgid "(and B<xml_str>)"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:805
-msgid ""
-"C<xml> converts the changelog to some free-form (i.e. there is neither a DTD "
-"or a schema for it) XML."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:808
-msgid "The method C<xml_str> is an alias for C<xml>."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:810 ../lib/Parse/DebianChangelog.pm:893
-msgid ""
-"Both methods support the common output options described in section "
-"L<\"COMMON OUTPUT OPTIONS\"> and additionally the following configuration "
-"options (as usual to give in a hash reference as parameter to the method "
-"call):"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:817 ../lib/Parse/DebianChangelog.pm:900
-msgid "outfile"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:819 ../lib/Parse/DebianChangelog.pm:902
-msgid "directly write the output to the file specified"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:823
-msgid "xml_str"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:825
-msgid "See L<xml>."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:882
-msgid "(and B<html_str>)"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:884
-msgid ""
-"C<html> converts the changelog to a HTML file with some nice features such "
-"as a quick-link bar with direct links to every entry. The HTML is generated "
-"with the help of HTML::Template. If you want to change the output you should "
-"use the default template provided with this module as a base and read the "
-"documentation of HTML::Template to understand how to edit it."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:891
-msgid "The method C<html_str> is an alias for C<html>."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:904
-msgid "template"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:906
-msgid ""
-"template file to use, defaults to tmpl/default.tmpl, so you most likely want "
-"to override that.  NOTE: The plan is to provide a configuration file for the "
-"module later to be able to use sane defaults here."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:911
-msgid "style"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:913
-msgid ""
-"path to the CSS stylesheet to use (a default might be specified in the "
-"template and will be honoured, see the default template for an example)"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:917
-msgid "print_style"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:919
-msgid ""
-"path to the CSS stylesheet to use for printing (see the notes for C<style> "
-"about default values)"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:924
-msgid "html_str"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:926
-msgid "See L<html>."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:1062
-msgid "init_filters"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:1064 ../lib/Parse/DebianChangelog.pm:1083
-#: ../lib/Parse/DebianChangelog.pm:1100
-msgid "not yet documented"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:1081
-msgid "apply_filters"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:1098
-msgid "add_filter, delete_filter, replace_filter"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:1170
-msgid "COMMON OUTPUT OPTIONS"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:1172
-msgid ""
-"The following options are supported by all output methods, all take a "
-"version number as value:"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:1177
-msgid "since"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:1179
-msgid ""
-"Causes changelog information from all versions strictly later than "
-"B<version> to be used."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:1182
-msgid "(works exactly like the C<-v> option of dpkg-parsechangelog)."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:1184
-msgid "until"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:1186
-msgid ""
-"Causes changelog information from all versions strictly earlier than "
-"B<version> to be used."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:1189
-msgid "from"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:1191
-msgid ""
-"Similar to C<since> but also includes the information for the specified "
-"B<version> itself."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:1194
-msgid "to"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:1196
-msgid ""
-"Similar to C<until> but also includes the information for the specified "
-"B<version> itself."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:1201
-msgid ""
-"The following options also supported by all output methods but don't take "
-"version numbers as values:"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:1206
-msgid "all"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:1208
-msgid ""
-"If set to a true value, all entries of the changelog are returned, this "
-"overrides all other options. While the XML and HTML formats default to all "
-"== true, this does of course not overwrite other options unless it is set "
-"explicitly with the call."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:1213
-msgid "count"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:1215
-msgid ""
-"Expects a signed integer as value. Returns C<value> entries from the top of "
-"the changelog if set to a positive integer, and C<abs(value)> entries from "
-"the tail if set to a negative integer."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:1219
-msgid "offset"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:1221
-msgid ""
-"Expects a signed integer as value. Changes the starting point for C<count>, "
-"either counted from the top (positive integer) or from the tail (negative "
-"integer). C<offset> has no effect if C<count> wasn't given as well."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:1228
-msgid ""
-"Some examples for the above options. Imagine an example changelog with "
-"entries for the versions 1.2, 1.3, 2.0, 2.1, 2.2, 3.0 and 3.1."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:1231
-#, no-wrap
-msgid ""
-"            Call                               Included entries\n"
-" C<E<lt>formatE<gt>({ since =E<gt> '2.0' })>  3.1, 3.0, 2.2\n"
-" C<E<lt>formatE<gt>({ until =E<gt> '2.0' })>  1.3, 1.2\n"
-" C<E<lt>formatE<gt>({ from =E<gt> '2.0' })>   3.1, 3.0, 2.2, 2.1, 2.0\n"
-" C<E<lt>formatE<gt>({ to =E<gt> '2.0' })>     2.0, 1.3, 1.2\n"
-" C<E<lt>formatE<gt>({ count =E<gt> 2 }>>      3.1, 3.0\n"
-" C<E<lt>formatE<gt>({ count =E<gt> -2 }>>     1.3, 1.2\n"
-" C<E<lt>formatE<gt>({ count =E<gt> 3,\n"
-"\t\t      offset=E<gt> 2 }>>      2.2, 2.1, 2.0\n"
-" C<E<lt>formatE<gt>({ count =E<gt> 2,\n"
-"\t\t      offset=E<gt> -3 }>>     2.0, 1.3\n"
-" C<E<lt>formatE<gt>({ count =E<gt> -2,\n"
-"\t\t      offset=E<gt> 3 }>>      3.0, 2.2\n"
-" C<E<lt>formatE<gt>({ count =E<gt> -2,\n"
-"\t\t      offset=E<gt> -3 }>>     2.2, 2.1\n"
-"\n"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:1247
-msgid ""
-"Any combination of one option of C<since> and C<from> and one of C<until> "
-"and C<to> returns the intersection of the two results with only one of the "
-"options specified."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog.pm:1253
-msgid "Parse::DebianChangelog::Entry, Parse::DebianChangelog::ChangesFilters"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/ChangesFilters.pm:23
-msgid ""
-"Parse::DebianChangelog::ChangesFilters - filters to be applied to Debian "
-"changelog entries"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/ChangesFilters.pm:29
-msgid ""
-"This is currently only used internally by Parse::DebianChangelog and is not "
-"yet documented. There may be still API changes until this module is "
-"finalized."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/ChangesFilters.pm:167
-#: ../lib/Parse/DebianChangelog/Entry.pm:151
-msgid "Parse::DebianChangelog"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/Entry.pm:23
-msgid ""
-"Parse::DebianChangelog::Entry - represents one entry in a Debian changelog"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/Entry.pm:29
-msgid "Methods"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/Entry.pm:33
-msgid "Creates a new object, no options."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/Entry.pm:35
-msgid "new"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/Entry.pm:37
-msgid "Alias for init."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/Entry.pm:39
-msgid "is_empty"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/Entry.pm:41
-msgid ""
-"Checks if the object is actually initialized with data. Due to limitations "
-"in Parse::DebianChangelog this currently simply checks if one of the fields "
-"Source, Version, Maintainer, Date, or Changes is initalized."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/Entry.pm:45
-msgid "Accessors"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/Entry.pm:47
-msgid ""
-"The following fields are available via accessor functions (all fields are "
-"string values unless otherwise noted):"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/Entry.pm:52
-#: ../lib/Parse/DebianChangelog/Entry.pm:56
-#: ../lib/Parse/DebianChangelog/Entry.pm:60
-#: ../lib/Parse/DebianChangelog/Entry.pm:64
-#: ../lib/Parse/DebianChangelog/Entry.pm:68
-#: ../lib/Parse/DebianChangelog/Entry.pm:72
-#: ../lib/Parse/DebianChangelog/Entry.pm:76
-#: ../lib/Parse/DebianChangelog/Entry.pm:80
-#: ../lib/Parse/DebianChangelog/Entry.pm:84
-#: ../lib/Parse/DebianChangelog/Entry.pm:88
-#: ../lib/Parse/DebianChangelog/Entry.pm:92
-#: ../lib/Parse/DebianChangelog/Entry.pm:96
-#: ../lib/Parse/DebianChangelog/Entry.pm:100
-msgid "*"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/Entry.pm:70
-msgid "ExtraFields (all fields except for urgency as hash)"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/Entry.pm:74
-msgid "Header (the whole header in verbatim form)"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/Entry.pm:78
-msgid "Changes (the actual content of the bug report, in verbatim form)"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/Entry.pm:82
-msgid "Trailer (the whole trailer in verbatim form)"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/Entry.pm:86
-msgid "Closes (Array of bug numbers)"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/Entry.pm:90
-msgid "Maintainer (name B<and> email address)"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/Entry.pm:98
-msgid "Timestamp (Date expressed in seconds since the epoche)"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/Entry.pm:102
-msgid ""
-"ERROR (last parse error related to this entry in the format described at "
-"Parse::DebianChangelog::get_parse_errors."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/Util.pm:24
-msgid ""
-"Parse::DebianChangelog::Util - utility functions for parsing Debian "
-"changelogs"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/Util.pm:28
-msgid ""
-"This is currently only used internally by Parse::DebianChangelog.  There may "
-"be still API changes until this module is finalized."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/Util.pm:31
-msgid "Functions"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/Util.pm:58
-msgid "find_closes"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/Util.pm:60
-msgid ""
-"Takes one string as argument and finds \"Closes: #123456, #654321\" "
-"statements as supported by the Debian Archive software in it. Returns all "
-"closed bug numbers in an array reference."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/Util.pm:80
-msgid "data2rfc822"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/Util.pm:82
-msgid ""
-"Takes two hash references as arguments. The first should contain the data to "
-"output in RFC822 format. The second can contain a sorting order for the "
-"fields. The higher the numerical value of the hash value, the earlier the "
-"field is printed if it exists."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/Util.pm:87
-msgid "Return the data in RFC822 format as string."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/Util.pm:115
-msgid "data2rfc822_mult"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/Util.pm:117
-msgid ""
-"The first argument should be an array ref to an array of hash references.  "
-"The second argument is a hash reference and has the same meaning as the "
-"second argument of L<data2rfc822>."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/Util.pm:121
-msgid ""
-"Calls L<data2rfc822> for each element of the array given as first argument "
-"and returns the concatenated results."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/Util.pm:139
-msgid "get_dpkg_changes"
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/Util.pm:141
-msgid "Takes a Parse::DebianChangelog::Entry object as first argument."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/Util.pm:143
-msgid ""
-"Returns a string that is suitable for using it in a C<Changes> field in the "
-"output format of C<dpkg-parsechangelog>."
-msgstr ""
-
-#: ../lib/Parse/DebianChangelog/Util.pm:160
-msgid "Parse::DebianChangelog, Parse::DebianChangelog::Entry"
-msgstr ""
-
-#: ../lib/Pod/UsageTrans.pm:32
-msgid ""
-"Pod::UsageTrans, pod2usage() - print a usage message from embedded pod "
-"documentation"
-msgstr ""
-
-#: ../lib/Pod/UsageTrans.pm:36
-#, no-wrap
-msgid ""
-"  use Pod::UsageTrans\n"
-"  use Locale::gettext;\n"
-"\n"
-msgstr ""
-
-#: ../lib/Pod/UsageTrans.pm:39
-#, no-wrap
-msgid ""
-"  setlocale(LC_MESSAGES,'');\n"
-"  textdomain('prog');\n"
-"\n"
-msgstr ""
-
-#: ../lib/Pod/UsageTrans.pm:42
-#, no-wrap
-msgid ""
-"  my $message_text  = \"This text precedes the usage message.\";\n"
-"  my $exit_status   = 2;          ## The exit status to use\n"
-"  my $verbose_level = 0;          ## The verbose level to use\n"
-"  my $filehandle    = \\*STDERR;   ## The filehandle to write to\n"
-"  my $textdomain    = 'prog-pod'; ## The gettext domain for the Pod "
-"documentation\n"
-"\n"
-msgstr ""
-
-#: ../lib/Pod/UsageTrans.pm:48
-#, no-wrap
-msgid ""
-"  pod2usage($message_text);\n"
-"\n"
-msgstr ""
-
-#: ../lib/Pod/UsageTrans.pm:50
-#, no-wrap
-msgid ""
-"  pod2usage($exit_status);\n"
-"\n"
-msgstr ""
-
-#: ../lib/Pod/UsageTrans.pm:52
-#, no-wrap
-msgid ""
-"  pod2usage( { -message => gettext( $message_text ) ,\n"
-"               -exitval => $exit_status  ,\n"
-"               -verbose => $verbose_level,\n"
-"               -output  => $filehandle,\n"
-"               -textdomain => $textdomain } );\n"
-"\n"
-msgstr ""
-
-#: ../lib/Pod/UsageTrans.pm:58
-#, no-wrap
-msgid ""
-"  pod2usage(   -msg     => $message_text ,\n"
-"               -exitval => $exit_status  ,\n"
-"               -verbose => $verbose_level,\n"
-"               -output  => $filehandle,\n"
-"               -textdomain => $textdomain );\n"
-"\n"
-msgstr ""
-
-#: ../lib/Pod/UsageTrans.pm:66
-msgid ""
-"Pod::UsageTrans works exactly like Pod::Usage but allows you to easily "
-"translate your messages. It was specifically written to be compatible with "
-"the F<.po> files produced by po4a(7). If you want to use any other method to "
-"produce your F<.po> files you should probably take a look at the source of "
-"code of this module to see which msgids you will need to use."
-msgstr ""
-
-#: ../lib/Pod/UsageTrans.pm:73
-msgid ""
-"For documentation on calling pod2usage from your program see Pod::Usage. "
-"Pod::UsageTrans additionally supports a C<-textdomain> option where you can "
-"specify the gettext domain to use. If C<-textdomain> isn't set, "
-"Pod::UsageTrans will behave exactly like Pod::Usage."
-msgstr ""
-
-#: ../lib/Pod/UsageTrans.pm:79
-msgid "BUGS"
-msgstr ""
-
-#: ../lib/Pod/UsageTrans.pm:81
-msgid ""
-"Pod::UsageTrans is currently in the state of a quickly hacked together "
-"solution that was tested with exactly one use case. Expect bugs in corner "
-"cases."
-msgstr ""
-
-#: ../lib/Pod/UsageTrans.pm:85
-msgid ""
-"It specifically doesn't support many of the po4a options like charset "
-"conversion between the POD input and the msgstr in the F<.pot> file."
-msgstr ""
-
-#: ../lib/Pod/UsageTrans.pm:90
-msgid "po4a(7), Pod::Usage, gettext info documentation"
-msgstr ""
-
-#: ../lib/Pod/UsageTrans.pm:96
-msgid ""
-"Based on Pod::Usage by Brad Appleton E<lt>bradapp@enteract.comE<gt> which is "
-"based on code for B<Pod::Text::pod2text()> written by Tom Christiansen "
-"E<lt>tchrist@mox.perl.comE<gt>"
-msgstr ""
-
-#: ../lib/Pod/UsageTrans.pm:100
-msgid ""
-"Also based on Locale::Po4a::Pod, Locale::Po4a::Po and "
-"Locale::Po4a::TransTractor by Martin Quinson and Denis Barbier."
-msgstr ""
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/parted.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/parted.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/parted.po	2014-02-24 08:24:32.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/parted.po	2014-03-24 09:42:39.000000000 +0000
@@ -7,14 +7,14 @@
 "Project-Id-Version: parted 1.6.6\n"
 "Report-Msgid-Bugs-To: bug-parted@gnu.org\n"
 "POT-Creation-Date: 2010-05-28 20:30+0200\n"
-"PO-Revision-Date: 2014-02-18 19:14+0000\n"
+"PO-Revision-Date: 2014-03-16 03:56+0000\n"
 "Last-Translator: Wang Li <Unknown>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:39+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 11:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: lib/argmatch.c:133
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/pbbuttonsd.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/pbbuttonsd.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/pbbuttonsd.po	2014-02-24 08:24:37.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/pbbuttonsd.po	2014-03-24 09:42:44.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:13+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:31+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: src/init.c:240
 #, c-format
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/pidgin-libnotify.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/pidgin-libnotify.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/pidgin-libnotify.po	2014-02-24 08:24:42.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/pidgin-libnotify.po	2014-03-24 09:42:49.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:58+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:29+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: ../src/pidgin-libnotify.c:85
 msgid "New messages"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/pidgin.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/pidgin.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/pidgin.po	2014-02-24 08:24:42.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/pidgin.po	2014-03-24 09:42:49.000000000 +0000
@@ -19,8 +19,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:55+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:26+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #. Translators may want to transliterate the name.
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/po4a.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/po4a.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/po4a.po	2014-02-24 08:24:37.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/po4a.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,1137 +0,0 @@
-# Simplified Chinese translation for po4a
-# Copyright (c) 2007 Rosetta Contributors and Canonical Ltd 2007
-# This file is distributed under the same license as the po4a package.
-# rainofchaos <rainofchaos@gmail.com>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: po4a\n"
-"Report-Msgid-Bugs-To: po4a@packages.debian.org\n"
-"POT-Creation-Date: 2010-11-24 01:24+0100\n"
-"PO-Revision-Date: 2010-04-14 14:25+0000\n"
-"Last-Translator: Wylmer Wang <Unknown>\n"
-"Language-Team: Simplified Chinese <debian-l10n-chinese@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-12 12:47+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
-"Language: zh_CN\n"
-
-#: ../../lib/Locale/Po4a/Chooser.pm:26
-msgid "Need to provide a module name"
-msgstr "需提供模块名"
-
-#: ../../lib/Locale/Po4a/Chooser.pm:47
-#, perl-format
-msgid "Unknown format type: %s."
-msgstr "未知格式类型：%s"
-
-#: ../../lib/Locale/Po4a/Chooser.pm:49
-#, perl-format
-msgid "Module loading error: %s"
-msgstr "模块加载错误：%s"
-
-#: ../../lib/Locale/Po4a/Chooser.pm:58
-msgid "List of valid formats:"
-msgstr "可用格式列表："
-
-#. ."\n  - ".gettext("bibtex: BibTex bibliography format.")
-#: ../../lib/Locale/Po4a/Chooser.pm:60
-msgid "dia: uncompressed Dia diagrams."
-msgstr "dia：未解压缩Dia表格"
-
-#: ../../lib/Locale/Po4a/Chooser.pm:61
-msgid "docbook: DocBook XML."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Chooser.pm:62
-msgid "guide: Gentoo Linux's XML documentation format."
-msgstr ""
-
-#. ."\n  - ".gettext("html: HTML documents (EXPERIMENTAL).")
-#: ../../lib/Locale/Po4a/Chooser.pm:64
-msgid "ini: INI format."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Chooser.pm:65
-msgid "kernelhelp: Help messages of each kernel compilation option."
-msgstr "内核帮助：每个内核编译选项的帮助信息"
-
-#: ../../lib/Locale/Po4a/Chooser.pm:66
-msgid "latex: LaTeX format."
-msgstr "latex: LaTeX 格式。"
-
-#: ../../lib/Locale/Po4a/Chooser.pm:67
-msgid "man: Good old manual page format."
-msgstr "man：优秀的旧手册格式"
-
-#: ../../lib/Locale/Po4a/Chooser.pm:68
-msgid "pod: Perl Online Documentation format."
-msgstr "pod：Perl 在线文档格式"
-
-#: ../../lib/Locale/Po4a/Chooser.pm:69
-msgid "sgml: either DebianDoc or DocBook DTD."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Chooser.pm:70
-msgid "texinfo: The info page format."
-msgstr "texinfo:  info 页格式."
-
-#: ../../lib/Locale/Po4a/Chooser.pm:71
-msgid "tex: generic TeX documents (see also latex)."
-msgstr "tex: 常规 TeX 文档 (参考 latex)。"
-
-#: ../../lib/Locale/Po4a/Chooser.pm:72
-msgid "text: simple text document."
-msgstr "text: 简单文本文档。"
-
-#: ../../lib/Locale/Po4a/Chooser.pm:73
-msgid "wml: WML documents."
-msgstr "wml：WML 文档。"
-
-#: ../../lib/Locale/Po4a/Chooser.pm:74
-msgid "xhtml: XHTML documents."
-msgstr "xhtml: XHTML 文档。"
-
-#: ../../lib/Locale/Po4a/Chooser.pm:75
-msgid "xml: generic XML documents (see also docbook)."
-msgstr "xml: 常规 XML 文档 (参考 docbook)。"
-
-#: ../../lib/Locale/Po4a/Common.pm:108
-#, perl-format
-msgid ""
-"%s version %s.\n"
-"written by Martin Quinson and Denis Barbier.\n"
-"\n"
-"Copyright (C) 2002, 2003, 2004 Software in the Public Interest, Inc.\n"
-"This is free software; see source code for copying\n"
-"conditions. There is NO warranty; not even for\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Debconf.pm:173
-#, perl-format
-msgid "Translated field in master document: %s"
-msgstr "主文档已翻译的部分：%s"
-
-#: ../../lib/Locale/Po4a/KernelHelp.pm:103
-msgid "Syntax error"
-msgstr "语法错误"
-
-#: ../../lib/Locale/Po4a/Man.pm:489 ../../lib/Locale/Po4a/Po.pm:161
-#: ../../lib/Locale/Po4a/Sgml.pm:250 ../../lib/Locale/Po4a/TeX.pm:1637
-#: ../../lib/Locale/Po4a/Text.pm:164 ../../lib/Locale/Po4a/Xml.pm:524
-#, perl-format
-msgid "Unknown option: %s"
-msgstr "未知选项: %s"
-
-#: ../../lib/Locale/Po4a/Man.pm:506
-msgid ""
-"Invalid 'groff_code' value. Must be one of 'fail', 'verbatim', 'translate'."
-msgstr "无效的 groff_code 值。必须是下面几种中的某个：fail, verbatim, translate。"
-
-#: ../../lib/Locale/Po4a/Man.pm:553
-msgid ""
-"The no_wrap parameters must be a set of comma-separated begin:end couples.\n"
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Man.pm:599
-msgid "Invalid 'unknown_macros' value. Must be one of:\n"
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Man.pm:653
-msgid ""
-"This file was generated with Pod::Man. Translate the POD file with the pod "
-"module of po4a."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Man.pm:656
-msgid ""
-"This file was generated with help2man. Translate the source file with the "
-"regular gettext."
-msgstr "本文件是用 help2man 生成的。请用 gettext 命令来翻译源文件。"
-
-#: ../../lib/Locale/Po4a/Man.pm:658
-msgid ""
-"This file was generated with docbook-to-man. Translate the source file with "
-"the sgml module of po4a."
-msgstr "本文件是用 docbook-to-man 生成的。请用 po4a 的 sgml 模块来翻译源文件。"
-
-#: ../../lib/Locale/Po4a/Man.pm:661
-msgid ""
-"This file was generated with docbook2man. Translate the source file with the "
-"sgml module of po4a."
-msgstr "本文件是用 docbook2man 生成的。请用 po4a 的 sgml 模块来翻译源文件。"
-
-#: ../../lib/Locale/Po4a/Man.pm:665 ../../lib/Locale/Po4a/Man.pm:673
-#, perl-format
-msgid ""
-"This file was generated with %s. You should translate the source file, but "
-"continuing anyway."
-msgstr "本文件是用 %s 生成的。但是你需要翻译源文件。"
-
-#: ../../lib/Locale/Po4a/Man.pm:669
-msgid ""
-"This file was generated with db2man.xsl. Translate the source file with the "
-"xml module of po4a."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Man.pm:679
-#, perl-format
-msgid ""
-"This file contains the line '%s'. You should translate the source file, but "
-"continuing anyway."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Man.pm:741
-#, perl-format
-msgid ""
-"Font modifiers followed by a command may disturb po4a.  You should either "
-"remove the font modifier '%s', or integrate a \\f font modifier in the "
-"following command ('%s'), but continuing anyway."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Man.pm:846
-msgid ""
-"The unshiftline is not supported for the man module. Please send a bug "
-"report with the groff page that generated this error."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Man.pm:889
-#, perl-format
-msgid ""
-"macro %s called without arguments. Even if placing the macro arguments on "
-"the next line is authorized by man(7), handling this would make the po4a "
-"parser too complicate. Please simply put the macro args on the same line."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Man.pm:917
-msgid "Escape sequence \\c encountered. This is not completely handled yet."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Man.pm:1083
-#, perl-format
-msgid "Unbalanced '<' and '>' in font modifier. Faulty message: %s"
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Man.pm:1121
-#, perl-format
-msgid "Unknown '<' or '>' sequence. Faulty message: %s"
-msgstr "未知的  '<' or '>' 序列。出错消息：%s"
-
-#: ../../lib/Locale/Po4a/Man.pm:1273
-#, perl-format
-msgid "Unparsable line: %s"
-msgstr "无法解析的行：%s"
-
-#: ../../lib/Locale/Po4a/Man.pm:1346
-#, perl-format
-msgid ""
-"Unknown macro '%s'. Remove it from the document, or refer to the "
-"Locale::Po4a::Man manpage to see how po4a can handle new macros."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Man.pm:1541
-#, perl-format
-msgid "Cannot parse command arguments: %s"
-msgstr "无法解析命令参数：%s"
-
-#: ../../lib/Locale/Po4a/Man.pm:1665
-#, perl-format
-msgid "Unsupported font in: '%s'."
-msgstr "在 '%s' 中不支持字体："
-
-#: ../../lib/Locale/Po4a/Man.pm:2028
-msgid ""
-"This page defines a new macro with '.de'. Since po4a is not a real groff "
-"parser, this is not supported."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Man.pm:2094
-msgid "The .ie macro must be followed by a .el macro."
-msgstr ".ie 宏后面必须跟带有一个 .el 宏。"
-
-#: ../../lib/Locale/Po4a/Man.pm:2120
-#, perl-format
-msgid ""
-"This page uses conditionals with '%s'. Since po4a is not a real groff "
-"parser, this is not supported."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Man.pm:2161
-#, perl-format
-msgid ""
-"This page includes another file with '%s'. Do not forget to translate this "
-"file ('%s')."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Man.pm:2277
-#, perl-format
-msgid ""
-"This page uses the '%s' request with the number of lines in argument. This "
-"is not supported yet."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Man.pm:2292
-#, perl-format
-msgid ""
-"This page uses the '%s' request. This request is only supported when no "
-"argument is provided."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/NewsDebian.pm:89
-msgid "Begin of a new entry before the end of previous one"
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Po.pm:169
-#, perl-format
-msgid ""
-"Invalid value for option 'porefs' ('%s' is not one of 'full', 'noline' or "
-"'none')"
-msgstr "porefs 的参数值无效 ('%s' 必须是下面某一种： 'full', 'noline' or 'none')"
-
-#: ../../lib/Locale/Po4a/Po.pm:222
-msgid "Please provide a non-null filename"
-msgstr "请提供一个非空的文件名"
-
-#: ../../lib/Locale/Po4a/Po.pm:234 ../../lib/Locale/Po4a/TeX.pm:930
-#: ../../lib/Locale/Po4a/TransTractor.pm:414
-#: ../../lib/Locale/Po4a/TransTractor.pm:547
-#: ../../lib/Locale/Po4a/Xhtml.pm:132 ../../lib/Locale/Po4a/Xml.pm:113
-#, perl-format
-msgid "Can't read from %s: %s"
-msgstr "无法从 %s: %s 读取"
-
-#: ../../lib/Locale/Po4a/Po.pm:305
-msgid "Messages with more than 2 plural forms are not supported."
-msgstr "不支持带 超过 2 种复数形式 的消息。"
-
-#: ../../lib/Locale/Po4a/Po.pm:314
-#, perl-format
-msgid "Strange line: -->%s<--"
-msgstr "特殊线条：-->%s<--"
-
-#: ../../lib/Locale/Po4a/Po.pm:373 ../../lib/Locale/Po4a/Po.pm:528
-#: ../../lib/Locale/Po4a/TransTractor.pm:449
-msgid "Can't write to a file without filename"
-msgstr "没有输入文件名，无法保存"
-
-#: ../../lib/Locale/Po4a/Po.pm:390 ../../lib/Locale/Po4a/TransTractor.pm:464
-#, perl-format
-msgid "Can't write to %s: %s"
-msgstr "无法写入 %s：%s"
-
-#: ../../lib/Locale/Po4a/Po.pm:463
-msgid "Can't write PO files with more than two plural forms."
-msgstr "无法写入 带多于 2 种复数形式的 PO 文件。"
-
-#: ../../lib/Locale/Po4a/Po.pm:508
-#, perl-format
-msgid "Can't unlink %s: %s."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Po.pm:515 ../../lib/Locale/Po4a/Po.pm:520
-#: ../../po4a:1356
-#, perl-format
-msgid "Can't move %s to %s: %s."
-msgstr "移动 %s 到 %s：%s。"
-
-#: ../../lib/Locale/Po4a/Po.pm:560
-msgid ""
-"\n"
-"The gettextization failed (once again). Don't give up, gettextizing is a "
-"subtle art, but this is only needed once to convert a project to the "
-"gorgeous luxus offered by po4a to translators.\n"
-"Please refer to the po4a(7) documentation, the section \"HOWTO convert a pre-"
-"existing translation to po4a?\" contains several hints to help you in your "
-"task"
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Po.pm:573
-#, perl-format
-msgid ""
-"Original has more strings than the translation (%d>%d). Please fix it by "
-"editing the translated version to add some dummy entry."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Po.pm:581
-#, perl-format
-msgid ""
-"Original has less strings than the translation (%d<%d). Please fix it by "
-"removing the extra entry from the translated file. You may need an addendum "
-"(cf po4a(7)) to reput the chunk in place after gettextization. A possible "
-"cause is that a text duplicated in the original is not translated the same "
-"way each time. Remove one of the translations, and you're fine."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Po.pm:649
-#, perl-format
-msgid ""
-"po4a gettextization: Structure disparity between original and translated "
-"files:\n"
-"msgid (at %s) is of type '%s' while\n"
-"msgstr (at %s) is of type '%s'.\n"
-"Original text: %s\n"
-"Translated text: %s\n"
-"(result so far dumped to gettextization.failed.po)"
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Po.pm:883
-#, perl-format
-msgid "Eval failure: %s"
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Po.pm:1007
-#, perl-format
-msgid ""
-"'%s' is the singular form of a message, po4a will use the msgstr[0] "
-"translation (%s)."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Po.pm:1012
-#, perl-format
-msgid ""
-"'%s' is the plural form of a message, po4a will use the msgstr[1] "
-"translation (%s)."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Po.pm:1225
-#, perl-format
-msgid "msgid defined twice: %s"
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Po.pm:1257
-#, perl-format
-msgid ""
-"Translations don't match for:\n"
-"%s\n"
-"-->First translation:\n"
-"%s\n"
-" Second translation:\n"
-"%s\n"
-" Old translation discarded."
-msgstr ""
-"Copy text   \t\n"
-"翻译不吻合：\n"
-"%s\n"
-"-->第一次翻译：\n"
-"%s\n"
-" 第二次翻译：\n"
-"%s\n"
-" 忽略旧的翻译。"
-
-#: ../../lib/Locale/Po4a/Sgml.pm:216
-msgid ""
-"The needed module SGMLS.pm was not found and needs to be installed. It can "
-"be found on the CPAN, in package libsgmls-perl on debian, etc."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Sgml.pm:284
-msgid "msgid skipped to help translators (contains only an entity)"
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Sgml.pm:291
-msgid "msgid skipped to help translators (contains only tags)"
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Sgml.pm:299
-msgid ""
-"msgid skipped to help translators (contains only opening or closing tags of "
-"marked sections)"
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Sgml.pm:383 ../../lib/Locale/Po4a/Sgml.pm:806
-#, perl-format
-msgid "Can't close tempfile: %s"
-msgstr "无法关闭模板文件：%s"
-
-#: ../../lib/Locale/Po4a/Sgml.pm:387
-msgid ""
-"Error while running nsgmls -p.  Please check if nsgmls and the DTD are "
-"installed."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Sgml.pm:396
-msgid ""
-"Trying to handle a XML document as a SGML one. Feel lucky if it works, help "
-"us implementing a proper XML backend if it does not."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Sgml.pm:409
-msgid ""
-"This file is not a master SGML document (no DOCTYPE). It may be a file to be "
-"included by another one, in which case it should not be passed to po4a "
-"directly. Text from included files is extracted/translated when handling the "
-"master file including them."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Sgml.pm:530
-msgid "DTD of this file is unknown, but proceeding as requested."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Sgml.pm:534
-msgid ""
-"DTD of this file is unknown. (supported: DebianDoc, DocBook). The prolog "
-"follows:"
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Sgml.pm:628 ../../lib/Locale/Po4a/Sgml.pm:710
-#, perl-format
-msgid "Can't open %s (content of entity %s%s;): %s"
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Sgml.pm:681
-#, perl-format
-msgid "unrecognized prolog inclusion entity: %%%s;"
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Sgml.pm:812
-#, perl-format
-msgid "Can't run nsgmls: %s"
-msgstr "无法运行 nsgmls: %s"
-
-#: ../../lib/Locale/Po4a/Sgml.pm:927
-#, perl-format
-msgid "Unknown tag %s"
-msgstr "未知的标签 %s"
-
-#: ../../lib/Locale/Po4a/Sgml.pm:961
-#, perl-format
-msgid "bad translation '%s' for '%s' in '%s'"
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Sgml.pm:1016 ../../lib/Locale/Po4a/Sgml.pm:1094
-#, perl-format
-msgid "Closing tag for a translation container missing before %s"
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Sgml.pm:1177
-#, perl-format
-msgid "Unknown SGML event type: %s"
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Sgml.pm:1186
-msgid ""
-"Warning: nsgmls produced some errors.  This is usually caused by po4a, which "
-"modifies the input and restores it afterwards, causing the input of nsgmls "
-"to be invalid.  This is usually safe, but you may wish to verify the "
-"generated document with nsgmls -wno-valid.  Continuing..."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/TeX.pm:503 ../../lib/Locale/Po4a/TeX.pm:583
-#, perl-format
-msgid "un-balanced %s in '%s'"
-msgstr ""
-
-#: ../../lib/Locale/Po4a/TeX.pm:517 ../../lib/Locale/Po4a/TeX.pm:601
-#, perl-format
-msgid "Error while checking the number of arguments of the '%s' command: %s"
-msgstr ""
-
-#: ../../lib/Locale/Po4a/TeX.pm:777 ../../lib/Locale/Po4a/TeX.pm:878
-#, perl-format
-msgid "Unknown command: '%s'"
-msgstr "未知的命令：%s"
-
-#: ../../lib/Locale/Po4a/TeX.pm:924 ../../lib/Locale/Po4a/TransTractor.pm:410
-msgid "Can't read from file without having a filename"
-msgstr "没有指定文件名，无法读取文件"
-
-#: ../../lib/Locale/Po4a/TeX.pm:965
-#, perl-format
-msgid "Can't find %s with kpsewhich"
-msgstr ""
-
-#: ../../lib/Locale/Po4a/TeX.pm:997 ../../lib/Locale/Po4a/TransTractor.pm:436
-#: ../../lib/Locale/Po4a/Xhtml.pm:141 ../../lib/Locale/Po4a/Xml.pm:122
-#, perl-format
-msgid "Can't close %s after reading: %s"
-msgstr "无法关闭 %s，之前已读取 %s"
-
-#: ../../lib/Locale/Po4a/TeX.pm:1023
-#, perl-format
-msgid "kpsewhich cannot find %s"
-msgstr ""
-
-#: ../../lib/Locale/Po4a/TeX.pm:1033 ../../po4a:775 ../../po4a:966
-#: ../../po4a-translate:262
-#, perl-format
-msgid "Can't open %s: %s"
-msgstr "无法打开 %s: %s"
-
-#: ../../lib/Locale/Po4a/TeX.pm:1071
-#, perl-format
-msgid "Cannot use an alias to the unknown command '%s'"
-msgstr ""
-
-#: ../../lib/Locale/Po4a/TeX.pm:1077
-#, perl-format
-msgid ""
-"You are using the old definitions format (%s).  Please update this "
-"definition line."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/TeX.pm:1281 ../../lib/Locale/Po4a/TeX.pm:1543
-#, perl-format
-msgid "unknown environment: '%s'"
-msgstr ""
-
-#: ../../lib/Locale/Po4a/TeX.pm:1304
-#, perl-format
-msgid "unmatched end of environment '%s'"
-msgstr ""
-
-#: ../../lib/Locale/Po4a/TeX.pm:1352 ../../lib/Locale/Po4a/TeX.pm:1467
-#, perl-format
-msgid "Wrong number of arguments for the '%s' command."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/TeX.pm:1365 ../../lib/Locale/Po4a/TeX.pm:1480
-#: ../../lib/Locale/Po4a/TeX.pm:1570
-msgid "An optional argument was provided, but a mandatory one is expected."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/TeX.pm:1369 ../../lib/Locale/Po4a/TeX.pm:1484
-#, perl-format
-msgid "Command '%s': %s"
-msgstr ""
-
-#: ../../lib/Locale/Po4a/TeX.pm:1425
-#, perl-format
-msgid "register_generic_command: unsupported format: '%s'."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/TeX.pm:1537
-msgid "The first argument of \\begin is mandatory."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:471
-#, perl-format
-msgid "Can't close %s after writing: %s"
-msgstr ""
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:552
-#, perl-format
-msgid "Can't read po4a header from %s."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:557
-#, perl-format
-msgid "First line of %s does not look like a po4a header."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:562
-#, perl-format
-msgid "Syntax error in po4a header of %s, near \"%s\""
-msgstr ""
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:576
-#, perl-format
-msgid "Invalid argument in the po4a header of %s: %s"
-msgstr ""
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:582
-#, perl-format
-msgid "The po4a header of %s does not define the mode."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:586
-#, perl-format
-msgid ""
-"Mode invalid in the po4a header of %s: should be 'before' or 'after' not %s."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:591
-#, perl-format
-msgid "The po4a header of %s does not define the position."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:595
-msgid "No ending boundary given in the po4a header, but mode=after."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:621
-msgid "Can't apply addendum when not given the filename"
-msgstr ""
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:624
-#, perl-format
-msgid "Addendum %s does not exist."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:645
-#, perl-format
-msgid "No candidate position for the addendum %s."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:650
-#, perl-format
-msgid "More than one candidate position found for the addendum %s."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:656
-#: ../../lib/Locale/Po4a/TransTractor.pm:679
-#, perl-format
-msgid "Addendum '%s' applied before this line: %s"
-msgstr ""
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:686
-#, perl-format
-msgid "Addendum '%s' applied after the line: %s."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:693
-#, perl-format
-msgid "Addendum '%s' applied at the end of the file."
-msgstr ""
-
-#. FYI, the document charset have to be determined *before* we see the first
-#. string to recode.
-#: ../../lib/Locale/Po4a/TransTractor.pm:856
-#: ../../lib/Locale/Po4a/TransTractor.pm:1043
-#, perl-format
-msgid ""
-"Couldn't determine the input document's charset. Please specify it on the "
-"command line. (non-ASCII char at %s)"
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Wml.pm:89
-#, perl-format
-msgid "Can't create a temporary XML file: %s"
-msgstr ""
-
-#. TODO: It will be hard to identify the location.
-#. => find a way to retrieve the reference.
-#: ../../lib/Locale/Po4a/Xml.pm:211
-#, perl-format
-msgid ""
-"'po4a-id=%d' in the translation does not exist in the original string (or "
-"'po4a-id=%d' used twice in the translation)."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Xml.pm:655
-#, perl-format
-msgid "Internal error: unknown type identifier '%s'."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Xml.pm:822
-#, perl-format
-msgid ""
-"Bad document type. '%s' expected. You can fix this warning with a -o doctype "
-"option, or ignore this check with -o doctype=\"\"."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Xml.pm:900 ../../lib/Locale/Po4a/Xml.pm:1489
-#, perl-format
-msgid ""
-"Unexpected closing tag </%s> found. The main document may be wrong.  "
-"Continuing..."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Xml.pm:902 ../../lib/Locale/Po4a/Xml.pm:1491
-#, perl-format
-msgid "Unexpected closing tag </%s> found. The main document may be wrong."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Xml.pm:1240
-#, perl-format
-msgid "Content of attribute %s excluded: %s"
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Xml.pm:1252
-msgid "Bad attribute syntax.  Continuing..."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Xml.pm:1254
-msgid "Bad attribute syntax"
-msgstr ""
-
-#. Inform that this tag isn't translated in debug mode
-#: ../../lib/Locale/Po4a/Xml.pm:1659
-#, perl-format
-msgid "Content of tag %s excluded: %s"
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Xml.pm:1756 ../../lib/Locale/Po4a/Xml.pm:1766
-#, perl-format
-msgid ""
-"The '%s' option is deprecated. Please use the translated/untranslated and/or "
-"break/inline/placeholder categories."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/Xml.pm:1872 ../../lib/Locale/Po4a/Xml.pm:1879
-#: ../../lib/Locale/Po4a/Xml.pm:1883 ../../lib/Locale/Po4a/Xml.pm:1887
-#: ../../lib/Locale/Po4a/Xml.pm:1893 ../../lib/Locale/Po4a/Xml.pm:1897
-#: ../../lib/Locale/Po4a/Xml.pm:1903
-#, perl-format
-msgid "Tag '%s' both in the %s and %s categories."
-msgstr ""
-
-#: ../../po4a:671 ../../po4a:675
-#, perl-format
-msgid "Invalid %s. Directory %s does not exist."
-msgstr ""
-
-#: ../../po4a:708 ../../po4a:948
-#, perl-format
-msgid "Unparsable argument '%s' (%s)."
-msgstr ""
-
-#: ../../po4a:742
-#, perl-format
-msgid "failed to execute '%s': %s."
-msgstr ""
-
-#: ../../po4a:746
-#, perl-format
-msgid "'%s' died with signal %d, with coredump."
-msgstr ""
-
-#: ../../po4a:750
-#, perl-format
-msgid "'%s' died with signal %d, without coredump."
-msgstr ""
-
-#: ../../po4a:755
-#, perl-format
-msgid "'%s' exited with value %d."
-msgstr ""
-
-#: ../../po4a:759
-#, perl-format
-msgid "Error: %s"
-msgstr ""
-
-#. Check file existence
-#: ../../po4a:765 ../../po4a-gettextize:226 ../../po4a-normalize:152
-#: ../../po4a-translate:206 ../../po4a-translate:207 ../../po4a-updatepo:228
-#: ../../scripts/msguntypot:167 ../../scripts/msguntypot:169
-#, perl-format
-msgid "File %s does not exist."
-msgstr ""
-
-#: ../../po4a:788 ../../po4a:977
-#, perl-format
-msgid "Unknown variable: %s"
-msgstr ""
-
-#: ../../po4a:798
-#, perl-format
-msgid "Syntax error: %s"
-msgstr ""
-
-#: ../../po4a:826 ../../po4a:838
-#, perl-format
-msgid "'%s' redeclared"
-msgstr ""
-
-#: ../../po4a:831
-#, perl-format
-msgid "Unparsable argument '%s'."
-msgstr ""
-
-#: ../../po4a:844
-msgid "The list of languages cannot be set twice."
-msgstr ""
-
-#: ../../po4a:847
-msgid "The POT file cannot be set twice."
-msgstr ""
-
-#: ../../po4a:854
-#, perl-format
-msgid "'%s' is not a directory"
-msgstr ""
-
-#: ../../po4a:858
-#, perl-format
-msgid "Cannot list the '%s' directory"
-msgstr ""
-
-#: ../../po4a:869
-#, perl-format
-msgid "too many POT files: %s %s"
-msgstr ""
-
-#: ../../po4a:879
-#, perl-format
-msgid "no PO files found in %s"
-msgstr ""
-
-#: ../../po4a:890
-#, perl-format
-msgid ""
-"The '%s' master file was specified earlier in the configuration file.  This "
-"may cause problems with options."
-msgstr ""
-
-#: ../../po4a:896
-#, perl-format
-msgid "The '%s' master file does not exist."
-msgstr ""
-
-#: ../../po4a:952
-msgid "The translated and master file are the same."
-msgstr ""
-
-#: ../../po4a:992
-#, perl-format
-msgid "Translation of %s in %s redefined"
-msgstr ""
-
-#: ../../po4a:1020
-#, perl-format
-msgid "Unparsable command '%s'."
-msgstr ""
-
-#. don't care about error here
-#: ../../po4a:1026
-msgid "po4a_paths not declared. Dunno where to find the POT and PO files"
-msgstr ""
-
-#: ../../po4a:1039
-#, perl-format
-msgid "Cannot parse option line (missing >%s<?): %s"
-msgstr ""
-
-#: ../../po4a:1068
-msgid "Split mode, creating a temporary POT"
-msgstr ""
-
-#: ../../po4a:1071
-msgid "Disabling --translate-only option, it is not supported in split mode"
-msgstr ""
-
-#: ../../po4a:1124 ../../po4a:1282 ../../po4a-updatepo:256
-#, perl-format
-msgid "Updating %s:"
-msgstr ""
-
-#: ../../po4a:1127 ../../po4a:1291 ../../po4a-updatepo:264
-#, perl-format
-msgid "Creating %s:"
-msgstr ""
-
-#: ../../po4a:1192 ../../po4a:1222 ../../po4a:1320 ../../po4a-updatepo:238
-#, perl-format
-msgid "Can't create a temporary POT file: %s"
-msgstr ""
-
-#: ../../po4a:1205
-#, perl-format
-msgid " (%d entries)"
-msgstr ""
-
-#: ../../po4a:1231 ../../po4a:1346
-#, perl-format
-msgid "Can't create directory '%s': %s"
-msgstr ""
-
-#: ../../po4a:1253 ../../scripts/msguntypot:206
-#, perl-format
-msgid "Can't create a temporary PO file: %s"
-msgstr ""
-
-#: ../../po4a:1410
-#, perl-format
-msgid "%s doesn't need to be updated."
-msgstr ""
-
-#: ../../po4a:1458
-#, perl-format
-msgid "Discard %s (%s of %s strings; only %s%% translated; need %s%%)."
-msgstr ""
-
-#: ../../po4a:1467
-#, perl-format
-msgid "Timestamp %s created."
-msgstr ""
-
-#: ../../po4a:1481
-#, perl-format
-msgid "Timestamp %s removed."
-msgstr ""
-
-#: ../../po4a:1494
-#, perl-format
-msgid "Addendum %s does NOT apply to %s (translation discarded)."
-msgstr ""
-
-#: ../../po4a:1509
-#, perl-format
-msgid "%s is %s%% translated (%s strings)."
-msgstr ""
-
-#: ../../po4a:1512 ../../po4a-translate:238
-#, perl-format
-msgid "%s is %s%% translated (%s of %s strings)."
-msgstr ""
-
-#: ../../po4a-translate:244
-#, perl-format
-msgid "Discard the translation of %s (only %s%% translated; need %s%%)."
-msgstr ""
-
-#: ../../po4a-translate:282
-#, perl-format
-msgid "Discard the translation of %s (addendum %s does not apply)."
-msgstr ""
-
-#: ../../po4a-updatepo:229
-msgid "po4a-updatepo can't take the input PO from stdin."
-msgstr ""
-
-#: ../../po4a-updatepo:241
-msgid "Parse input files... "
-msgstr ""
-
-#: ../../po4a-updatepo:251
-msgid "done."
-msgstr ""
-
-#: ../../po4a-updatepo:260 ../../scripts/msguntypot:215
-#, perl-format
-msgid "Error while running msgmerge: %s"
-msgstr ""
-
-#: ../../po4a-updatepo:267
-#, perl-format
-msgid "Error while copying the PO file: %s"
-msgstr ""
-
-#. Argument checking
-#: ../../scripts/msguntypot:166 ../../scripts/msguntypot:168
-#, perl-format
-msgid "Mandatory argument '%s' missing."
-msgstr ""
-
-#: ../../scripts/msguntypot:177
-#, perl-format
-msgid ""
-"The new and old POT files have different amount of strings (%d != %d). "
-"Something's seriously wrong here."
-msgstr ""
-
-#: ../../scripts/msguntypot:195
-#, perl-format
-msgid "Found %d modified entries."
-msgstr ""
-
-#: ../../scripts/msguntypot:211
-#, perl-format
-msgid "Handling %s"
-msgstr ""
-
-#: ../../scripts/msguntypot:236
-#, perl-format
-msgid "Modified %d entries in %d files."
-msgstr ""
-
-#. print out help message
-#: ../../share/po4a-build:91
-#, sh-format
-msgid ""
-"\n"
-"po4a-build - po4a frontend\n"
-"\n"
-"Syntax: po4a-build\n"
-"        po4a-build --pot-only\n"
-"\n"
-"Commands:\n"
-"-?|-h|--help|--version:     print this help message and exit\n"
-"--pot-only:                 only create the POT file\n"
-"\n"
-"Options:\n"
-"-f|--file FILE:             po4a-build.conf config file path\n"
-"\n"
-msgstr ""
-
-#: ../../share/po4a-build:124
-#, sh-format
-msgid "Unrecognised command: $com"
-msgstr ""
-
-#. without config, there's nothing to do.
-#: ../../share/po4a-build:132
-#, sh-format
-msgid "Cannot find config file! '$FILE'"
-msgstr ""
-
-#. test
-#: ../../share/po4a-build:197 ../../share/po4a-build:247
-#, sh-format
-msgid "Internal po4a from $OURS being used instead of /usr/bin/"
-msgstr ""
-
-#. TRANSLATORS: $X contains the name of the manual page
-#: ../../share/po4a-build:258
-#, sh-format
-msgid "Processing untranslated files for $X (1). . ."
-msgstr ""
-
-#. TRANSLATORS: $X3 contains the name of the manual page
-#: ../../share/po4a-build:265
-#, sh-format
-msgid "Processing untranslated files for $X3 (3). . ."
-msgstr ""
-
-#. TRANSLATORS: $file contains the basename of the POD file
-#: ../../share/po4a-build:277
-#, sh-format
-msgid "Processing untranslated files for $file (1) . . ."
-msgstr ""
-
-#. TRANSLATORS: $name contains the Perl module name
-#: ../../share/po4a-build:285
-#, sh-format
-msgid "Processing untranslated files for $name (3) . . ."
-msgstr ""
-
-#. TRANSLATORS: $file contains the basename of the POD file
-#: ../../share/po4a-build:293
-#, sh-format
-msgid "Processing untranslated files for $file (5) . . ."
-msgstr ""
-
-#. TRANSLATORS: $file contains the basename of the POD file
-#: ../../share/po4a-build:307
-#, sh-format
-msgid "Processing untranslated files for $file (7) . . ."
-msgstr ""
-
-#. TRANSLATORS: $l contains language code, $X contains the name of the manual page
-#: ../../share/po4a-build:328
-#, sh-format
-msgid "Processing $l translations for $X (1). . ."
-msgstr ""
-
-#. TRANSLATORS: $l contains language code, $X3 contains the name of the manual page
-#: ../../share/po4a-build:337
-#, sh-format
-msgid "Processing $l translations for $X3 (3). . ."
-msgstr ""
-
-#. TRANSLATORS: $l contains language code, $file contains the basename of the POD file
-#: ../../share/po4a-build:351
-#, sh-format
-msgid "Processing $l translations for $file (1). . ."
-msgstr ""
-
-#. TRANSLATORS: $l contains language code, $name contains the Perl module name
-#: ../../share/po4a-build:362
-#, sh-format
-msgid "Processing $l translations for $name (3). . ."
-msgstr ""
-
-#. TRANSLATORS: $l contains language code, $file contains the basename of the POD file
-#: ../../share/po4a-build:372
-#, sh-format
-msgid "Processing $l translations for $file (5). . ."
-msgstr ""
-
-#. TRANSLATORS: $l contains language code, $file contains the basename of the POD file
-#: ../../share/po4a-build:388
-#, sh-format
-msgid "Processing $l translations for $file (7). . ."
-msgstr ""
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/polkit-1.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/polkit-1.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/polkit-1.po	2014-02-24 08:24:44.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/polkit-1.po	2014-03-24 09:42:52.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:17+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: ../actions/org.freedesktop.policykit.policy.in.h:1
 msgid "Run programs as another user"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/popt.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/popt.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/popt.po	2014-02-24 08:24:32.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/popt.po	2014-03-24 09:42:39.000000000 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:39+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 11:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: popt.c:47
 msgid "unknown errno"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/pppconfig.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/pppconfig.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/pppconfig.po	2014-02-24 08:24:33.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/pppconfig.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,852 +0,0 @@
-# Pppconfig's Simplified Chinese translation
-#
-# This file is distributed under the same license as the pppconfig package.
-# Carlos Z.F. Liu <carlos_liu@yahoo.com>, 2004.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: pppconfig 2.3.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-07 21:04+0000\n"
-"PO-Revision-Date: 2010-11-05 01:19+0000\n"
-"Last-Translator: Carlos Z.F. Liu <Unknown>\n"
-"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-12 12:17+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
-
-#. Arbitrary upper limits on option and chat files.
-#. If they are bigger than this something is wrong.
-#: pppconfig:69
-msgid "\"GNU/Linux PPP Configuration Utility\""
-msgstr "“GNU/Linux PPP 配置工具”"
-
-#: pppconfig:128
-msgid "No UI\n"
-msgstr "无用户界面\n"
-
-#: pppconfig:131
-msgid "You must be root to run this program.\n"
-msgstr "您必须以 root 用户身份运行此程序。\n"
-
-#: pppconfig:132 pppconfig:133
-#, perl-format
-msgid "%s does not exist.\n"
-msgstr "%s 不存在。\n"
-
-#. Parent
-#: pppconfig:161
-msgid "Can't close WTR in parent: "
-msgstr "无法在父进程中关闭 WTR： "
-
-#: pppconfig:167
-msgid "Can't close RDR in parent: "
-msgstr "无法在父进程中关闭 RDR： "
-
-#. Child or failed fork()
-#: pppconfig:171
-msgid "cannot fork: "
-msgstr "无法 fork： "
-
-#: pppconfig:172
-msgid "Can't close RDR in child: "
-msgstr "无法在子进程中关闭 RDR： "
-
-#: pppconfig:173
-msgid "Can't redirect stderr: "
-msgstr "无法重定向标准错误输出： "
-
-#: pppconfig:174
-msgid "Exec failed: "
-msgstr "Exec 失败： "
-
-#: pppconfig:178
-msgid "Internal error: "
-msgstr "内部错误： "
-
-#: pppconfig:255
-msgid "Create a connection"
-msgstr "创建一个连接"
-
-#: pppconfig:259
-#, perl-format
-msgid "Change the connection named %s"
-msgstr "修改名为 %s 的连接"
-
-#: pppconfig:262
-#, perl-format
-msgid "Create a connection named %s"
-msgstr "创建名为 %s 的连接"
-
-#. This section sets up the main menu.
-#: pppconfig:270
-msgid ""
-"This is the PPP configuration utility.  It does not connect to your isp: "
-"just configures ppp so that you can do so with a utility such as pon.  It "
-"will ask for the username, password, and phone number that your ISP gave "
-"you.  If your ISP uses PAP or CHAP, that is all you need.  If you must use a "
-"chat script, you will need to know how your ISP prompts for your username "
-"and password.  If you do not know what your ISP uses, try PAP.  Use the up "
-"and down arrow keys to move around the menus.  Hit ENTER to select an item.  "
-"Use the TAB key to move from the menu to <OK> to <CANCEL> and back.  To move "
-"on to the next menu go to <OK> and hit ENTER. To go back to the previous "
-"menu go to <CANCEL> and hit enter."
-msgstr ""
-"此程序是 PPP 配置工具。它本身并不能连接您的 ISP，而是对 ppp 进行设置，使您可以通过 pon 命令进行连接。它将询问 ISP "
-"提供给您的用户名、密码和电话号码。如果您的 ISP 使用 PAP 或 CHAP，这些设置就足够了。如果必须使对话脚本(chat "
-"scropt)，就还需要知道您的 ISP 所使用的用户名和密码提示符。如果不清楚您的 ISP 使用的是哪种技术，请选择 "
-"PAP。请在程序中使用上下箭头按键来移动菜单选项光标、按回车键选定项目、使用跳格(TAB)键在<确定>、<取消>和菜单间移动。当您准备好进入下一菜单时，请"
-"移动到<确定>并敲回车。要返前一菜单，请移动到<取消>并敲回车。"
-
-#: pppconfig:271
-msgid "Main Menu"
-msgstr "主菜单"
-
-#: pppconfig:273
-msgid "Change a connection"
-msgstr "修改连接"
-
-#: pppconfig:274
-msgid "Delete a connection"
-msgstr "删除连接"
-
-#: pppconfig:275
-msgid "Finish and save files"
-msgstr "完成并保存文件"
-
-#: pppconfig:283
-#, perl-format
-msgid ""
-"Please select the authentication method for this connection.  PAP is the "
-"method most often used in Windows 95, so if your ISP supports the NT or "
-"Win95 dial up client, try PAP.  The method is now set to %s."
-msgstr ""
-"请为此连接选择认证方式。PAP 通常是 Windows 95 中最常用的方式，如果您的 ISP 支持 NT 或 Win95 拔号客户端，请试用 "
-"PAP。当前设定的方式是 %s。"
-
-#: pppconfig:284
-#, perl-format
-msgid " Authentication Method for %s"
-msgstr " %s 的验证模式"
-
-#: pppconfig:285
-msgid "Peer Authentication Protocol"
-msgstr "Peer 认证协议(Peer Authentication Protocol)"
-
-#: pppconfig:286
-msgid "Use \"chat\" for login:/password: authentication"
-msgstr "使用“chat”作为 login:/password: 认证方式"
-
-#: pppconfig:287
-msgid "Crypto Handshake Auth Protocol"
-msgstr "加密握手认证协议(Crypto Handshake Auth Protocol)"
-
-#: pppconfig:309
-msgid ""
-"Please select the property you wish to modify, select \"Cancel\" to go back "
-"to start over, or select \"Finished\" to write out the changed files."
-msgstr "请选择您想要修改的属性。请选择“取消”以返回并重新设置，或者选择“完成”将修改过的文件存盘。"
-
-#: pppconfig:310
-#, perl-format
-msgid "\"Properties of %s\""
-msgstr "“%s 的属性”"
-
-#: pppconfig:311
-#, perl-format
-msgid "%s Telephone number"
-msgstr "%s 电话号码"
-
-#: pppconfig:312
-#, perl-format
-msgid "%s Login prompt"
-msgstr "%s 登录提示符"
-
-#: pppconfig:314
-#, perl-format
-msgid "%s ISP user name"
-msgstr "%s 互连网服务提供商(ISP)名称"
-
-#: pppconfig:315
-#, perl-format
-msgid "%s Password prompt"
-msgstr "%s 密码提示符"
-
-#: pppconfig:317
-#, perl-format
-msgid "%s ISP password"
-msgstr "%s ISP 密码"
-
-#: pppconfig:318
-#, perl-format
-msgid "%s Port speed"
-msgstr "%s 端口速度"
-
-#: pppconfig:319
-#, perl-format
-msgid "%s Modem com port"
-msgstr "%s 调制解调器 com 端口"
-
-#: pppconfig:320
-#, perl-format
-msgid "%s Authentication method"
-msgstr "%s 认证方式"
-
-#: pppconfig:322
-msgid "Advanced Options"
-msgstr "高级选项"
-
-#: pppconfig:324
-msgid "Write files and return to main menu."
-msgstr "写入文件并返回主菜单。"
-
-#. @menuvar = (gettext("\
-#. This menu allows you to change some of the more obscure settings.  Select \
-#. the setting you wish to change, and select \"Previous\" when you are done. \
-#. Use the arrow keys to scroll the list."),
-#: pppconfig:360
-msgid ""
-"This menu allows you to change some of the more obscure settings.  Select "
-"the setting you wish to change, and select \"Previous\" when you are done. "
-"Use the arrow keys to scroll the list."
-msgstr ""
-"此菜单允许您改变一些更隐秘的设置。请选择您想要修改的设置项，当修改完成后，请选择“Previous”。您可以使用上下箭头按键在列表中滚动光标。"
-
-#: pppconfig:361
-#, perl-format
-msgid "\"Advanced Settings for %s\""
-msgstr "“%s 的高级设定”"
-
-#: pppconfig:362
-#, perl-format
-msgid "%s Modem init string"
-msgstr "%s 调制解调器初始化字符串(init string)"
-
-#: pppconfig:363
-#, perl-format
-msgid "%s Connect response"
-msgstr "%s 连接应答"
-
-#: pppconfig:364
-#, perl-format
-msgid "%s Pre-login chat"
-msgstr "%s 登录前对话(Pre-login chat)"
-
-#: pppconfig:365
-#, perl-format
-msgid "%s Default route state"
-msgstr "%s 默认路由状态(route state)"
-
-#: pppconfig:366
-#, perl-format
-msgid "%s Set ip addresses"
-msgstr "%s 设定 ip 地址"
-
-#: pppconfig:367
-#, perl-format
-msgid "%s Turn debugging on or off"
-msgstr "%s 是否打开调试开关"
-
-#: pppconfig:368
-#, perl-format
-msgid "%s Turn demand dialing on or off"
-msgstr "%s 是否打开按需拔号(demand dialing)开关"
-
-#: pppconfig:369
-#, perl-format
-msgid "%s Turn persist on or off"
-msgstr "%s 是否打开保持活跃(persist)开关"
-
-#: pppconfig:371
-#, perl-format
-msgid "%s Change DNS"
-msgstr "%s 修改 DNS"
-
-#: pppconfig:372
-msgid "                     Add a ppp user"
-msgstr "                     增加一个 ppp 用户"
-
-#: pppconfig:374
-#, perl-format
-msgid "%s Post-login chat "
-msgstr "%s 登录后对话(Post-login chat) "
-
-#: pppconfig:376
-#, perl-format
-msgid "%s Change remotename "
-msgstr "%s 修改远端名称 "
-
-#: pppconfig:378
-#, perl-format
-msgid "%s Idle timeout "
-msgstr "%s 空闲(Idle)超时 "
-
-#. End of SWITCH
-#: pppconfig:389
-msgid "Return to previous menu"
-msgstr "返回前一菜单"
-
-#: pppconfig:391
-msgid "Exit this utility"
-msgstr "退出此工具"
-
-#: pppconfig:539
-#, perl-format
-msgid "Internal error: no such thing as %s, "
-msgstr "内部错误：没有 %s 之类的东西， "
-
-#. End of while(1)
-#. End of do_action
-#. the connection string sent by the modem
-#: pppconfig:546
-msgid ""
-"Enter the text of connect acknowledgement, if any.  This string will be sent "
-"when the CONNECT string is received from the modem.  Unless you know for "
-"sure that your ISP requires such an acknowledgement you should leave this as "
-"a null string: that is, ''.\n"
-msgstr ""
-"如果有的话，请输入连接响应内容。此字符串将会在调制解调器收到 CONNECT 字串后发出。除非您确切的知道您的 ISP "
-"需要这样一个响应，否则请将此处设为空字符串：也就是''。\n"
-
-#: pppconfig:547
-msgid "Ack String"
-msgstr "Ack 字符串"
-
-#. the login prompt string sent by the ISP
-#: pppconfig:555
-msgid ""
-"Enter the text of the login prompt.  Chat will send your username in "
-"response.  The most common prompts are login: and username:.  Sometimes the "
-"first letter is capitalized and so we leave it off and match the rest of the "
-"word.  Sometimes the colon is omitted.  If you aren't sure, try ogin:."
-msgstr ""
-"请输入登录提示符内容。对话将会发送您的用户名作为回应。通常使用的提示符是 login: 和 "
-"username:。有时候提示符的首字母是大写，所以我们将忽略它并匹配余下的部分。有时候冒号也被省略。如果您不确定，请试用 ogin:。"
-
-#: pppconfig:556
-msgid "Login Prompt"
-msgstr "登录提示符"
-
-#. password prompt sent by the ISP
-#: pppconfig:564
-msgid ""
-"Enter the text of the password prompt.  Chat will send your password in "
-"response. The most common prompt is password:.  Sometimes the first letter "
-"is capitalized and so we leave it off and match the last part of the word."
-msgstr ""
-"请输入密码提示符内容。对话将会发送您的密码作为回应。通常使用的提示符是passowrd:。有时候提示符的首字母是大写，所以我们将忽略它并匹配余下的部分。"
-
-#: pppconfig:564
-msgid "Password Prompt"
-msgstr "密码提示符"
-
-#. optional pre-login chat
-#: pppconfig:572
-msgid ""
-"You probably do not need to put anything here.  Enter any additional input "
-"your isp requires before you log in.  If you need to make an entry, make the "
-"first entry the prompt you expect and the second the required response.  "
-"Example: your isp sends 'Server:' and expect you to respond with "
-"'trilobite'.  You would put 'erver trilobite' (without the quotes) here.  "
-"All entries must be separated by white space.  You can have more than one "
-"expect-send pair."
-msgstr ""
-"您多半不需要在此填写任何内容。请输入登录前您的 ISP "
-"所要求的额外内容。如果您需要在此增加输入项，请先填写您所期待的提示符，然后是所需的回应。例如，您的 ISP "
-"发送这“Server:”并希望您回应“trilobite”。您就应该在此写入“erver "
-"trilobite”(不带引号)。所有输入项必须以空格分隔。当然，您可以输入多个“期待-发送”对。"
-
-#: pppconfig:572
-msgid "Pre-Login"
-msgstr "登录前(Pre-Login)"
-
-#. post-login chat
-#: pppconfig:580
-msgid ""
-"You probably do not need to change this.  It is initially '' \\d\\c which "
-"tells chat to expect nothing, wait one second, and send nothing.  This gives "
-"your isp time to get ppp started.  If your isp requires any additional input "
-"after you have logged in you should put it here.  This may be a program name "
-"like ppp as a response to a menu prompt.  If you need to make an entry, make "
-"the first entry the prompt you expect and the second the required response.  "
-"Example: your isp sends 'Protocol' and expect you to respond with 'ppp'.  "
-"You would put 'otocol ppp' (without the quotes) here.  Fields must be "
-"separated by white space.  You can have more than one expect-send pair."
-msgstr ""
-"您多半不需要修改此项内容。此处的初始值为''\\\\d\\\\c即告诉对话不期待任何内容，等待一秒钟，不发送任何内容。这将会给您的 ISP "
-"留下时间以启动 ppp。如果您的 ISP 需要任何登录后的额外输入，请填写在此处。这可能是一个类似 ppp "
-"的程序名以回应一个菜单提示。如果您需要在此增加输入项，请先填写您所期望的提示符，然后是所需的回应内容。例如，您的 ISP "
-"发送这“Protocol”并希望您回应“ppp”。您就应该在此写入“rotocol "
-"ppp”(不带引号)。所有输入项必须以空格分隔。当然，您可以输入多个“期待-发送”对。"
-
-#: pppconfig:580
-msgid "Post-Login"
-msgstr "登录后(Post-Login)"
-
-#: pppconfig:603
-msgid "Enter the username given to you by your ISP."
-msgstr "请输入 ISP 给您的用户名。"
-
-#: pppconfig:604
-msgid "User Name"
-msgstr "用户名"
-
-#: pppconfig:621
-msgid ""
-"Answer 'yes' to have the port your modem is on identified automatically.  It "
-"will take several seconds to test each serial port.  Answer 'no' if you "
-"would rather enter the serial port yourself"
-msgstr ""
-"如果您希望程序自动探测调制解调器的端口，请回答“是”。这将花费一点时间来测试\r\n"
-"每个串行端口。如果您想自己指定串行口，请回答“否”。"
-
-#: pppconfig:622
-msgid "Choose Modem Config Method"
-msgstr "选择调制解调器配置方式"
-
-#: pppconfig:625
-msgid "Can't probe while pppd is running."
-msgstr "当 pppd 正在运行时无法进行探测。"
-
-#: pppconfig:632
-#, perl-format
-msgid "Probing %s"
-msgstr "正在探测 %s"
-
-#: pppconfig:639
-msgid ""
-"Below is a list of all the serial ports that appear to have hardware that "
-"can be used for ppp.  One that seems to have a modem on it has been "
-"preselected.  If no modem was found 'Manual' was preselected.  To accept the "
-"preselection just hit TAB and then ENTER.  Use the up and down arrow keys to "
-"move among the selections, and press the spacebar to select one.  When you "
-"are finished, use TAB to select <OK> and ENTER to move on to the next item. "
-msgstr ""
-"以下列表是所有在硬件上可以用于 ppp "
-"的串行端口，其中被已经被选中的那一个看起来是连接了调制解调器。如果没有探测到调制解调器，则默认选择为“手动”。如果您要接受预定义的默认选项，请按 TAB "
-"键然后回车。您可以使用上下箭头键来在选择列表中移动，使用空格来选中。当您完成选择后，使用 TAB 键将光标移到<确定>上并回车以进入下一个设置项目。 "
-
-#: pppconfig:639
-msgid "Select Modem Port"
-msgstr "请选择调制解调器端口"
-
-#: pppconfig:641
-msgid "Enter the port by hand. "
-msgstr "手动输入端口号。 "
-
-#: pppconfig:649
-msgid ""
-"Enter the port your modem is on. \n"
-"/dev/ttyS0 is COM1 in DOS. \n"
-"/dev/ttyS1 is COM2 in DOS. \n"
-"/dev/ttyS2 is COM3 in DOS. \n"
-"/dev/ttyS3 is COM4 in DOS. \n"
-"/dev/ttyS1 is the most common.  Note that this must be typed exactly as "
-"shown.  Capitalization is important: ttyS1 is not the same as ttys1."
-msgstr ""
-"请选择您的调制解调器所在端口。/dev/ttyS0 即 DOS 中的 COM1。/dev/ttyS1 即 DOS 中的 COM2。/dev/ttyS2 "
-"即 DOS 中的 COM3。/dev/ttyS3 即 DOS 中的 COM4。/dev/ttyS1 "
-"是最常见的选择。请注意，您所填写的内容必须与以上所显示的完全相同。字母大小写敏感：ttyS1 与 ttys1 是不同的。"
-
-#: pppconfig:655
-msgid "Manually Select Modem Port"
-msgstr "手动选择调制解调器端口"
-
-#: pppconfig:670
-msgid ""
-"Enabling default routing tells your system that the way to reach hosts to "
-"which it is not directly connected is via your ISP.  This is almost "
-"certainly what you want.  Use the up and down arrow keys to move among the "
-"selections, and press  the spacebar to select one.  When you are finished, "
-"use TAB to select <OK> and ENTER to move on to the next item."
-msgstr ""
-"开启默认路由将告诉系统通往非直接连接到本机的主机的路径是通过您的 ISP "
-"服务器。这通常是您想要的结果。您可以使用上下箭头键来在选择列表中移动，使用空格来选中。当您完成选择后，使用 TAB "
-"键将光标移到<确定>上并回车以进入下一个设置项目。"
-
-#: pppconfig:671
-msgid "Default Route"
-msgstr "默认路由"
-
-#: pppconfig:672
-msgid "Enable default route"
-msgstr "开启默认路由"
-
-#: pppconfig:673
-msgid "Disable default route"
-msgstr "禁用默认路由"
-
-#: pppconfig:680
-msgid ""
-"You almost certainly do not want to change this from the default value of "
-"noipdefault. This is not the place for your nameserver ip numbers.  It is "
-"the place for your ip number if and only if your ISP has assigned you a "
-"static one.  If you have been given only a local static ip, enter it with a "
-"colon at the end, like this: 192.168.1.2:  If you have been given both a "
-"local and a remote ip, enter the local ip, a colon, and the remote ip, like "
-"this: 192.168.1.2:10.203.1.2"
-msgstr ""
-
-#: pppconfig:681
-msgid "IP Numbers"
-msgstr "IP 地址"
-
-#. get the port speed
-#: pppconfig:688
-msgid ""
-"Enter your modem port speed (e.g. 9600, 19200, 38400, 57600, 115200).  I "
-"suggest that you leave it at 115200."
-msgstr ""
-"请输入您的调制解调器端口速率(比如 9600, 19200, 38400, 57600, 115200)。我建议您保留此值为115200。"
-
-#: pppconfig:689
-msgid "Speed"
-msgstr "速度"
-
-#: pppconfig:697
-msgid ""
-"Enter modem initialization string.  The default value is ATZ, which tells "
-"the modem to use it's default settings.  As most modems are shipped from the "
-"factory with default settings that are appropriate for ppp, I suggest you "
-"not change this."
-msgstr ""
-"请输入调制解调器的初始化字符串。默认值为 ATZ，它将通知调制解调器使用其默认设置。绝大部分调制解调器的出厂默认设置都能正常的配合 ppp，建议保留此项。"
-
-#: pppconfig:698
-msgid "Modem Initialization"
-msgstr "调制解调器初始化"
-
-#: pppconfig:711
-msgid ""
-"Select method of dialing.  Since almost everyone has touch-tone, you should "
-"leave the dialing method set to tone unless you are sure you need pulse.  "
-"Use the up and down arrow keys to move among the selections, and press the "
-"spacebar to select one.  When you are finished, use TAB to select <OK> and "
-"ENTER to move on to the next item."
-msgstr ""
-"请选择拔号方式。由于现在几乎所有人都是使用音频电话，您应该将拔号方式设定为音频，除非您确定需要脉冲方式。您可以使用上下箭头键来在选择列表中移动，使用空格来"
-"选中。当您完成选择后，使用 TAB 键将光标移到<确定>上并回车以进入下一个设置项目。"
-
-#: pppconfig:712
-msgid "Pulse or Tone"
-msgstr "脉冲或音频"
-
-#. Now get the number.
-#: pppconfig:719
-msgid ""
-"Enter the number to dial.  Don't include any dashes.  See your modem manual "
-"if you need to do anything unusual like dialing through a PBX."
-msgstr "请输入要拔的电话号码。不要包括短横杠(-)。如果您需要进行类似通过 PBX 拔号之类的不寻常的操作，请查阅您的调制解调器手册。"
-
-#: pppconfig:720
-msgid "Phone Number"
-msgstr "电话号码"
-
-#: pppconfig:732
-msgid "Enter the password your ISP gave you."
-msgstr "请输入 ISP 给您的密码。"
-
-#: pppconfig:733
-msgid "Password"
-msgstr "密码"
-
-#: pppconfig:797
-msgid ""
-"Enter the name you wish to use to refer to this isp.  You will probably want "
-"to give the default name of 'provider' to your primary isp.  That way, you "
-"can dial it by just giving the command 'pon'.  Give each additional isp a "
-"unique name.  For example, you might call your employer 'theoffice' and your "
-"university 'theschool'.  Then you can connect to your isp with 'pon', your "
-"office with 'pon theoffice', and your university with 'pon theschool'.  "
-"Note: the name must contain no spaces."
-msgstr ""
-"请输入您想为此 ISP 设定的名称。您可以将主 ISP 的名称保留为“provider”，这样，您就可以直接运行“pon”命令来拔号。而给其它 ISP "
-"设定各自独立的名称。例如，您给公司网络起名为“theoffice”，给学校的网络起名为“theschool”。然后，您就可以用“pon”命令来连接您的 "
-"ISP，用“pon theoffice”连接到公司，用“pon theschool”连接到学校。注意：名称不能包含空格。"
-
-#: pppconfig:798
-msgid "Provider Name"
-msgstr "提供商名称"
-
-#: pppconfig:802
-msgid "This connection exists.  Do you want to overwrite it?"
-msgstr "此连接已存在。您要覆盖它吗？"
-
-#: pppconfig:803
-msgid "Connection Exists"
-msgstr "连接已存在"
-
-#: pppconfig:816
-#, perl-format
-msgid ""
-"Finished configuring connection and writing changed files.  The chat strings "
-"for connecting to the ISP are in /etc/chatscripts/%s, while the options for "
-"pppd are in /etc/ppp/peers/%s.  You may edit these files by hand if you "
-"wish.  You will now have an opportunity to exit the program, configure "
-"another connection, or revise this or another one."
-msgstr ""
-"完成连接配置并将修改内容存盘。连接到 ISP 的对话字符串将被保存到 /etc/chatscripts/%s 中，pppd 的选项将存在 "
-"/etc/ppp/peers/%s 中。如果您希望，也可以手工修改这些文件。现在您可以选择是“退出程序”、“配置另一连接”或是“修改本连接或其它连接”。"
-
-#: pppconfig:817
-msgid "Finished"
-msgstr "完成"
-
-#. this sets up new connections by calling other functions to:
-#. - initialize a clean state by zeroing state variables
-#. - query the user for information about a connection
-#: pppconfig:853
-msgid "Create Connection"
-msgstr "创建连接"
-
-#: pppconfig:886
-msgid "No connections to change."
-msgstr "无可修改之连接"
-
-#: pppconfig:886 pppconfig:890
-msgid "Select a Connection"
-msgstr "选择连接"
-
-#: pppconfig:890
-msgid "Select connection to change."
-msgstr "请选择要修改的连接。"
-
-#: pppconfig:913
-msgid "No connections to delete."
-msgstr "无可删除之连接"
-
-#: pppconfig:913 pppconfig:917
-msgid "Delete a Connection"
-msgstr "删除连接"
-
-#: pppconfig:917
-msgid "Select connection to delete."
-msgstr "请选择要删除的连接。"
-
-#: pppconfig:917 pppconfig:919
-msgid "Return to Previous Menu"
-msgstr "返回前一菜单"
-
-#: pppconfig:926
-msgid "Do you wish to quit without saving your changes?"
-msgstr "您想不保存修改就退出吗？"
-
-#: pppconfig:926
-msgid "Quit"
-msgstr "退出"
-
-#: pppconfig:938
-msgid "Debugging is presently enabled."
-msgstr "目前已经启用调试。"
-
-#: pppconfig:938
-msgid "Debugging is presently disabled."
-msgstr "目前已经禁用调试。"
-
-#: pppconfig:939
-#, perl-format
-msgid ""
-"Selecting YES will enable debugging.  Selecting NO will disable it. %s"
-msgstr "选择 是 将会启用调试。选择 否 将会禁用调试。%s"
-
-#: pppconfig:939
-msgid "Debug Command"
-msgstr "调试命令"
-
-#: pppconfig:954
-#, perl-format
-msgid ""
-"Selecting YES will enable demand dialing for this provider.  Selecting NO "
-"will disable it.  Note that you will still need to start pppd with pon: "
-"pppconfig will not do that for you.  When you do so, pppd will go into the "
-"background and wait for you to attempt to access something on the Net, and "
-"then dial up the ISP.  If you do enable demand dialing you will also want to "
-"set an idle-timeout so that the link will go down when it is idle.  Demand "
-"dialing is presently %s."
-msgstr ""
-
-#: pppconfig:954
-msgid "Demand Command"
-msgstr "按需拔号命令(Demand Command)"
-
-#: pppconfig:968
-#, perl-format
-msgid ""
-"Selecting YES will enable persist mode.  Selecting NO will disable it.  This "
-"will cause pppd to keep trying until it connects and to try to reconnect if "
-"the connection goes down.  Persist is incompatible with demand dialing: "
-"enabling demand will disable persist.  Persist is presently %s."
-msgstr ""
-"选择“是”将开启保持活跃模式。选择“否”关闭之。此模式将使 pppd "
-"持续重试直到成功建立连接，并在连接被挂断后自动重拔。保持活跃模式与按需拔号不兼容：开启按需拔号将关闭保持活跃模式。保持活跃模式当前的状态是%s。"
-
-#: pppconfig:968
-msgid "Persist Command"
-msgstr "保持活跃命令(Persist Command)"
-
-#: pppconfig:992
-msgid ""
-"Choose a method.  'Static' means that the same nameservers will be used "
-"every time this provider is used.  You will be asked for the nameserver "
-"numbers in the next screen.  'Dynamic' means that pppd will automatically "
-"get the nameserver numbers each time you connect to this provider.  'None' "
-"means that DNS will be handled by other means, such as BIND (named) or "
-"manual editing of /etc/resolv.conf.  Select 'None' if you do not want "
-"/etc/resolv.conf to be changed when you connect to this provider.  Use the "
-"up and down arrow keys to move among the selections, and press the spacebar "
-"to select one.  When you are finished, use TAB to select <OK> and ENTER to "
-"move on to the next item."
-msgstr ""
-"请选择一个模式。“静态”即每次连接到此互连网提供商时都使用同一域名服务器。您将会在下一屏被问到域名服务器的地址。“动态”指的是每次连接到该提供商时，ppp"
-"d 都会自动获取域名服务器地址。“无”则意味着用其它方式控制 DNS，例如 BIND (named)或手工编辑 /etc/resolv.conf "
-"文件。如果您不希望在连接到提供商时 /etc/resov.conf "
-"被自行改动，就请选择“无”。您可以使用上下箭头键来在选择列表中移动，使用空格来选中。当您完成选择后，使用 TAB "
-"键将光标移到<确定>上并回车以进入下一个设置项目。"
-
-#: pppconfig:993
-msgid "Configure Nameservers (DNS)"
-msgstr "配置域名服务器(DNS)"
-
-#: pppconfig:994
-msgid "Use static DNS"
-msgstr "使用静态 DNS"
-
-#: pppconfig:995
-msgid "Use dynamic DNS"
-msgstr "使用动态 DNS"
-
-#: pppconfig:996
-msgid "DNS will be handled by other means"
-msgstr "DNS 将会由其它方式控制"
-
-#: pppconfig:1001
-msgid ""
-"\n"
-"Enter the IP number for your primary nameserver."
-msgstr ""
-"\n"
-"请输入您的主域名服务器(主要DNS)的 IP 地址。"
-
-#: pppconfig:1002 pppconfig:1012
-msgid "IP number"
-msgstr "IP 地址"
-
-#: pppconfig:1012
-msgid "Enter the IP number for your secondary nameserver (if any)."
-msgstr "请输入您的次域名服务器(次要DNS)的 IP 地址(如果有的话)。"
-
-#: pppconfig:1043
-msgid ""
-"Enter the username of a user who you want to be able to start and stop ppp.  "
-"She will be able to start any connection.  To remove a user run the program "
-"vigr and remove the user from the dip group. "
-msgstr "请输入能开启或关闭 ppp 的用户名。她将能够启动任何连接。如果要删除用户，请运行 vigr 程序并将该用户从 dip 组中删除。 "
-
-#: pppconfig:1044
-msgid "Add User "
-msgstr "增加用户 "
-
-#. Make sure the user exists.
-#: pppconfig:1047
-#, perl-format
-msgid ""
-"\n"
-"No such user as %s. "
-msgstr ""
-"\n"
-"没有 %s 用户。 "
-
-#: pppconfig:1060
-msgid ""
-"You probably don't want to change this.  Pppd uses the remotename as well as "
-"the username to find the right password in the secrets file.  The default "
-"remotename is the provider name.  This allows you to use the same username "
-"with different providers.  To disable the remotename option give a blank "
-"remotename.  The remotename option will be omitted from the provider file "
-"and a line with a * instead of a remotename will be put in the secrets file."
-msgstr ""
-"您可能不会想要改变此项设定。Pppd 使用此远端名称和用户名在 secrets "
-"文件中查找正确的密码。默认的远端名称就是提供商名称。这将允许您在不同的提供商下使用同一用户名。要禁止远端名称选项，请将此置空。provider "
-"文件将忽略远端名称选项，而在secrets 文件将使用 * 而非远端名称。"
-
-#: pppconfig:1060
-msgid "Remotename"
-msgstr "远端名称"
-
-#: pppconfig:1068
-msgid ""
-"If you want this PPP link to shut down automatically when it has been idle "
-"for a certain number of seconds, put that number here.  Leave this blank if "
-"you want no idle shutdown at all."
-msgstr "如果您希望当 PPP 连接处于空闲状态一定时间后自动挂断，请在此处输入相应的秒数。如果您不想使用空闲挂断功能，请将此处置空。"
-
-#: pppconfig:1068
-msgid "Idle Timeout"
-msgstr "空闲(Idle)超时"
-
-#. $data =~ s/\n{2,}/\n/gso; # Remove blank lines
-#: pppconfig:1078 pppconfig:1689
-#, perl-format
-msgid "Couldn't open %s.\n"
-msgstr "无法打开 %s。\n"
-
-#: pppconfig:1394 pppconfig:1411 pppconfig:1588
-#, perl-format
-msgid "Can't open %s.\n"
-msgstr "无法打开 %s。\n"
-
-#. Get an exclusive lock.  Return if we can't get it.
-#. Get an exclusive lock.  Exit if we can't get it.
-#: pppconfig:1396 pppconfig:1413 pppconfig:1591
-#, perl-format
-msgid "Can't lock %s.\n"
-msgstr "无法锁定 %s。\n"
-
-#: pppconfig:1690
-#, perl-format
-msgid "Couldn't print to %s.\n"
-msgstr "无法打印至 %s。\n"
-
-#: pppconfig:1692 pppconfig:1693
-#, perl-format
-msgid "Couldn't rename %s.\n"
-msgstr "无法将 %s 改名。\n"
-
-#: pppconfig:1698
-msgid ""
-"Usage: pppconfig [--version] | [--help] | [[--dialog] | [--whiptail] | [--"
-"gdialog] [--noname] | [providername]]\n"
-"'--version' prints the version.\n"
-"'--help' prints a help message.\n"
-"'--dialog' uses dialog instead of gdialog.\n"
-"'--whiptail' uses whiptail.\n"
-"'--gdialog' uses gdialog.\n"
-"'--noname' forces the provider name to be 'provider'.\n"
-"'providername' forces the provider name to be 'providername'.\n"
-msgstr ""
-
-#: pppconfig:1711
-msgid ""
-"pppconfig is an interactive, menu driven utility to help automate setting \n"
-"up a dial up ppp connection.  It currently supports PAP, CHAP, and chat \n"
-"authentication.  It uses the standard pppd configuration files.  It does \n"
-"not make a connection to your isp, it just configures your system so that \n"
-"you can do so with a utility such as pon.  It can detect your modem, and \n"
-"it can configure ppp for dynamic dns, multiple ISP's and demand dialing. \n"
-"\n"
-"Before running pppconfig you should know what sort of authentication your \n"
-"isp requires, the username and password that they want you to use, and the \n"
-"phone number.  If they require you to use chat authentication, you will \n"
-"also need to know the login and password prompts and any other prompts and \n"
-"responses required for login.  If you can't get this information from your \n"
-"isp you could try dialing in with minicom and working through the procedure "
-"\n"
-"until you get the garbage that indicates that ppp has started on the other \n"
-"end. \n"
-"\n"
-"Since pppconfig makes changes in system configuration files, you must be \n"
-"logged in as root or use sudo to run it.\n"
-"\n"
-msgstr ""
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/pppoeconf.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/pppoeconf.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/pppoeconf.po	2014-02-24 08:24:33.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/pppoeconf.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,306 +0,0 @@
-# Chinese (China) translation for pppoeconf
-# Copyright (c) 2007 Rosetta Contributors and Canonical Ltd 2007
-# This file is distributed under the same license as the pppoeconf package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: pppoeconf\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-04-18 01:10+0200\n"
-"PO-Revision-Date: 2010-03-13 03:06+0000\n"
-"Last-Translator: Hugh SH <Unknown>\n"
-"Language-Team: Chinese (China) <zh_CN@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2013-12-12 12:17+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
-
-#: ../pppoeconf:46
-msgid "Please become root before running pppoeconf!"
-msgstr "运行 pppoeconf 之前请先切换到 root 用户！"
-
-#: ../pppoeconf:48 ../pppoeconf:68
-msgid "Press return to continue..."
-msgstr "按回车键继续……"
-
-#: ../pppoeconf:66
-msgid ""
-"Please install ppp package and enable pppoe support in the kernel, or "
-"install pppoe package!"
-msgstr "请安装 ppp 包并在内核中启用 pppoe 支持，或者安装 pppoe 包！"
-
-#: ../pppoeconf:108
-msgid "Or press ESC to abort here."
-msgstr "或者按 ESC 键退出。"
-
-#: ../pppoeconf:127
-msgid ""
-"\n"
-"Most providers send the needed login information per mail. Some providers "
-"describe it in odd ways, assuming the user to input the data in their \"user-"
-"friendly\" setup programs. But in fact, these applications generate usuall "
-"PPP user names and passwords from the entered data. You can find the real "
-"names too and input the correct data in the dialog box.\n"
-"\n"
-"For example, this are methods used some german providers:\n"
-"\n"
-"Sample username (alias \"login\" or \"login name\"): 11111111111\n"
-"\n"
-"T-Online T-DSL:\n"
-"  additional data:\n"
-"    sample T-Onlinenummer: 222222222222\n"
-"    sample Mitbenutzer: 0001\n"
-"\n"
-"  complete username: 111111111111222222222222#0001@t-online.de\n"
-"\n"
-"Telekom Business Online (DSL):\n"
-"\n"
-"  complete username: t-online-com/111111111111@t-online-com.de\n"
-"\n"
-"1und1 uses another scheme (using above example):\n"
-"\n"
-"  complete username: 1und1/11111111111\n"
-"\n"
-"Cyberfun:\n"
-"\n"
-"  complete username: sdt/11111111111\n"
-"\n"
-"Komtel:\n"
-"  additional data:\n"
-"    downstream speed class: 768\n"
-"\n"
-"  complete username: 11111111111@FoniNet-768\n"
-"\n"
-"Net Cologne:\n"
-"\n"
-"  complete username: 11111111111@netcologne.de\n"
-"\n"
-"Q-DSL:\n"
-"\n"
-"  complete username: 11111111111@q-dsl.de\n"
-"\n"
-"Versatel:\n"
-"\n"
-"  complete username: 11111111111@VersaNet-1024k\n"
-"\n"
-"Webnetix:\n"
-"\n"
-"  complete username: sdt/11111111111\n"
-msgstr ""
-"\n"
-"大多数网络接入服务供应商通过邮件发送接入时所需的登录信息。有的供应商使用特殊登录方式，要求用户在他们提供的“用户界面友好”的安装程序中输入数据。但实际上，"
-"这些安装程序会根据用户输入的数据，生成建立PPP连接时所使用的用户名和密码。尽管这样，您还是可以找出实际使用的用户名，并将它们填写在对话框中。\n"
-"\n"
-"例如，这里列出了一些中国供应商的做法：\n"
-"\n"
-"示范用户名：12345678\n"
-"\n"
-"上海电信：\n"
-"    输入用户名：ad12345678@shtel\n"
-
-#: ../pppoeconf:185
-msgid "SCANNING DEVICE"
-msgstr "正在扫描设备"
-
-#: ../pppoeconf:186
-#, sh-format
-msgid "Looking for PPPoE Access Concentrator on $iface..."
-msgstr "正在搜寻连接到 $iface 的 PPPoE 访问集中器……"
-
-#: ../pppoeconf:188
-msgid "(multi-modem mode)"
-msgstr "（multi-modem 模式）"
-
-#: ../pppoeconf:210
-msgid "NOT CONNECTED"
-msgstr "未连接"
-
-#: ../pppoeconf:212
-#, sh-format
-msgid ""
-"Sorry, I scanned $number interface, but the Access Concentrator of your "
-"provider did not respond. Please check your network and modem cables. "
-"Another reason for the scan failure may also be another running pppoe "
-"process which controls the modem."
-msgid_plural ""
-"Sorry, I scanned $number interfaces, but the Access Concentrator of your "
-"provider did not respond. Please check your network and modem cables. "
-"Another reason for the scan failure may also be another running pppoe "
-"process which controls the modem."
-msgstr[0] ""
-"抱歉，扫描了 $number "
-"个接口，但供应商的访问集中器没有响应。请检查您的网线以及调制解调器的线缆是否接好。导致扫描失败的另一个可能原因是其他的pppoe进程正在占用调制解调器。"
-
-#: ../pppoeconf:226
-msgid "OKAY TO MODIFY"
-msgstr "请确认修改"
-
-#: ../pppoeconf:227
-#, sh-format
-msgid ""
-"If you continue with this program, the configuration file $OPTSFILE will be "
-"modified. Please make sure that you have a backup copy before saying Yes.\n"
-"\n"
-"Continue with configuration?"
-msgstr ""
-"本程序接下来要修改配置文件 $OPTSFILE。在此之前，请先进行备份。\n"
-"\n"
-"进入下一步配置吗？"
-
-#: ../pppoeconf:307
-msgid "POPULAR OPTIONS"
-msgstr "经典模式"
-
-#: ../pppoeconf:308
-msgid ""
-"Most people using popular dialup providers prefer the options 'noauth' and "
-"'defaultroute' in their configuration and remove the 'nodetach' option. "
-"Should I check your configuration file and change these settings where "
-"neccessary?"
-msgstr ""
-"绝大多数使用常见拨号服务的用户倾向于在其配置文件中设定'无认证'和'默认路由'，并删除'nodetach'选项。\r\n"
-"是否检查您的配置文件修改必要的设定？"
-
-#: ../pppoeconf:326
-msgid "ENTER USERNAME"
-msgstr "输入用户名"
-
-#: ../pppoeconf:327
-msgid ""
-"Please enter the username which you usually need for the PPP login to your "
-"provider in the input box below. If you wish to see the help screen, delete "
-"the username and press OK."
-msgstr "请在下面的文本框中输入PPP登录所需的用户名。如果您要查看帮助，请留空文本框并选择 OK。"
-
-#: ../pppoeconf:348
-msgid "ENTER PASSWORD"
-msgstr "输入密码"
-
-#: ../pppoeconf:349
-msgid ""
-"Please enter the password which you usually need for the PPP login to your "
-"provider in the input box below.\n"
-"\n"
-"NOTE: you can see the password in plain text while typing."
-msgstr ""
-"请在下面的文本框中输入PPP登录时使用的密码。\n"
-"\n"
-"注意：您输入的密码将以明文形式显示在文本框中。"
-
-#: ../pppoeconf:369
-msgid "USE PEER DNS"
-msgstr "使用局端提供的DNS"
-
-#: ../pppoeconf:370
-msgid ""
-"You need at least one DNS IP address to resolve the normal host names. "
-"Normally your provider sends you addresses of useable servers when the "
-"connection is established. Would you like to add these addresses "
-"automatically to the list of nameservers in your local /etc/resolv.conf "
-"file? (recommended)"
-msgstr ""
-"为了解析主机名，您至少需要获得一个 DNS IP "
-"地址。通常情况下，当连接建立时供应商会将可用的服务器地址发送给您。是否要将这些地址自动加入到名字服务器列表 /etc/resolv.conf "
-"文件中？（推荐）"
-
-#: ../pppoeconf:386
-msgid "LIMITED MSS PROBLEM"
-msgstr "MSS 限制错误"
-
-#: ../pppoeconf:387
-msgid ""
-"Many providers have routers that do not support TCP packets with a MSS "
-"higher than 1460. Usually, outgoing packets have this MSS when they go "
-"through one real Ethernet link with the default MTU size (1500). "
-"Unfortunately, if you are forwarding packets from other hosts (i.e. doing "
-"masquerading) the MSS may be increased depending on the packet size and the "
-"route to the client hosts, so your client machines won't be able to connect "
-"to some sites. There is a solution: the maximum MSS can be limited by pppoe. "
-"You can find more details about this issue in the pppoe documentation.\n"
-"\n"
-"Should pppoe clamp MSS at 1452 bytes?\n"
-"\n"
-"If unsure, say yes.\n"
-"\n"
-"(If you still get problems described above, try setting to 1412 in the dsl-"
-"provider file.)"
-msgstr ""
-"很多接入商使用的路由器不支持 MSS 超过 1460 的 TCP 包。通常，外发的包在经过一个真正的以太网连接时会使用这个 MSS 值（默认 "
-"1500）。\n"
-"但是，如果是从其他主机转发的包（例如伪装），MSS 可能会因包的大小以及到客户端的路由而增加，从而导致你的客户机器无法连接某些站点。解决办法就是由 "
-"pppoe 来限制 MSS 的最大值。您可以在 pppoe 文档中找到相关话题的详细信息。\n"
-"\n"
-"需要 pppoe 把 MSS 固定为 1452 字节吗？\n"
-"\n"
-"如果不确定，请选择是。\n"
-"\n"
-"（如果无法理解上面的叙述，请尝试在 dsl-provider 文件中将其设置为 1412）"
-
-#: ../pppoeconf:416
-msgid "DONE"
-msgstr "完成"
-
-#: ../pppoeconf:417
-msgid ""
-"Your PPPD is configured now. Would you like to start the connection at boot "
-"time?"
-msgstr "您的 PPPD 设置完成。您希望每次启动系统时建立连接吗？"
-
-#: ../pppoeconf:434
-msgid "ERROR"
-msgstr "错误"
-
-#: ../pppoeconf:435
-#, sh-format
-msgid ""
-"The interfaces file generated by pppoeconf appears to be invalid. This is "
-"probably because pppoeconf is unable to handle your original interfaces "
-"file. Should pppoeconf nevertheless change your interfaces file with the one "
-"that appears to be invalid?\n"
-"If you agree, you will probably break your network connectivity after "
-"rebooting, and cause some local problems if lo is down. Your original "
-"interfaces file will be moved to $REALINTFILE~ so you can restore it.\n"
-"If not, you will have to make sure that $iface is configured before starting "
-"your DSL connection and start the connection manually.\n"
-"\n"
-"Note that this situation is not expected and you should consider submitting "
-"a bug report against pppoeconf including your original interfaces file and "
-"the one generated by pppoeconf."
-msgstr ""
-"由 pppoeconf 生成的接口文件似乎无效。这可能是 pppoeconf 无法处理原始接口文件造成的。是否需要 pppoeconf "
-"尝试更改此无效文件？\n"
-"如果是，重启之后您很可能丢失网络连接，并可能因 lo 中断造成一些本地问题。您的原始接口文件将被保存为 $REALINTFILE~ 留作备份。\n"
-"如果否，您需要先确认 $iface 被正确配置，然后才能手动建立 DSL 连接。\n"
-"\n"
-"注意，这是不应该出现的情况，您可以考虑将您的原始接口文件和 pppoeconf 生成的接口文件作为 bug 报告给 pppoeconf。"
-
-#: ../pppoeconf:456
-msgid "ESTABLISH A CONNECTION"
-msgstr "建立一个连接"
-
-#: ../pppoeconf:457
-msgid ""
-"Now, you can make a DSL connection with \"pon dsl-provider\" and terminate "
-"it with \"poff\". Would you like to start the connection now?"
-msgstr "现在，您可以通过 \"pon dsl-provider\" 来建立连接和通过 \"poff\" 来中断连接。现在就建立连接吗？"
-
-#: ../pppoeconf:463
-msgid "CONNECTION INITIATED"
-msgstr "连接已初始化"
-
-#: ../pppoeconf:464
-msgid ""
-"The DSL connection has been triggered. You can use the \"plog\" command to "
-"see the status or \"ifconfig ppp0\" for general interface info."
-msgstr "已触发 DSL 连接。您可以通过 \"plog\" 命令来查看状态，或者通过 \"ifconfig ppp0\" 来获得接口信息。"
-
-#: ../pppoeconf:476
-msgid "NO INTERFACE FOUND"
-msgstr "未找到接口"
-
-#: ../pppoeconf:477
-msgid "Sorry, no working ethernet card could be found."
-msgstr ""
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/psmisc.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/psmisc.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/psmisc.po	2014-02-24 08:24:33.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/psmisc.po	2014-03-24 09:42:41.000000000 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:49+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:03+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: src/fuser.c:133
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/pulseaudio.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/pulseaudio.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/pulseaudio.po	2014-02-24 08:24:41.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/pulseaudio.po	2014-03-24 09:42:48.000000000 +0000
@@ -10,15 +10,15 @@
 msgstr ""
 "Project-Id-Version: pulseaudio.master-tx\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-17 21:03+0000\n"
+"POT-Creation-Date: 2014-02-28 07:00+0000\n"
 "PO-Revision-Date: 2012-06-22 22:38+0000\n"
 "Last-Translator: Leah Liu <Unknown>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:45+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:09+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: \n"
 
 #: ../src/modules/alsa/alsa-util.c:1128 ../src/modules/alsa/alsa-util.c:1203
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/python-apt.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/python-apt.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/python-apt.po	2014-02-24 08:24:33.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/python-apt.po	2014-03-24 09:42:41.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: update-manager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-17 15:52+0000\n"
+"POT-Creation-Date: 2014-03-18 17:47+0000\n"
 "PO-Revision-Date: 2013-09-11 07:35+0000\n"
 "Last-Translator: Anthony Fok <foka@debian.org>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:49+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:04+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: \n"
 
 #. ChangelogURI
@@ -467,7 +467,7 @@
 msgstr "非DFSG兼容软件"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:211 ../aptsources/distro.py:441
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:442
 #, python-format
 msgid "Server for %s"
 msgstr "%s 的服务器"
@@ -484,39 +484,39 @@
 msgid "Custom servers"
 msgstr "自定义服务器"
 
-#: ../apt/progress/gtk2.py:243
+#: ../apt/progress/gtk2.py:245
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr "正在下载文件 %(current)li 从 %(total)li 速度是 %(speed)s/s"
 
-#: ../apt/progress/gtk2.py:249
+#: ../apt/progress/gtk2.py:251
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "正在下载文件 %(current)li 从 %(total)li"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:272
+#: ../apt/progress/gtk2.py:274
 msgid "Details"
 msgstr "详细信息"
 
-#: ../apt/progress/gtk2.py:345
+#: ../apt/progress/gtk2.py:347
 msgid "Starting..."
 msgstr "开始..."
 
-#: ../apt/progress/gtk2.py:351
+#: ../apt/progress/gtk2.py:353
 msgid "Complete"
 msgstr "完成"
 
-#: ../apt/package.py:337
+#: ../apt/package.py:380
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr "无效的 unicode 在 '%s' (%s) 的描述中。 请汇报。"
 
-#: ../apt/package.py:910 ../apt/package.py:1016
+#: ../apt/package.py:950 ../apt/package.py:1056
 msgid "The list of changes is not available"
 msgstr "变动列表尚不可用。"
 
-#: ../apt/package.py:1022
+#: ../apt/package.py:1062
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -529,7 +529,7 @@
 "请使用http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
 "直至这些选项可用或者稍后再试。"
 
-#: ../apt/package.py:1029
+#: ../apt/package.py:1069
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
@@ -537,28 +537,27 @@
 "无法下载更新列表。 \n"
 "请检查您的网络连接。"
 
-#: ../apt/debfile.py:85
+#: ../apt/debfile.py:89
 #, python-format
 msgid "List of files for '%s' could not be read"
 msgstr "无法读取“%s”的列表"
 
-#: ../apt/debfile.py:96
+#: ../apt/debfile.py:101
 #, python-format
 msgid "List of control files for '%s' could not be read"
 msgstr "无法读取 %s  的控制文件列表"
 
-#: ../apt/debfile.py:217
+#: ../apt/debfile.py:226
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr "依赖关系不满足： %s\n"
 
-#: ../apt/debfile.py:238
+#: ../apt/debfile.py:249
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr "与已安装的软件包 '%s' 冲突"
 
-#. TRANSLATORS: the first '%s' is the package that breaks, the second the dependency that makes it break, the third the relation (e.g. >=) and the latest the version for the releation
-#: ../apt/debfile.py:379
+#: ../apt/debfile.py:396
 #, python-format
 msgid ""
 "Breaks existing package '%(pkgname)s' dependency %(depname)s "
@@ -566,8 +565,7 @@
 msgstr ""
 "破坏现有软件包 '%(pkgname)s' 的依赖 %(depname)s (%(deprelation)s %(depversion)s)"
 
-#. TRANSLATORS: the first '%s' is the package that conflicts, the second the packagename that it conflicts with (so the name of the deb the user tries to install), the third is the relation (e.g. >=) and the last is the version for the relation
-#: ../apt/debfile.py:395
+#: ../apt/debfile.py:423
 #, python-format
 msgid ""
 "Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
@@ -575,7 +573,7 @@
 msgstr ""
 "破坏现有软件包 '%(pkgname)s' 对 %(targetpkg)s (%(comptype)s %(targetver)s) 的冲突关系"
 
-#: ../apt/debfile.py:405
+#: ../apt/debfile.py:437
 #, python-format
 msgid ""
 "Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But "
@@ -584,30 +582,29 @@
 "破坏现有软件包 '%(pkgname)s' 和 '%(targetpkg)s' 的冲突关系。但是 '%(debfile)s' 通过 "
 "'%(provides)s' 提供了它"
 
-#: ../apt/debfile.py:453
+#: ../apt/debfile.py:488
 msgid "No Architecture field in the package"
 msgstr "软件包中没有 架构 字段信息"
 
-#: ../apt/debfile.py:463
+#: ../apt/debfile.py:498
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr "错误的架构 '%s'"
 
-#. the deb is older than the installed
-#: ../apt/debfile.py:470
+#: ../apt/debfile.py:506
 msgid "A later version is already installed"
 msgstr "已经安装了较新的版本"
 
-#: ../apt/debfile.py:495
+#: ../apt/debfile.py:531
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr "无法满足所有的依赖关系（缓存损坏）"
 
-#: ../apt/debfile.py:525
+#: ../apt/debfile.py:560
 #, python-format
 msgid "Cannot install '%s'"
 msgstr "无法安装 '%s'"
 
-#: ../apt/debfile.py:599
+#: ../apt/debfile.py:636
 msgid ""
 "Automatically decompressed:\n"
 "\n"
@@ -615,45 +612,45 @@
 "自动解压：\n"
 "\n"
 
-#: ../apt/debfile.py:605
+#: ../apt/debfile.py:642
 msgid "Automatically converted to printable ascii:\n"
 msgstr "自动转换为可打印的 ascii：\n"
 
-#: ../apt/debfile.py:695
+#: ../apt/debfile.py:733
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr "为源软件包 '%s' 编译 %s 安装编译依赖\n"
 
-#: ../apt/debfile.py:706
+#: ../apt/debfile.py:744
 msgid "An essential package would be removed"
 msgstr "一个基本软件包将被移除"
 
-#: ../apt/progress/text.py:82
+#: ../apt/progress/text.py:89
 #, python-format
 msgid "%c%s... Done"
 msgstr "%c%s... 完成"
 
-#: ../apt/progress/text.py:122
+#: ../apt/progress/text.py:129
 msgid "Hit "
 msgstr "命中 "
 
-#: ../apt/progress/text.py:131
+#: ../apt/progress/text.py:138
 msgid "Ign "
 msgstr "忽略 "
 
-#: ../apt/progress/text.py:133
+#: ../apt/progress/text.py:140
 msgid "Err "
 msgstr "错误 "
 
-#: ../apt/progress/text.py:144
+#: ../apt/progress/text.py:151
 msgid "Get:"
 msgstr "获取："
 
-#: ../apt/progress/text.py:203
+#: ../apt/progress/text.py:211
 msgid " [Working]"
 msgstr " [执行中]"
 
-#: ../apt/progress/text.py:214
+#: ../apt/progress/text.py:222
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -665,19 +662,19 @@
 "的盘片插入驱动器“%s”再按回车键\n"
 
 #. Trick for getting a translation from apt
-#: ../apt/progress/text.py:223
+#: ../apt/progress/text.py:231
 #, python-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "已下载 %sB / %s (%sB/s)\n"
 
-#: ../apt/progress/text.py:239
+#: ../apt/progress/text.py:247
 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
 msgstr "请给这张盘起个名字，例如 “Debian 2.1r1 Disk 1”"
 
-#: ../apt/progress/text.py:255
+#: ../apt/progress/text.py:263
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "请把盘片插入驱动器再按回车键"
 
-#: ../apt/cache.py:160
+#: ../apt/cache.py:163
 msgid "Building data structures"
 msgstr "正在构建数据结构"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/quilt.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/quilt.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/quilt.po	2014-02-24 08:24:34.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/quilt.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,1018 +0,0 @@
-# Simplified Chinese translation for quilt
-# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the quilt package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: quilt\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-12-12 12:18+0000\n"
-"PO-Revision-Date: 2008-02-02 00:21+0000\n"
-"Last-Translator: Tao Wei <weitao1979@gmail.com>\n"
-"Language-Team: Simplified Chinese <zh_CN@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-12 12:18+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
-
-#: bin/quilt.in:23
-msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..."
-msgstr "用法：quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..."
-
-#: bin/quilt.in:24
-msgid "       quilt --version"
-msgstr "       quilt --version"
-
-#: bin/quilt.in:26
-msgid "Commands are:"
-msgstr "命令是："
-
-#: bin/quilt.in:31
-msgid ""
-"\n"
-"Global options:\n"
-"\n"
-"--trace\n"
-"\tRuns the command in bash trace mode (-x). For internal debugging.\n"
-"\n"
-"--quiltrc file\n"
-"\tUse the specified configuration file instead of ~/.quiltrc (or\n"
-"\t/etc/quilt.quiltrc if ~/.quiltrc does not exist).  See the pdf\n"
-"\tdocumentation for details about its possible contents.\n"
-"\n"
-"--version\n"
-"\tPrint the version number and exit immediately."
-msgstr ""
-
-#: quilt/add.in:22
-msgid "Usage: quilt add [-p patch] {file} ...\\n"
-msgstr "用法：quilt add [-p patch] {file} ...\\n"
-
-#: quilt/add.in:25
-msgid ""
-"\n"
-"Add one or more files to the topmost or named patch.  Files must be\n"
-"added to the patch before being modified.  Files that are modified by\n"
-"patches already applied on top of the specified patch cannot be added.\n"
-"\n"
-"-p patch\n"
-"\tPatch to add files to.\n"
-msgstr ""
-
-#: quilt/add.in:48 quilt/add.in:54
-msgid "File \\`%s' is located below \\`%s'\\n"
-msgstr ""
-
-#: quilt/add.in:78 quilt/applied.in:62 quilt/delete.in:97 quilt/diff.in:160
-#: quilt/diff.in:171 quilt/graph.in:116 quilt/header.in:135 quilt/next.in:62
-#: quilt/pop.in:246 quilt/previous.in:62 quilt/push.in:312
-#: quilt/refresh.in:148 quilt/remove.in:53 quilt/rename.in:63
-#: quilt/unapplied.in:62
-msgid "Patch %s is not in series\\n"
-msgstr ""
-
-#: quilt/add.in:99 quilt/diff.in:239 quilt/graph.in:121 quilt/pop.in:261
-#: quilt/refresh.in:154 quilt/remove.in:74
-msgid "Patch %s is not applied\\n"
-msgstr ""
-
-#: quilt/add.in:106 quilt/delete.in:76 quilt/diff.in:247 quilt/files.in:103
-#: quilt/fold.in:79 quilt/fork.in:72 quilt/graph.in:131 quilt/header.in:142
-#: quilt/pop.in:295 quilt/push.in:350 quilt/refresh.in:162 quilt/remove.in:81
-#: quilt/rename.in:85
-msgid "No patches applied\\n"
-msgstr ""
-
-#: quilt/add.in:121
-msgid "File %s is already in patch %s\\n"
-msgstr ""
-
-#: quilt/add.in:129 quilt/remove.in:100
-msgid "File %s modified by patch %s\\n"
-msgstr ""
-
-#: quilt/add.in:137
-msgid "Cannot add symbolic link %s\\n"
-msgstr ""
-
-#: quilt/add.in:144
-msgid "Failed to back up file %s\\n"
-msgstr ""
-
-#: quilt/add.in:155
-msgid "File %s added to patch %s\\n"
-msgstr ""
-
-#: quilt/annotate.in:22
-msgid "Usage: quilt annotate {file}\\n"
-msgstr ""
-
-#: quilt/annotate.in:25
-msgid ""
-"\n"
-"Print an annotated listing of the specified file showing which\n"
-"patches modify which lines.\n"
-msgstr ""
-
-#: quilt/applied.in:22
-msgid "Usage: quilt applied [patch]\\n"
-msgstr ""
-
-#: quilt/applied.in:25
-msgid ""
-"\n"
-"Print a list of applied patches, or all patches up to and including the\n"
-"specified patch in the file series.\n"
-msgstr ""
-
-#: quilt/applied.in:67
-msgid "Patch is not applied\\n"
-msgstr ""
-
-#: quilt/delete.in:22
-msgid "Usage: quilt delete [patch | -n]\\n"
-msgstr ""
-
-#: quilt/delete.in:25
-msgid ""
-"\n"
-"Remove the specified or topmost patch from the series file.  If the\n"
-"patch is applied, quilt will attempt to remove it first. (Only the\n"
-"topmost patch can be removed right now.)\n"
-"\n"
-"-n\tDelete the next patch after topmost, rather than the specified\n"
-"\tor topmost patch.\n"
-msgstr ""
-
-#: quilt/delete.in:88
-msgid "No next patch\\n"
-msgstr ""
-
-#: quilt/delete.in:106
-msgid "Patch %s is currently applied\\n"
-msgstr ""
-
-#: quilt/delete.in:113
-msgid "Removed patch %s\\n"
-msgstr ""
-
-#: quilt/delete.in:115
-msgid "Failed to remove patch %s\\n"
-msgstr ""
-
-#: quilt/diff.in:24
-msgid ""
-"Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P "
-"patch] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] [--sort] "
-"[--color] [file ...]\\n"
-msgstr ""
-
-#: quilt/diff.in:28
-msgid ""
-"\n"
-"Produces a diff of the specified file(s) in the topmost or specified\n"
-"patch.  If no files are specified, all files that are modified are\n"
-"included.\n"
-"\n"
-"-p n\tCreate a -p n style patch (-p0 or -p1 are supported).\n"
-"\n"
-"-u, -U num, -c, -C num\n"
-"\tCreate a unified diff (-u, -U) with num lines of context. Create\n"
-"\ta context diff (-c, -C) with num lines of context. The number of\n"
-"\tcontext lines defaults to 3.\n"
-"\n"
-"--no-timestamps\n"
-"\tDo not include file timestamps in patch headers.\n"
-"\n"
-"--no-index\n"
-"\tDo not output Index: lines.\n"
-"\n"
-"-z\tWrite to standard output the changes that have been made\n"
-"\trelative to the topmost or specified patch.\n"
-"\n"
-"-R\tCreate a reverse diff.\n"
-"\n"
-"-P patch\n"
-"\tCreate a diff for the specified patch.  (Defaults to the topmost\n"
-"\tpatch.)\n"
-"\n"
-"--combine patch\n"
-"\tCreate a combined diff for all patches between this patch and\n"
-"\tthe patch specified with -P. A patch name of \\\"-\\\" is equivalent\n"
-"\tto specifying the first applied patch.\n"
-"\n"
-"--snapshot\n"
-"\tDiff against snapshot (see \\`quilt snapshot -h').\n"
-"\n"
-"--diff=utility\n"
-"\tUse the specified utility for generating the diff. The utility\n"
-"\tis invoked with the original and new file name as arguments.\n"
-"\n"
-"--color[=always|auto|never]\n"
-"\tUse syntax coloring.\n"
-"\n"
-"--sort\tSort files by their name instead of preserving the original order.\n"
-msgstr ""
-
-#: quilt/diff.in:231
-msgid ""
-"Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined.\\n"
-msgstr ""
-
-#: quilt/diff.in:258
-msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n"
-msgstr ""
-
-#: quilt/diff.in:293 quilt/files.in:122
-msgid "Patch %s not applied before patch %s\\n"
-msgstr ""
-
-#: quilt/diff.in:343 quilt/pop.in:114
-msgid "Failed to copy files to temporary directory\\n"
-msgstr ""
-
-#: quilt/diff.in:367 quilt/pop.in:138
-msgid "Failed to patch temporary files\\n"
-msgstr ""
-
-#: quilt/diff.in:386
-msgid "File %s is not being modified\\n"
-msgstr ""
-
-#: quilt/diff.in:406 quilt/refresh.in:201
-msgid "Diff failed, aborting\\n"
-msgstr ""
-
-#: quilt/diff.in:413
-msgid "More recent patches modify files in patch %s\\n"
-msgstr ""
-
-#: quilt/edit.in:13
-msgid "Usage: quilt edit file ...\\n"
-msgstr ""
-
-#: quilt/edit.in:16
-msgid ""
-"\n"
-"Edit the specified file(s) in \\$EDITOR (%s) after adding it (them) to\n"
-"the topmost patch.\n"
-msgstr ""
-
-#: quilt/files.in:22
-msgid "Usage: quilt files [-v] [-a] [-l] [--combine patch] [patch]\\n"
-msgstr ""
-
-#: quilt/files.in:25
-msgid ""
-"\n"
-"Print the list of files that the topmost or specified patch changes.\n"
-"\n"
-"-a\tList all files in all applied patches.\n"
-"\n"
-"-l\tAdd patch name to output.\n"
-"\n"
-"-v\tVerbose, more user friendly output.\n"
-"\n"
-"--combine patch\n"
-"\tCreate a listing for all patches between this patch and\n"
-"\tthe topmost applied patch. A patch name of \\\"-\\\" is equivalent\n"
-"\tto specifying the first applied patch.\n"
-"\n"
-msgstr ""
-
-#: quilt/files.in:76 quilt/files.in:96
-msgid "Patch %s is not in series file\\n"
-msgstr ""
-
-#: quilt/fold.in:22
-msgid "Usage: quilt fold [-p strip-level]\\n"
-msgstr ""
-
-#: quilt/fold.in:25
-msgid ""
-"\n"
-"Integrate the patch read from standard input into the topmost patch:\n"
-"After making sure that all files modified are part of the topmost\n"
-"patch, the patch is applied with the specified strip level (which\n"
-"defaults to 1).\n"
-"\n"
-"-p strip-level\n"
-"\tThe number of pathname components to strip from file names\n"
-"\twhen applying patchfile.\n"
-msgstr ""
-
-#: quilt/fold.in:116
-msgid "File %s may be corrupted\\n"
-msgstr "文件 %s 可能已损坏\\n"
-
-#: quilt/fork.in:22
-msgid "Usage: quilt fork [new_name]\\n"
-msgstr ""
-
-#: quilt/fork.in:25
-msgid ""
-"\n"
-"Fork the topmost patch.  Forking a patch means creating a verbatim copy\n"
-"of it under a new name, and use that new name instead of the original\n"
-"one in the current series.  This is useful when a patch has to be\n"
-"modified, but the original version of it should be preserved, e.g.\n"
-"because it is used in another series, or for the history.  A typical\n"
-"sequence of commands would be: fork, edit, refresh.\n"
-"\n"
-"If new_name is missing, the name of the forked patch will be the current\n"
-"patch name, followed by \\\"-2\\\".  If the patch name already ends in a\n"
-"dash-and-number, the number is further incremented (e.g., patch.diff,\n"
-"patch-2.diff, patch-3.diff).\n"
-msgstr ""
-
-#: quilt/fork.in:99
-msgid "Patch %s exists already, please choose a new name\\n"
-msgstr ""
-
-#: quilt/fork.in:111
-msgid "Fork of patch %s to patch %s failed\\n"
-msgstr ""
-
-#: quilt/fork.in:117
-msgid "Fork of patch %s created as %s\\n"
-msgstr ""
-
-#: quilt/graph.in:22
-msgid ""
-"Usage: quilt graph [--all] [--reduce] [--lines[=num]] [--edge-labels=files] "
-"[patch]\\n"
-msgstr ""
-
-#: quilt/graph.in:26
-msgid ""
-"\n"
-"Generate a dot(1) directed graph showing the dependencies between\n"
-"applied patches. A patch depends on another patch if both touch the same\n"
-"file or, with the --lines option, if their modifications overlap. Unless\n"
-"otherwise specified, the graph includes all patches that the topmost\n"
-"patch depends on.\n"
-"When a patch name is specified, instead of the topmost patch, create a\n"
-"graph for the specified patch. The graph will include all other patches\n"
-"that this patch depends on, as well as all patches that depend on this\n"
-"patch.\n"
-"\n"
-"--all\tGenerate a graph including all applied patches and their\n"
-"\tdependencies. (Unapplied patches are not included.)\n"
-"\n"
-"--reduce\n"
-"\tEliminate transitive edges from the graph.\n"
-"\n"
-"--lines[=num]\n"
-"\tCompute dependencies by looking at the lines the patches modify.\n"
-"\tUnless a different num is specified, two lines of context are\n"
-"\tincluded.\n"
-"\n"
-"--edge-labels=files\n"
-"\tLabel graph edges with the file names that the adjacent patches\n"
-"\tmodify.\n"
-"\n"
-"-T ps\tDirectly produce a PostScript output file.\n"
-msgstr ""
-
-#: quilt/grep.in:22
-msgid "Usage: quilt grep [-h|options] {pattern}\\n"
-msgstr ""
-
-#: quilt/grep.in:25
-msgid ""
-"\n"
-"Grep through the source files, recursively, skipping patches and quilt\n"
-"meta-information. If no filename argument is given, the whole source\n"
-"tree is searched. Please see the grep(1) manual page for options.\n"
-"\n"
-"-h\tPrint this help. The grep -h option can be passed after a\n"
-"\tdouble-dash (--). Search expressions that start with a dash\n"
-"\tcan be passed after a second double-dash (-- --).\n"
-msgstr ""
-
-#: quilt/header.in:24
-msgid ""
-"Usage: quilt header [-a|-r|-e] [--backup] [--strip-diffstat] [--strip-"
-"trailing-whitespace] [patch]\\n"
-msgstr ""
-
-#: quilt/header.in:28
-msgid ""
-"\n"
-"Print or change the header of the topmost or specified patch.\n"
-"\n"
-"-a, -r, -e\n"
-"\tAppend to (-a) or replace (-r) the exiting patch header, or\n"
-"\tedit (-e) the header in \\$EDITOR (%s). If none of these options is\n"
-"\tgiven, print the patch header.\n"
-"\t\n"
-"--strip-diffstat\n"
-"\tStrip diffstat output from the header.\n"
-"\n"
-"--strip-trailing-whitespace\n"
-"\tStrip trailing whitespace at the end of lines of the header.\n"
-"\n"
-"--backup\n"
-"\tCreate a backup copy of the old version of a patch as patch~.\n"
-msgstr ""
-
-#: quilt/header.in:192
-msgid "Replaced header of patch %s\\n"
-msgstr ""
-
-#: quilt/header.in:195
-msgid "Appended text to header of patch %s\\n"
-msgstr ""
-
-#: quilt/import.in:22
-msgid "Usage: quilt import [-f] [-p num] [-n patch] patchfile ...\\n"
-msgstr ""
-
-#: quilt/import.in:25
-msgid ""
-"\n"
-"Import external patches.\n"
-"\n"
-"-p num\n"
-"\tNumber of directory levels to strip when applying (default=1)\n"
-"\n"
-"-n patch\n"
-"\tPatch filename to use inside quilt. This option can only be\n"
-"\tused when importing a single patch.\n"
-"\n"
-"-f\tOverwite/update existing patches.\n"
-msgstr ""
-
-#: quilt/import.in:74
-msgid "Option \\`-n' can only be used when importing a single patch\\n"
-msgstr ""
-
-#: quilt/import.in:92
-msgid "Patch %s is applied\\n"
-msgstr ""
-
-#: quilt/import.in:100
-msgid "Patch %s exists. Replace with -f.\\n"
-msgstr ""
-
-#: quilt/import.in:104
-msgid "Replacing patch %s with new version\\n"
-msgstr ""
-
-#: quilt/import.in:107
-msgid "Importing patch %s (stored as %s)\\n"
-msgstr ""
-
-#: quilt/import.in:115
-msgid "Failed to import patch %s\\n"
-msgstr ""
-
-#: quilt/import.in:122
-msgid "Failed to insert patch %s into file series\\n"
-msgstr ""
-
-#: quilt/mail.in:25
-msgid ""
-"Usage: quilt mail {--mbox file|--send} [--from ...] [--to ...] [--cc ...] [--"
-"bcc ...] [--subject ...]\\n"
-msgstr ""
-
-#: quilt/mail.in:28
-msgid ""
-"\n"
-"Create mail messages from all patches in the series file, and either store\n"
-"them in a mailbox file, or send them immediately. The editor is opened\n"
-"with a template for the introductory message. Please see the file\n"
-"%s for details.\n"
-"\n"
-"--mbox file\n"
-"\tStore all messages in the specified file in mbox format. The mbox\n"
-"\tcan later be sent using formail, for example.\n"
-"\n"
-"--send\n"
-"\tSend the messages directly using %s.\n"
-"\n"
-"--from, --subject\n"
-"\tThe values for the From and Subject headers to use.\n"
-"\n"
-"--to, --cc, --bcc\n"
-"\tAppend a recipient to the To, Cc, or Bcc header.\n"
-msgstr ""
-
-#: quilt/new.in:22
-msgid "Usage: quilt new {patchname}\\n"
-msgstr ""
-
-#: quilt/new.in:25
-msgid ""
-"\n"
-"Create a new patch with the specified file name, and insert it after the\n"
-"topmost patch in the patch series file.\n"
-msgstr ""
-
-#: quilt/new.in:64
-msgid "Patch %s exists already\\n"
-msgstr ""
-
-#: quilt/new.in:75
-msgid "Failed to create patch %s\\n"
-msgstr ""
-
-#: quilt/new.in:78
-msgid "Patch %s is now on top\\n"
-msgstr ""
-
-#: quilt/next.in:22
-msgid "Usage: quilt next [patch]\\n"
-msgstr ""
-
-#: quilt/next.in:25
-msgid ""
-"\n"
-"Print the name of the next patch after the specified or topmost patch in\n"
-"the series file.\n"
-msgstr ""
-
-#: quilt/patches.in:22
-msgid "Usage: quilt patches {file}\\n"
-msgstr ""
-
-#: quilt/patches.in:25
-msgid ""
-"\n"
-"Print the list of patches that modify the specified file. (Uses a\n"
-"heuristic to determine which files are modified by unapplied patches.\n"
-"Note that this heuristic is much slower than scanning applied patches.)\n"
-"\n"
-"-v\tVerbose, more user friendly output.\n"
-msgstr ""
-
-#: quilt/pop.in:22
-msgid "Usage: quilt pop [-afRqv] [num|patch]\\n"
-msgstr ""
-
-#: quilt/pop.in:25
-msgid ""
-"\n"
-"Remove patch(es) from the stack of applied patches.  Without options,\n"
-"the topmost patch is removed.  When a number is specified, remove the\n"
-"specified number of patches.  When a patch name is specified, remove\n"
-"patches until the specified patch end up on top of the stack.  Patch\n"
-"names may include the patches/ prefix, which means that filename\n"
-"completion can be used.\n"
-"\n"
-"-a\tRemove all applied patches.\n"
-"\n"
-"-f\tForce remove. The state before the patch(es) were applied will\n"
-"\tbe restored from backup files.\n"
-"\n"
-"-R\tAlways verify if the patch removes cleanly; don't rely on\n"
-"\ttimestamp checks.\n"
-"\n"
-"-q\tQuiet operation.\n"
-"\n"
-"-v\tVerbose operation.\n"
-msgstr ""
-
-#: quilt/pop.in:156
-msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n"
-msgstr ""
-
-#: quilt/pop.in:181
-msgid "Patch %s appears to be empty, removing\\n"
-msgstr ""
-
-#: quilt/pop.in:185
-msgid "Removing patch %s\\n"
-msgstr ""
-
-#: quilt/pop.in:269
-msgid "Patch %s needs to be refreshed first.\\n"
-msgstr ""
-
-#: quilt/pop.in:279
-msgid "No patch removed\\n"
-msgstr ""
-
-#: quilt/pop.in:302 quilt/push.in:372
-msgid "Now at patch %s\\n"
-msgstr ""
-
-#: quilt/previous.in:22
-msgid "Usage: quilt previous [patch]\\n"
-msgstr ""
-
-#: quilt/previous.in:25
-msgid ""
-"\n"
-"Print the name of the previous patch before the specified or topmost\n"
-"patch in the series file.\n"
-msgstr ""
-
-#: quilt/push.in:24
-msgid "Usage: quilt push [-afqv] [--leave-rejects] [num|patch]\\n"
-msgstr ""
-
-#: quilt/push.in:27
-msgid ""
-"\n"
-"Apply patch(es) from the series file.  Without options, the next patch\n"
-"in the series file is applied.  When a number is specified, apply the\n"
-"specified number of patches.  When a patch name is specified, apply\n"
-"all patches up to and including the specified patch.  Patch names may\n"
-"include the patches/ prefix, which means that filename completion can\n"
-"be used.\n"
-"\n"
-"-a\tApply all patches in the series file.\n"
-"\n"
-"-f\tForce apply, even if the patch has rejects.\n"
-"\n"
-"-q\tQuiet operation.\n"
-"\n"
-"-v\tVerbose operation.\n"
-"\n"
-"--leave-rejects\n"
-"\tLeave around the reject files patch produced, even if the patch\n"
-"\tis not actually applied.\n"
-"\n"
-"--interactive\n"
-"\tAllow the patch utility to ask how to deal with conflicts. If\n"
-"\tthis option is not given, the -f option will be passed to the \n"
-"\tpatch program.\n"
-"\n"
-"--color[=always|auto|never]\n"
-"\tUse syntax coloring.\n"
-msgstr ""
-
-#: quilt/push.in:64
-msgid "Interrupted by user; patch %s was not applied.\\n"
-msgstr ""
-
-#: quilt/push.in:157
-msgid "Applying patch %s\\n"
-msgstr ""
-
-#: quilt/push.in:189
-msgid "Patch %s does not exist; applied empty patch\\n"
-msgstr ""
-
-#: quilt/push.in:193
-msgid "Patch %s appears to be empty; applied\\n"
-msgstr ""
-
-#: quilt/push.in:197
-msgid "Applied patch %s (forced; needs refresh)\\n"
-msgstr ""
-
-#: quilt/push.in:202
-msgid "Patch %s does not apply (enforce with -f)\\n"
-msgstr ""
-
-#: quilt/push.in:241
-msgid "Patch %s not found in file series\\n"
-msgstr ""
-
-#: quilt/push.in:329
-msgid "Patch %s is already applied\\n"
-msgstr ""
-
-#: quilt/push.in:338
-msgid "The topmost patch %s needs to be refreshed first.\\n"
-msgstr ""
-
-#: quilt/push.in:352
-msgid "File series fully applied, ends at patch %s\\n"
-msgstr ""
-
-#: quilt/refresh.in:22
-msgid ""
-"Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--no-index] [--diffstat] "
-"[--sort] [--backup] [--strip-trailing-whitespace] [patch]\\n"
-msgstr ""
-
-#: quilt/refresh.in:26
-msgid ""
-"\n"
-"Refreshes the specified patch, or the topmost patch by default.\n"
-"Documentation that comes before the actual patch in the patch file is\n"
-"retained.\n"
-"\n"
-"It is possible to refresh patches that are not on top.  If any patches\n"
-"on top of the patch to refresh modify the same files, the script aborts\n"
-"by default.  Patches can still be refreshed with -f.  In that case this\n"
-"script will print a warning for each shadowed file, changes by more\n"
-"recent patches will be ignored, and only changes in files that have not\n"
-"been modified by any more recent patches will end up in the specified\n"
-"patch.\n"
-"\n"
-"-p n\tCreate a -p n style patch (-p0 or -p1 supported).\n"
-"\n"
-"-u, -U num, -c, -C num\n"
-"\tCreate a unified diff (-u, -U) with num lines of context. Create\n"
-"\ta context diff (-c, -C) with num lines of context. The number of\n"
-"\tcontext lines defaults to 3.\n"
-"\n"
-"--no-timestamps\n"
-"\tDo not include file timestamps in patch headers.\n"
-"\t\n"
-"--no-index\n"
-"\tDo not output Index: lines.\n"
-"\n"
-"--diffstat\n"
-"\tAdd a diffstat section to the patch header, or replace the\n"
-"\texisting diffstat section.\n"
-"\n"
-"-f\tEnforce refreshing of a patch that is not on top.\n"
-"\n"
-"--backup\n"
-"\tCreate a backup copy of the old version of a patch as patch~.\n"
-"\n"
-"--sort\tSort files by their name instead of preserving the original order.\n"
-"\n"
-"--strip-trailing-whitespace\n"
-"\tStrip trailing whitespace at the end of lines.\n"
-msgstr ""
-
-#: quilt/refresh.in:173
-msgid ""
-"Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n"
-msgstr ""
-
-#: quilt/refresh.in:207
-msgid ""
-"More recent patches modify files in patch %s. Enforce refresh with -f.\\n"
-msgstr ""
-
-#: quilt/refresh.in:213
-msgid ""
-"Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n"
-msgstr ""
-
-#: quilt/refresh.in:219
-msgid "Nothing in patch %s\\n"
-msgstr ""
-
-#: quilt/refresh.in:296
-msgid "Patch %s is unchanged\\n"
-msgstr ""
-
-#: quilt/refresh.in:301
-msgid "Refreshed patch %s\\n"
-msgstr ""
-
-#: quilt/remove.in:22
-msgid "Usage: quilt remove [-p patch] {file} ...\\n"
-msgstr ""
-
-#: quilt/remove.in:25
-msgid ""
-"\n"
-"Remove one or more files from the topmost or named patch.  Files that\n"
-"are modified by patches on top of the specified patch cannot be removed.\n"
-"\n"
-"-p patch\n"
-"\tPatch to remove files from.\n"
-msgstr ""
-
-#: quilt/remove.in:91
-msgid "File %s is not in patch %s\\n"
-msgstr ""
-
-#: quilt/remove.in:109
-msgid "Failed to remove file %s from patch %s\\n"
-msgstr ""
-
-#: quilt/remove.in:123
-msgid "File %s removed from patch %s\\n"
-msgstr ""
-
-#: quilt/rename.in:22
-msgid "Usage: quilt rename [-p patch] new_name\\n"
-msgstr ""
-
-#: quilt/rename.in:25
-msgid ""
-"\n"
-"Rename the topmost or named patch.\n"
-"\n"
-"-p patch\n"
-"\tPatch to rename.\n"
-msgstr ""
-
-#: quilt/rename.in:96
-msgid "Patch %s exists already, please choose a different name\\n"
-msgstr ""
-
-#: quilt/rename.in:110
-msgid "Renaming of patch %s to %s failed\\n"
-msgstr ""
-
-#: quilt/rename.in:116
-msgid "Patch %s renamed to %s\\n"
-msgstr ""
-
-#: quilt/series.in:22
-msgid "Usage: quilt series [-v]\\n"
-msgstr ""
-
-#: quilt/series.in:25
-msgid ""
-"\n"
-"Print the names of all patches in the series file.\n"
-"\n"
-"-v\tVerbose, more user friendly output.\n"
-msgstr ""
-
-#: quilt/setup.in:27
-msgid "Usage: quilt setup [-d path-prefix] [-v] {specfile|seriesfile}\\n"
-msgstr ""
-
-#: quilt/setup.in:30
-msgid ""
-"\n"
-"Initializes a source tree from an rpm spec file or a quilt series file.\n"
-"\n"
-"-d\toptional path prefix (sub-directory).\n"
-"\n"
-"-v\tverbose debug output.\n"
-msgstr ""
-
-#: quilt/setup.in:96
-msgid "Directory %s exists\\n"
-msgstr ""
-
-#: quilt/setup.in:102
-msgid "File %s exists\\n"
-msgstr ""
-
-#: quilt/setup.in:118
-msgid "The %%prep section of %s failed; results may be incomplete\\n"
-msgstr ""
-
-#: quilt/setup.in:121
-msgid "The -v option will show rpm's output\\n"
-msgstr ""
-
-#: quilt/setup.in:155
-msgid "Unpacking archive %s\\n"
-msgstr ""
-
-#: quilt/snapshot.in:22
-msgid "Usage: quilt snapshot [-d]\\n"
-msgstr ""
-
-#: quilt/snapshot.in:25
-msgid ""
-"\n"
-"Take a snapshot of the current working state.  After taking the snapshot,\n"
-"the tree can be modified in the usual ways, including pushing and\n"
-"popping patches.  A diff against the tree at the moment of the\n"
-"snapshot can be generated with \\`quilt diff --snapshot'.\n"
-"\n"
-"-d\tOnly remove current snapshot.\n"
-msgstr ""
-
-#: quilt/top.in:22
-msgid "Usage: quilt top\\n"
-msgstr ""
-
-#: quilt/top.in:25
-msgid ""
-"\n"
-"Print the name of the topmost patch on the current stack of applied\n"
-"patches.\n"
-msgstr ""
-
-#: quilt/unapplied.in:22
-msgid "Usage: quilt unapplied [patch]\\n"
-msgstr ""
-
-#: quilt/unapplied.in:25
-msgid ""
-"\n"
-"Print a list of patches that are not applied, or all patches that follow\n"
-"the specified patch in the series file.\n"
-msgstr ""
-
-#: quilt/upgrade.in:25
-msgid "Usage: quilt upgrade\\n"
-msgstr ""
-
-#: quilt/upgrade.in:28
-msgid ""
-"\n"
-"Upgrade the meta-data in a working tree from an old version of quilt to the\n"
-"current version. This command is only needed when the quilt meta-data "
-"format\n"
-"has changed, and the working tree still contains old-format meta-data. In "
-"that\n"
-"case, quilt will request to run \\`quilt upgrade'.\n"
-msgstr ""
-
-#: quilt/upgrade.in:67
-msgid ""
-"The quilt meta-data in %s are already in the version %s format; nothing to "
-"do\\n"
-msgstr ""
-
-#: quilt/upgrade.in:71
-msgid "Converting meta-data to version %s\\n"
-msgstr ""
-
-#: quilt/upgrade.in:102
-msgid "Conversion failed\\n"
-msgstr ""
-
-#: quilt/upgrade.in:103
-msgid ""
-"\n"
-"Please remove all patches using \\`quilt pop -a' from the quilt version used "
-"to create this working tree, or remove the %s directory and apply the "
-"patches from scratch.\\n"
-msgstr ""
-
-#: scripts/edmail.in:81
-#, perl-format
-msgid "Display name '%s' contains unpaired parentheses\n"
-msgstr ""
-
-#: scripts/edmail.in:85
-#, perl-format
-msgid "Display name '%s' contains invalid characters\n"
-msgstr ""
-
-#: scripts/edmail.in:89
-#, perl-format
-msgid "Display name '%s' contains non-printable or 8-bit characters\n"
-msgstr ""
-
-#: scripts/edmail.in:95
-#, perl-format
-msgid "Delivery address '%s' is invalid\n"
-msgstr ""
-
-#: scripts/parse-patch.in:50
-#, perl-format
-msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
-msgstr ""
-
-#: scripts/parse-patch.in:97 scripts/parse-patch.in:104
-#, perl-format
-msgid "File %s disappeared!\n"
-msgstr ""
-
-#: scripts/parse-patch.in:150 scripts/parse-patch.in:156
-#, perl-format
-msgid "Failed to rename %s to %s: %s\n"
-msgstr ""
-
-#: scripts/patchfns.in:732
-msgid ""
-"The quilt meta-data in this tree has version %s, but this version of quilt "
-"can only handle meta-data formats up to and including version %s. Please pop "
-"all the patches using the version of quilt used to push them before "
-"downgrading.\\n"
-msgstr ""
-
-#: scripts/patchfns.in:809
-msgid ""
-"The working tree was created by an older version of quilt. Please run 'quilt "
-"upgrade'.\\n"
-msgstr ""
-
-#: scripts/remove-trailing-ws.in:43
-#, perl-format
-msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n"
-msgstr ""
-
-#: scripts/remove-trailing-ws.in:65 scripts/remove-trailing-ws.in:92
-#, perl-format
-msgid "%s: I'm confused.\n"
-msgstr ""
-
-#: scripts/remove-trailing-ws.in:113
-#, perl-format
-msgid "Warning: trailing whitespace in line %s of %s\n"
-msgstr ""
-
-#: scripts/remove-trailing-ws.in:116
-#, perl-format
-msgid "Warning: trailing whitespace in lines %s of %s\n"
-msgstr ""
-
-#: scripts/remove-trailing-ws.in:120
-#, perl-format
-msgid "Removing trailing whitespace from line %s of %s\n"
-msgstr ""
-
-#: scripts/remove-trailing-ws.in:123
-#, perl-format
-msgid "Removing trailing whitespace from lines %s of %s\n"
-msgstr ""
-
-#: scripts/remove-trailing-ws.in:143
-#, perl-format
-msgid "Renaming %s to %s: %s\n"
-msgstr ""
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/quota.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/quota.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/quota.po	2014-02-24 08:24:34.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/quota.po	2014-03-24 09:42:41.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:49+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:04+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: bylabel.c:253
 #, c-format
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/recode.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/recode.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/recode.po	2014-02-24 08:24:32.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/recode.po	2014-03-24 09:42:39.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:40+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 11:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "X-Poedit-Basepath: z:\\recode-3.6\n"
 
 #: src/main.c:142
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/remote-login-service.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/remote-login-service.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/remote-login-service.po	2014-02-24 08:24:49.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/remote-login-service.po	2014-03-24 09:42:56.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:50+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 14:35+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: ../data/remote-login-service.conf.in.h:1
 msgid "Remote Login"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/rpm.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/rpm.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/rpm.po	2014-02-24 08:24:32.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/rpm.po	2014-03-24 09:42:39.000000000 +0000
@@ -21,8 +21,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 11:53+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: cliutils.c:21 lib/poptI.c:29
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/rrdtool.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/rrdtool.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/rrdtool.po	2014-02-24 08:24:32.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/rrdtool.po	2014-03-24 09:42:39.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 11:53+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: src/rrd_getopt.c:624
 #, c-format
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/sane-backends.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/sane-backends.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/sane-backends.po	2014-02-24 08:24:32.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/sane-backends.po	2014-03-24 09:42:39.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 11:54+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: ../include/sane/saneopts.h:154
 #, no-c-format
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/screen-resolution-extra.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/screen-resolution-extra.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/screen-resolution-extra.po	2014-02-24 08:24:44.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/screen-resolution-extra.po	2014-03-24 09:42:51.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:10+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:43+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: ../ScreenResolution/ui.py:60
 msgid ""
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/sed.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/sed.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/sed.po	2014-02-24 08:24:34.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/sed.po	2014-03-24 09:42:41.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:51+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:07+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: sed/compile.c:144
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/shared-mime-info.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/shared-mime-info.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/shared-mime-info.po	2014-02-24 08:24:34.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/shared-mime-info.po	2014-03-24 09:42:41.000000000 +0000
@@ -9,15 +9,15 @@
 msgstr ""
 "Project-Id-Version: shared-mime-info\n"
 "Report-Msgid-Bugs-To: http://bugzilla.freedesktop.org/\n"
-"POT-Creation-Date: 2014-02-17 21:25+0000\n"
+"POT-Creation-Date: 2014-02-28 15:50+0000\n"
 "PO-Revision-Date: 2013-02-26 00:15+0000\n"
 "Last-Translator: lovenemesis <Unknown>\n"
 "Language-Team: Chinese (China) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:52+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:07+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: ../freedesktop.org.xml.in.h:1
@@ -1131,1637 +1131,1641 @@
 msgstr "Ogg FLAC 音频"
 
 #: ../freedesktop.org.xml.in.h:283
+msgid "Opus audio"
+msgstr ""
+
+#: ../freedesktop.org.xml.in.h:284
 msgid "Ogg Speex audio"
 msgstr "Ogg Speex 音频"
 
-#: ../freedesktop.org.xml.in.h:284
+#: ../freedesktop.org.xml.in.h:285
 msgid "Speex audio"
 msgstr "Speex 音频"
 
-#: ../freedesktop.org.xml.in.h:285
+#: ../freedesktop.org.xml.in.h:286
 msgid "Ogg Theora video"
 msgstr "Ogg Theora 视频"
 
-#: ../freedesktop.org.xml.in.h:286
+#: ../freedesktop.org.xml.in.h:287
 msgid "OGM video"
 msgstr "OGM 视频"
 
-#: ../freedesktop.org.xml.in.h:287
+#: ../freedesktop.org.xml.in.h:288
 msgid "OLE2 compound document storage"
 msgstr "OLE2 组合文档存储"
 
-#: ../freedesktop.org.xml.in.h:288
+#: ../freedesktop.org.xml.in.h:289
 msgid "Microsoft Publisher document"
 msgstr ""
 
-#: ../freedesktop.org.xml.in.h:289
+#: ../freedesktop.org.xml.in.h:290
 msgid "Windows Installer package"
 msgstr "Windows 程序安装包"
 
-#: ../freedesktop.org.xml.in.h:290
+#: ../freedesktop.org.xml.in.h:291
 msgid "GNU Oleo spreadsheet"
 msgstr "GNU Oleo 工作簿"
 
-#: ../freedesktop.org.xml.in.h:291
+#: ../freedesktop.org.xml.in.h:292
 msgid "PAK archive"
 msgstr "AR 归档文件"
 
-#: ../freedesktop.org.xml.in.h:292
+#: ../freedesktop.org.xml.in.h:293
 msgid "Palm OS database"
 msgstr "Palm OS 数据库"
 
-#: ../freedesktop.org.xml.in.h:293
+#: ../freedesktop.org.xml.in.h:294
 msgid "Parchive archive"
 msgstr "Parchive 归档文件"
 
-#: ../freedesktop.org.xml.in.h:294
+#: ../freedesktop.org.xml.in.h:295
 msgid "PEF executable"
 msgstr "PEF 可执行文件"
 
-#: ../freedesktop.org.xml.in.h:295
+#: ../freedesktop.org.xml.in.h:296
 msgid "Perl script"
 msgstr "Perl 脚本"
 
-#: ../freedesktop.org.xml.in.h:296
+#: ../freedesktop.org.xml.in.h:297
 msgid "PHP script"
 msgstr "PHP 脚本"
 
-#: ../freedesktop.org.xml.in.h:297
+#: ../freedesktop.org.xml.in.h:298
 msgid "PKCS#7 certificate bundle"
 msgstr "PKCS#7 证书束"
 
-#: ../freedesktop.org.xml.in.h:298
+#: ../freedesktop.org.xml.in.h:299
 msgid "PKCS#12 certificate bundle"
 msgstr "PKCS#12 证书束"
 
-#: ../freedesktop.org.xml.in.h:299
+#: ../freedesktop.org.xml.in.h:300
 msgid "PlanPerfect spreadsheet"
 msgstr "PlanPerfect 工作簿"
 
-#: ../freedesktop.org.xml.in.h:300
+#: ../freedesktop.org.xml.in.h:301
 msgid "Pocket Word document"
 msgstr "Pocket Word 文档"
 
-#: ../freedesktop.org.xml.in.h:301
+#: ../freedesktop.org.xml.in.h:302
 msgid "Linear and integer program expression format"
 msgstr "线性和整数规划的表达格式"
 
-#: ../freedesktop.org.xml.in.h:302
+#: ../freedesktop.org.xml.in.h:303
 msgid "profiler results"
 msgstr "profiler 结果"
 
-#: ../freedesktop.org.xml.in.h:303
+#: ../freedesktop.org.xml.in.h:304
 msgid "Pathetic Writer document"
 msgstr "Pathetic Writer 文档"
 
-#: ../freedesktop.org.xml.in.h:304
+#: ../freedesktop.org.xml.in.h:305
 msgid "Python bytecode"
 msgstr "Python 字节码"
 
-#: ../freedesktop.org.xml.in.h:305
+#: ../freedesktop.org.xml.in.h:306
 msgid "QtiPlot document"
 msgstr ""
 
-#: ../freedesktop.org.xml.in.h:306
+#: ../freedesktop.org.xml.in.h:307
 msgid "Quattro Pro spreadsheet"
 msgstr "Quattro Pro 工作簿"
 
-#: ../freedesktop.org.xml.in.h:307
+#: ../freedesktop.org.xml.in.h:308
 msgid "QuickTime metalink playlist"
 msgstr "QuickTime 元链接播放列表"
 
-#: ../freedesktop.org.xml.in.h:308
+#: ../freedesktop.org.xml.in.h:309
 msgid "Quicken document"
 msgstr "Quicken 文档"
 
-#: ../freedesktop.org.xml.in.h:309
+#: ../freedesktop.org.xml.in.h:310
 msgid "RAR archive"
 msgstr "RAR 归档文件"
 
-#: ../freedesktop.org.xml.in.h:310
+#: ../freedesktop.org.xml.in.h:311
 msgid "DAR archive"
 msgstr "DAR 归档文件"
 
-#: ../freedesktop.org.xml.in.h:311
+#: ../freedesktop.org.xml.in.h:312
 msgid "Alzip archive"
 msgstr "Alzip 归档文件"
 
-#: ../freedesktop.org.xml.in.h:312
+#: ../freedesktop.org.xml.in.h:313
 msgid "rejected patch"
 msgstr "拒绝的补丁"
 
-#: ../freedesktop.org.xml.in.h:313
+#: ../freedesktop.org.xml.in.h:314
 msgid "RPM package"
 msgstr "RPM 软件包"
 
-#: ../freedesktop.org.xml.in.h:314
+#: ../freedesktop.org.xml.in.h:315
 msgid "Source RPM package"
 msgstr ""
 
-#: ../freedesktop.org.xml.in.h:315
+#: ../freedesktop.org.xml.in.h:316
 msgid "Ruby script"
 msgstr "Ruby 脚本"
 
-#: ../freedesktop.org.xml.in.h:316
+#: ../freedesktop.org.xml.in.h:317
 msgid "Markaby script"
 msgstr "RMarkaby 脚本"
 
-#: ../freedesktop.org.xml.in.h:317
+#: ../freedesktop.org.xml.in.h:318
 msgid "SC/Xspread spreadsheet"
 msgstr "SC/Xspread 工作簿"
 
-#: ../freedesktop.org.xml.in.h:318
+#: ../freedesktop.org.xml.in.h:319
 msgid "shell archive"
 msgstr "shell 归档文件"
 
-#: ../freedesktop.org.xml.in.h:319
+#: ../freedesktop.org.xml.in.h:320
 msgid "libtool shared library"
 msgstr "libtool 共享库"
 
-#: ../freedesktop.org.xml.in.h:320
+#: ../freedesktop.org.xml.in.h:321
 msgid "shared library"
 msgstr "共享库"
 
-#: ../freedesktop.org.xml.in.h:321
+#: ../freedesktop.org.xml.in.h:322
 msgid "shell script"
 msgstr "shell 脚本"
 
-#: ../freedesktop.org.xml.in.h:322
+#: ../freedesktop.org.xml.in.h:323
 msgid "Shockwave Flash file"
 msgstr "Shockwave Flash 文件"
 
 #. translators: "Shorten" is the name of an audio codec
-#: ../freedesktop.org.xml.in.h:324
+#: ../freedesktop.org.xml.in.h:325
 msgid "Shorten audio"
 msgstr "Shorten 音频"
 
-#: ../freedesktop.org.xml.in.h:325
+#: ../freedesktop.org.xml.in.h:326
 msgid "Siag spreadsheet"
 msgstr "Siag 工作簿"
 
-#: ../freedesktop.org.xml.in.h:326
+#: ../freedesktop.org.xml.in.h:327
 msgid "Skencil document"
 msgstr "Skencil 文档"
 
-#: ../freedesktop.org.xml.in.h:327
+#: ../freedesktop.org.xml.in.h:328
 msgid "Stampede package"
 msgstr "Stampede 软件包"
 
-#: ../freedesktop.org.xml.in.h:328
+#: ../freedesktop.org.xml.in.h:329
 msgid "Sega Master System/Game Gear ROM"
 msgstr "Sega Master System/Game Gear ROM"
 
 #. Translate this as Super Famicom (in Far East Asia) or Super Nintendo (in Europe) if the console was known as such in your locale
-#: ../freedesktop.org.xml.in.h:330
+#: ../freedesktop.org.xml.in.h:331
 msgid "Super NES ROM"
 msgstr "Super NES ROM"
 
-#: ../freedesktop.org.xml.in.h:331
+#: ../freedesktop.org.xml.in.h:332
 msgid "StuffIt archive"
 msgstr "Macintosh StuffIt 归档文件"
 
-#: ../freedesktop.org.xml.in.h:332
+#: ../freedesktop.org.xml.in.h:333
 msgid "SubRip subtitles"
 msgstr "SubRip 字幕"
 
-#: ../freedesktop.org.xml.in.h:333
+#: ../freedesktop.org.xml.in.h:334
 msgid "WebVTT subtitles"
 msgstr "WebVTT 字幕"
 
-#: ../freedesktop.org.xml.in.h:334
+#: ../freedesktop.org.xml.in.h:335
 msgid "SAMI subtitles"
 msgstr "SAMI 字幕"
 
-#: ../freedesktop.org.xml.in.h:335
+#: ../freedesktop.org.xml.in.h:336
 msgid "MicroDVD subtitles"
 msgstr "MicroDVD 字幕"
 
-#: ../freedesktop.org.xml.in.h:336
+#: ../freedesktop.org.xml.in.h:337
 msgid "MPSub subtitles"
 msgstr "MPSub 字幕"
 
-#: ../freedesktop.org.xml.in.h:337
+#: ../freedesktop.org.xml.in.h:338
 msgid "SSA subtitles"
 msgstr "SSA 字幕"
 
-#: ../freedesktop.org.xml.in.h:338
+#: ../freedesktop.org.xml.in.h:339
 msgid "SubViewer subtitles"
 msgstr "SubViewer 字幕"
 
-#: ../freedesktop.org.xml.in.h:339
+#: ../freedesktop.org.xml.in.h:340
 msgid "iMelody ringtone"
 msgstr "iMelody 铃声"
 
-#: ../freedesktop.org.xml.in.h:340
+#: ../freedesktop.org.xml.in.h:341
 msgid "SMAF audio"
 msgstr "SMAF 音频"
 
-#: ../freedesktop.org.xml.in.h:341
+#: ../freedesktop.org.xml.in.h:342
 msgid "MRML playlist"
 msgstr "MRML 播放列表"
 
-#: ../freedesktop.org.xml.in.h:342
+#: ../freedesktop.org.xml.in.h:343
 msgid "XMF audio"
 msgstr "XMF 音频"
 
-#: ../freedesktop.org.xml.in.h:343
+#: ../freedesktop.org.xml.in.h:344
 msgid "SV4 CPIO archive"
 msgstr "SV4 CPIO 归档文件"
 
-#: ../freedesktop.org.xml.in.h:344
+#: ../freedesktop.org.xml.in.h:345
 msgid "SV4 CPIO archive (with CRC)"
 msgstr "SV4 CPIP 归档文件(带有 CRC)"
 
-#: ../freedesktop.org.xml.in.h:345
+#: ../freedesktop.org.xml.in.h:346
 msgid "Tar archive"
 msgstr "Tar 归档文件"
 
-#: ../freedesktop.org.xml.in.h:346
+#: ../freedesktop.org.xml.in.h:347
 msgid "Tar archive (compressed)"
 msgstr "Tar 归档文件(压缩)"
 
-#: ../freedesktop.org.xml.in.h:347
+#: ../freedesktop.org.xml.in.h:348
 msgid "generic font file"
 msgstr "通用字体文件"
 
-#: ../freedesktop.org.xml.in.h:348
+#: ../freedesktop.org.xml.in.h:349
 msgid "packed font file"
 msgstr "打包的字体文件"
 
-#: ../freedesktop.org.xml.in.h:349
+#: ../freedesktop.org.xml.in.h:350
 msgid "TGIF document"
 msgstr "TGIF 文档"
 
-#: ../freedesktop.org.xml.in.h:350
+#: ../freedesktop.org.xml.in.h:351
 msgid "theme"
 msgstr "主题"
 
-#: ../freedesktop.org.xml.in.h:351
+#: ../freedesktop.org.xml.in.h:352
 msgid "ToutDoux document"
 msgstr "ToutDoux 文档"
 
-#: ../freedesktop.org.xml.in.h:352
+#: ../freedesktop.org.xml.in.h:353
 msgid "backup file"
 msgstr "备份文件"
 
-#: ../freedesktop.org.xml.in.h:353
+#: ../freedesktop.org.xml.in.h:354
 msgid "Troff document"
 msgstr "Troff 文档"
 
-#: ../freedesktop.org.xml.in.h:354
+#: ../freedesktop.org.xml.in.h:355
 msgid "Troff document (with manpage macros)"
 msgstr "Troff 文档(带 Man 手册宏)"
 
-#: ../freedesktop.org.xml.in.h:355
+#: ../freedesktop.org.xml.in.h:356
 msgid "manual page (compressed)"
 msgstr "手册页 (压缩)"
 
-#: ../freedesktop.org.xml.in.h:356
+#: ../freedesktop.org.xml.in.h:357
 msgid "Tar archive (LZO-compressed)"
 msgstr "Tar 归档文件(LZO 压缩)"
 
-#: ../freedesktop.org.xml.in.h:357
+#: ../freedesktop.org.xml.in.h:358
 msgid "XZ archive"
 msgstr "XZ 归档文件"
 
-#: ../freedesktop.org.xml.in.h:358
+#: ../freedesktop.org.xml.in.h:359
 msgid "Tar archive (XZ-compressed)"
 msgstr "Tar 归档文件(XZ 压缩)"
 
-#: ../freedesktop.org.xml.in.h:359
+#: ../freedesktop.org.xml.in.h:360
 msgid "PDF document (XZ-compressed)"
 msgstr "PDF 文档(XZ)"
 
-#: ../freedesktop.org.xml.in.h:360
+#: ../freedesktop.org.xml.in.h:361
 msgid "Ustar archive"
 msgstr "Ustar 归档文件"
 
-#: ../freedesktop.org.xml.in.h:361
+#: ../freedesktop.org.xml.in.h:362
 msgid "WAIS source code"
 msgstr "WAIS 源代码"
 
-#: ../freedesktop.org.xml.in.h:362
+#: ../freedesktop.org.xml.in.h:363
 msgid "WordPerfect/Drawperfect image"
 msgstr "WordPerfect/Drawperfect 图像"
 
-#: ../freedesktop.org.xml.in.h:363
+#: ../freedesktop.org.xml.in.h:364
 msgid "DER/PEM/Netscape-encoded X.509 certificate"
 msgstr "DER/PEM/Netscape-encoded X.509 证书"
 
-#: ../freedesktop.org.xml.in.h:364
+#: ../freedesktop.org.xml.in.h:365
 msgid "empty document"
 msgstr "空文档"
 
-#: ../freedesktop.org.xml.in.h:365
+#: ../freedesktop.org.xml.in.h:366
 msgid "Zoo archive"
 msgstr "Zoo 归档文件"
 
-#: ../freedesktop.org.xml.in.h:366
+#: ../freedesktop.org.xml.in.h:367
 msgid "XHTML page"
 msgstr "XHTML 页面"
 
-#: ../freedesktop.org.xml.in.h:367
+#: ../freedesktop.org.xml.in.h:368
 msgid "Zip archive"
 msgstr "Zip 归档文件"
 
-#: ../freedesktop.org.xml.in.h:368
+#: ../freedesktop.org.xml.in.h:369
 msgid "Windows Imaging Format Disk Image"
 msgstr "Windows Imaging 格式磁盘镜像"
 
-#: ../freedesktop.org.xml.in.h:369
+#: ../freedesktop.org.xml.in.h:370
 msgid "Dolby Digital audio"
 msgstr "杜比数字音频"
 
-#: ../freedesktop.org.xml.in.h:370
+#: ../freedesktop.org.xml.in.h:371
 msgid "DTS audio"
 msgstr ""
 
-#: ../freedesktop.org.xml.in.h:371
+#: ../freedesktop.org.xml.in.h:372
 msgid "DTSHD audio"
 msgstr ""
 
-#: ../freedesktop.org.xml.in.h:372
+#: ../freedesktop.org.xml.in.h:373
 msgid "AMR audio"
 msgstr "AMR 音频"
 
-#: ../freedesktop.org.xml.in.h:373
+#: ../freedesktop.org.xml.in.h:374
 msgid "AMR-WB audio"
 msgstr "AMR-WB 音频"
 
-#: ../freedesktop.org.xml.in.h:374
+#: ../freedesktop.org.xml.in.h:375
 msgid "ULAW (Sun) audio"
 msgstr "ULAW (Sun) 音频"
 
-#: ../freedesktop.org.xml.in.h:375
+#: ../freedesktop.org.xml.in.h:376
 msgid "Commodore 64 audio"
 msgstr "Commodore 64 音频"
 
-#: ../freedesktop.org.xml.in.h:376
+#: ../freedesktop.org.xml.in.h:377
 msgid "PCM audio"
 msgstr "PCM 音频"
 
-#: ../freedesktop.org.xml.in.h:377
+#: ../freedesktop.org.xml.in.h:378
 msgid "AIFC audio"
 msgstr "AIFC 音频"
 
-#: ../freedesktop.org.xml.in.h:378
+#: ../freedesktop.org.xml.in.h:379
 msgid "AIFF/Amiga/Mac audio"
 msgstr "AIFF/Amiga/Mac 音频"
 
-#: ../freedesktop.org.xml.in.h:379
+#: ../freedesktop.org.xml.in.h:380
 msgid "Monkey's audio"
 msgstr "Monkey's audio 音频"
 
-#: ../freedesktop.org.xml.in.h:380
+#: ../freedesktop.org.xml.in.h:381
 msgid "Impulse Tracker audio"
 msgstr "Impulse Tracker 音频"
 
-#: ../freedesktop.org.xml.in.h:381
+#: ../freedesktop.org.xml.in.h:382
 msgid "FLAC audio"
 msgstr "FLAC 音频"
 
-#: ../freedesktop.org.xml.in.h:382
+#: ../freedesktop.org.xml.in.h:383
 msgid "WavPack audio"
 msgstr "WavPack 音频"
 
-#: ../freedesktop.org.xml.in.h:383
+#: ../freedesktop.org.xml.in.h:384
 msgid "WavPack audio correction file"
 msgstr "WavPack 音频校正文档"
 
-#: ../freedesktop.org.xml.in.h:384
+#: ../freedesktop.org.xml.in.h:385
 msgid "MIDI audio"
 msgstr "MIDI 音频"
 
-#: ../freedesktop.org.xml.in.h:385
+#: ../freedesktop.org.xml.in.h:386
 msgid "compressed Tracker audio"
 msgstr "压缩的 Tracker 音频"
 
-#: ../freedesktop.org.xml.in.h:386
+#: ../freedesktop.org.xml.in.h:387
 msgid "AAC audio"
 msgstr ""
 
-#: ../freedesktop.org.xml.in.h:387
+#: ../freedesktop.org.xml.in.h:388
 msgid "MPEG-4 audio"
 msgstr "MPEG-4 音频"
 
-#: ../freedesktop.org.xml.in.h:388
+#: ../freedesktop.org.xml.in.h:389
 msgid "MPEG-4 video"
 msgstr "MPEG-4 视频"
 
-#: ../freedesktop.org.xml.in.h:389
+#: ../freedesktop.org.xml.in.h:390
 msgid "MPEG-4 audio book"
 msgstr "MPEG-4 有声书"
 
-#: ../freedesktop.org.xml.in.h:390
+#: ../freedesktop.org.xml.in.h:391
 msgid "3GPP multimedia file"
 msgstr "3GPP 多媒体文件"
 
-#: ../freedesktop.org.xml.in.h:391
+#: ../freedesktop.org.xml.in.h:392
 msgid "3GPP2 multimedia file"
 msgstr "3GPP2 多媒体文件"
 
-#: ../freedesktop.org.xml.in.h:392
+#: ../freedesktop.org.xml.in.h:393
 msgid "Amiga SoundTracker audio"
 msgstr "Amiga SoundTracker 音频"
 
-#: ../freedesktop.org.xml.in.h:393
+#: ../freedesktop.org.xml.in.h:394
 msgid "MP2 audio"
 msgstr "MP2 音频"
 
-#: ../freedesktop.org.xml.in.h:394
+#: ../freedesktop.org.xml.in.h:395
 msgid "MP3 audio"
 msgstr "MP3 音频"
 
-#: ../freedesktop.org.xml.in.h:395
+#: ../freedesktop.org.xml.in.h:396
 msgid "MP3 audio (streamed)"
 msgstr "MP3 流音频"
 
-#: ../freedesktop.org.xml.in.h:396
+#: ../freedesktop.org.xml.in.h:397
 msgid "HTTP Live Streaming playlist"
 msgstr "HTTP 直播流播放列表"
 
-#: ../freedesktop.org.xml.in.h:397
+#: ../freedesktop.org.xml.in.h:398
 msgid "Microsoft ASX playlist"
 msgstr "Microsoft ASX 播放列表"
 
-#: ../freedesktop.org.xml.in.h:398
+#: ../freedesktop.org.xml.in.h:399
 msgid "PSF audio"
 msgstr "PSF 音频"
 
-#: ../freedesktop.org.xml.in.h:399
+#: ../freedesktop.org.xml.in.h:400
 msgid "MiniPSF audio"
 msgstr "MiniPSF 音频"
 
-#: ../freedesktop.org.xml.in.h:400
+#: ../freedesktop.org.xml.in.h:401
 msgid "PSFlib audio library"
 msgstr "PSFlib 音频库文件"
 
-#: ../freedesktop.org.xml.in.h:401
+#: ../freedesktop.org.xml.in.h:402
 msgid "Windows Media audio"
 msgstr "Windows Media 音频"
 
-#: ../freedesktop.org.xml.in.h:402
+#: ../freedesktop.org.xml.in.h:403
 msgid "Musepack audio"
 msgstr "Musepack 音频"
 
-#: ../freedesktop.org.xml.in.h:403
+#: ../freedesktop.org.xml.in.h:404
 msgid "RealAudio document"
 msgstr "RealAudio 文档"
 
-#: ../freedesktop.org.xml.in.h:404
+#: ../freedesktop.org.xml.in.h:405
 msgid "RealMedia Metafile"
 msgstr "RealMedia 元文件"
 
-#: ../freedesktop.org.xml.in.h:405
+#: ../freedesktop.org.xml.in.h:406
 msgid "RealVideo document"
 msgstr "RealAudio 文档"
 
-#: ../freedesktop.org.xml.in.h:406
+#: ../freedesktop.org.xml.in.h:407
 msgid "RealMedia document"
 msgstr "RealMedia 文档"
 
-#: ../freedesktop.org.xml.in.h:407
+#: ../freedesktop.org.xml.in.h:408
 msgid "RealPix document"
 msgstr "RealPix 文档"
 
-#: ../freedesktop.org.xml.in.h:408
+#: ../freedesktop.org.xml.in.h:409
 msgid "RealText document"
 msgstr "RealText 文档"
 
-#: ../freedesktop.org.xml.in.h:409
+#: ../freedesktop.org.xml.in.h:410
 msgid "RIFF audio"
 msgstr "RIFF 音频"
 
-#: ../freedesktop.org.xml.in.h:410
+#: ../freedesktop.org.xml.in.h:411
 msgid "Scream Tracker 3 audio"
 msgstr "Scheme Tracker 3 音频"
 
-#: ../freedesktop.org.xml.in.h:411
+#: ../freedesktop.org.xml.in.h:412
 msgid "MP3 ShoutCast playlist"
 msgstr "MP3 ShoutCast 播放列表"
 
-#: ../freedesktop.org.xml.in.h:412
+#: ../freedesktop.org.xml.in.h:413
 msgid "Scream Tracker audio"
 msgstr "Scream Tracker 音频"
 
-#: ../freedesktop.org.xml.in.h:413
+#: ../freedesktop.org.xml.in.h:414
 msgid "VOC audio"
 msgstr "VOC 音频"
 
-#: ../freedesktop.org.xml.in.h:414
+#: ../freedesktop.org.xml.in.h:415
 msgid "WAV audio"
 msgstr "WAV 音频"
 
-#: ../freedesktop.org.xml.in.h:415
+#: ../freedesktop.org.xml.in.h:416
 msgid "Scream Tracker instrument"
 msgstr "Scream Tracker 乐器"
 
-#: ../freedesktop.org.xml.in.h:416
+#: ../freedesktop.org.xml.in.h:417
 msgid "FastTracker II audio"
 msgstr "FastTracker II 音频"
 
-#: ../freedesktop.org.xml.in.h:417
+#: ../freedesktop.org.xml.in.h:418
 msgid "TrueAudio audio"
 msgstr "TrueAudio 音频"
 
-#: ../freedesktop.org.xml.in.h:418
+#: ../freedesktop.org.xml.in.h:419
 msgid "Windows BMP image"
 msgstr "Windows BMP 图像"
 
-#: ../freedesktop.org.xml.in.h:419
+#: ../freedesktop.org.xml.in.h:420
 msgid "WBMP image"
 msgstr "WBMP 图像"
 
-#: ../freedesktop.org.xml.in.h:420
+#: ../freedesktop.org.xml.in.h:421
 msgid "Computer Graphics Metafile"
 msgstr "CGM 计算机图像元文件"
 
-#: ../freedesktop.org.xml.in.h:421
+#: ../freedesktop.org.xml.in.h:422
 msgid "CCITT G3 fax"
 msgstr "CCITT G3 传真"
 
-#: ../freedesktop.org.xml.in.h:422
+#: ../freedesktop.org.xml.in.h:423
 msgid "G3 fax image"
 msgstr "G3 传真文档"
 
-#: ../freedesktop.org.xml.in.h:423
+#: ../freedesktop.org.xml.in.h:424
 msgid "GIF image"
 msgstr "GIF 图像"
 
-#: ../freedesktop.org.xml.in.h:424
+#: ../freedesktop.org.xml.in.h:425
 msgid "IEF image"
 msgstr "IEF 图像"
 
-#: ../freedesktop.org.xml.in.h:425
+#: ../freedesktop.org.xml.in.h:426
 msgid "JPEG image"
 msgstr "JPEG 图像"
 
-#: ../freedesktop.org.xml.in.h:426
+#: ../freedesktop.org.xml.in.h:427
 msgid "JPEG-2000 image"
 msgstr "JPEG-2000 图像"
 
-#: ../freedesktop.org.xml.in.h:427
+#: ../freedesktop.org.xml.in.h:428
 msgid "OpenRaster archiving image"
 msgstr "OpenRaster 归档映像"
 
-#: ../freedesktop.org.xml.in.h:428
+#: ../freedesktop.org.xml.in.h:429
 msgid "DirectDraw surface"
 msgstr "DirectDraw 表面"
 
-#: ../freedesktop.org.xml.in.h:429
+#: ../freedesktop.org.xml.in.h:430
 msgid "X11 cursor"
 msgstr "X11 指针"
 
-#: ../freedesktop.org.xml.in.h:430
+#: ../freedesktop.org.xml.in.h:431
 msgid "EXR image"
 msgstr "EXR 图像"
 
-#: ../freedesktop.org.xml.in.h:431
+#: ../freedesktop.org.xml.in.h:432
 msgid "Macintosh Quickdraw/PICT drawing"
 msgstr "Macintosh Quickdraw/PICT 绘图"
 
-#: ../freedesktop.org.xml.in.h:432
+#: ../freedesktop.org.xml.in.h:433
 msgid "UFRaw ID image"
 msgstr "UFRaw ID 图像"
 
-#: ../freedesktop.org.xml.in.h:433
+#: ../freedesktop.org.xml.in.h:434
 msgid "digital raw image"
 msgstr "数字化原始图像"
 
-#: ../freedesktop.org.xml.in.h:434
+#: ../freedesktop.org.xml.in.h:435
 msgid "Adobe DNG negative"
 msgstr "Adobe DNG 负片"
 
-#: ../freedesktop.org.xml.in.h:435
+#: ../freedesktop.org.xml.in.h:436
 msgid "Canon CRW raw image"
 msgstr "Canon CRW 原始图像"
 
-#: ../freedesktop.org.xml.in.h:436
+#: ../freedesktop.org.xml.in.h:437
 msgid "Canon CR2 raw image"
 msgstr "Canon CR2 原始图像"
 
-#: ../freedesktop.org.xml.in.h:437
+#: ../freedesktop.org.xml.in.h:438
 msgid "Fuji RAF raw image"
 msgstr "富士RAF 原始图像"
 
-#: ../freedesktop.org.xml.in.h:438
+#: ../freedesktop.org.xml.in.h:439
 msgid "Kodak DCR raw image"
 msgstr "Kodak DCR 原始图像"
 
-#: ../freedesktop.org.xml.in.h:439
+#: ../freedesktop.org.xml.in.h:440
 msgid "Kodak K25 raw image"
 msgstr "Kodak K25 原始图像"
 
-#: ../freedesktop.org.xml.in.h:440
+#: ../freedesktop.org.xml.in.h:441
 msgid "Kodak KDC raw image"
 msgstr "Kodak KDC 原始图像"
 
-#: ../freedesktop.org.xml.in.h:441
+#: ../freedesktop.org.xml.in.h:442
 msgid "Minolta MRW raw image"
 msgstr "Minolta MRW 原始图像"
 
-#: ../freedesktop.org.xml.in.h:442
+#: ../freedesktop.org.xml.in.h:443
 msgid "Nikon NEF raw image"
 msgstr "Nikon NEF 原始图像"
 
-#: ../freedesktop.org.xml.in.h:443
+#: ../freedesktop.org.xml.in.h:444
 msgid "Olympus ORF raw image"
 msgstr "Olympus ORF 原始图像"
 
-#: ../freedesktop.org.xml.in.h:444
+#: ../freedesktop.org.xml.in.h:445
 msgid "Panasonic raw image"
 msgstr "Panasonic 原始图像"
 
-#: ../freedesktop.org.xml.in.h:445
+#: ../freedesktop.org.xml.in.h:446
 msgid "Panasonic raw2 image"
 msgstr "Panasonic raw2 图像"
 
-#: ../freedesktop.org.xml.in.h:446
+#: ../freedesktop.org.xml.in.h:447
 msgid "Pentax PEF raw image"
 msgstr "Pentax PEF 原始图像"
 
-#: ../freedesktop.org.xml.in.h:447
+#: ../freedesktop.org.xml.in.h:448
 msgid "Sigma X3F raw image"
 msgstr "Sigma X3F 原始图像"
 
-#: ../freedesktop.org.xml.in.h:448
+#: ../freedesktop.org.xml.in.h:449
 msgid "Sony SRF raw image"
 msgstr "Sony SRF 原始映像"
 
-#: ../freedesktop.org.xml.in.h:449
+#: ../freedesktop.org.xml.in.h:450
 msgid "Sony SR2 raw image"
 msgstr "Sony SR2 原始映像"
 
-#: ../freedesktop.org.xml.in.h:450
+#: ../freedesktop.org.xml.in.h:451
 msgid "Sony ARW raw image"
 msgstr "Sony ARW 原始映像"
 
-#: ../freedesktop.org.xml.in.h:451
+#: ../freedesktop.org.xml.in.h:452
 msgid "PNG image"
 msgstr "PNG 图像"
 
-#: ../freedesktop.org.xml.in.h:452
+#: ../freedesktop.org.xml.in.h:453
 msgid "Apple optimised PNG image"
 msgstr ""
 
-#: ../freedesktop.org.xml.in.h:453
+#: ../freedesktop.org.xml.in.h:454
 msgid "Run Length Encoded bitmap image"
 msgstr "游程编码位图"
 
-#: ../freedesktop.org.xml.in.h:454
+#: ../freedesktop.org.xml.in.h:455
 msgid "SVG image"
 msgstr "SVG 图像"
 
-#: ../freedesktop.org.xml.in.h:455
+#: ../freedesktop.org.xml.in.h:456
 msgid "compressed SVG image"
 msgstr "压缩的 SVG 图像"
 
-#: ../freedesktop.org.xml.in.h:456
+#: ../freedesktop.org.xml.in.h:457
 msgid "TIFF image"
 msgstr "TIFF 图像"
 
-#: ../freedesktop.org.xml.in.h:457
+#: ../freedesktop.org.xml.in.h:458
 msgid "AutoCAD image"
 msgstr "AutoCAD 图像"
 
-#: ../freedesktop.org.xml.in.h:458
+#: ../freedesktop.org.xml.in.h:459
 msgid "DXF vector image"
 msgstr "DXF 矢量图像"
 
-#: ../freedesktop.org.xml.in.h:459
+#: ../freedesktop.org.xml.in.h:460
 msgid "Microsoft Document Imaging format"
 msgstr "Microsoft Document Imaging 扫描图像"
 
-#: ../freedesktop.org.xml.in.h:460
+#: ../freedesktop.org.xml.in.h:461
 msgid "3D Studio image"
 msgstr "3D Studio 图像"
 
-#: ../freedesktop.org.xml.in.h:461
+#: ../freedesktop.org.xml.in.h:462
 msgid "Applix Graphics image"
 msgstr "Applix Graphics 图像"
 
-#: ../freedesktop.org.xml.in.h:462
+#: ../freedesktop.org.xml.in.h:463
 msgid "EPS image (bzip-compressed)"
 msgstr "EPS 图像(bzip 压缩)"
 
-#: ../freedesktop.org.xml.in.h:463
+#: ../freedesktop.org.xml.in.h:464
 msgid "CMU raster image"
 msgstr "CMU 矢量图像"
 
-#: ../freedesktop.org.xml.in.h:464
+#: ../freedesktop.org.xml.in.h:465
 msgid "compressed GIMP image"
 msgstr "压缩的 GIMP 图像"
 
-#: ../freedesktop.org.xml.in.h:465
+#: ../freedesktop.org.xml.in.h:466
 msgid "DICOM image"
 msgstr "DICOM 图像"
 
-#: ../freedesktop.org.xml.in.h:466
+#: ../freedesktop.org.xml.in.h:467
 msgid "DocBook document"
 msgstr "DocBook 文档"
 
-#: ../freedesktop.org.xml.in.h:467
+#: ../freedesktop.org.xml.in.h:468
 msgid "DIB image"
 msgstr "DIB 图像"
 
-#: ../freedesktop.org.xml.in.h:468
+#: ../freedesktop.org.xml.in.h:469
 msgid "DjVu image"
 msgstr "DjVu 图像"
 
-#: ../freedesktop.org.xml.in.h:469
+#: ../freedesktop.org.xml.in.h:470
 msgid "DPX image"
 msgstr "DPX 图像"
 
-#: ../freedesktop.org.xml.in.h:470
+#: ../freedesktop.org.xml.in.h:471
 msgid "EPS image"
 msgstr "EPS 图像"
 
-#: ../freedesktop.org.xml.in.h:471
+#: ../freedesktop.org.xml.in.h:472
 msgid "FITS document"
 msgstr "FITS 文档"
 
-#: ../freedesktop.org.xml.in.h:472
+#: ../freedesktop.org.xml.in.h:473
 msgid "FPX image"
 msgstr "FPX 图像"
 
-#: ../freedesktop.org.xml.in.h:473
+#: ../freedesktop.org.xml.in.h:474
 msgid "EPS image (gzip-compressed)"
 msgstr "EPS 图像(gzip 压缩)"
 
-#: ../freedesktop.org.xml.in.h:474
+#: ../freedesktop.org.xml.in.h:475
 msgid "Microsoft icon"
 msgstr "Microsoft 图标"
 
-#: ../freedesktop.org.xml.in.h:475
+#: ../freedesktop.org.xml.in.h:476
 msgid "MacOS X icon"
 msgstr "MacOS X 图标"
 
-#: ../freedesktop.org.xml.in.h:476
+#: ../freedesktop.org.xml.in.h:477
 msgid "ILBM image"
 msgstr "ILBM 图像"
 
-#: ../freedesktop.org.xml.in.h:477
+#: ../freedesktop.org.xml.in.h:478
 msgid "JNG image"
 msgstr "JNG 图像"
 
-#: ../freedesktop.org.xml.in.h:478
+#: ../freedesktop.org.xml.in.h:479
 msgid "LightWave object"
 msgstr "LightWave 对象"
 
-#: ../freedesktop.org.xml.in.h:479
+#: ../freedesktop.org.xml.in.h:480
 msgid "LightWave scene"
 msgstr "LightWave 场景"
 
-#: ../freedesktop.org.xml.in.h:480
+#: ../freedesktop.org.xml.in.h:481
 msgid "MacPaint Bitmap image"
 msgstr "MacPaint 位图"
 
-#: ../freedesktop.org.xml.in.h:481
+#: ../freedesktop.org.xml.in.h:482
 msgid "Office drawing"
 msgstr "Microsoft Office 绘图"
 
-#: ../freedesktop.org.xml.in.h:482
+#: ../freedesktop.org.xml.in.h:483
 msgid "NIFF image"
 msgstr "NIFF 图像"
 
-#: ../freedesktop.org.xml.in.h:483
+#: ../freedesktop.org.xml.in.h:484
 msgid "PCX image"
 msgstr "PCX 图像"
 
-#: ../freedesktop.org.xml.in.h:484
+#: ../freedesktop.org.xml.in.h:485
 msgid "PCD image"
 msgstr "PCD 图像"
 
-#: ../freedesktop.org.xml.in.h:485
+#: ../freedesktop.org.xml.in.h:486
 msgid "PNM image"
 msgstr "PNM 图像"
 
-#: ../freedesktop.org.xml.in.h:486
+#: ../freedesktop.org.xml.in.h:487
 msgid "PBM image"
 msgstr "PBM 图像"
 
-#: ../freedesktop.org.xml.in.h:487
+#: ../freedesktop.org.xml.in.h:488
 msgid "PGM image"
 msgstr "PGM 图像"
 
-#: ../freedesktop.org.xml.in.h:488
+#: ../freedesktop.org.xml.in.h:489
 msgid "PPM image"
 msgstr "PPM 图像"
 
-#: ../freedesktop.org.xml.in.h:489
+#: ../freedesktop.org.xml.in.h:490
 msgid "Photoshop image"
 msgstr "Photoshop 图像"
 
-#: ../freedesktop.org.xml.in.h:490
+#: ../freedesktop.org.xml.in.h:491
 msgid "RGB image"
 msgstr "RGB 图像"
 
-#: ../freedesktop.org.xml.in.h:491
+#: ../freedesktop.org.xml.in.h:492
 msgid "SGI image"
 msgstr "SGI 图像"
 
-#: ../freedesktop.org.xml.in.h:492
+#: ../freedesktop.org.xml.in.h:493
 msgid "Sun raster image"
 msgstr "Sun 光栅图像"
 
-#: ../freedesktop.org.xml.in.h:493
+#: ../freedesktop.org.xml.in.h:494
 msgid "TGA image"
 msgstr "TGA 图像"
 
-#: ../freedesktop.org.xml.in.h:494
+#: ../freedesktop.org.xml.in.h:495
 msgid "Windows cursor"
 msgstr "Windows 光标"
 
-#: ../freedesktop.org.xml.in.h:495
+#: ../freedesktop.org.xml.in.h:496
 msgid "Windows animated cursor"
 msgstr "Windows 动画光标"
 
-#: ../freedesktop.org.xml.in.h:496
+#: ../freedesktop.org.xml.in.h:497
 msgid "EMF image"
 msgstr "EMF 图像"
 
-#: ../freedesktop.org.xml.in.h:497
+#: ../freedesktop.org.xml.in.h:498
 msgid "WMF image"
 msgstr "WMF 图像"
 
-#: ../freedesktop.org.xml.in.h:498
+#: ../freedesktop.org.xml.in.h:499
 msgid "XBM image"
 msgstr "XBM 图像"
 
-#: ../freedesktop.org.xml.in.h:499
+#: ../freedesktop.org.xml.in.h:500
 msgid "GIMP image"
 msgstr "GIMP 图像"
 
-#: ../freedesktop.org.xml.in.h:500
+#: ../freedesktop.org.xml.in.h:501
 msgid "XFig image"
 msgstr "XFig 图像"
 
-#: ../freedesktop.org.xml.in.h:501
+#: ../freedesktop.org.xml.in.h:502
 msgid "XPM image"
 msgstr "XPM 图像"
 
-#: ../freedesktop.org.xml.in.h:502
+#: ../freedesktop.org.xml.in.h:503
 msgid "X window image"
 msgstr "X window 图像"
 
-#: ../freedesktop.org.xml.in.h:503
+#: ../freedesktop.org.xml.in.h:504
 msgid "block device"
 msgstr "块设备"
 
-#: ../freedesktop.org.xml.in.h:504
+#: ../freedesktop.org.xml.in.h:505
 msgid "character device"
 msgstr "字符设备"
 
-#: ../freedesktop.org.xml.in.h:505
+#: ../freedesktop.org.xml.in.h:506
 msgid "folder"
 msgstr "文件夹"
 
-#: ../freedesktop.org.xml.in.h:506
+#: ../freedesktop.org.xml.in.h:507
 msgid "pipe"
 msgstr "管道"
 
-#: ../freedesktop.org.xml.in.h:507
+#: ../freedesktop.org.xml.in.h:508
 msgid "mount point"
 msgstr "挂载点"
 
-#: ../freedesktop.org.xml.in.h:508
+#: ../freedesktop.org.xml.in.h:509
 msgid "socket"
 msgstr "套接字"
 
-#: ../freedesktop.org.xml.in.h:509
+#: ../freedesktop.org.xml.in.h:510
 msgid "symbolic link"
 msgstr "符号链接"
 
-#: ../freedesktop.org.xml.in.h:510
+#: ../freedesktop.org.xml.in.h:511
 msgid "mail delivery report"
 msgstr "邮件投递报告"
 
-#: ../freedesktop.org.xml.in.h:511
+#: ../freedesktop.org.xml.in.h:512
 msgid "mail disposition report"
 msgstr "邮件接收报告"
 
-#: ../freedesktop.org.xml.in.h:512
+#: ../freedesktop.org.xml.in.h:513
 msgid "reference to remote file"
 msgstr "到远程文件的引用"
 
-#: ../freedesktop.org.xml.in.h:513
+#: ../freedesktop.org.xml.in.h:514
 msgid "Usenet news message"
 msgstr "Usenet 新闻信"
 
-#: ../freedesktop.org.xml.in.h:514
+#: ../freedesktop.org.xml.in.h:515
 msgid "partial email message"
 msgstr "部分电子邮件"
 
-#: ../freedesktop.org.xml.in.h:515
+#: ../freedesktop.org.xml.in.h:516
 msgid "email message"
 msgstr "电子邮件"
 
-#: ../freedesktop.org.xml.in.h:516
+#: ../freedesktop.org.xml.in.h:517
 msgid "GNU mail message"
 msgstr "GNU mail 信件"
 
-#: ../freedesktop.org.xml.in.h:517
+#: ../freedesktop.org.xml.in.h:518
 msgid "VRML document"
 msgstr "VRML 文档"
 
-#: ../freedesktop.org.xml.in.h:518
+#: ../freedesktop.org.xml.in.h:519
 msgid "message in several formats"
 msgstr "各种格式的消息"
 
-#: ../freedesktop.org.xml.in.h:519
+#: ../freedesktop.org.xml.in.h:520
 msgid "Macintosh AppleDouble-encoded file"
 msgstr "Macintosh AppleDouble 编码的文件"
 
-#: ../freedesktop.org.xml.in.h:520
+#: ../freedesktop.org.xml.in.h:521
 msgid "message digest"
 msgstr "消息摘要"
 
-#: ../freedesktop.org.xml.in.h:521
+#: ../freedesktop.org.xml.in.h:522
 msgid "encrypted message"
 msgstr "加密信件"
 
-#: ../freedesktop.org.xml.in.h:522
+#: ../freedesktop.org.xml.in.h:523
 msgid "compound documents"
 msgstr "组合文档"
 
-#: ../freedesktop.org.xml.in.h:523
+#: ../freedesktop.org.xml.in.h:524
 msgid "compound document"
 msgstr "组合文档"
 
-#: ../freedesktop.org.xml.in.h:524
+#: ../freedesktop.org.xml.in.h:525
 msgid "mail system report"
 msgstr "邮件系统报告"
 
-#: ../freedesktop.org.xml.in.h:525
+#: ../freedesktop.org.xml.in.h:526
 msgid "signed message"
 msgstr "签名信件"
 
-#: ../freedesktop.org.xml.in.h:526
+#: ../freedesktop.org.xml.in.h:527
 msgid "stream of data (server push)"
 msgstr "数据流(服务器推送)"
 
-#: ../freedesktop.org.xml.in.h:527
+#: ../freedesktop.org.xml.in.h:528
 msgid "VCS/ICS calendar"
 msgstr "VCS/ICS 日历"
 
-#: ../freedesktop.org.xml.in.h:528
+#: ../freedesktop.org.xml.in.h:529
 msgid "CSS stylesheet"
 msgstr "CSS 样式表"
 
-#: ../freedesktop.org.xml.in.h:529
+#: ../freedesktop.org.xml.in.h:530
 msgid "electronic business card"
 msgstr "电子商务卡"
 
-#: ../freedesktop.org.xml.in.h:530
+#: ../freedesktop.org.xml.in.h:531
 msgid "txt2tags document"
 msgstr "txt2tags 文档"
 
-#: ../freedesktop.org.xml.in.h:531
+#: ../freedesktop.org.xml.in.h:532
 msgid "Verilog source code"
 msgstr "Verilog 源代码"
 
-#: ../freedesktop.org.xml.in.h:532
+#: ../freedesktop.org.xml.in.h:533
 msgid "SystemVerilog header"
 msgstr "SystemVerilog 头"
 
-#: ../freedesktop.org.xml.in.h:533
+#: ../freedesktop.org.xml.in.h:534
 msgid "SystemVerilog source code"
 msgstr "SystemVerilog 源代码"
 
-#: ../freedesktop.org.xml.in.h:534
+#: ../freedesktop.org.xml.in.h:535
 msgid "VHDL source code"
 msgstr "VHDL 源代码"
 
-#: ../freedesktop.org.xml.in.h:535
+#: ../freedesktop.org.xml.in.h:536
 msgid "enriched text document"
 msgstr "富文本文档"
 
-#: ../freedesktop.org.xml.in.h:536
+#: ../freedesktop.org.xml.in.h:537
 msgid "help page"
 msgstr "帮助页面"
 
-#: ../freedesktop.org.xml.in.h:537
+#: ../freedesktop.org.xml.in.h:538
 msgid "plain text document"
 msgstr "纯文本文档"
 
-#: ../freedesktop.org.xml.in.h:538
+#: ../freedesktop.org.xml.in.h:539
 msgid "RDF file"
 msgstr "RDF 文件"
 
-#: ../freedesktop.org.xml.in.h:539
+#: ../freedesktop.org.xml.in.h:540
 msgid "email headers"
 msgstr "电子邮件头"
 
-#: ../freedesktop.org.xml.in.h:540
+#: ../freedesktop.org.xml.in.h:541
 msgid "rich text document"
 msgstr "RTF 丰富文本文档"
 
-#: ../freedesktop.org.xml.in.h:541
+#: ../freedesktop.org.xml.in.h:542
 msgid "RSS summary"
 msgstr "RSS 摘要"
 
-#: ../freedesktop.org.xml.in.h:542
+#: ../freedesktop.org.xml.in.h:543
 msgid "Atom syndication feed"
 msgstr "Atom 更新种子"
 
-#: ../freedesktop.org.xml.in.h:543
+#: ../freedesktop.org.xml.in.h:544
 msgid "OPML syndication feed"
 msgstr "OPML 聚合种子"
 
-#: ../freedesktop.org.xml.in.h:544
+#: ../freedesktop.org.xml.in.h:545
 msgid "SGML document"
 msgstr "SGML 文档"
 
-#: ../freedesktop.org.xml.in.h:545
+#: ../freedesktop.org.xml.in.h:546
 msgid "spreadsheet interchange document"
 msgstr "电子表格交换文档"
 
-#: ../freedesktop.org.xml.in.h:546
+#: ../freedesktop.org.xml.in.h:547
 msgid "TSV document"
 msgstr "TSV 文档"
 
-#: ../freedesktop.org.xml.in.h:547
+#: ../freedesktop.org.xml.in.h:548
 msgid "Graphviz DOT graph"
 msgstr "Graphviz DOT 科学图形"
 
-#: ../freedesktop.org.xml.in.h:548
+#: ../freedesktop.org.xml.in.h:549
 msgid "JAD document"
 msgstr "JAD 文档"
 
-#: ../freedesktop.org.xml.in.h:549
+#: ../freedesktop.org.xml.in.h:550
 msgid "WML document"
 msgstr "WML 文档"
 
-#: ../freedesktop.org.xml.in.h:550
+#: ../freedesktop.org.xml.in.h:551
 msgid "WMLScript program"
 msgstr "WMLScript 程序"
 
-#: ../freedesktop.org.xml.in.h:551
+#: ../freedesktop.org.xml.in.h:552
 msgid "ACE archive"
 msgstr "ACE 归档文件"
 
-#: ../freedesktop.org.xml.in.h:552
+#: ../freedesktop.org.xml.in.h:553
 msgid "Ada source code"
 msgstr "Ada 源代码"
 
-#: ../freedesktop.org.xml.in.h:553
+#: ../freedesktop.org.xml.in.h:554
 msgid "author list"
 msgstr "作者列表"
 
-#: ../freedesktop.org.xml.in.h:554
+#: ../freedesktop.org.xml.in.h:555
 msgid "BibTeX document"
 msgstr "BibTeX 文档"
 
-#: ../freedesktop.org.xml.in.h:555
+#: ../freedesktop.org.xml.in.h:556
 msgid "C++ header"
 msgstr "C++ 源代码头文件"
 
-#: ../freedesktop.org.xml.in.h:556
+#: ../freedesktop.org.xml.in.h:557
 msgid "C++ source code"
 msgstr "C++ 源代码"
 
-#: ../freedesktop.org.xml.in.h:557
+#: ../freedesktop.org.xml.in.h:558
 msgid "ChangeLog document"
 msgstr "变更日志文档"
 
-#: ../freedesktop.org.xml.in.h:558
+#: ../freedesktop.org.xml.in.h:559
 msgid "C header"
 msgstr "C 程序头文件"
 
-#: ../freedesktop.org.xml.in.h:559
+#: ../freedesktop.org.xml.in.h:560
 msgid "CMake source code"
 msgstr "CMake 源代码"
 
-#: ../freedesktop.org.xml.in.h:560
+#: ../freedesktop.org.xml.in.h:561
 msgid "CSV document"
 msgstr "CSV 文档"
 
-#: ../freedesktop.org.xml.in.h:561
+#: ../freedesktop.org.xml.in.h:562
 msgid "license terms"
 msgstr "软件许可条款"
 
-#: ../freedesktop.org.xml.in.h:562
+#: ../freedesktop.org.xml.in.h:563
 msgid "author credits"
 msgstr "软件作者致谢"
 
-#: ../freedesktop.org.xml.in.h:563
+#: ../freedesktop.org.xml.in.h:564
 msgid "C source code"
 msgstr "C 源代码"
 
-#: ../freedesktop.org.xml.in.h:564
+#: ../freedesktop.org.xml.in.h:565
 msgid "C# source code"
 msgstr "C# 源代码"
 
-#: ../freedesktop.org.xml.in.h:565
+#: ../freedesktop.org.xml.in.h:566
 msgid "Vala source code"
 msgstr "Vala 源代码"
 
-#: ../freedesktop.org.xml.in.h:566
+#: ../freedesktop.org.xml.in.h:567
 msgid "OOC source code"
 msgstr "OOC"
 
-#: ../freedesktop.org.xml.in.h:567
+#: ../freedesktop.org.xml.in.h:568
 msgid "DCL script"
 msgstr "DCL 脚本"
 
-#: ../freedesktop.org.xml.in.h:568
+#: ../freedesktop.org.xml.in.h:569
 msgid "DSSSL document"
 msgstr "DSSSL 文档"
 
-#: ../freedesktop.org.xml.in.h:569
+#: ../freedesktop.org.xml.in.h:570
 msgid "D source code"
 msgstr "D 源代码"
 
-#: ../freedesktop.org.xml.in.h:570
+#: ../freedesktop.org.xml.in.h:571
 msgid "DTD file"
 msgstr "DTD 文件"
 
-#: ../freedesktop.org.xml.in.h:571
+#: ../freedesktop.org.xml.in.h:572
 msgid "Eiffel source code"
 msgstr "Eiffel 源代码"
 
-#: ../freedesktop.org.xml.in.h:572
+#: ../freedesktop.org.xml.in.h:573
 msgid "Emacs Lisp source code"
 msgstr "Emacs Lisp 源代码"
 
-#: ../freedesktop.org.xml.in.h:573
+#: ../freedesktop.org.xml.in.h:574
 msgid "Erlang source code"
 msgstr "Erlang 源代码"
 
-#: ../freedesktop.org.xml.in.h:574
+#: ../freedesktop.org.xml.in.h:575
 msgid "Fortran source code"
 msgstr "Fortran 源代码"
 
-#: ../freedesktop.org.xml.in.h:575
+#: ../freedesktop.org.xml.in.h:576
 msgid "translation file"
 msgstr "消息翻译文件"
 
-#: ../freedesktop.org.xml.in.h:576
+#: ../freedesktop.org.xml.in.h:577
 msgid "translation template"
 msgstr "消息翻译模板"
 
-#: ../freedesktop.org.xml.in.h:577
+#: ../freedesktop.org.xml.in.h:578
 msgid "HTML document"
 msgstr "HTML 文档"
 
-#: ../freedesktop.org.xml.in.h:578
+#: ../freedesktop.org.xml.in.h:579
 msgid "Web application cache manifest"
 msgstr "网络应用程序缓存清单"
 
-#: ../freedesktop.org.xml.in.h:579
+#: ../freedesktop.org.xml.in.h:580
 msgid "Google Video Pointer"
 msgstr "Google 视频指向"
 
-#: ../freedesktop.org.xml.in.h:580
+#: ../freedesktop.org.xml.in.h:581
 msgid "Haskell source code"
 msgstr "Haskell 源代码"
 
-#: ../freedesktop.org.xml.in.h:581
+#: ../freedesktop.org.xml.in.h:582
 msgid "IDL document"
 msgstr "IDL 文档"
 
-#: ../freedesktop.org.xml.in.h:582
+#: ../freedesktop.org.xml.in.h:583
 msgid "installation instructions"
 msgstr "软件安装指南"
 
-#: ../freedesktop.org.xml.in.h:583
+#: ../freedesktop.org.xml.in.h:584
 msgid "Java source code"
 msgstr "Java 源代码"
 
-#: ../freedesktop.org.xml.in.h:584
+#: ../freedesktop.org.xml.in.h:585
 msgid "LDIF address book"
 msgstr "LDIF 地址簿"
 
-#: ../freedesktop.org.xml.in.h:585
+#: ../freedesktop.org.xml.in.h:586
 msgid "Lilypond music sheet"
 msgstr "Lilypond 乐谱"
 
-#: ../freedesktop.org.xml.in.h:586
+#: ../freedesktop.org.xml.in.h:587
 msgid "LHS source code"
 msgstr "LHS 源代码"
 
-#: ../freedesktop.org.xml.in.h:587
+#: ../freedesktop.org.xml.in.h:588
 msgid "application log"
 msgstr "应用程序日志"
 
-#: ../freedesktop.org.xml.in.h:588
+#: ../freedesktop.org.xml.in.h:589
 msgid "Makefile"
 msgstr "Makefile"
 
-#: ../freedesktop.org.xml.in.h:589
+#: ../freedesktop.org.xml.in.h:590
 msgid "Markdown document"
 msgstr "Markdown 文档"
 
-#: ../freedesktop.org.xml.in.h:590
+#: ../freedesktop.org.xml.in.h:591
 msgid "Qt MOC file"
 msgstr "Qt 元对象编译文件"
 
-#: ../freedesktop.org.xml.in.h:591
+#: ../freedesktop.org.xml.in.h:592
 msgid "Windows Registry extract"
 msgstr "Windows 注册表文件"
 
-#: ../freedesktop.org.xml.in.h:592
+#: ../freedesktop.org.xml.in.h:593
 msgid "Managed Object Format"
 msgstr "托管对象格式"
 
-#: ../freedesktop.org.xml.in.h:593
+#: ../freedesktop.org.xml.in.h:594
 msgid "Mup publication"
 msgstr "Mup 应用程序"
 
-#: ../freedesktop.org.xml.in.h:594
+#: ../freedesktop.org.xml.in.h:595
 msgid "Objective-C source code"
 msgstr "Objective-C 源代码"
 
-#: ../freedesktop.org.xml.in.h:595
+#: ../freedesktop.org.xml.in.h:596
 msgid "OCaml source code"
 msgstr "OCaml 源代码"
 
-#: ../freedesktop.org.xml.in.h:596
+#: ../freedesktop.org.xml.in.h:597
 msgid "MATLAB script/function"
 msgstr "MATLAB 脚本/函数"
 
-#: ../freedesktop.org.xml.in.h:597
+#: ../freedesktop.org.xml.in.h:598
 msgid "Modelica model"
 msgstr ""
 
-#: ../freedesktop.org.xml.in.h:598
+#: ../freedesktop.org.xml.in.h:599
 msgid "Pascal source code"
 msgstr "Pascal 源代码"
 
-#: ../freedesktop.org.xml.in.h:599
+#: ../freedesktop.org.xml.in.h:600
 msgid "differences between files"
 msgstr "文件的区别"
 
-#: ../freedesktop.org.xml.in.h:600
+#: ../freedesktop.org.xml.in.h:601
 msgid "Go source code"
 msgstr "Go"
 
-#: ../freedesktop.org.xml.in.h:601
+#: ../freedesktop.org.xml.in.h:602
 msgid "Python script"
 msgstr "Python 脚本"
 
-#: ../freedesktop.org.xml.in.h:602
+#: ../freedesktop.org.xml.in.h:603
 msgid "Lua script"
 msgstr "Lua 脚本"
 
-#: ../freedesktop.org.xml.in.h:603
+#: ../freedesktop.org.xml.in.h:604
 msgid "README document"
 msgstr "README 文档"
 
-#: ../freedesktop.org.xml.in.h:604
+#: ../freedesktop.org.xml.in.h:605
 msgid "NFO document"
 msgstr "NFO 文档"
 
-#: ../freedesktop.org.xml.in.h:605
+#: ../freedesktop.org.xml.in.h:606
 msgid "RPM spec file"
 msgstr "RPM spec 文件"
 
-#: ../freedesktop.org.xml.in.h:606
+#: ../freedesktop.org.xml.in.h:607
 msgid "Scala source code"
 msgstr "Scala 源代码"
 
-#: ../freedesktop.org.xml.in.h:607
+#: ../freedesktop.org.xml.in.h:608
 msgid "Scheme source code"
 msgstr "Scheme 源代码"
 
-#: ../freedesktop.org.xml.in.h:608
+#: ../freedesktop.org.xml.in.h:609
 msgid "Setext document"
 msgstr "Setext 文档"
 
-#: ../freedesktop.org.xml.in.h:609
+#: ../freedesktop.org.xml.in.h:610
 msgid "SQL code"
 msgstr "SQL 代码"
 
-#: ../freedesktop.org.xml.in.h:610
+#: ../freedesktop.org.xml.in.h:611
 msgid "Tcl script"
 msgstr "Tcl 脚本"
 
-#: ../freedesktop.org.xml.in.h:611
+#: ../freedesktop.org.xml.in.h:612
 msgid "TeX document"
 msgstr "TeX 文档"
 
-#: ../freedesktop.org.xml.in.h:612
+#: ../freedesktop.org.xml.in.h:613
 msgid "TeXInfo document"
 msgstr "TeXInfo 文档"
 
-#: ../freedesktop.org.xml.in.h:613
+#: ../freedesktop.org.xml.in.h:614
 msgid "Troff ME input document"
 msgstr "Troff ME 输入文档"
 
-#: ../freedesktop.org.xml.in.h:614
+#: ../freedesktop.org.xml.in.h:615
 msgid "Troff MM input document"
 msgstr "Troff MM 输入文档"
 
-#: ../freedesktop.org.xml.in.h:615
+#: ../freedesktop.org.xml.in.h:616
 msgid "Troff MS input document"
 msgstr "Troff MS 输入文档"
 
-#: ../freedesktop.org.xml.in.h:616
+#: ../freedesktop.org.xml.in.h:617
 msgid "X-Motif UIL table"
 msgstr "X-Motif UIL 表"
 
-#: ../freedesktop.org.xml.in.h:617
+#: ../freedesktop.org.xml.in.h:618
 msgid "resource location"
 msgstr "资源位置"
 
-#: ../freedesktop.org.xml.in.h:618
+#: ../freedesktop.org.xml.in.h:619
 msgid "uuencoded file"
 msgstr ""
 
-#: ../freedesktop.org.xml.in.h:619
+#: ../freedesktop.org.xml.in.h:620
 msgid "XMI file"
 msgstr "XMI 文件"
 
-#: ../freedesktop.org.xml.in.h:620
+#: ../freedesktop.org.xml.in.h:621
 msgid "XSL FO file"
 msgstr "XSL 格式化对象文件"
 
-#: ../freedesktop.org.xml.in.h:621
+#: ../freedesktop.org.xml.in.h:622
 msgid "iptables configuration file"
 msgstr "iptables 防火墙配置文件"
 
-#: ../freedesktop.org.xml.in.h:622
+#: ../freedesktop.org.xml.in.h:623
 msgid "XSLT stylesheet"
 msgstr "XSLT 样式表"
 
-#: ../freedesktop.org.xml.in.h:623
+#: ../freedesktop.org.xml.in.h:624
 msgid "XMCD CD database"
 msgstr "XMCD CD 数据库"
 
-#: ../freedesktop.org.xml.in.h:624
+#: ../freedesktop.org.xml.in.h:625
 msgid "XML document"
 msgstr "XML 文档"
 
-#: ../freedesktop.org.xml.in.h:625
+#: ../freedesktop.org.xml.in.h:626
 msgid "XML entities document"
 msgstr "XML 特征文档"
 
-#: ../freedesktop.org.xml.in.h:626
+#: ../freedesktop.org.xml.in.h:627
 msgid "DV video"
 msgstr "DV 视频"
 
-#: ../freedesktop.org.xml.in.h:627
+#: ../freedesktop.org.xml.in.h:628
 msgid "ISI video"
 msgstr "ISI 视频"
 
-#: ../freedesktop.org.xml.in.h:628
+#: ../freedesktop.org.xml.in.h:629
 msgid "MPEG-2 transport stream"
 msgstr "MPEG-2 传输流"
 
-#: ../freedesktop.org.xml.in.h:629
+#: ../freedesktop.org.xml.in.h:630
 msgid "MPEG video"
 msgstr "MPEG 视频"
 
-#: ../freedesktop.org.xml.in.h:630
+#: ../freedesktop.org.xml.in.h:631
 msgid "MPEG video (streamed)"
 msgstr "MPEG 视频流媒体"
 
-#: ../freedesktop.org.xml.in.h:631
+#: ../freedesktop.org.xml.in.h:632
 msgid "QuickTime video"
 msgstr "QuickTime 视频"
 
-#: ../freedesktop.org.xml.in.h:632
+#: ../freedesktop.org.xml.in.h:633
 msgid "QuickTime image"
 msgstr "QuickTime 图像"
 
-#: ../freedesktop.org.xml.in.h:633
+#: ../freedesktop.org.xml.in.h:634
 msgid "Vivo video"
 msgstr "Vivo 视频"
 
-#: ../freedesktop.org.xml.in.h:634
+#: ../freedesktop.org.xml.in.h:635
 msgid "Wavelet video"
 msgstr "Wavelet 视频"
 
-#: ../freedesktop.org.xml.in.h:635
+#: ../freedesktop.org.xml.in.h:636
 msgid "ANIM animation"
 msgstr "ANIM 动画"
 
-#: ../freedesktop.org.xml.in.h:636
+#: ../freedesktop.org.xml.in.h:637
 msgid "FLIC animation"
 msgstr "FLIC 动画"
 
-#: ../freedesktop.org.xml.in.h:637
+#: ../freedesktop.org.xml.in.h:638
 msgid "Haansoft Hangul document"
 msgstr "Haansoft Hangul 文档"
 
-#: ../freedesktop.org.xml.in.h:638
+#: ../freedesktop.org.xml.in.h:639
 msgid "Haansoft Hangul document template"
 msgstr "Haansoft Hangul 文档模板"
 
-#: ../freedesktop.org.xml.in.h:639
+#: ../freedesktop.org.xml.in.h:640
 msgid "MNG animation"
 msgstr "MNG 动画"
 
-#: ../freedesktop.org.xml.in.h:640
+#: ../freedesktop.org.xml.in.h:641
 msgid "ASF video"
 msgstr "ASF 视频"
 
-#: ../freedesktop.org.xml.in.h:641
+#: ../freedesktop.org.xml.in.h:642
 msgid "Windows Media Station file"
 msgstr "Windows 媒体工作站文件"
 
-#: ../freedesktop.org.xml.in.h:642
+#: ../freedesktop.org.xml.in.h:643
 msgid "Windows Media video"
 msgstr "Windows Media 视频"
 
-#: ../freedesktop.org.xml.in.h:643
+#: ../freedesktop.org.xml.in.h:644
 msgid "AVI video"
 msgstr "AVI 视频"
 
-#: ../freedesktop.org.xml.in.h:644
+#: ../freedesktop.org.xml.in.h:645
 msgid "NullSoft video"
 msgstr "Nullsoft 视频"
 
-#: ../freedesktop.org.xml.in.h:645
+#: ../freedesktop.org.xml.in.h:646
 msgid "SDP multicast stream file"
 msgstr "SDP 多播流文件"
 
-#: ../freedesktop.org.xml.in.h:646
+#: ../freedesktop.org.xml.in.h:647
 msgid "SGI video"
 msgstr "SGI 视频"
 
-#: ../freedesktop.org.xml.in.h:647
+#: ../freedesktop.org.xml.in.h:648
 msgid "eMusic download package"
 msgstr "eMusic 下载包"
 
-#: ../freedesktop.org.xml.in.h:648
+#: ../freedesktop.org.xml.in.h:649
 msgid "KML geographic data"
 msgstr "KML 地理数据"
 
-#: ../freedesktop.org.xml.in.h:649
+#: ../freedesktop.org.xml.in.h:650
 msgid "KML geographic compressed data"
 msgstr "KML 压缩地理数据"
 
-#: ../freedesktop.org.xml.in.h:650
+#: ../freedesktop.org.xml.in.h:651
 msgid "Citrix ICA settings file"
 msgstr "Citrix ICA 设置文件"
 
-#: ../freedesktop.org.xml.in.h:651
+#: ../freedesktop.org.xml.in.h:652
 msgid "XUL interface document"
 msgstr "XUL 界面文档"
 
-#: ../freedesktop.org.xml.in.h:652
+#: ../freedesktop.org.xml.in.h:653
 msgid "XPInstall installer module"
 msgstr "XPInstall 安装工具模块"
 
-#: ../freedesktop.org.xml.in.h:653
+#: ../freedesktop.org.xml.in.h:654
 msgid "Word 2007 document"
 msgstr "Microsoft Word 2007 文档"
 
-#: ../freedesktop.org.xml.in.h:654
+#: ../freedesktop.org.xml.in.h:655
 msgid "Word 2007 document template"
 msgstr "Word 2007 文档模板"
 
-#: ../freedesktop.org.xml.in.h:655
+#: ../freedesktop.org.xml.in.h:656
 msgid "PowerPoint 2007 presentation"
 msgstr "Microsoft PowerPoint 2007 演示文稿"
 
-#: ../freedesktop.org.xml.in.h:656
+#: ../freedesktop.org.xml.in.h:657
 msgid "PowerPoint 2007 slide"
 msgstr "PowerPoint 2007 文稿"
 
-#: ../freedesktop.org.xml.in.h:657
+#: ../freedesktop.org.xml.in.h:658
 msgid "PowerPoint 2007 show"
 msgstr "Microsoft PowerPoint 2007 演示文稿"
 
-#: ../freedesktop.org.xml.in.h:658
+#: ../freedesktop.org.xml.in.h:659
 msgid "PowerPoint 2007 presentation template"
 msgstr "PowerPoint 2007 演示文稿模板"
 
-#: ../freedesktop.org.xml.in.h:659
+#: ../freedesktop.org.xml.in.h:660
 msgid "Excel 2007 spreadsheet"
 msgstr "Microsoft Excel 2007 工作簿"
 
-#: ../freedesktop.org.xml.in.h:660
+#: ../freedesktop.org.xml.in.h:661
 msgid "Excel 2007 spreadsheet template"
 msgstr "Excel 2007 工作表模板"
 
-#: ../freedesktop.org.xml.in.h:661
+#: ../freedesktop.org.xml.in.h:662
 msgid "T602 document"
 msgstr "T602 文档"
 
-#: ../freedesktop.org.xml.in.h:662
+#: ../freedesktop.org.xml.in.h:663
 msgid "Cisco VPN Settings"
 msgstr "Cisco VPN 设置"
 
-#: ../freedesktop.org.xml.in.h:663
+#: ../freedesktop.org.xml.in.h:664
 msgid "ICC profile"
 msgstr "ICC 文件"
 
-#: ../freedesktop.org.xml.in.h:664
+#: ../freedesktop.org.xml.in.h:665
 msgid "IT 8.7 color calibration file"
 msgstr "IT 8.7 色彩校准文件"
 
-#: ../freedesktop.org.xml.in.h:665
+#: ../freedesktop.org.xml.in.h:666
 msgid "CCMX color correction file"
 msgstr ""
 
-#: ../freedesktop.org.xml.in.h:666
+#: ../freedesktop.org.xml.in.h:667
 msgid "WinHelp help file"
 msgstr ""
 
 #. http://en.wikipedia.org/wiki/Design_rule_for_Camera_File_system
-#: ../freedesktop.org.xml.in.h:668
+#: ../freedesktop.org.xml.in.h:669
 msgid "digital photos"
 msgstr "数字化图像"
 
 #. TRANSLATORS: This is a brand-name, not a generic term. Please see
 #. http://en.wikipedia.org/wiki/Video_CD
 #. http://www.herongyang.com/CD-DVD/VCD-Movie-File-Directory-Structure.html
-#: ../freedesktop.org.xml.in.h:672
+#: ../freedesktop.org.xml.in.h:673
 msgid "Video CD"
 msgstr "VCD"
 
 #. TRANSLATORS: This is a brand-name, not a generic term. Please see
 #. http://en.wikipedia.org/wiki/Super_Video_CD
 #. http://everything2.com/index.pl?node_id=1009222
-#: ../freedesktop.org.xml.in.h:676
+#: ../freedesktop.org.xml.in.h:677
 msgid "Super Video CD"
 msgstr "SVCD"
 
 #. http://en.wikipedia.org/wiki/DVD-Video
-#: ../freedesktop.org.xml.in.h:678
+#: ../freedesktop.org.xml.in.h:679
 msgid "video DVD"
 msgstr "视频 DVD"
 
 #. http://en.wikipedia.org/wiki/Red_Book_(audio_CD_standard)
-#: ../freedesktop.org.xml.in.h:680
+#: ../freedesktop.org.xml.in.h:681
 msgid "audio CD"
 msgstr "音频 CD"
 
 #. http://en.wikipedia.org/wiki/Compact_Disc
-#: ../freedesktop.org.xml.in.h:682
+#: ../freedesktop.org.xml.in.h:683
 msgid "blank CD disc"
 msgstr "空 CD 光盘"
 
 #. http://en.wikipedia.org/wiki/DVD
-#: ../freedesktop.org.xml.in.h:684
+#: ../freedesktop.org.xml.in.h:685
 msgid "blank DVD disc"
 msgstr "空 DVD 光盘"
 
 #. http://en.wikipedia.org/wiki/Blu-ray_Disc
-#: ../freedesktop.org.xml.in.h:686
+#: ../freedesktop.org.xml.in.h:687
 msgid "blank Blu-ray disc"
 msgstr "空蓝光 DVD"
 
 #. http://en.wikipedia.org/wiki/HD_DVD
-#: ../freedesktop.org.xml.in.h:688
+#: ../freedesktop.org.xml.in.h:689
 msgid "blank HD DVD disc"
 msgstr "空 HD DVD 光盘"
 
 #. http://en.wikipedia.org/wiki/DVD-Audio
-#: ../freedesktop.org.xml.in.h:690
+#: ../freedesktop.org.xml.in.h:691
 msgid "audio DVD"
 msgstr "音频 DVD"
 
 #. http://en.wikipedia.org/wiki/Blu-ray_Disc
 #. http://www.blu-raydisc.com/Section-13470/Section-13890/Index.html
-#: ../freedesktop.org.xml.in.h:693
+#: ../freedesktop.org.xml.in.h:694
 msgid "Blu-ray video disc"
 msgstr "蓝光视频光盘"
 
 #. http://en.wikipedia.org/wiki/HD_DVD
 #. http://www.dvdafteredit.com/wiki/The_HVDVD_TS_Folder
-#: ../freedesktop.org.xml.in.h:696
+#: ../freedesktop.org.xml.in.h:697
 msgid "HD DVD video disc"
 msgstr "HD DVD 视频光盘"
 
 #. see fd.o hal spec
-#: ../freedesktop.org.xml.in.h:698
+#: ../freedesktop.org.xml.in.h:699
 msgid "e-book reader"
 msgstr "电子书阅读器"
 
 #. TRANSLATORS: This is a brand-name, not a generic term. Please see
 #. http://en.wikipedia.org/wiki/Picture_CD
 #. http://www.re.org/kristin/picturecd.html
-#: ../freedesktop.org.xml.in.h:702
+#: ../freedesktop.org.xml.in.h:703
 msgid "Picture CD"
 msgstr "柯达 Picture CD"
 
 #. see fd.o hal spec
-#: ../freedesktop.org.xml.in.h:704
+#: ../freedesktop.org.xml.in.h:705
 msgid "portable audio player"
 msgstr "便携式音频播放器"
 
 #. http://standards.freedesktop.org/autostart-spec/autostart-spec-latest.html
 #. http://bugzilla.gnome.org/show_bug.cgi?id=509823#c3
-#: ../freedesktop.org.xml.in.h:707
+#: ../freedesktop.org.xml.in.h:708
 msgid "software"
 msgstr "软件"
 
 #. http://standards.freedesktop.org/autostart-spec/autostart-spec-latest.html
 #. http://bugzilla.gnome.org/show_bug.cgi?id=509823#c3
-#: ../freedesktop.org.xml.in.h:710
+#: ../freedesktop.org.xml.in.h:711
 msgid "UNIX software"
 msgstr "UNIX 软件"
 
 #. http://standards.freedesktop.org/autostart-spec/autostart-spec-latest.html
 #. http://bugzilla.gnome.org/show_bug.cgi?id=509823#c3
-#: ../freedesktop.org.xml.in.h:713
+#: ../freedesktop.org.xml.in.h:714
 msgid "Windows software"
 msgstr "Windows 软件"
 
 #. http://www4.wiwiss.fu-berlin.de/bizer/TriG/
-#: ../freedesktop.org.xml.in.h:715
+#: ../freedesktop.org.xml.in.h:716
 msgid "TriG RDF document"
 msgstr ""
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/sharutils.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/sharutils.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/sharutils.po	2014-02-24 08:24:34.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/sharutils.po	2014-03-24 09:42:41.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:52+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:08+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: src/scribble.c:150
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/software-properties.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/software-properties.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/software-properties.po	2014-02-24 08:24:41.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/software-properties.po	2014-03-24 09:42:48.000000000 +0000
@@ -9,16 +9,16 @@
 msgstr ""
 "Project-Id-Version: update-manager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-10 15:29+0000\n"
-"PO-Revision-Date: 2014-02-11 08:30+0000\n"
+"POT-Creation-Date: 2014-02-28 21:39+0000\n"
+"PO-Revision-Date: 2014-03-07 11:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:47+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:13+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: \n"
 
 #: ../data/com.ubuntu.softwareproperties.policy.in.h:1
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/sp5.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/sp5.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/sp5.po	2014-02-24 08:24:32.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/sp5.po	2014-03-24 09:42:38.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:38+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 11:51+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 msgid ""
 "no system identifier could be generated for meta-DTD for architecture %1"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/subdomain_parser.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/subdomain_parser.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/subdomain_parser.po	2014-02-24 08:24:41.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/subdomain_parser.po	2014-03-24 09:42:48.000000000 +0000
@@ -12,8 +12,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:48+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:13+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: ../parser_include.c:80
 msgid "Error couldn't allocate temporary file\n"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/subversion.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/subversion.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/subversion.po	2014-02-24 08:24:32.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/subversion.po	2014-03-24 09:42:39.000000000 +0000
@@ -21,6 +21,9 @@
 # Update to new pot:
 #    ../../tools/po/po-update.sh zh_CN
 #
+# Merge from trunk:
+#    python ../../../../trunk/tools/dev/po-merge.py < ../../../../trunk/subversion/po/zh_CN.po zh_CN.po
+#
 # Check translation:
 #    msgfmt --statistics -c -o zh_CN.mo zh_CN.po
 #
@@ -53,1282 +56,1330 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: subversion 1.7\n"
+"Project-Id-Version: subversion 1.8\n"
 "Report-Msgid-Bugs-To: dev@subversion.apache.org\n"
-"POT-Creation-Date: 2014-01-06 23:02+0000\n"
-"PO-Revision-Date: 2013-12-13 15:16+0000\n"
+"POT-Creation-Date: 2014-02-24 10:14+0000\n"
+"PO-Revision-Date: 2014-02-24 18:43+0000\n"
 "Last-Translator: Subversion Developers <Unknown>\n"
 "Language-Team: Simplified Chinese <dev@subversion.apache.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:42+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 11:56+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: \n"
 
 #. Constructing nice error messages for roots.
 #. Build an SVN_ERR_FS_NOT_FOUND error, with a detailed error text,
 #. for PATH in ROOT. ROOT is of type svn_fs_root_t *.
-#: ../include/private/svn_fs_util.h:66
+#: ../include/private/svn_fs_util.h:81
 #, c-format
 msgid "File not found: transaction '%s', path '%s'"
 msgstr "没有找到文件: 事务“%s”，路径 “%s”"
 
-#: ../include/private/svn_fs_util.h:71
+#: ../include/private/svn_fs_util.h:86
 #, c-format
 msgid "File not found: revision %ld, path '%s'"
 msgstr "没有找到文件: 版本“%ld”，路径 “%s”"
 
 #. Build a detailed `file already exists' message for PATH in ROOT.
 #. ROOT is of type svn_fs_root_t *.
-#: ../include/private/svn_fs_util.h:82
+#: ../include/private/svn_fs_util.h:97
 #, c-format
 msgid "File already exists: filesystem '%s', transaction '%s', path '%s'"
 msgstr "文件已经存在: 文件系统“%s”，事务“%s”，路径“%s”"
 
-#: ../include/private/svn_fs_util.h:87
+#: ../include/private/svn_fs_util.h:102
 #, c-format
 msgid "File already exists: filesystem '%s', revision %ld, path '%s'"
 msgstr "文件已经存在: 文件系统“%s”，版本“%ld”，路径“%s”"
 
 #. ROOT is of type svn_fs_root_t *.
-#: ../include/private/svn_fs_util.h:95
+#: ../include/private/svn_fs_util.h:110
 msgid "Root object must be a transaction root"
 msgstr "根对象必须是事务的根"
 
 #. SVN_FS__ERR_NOT_MUTABLE: the caller attempted to change a node
 #. outside of a transaction. FS is of type "svn_fs_t *".
-#: ../include/private/svn_fs_util.h:102
+#: ../include/private/svn_fs_util.h:117
 #, c-format
 msgid "File is not mutable: filesystem '%s', revision %ld, path '%s'"
 msgstr "文件不是可变的: 文件系统“%s”，版本“%ld”，路径 “%s”"
 
-#. FS is of type "svn fs_t *".
-#: ../include/private/svn_fs_util.h:109
+#. FS is of type "svn_fs_t *".
+#: ../include/private/svn_fs_util.h:124
 #, c-format
 msgid "'%s' is not a directory in filesystem '%s'"
 msgstr "“%s”在文件系统“%s”中不是目录"
 
-#. FS is of type "svn fs_t *".
-#: ../include/private/svn_fs_util.h:116
+#. FS is of type "svn_fs_t *".
+#: ../include/private/svn_fs_util.h:131
 #, c-format
 msgid "'%s' is not a file in filesystem '%s'"
 msgstr "“%s”在文件系统“%s”中不是文件"
 
-#. FS is of type "svn fs_t *", LOCK is of type "svn_lock_t *".
-#: ../include/private/svn_fs_util.h:124
+#. FS is of type "svn_fs_t *", LOCK is of type "svn_lock_t *".
+#: ../include/private/svn_fs_util.h:139
 #, c-format
 msgid "Path '%s' is already locked by user '%s' in filesystem '%s'"
 msgstr "路径“%s”已经被用户“%s”锁定，其文件系统是“%s”"
 
-#. FS is of type "svn fs_t *".
-#: ../include/private/svn_fs_util.h:131
+#. FS is of type "svn_fs_t *".
+#: ../include/private/svn_fs_util.h:146
 #, c-format
 msgid "No lock on path '%s' in filesystem '%s'"
 msgstr "路径“%s”没有被锁定，其文件系统是“%s”"
 
-#. FS is of type "svn fs_t *".
-#: ../include/private/svn_fs_util.h:138
+#. FS is of type "svn_fs_t *".
+#: ../include/private/svn_fs_util.h:153
 #, c-format
 msgid "Lock has expired: lock-token '%s' in filesystem '%s'"
 msgstr "锁已经过期：令牌 “%s”，文件系统 “%s”"
 
-#. FS is of type "svn fs_t *".
-#: ../include/private/svn_fs_util.h:145
+#. FS is of type "svn_fs_t *".
+#: ../include/private/svn_fs_util.h:160
 #, c-format
 msgid "No username is currently associated with filesystem '%s'"
 msgstr "当前没有用户名称与文件系统“%s”关联"
 
 #. SVN_FS__ERR_LOCK_OWNER_MISMATCH: trying to use a lock whose
 #. LOCK_OWNER doesn't match the USERNAME associated with FS.
-#. FS is of type "svn fs_t *".
-#: ../include/private/svn_fs_util.h:154
+#. FS is of type "svn_fs_t *".
+#: ../include/private/svn_fs_util.h:169
 #, c-format
 msgid "User '%s' is trying to use a lock owned by '%s' in filesystem '%s'"
 msgstr "用户“%s”试图使用“%s”的锁，其文件系统是“%s”"
 
-#: ../include/svn_error_codes.h:160
+#: ../include/svn_error_codes.h:164
 msgid "Bad parent pool passed to svn_make_pool()"
 msgstr "无效的父内存池传递到 svn_make_pool()"
 
-#: ../include/svn_error_codes.h:164
+#: ../include/svn_error_codes.h:168
 msgid "Bogus filename"
 msgstr "非法的文件名"
 
-#: ../include/svn_error_codes.h:168
+#: ../include/svn_error_codes.h:172
 msgid "Bogus URL"
 msgstr "非法 URL"
 
-#: ../include/svn_error_codes.h:172
+#: ../include/svn_error_codes.h:176
 msgid "Bogus date"
 msgstr "非法日期"
 
-#: ../include/svn_error_codes.h:176
+#: ../include/svn_error_codes.h:180
 msgid "Bogus mime-type"
 msgstr "非法 mime-type"
 
-#: ../include/svn_error_codes.h:186
+#: ../include/svn_error_codes.h:190
 msgid "Wrong or unexpected property value"
 msgstr "错误或不期望的属性值"
 
-#: ../include/svn_error_codes.h:190
+#: ../include/svn_error_codes.h:194
 msgid "Version file format not correct"
 msgstr "版本文件格式不正确"
 
-#: ../include/svn_error_codes.h:194
+#: ../include/svn_error_codes.h:198
 msgid "Path is not an immediate child of the specified directory"
 msgstr "路径不是指定目录的直接子孙"
 
-#: ../include/svn_error_codes.h:198
+#: ../include/svn_error_codes.h:202
 msgid "Bogus UUID"
 msgstr "非法 UUID"
 
-#: ../include/svn_error_codes.h:203 ../include/svn_error_codes.h:905
+#: ../include/svn_error_codes.h:207 ../include/svn_error_codes.h:944
 msgid "Invalid configuration value"
 msgstr "无效的配置取值"
 
-#: ../include/svn_error_codes.h:207
+#: ../include/svn_error_codes.h:211
 msgid "Bogus server specification"
 msgstr "假的服务器规格"
 
-#: ../include/svn_error_codes.h:211
+#: ../include/svn_error_codes.h:215
 msgid "Unsupported checksum type"
 msgstr "不支持的校验和类型"
 
-#: ../include/svn_error_codes.h:215
+#: ../include/svn_error_codes.h:219
 msgid "Invalid character in hex checksum"
 msgstr "在 16 进制的校验和中发现无效字符"
 
-#: ../include/svn_error_codes.h:220
+#: ../include/svn_error_codes.h:224
 msgid "Unknown string value of token"
 msgstr "未知的字符串令牌值"
 
-#: ../include/svn_error_codes.h:225
+#: ../include/svn_error_codes.h:229
 msgid "Invalid changelist name"
 msgstr "无效的修改列表名称"
 
-#: ../include/svn_error_codes.h:231
+#: ../include/svn_error_codes.h:234
+msgid "Invalid atomic"
+msgstr "无效原子"
+
+#: ../include/svn_error_codes.h:240
 msgid "No such XML tag attribute"
 msgstr "没有这种 XML 标签属性"
 
-#: ../include/svn_error_codes.h:235
+#: ../include/svn_error_codes.h:244
 msgid "<delta-pkg> is missing ancestry"
 msgstr "<delta-pkg> 没有祖先"
 
-#: ../include/svn_error_codes.h:239
+#: ../include/svn_error_codes.h:248
 msgid "Unrecognized binary data encoding; can't decode"
 msgstr "无法识别的二进制数据编码: 无法解码"
 
-#: ../include/svn_error_codes.h:243
+#: ../include/svn_error_codes.h:252
 msgid "XML data was not well-formed"
 msgstr "XML 数据语法错误"
 
-#: ../include/svn_error_codes.h:247
+#: ../include/svn_error_codes.h:256
 msgid "Data cannot be safely XML-escaped"
 msgstr "XML 数据不能正确解码"
 
-#: ../include/svn_error_codes.h:253
+#: ../include/svn_error_codes.h:262
 msgid "Inconsistent line ending style"
 msgstr "不一致的行结束样式"
 
-#: ../include/svn_error_codes.h:257
+#: ../include/svn_error_codes.h:266
 msgid "Unrecognized line ending style"
 msgstr "无法识别的行结束样式"
 
-#: ../include/svn_error_codes.h:262
+#: ../include/svn_error_codes.h:271
 msgid "Line endings other than expected"
 msgstr "行意外结束"
 
-#: ../include/svn_error_codes.h:266
+#: ../include/svn_error_codes.h:275
 msgid "Ran out of unique names"
 msgstr "唯一名称耗尽"
 
-#: ../include/svn_error_codes.h:271
+#: ../include/svn_error_codes.h:280
 msgid "Framing error in pipe protocol"
 msgstr "管道协议中帧错误"
 
-#: ../include/svn_error_codes.h:276
+#: ../include/svn_error_codes.h:285
 msgid "Read error in pipe"
 msgstr "管道读取错误"
 
-#: ../include/svn_error_codes.h:280 ../libsvn_subr/cmdline.c:346
-#: ../libsvn_subr/cmdline.c:369 ../svn/util.c:929 ../svnlook/main.c:1836
+#: ../include/svn_error_codes.h:289 ../libsvn_subr/cmdline.c:362
+#: ../libsvn_subr/cmdline.c:385 ../svn/util.c:569 ../svnlook/svnlook.c:2009
 #, c-format
 msgid "Write error"
 msgstr "写入错误"
 
-#: ../include/svn_error_codes.h:285
+#: ../include/svn_error_codes.h:294
 msgid "Write error in pipe"
 msgstr "管道写入错误"
 
-#: ../include/svn_error_codes.h:291
+#: ../include/svn_error_codes.h:300
 msgid "Unexpected EOF on stream"
 msgstr "流意外结束"
 
-#: ../include/svn_error_codes.h:295
+#: ../include/svn_error_codes.h:304
 msgid "Malformed stream data"
 msgstr "非法流数据"
 
-#: ../include/svn_error_codes.h:299
+#: ../include/svn_error_codes.h:308
 msgid "Unrecognized stream data"
 msgstr "无法识别的流数据"
 
-#: ../include/svn_error_codes.h:304
+#: ../include/svn_error_codes.h:313
 msgid "Stream doesn't support seeking"
 msgstr "流不支持定位操作"
 
-#: ../include/svn_error_codes.h:310
+#: ../include/svn_error_codes.h:319
 msgid "Unknown svn_node_kind"
 msgstr "未知的 svn_node_kind"
 
-#: ../include/svn_error_codes.h:314
+#: ../include/svn_error_codes.h:323
 msgid "Unexpected node kind found"
 msgstr "发现意外节点种类"
 
-#: ../include/svn_error_codes.h:320
+#: ../include/svn_error_codes.h:329
 msgid "Can't find an entry"
 msgstr "无法找到条目"
 
-#: ../include/svn_error_codes.h:326
+#: ../include/svn_error_codes.h:335
 msgid "Entry already exists"
 msgstr "条目已存在"
 
-#: ../include/svn_error_codes.h:330
+#: ../include/svn_error_codes.h:339
 msgid "Entry has no revision"
 msgstr "条目没有版本"
 
-#: ../include/svn_error_codes.h:334
+#: ../include/svn_error_codes.h:343
 msgid "Entry has no URL"
 msgstr "入口没有 URL"
 
-#: ../include/svn_error_codes.h:338
+#: ../include/svn_error_codes.h:347
 msgid "Entry has an invalid attribute"
 msgstr "条目有无效属性"
 
-#: ../include/svn_error_codes.h:342
+#: ../include/svn_error_codes.h:351
 msgid "Can't create an entry for a forbidden name"
 msgstr "不能为禁用的名称创建条目"
 
-#: ../include/svn_error_codes.h:348
+#: ../include/svn_error_codes.h:357
 msgid "Obstructed update"
 msgstr "更新阻塞"
 
-#: ../include/svn_error_codes.h:353
+#: ../include/svn_error_codes.h:362
 msgid "Mismatch popping the WC unwind stack"
 msgstr "不匹配的弹出工作副本展开堆栈"
 
-#: ../include/svn_error_codes.h:358
+#: ../include/svn_error_codes.h:367
 msgid "Attempt to pop empty WC unwind stack"
 msgstr "试图弹出空的工作副本展开堆栈"
 
-#: ../include/svn_error_codes.h:363
+#: ../include/svn_error_codes.h:372
 msgid "Attempt to unlock with non-empty unwind stack"
 msgstr "试图解锁非空展开堆栈"
 
-#: ../include/svn_error_codes.h:367
+#: ../include/svn_error_codes.h:376
 msgid "Attempted to lock an already-locked dir"
 msgstr "试图锁定已加锁的目录"
 
-#: ../include/svn_error_codes.h:371
+#: ../include/svn_error_codes.h:380
 msgid "Working copy not locked; this is probably a bug, please report"
 msgstr "工作副本没有锁定；这可能是一个漏洞，请报告"
 
-#: ../include/svn_error_codes.h:376
+#: ../include/svn_error_codes.h:385
 msgid "Invalid lock"
 msgstr "无效锁"
 
-#: ../include/svn_error_codes.h:382 ../include/svn_error_codes.h:388
+#: ../include/svn_error_codes.h:391 ../include/svn_error_codes.h:397
 msgid "Path is not a working copy directory"
 msgstr "路径不是工作副本目录"
 
-#: ../include/svn_error_codes.h:392
+#: ../include/svn_error_codes.h:401
 msgid "Path is not a working copy file"
 msgstr "路径不是工作副本文件"
 
-#: ../include/svn_error_codes.h:396
+#: ../include/svn_error_codes.h:405
 msgid "Problem running log"
 msgstr "执行日志出错"
 
-#: ../include/svn_error_codes.h:400
+#: ../include/svn_error_codes.h:409
 msgid "Can't find a working copy path"
 msgstr "找不到工作副本路径"
 
-#: ../include/svn_error_codes.h:404
+#: ../include/svn_error_codes.h:413
 msgid "Working copy is not up-to-date"
 msgstr "工作副本没有更新到最新版本"
 
-#: ../include/svn_error_codes.h:408
+#: ../include/svn_error_codes.h:417
 msgid "Left locally modified or unversioned files"
 msgstr "保留本地修改或未纳入版本控制的文件"
 
-#: ../include/svn_error_codes.h:412
+#: ../include/svn_error_codes.h:421
 msgid "Unmergeable scheduling requested on an entry"
 msgstr "条目有无法合并的调度"
 
-#: ../include/svn_error_codes.h:416
+#: ../include/svn_error_codes.h:425
 msgid "Found a working copy path"
 msgstr "找到一个工作副本路径"
 
-#: ../include/svn_error_codes.h:420
+#: ../include/svn_error_codes.h:429
 msgid "A conflict in the working copy obstructs the current operation"
 msgstr "工作副本中的冲突阻止了当前操作"
 
-#: ../include/svn_error_codes.h:424
+#: ../include/svn_error_codes.h:433
 msgid "Working copy is corrupt"
 msgstr "工作副本已损坏"
 
-#: ../include/svn_error_codes.h:428
+#: ../include/svn_error_codes.h:437
 msgid "Working copy text base is corrupt"
 msgstr "工作副本的参考文件损坏"
 
-#: ../include/svn_error_codes.h:432
+#: ../include/svn_error_codes.h:441
 msgid "Cannot change node kind"
 msgstr "无法修改节点类型"
 
-#: ../include/svn_error_codes.h:436
+#: ../include/svn_error_codes.h:445
 msgid "Invalid operation on the current working directory"
 msgstr "操作对当前工作目录无效"
 
-#: ../include/svn_error_codes.h:440
+#: ../include/svn_error_codes.h:449
 msgid "Problem on first log entry in a working copy"
 msgstr "操作工作副本的第一个日志条目出错"
 
-#: ../include/svn_error_codes.h:444
+#: ../include/svn_error_codes.h:453
 msgid "Unsupported working copy format"
 msgstr "不支持此工作副本格式"
 
-#: ../include/svn_error_codes.h:448
+#: ../include/svn_error_codes.h:457
 msgid "Path syntax not supported in this context"
 msgstr "此上下文不支持路径语法"
 
-#: ../include/svn_error_codes.h:453
+#: ../include/svn_error_codes.h:462
 msgid "Invalid schedule"
 msgstr "无效的调度"
 
-#: ../include/svn_error_codes.h:458
+#: ../include/svn_error_codes.h:467
 msgid "Invalid relocation"
 msgstr "无效重定位"
 
-#: ../include/svn_error_codes.h:463
+#: ../include/svn_error_codes.h:472
 msgid "Invalid switch"
 msgstr "无效的切换"
 
-#: ../include/svn_error_codes.h:468
+#: ../include/svn_error_codes.h:477
 msgid "Changelist doesn't match"
 msgstr "修改列表不匹配"
 
-#: ../include/svn_error_codes.h:473
+#: ../include/svn_error_codes.h:482
 msgid "Conflict resolution failed"
 msgstr "解决冲突失败"
 
-#: ../include/svn_error_codes.h:477
+#: ../include/svn_error_codes.h:486
 msgid "Failed to locate 'copyfrom' path in working copy"
 msgstr "在工作副本中定位 “copyfrom” 的路径失败。"
 
-#: ../include/svn_error_codes.h:485
+#: ../include/svn_error_codes.h:494
 msgid "Moving a path from one changelist to another"
 msgstr "将路径从一个修改列表移到另一个"
 
-#: ../include/svn_error_codes.h:490
+#: ../include/svn_error_codes.h:499
 msgid "Cannot delete a file external"
 msgstr "无法删除外部文件"
 
-#: ../include/svn_error_codes.h:495
+#: ../include/svn_error_codes.h:504
 msgid "Cannot move a file external"
 msgstr "无法移动外部文件"
 
-#: ../include/svn_error_codes.h:500
+#: ../include/svn_error_codes.h:509
 msgid "Something's amiss with the wc sqlite database"
 msgstr "工作副本的 SQLite 数据库有错误"
 
-#: ../include/svn_error_codes.h:505
+#: ../include/svn_error_codes.h:514
 msgid "The working copy is missing"
 msgstr "工作副本丢失"
 
-#: ../include/svn_error_codes.h:510
+#: ../include/svn_error_codes.h:519
 msgid "The specified node is not a symlink"
 msgstr "指定的节点不是符号连接"
 
-#: ../include/svn_error_codes.h:515
+#: ../include/svn_error_codes.h:524
 msgid "The specified path has an unexpected status"
 msgstr "指定的路径有不期望的状态"
 
-#: ../include/svn_error_codes.h:520
+#: ../include/svn_error_codes.h:529
 msgid "The working copy needs to be upgraded"
 msgstr "工作副本需要升级"
 
-#: ../include/svn_error_codes.h:525
+#: ../include/svn_error_codes.h:534
 msgid ""
 "Previous operation has not finished; run 'cleanup' if it was interrupted"
 msgstr "以前的操作没有完成；如果它被中断，请执行“svn cleanup”"
 
-#: ../include/svn_error_codes.h:531
-msgid "The operation can not be performed with the specified depth"
+#: ../include/svn_error_codes.h:540
+msgid "The operation cannot be performed with the specified depth"
 msgstr "在指定的深度不能执行此操作"
 
-#: ../include/svn_error_codes.h:536
+#: ../include/svn_error_codes.h:545
 msgid "Couldn't open a working copy file because access was denied"
 msgstr "不能打开工作副本文件，访问被拒绝"
 
-#: ../include/svn_error_codes.h:542
+#: ../include/svn_error_codes.h:550
+msgid "Mixed-revision working copy was found but not expected"
+msgstr "发现了不期望的混合版本的工作副本"
+
+#: ../include/svn_error_codes.h:555
+msgid "Duplicate targets in svn:externals property"
+msgstr "svn:externals 属性包含重复的目标"
+
+#: ../include/svn_error_codes.h:561
 msgid "General filesystem error"
 msgstr "普通文件系统错误"
 
-#: ../include/svn_error_codes.h:546
+#: ../include/svn_error_codes.h:565
 msgid "Error closing filesystem"
 msgstr "关闭文件系统出错"
 
-#: ../include/svn_error_codes.h:550
+#: ../include/svn_error_codes.h:569
 msgid "Filesystem is already open"
 msgstr "文件系统已经打开"
 
-#: ../include/svn_error_codes.h:554
+#: ../include/svn_error_codes.h:573
 msgid "Filesystem is not open"
 msgstr "文件系统尚未打开"
 
-#: ../include/svn_error_codes.h:558
+#: ../include/svn_error_codes.h:577
 msgid "Filesystem is corrupt"
 msgstr "文件系统损坏"
 
-#: ../include/svn_error_codes.h:562
+#: ../include/svn_error_codes.h:581
 msgid "Invalid filesystem path syntax"
 msgstr "无效文件系统路径语法"
 
-#: ../include/svn_error_codes.h:566
+#: ../include/svn_error_codes.h:585
 msgid "Invalid filesystem revision number"
 msgstr "无效文件系统版本号"
 
-#: ../include/svn_error_codes.h:570
+#: ../include/svn_error_codes.h:589
 msgid "Invalid filesystem transaction name"
 msgstr "无效的文件系统事务名称"
 
-#: ../include/svn_error_codes.h:574
+#: ../include/svn_error_codes.h:593
 msgid "Filesystem directory has no such entry"
 msgstr "文件系统目录没有此条目"
 
-#: ../include/svn_error_codes.h:578
+#: ../include/svn_error_codes.h:597
 msgid "Filesystem has no such representation"
 msgstr "文件系统没有此修订版"
 
-#: ../include/svn_error_codes.h:582
+#: ../include/svn_error_codes.h:601
 msgid "Filesystem has no such string"
 msgstr "文件系统没有此字符串"
 
-#: ../include/svn_error_codes.h:586
+#: ../include/svn_error_codes.h:605
 msgid "Filesystem has no such copy"
 msgstr "文件系统此副本"
 
-#: ../include/svn_error_codes.h:590
+#: ../include/svn_error_codes.h:609
 msgid "The specified transaction is not mutable"
 msgstr "指定的事务不可改变"
 
-#: ../include/svn_error_codes.h:594
+#: ../include/svn_error_codes.h:613
 msgid "Filesystem has no item"
 msgstr "文件系统没有条目"
 
-#: ../include/svn_error_codes.h:598
+#: ../include/svn_error_codes.h:617
 msgid "Filesystem has no such node-rev-id"
 msgstr "文件系统没有此 node-rev-id"
 
-#: ../include/svn_error_codes.h:602
+#: ../include/svn_error_codes.h:621
 msgid "String does not represent a node or node-rev-id"
 msgstr "字符串不是节点或 node-rev-id"
 
-#: ../include/svn_error_codes.h:606
+#: ../include/svn_error_codes.h:625
 msgid "Name does not refer to a filesystem directory"
 msgstr "文件系统无此目录"
 
-#: ../include/svn_error_codes.h:610
+#: ../include/svn_error_codes.h:629
 msgid "Name does not refer to a filesystem file"
 msgstr "文件系统无此文件"
 
-#: ../include/svn_error_codes.h:614
+#: ../include/svn_error_codes.h:633
 msgid "Name is not a single path component"
 msgstr "名称不是单一路径"
 
-#: ../include/svn_error_codes.h:618
+#: ../include/svn_error_codes.h:637
 msgid "Attempt to change immutable filesystem node"
 msgstr "试图修改不变的文件系统节点"
 
-#: ../include/svn_error_codes.h:622
+#: ../include/svn_error_codes.h:641
 msgid "Item already exists in filesystem"
 msgstr "文件系统已有此条目"
 
-#: ../include/svn_error_codes.h:626
+#: ../include/svn_error_codes.h:645
 msgid "Attempt to remove or recreate fs root dir"
 msgstr "试图删除或重建文件系统根目录"
 
-#: ../include/svn_error_codes.h:630
+#: ../include/svn_error_codes.h:649
 msgid "Object is not a transaction root"
 msgstr "对象不是事务的根"
 
-#: ../include/svn_error_codes.h:634
+#: ../include/svn_error_codes.h:653
 msgid "Object is not a revision root"
 msgstr "对象不是版本的根"
 
-#: ../include/svn_error_codes.h:638
+#: ../include/svn_error_codes.h:657
 msgid "Merge conflict during commit"
 msgstr "提交时发生合并冲突"
 
-#: ../include/svn_error_codes.h:642
+#: ../include/svn_error_codes.h:661
 msgid "A representation vanished or changed between reads"
 msgstr "读取时修订版消失或改变"
 
-#: ../include/svn_error_codes.h:646
+#: ../include/svn_error_codes.h:665
 msgid "Tried to change an immutable representation"
 msgstr "试图修改不变的修订版"
 
-#: ../include/svn_error_codes.h:650
+#: ../include/svn_error_codes.h:669
 msgid "Malformed skeleton data"
 msgstr "非法骨架数据"
 
-#: ../include/svn_error_codes.h:654
+#: ../include/svn_error_codes.h:673
 msgid "Transaction is out of date"
 msgstr "事务过时"
 
-#: ../include/svn_error_codes.h:658
+#: ../include/svn_error_codes.h:677
 msgid "Berkeley DB error"
 msgstr "BDB 错误"
 
-#: ../include/svn_error_codes.h:662
+#: ../include/svn_error_codes.h:681
 msgid "Berkeley DB deadlock error"
 msgstr "BDB 死锁"
 
-#: ../include/svn_error_codes.h:666
+#: ../include/svn_error_codes.h:685
 msgid "Transaction is dead"
 msgstr "事务已经结束"
 
-#: ../include/svn_error_codes.h:670
+#: ../include/svn_error_codes.h:689
 msgid "Transaction is not dead"
 msgstr "事务尚未结束"
 
-#: ../include/svn_error_codes.h:675
+#: ../include/svn_error_codes.h:694
 msgid "Unknown FS type"
 msgstr "未知的FS类型"
 
-#: ../include/svn_error_codes.h:680
+#: ../include/svn_error_codes.h:699
 msgid "No user associated with filesystem"
 msgstr "没有用户与文件系统关联"
 
-#: ../include/svn_error_codes.h:685
+#: ../include/svn_error_codes.h:704
 msgid "Path is already locked"
 msgstr "已经锁定路径"
 
-#: ../include/svn_error_codes.h:690 ../include/svn_error_codes.h:852
+#: ../include/svn_error_codes.h:709 ../include/svn_error_codes.h:886
 msgid "Path is not locked"
 msgstr "路径没有加锁"
 
-#: ../include/svn_error_codes.h:695
+#: ../include/svn_error_codes.h:714
 msgid "Lock token is incorrect"
 msgstr "不正确的锁定令牌"
 
-#: ../include/svn_error_codes.h:700
+#: ../include/svn_error_codes.h:719
 msgid "No lock token provided"
 msgstr "没有提供锁定令牌"
 
-#: ../include/svn_error_codes.h:705
+#: ../include/svn_error_codes.h:724
 msgid "Username does not match lock owner"
 msgstr "用户不是锁所有者"
 
-#: ../include/svn_error_codes.h:710
+#: ../include/svn_error_codes.h:729
 msgid "Filesystem has no such lock"
 msgstr "文件系统没有此锁"
 
-#: ../include/svn_error_codes.h:715
+#: ../include/svn_error_codes.h:734
 msgid "Lock has expired"
 msgstr "锁过期"
 
-#: ../include/svn_error_codes.h:720 ../include/svn_error_codes.h:839
+#: ../include/svn_error_codes.h:739 ../include/svn_error_codes.h:873
 msgid "Item is out of date"
 msgstr "条目过时"
 
-#: ../include/svn_error_codes.h:732
+#: ../include/svn_error_codes.h:751
 msgid "Unsupported FS format"
 msgstr "不支持的文件系统格式"
 
-#: ../include/svn_error_codes.h:737
+#: ../include/svn_error_codes.h:756
 msgid "Representation is being written"
 msgstr "正在写修订版"
 
-#: ../include/svn_error_codes.h:742
+#: ../include/svn_error_codes.h:761
 msgid "The generated transaction name is too long"
 msgstr "产生的事务名称太长"
 
-#: ../include/svn_error_codes.h:747
+#: ../include/svn_error_codes.h:766
 msgid "Filesystem has no such node origin record"
 msgstr "文件系统没有此节点的原始记录"
 
-#: ../include/svn_error_codes.h:752
+#: ../include/svn_error_codes.h:771
 msgid "Filesystem upgrade is not supported"
 msgstr "不支持文件系统升级"
 
-#: ../include/svn_error_codes.h:757
+#: ../include/svn_error_codes.h:776
 msgid "Filesystem has no such checksum-representation index record"
 msgstr "文件系统没有此校验和展现索引记录"
 
-#: ../include/svn_error_codes.h:762
+#: ../include/svn_error_codes.h:781
 msgid "Property value in filesystem differs from the provided base value"
 msgstr "文件系统中的属性值与提供的基础值不同"
 
-#: ../include/svn_error_codes.h:769
+#: ../include/svn_error_codes.h:787
+msgid "The filesystem editor completion process was not followed"
+msgstr "没有运行文件系统编辑器完成进程"
+
+#: ../include/svn_error_codes.h:792
+msgid "A packed revprop could not be read"
+msgstr "不能读取打包的 revprop"
+
+#: ../include/svn_error_codes.h:797
+msgid "Could not initialize the revprop caching infrastructure."
+msgstr "不能初始化 revprop 缓存"
+
+#: ../include/svn_error_codes.h:803
 msgid "The repository is locked, perhaps for db recovery"
 msgstr "版本库被锁，可能正在恢复"
 
-#: ../include/svn_error_codes.h:773
+#: ../include/svn_error_codes.h:807
 msgid "A repository hook failed"
 msgstr "版本库钩子错误"
 
-#: ../include/svn_error_codes.h:777
+#: ../include/svn_error_codes.h:811
 msgid "Incorrect arguments supplied"
 msgstr "提供了不正确的参数"
 
-#: ../include/svn_error_codes.h:781
+#: ../include/svn_error_codes.h:815
 msgid "A report cannot be generated because no data was supplied"
 msgstr "没有数据，无法产生报告"
 
-#: ../include/svn_error_codes.h:785
+#: ../include/svn_error_codes.h:819
 msgid "Bogus revision report"
 msgstr "版本报告非法"
 
-#: ../include/svn_error_codes.h:794
+#: ../include/svn_error_codes.h:828
 msgid "Unsupported repository version"
 msgstr "不支持此版本库版本"
 
-#: ../include/svn_error_codes.h:798
+#: ../include/svn_error_codes.h:832
 msgid "Disabled repository feature"
 msgstr "关闭版本库特性"
 
-#: ../include/svn_error_codes.h:802
+#: ../include/svn_error_codes.h:836
 msgid "Error running post-commit hook"
 msgstr "执行 post-commit 钩子错误"
 
-#: ../include/svn_error_codes.h:807
+#: ../include/svn_error_codes.h:841
 msgid "Error running post-lock hook"
 msgstr "执行 post-lock 钩子错误"
 
-#: ../include/svn_error_codes.h:812
+#: ../include/svn_error_codes.h:846
 msgid "Error running post-unlock hook"
 msgstr "执行 post-unlock 钩子错误"
 
-#: ../include/svn_error_codes.h:817
+#: ../include/svn_error_codes.h:851
 msgid "Repository upgrade is not supported"
 msgstr "不支持版本库升级"
 
-#: ../include/svn_error_codes.h:823
+#: ../include/svn_error_codes.h:857
 msgid "Bad URL passed to RA layer"
 msgstr "传递至 RA 层的 URL 错误"
 
-#: ../include/svn_error_codes.h:827
+#: ../include/svn_error_codes.h:861
 msgid "Authorization failed"
 msgstr "认证失败"
 
-#: ../include/svn_error_codes.h:831
+#: ../include/svn_error_codes.h:865
 msgid "Unknown authorization method"
 msgstr "未知认证"
 
-#: ../include/svn_error_codes.h:835
+#: ../include/svn_error_codes.h:869
 msgid "Repository access method not implemented"
 msgstr "版本库未实现存取方法"
 
-#: ../include/svn_error_codes.h:843
+#: ../include/svn_error_codes.h:877
 msgid "Repository has no UUID"
 msgstr "版本库没有 UUID"
 
-#: ../include/svn_error_codes.h:847
+#: ../include/svn_error_codes.h:881
 msgid "Unsupported RA plugin ABI version"
 msgstr "不支持此 RA 插件的 ABI 版本"
 
-#: ../include/svn_error_codes.h:857
+#: ../include/svn_error_codes.h:891
 msgid "Server can only replay from the root of a repository"
 msgstr "服务器只能从版本库的根重放"
 
-#: ../include/svn_error_codes.h:862
+#: ../include/svn_error_codes.h:896
 msgid "Repository UUID does not match expected UUID"
 msgstr "版本库的 UUID 与期望的 UUID 不匹配"
 
-#: ../include/svn_error_codes.h:867
+#: ../include/svn_error_codes.h:901
 msgid "Repository root URL does not match expected root URL"
 msgstr "版本库根 URL 与期望的根 URL 不匹配"
 
-#: ../include/svn_error_codes.h:872
+#: ../include/svn_error_codes.h:906
 msgid "Session URL does not match expected session URL"
 msgstr "会话 URL 与期望的会话 URL 不匹配"
 
-#: ../include/svn_error_codes.h:878
+#: ../include/svn_error_codes.h:911 ../libsvn_ra_svn/client.c:492
+#, c-format
+msgid "Can't create tunnel"
+msgstr "无法创建隧道"
+
+#: ../include/svn_error_codes.h:917
 msgid "RA layer failed to init socket layer"
 msgstr "RA 层无法初始化 socket 层"
 
-#: ../include/svn_error_codes.h:882
+#: ../include/svn_error_codes.h:921
 msgid "RA layer failed to create HTTP request"
 msgstr "RA 层创建 HTTP 请求失败"
 
-#: ../include/svn_error_codes.h:886
+#: ../include/svn_error_codes.h:925
 msgid "RA layer request failed"
 msgstr "RA 层请求失败"
 
-#: ../include/svn_error_codes.h:890
+#: ../include/svn_error_codes.h:929
 msgid "RA layer didn't receive requested OPTIONS info"
 msgstr "RA 层无法取得请求的 OPTIONS 信息"
 
-#: ../include/svn_error_codes.h:894
+#: ../include/svn_error_codes.h:933
 msgid "RA layer failed to fetch properties"
 msgstr "RA 层无法取得属性"
 
-#: ../include/svn_error_codes.h:898
+#: ../include/svn_error_codes.h:937
 msgid "RA layer file already exists"
 msgstr "RA 层文件已经存在"
 
-#: ../include/svn_error_codes.h:912
+#: ../include/svn_error_codes.h:951
 msgid "HTTP Path Not Found"
 msgstr "找不到 HTTP 路径"
 
-#: ../include/svn_error_codes.h:916
+#: ../include/svn_error_codes.h:955
 msgid "Failed to execute WebDAV PROPPATCH"
 msgstr "执行 WebDAV PROPPATCH 失败"
 
-#: ../include/svn_error_codes.h:921 ../include/svn_error_codes.h:972
-#: ../libsvn_ra_svn/marshal.c:712 ../libsvn_ra_svn/marshal.c:830
-#: ../libsvn_ra_svn/marshal.c:857
+#: ../include/svn_error_codes.h:960 ../include/svn_error_codes.h:1403
+#: ../libsvn_ra_svn/marshal.c:1075 ../libsvn_ra_svn/marshal.c:1285
+#: ../libsvn_ra_svn/marshal.c:1315
 msgid "Malformed network data"
 msgstr "非法网络数据"
 
-#: ../include/svn_error_codes.h:926
+#: ../include/svn_error_codes.h:965
 msgid "Unable to extract data from response header"
 msgstr "不能从响应的头信息中获取数据"
 
-#: ../include/svn_error_codes.h:931
+#: ../include/svn_error_codes.h:970
 msgid "Repository has been moved"
 msgstr "版本库已经移动"
 
-#: ../include/svn_error_codes.h:936 ../libsvn_ra_serf/replay.c:860
-#: ../libsvn_ra_serf/update.c:2410 ../libsvn_ra_serf/util.c:705
+#: ../include/svn_error_codes.h:975 ../libsvn_ra_serf/update.c:2881
+#: ../libsvn_ra_serf/util.c:927
 msgid "Connection timed out"
 msgstr "连接超时"
 
-#: ../include/svn_error_codes.h:941
+#: ../include/svn_error_codes.h:980
 msgid "URL access forbidden for unknown reason"
 msgstr "因为未知的理由，禁止访问 URL"
 
-#: ../include/svn_error_codes.h:947 ../include/svn_error_codes.h:976
+#: ../include/svn_error_codes.h:986 ../include/svn_error_codes.h:1407
 msgid "Couldn't find a repository"
 msgstr "无法找到版本库"
 
-#: ../include/svn_error_codes.h:951
+#: ../include/svn_error_codes.h:990
 msgid "Couldn't open a repository"
 msgstr "无法打开版本库"
 
-#: ../include/svn_error_codes.h:956
-msgid "Special code for wrapping server errors to report to client"
-msgstr "用专用代码封装服务器错误以便报告客户端"
-
-#: ../include/svn_error_codes.h:960
-msgid "Unknown svn protocol command"
-msgstr "未知的 svn 协议命令"
-
-#: ../include/svn_error_codes.h:964
-msgid "Network connection closed unexpectedly"
-msgstr "网络连接意外关闭"
-
-#: ../include/svn_error_codes.h:968
-msgid "Network read/write error"
-msgstr "网络读写错误"
-
-#: ../include/svn_error_codes.h:980
-msgid "Client/server version mismatch"
-msgstr "客户端/服务器版本不匹配"
-
-#: ../include/svn_error_codes.h:985
-msgid "Cannot negotiate authentication mechanism"
-msgstr "无法协商认证机制"
-
-#: ../include/svn_error_codes.h:990
-msgid "Editor drive was aborted"
-msgstr "编辑器中止"
-
 #: ../include/svn_error_codes.h:996
-msgid "Initialization of SSPI library failed"
-msgstr "初始化 SSPI 库失败"
-
-#: ../include/svn_error_codes.h:1000
-msgid "Server SSL certificate untrusted"
-msgstr "服务器的 SSL 证书不被信任"
-
-#: ../include/svn_error_codes.h:1004
-msgid "Initialization of the GSSAPI context failed"
-msgstr "初始化 GSSAPI 失败"
-
-#: ../include/svn_error_codes.h:1009
-msgid "While handling serf response:"
-msgstr "当处理 serf 的响应时:"
-
-#: ../include/svn_error_codes.h:1017
-msgid "Credential data unavailable"
-msgstr "无法取得凭证数据"
-
-#: ../include/svn_error_codes.h:1021
-msgid "No authentication provider available"
-msgstr "没有可用的认证提供者"
-
-#: ../include/svn_error_codes.h:1025
-msgid "All authentication providers exhausted"
-msgstr "所有的认证提供者都不可用"
-
-#: ../include/svn_error_codes.h:1029
-msgid "Credentials not saved"
-msgstr "没有保存凭证数据"
-
-#: ../include/svn_error_codes.h:1034
-msgid "Authentication failed"
-msgstr "认证失败"
-
-#: ../include/svn_error_codes.h:1040
-msgid "Read access denied for root of edit"
-msgstr "编辑根目录时拒绝读取"
-
-#: ../include/svn_error_codes.h:1045
-msgid "Item is not readable"
-msgstr "条目不可读"
-
-#: ../include/svn_error_codes.h:1050
-msgid "Item is partially readable"
-msgstr "条目部分可读"
-
-#: ../include/svn_error_codes.h:1054
-msgid "Invalid authz configuration"
-msgstr "认证配置无效"
-
-#: ../include/svn_error_codes.h:1059
-msgid "Item is not writable"
-msgstr "条目不能写"
-
-#: ../include/svn_error_codes.h:1065
 msgid "Svndiff data has invalid header"
 msgstr "svndiff 数据包含无效头"
 
-#: ../include/svn_error_codes.h:1069
+#: ../include/svn_error_codes.h:1000
 msgid "Svndiff data contains corrupt window"
 msgstr "Svndiff 数据包含损坏窗口"
 
-#: ../include/svn_error_codes.h:1073
+#: ../include/svn_error_codes.h:1004
 msgid "Svndiff data contains backward-sliding source view"
 msgstr "Svndiff 数据包含向后变化的资源视图"
 
-#: ../include/svn_error_codes.h:1077
+#: ../include/svn_error_codes.h:1008
 msgid "Svndiff data contains invalid instruction"
 msgstr "svndiff 数据包含无效指令"
 
-#: ../include/svn_error_codes.h:1081
+#: ../include/svn_error_codes.h:1012
 msgid "Svndiff data ends unexpectedly"
 msgstr "svndiff 数据意外结束"
 
-#: ../include/svn_error_codes.h:1085
+#: ../include/svn_error_codes.h:1016
 msgid "Svndiff compressed data is invalid"
 msgstr "非法 svndiff 压缩数据"
 
-#: ../include/svn_error_codes.h:1091
-msgid "Diff data source modified unexpectedly"
-msgstr "svndiff 数据被意外修改"
-
-#: ../include/svn_error_codes.h:1097
+#: ../include/svn_error_codes.h:1022
 msgid "Apache has no path to an SVN filesystem"
 msgstr "Apache 没有指向 SVN 文件系统的路径"
 
-#: ../include/svn_error_codes.h:1101
+#: ../include/svn_error_codes.h:1026
 msgid "Apache got a malformed URI"
 msgstr "Apache 得到非法 URI"
 
-#: ../include/svn_error_codes.h:1105
+#: ../include/svn_error_codes.h:1030
 msgid "Activity not found"
 msgstr "没有找到活动项"
 
-#: ../include/svn_error_codes.h:1109
+#: ../include/svn_error_codes.h:1034
 msgid "Baseline incorrect"
 msgstr "基线错误"
 
-#: ../include/svn_error_codes.h:1113
+#: ../include/svn_error_codes.h:1038
 msgid "Input/output error"
 msgstr "输出/输出错误"
 
-#: ../include/svn_error_codes.h:1119
+#: ../include/svn_error_codes.h:1044
 msgid "A path under version control is needed for this operation"
 msgstr "只能对纳入版本控制的路径执行此操作"
 
-#: ../include/svn_error_codes.h:1123
+#: ../include/svn_error_codes.h:1048
 msgid "Repository access is needed for this operation"
 msgstr "此操作需要存取版本库"
 
-#: ../include/svn_error_codes.h:1127
+#: ../include/svn_error_codes.h:1052
 msgid "Bogus revision information given"
 msgstr "给出的版本信息非法"
 
-#: ../include/svn_error_codes.h:1131
+#: ../include/svn_error_codes.h:1056
 msgid "Attempting to commit to a URL more than once"
 msgstr "试图对 URL 进行多次提交"
 
-#: ../include/svn_error_codes.h:1135
+#: ../include/svn_error_codes.h:1060
 msgid "Operation does not apply to binary file"
 msgstr "不能对二进制文件执行此操作"
 
-#: ../include/svn_error_codes.h:1141
+#: ../include/svn_error_codes.h:1066
 msgid "Format of an svn:externals property was invalid"
 msgstr "svn:externals 属性格式非法"
 
-#: ../include/svn_error_codes.h:1145
+#: ../include/svn_error_codes.h:1070
 msgid "Attempting restricted operation for modified resource"
 msgstr "试图对已修改的资源进行受限操作"
 
-#: ../include/svn_error_codes.h:1149
+#: ../include/svn_error_codes.h:1074
 msgid "Operation does not apply to directory"
 msgstr "不能对目录执行此操作"
 
-#: ../include/svn_error_codes.h:1153
+#: ../include/svn_error_codes.h:1078
 msgid "Revision range is not allowed"
 msgstr "不允许的版本范围"
 
-#: ../include/svn_error_codes.h:1157
+#: ../include/svn_error_codes.h:1082
 msgid "Inter-repository relocation not allowed"
 msgstr "不支持版本库之间的重新定位"
 
-#: ../include/svn_error_codes.h:1161
+#: ../include/svn_error_codes.h:1086
 msgid "Author name cannot contain a newline"
 msgstr "作者名称不能换行"
 
-#: ../include/svn_error_codes.h:1165
+#: ../include/svn_error_codes.h:1090
 msgid "Bad property name"
 msgstr "属性名称错误"
 
-#: ../include/svn_error_codes.h:1170
+#: ../include/svn_error_codes.h:1095
 msgid "Two versioned resources are unrelated"
 msgstr "两个纳入版本控制的资源不相关"
 
-#: ../include/svn_error_codes.h:1175
+#: ../include/svn_error_codes.h:1100
 msgid "Path has no lock token"
 msgstr "路径没有锁定令牌"
 
-#: ../include/svn_error_codes.h:1180
+#: ../include/svn_error_codes.h:1105
 msgid "Operation does not support multiple sources"
 msgstr "此操作不支持多个源对象"
 
-#: ../include/svn_error_codes.h:1185
+#: ../include/svn_error_codes.h:1110
 msgid "No versioned parent directories"
 msgstr "没有受版本控制的父目录"
 
-#: ../include/svn_error_codes.h:1190 ../include/svn_error_codes.h:1210
+#: ../include/svn_error_codes.h:1115 ../include/svn_error_codes.h:1135
 msgid "Working copy and merge source not ready for reintegration"
 msgstr "工作副本与合并来源没有准备好复兴"
 
-#: ../include/svn_error_codes.h:1195
+#: ../include/svn_error_codes.h:1120
 msgid "A file external cannot overwrite an existing versioned item"
 msgstr "外部引用的文件不能覆写已存的版本控制的条目"
 
-#: ../include/svn_error_codes.h:1200
+#: ../include/svn_error_codes.h:1125
 msgid "Invalid path component strip count specified"
 msgstr "指定了无效的路径组件修剪计数"
 
-#: ../include/svn_error_codes.h:1205
+#: ../include/svn_error_codes.h:1130
 msgid "Detected a cycle while processing the operation"
 msgstr "当处理此操作是，检测到死循环"
 
-#: ../include/svn_error_codes.h:1215
+#: ../include/svn_error_codes.h:1140
 msgid "Invalid mergeinfo detected in merge target"
 msgstr "在合并目标检测到了合并信息"
 
-#: ../include/svn_error_codes.h:1220
+#: ../include/svn_error_codes.h:1145
 msgid "Can't perform this operation without a valid lock token"
 msgstr "不能在没有合法的锁令牌时执行此操作"
 
-#: ../include/svn_error_codes.h:1225
+#: ../include/svn_error_codes.h:1150
 msgid "The operation is forbidden by the server"
 msgstr "操作被服务器禁止"
 
-#: ../include/svn_error_codes.h:1231
+#: ../include/svn_error_codes.h:1156
 msgid "A problem occurred; see other errors for details"
 msgstr "发生问题；请参阅其它错误信息"
 
-#: ../include/svn_error_codes.h:1235
+#: ../include/svn_error_codes.h:1160
 msgid "Failure loading plugin"
 msgstr "加载插件失败"
 
-#: ../include/svn_error_codes.h:1239
+#: ../include/svn_error_codes.h:1164
 msgid "Malformed file"
 msgstr "文件格式错误"
 
-#: ../include/svn_error_codes.h:1243
+#: ../include/svn_error_codes.h:1168
 msgid "Incomplete data"
 msgstr "数据不完整"
 
-#: ../include/svn_error_codes.h:1247
+#: ../include/svn_error_codes.h:1172
 msgid "Incorrect parameters given"
 msgstr "参数不正确"
 
-#: ../include/svn_error_codes.h:1251
+#: ../include/svn_error_codes.h:1176
 msgid "Tried a versioning operation on an unversioned resource"
 msgstr "试图对未纳入版本控制的资源进行版本操作"
 
-#: ../include/svn_error_codes.h:1255
+#: ../include/svn_error_codes.h:1180
 msgid "Test failed"
 msgstr "测试失败"
 
-#: ../include/svn_error_codes.h:1259
+#: ../include/svn_error_codes.h:1184
 msgid "Trying to use an unsupported feature"
 msgstr "试图使用不支持的特性"
 
-#: ../include/svn_error_codes.h:1263
+#: ../include/svn_error_codes.h:1188
 msgid "Unexpected or unknown property kind"
 msgstr "意外或未知的属性类型"
 
-#: ../include/svn_error_codes.h:1267
+#: ../include/svn_error_codes.h:1192
 msgid "Illegal target for the requested operation"
 msgstr "此请求操作的目标非法"
 
-#: ../include/svn_error_codes.h:1271
+#: ../include/svn_error_codes.h:1196
 msgid "MD5 checksum is missing"
 msgstr "没有 MD5 校验和"
 
-#: ../include/svn_error_codes.h:1275
+#: ../include/svn_error_codes.h:1200
 msgid "Directory needs to be empty but is not"
 msgstr "必须为空的目录有内容"
 
-#: ../include/svn_error_codes.h:1279
+#: ../include/svn_error_codes.h:1204
 msgid "Error calling external program"
 msgstr "调用外部程序错误"
 
-#: ../include/svn_error_codes.h:1283
+#: ../include/svn_error_codes.h:1208
 msgid "Python exception has been set with the error"
 msgstr "Python 异常被设为错误"
 
-#: ../include/svn_error_codes.h:1287
+#: ../include/svn_error_codes.h:1212
 msgid "A checksum mismatch occurred"
 msgstr "校验和错误"
 
-#: ../include/svn_error_codes.h:1291
+#: ../include/svn_error_codes.h:1216
 msgid "The operation was interrupted"
 msgstr "操作被中断"
 
-#: ../include/svn_error_codes.h:1295
+#: ../include/svn_error_codes.h:1220
 msgid "The specified diff option is not supported"
 msgstr "不支持指定的 diff 选项"
 
-#: ../include/svn_error_codes.h:1299
+#: ../include/svn_error_codes.h:1224
 msgid "Property not found"
 msgstr "找不到属性"
 
-#: ../include/svn_error_codes.h:1303
+#: ../include/svn_error_codes.h:1228
 msgid "No auth file path available"
 msgstr "未提供 auth 文件路径"
 
-#: ../include/svn_error_codes.h:1308
+#: ../include/svn_error_codes.h:1233
 msgid "Incompatible library version"
 msgstr "不兼容的库版本"
 
-#: ../include/svn_error_codes.h:1313
+#: ../include/svn_error_codes.h:1238
 msgid "Mergeinfo parse error"
 msgstr "分析合并信息出错"
 
-#: ../include/svn_error_codes.h:1318
+#: ../include/svn_error_codes.h:1243
 msgid "Cease invocation of this API"
 msgstr "停止调用此 API"
 
-#: ../include/svn_error_codes.h:1323
+#: ../include/svn_error_codes.h:1248
 msgid "Error parsing revision number"
 msgstr "解析版本号出错"
 
-#: ../include/svn_error_codes.h:1328
+#: ../include/svn_error_codes.h:1253
 msgid "Iteration terminated before completion"
 msgstr "迭代在完成前终止"
 
-#: ../include/svn_error_codes.h:1333
+#: ../include/svn_error_codes.h:1258
 msgid "Unknown changelist"
 msgstr "未知修改列表"
 
-#: ../include/svn_error_codes.h:1338
+#: ../include/svn_error_codes.h:1263
 msgid "Reserved directory name in command line arguments"
 msgstr "在命令行参数中包含保留的目录名称"
 
-#: ../include/svn_error_codes.h:1343
+#: ../include/svn_error_codes.h:1268
 msgid "Inquiry about unknown capability"
 msgstr "查询未知特性"
 
-#: ../include/svn_error_codes.h:1348
+#: ../include/svn_error_codes.h:1273
 msgid "Test skipped"
 msgstr "跳过测试"
 
-#: ../include/svn_error_codes.h:1353
-msgid "apr memcache library not available"
-msgstr "apr memcache 库不可用"
+#: ../include/svn_error_codes.h:1278
+msgid "APR memcache library not available"
+msgstr "APR memcache 库不可用"
 
-#: ../include/svn_error_codes.h:1358
+#: ../include/svn_error_codes.h:1283
 msgid "Couldn't perform atomic initialization"
 msgstr "不能完成原子的初始化"
 
-#: ../include/svn_error_codes.h:1363
+#: ../include/svn_error_codes.h:1288
 msgid "SQLite error"
 msgstr "SQLite 错误"
 
-#: ../include/svn_error_codes.h:1368
+#: ../include/svn_error_codes.h:1293
 msgid "Attempted to write to readonly SQLite db"
 msgstr "试图写至只读 SQLite 数据库"
 
-#: ../include/svn_error_codes.h:1373
+#: ../include/svn_error_codes.h:1300
 msgid "Unsupported schema found in SQLite db"
 msgstr "不支持 SQLite 数据库中的方案"
 
-#: ../include/svn_error_codes.h:1378
+#: ../include/svn_error_codes.h:1305
 msgid "The SQLite db is busy"
 msgstr "SQLite 数据库繁忙"
 
-#: ../include/svn_error_codes.h:1383
+#: ../include/svn_error_codes.h:1310
 msgid ""
 "SQLite busy at transaction rollback; resetting all busy SQLite statements to "
 "allow rollback"
 msgstr "SQLite 忙于回滚事务; 请重置所有繁忙的 SQLite 语句，以便允许回滚"
 
-#: ../include/svn_error_codes.h:1389
+#: ../include/svn_error_codes.h:1316
 msgid "Constraint error in SQLite db"
 msgstr "在 SQLite 数据库中的约束出错"
 
-#: ../include/svn_error_codes.h:1395
+#: ../include/svn_error_codes.h:1321
+msgid "Too many memcached servers configured"
+msgstr "配置了太多的 memcached 服务器"
+
+#: ../include/svn_error_codes.h:1326
+msgid "Failed to parse version number string"
+msgstr "解析版本号字符串失败"
+
+#: ../include/svn_error_codes.h:1331
+msgid "Atomic data storage is corrupt"
+msgstr "原子数据存储损坏"
+
+#: ../include/svn_error_codes.h:1337
 msgid "Error parsing arguments"
 msgstr "解析参数出错"
 
-#: ../include/svn_error_codes.h:1399
+#: ../include/svn_error_codes.h:1341
 msgid "Not enough arguments provided"
 msgstr "没有提供足够的参数"
 
-#: ../include/svn_error_codes.h:1403
+#: ../include/svn_error_codes.h:1345
 msgid "Mutually exclusive arguments specified"
 msgstr "参数冲突"
 
-#: ../include/svn_error_codes.h:1407
+#: ../include/svn_error_codes.h:1349
 msgid "Attempted command in administrative dir"
 msgstr "试图在管理目录中执行命令"
 
-#: ../include/svn_error_codes.h:1411
+#: ../include/svn_error_codes.h:1353
 msgid "The log message file is under version control"
 msgstr "日志信息文件被纳入版本控制"
 
-#: ../include/svn_error_codes.h:1415
+#: ../include/svn_error_codes.h:1357
 msgid "The log message is a pathname"
 msgstr "日志信息是路径名"
 
-#: ../include/svn_error_codes.h:1419
+#: ../include/svn_error_codes.h:1361
 msgid "Committing in directory scheduled for addition"
 msgstr "在调度增加的目录中进行提交"
 
-#: ../include/svn_error_codes.h:1423
+#: ../include/svn_error_codes.h:1365
 msgid "No external editor available"
 msgstr "没有外部编辑器可用"
 
-#: ../include/svn_error_codes.h:1427
+#: ../include/svn_error_codes.h:1369
 msgid "Something is wrong with the log message's contents"
 msgstr "日志信息内容不妥"
 
-#: ../include/svn_error_codes.h:1431
+#: ../include/svn_error_codes.h:1373
 msgid "A log message was given where none was necessary"
 msgstr "在不需要时给出日志信息"
 
-#: ../include/svn_error_codes.h:1435
+#: ../include/svn_error_codes.h:1377
 msgid "No external merge tool available"
 msgstr "没有外部合并工具可用"
 
-#: ../include/svn_error_codes.h:1439
+#: ../include/svn_error_codes.h:1381
 msgid "Failed processing one or more externals definitions"
 msgstr "处理一个或更多的外部定义失败"
 
-#: ../include/svn_error_codes.h:1445
+#: ../include/svn_error_codes.h:1387
+msgid "Special code for wrapping server errors to report to client"
+msgstr "用专用代码封装服务器错误以便报告客户端"
+
+#: ../include/svn_error_codes.h:1391
+msgid "Unknown svn protocol command"
+msgstr "未知的 svn 协议命令"
+
+#: ../include/svn_error_codes.h:1395
+msgid "Network connection closed unexpectedly"
+msgstr "网络连接意外关闭"
+
+#: ../include/svn_error_codes.h:1399
+msgid "Network read/write error"
+msgstr "网络读写错误"
+
+#: ../include/svn_error_codes.h:1411
+msgid "Client/server version mismatch"
+msgstr "客户端/服务器版本不匹配"
+
+#: ../include/svn_error_codes.h:1416
+msgid "Cannot negotiate authentication mechanism"
+msgstr "无法协商认证机制"
+
+#: ../include/svn_error_codes.h:1421
+msgid "Editor drive was aborted"
+msgstr "编辑器中止"
+
+#: ../include/svn_error_codes.h:1429
+msgid "Credential data unavailable"
+msgstr "无法取得凭证数据"
+
+#: ../include/svn_error_codes.h:1433
+msgid "No authentication provider available"
+msgstr "没有可用的认证提供者"
+
+#: ../include/svn_error_codes.h:1437
+msgid "All authentication providers exhausted"
+msgstr "所有的认证提供者都不可用"
+
+#: ../include/svn_error_codes.h:1441
+msgid "Credentials not saved"
+msgstr "没有保存凭证数据"
+
+#: ../include/svn_error_codes.h:1446
+msgid "Authentication failed"
+msgstr "认证失败"
+
+#: ../include/svn_error_codes.h:1452
+msgid "Read access denied for root of edit"
+msgstr "编辑根目录时拒绝读取"
+
+#: ../include/svn_error_codes.h:1457
+msgid "Item is not readable"
+msgstr "条目不可读"
+
+#: ../include/svn_error_codes.h:1462
+msgid "Item is partially readable"
+msgstr "条目部分可读"
+
+#: ../include/svn_error_codes.h:1466
+msgid "Invalid authz configuration"
+msgstr "认证配置无效"
+
+#: ../include/svn_error_codes.h:1471
+msgid "Item is not writable"
+msgstr "条目不能写"
+
+#: ../include/svn_error_codes.h:1478
+msgid "Diff data source modified unexpectedly"
+msgstr "svndiff 数据被意外修改"
+
+#: ../include/svn_error_codes.h:1484
+msgid "Initialization of SSPI library failed"
+msgstr "初始化 SSPI 库失败"
+
+#: ../include/svn_error_codes.h:1488
+msgid "Server SSL certificate untrusted"
+msgstr "服务器的 SSL 证书不被信任"
+
+#: ../include/svn_error_codes.h:1493
+msgid "Initialization of the GSSAPI context failed"
+msgstr "初始化 GSSAPI 失败"
+
+#: ../include/svn_error_codes.h:1498
+msgid "While handling serf response:"
+msgstr "当处理 serf 的响应时:"
+
+#: ../include/svn_error_codes.h:1504
 msgid "Assertion failure"
 msgstr "断言失败"
 
-#: ../include/svn_error_codes.h:1449
+#: ../include/svn_error_codes.h:1508
 msgid "No non-tracing links found in the error chain"
 msgstr "没有发现错误链中的非跟踪链接"
 
-#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:273
+#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:274
 msgid "GNOME Keyring is locked and we are non-interactive"
 msgstr "GNOME Keyring 被锁定，并且我们处于非交互方式"
 
-#: ../libsvn_client/add.c:550
+#: ../libsvn_client/add.c:606 ../libsvn_client/cmdline.c:356
+#: ../libsvn_subr/opt.c:930
+#, c-format
+msgid "'%s' ends in a reserved name"
+msgstr "“%s”以保留名称结束"
+
+#: ../libsvn_client/add.c:875
 #, c-format
 msgid "'%s' prevents creating parent of '%s'"
 msgstr "'%s' 阻止创建 '%s' 的父亲"
 
-#: ../libsvn_client/add.c:587 ../libsvn_wc/adm_ops.c:918
+#: ../libsvn_client/add.c:914 ../libsvn_wc/adm_ops.c:732
 #, c-format
 msgid ""
 "'%s' is an existing item in conflict; please mark the conflict as resolved "
 "before adding a new item here"
 msgstr "条目“%s”处于冲突状态；请在新增之前标记冲突为已经解决"
 
-#: ../libsvn_client/add.c:594 ../libsvn_wc/adm_ops.c:873
-#: ../libsvn_wc/workqueue.c:960 ../libsvn_wc/workqueue.c:1053
+#: ../libsvn_client/add.c:921 ../libsvn_wc/adm_ops.c:687
+#: ../libsvn_wc/workqueue.c:905 ../libsvn_wc/workqueue.c:999
 #, c-format
 msgid "'%s' not found"
 msgstr "找不到 “%s”"
 
-#: ../libsvn_client/add.c:600 ../libsvn_wc/adm_ops.c:588
-#: ../libsvn_wc/adm_ops.c:878
+#: ../libsvn_client/add.c:927 ../libsvn_wc/adm_ops.c:692
+#: ../libsvn_wc/delete.c:98
 #, c-format
 msgid "Unsupported node kind for path '%s'"
 msgstr "路径 “%s” 有不支持的节点种类"
 
-#: ../libsvn_client/add.c:650 ../libsvn_client/cmdline.c:393
-#: ../libsvn_subr/opt.c:903
-#, c-format
-msgid "'%s' ends in a reserved name"
-msgstr "“%s”以保留名称结束"
-
-#: ../libsvn_client/add.c:682 ../libsvn_client/changelist.c:65
-#: ../libsvn_client/changelist.c:104 ../libsvn_client/cleanup.c:56
-#: ../libsvn_client/cleanup.c:134 ../libsvn_client/commit.c:710
-#: ../libsvn_client/export.c:1050 ../libsvn_client/patch.c:2956
-#: ../libsvn_client/relocate.c:237 ../libsvn_client/resolved.c:54
-#: ../libsvn_client/revert.c:135 ../libsvn_client/status.c:269
-#: ../libsvn_client/switch.c:391 ../libsvn_client/update.c:590
-#: ../svn/util.c:1392
+#: ../libsvn_client/add.c:960 ../libsvn_client/changelist.c:65
+#: ../libsvn_client/changelist.c:104 ../libsvn_client/cleanup.c:55
+#: ../libsvn_client/export.c:1392 ../libsvn_client/import.c:815
+#: ../libsvn_client/patch.c:3009 ../libsvn_client/relocate.c:232
+#: ../libsvn_client/resolved.c:121 ../libsvn_client/revert.c:136
+#: ../libsvn_client/status.c:353 ../libsvn_client/switch.c:473
+#: ../libsvn_client/update.c:646 ../libsvn_client/upgrade.c:105
+#: ../svn/util.c:984
 #, c-format
 msgid "'%s' is not a local path"
 msgstr "“%s”不是本地路径"
 
-#: ../libsvn_client/add.c:825 ../libsvn_client/add.c:852
+#: ../libsvn_client/add.c:1001 ../libsvn_client/copy_foreign.c:489
+#: ../libsvn_wc/adm_ops.c:766 ../libsvn_wc/copy.c:715
 #, c-format
-msgid "There is no valid uri above '%s'"
-msgstr "在 '%s' 的上级没有合法的 URI"
+msgid "'%s' is already under version control"
+msgstr "“%s”已纳入版本控制"
 
-#: ../libsvn_client/blame.c:395
+#: ../libsvn_client/add.c:1134 ../libsvn_client/add.c:1161
 #, c-format
-msgid "Cannot calculate blame information for binary file '%s'"
-msgstr "无法为二进制文件 “%s” 计算追溯信息"
+msgid "There is no valid URI above '%s'"
+msgstr "在 '%s' 的上级没有合法的 URI"
 
-#: ../libsvn_client/blame.c:622
+#: ../libsvn_client/blame.c:605
 msgid "Start revision must precede end revision"
 msgstr "起始版本必须小于结束版本"
 
-#: ../libsvn_client/cat.c:75 ../libsvn_client/commit_util.c:1119
-#: ../libsvn_client/delete.c:65 ../libsvn_client/prop_commands.c:846
-#: ../libsvn_client/prop_commands.c:1141 ../libsvn_client/revisions.c:104
-#: ../libsvn_wc/adm_ops.c:2354 ../libsvn_wc/adm_ops.c:2389
-#: ../libsvn_wc/copy.c:611 ../libsvn_wc/entries.c:1285
-#: ../libsvn_wc/entries.c:2566 ../libsvn_wc/entries.c:2597 ../svn/notify.c:980
+#: ../libsvn_client/blame.c:633
+#, c-format
+msgid "Cannot calculate blame information for binary file '%s'"
+msgstr "无法为二进制文件 “%s” 计算追溯信息"
+
+#: ../libsvn_client/cat.c:77 ../libsvn_client/commit_util.c:610
+#: ../libsvn_client/delete.c:81 ../libsvn_client/prop_commands.c:833
+#: ../libsvn_client/prop_commands.c:1411 ../libsvn_client/revisions.c:104
+#: ../libsvn_wc/adm_ops.c:1197 ../libsvn_wc/adm_ops.c:1247
+#: ../libsvn_wc/copy.c:563 ../libsvn_wc/copy.c:624 ../libsvn_wc/entries.c:1301
+#: ../libsvn_wc/entries.c:2681 ../libsvn_wc/entries.c:2712
+#: ../svn/notify.c:1095
 #, c-format
 msgid "'%s' is not under version control"
 msgstr "“%s” 尚未纳入版本控制"
 
-#: ../libsvn_client/cat.c:80
+#: ../libsvn_client/cat.c:82
 #, c-format
 msgid "'%s' refers to a directory"
 msgstr "“%s” 引用一个目录"
 
-#: ../libsvn_client/cat.c:90
+#: ../libsvn_client/cat.c:92
 #, c-format
-msgid "'%s' has no base revision until it is committed"
+msgid "'%s' has no pristine version until it is committed"
 msgstr "在提交之前，“%s”没有基础版本"
 
-#: ../libsvn_client/cat.c:154 ../libsvn_client/export.c:290
+#: ../libsvn_client/cat.c:147 ../libsvn_client/export.c:388
 msgid "(local)"
 msgstr "(本地)"
 
-#: ../libsvn_client/cat.c:243
+#: ../libsvn_client/cat.c:247
 #, c-format
 msgid "URL '%s' refers to a directory"
 msgstr "URL “%s” 指向目录"
@@ -1337,111 +1388,66 @@
 msgid "Target changelist name must not be empty"
 msgstr "目标修改列表的名称不能为空"
 
-#: ../libsvn_client/checkout.c:122 ../libsvn_client/export.c:1236
+#: ../libsvn_client/checkout.c:109 ../libsvn_client/export.c:1445
 #, c-format
 msgid "URL '%s' doesn't exist"
 msgstr "URL “%s” 不存在"
 
-#: ../libsvn_client/checkout.c:126
+#: ../libsvn_client/checkout.c:113
 #, c-format
 msgid "URL '%s' refers to a file, not a directory"
 msgstr "URL “%s” 指向一个文件，不是目录"
 
-#: ../libsvn_client/checkout.c:162
+#: ../libsvn_client/checkout.c:147
 #, c-format
 msgid "'%s' is already a working copy for a different URL"
 msgstr "“%s” 已经是指向不同 URL 的工作副本"
 
-#: ../libsvn_client/checkout.c:170
+#: ../libsvn_client/checkout.c:155
 #, c-format
 msgid "'%s' already exists and is not a directory"
 msgstr "“%s” 已经存在并且不是目录"
 
-#: ../libsvn_client/cmdline.c:78
-#, c-format
-msgid "Improper relative URL '%s'"
-msgstr "不正确的相对 URL“%s”"
-
-#: ../libsvn_client/cmdline.c:149
+#: ../libsvn_client/cmdline.c:104
 #, c-format
 msgid "All non-relative targets must have the same root URL"
 msgstr "所有非相对目标必须有相同的根 URL"
 
-#: ../libsvn_client/cmdline.c:353
+#: ../libsvn_client/cmdline.c:312
 msgid ""
 "Resolving '^/': no repository root found in the target arguments or in the "
 "current directory"
 msgstr "解析“^/”: 在目标参数或当前目录中找不到版本库的根"
 
-#: ../libsvn_client/commit.c:150
-#, c-format
-msgid "%s property on '%s' contains unrecognized EOL-style '%s'"
-msgstr "属性 %s (对象 '%s') 包含不可识别的行结束符号 '%s'"
-
-#: ../libsvn_client/commit.c:441
-#, c-format
-msgid "Unknown or unversionable type for '%s'"
-msgstr "“%s” 是未知类型或不可纳入版本控制"
-
-#: ../libsvn_client/commit.c:548
-msgid "New entry name required when importing a file"
-msgstr "导入文件时，需要一个新的条目名称"
-
-#: ../libsvn_client/commit.c:583 ../libsvn_client/patch.c:2963
-#: ../libsvn_client/patch.c:2975 ../libsvn_wc/adm_ops.c:583
-#: ../libsvn_wc/lock.c:120 ../libsvn_wc/wc_db_wcroot.c:74
-#, c-format
-msgid "'%s' does not exist"
-msgstr "“%s” 不存在"
-
-#: ../libsvn_client/commit.c:665 ../libsvn_client/copy.c:461
-#: ../libsvn_client/merge.c:9255 ../libsvn_client/merge.c:10520
-#: ../libsvn_client/merge.c:10816 ../svnlook/main.c:1451
-#, c-format
-msgid "Path '%s' does not exist"
-msgstr "路径 “%s” 不存在"
-
-#: ../libsvn_client/commit.c:799 ../libsvn_client/copy.c:512
-#: ../libsvn_client/copy.c:1043 ../libsvn_client/copy.c:1300
-#: ../libsvn_client/copy.c:1924
-#, c-format
-msgid "Path '%s' already exists"
-msgstr "路径 “%s” 已经存在"
-
-#: ../libsvn_client/commit.c:814
-#, c-format
-msgid "'%s' is a reserved name and cannot be imported"
-msgstr "“%s” 是保留名称，无法被导入"
-
-#: ../libsvn_client/commit.c:852 ../libsvn_client/copy.c:1460
+#: ../libsvn_client/commit.c:155 ../libsvn_client/copy.c:1522
 msgid "Commit failed (details follow):"
 msgstr "提交失败(细节如下):"
 
-#: ../libsvn_client/commit.c:860
+#: ../libsvn_client/commit.c:163
 msgid "Commit succeeded, but other errors follow:"
 msgstr "提交成功，但是发生了其它错误，细节如下:"
 
-#: ../libsvn_client/commit.c:867
+#: ../libsvn_client/commit.c:170
 msgid "Error unlocking locked dirs (details follow):"
 msgstr "解除锁定目录出错(细节如下):"
 
-#: ../libsvn_client/commit.c:878
+#: ../libsvn_client/commit.c:181
 msgid "Error bumping revisions post-commit (details follow):"
 msgstr "执行 post-commit 出错 (细节如下):"
 
-#: ../libsvn_client/commit.c:1005
+#: ../libsvn_client/commit.c:314
 #, c-format
 msgid ""
 "Cannot delete the directory '%s' in a non-recursive commit because it has "
 "children"
 msgstr "因为目录“%s”非空，因此不能在非递归提交中删除它"
 
-#: ../libsvn_client/commit.c:1219
+#: ../libsvn_client/commit.c:613
 #, c-format
 msgid "'%s' is a URL, but URLs cannot be commit targets"
 msgstr "“%s” 是 URL，但是 URL 不可作为提交目标"
 
-#: ../libsvn_client/commit.c:1325
+#: ../libsvn_client/commit.c:735
 msgid ""
 "Commit can only commit to a single repository at a time.\n"
 "Are all targets part of the same working copy?"
@@ -1449,487 +1455,541 @@
 "每次提交只能针对一个版本库。\n"
 "是否所有目标都属于同一工作副本？"
 
-#: ../libsvn_client/commit_util.c:93 ../libsvn_repos/commit.c:138
+#: ../libsvn_client/commit.c:851
+#, c-format
+msgid ""
+"Cannot commit '%s' because it was moved from '%s' which is not part of the "
+"commit; both sides of the move must be committed together"
+msgstr ""
+
+#: ../libsvn_client/commit.c:882
+#, c-format
+msgid ""
+"Cannot commit '%s' because it was moved to '%s' which is not part of the "
+"commit; both sides of the move must be committed together"
+msgstr ""
+
+#: ../libsvn_client/commit_util.c:94 ../libsvn_repos/commit.c:167
 #, c-format
 msgid "Directory '%s' is out of date"
 msgstr "目录 “%s” 已经过时"
 
-#: ../libsvn_client/commit_util.c:94 ../libsvn_repos/commit.c:140
+#: ../libsvn_client/commit_util.c:95 ../libsvn_repos/commit.c:169
 #, c-format
 msgid "File '%s' is out of date"
 msgstr "文件 “%s” 已经过时"
 
-#: ../libsvn_client/commit_util.c:129
+#: ../libsvn_client/commit_util.c:130
 #, c-format
 msgid "Directory '%s' is locked in another working copy"
 msgstr "目录“%s”在其它工作副本中被锁定"
 
-#: ../libsvn_client/commit_util.c:130
+#: ../libsvn_client/commit_util.c:131
 #, c-format
 msgid "File '%s' is locked in another working copy"
 msgstr "文件“%s” 在其它工作副本中被锁定"
 
-#: ../libsvn_client/commit_util.c:165
+#: ../libsvn_client/commit_util.c:166
 #, c-format
 msgid "Changing directory '%s' is forbidden by the server"
 msgstr "服务器禁止修改目录“%s”"
 
-#: ../libsvn_client/commit_util.c:166
+#: ../libsvn_client/commit_util.c:167
 #, c-format
 msgid "Changing file '%s' is forbidden by the server"
 msgstr "服务器禁止修改文件“%s”"
 
-#: ../libsvn_client/commit_util.c:331 ../libsvn_client/commit_util.c:580
-#: ../libsvn_client/commit_util.c:1113
-#, c-format
-msgid "Aborting commit: '%s' remains in conflict"
-msgstr "提交终止: “%s” 处于冲突状态"
-
-#: ../libsvn_client/commit_util.c:375
+#: ../libsvn_client/commit_util.c:315
 #, c-format
 msgid "Aborting commit: '%s' remains in tree-conflict"
 msgstr "提交终止: “%s” 仍处于树冲突状态"
 
-#: ../libsvn_client/commit_util.c:520
+#: ../libsvn_client/commit_util.c:666
 #, c-format
-msgid "Unknown entry kind for '%s'"
-msgstr "“%s” 有未知的条目类型"
+msgid "Aborting commit: '%s' remains in conflict"
+msgstr "提交终止: “%s” 处于冲突状态"
 
-#: ../libsvn_client/commit_util.c:547
+#: ../libsvn_client/commit_util.c:685
 #, c-format
-msgid "Entry '%s' has unexpectedly changed special status"
-msgstr "条目 “%s” 意外改变状态"
+msgid "Node '%s' has unexpectedly changed kind"
+msgstr "节点 “%s” 的类型意外改变"
 
-#: ../libsvn_client/commit_util.c:698
+#: ../libsvn_client/commit_util.c:726
 #, c-format
 msgid "'%s' is scheduled for addition, but is missing"
 msgstr "丢失了预定增加的“%s”"
 
-#: ../libsvn_client/commit_util.c:1182
+#: ../libsvn_client/commit_util.c:1212
 #, c-format
 msgid ""
 "'%s' is not known to exist in the repository and is not part of the commit, "
 "yet its child '%s' is part of the commit"
 msgstr "“%s” 不在版本库中，也不是提交的一部分，但是它的子路径 “%s” 是提交的一部分"
 
-#: ../libsvn_client/commit_util.c:1324
+#: ../libsvn_client/commit_util.c:1351
 #, c-format
 msgid "Cannot commit both '%s' and '%s' as they refer to the same URL"
 msgstr "无法同时提交 “%s” 与 “%s”，因为它们都指向同一个 URL"
 
-#: ../libsvn_client/commit_util.c:1481
+#: ../libsvn_client/commit_util.c:1502
 #, c-format
 msgid "Commit item '%s' has copy flag but no copyfrom URL"
 msgstr "提交项目 “%s” 有复制标记，但是没有源地址(copyfrom URL)"
 
-#: ../libsvn_client/commit_util.c:1486
+#: ../libsvn_client/commit_util.c:1507
 #, c-format
 msgid "Commit item '%s' has copy flag but an invalid revision"
 msgstr "提交项目 “%s” 有复制标志，但是版本无效"
 
-#: ../libsvn_client/commit_util.c:2249
+#: ../libsvn_client/commit_util.c:1969
 msgid "Standard properties can't be set explicitly as revision properties"
 msgstr "标准属性不能设置为版本属性"
 
-#: ../libsvn_client/copy.c:531 ../libsvn_client/copy.c:1940
+#: ../libsvn_client/copy.c:439
+#, c-format
+msgid "Path '%s' exists, but is excluded"
+msgstr "路径 “%s” 存在，但被排除"
+
+#: ../libsvn_client/copy.c:445 ../libsvn_client/copy.c:1062
+#: ../libsvn_client/copy.c:1321 ../libsvn_client/copy.c:1896
+#: ../libsvn_client/import.c:862
+#, c-format
+msgid "Path '%s' already exists"
+msgstr "路径 “%s” 已经存在"
+
+#: ../libsvn_client/copy.c:500
+#, c-format
+msgid "Path '%s' already exists as unversioned node"
+msgstr "路径 “%s” 已经作为非版本控制节点存在"
+
+#: ../libsvn_client/copy.c:522 ../libsvn_client/copy.c:532
+#: ../libsvn_client/copy.c:1912
 #, c-format
 msgid "Path '%s' is not a directory"
 msgstr "路径 “%s” 不是目录"
 
-#: ../libsvn_client/copy.c:700 ../libsvn_client/copy.c:741
+#: ../libsvn_client/copy.c:571 ../libsvn_client/merge.c:10118
+#: ../svnlook/svnlook.c:1425
+#, c-format
+msgid "Path '%s' does not exist"
+msgstr "路径 “%s” 不存在"
+
+#: ../libsvn_client/copy.c:741 ../libsvn_client/copy.c:782
 #, c-format
 msgid "Path '%s' already exists, but is not a directory"
 msgstr "路径 “%s” 已经存在，但不是目录"
 
-#: ../libsvn_client/copy.c:806
+#: ../libsvn_client/copy.c:843
 msgid ""
 "Source and destination URLs appear not to point to the same repository."
 msgstr "来源与目标 URL 似乎不在同一版本库。"
 
-#: ../libsvn_client/copy.c:1031 ../libsvn_client/prop_commands.c:186
+#: ../libsvn_client/copy.c:1052 ../libsvn_client/prop_commands.c:167
 #, c-format
 msgid "Path '%s' does not exist in revision %ld"
 msgstr "路径 “%s” 不在版本 %ld 中"
 
-#: ../libsvn_client/copy.c:1598
-#, c-format
-msgid ""
-"Source URL '%s' is from foreign repository; leaving it as a disjoint WC"
-msgstr "源 URL “%s” 来自其它版本库；把它当作脱离的工作副本"
-
-#: ../libsvn_client/copy.c:1701 ../libsvn_client/copy.c:1714
-#: ../libsvn_wc/adm_ops.c:946 ../libsvn_wc/copy.c:727
-#, c-format
-msgid "'%s' is already under version control"
-msgstr "“%s”已纳入版本控制"
-
-#: ../libsvn_client/copy.c:1735
-#, c-format
-msgid "Entry for '%s' exists (though the working file is missing)"
-msgstr "“%s” 的入口存在(尽管丢失了工作文件)"
-
-#: ../libsvn_client/copy.c:1908
+#: ../libsvn_client/copy.c:1880
 #, c-format
 msgid "Path '%s' not found in revision %ld"
 msgstr "路径 “%s” 不在版本 %ld 中"
 
-#: ../libsvn_client/copy.c:1913
+#: ../libsvn_client/copy.c:1885
 #, c-format
 msgid "Path '%s' not found in head revision"
 msgstr "HEAD 版本中找不到路径 “%s”"
 
-#: ../libsvn_client/copy.c:2035
+#: ../libsvn_client/copy.c:2013
 msgid "Cannot mix repository and working copy sources"
 msgstr "不能在源中混合版本库和工作副本"
 
-#: ../libsvn_client/copy.c:2087
+#: ../libsvn_client/copy.c:2065
 #, c-format
 msgid "Cannot copy path '%s' into its own child '%s'"
 msgstr "无法复制路径 “%s” 到其子目录 “%s” 中"
 
-#: ../libsvn_client/copy.c:2123
+#: ../libsvn_client/copy.c:2101
 #, c-format
 msgid ""
 "Cannot move the external at '%s'; please edit the svn:externals property on "
 "'%s'."
 msgstr "不能移动在“%s”的外部引用；请在“%s”修改属性 svn:externals property 。"
 
-#: ../libsvn_client/copy.c:2138
+#: ../libsvn_client/copy.c:2116
 msgid "Moves between the working copy and the repository are not supported"
 msgstr "不支持在工作副本和版本库之间移动"
 
-#: ../libsvn_client/copy.c:2153
+#: ../libsvn_client/copy.c:2131
 #, c-format
 msgid "Cannot move URL '%s' into itself"
 msgstr "无法移动 URL “%s” 到本身"
 
-#: ../libsvn_client/copy.c:2154
+#: ../libsvn_client/copy.c:2132
 #, c-format
 msgid "Cannot move path '%s' into itself"
 msgstr "无法移动路径 “%s” 到本身"
 
-#: ../libsvn_client/copy.c:2221
+#: ../libsvn_client/copy.c:2199
 #, c-format
 msgid "'%s' does not have a URL associated with it"
 msgstr "“%s” 没有关联的 URL"
 
-#: ../libsvn_client/delete.c:60
+#: ../libsvn_client/copy_foreign.c:131 ../libsvn_client/copy_foreign.c:282
+#: ../libsvn_client/externals.c:904 ../libsvn_client/externals.c:1103
+#: ../libsvn_wc/update_editor.c:1124
+#, c-format
+msgid "Path '%s' is not in the working copy"
+msgstr "路径 “%s” 不在工作副本中"
+
+#: ../libsvn_client/copy_foreign.c:372 ../libsvn_client/export.c:812
+#: ../libsvn_client/repos_diff.c:998 ../libsvn_fs_fs/dag.c:1051
+#: ../libsvn_ra_svn/client.c:1208 ../libsvn_wc/diff_editor.c:1981
+#: ../libsvn_wc/diff_editor.c:2060 ../libsvn_wc/externals.c:651
+#: ../libsvn_wc/update_editor.c:4279
+#, c-format
+msgid "Checksum mismatch for '%s'"
+msgstr "'%s' 的校验和不匹配"
+
+#: ../libsvn_client/copy_foreign.c:479
+#, c-format
+msgid "'%s' is not a valid location inside a repository"
+msgstr "“%s”在版本库中不是合法的位置"
+
+#: ../libsvn_client/copy_foreign.c:510
+#, c-format
+msgid "Can't add '%s', because no parent directory is found"
+msgstr "不能增加“%s”，因为没有发现它的父目录"
+
+#: ../libsvn_client/delete.c:76
 #, c-format
 msgid "'%s' is in the way of the resource actually under version control"
 msgstr "“%s” 阻碍资源纳入版本控制"
 
-#: ../libsvn_client/delete.c:75
+#: ../libsvn_client/delete.c:95
 #, c-format
 msgid "'%s' has local modifications -- commit or revert them first"
 msgstr "“%s” 已有本地修改 -- 请先提交或撤销"
 
-#: ../libsvn_client/delete.c:109
+#: ../libsvn_client/delete.c:127
 #, c-format
 msgid ""
 "Cannot remove the external at '%s'; please edit or delete the svn:externals "
 "property on '%s'"
 msgstr "不能在“%s”删除外部引用；请在“%s”修改或删除属性 svn:externals"
 
-#: ../libsvn_client/deprecated.c:785 ../svn/move-cmd.c:65
+#: ../libsvn_client/deprecated.c:862 ../svn/move-cmd.c:65
 msgid "Cannot specify revisions (except HEAD) with move operations"
 msgstr "移动操作不能指定版本"
 
-#: ../libsvn_client/deprecated.c:1402
+#: ../libsvn_client/deprecated.c:1624
 msgid "No commits in repository"
 msgstr "版本库中没有提交"
 
-#: ../libsvn_client/deprecated.c:2477 ../libsvn_wc/deprecated.c:3688
+#: ../libsvn_client/deprecated.c:2930 ../libsvn_wc/deprecated.c:3953
 msgid "Non-recursive relocation not supported"
 msgstr "不支持非递归的重新定位"
 
-#: ../libsvn_client/diff.c:136
-#, c-format
-msgid "   Reverse-merged %s:r%s%s"
-msgstr "   已经撤销合并 %s:r%s%s"
-
-#: ../libsvn_client/diff.c:151
-#, c-format
-msgid "   Merged %s:r%s%s"
-msgstr "   已经合并 %s:r%s%s"
-
-#: ../libsvn_client/diff.c:161 ../libsvn_diff/diff_file.c:1852
-#: ../libsvn_diff/diff_file.c:1868
+#. Utilities
+#: ../libsvn_client/diff.c:64
 #, c-format
 msgid "Path '%s' must be an immediate child of the directory '%s'"
 msgstr "路径 “%s” 必须是目录 “%s” 的直接子孙"
 
-#: ../libsvn_client/diff.c:368
+#: ../libsvn_client/diff.c:258
 #, c-format
 msgid "%s\t(revision %ld)"
 msgstr "%s\t(版本 %ld)"
 
-#: ../libsvn_client/diff.c:370
+#: ../libsvn_client/diff.c:260
 #, c-format
 msgid "%s\t(working copy)"
 msgstr "%s\t(工作副本)"
 
-#: ../libsvn_client/diff.c:630
+#: ../libsvn_client/diff.c:512 ../svnlook/svnlook.c:795
 #, c-format
 msgid "%sProperty changes on: %s%s"
 msgstr "%s 属性改变: %s%s"
 
-#: ../libsvn_client/diff.c:969
+#: ../libsvn_client/diff.c:760
 #, c-format
 msgid "Cannot display: file marked as a binary type.%s"
 msgstr "无法显示: 文件标记为二进制类型。%s"
 
-#: ../libsvn_client/diff.c:1397
-#, c-format
-msgid "Path '%s' has no URL"
-msgstr "路径 '%s' 没有 URL"
-
-#: ../libsvn_client/diff.c:1423 ../libsvn_client/merge.c:6314
-#: ../libsvn_client/merge.c:9264
+#: ../libsvn_client/diff.c:1265 ../libsvn_client/merge.c:7178
+#: ../libsvn_client/merge.c:10525
 msgid "Not all required revisions are specified"
 msgstr "没有全部提供需要的版本"
 
-#: ../libsvn_client/diff.c:1438
-msgid "At least one revision must be non-local for a pegged diff"
-msgstr "对于铆钉差异，必须至少有一个非本地版本"
+#: ../libsvn_client/diff.c:1279
+msgid ""
+"At least one revision must be something other than BASE or WORKING when "
+"diffing a URL"
+msgstr "要比较 URL 的时候，必须有一个版本，既不是基础版本，又不是工作版本"
 
-#: ../libsvn_client/diff.c:1481
+#: ../libsvn_client/diff.c:1316
 #, c-format
 msgid "Diff target '%s' was not found in the repository at revision '%ld'"
 msgstr "差异目标 '%s' 不在版本库的版本 '%ld' 中"
 
-#: ../libsvn_client/diff.c:1486
+#: ../libsvn_client/diff.c:1321
 #, c-format
 msgid ""
 "Diff target '%s' was not found in the repository at revision '%ld' or '%ld'"
 msgstr "差异目标 '%s' 不在版本库的版本 '%ld' 或 '%ld' 中"
 
-#: ../libsvn_client/diff.c:1661
+#: ../libsvn_client/diff.c:1496
 #, c-format
 msgid ""
 "Diff target '%s' was not found in the repository at revisions '%ld' and '%ld'"
 msgstr "差异目标 '%s' 不在版本库的版本 '%ld' 和 '%ld' 中"
 
-#: ../libsvn_client/diff.c:1666
+#: ../libsvn_client/diff.c:1501
 #, c-format
 msgid ""
-"Diff targets '%s and '%s' were not found in the repository at revisions "
+"Diff targets '%s' and '%s' were not found in the repository at revisions "
 "'%ld' and '%ld'"
 msgstr "差异目标 '%s' 与 '%s' 不在版本库的版本 '%ld' 和 '%ld' 中"
 
-#: ../libsvn_client/diff.c:1731
-msgid "Sorry, svn_client_diff5 was called in a way that is not yet supported"
-msgstr "抱歉，svn_client_diff5 尚不支持这种调用方式"
+#: ../libsvn_client/diff.c:1575
+msgid "Sorry, svn_client_diff6 was called in a way that is not yet supported"
+msgstr "抱歉，svn_client_diff6 尚不支持这种调用方式"
 
-#: ../libsvn_client/diff.c:1774
+#: ../libsvn_client/diff.c:1616
 msgid ""
 "Only diffs between a path's text-base and its working files are supported at "
 "this time"
-msgstr "当前 diff 只支持参考文件与其工作文件比较"
+msgstr "当前只支持纯文本类型的参考文件与其工作文件比较比较差异"
+
+#: ../libsvn_client/diff.c:2221
+msgid ""
+"Summarized diffs are only supported between a path's text-base and its "
+"working files at this time"
+msgstr "当前概要差异只支持参考文件与其工作文件比较"
+
+#: ../libsvn_client/diff.c:2582 ../libsvn_client/diff.c:2648
+msgid "Cannot ignore properties and show only properties at the same time"
+msgstr ""
 
-#: ../libsvn_client/diff.c:2472 ../libsvn_client/switch.c:147
+#: ../libsvn_client/diff_local.c:609
 #, c-format
-msgid "Directory '%s' has no URL"
-msgstr "目录 “%s” 没有 URL"
+msgid "'%s' is not the same node kind as '%s'"
+msgstr "'%s' 与 '%s' 的节点类型不同"
 
-#: ../libsvn_client/diff.c:2781
-msgid "Summarizing diff can only compare repository to repository"
-msgstr "只有版本库和版本库才能比较差异概要"
+#: ../libsvn_client/diff_local.c:632 ../libsvn_wc/props.c:1568
+#, c-format
+msgid "'%s' is not a file or directory"
+msgstr "“%s”不是文件或目录"
 
-#: ../libsvn_client/export.c:95
+#: ../libsvn_client/export.c:102
 #, c-format
 msgid "'%s' is not a valid EOL value"
 msgstr "“%s” 不是一个有效的 EOL 值"
 
-#: ../libsvn_client/export.c:453
+#: ../libsvn_client/export.c:240
 msgid ""
 "Destination directory exists, and will not be overwritten unless forced"
 msgstr "目的目录已存在，除非强迫为之，否则不会覆盖"
 
-#: ../libsvn_client/export.c:588 ../libsvn_client/export.c:1114
+#: ../libsvn_client/export.c:265 ../libsvn_client/export.c:1525
+#: ../libsvn_wc/adm_crawler.c:1204 ../libsvn_wc/conflicts.c:1293
+#: ../libsvn_wc/copy.c:586 ../libsvn_wc/crop.c:236 ../libsvn_wc/crop.c:327
+#: ../libsvn_wc/info.c:403 ../libsvn_wc/node.c:704 ../libsvn_wc/props.c:227
+#: ../libsvn_wc/status.c:2781 ../libsvn_wc/wc_db.c:2526
+#: ../libsvn_wc/wc_db.c:2720 ../libsvn_wc/wc_db.c:2744
+#: ../libsvn_wc/wc_db.c:2902 ../libsvn_wc/wc_db.c:3893
+#: ../libsvn_wc/wc_db.c:5927 ../libsvn_wc/wc_db.c:6247
+#: ../libsvn_wc/wc_db.c:6408 ../libsvn_wc/wc_db.c:6563
+#: ../libsvn_wc/wc_db.c:8390 ../libsvn_wc/wc_db.c:8847
+#: ../libsvn_wc/wc_db.c:9476 ../libsvn_wc/wc_db.c:9623
+#: ../libsvn_wc/wc_db.c:9763 ../libsvn_wc/wc_db.c:10113
+#: ../libsvn_wc/wc_db.c:11600 ../libsvn_wc/wc_db.c:11676
+#: ../libsvn_wc/wc_db.c:13210 ../libsvn_wc/wc_db.c:13270
+#: ../libsvn_wc/wc_db.c:13408 ../libsvn_wc/wc_db.c:13566
+#: ../libsvn_wc/wc_db.c:14003 ../libsvn_wc/wc_db.c:14784
+#, c-format
+msgid "The node '%s' was not found."
+msgstr "找不到节点 '%s'。"
+
+#: ../libsvn_client/export.c:283 ../libsvn_client/export.c:1182
+#: ../libsvn_client/export.c:1239
 #, c-format
 msgid ""
 "Destination file '%s' exists, and will not be overwritten unless forced"
 msgstr "目标文件“%s”已存在，除非强迫为之，否则不会被覆盖"
 
-#: ../libsvn_client/export.c:593 ../libsvn_client/export.c:1119
+#: ../libsvn_client/export.c:289 ../libsvn_client/export.c:1187
+#: ../libsvn_client/export.c:1244
 #, c-format
 msgid ""
 "Destination '%s' exists. Cannot overwrite directory with non-directory"
 msgstr "目标“%s”已存在。不能用非目录覆盖目录"
 
-#: ../libsvn_client/export.c:631 ../libsvn_client/export.c:778
+#: ../libsvn_client/export.c:471 ../libsvn_client/export.c:620
+#: ../libsvn_client/export.c:1076
 #, c-format
 msgid "'%s' exists and is not a directory"
 msgstr "“%s” 已存在且不是目录"
 
-#: ../libsvn_client/export.c:635 ../libsvn_client/export.c:782
+#: ../libsvn_client/export.c:475 ../libsvn_client/export.c:624
+#: ../libsvn_client/export.c:1080
 #, c-format
 msgid "'%s' already exists"
 msgstr "“%s” 已存在"
 
-#: ../libsvn_client/export.c:968 ../libsvn_client/repos_diff.c:987
-#: ../libsvn_fs_fs/dag.c:1040 ../libsvn_ra_neon/fetch.c:767
-#: ../libsvn_ra_svn/client.c:1081 ../libsvn_wc/diff_editor.c:1604
-#: ../libsvn_wc/externals.c:588 ../libsvn_wc/update_editor.c:4037
-#, c-format
-msgid "Checksum mismatch for '%s'"
-msgstr "'%s' 的校验和不匹配"
-
-#: ../libsvn_client/externals.c:395
+#: ../libsvn_client/externals.c:406
 #, c-format
 msgid ""
 "Cannot insert a file external defined on '%s' into the working copy '%s'."
 msgstr "不能将在“%s”定义的文件外部引用插入到工作副本“%s”。"
 
-#: ../libsvn_client/externals.c:428
+#: ../libsvn_client/externals.c:431
 #, c-format
 msgid ""
 "The file external from '%s' cannot overwrite the existing versioned item at "
 "'%s'"
 msgstr "来源于 “%s” 的外部引用的文件不能覆写位于 “%s” 的已存版本控制条目"
 
-#: ../libsvn_client/externals.c:445
+#: ../libsvn_client/externals.c:444
 #, c-format
 msgid "The file external '%s' can not be created because the node exists."
 msgstr "不能创建文件外部引用 '%s'，节点已经存在。"
 
-#: ../libsvn_client/externals.c:553
-#, c-format
-msgid "URL '%s' does not begin with a scheme"
-msgstr "URL “%s” 没有以方案开始"
-
-#: ../libsvn_client/externals.c:629
-#, c-format
-msgid "Illegal parent directory URL '%s'"
-msgstr "非法父目录 URL “%s”"
-
-#: ../libsvn_client/externals.c:668
-#, c-format
-msgid "Illegal repository root URL '%s'"
-msgstr "非法版本库根 URL “%s”"
-
-#: ../libsvn_client/externals.c:713
-#, c-format
-msgid "The external relative URL '%s' cannot have backpaths, i.e. '..'"
-msgstr "外部相对 URL “%s” 不能包含后退路径，例如 “..”"
-
-#: ../libsvn_client/externals.c:741
-#, c-format
-msgid "Unrecognized format for the relative external URL '%s'"
-msgstr "外部相对 URL “%s” 的格式无法识别"
-
-#: ../libsvn_client/externals.c:880
+#: ../libsvn_client/externals.c:703
 #, c-format
 msgid "URL '%s' at revision %ld doesn't exist"
 msgstr "URL “%s” 在版本 %ld 中不存在"
 
-#: ../libsvn_client/externals.c:885
+#: ../libsvn_client/externals.c:708
 #, c-format
 msgid "URL '%s' at revision %ld is not a file or a directory"
 msgstr "URL “%s” 在版本 %ld 中不是文件或目录"
 
-#: ../libsvn_client/externals.c:953
+#: ../libsvn_client/externals.c:786
 #, c-format
 msgid ""
-"Unsupported external: url of file external '%s' is not in repository '%s'"
-msgstr "不支持的外部定义：外部文件“%s”的 URL 不在版本库“%s”中"
+"Unsupported external: URL of file external '%s' is not in repository '%s'"
+msgstr "不支持的外部对象：文件外部对象“%s”的 URL 不在版本库“%s”中"
 
-#: ../libsvn_client/externals.c:1145
+#: ../libsvn_client/externals.c:979
 #, c-format
 msgid "Traversal of '%s' found no ambient depth"
 msgstr "在 “%s” 中找不到深度"
 
-#: ../libsvn_client/info.c:345
+#: ../libsvn_client/import.c:159
 #, c-format
-msgid ""
-"Server does not support retrieving information about the repository root"
-msgstr "服务器不支持取得版本库根的信息"
+msgid "%s property on '%s' contains unrecognized EOL-style '%s'"
+msgstr "属性 %s (对象 '%s') 包含不可识别的行结束符号 '%s'"
+
+#: ../libsvn_client/import.c:489
+#, c-format
+msgid "Unknown or unversionable type for '%s'"
+msgstr "“%s” 是未知类型或不可纳入版本控制"
+
+#: ../libsvn_client/import.c:707
+msgid "New entry name required when importing a file"
+msgstr "导入文件时，需要一个新的条目名称"
+
+#: ../libsvn_client/import.c:758 ../libsvn_client/patch.c:3016
+#: ../libsvn_client/patch.c:3028 ../libsvn_wc/delete.c:93
+#: ../libsvn_wc/lock.c:121 ../libsvn_wc/wc_db_wcroot.c:77
+#, c-format
+msgid "'%s' does not exist"
+msgstr "“%s” 不存在"
+
+#: ../libsvn_client/import.c:891
+#, c-format
+msgid "'%s' is a reserved name and cannot be imported"
+msgstr "“%s” 是保留名称，无法被导入"
 
-#: ../libsvn_client/info.c:352 ../libsvn_client/info.c:367
-#: ../libsvn_client/info.c:377 ../libsvn_client/list.c:245
+#: ../libsvn_client/info.c:310 ../libsvn_client/list.c:376
 #, c-format
 msgid "URL '%s' non-existent in revision %ld"
 msgstr "URL “%s” 不在版本 %ld 中"
 
-#: ../libsvn_client/locking_commands.c:260
-#: ../libsvn_client/locking_commands.c:286
+#: ../libsvn_client/locking_commands.c:266
+#: ../libsvn_client/locking_commands.c:292
 msgid "No common parent found, unable to operate on disjoint arguments"
 msgstr "没有找到公共父节点，不能在分离的参数上操作"
 
-#: ../libsvn_client/locking_commands.c:305 ../libsvn_client/merge.c:9287
-#: ../libsvn_client/merge.c:9294 ../libsvn_client/merge.c:10529
-#: ../libsvn_client/merge.c:10825 ../libsvn_client/ra.c:462
-#: ../libsvn_client/ra.c:669 ../libsvn_client/update.c:234
+#: ../libsvn_client/locking_commands.c:325
 #, c-format
-msgid "'%s' has no URL"
-msgstr "“%s” 没有 URL"
+msgid "The node '%s' is not a file"
+msgstr "节点 '%s' 不是文件"
 
-#: ../libsvn_client/locking_commands.c:319
+#: ../libsvn_client/locking_commands.c:345
 msgid "Unable to lock/unlock across multiple repositories"
 msgstr "不能跨越多个版本库进行锁定/解锁"
 
-#: ../libsvn_client/locking_commands.c:367
+#: ../libsvn_client/locking_commands.c:400
 #, c-format
 msgid "'%s' is not locked in this working copy"
 msgstr "“%s” 没有在工作副本中锁定"
 
-#: ../libsvn_client/locking_commands.c:410
+#: ../libsvn_client/locking_commands.c:450
 #, c-format
 msgid "'%s' is not locked"
 msgstr "“%s” 没有被锁定"
 
-#: ../libsvn_client/locking_commands.c:444 ../libsvn_fs/fs-loader.c:1265
-#: ../libsvn_ra/ra_loader.c:1067
+#: ../libsvn_client/locking_commands.c:483 ../libsvn_fs/fs-loader.c:1413
+#: ../libsvn_ra/ra_loader.c:1074
 msgid "Lock comment contains illegal characters"
 msgstr "锁定注释包含非法字符"
 
-#: ../libsvn_client/log.c:299 ../libsvn_client/log.c:357
-msgid "Missing required revision specification"
-msgstr "未提供请求的版本"
+#: ../libsvn_client/log.c:309
+msgid "No valid target found"
+msgstr "没有发现合法目标"
 
-#: ../libsvn_client/log.c:406
+#: ../libsvn_client/log.c:340
 #, c-format
 msgid "'%s' is not a relative path"
 msgstr "'%s' 不是相对路径"
 
-#: ../libsvn_client/log.c:428
+#: ../libsvn_client/log.c:366
 msgid "When specifying working copy paths, only one target may be given"
 msgstr "当指定工作副本路径时，只能给出一个目标"
 
-#: ../libsvn_client/log.c:454 ../libsvn_client/status.c:359
+#: ../libsvn_client/log.c:390 ../libsvn_client/revisions.c:189
+msgid "PREV, BASE, or COMMITTED revision keywords are invalid for URL"
+msgstr "对于 URL，版本关键字 PREV，BASE，或 COMMITTED 非法"
+
+#: ../libsvn_client/log.c:523 ../libsvn_client/log.c:830
+msgid "Missing required revision specification"
+msgstr "未提供请求的版本"
+
+#: ../libsvn_client/merge.c:439
 #, c-format
-msgid "Entry '%s' has no URL"
-msgstr "条目“%s”没有URL"
+msgid "URL '%s' of '%s' is not in repository '%s'"
+msgstr "URL“%s”(本地路径“%s”)不在版本库“%s”中"
 
-#: ../libsvn_client/merge.c:307
+#: ../libsvn_client/merge.c:476
 #, c-format
-msgid "Url '%s' of '%s' is not in repository '%s'"
-msgstr "URL“%s”(祖先“%s”)不在版本库“%s”中"
+msgid "'%s' must be from the same repository as '%s'"
+msgstr "“%s”必须与“%s”在同一个版本库中"
 
 #. xgettext: the '.working', '.merge-left.r%ld' and
 #. '.merge-right.r%ld' strings are used to tag onto a file
 #. name in case of a merge conflict
-#: ../libsvn_client/merge.c:1507
+#: ../libsvn_client/merge.c:2030
 msgid ".working"
 msgstr ".working"
 
-#: ../libsvn_client/merge.c:1509
+#: ../libsvn_client/merge.c:2032
 #, c-format
 msgid ".merge-left.r%ld"
 msgstr ".merge-left.r%ld"
 
-#: ../libsvn_client/merge.c:1512
+#: ../libsvn_client/merge.c:2035
 #, c-format
 msgid ".merge-right.r%ld"
 msgstr ".merge-right.r%ld"
 
-#: ../libsvn_client/merge.c:3898
+#: ../libsvn_client/merge.c:4683
 msgid ""
 "Cannot reverse-merge a range from a path's own future history; try updating "
 "first"
 msgstr "不能从路径的未来历史中反向合并范围；请先更新"
 
-#: ../libsvn_client/merge.c:4629
+#: ../libsvn_client/merge.c:5418
 #, c-format
 msgid ""
 "One or more conflicts were produced while merging r%ld:%ld into\n"
@@ -1940,87 +2000,83 @@
 "当合并 r%ld:%ld 到 “%s” 时出现了一个或更多的冲突\n"
 "请解决所有冲突后，再次运行合并，处理剩余的未合并版本"
 
-#: ../libsvn_client/merge.c:5608
+#: ../libsvn_client/merge.c:6233
 #, c-format
-msgid "Invalid mergeinfo detected on '%s', mergetracking not possible"
-msgstr "在“%s”发现了非法的合并信息；合并跟踪是不可能的"
+msgid "Invalid mergeinfo detected on '%s', merge tracking not possible"
+msgstr "在“%s”检测到非法的合并信息；合并跟踪是不可能的"
 
-#: ../libsvn_client/merge.c:5662
+#: ../libsvn_client/merge.c:6382
 msgid ""
 "Merge tracking not allowed with missing subtrees; try restoring these items "
 "first:\n"
 msgstr "合并跟踪不允许丢失子树; 请先恢复这些项目:\n"
 
-#: ../libsvn_client/merge.c:6674
+#: ../libsvn_client/merge.c:7382
 #, c-format
 msgid ""
-"Invalid mergeinfo detected on merge target '%s', mergetracking not possible"
-msgstr "在合并目标“%s”发现了非法的合并信息；合并跟踪是不可能的"
+"Invalid mergeinfo detected on merge target '%s', merge tracking not possible"
+msgstr "在合并目标“%s”检测到非法的合并信息；合并跟踪是不可能的"
 
-#: ../libsvn_client/merge.c:8721
+#: ../libsvn_client/merge.c:9700
 msgid "Use of two URLs is not compatible with mergeinfo modification"
 msgstr "使用两个 URL 与合并信息修改不兼容"
 
-#: ../libsvn_client/merge.c:8728 ../libsvn_client/merge.c:9043
+#: ../libsvn_client/merge.c:9707 ../libsvn_client/merge.c:10032
 msgid ""
 "Merge from foreign repository is not compatible with mergeinfo modification"
 msgstr "从外部版本库合并与合并信息修改不兼容"
 
-#: ../libsvn_client/merge.c:8742 ../libsvn_client/merge.c:9302
-#: ../libsvn_client/merge.c:10832
+#: ../libsvn_client/merge.c:10125 ../libsvn_client/merge.c:10268
 #, c-format
 msgid "Merge target '%s' does not exist in the working copy"
 msgstr "合并目标 “%s” 不在工作副本中"
 
-#: ../libsvn_client/merge.c:9169
+#: ../libsvn_client/merge.c:10148
 msgid "Cannot determine revision of working copy"
 msgstr "不能确定工作副本的版本"
 
-#: ../libsvn_client/merge.c:9175
+#: ../libsvn_client/merge.c:10154
 #, c-format
 msgid ""
-"Cannot merge into mixed-revision working copy [%lu:%lu]; try updating first"
-msgstr "不能合并到有混合版本的工作副本 [%lu:%lu] 中；请先更新"
+"Cannot merge into mixed-revision working copy [%ld:%ld]; try updating first"
+msgstr "不能合并到有混合版本的工作副本 [%ld:%ld] 中；请先更新"
 
-#: ../libsvn_client/merge.c:9190
+#: ../libsvn_client/merge.c:10169
 msgid "Cannot merge into a working copy with a switched subtree"
 msgstr "不能合并到已经切换子目录的工作副本中"
 
-#: ../libsvn_client/merge.c:9206
+#: ../libsvn_client/merge.c:10185
 msgid "Cannot merge into a working copy that has local modifications"
 msgstr "不能合并到有本地修改的工作副本中"
 
-#: ../libsvn_client/merge.c:9268 ../svn/merge-cmd.c:346
-msgid "Merge sources must both be either paths or URLs"
-msgstr "合并源必须同时是路径或 URL"
-
-#: ../libsvn_client/merge.c:9337 ../libsvn_ra/ra_loader.c:554
+#: ../libsvn_client/merge.c:10205 ../svn/merge-cmd.c:60
 #, c-format
-msgid "'%s' isn't in the same repository as '%s'"
-msgstr "“%s”与“%s”并不在同一个版本库中"
+msgid ""
+"Invalid merge source '%s'; a working copy path can only be used with a "
+"repository revision (a number, a date, or head)"
+msgstr ""
 
-#: ../libsvn_client/merge.c:10347
-#, c-format
-msgid "Invalid mergeinfo detected on '%s', reintegrate merge not possible"
-msgstr "在“%s”发现了非法的合并信息；复兴合并是不可能的"
+#: ../libsvn_client/merge.c:10528 ../svn/merge-cmd.c:127
+msgid "Merge sources must both be either paths or URLs"
+msgstr "合并源必须同时是路径或 URL"
 
-#: ../libsvn_client/merge.c:10390 ../libsvn_client/merge.c:10658
+#: ../libsvn_client/merge.c:11289 ../libsvn_client/merge.c:11451
+#: ../libsvn_client/merge.c:12338
 #, c-format
 msgid "'%s@%ld' must be ancestrally related to '%s@%ld'"
 msgstr "“%s@%ld”必须与“%s@%ld”有祖先关系"
 
-#: ../libsvn_client/merge.c:10544
-#, c-format
-msgid "'%s' must be from the same repository as '%s'"
-msgstr "“%s”必须与“%s”在同一个版本库中"
-
-#: ../libsvn_client/merge.c:10575
+#: ../libsvn_client/merge.c:11401
 #, c-format
 msgid ""
 "Neither the reintegrate source nor target can be the root of the repository"
 msgstr "复兴源或目标都不能是版本库的根。"
 
-#: ../libsvn_client/merge.c:10686
+#: ../libsvn_client/merge.c:11411
+msgid "Reintegrate merge not possible"
+msgstr "复兴合并是不可能的"
+
+#: ../libsvn_client/merge.c:11484
 #, c-format
 msgid ""
 "Reintegrate can only be used if revisions %ld through %ld were previously "
@@ -2030,122 +2086,160 @@
 "复兴只能用于版本 %ld 到 %ld 以前曾经从 %s 合并到复兴源的情况，但是现在不是这种情况：\n"
 "%s"
 
-#: ../libsvn_client/mergeinfo.c:1822
+#: ../libsvn_client/merge.c:11546
+#, c-format
+msgid ""
+"Can't reintegrate into '%s' because it is locally added and therefore not "
+"related to the merge source"
+msgstr ""
+
+#: ../libsvn_client/merge.c:11814
+msgid "Cannot merge automatically while ignoring mergeinfo"
+msgstr ""
+
+#: ../libsvn_client/merge.c:12554
+msgid ""
+"The required merge is reintegrate-like, and the record-only option cannot be "
+"used with this kind of merge"
+msgstr ""
+
+#: ../libsvn_client/merge.c:12560
+msgid ""
+"The required merge is reintegrate-like, and the depth option cannot be used "
+"with this kind of merge"
+msgstr ""
+
+#: ../libsvn_client/merge.c:12566
+msgid ""
+"The required merge is reintegrate-like, and the force_delete option cannot "
+"be used with this kind of merge"
+msgstr ""
+
+#: ../libsvn_client/mergeinfo.c:1718
 msgid "Only depths 'infinity' and 'empty' are currently supported"
 msgstr "当前仅支持深度 'infinity' 和 'empty'"
 
-#: ../libsvn_client/patch.c:275
+#: ../libsvn_client/patch.c:279
 #, c-format
 msgid "Cannot strip %u components from '%s'"
 msgstr "不能修剪 %u 个组件于“%s”"
 
-#: ../libsvn_client/patch.c:2952
+#: ../libsvn_client/patch.c:910
+msgid "Invalid link representation"
+msgstr "非法链接表述"
+
+#: ../libsvn_client/patch.c:3005
 msgid "strip count must be positive"
 msgstr "修剪计数取值必须为正"
 
-#: ../libsvn_client/patch.c:2968 ../libsvn_fs_base/tree.c:4003
-#: ../libsvn_fs_base/tree.c:4008 ../libsvn_fs_fs/tree.c:2731
-#: ../libsvn_fs_fs/tree.c:2736 ../libsvn_ra/compat.c:685
-#: ../libsvn_ra_local/ra_plugin.c:1077
+#: ../libsvn_client/patch.c:3021 ../libsvn_fs_base/tree.c:3978
+#: ../libsvn_fs_base/tree.c:3983 ../libsvn_fs_fs/tree.c:3066
+#: ../libsvn_fs_fs/tree.c:3071 ../libsvn_ra/compat.c:675
+#: ../libsvn_ra_local/ra_plugin.c:1145
 #, c-format
 msgid "'%s' is not a file"
 msgstr "“%s”不是一个文件"
 
-#: ../libsvn_client/patch.c:2980 ../libsvn_wc/util.c:59
+#: ../libsvn_client/patch.c:3033 ../libsvn_wc/util.c:59
 #, c-format
 msgid "'%s' is not a directory"
 msgstr "“%s”不是目录"
 
-#: ../libsvn_client/prop_commands.c:81
+#: ../libsvn_client/prop_commands.c:60
 #, c-format
 msgid "'%s' is a wcprop, thus not accessible to clients"
 msgstr "“%s” 是一个工作副本属性，应此不能被客户端存取"
 
-#: ../libsvn_client/prop_commands.c:173
+#: ../libsvn_client/prop_commands.c:155
 #, c-format
 msgid "Property '%s' is not a regular property"
 msgstr "属性 “%s” 不是常规属性"
 
-#: ../libsvn_client/prop_commands.c:301
+#: ../libsvn_client/prop_commands.c:266
 #, c-format
 msgid "Revision property '%s' not allowed in this context"
 msgstr "此上下文中不允许版本属性 “%s”"
 
-#: ../libsvn_client/prop_commands.c:308 ../libsvn_client/prop_commands.c:515
+#: ../libsvn_client/prop_commands.c:273 ../libsvn_client/prop_commands.c:468
 #, c-format
 msgid "Bad property name: '%s'"
 msgstr "属性名称错误: “%s”"
 
-#: ../libsvn_client/prop_commands.c:336
+#: ../libsvn_client/prop_commands.c:301
 msgid "Targets must be working copy paths"
 msgstr "目标必须是工作副本路径"
 
-#: ../libsvn_client/prop_commands.c:409
+#: ../libsvn_client/prop_commands.c:362
 msgid "Targets must be URLs"
 msgstr "目标必须是 URL"
 
-#: ../libsvn_client/prop_commands.c:419
+#: ../libsvn_client/prop_commands.c:372
 msgid "Setting property on non-local targets needs a base revision"
 msgstr "设定非本地目标的属性需要版本参数"
 
-#: ../libsvn_client/prop_commands.c:434
+#: ../libsvn_client/prop_commands.c:387
 #, c-format
 msgid "Setting property '%s' on non-local targets is not supported"
 msgstr "不支持对非本地目标设置属性“%s”"
 
-#: ../libsvn_client/prop_commands.c:462
+#: ../libsvn_client/prop_commands.c:415
 #, c-format
 msgid ""
 "revprop '%s' in r%ld is unexpectedly absent in repository (maybe someone "
 "else deleted it?)"
 msgstr "revprop “%s” 于版本 r%ld 出乎意料地不在版本库中(可能某人删除了？)"
 
-#: ../libsvn_client/prop_commands.c:471
+#: ../libsvn_client/prop_commands.c:424
 #, c-format
 msgid ""
 "revprop '%s' in r%ld has unexpected value in repository (maybe someone else "
 "changed it?)"
 msgstr "revprop “%s” 于版本 r%ld 在版本库中出乎意料地取值(可能某人修改了？)"
 
-#: ../libsvn_client/prop_commands.c:479
+#: ../libsvn_client/prop_commands.c:432
 #, c-format
 msgid ""
 "revprop '%s' in r%ld is unexpectedly present in repository (maybe someone "
 "else set it?)"
 msgstr "revprop “%s” 于版本 r%ld 出乎意料地在版本库中(可能某人设置了？)"
 
-#: ../libsvn_client/prop_commands.c:510
+#: ../libsvn_client/prop_commands.c:463
 msgid ""
 "Author name should not contain a newline; value will not be set unless forced"
 msgstr "作者名称不能包含换行；除非强迫为之，否则其值不会被设定"
 
-#: ../libsvn_client/prop_commands.c:662
+#: ../libsvn_client/prop_commands.c:577
 #, c-format
 msgid "'%s' does not exist in revision %ld"
 msgstr "没有路径 “%s” 在版本 %ld 中"
 
-#: ../libsvn_client/prop_commands.c:668 ../libsvn_client/prop_commands.c:985
-#: ../libsvn_wc/crop.c:182
+#: ../libsvn_client/prop_commands.c:583 ../libsvn_client/prop_commands.c:1096
+#: ../libsvn_wc/crop.c:168
 #, c-format
 msgid "Unknown node kind for '%s'"
 msgstr "“%s” 是未知的节点类型"
 
-#: ../libsvn_client/ra.c:156
+#: ../libsvn_client/ra.c:161
 #, c-format
-msgid "Attempt to set wc property '%s' on '%s' in a non-commit operation"
+msgid "Attempt to set wcprop '%s' on '%s' in a non-commit operation"
 msgstr "试图在非提交操作中，设定工作副本属性 “%s” 于 “%s”"
 
-#: ../libsvn_client/ra.c:356
+#: ../libsvn_client/ra.c:415
 #, c-format
 msgid "Redirect cycle detected for URL '%s'"
 msgstr "z在 URL '%s' 检测到循环重定向"
 
-#: ../libsvn_client/ra.c:741 ../libsvn_ra/compat.c:394
+#: ../libsvn_client/ra.c:501 ../libsvn_client/ra.c:812
+#, c-format
+msgid "'%s' has no URL"
+msgstr "“%s” 没有 URL"
+
+#: ../libsvn_client/ra.c:679 ../libsvn_ra/compat.c:395
 #, c-format
 msgid "Unable to find repository location for '%s' in revision %ld"
 msgstr "“%s” 的版本库位置不在版本 %ld 中"
 
-#: ../libsvn_client/ra.c:748
+#: ../libsvn_client/ra.c:691
 #, c-format
 msgid ""
 "The location for '%s' for revision %ld does not exist in the repository or "
@@ -2162,7 +2256,7 @@
 msgid "The repository at '%s' has uuid '%s', but the WC has '%s'"
 msgstr "版本库 “%s” 的 uuid 是 “%s”，但是工作副本的是 “%s”"
 
-#: ../libsvn_client/repos_diff.c:919 ../libsvn_wc/externals.c:508
+#: ../libsvn_client/repos_diff.c:931 ../libsvn_wc/externals.c:570
 #, c-format
 msgid "Base checksum mismatch for '%s'"
 msgstr "“%s”的校验和错误"
@@ -2177,29 +2271,35 @@
 msgid "Unrecognized revision type requested for '%s'"
 msgstr "“%s” 的请求版本类型无法识别"
 
-#: ../libsvn_client/revisions.c:189
-msgid "PREV, BASE, or COMMITTED revision keywords are invalid for URL"
-msgstr "对于 URL，版本关键字 PREV，BASE，或 COMMITTED 非法"
-
-#: ../libsvn_client/status.c:317 ../libsvn_client/status.c:491
-#: ../libsvn_wc/lock.c:563 ../libsvn_wc/lock.c:855 ../libsvn_wc/lock.c:1573
-#: ../libsvn_wc/wc_db.c:10217 ../libsvn_wc/wc_db_wcroot.c:560
+#: ../libsvn_client/status.c:407 ../libsvn_client/status.c:586
+#: ../libsvn_wc/lock.c:564 ../libsvn_wc/lock.c:856 ../libsvn_wc/lock.c:1542
+#: ../libsvn_wc/wc_db.c:12822 ../libsvn_wc/wc_db_wcroot.c:630
 #, c-format
 msgid "'%s' is not a working copy"
 msgstr "“%s”不是工作副本"
 
-#: ../libsvn_client/switch.c:102
+#: ../libsvn_client/status.c:454
+#, c-format
+msgid "Entry '%s' has no URL"
+msgstr "条目“%s”没有URL"
+
+#: ../libsvn_client/switch.c:129
 #, c-format
 msgid "Cannot both exclude and switch a path"
 msgstr "不能同时排除和切换同一路径"
 
-#: ../libsvn_client/switch.c:123
+#: ../libsvn_client/switch.c:150
 #, c-format
 msgid "Cannot switch '%s' because it is not in the repository yet"
 msgstr "不能切换“%s”，因为还不在版本库中"
 
-#: ../libsvn_client/switch.c:190 ../libsvn_ra_local/ra_plugin.c:228
-#: ../libsvn_ra_local/ra_plugin.c:307 ../libsvn_wc/update_editor.c:4584
+#: ../libsvn_client/switch.c:175
+#, c-format
+msgid "Directory '%s' has no URL"
+msgstr "目录 “%s” 没有 URL"
+
+#: ../libsvn_client/switch.c:215 ../libsvn_ra_local/ra_plugin.c:236
+#: ../libsvn_ra_local/ra_plugin.c:326 ../libsvn_wc/update_editor.c:4870
 #, c-format
 msgid ""
 "'%s'\n"
@@ -2211,202 +2311,243 @@
 "“%s”\n"
 "并不在同一个版本库中"
 
-#: ../libsvn_client/switch.c:215
+#: ../libsvn_client/switch.c:242
 #, c-format
 msgid "'%s' shares no common ancestry with '%s'"
 msgstr "“%s”与“%s”没有共同的祖先"
 
-#: ../libsvn_client/util.c:110
-#, c-format
-msgid "URL '%s' is not a child of repository root URL '%s'"
-msgstr "URL “%s” 不是版本库根 URL “%s” 的子节点"
-
-#: ../libsvn_client/util.c:131
-#, c-format
-msgid "URL '%s' is not inside repository"
-msgstr "URL“%s”不在版本库中"
-
-#: ../libsvn_client/util.c:235 ../svn/util.c:1382
+#: ../libsvn_client/util.c:336
 #, c-format
 msgid "Cannot mix repository and working copy targets"
 msgstr "不能混合版本库和工作副本目标"
 
-#: ../libsvn_delta/svndiff.c:167
+#: ../libsvn_delta/svndiff.c:175
 msgid "Compression of svndiff data failed"
 msgstr "压缩 svndiff 数据失败"
 
-#: ../libsvn_delta/svndiff.c:449
+#: ../libsvn_delta/svndiff.c:538
 msgid "Decompression of svndiff data failed: no size"
 msgstr "解压 svndiff 数据失败: 没有长度"
 
-#: ../libsvn_delta/svndiff.c:452
+#: ../libsvn_delta/svndiff.c:541
 msgid "Decompression of svndiff data failed: size too large"
 msgstr "解压 svndiff 数据失败: 长度太大"
 
-#: ../libsvn_delta/svndiff.c:473
+#: ../libsvn_delta/svndiff.c:565
 msgid "Decompression of svndiff data failed"
 msgstr "解压 svndiff 数据失败"
 
-#: ../libsvn_delta/svndiff.c:480
+#: ../libsvn_delta/svndiff.c:572
 msgid "Size of uncompressed data does not match stored original length"
 msgstr "解压后的数据长度与原始长度不相等"
 
-#: ../libsvn_delta/svndiff.c:555
+#: ../libsvn_delta/svndiff.c:648
 #, c-format
 msgid "Invalid diff stream: insn %d cannot be decoded"
 msgstr "无效的差异流: insn %d 不能解码"
 
-#: ../libsvn_delta/svndiff.c:559
+#: ../libsvn_delta/svndiff.c:652
 #, c-format
 msgid "Invalid diff stream: insn %d has length zero"
 msgstr "无效的差异流: insn %d 出现 0 长度"
 
-#: ../libsvn_delta/svndiff.c:563
+#: ../libsvn_delta/svndiff.c:656
 #, c-format
 msgid "Invalid diff stream: insn %d overflows the target view"
 msgstr "无效的差异流: insn %d 溢出目标视图"
 
-#: ../libsvn_delta/svndiff.c:572
+#: ../libsvn_delta/svndiff.c:665
 #, c-format
 msgid "Invalid diff stream: [src] insn %d overflows the source view"
 msgstr "无效的差异流: [src] insn %d 溢出源视图"
 
-#: ../libsvn_delta/svndiff.c:579
+#: ../libsvn_delta/svndiff.c:672
 #, c-format
 msgid ""
 "Invalid diff stream: [tgt] insn %d starts beyond the target view position"
 msgstr "无效的差异流: [tgt] insn %d 起点超过目标视图位置"
 
-#: ../libsvn_delta/svndiff.c:586
+#: ../libsvn_delta/svndiff.c:679
 #, c-format
 msgid "Invalid diff stream: [new] insn %d overflows the new data section"
 msgstr "无效的差异流: [new] insn %d 溢出新数据区域"
 
-#: ../libsvn_delta/svndiff.c:596
+#: ../libsvn_delta/svndiff.c:689
 msgid "Delta does not fill the target window"
 msgstr "Delta 没有填充目标窗口"
 
-#: ../libsvn_delta/svndiff.c:599
+#: ../libsvn_delta/svndiff.c:692
 msgid "Delta does not contain enough new data"
 msgstr "Delta 没有包含足够新数据"
 
-#: ../libsvn_delta/svndiff.c:705
+#: ../libsvn_delta/svndiff.c:797
 msgid "Svndiff has invalid header"
 msgstr "Svndiff 数据包含无效头"
 
-#: ../libsvn_delta/svndiff.c:761 ../libsvn_delta/svndiff.c:925
+#: ../libsvn_delta/svndiff.c:853 ../libsvn_delta/svndiff.c:1035
 msgid "Svndiff contains a too-large window"
 msgstr "Svndiff 数据包含太大的窗口"
 
-#: ../libsvn_delta/svndiff.c:768 ../libsvn_delta/svndiff.c:932
+#: ../libsvn_delta/svndiff.c:860 ../libsvn_delta/svndiff.c:1042
 msgid "Svndiff contains corrupt window header"
 msgstr "Svndiff 数据包含无效窗口"
 
-#: ../libsvn_delta/svndiff.c:777
+#: ../libsvn_delta/svndiff.c:869
 msgid "Svndiff has backwards-sliding source views"
 msgstr "Svndiff 数据包含向后变化的资源视图"
 
-#: ../libsvn_delta/svndiff.c:826 ../libsvn_delta/svndiff.c:873
-#: ../libsvn_delta/svndiff.c:954
+#: ../libsvn_delta/svndiff.c:926 ../libsvn_delta/svndiff.c:983
+#: ../libsvn_delta/svndiff.c:1064
 msgid "Unexpected end of svndiff input"
 msgstr "svndiff 输入意料结束"
 
-#: ../libsvn_diff/diff_file.c:1089
+#: ../libsvn_diff/diff_file.c:184
+#, c-format
+msgid "File '%s' is too large to be read in to memory"
+msgstr ""
+
+#: ../libsvn_diff/diff_file.c:1106
 #, c-format
 msgid "The file '%s' changed unexpectedly during diff"
 msgstr "文件“%s”在比较期间意外改变"
 
-#: ../libsvn_diff/diff_file.c:1259
+#: ../libsvn_diff/diff_file.c:1276
 msgid "Error in options to internal diff"
 msgstr "内部比较的选项错误"
 
-#: ../libsvn_diff/diff_file.c:1285
+#: ../libsvn_diff/diff_file.c:1302
 #, c-format
 msgid "Invalid argument '%s' in diff options"
 msgstr "diff 选项中参数'%s'无效"
 
-#: ../libsvn_diff/diff_file.c:1568
-msgid "No newline at end of file"
-msgstr "文件没有以空行结尾"
-
 #. Order of date components can be different in different languages
-#: ../libsvn_diff/diff_file.c:1775
+#: ../libsvn_diff/diff_file.c:1799
 msgid "%a %b %e %H:%M:%S %Y"
 msgstr "%a %b %e %H:%M:%S %Y"
 
-#: ../libsvn_diff/diff_file.c:2393
+#: ../libsvn_diff/diff_file.c:1875 ../libsvn_diff/diff_file.c:1891
+#, c-format
+msgid "Path '%s' must be inside the directory '%s'"
+msgstr "路径 “%s” 必须在目录 “%s”内"
+
+#: ../libsvn_diff/diff_file.c:2409
 #, c-format
 msgid "Failed to delete mmap '%s'"
 msgstr "删除 mmap“%s”失败"
 
-#: ../libsvn_fs/fs-loader.c:117 ../libsvn_ra/ra_loader.c:179
-#: ../libsvn_ra/ra_loader.c:192
+#: ../libsvn_diff/util.c:463
 #, c-format
-msgid "'%s' does not define '%s()'"
-msgstr "“%s” 未定义 “%s()”"
+msgid "   Reverse-merged %s:r%s%s"
+msgstr "   已经撤销合并 %s:r%s%s"
+
+#: ../libsvn_diff/util.c:480
+#, c-format
+msgid "   Merged %s:r%s%s"
+msgstr "   已经合并 %s:r%s%s"
 
-#: ../libsvn_fs/fs-loader.c:134
+#: ../libsvn_fs/editor.c:219
 #, c-format
-msgid "Can't grab FS mutex"
-msgstr "无法获取文件系统互斥体"
+msgid "Revision for modifying '%s' is required"
+msgstr "修改“%s”需要版本号"
 
-#: ../libsvn_fs/fs-loader.c:146
+#: ../libsvn_fs/editor.c:228
 #, c-format
-msgid "Can't ungrab FS mutex"
-msgstr "不能释放文件系统互斥体"
+msgid "'%s' is out of date; try updating"
+msgstr "“%s” 已经过时；请先更新"
 
-#: ../libsvn_fs/fs-loader.c:167
+#: ../libsvn_fs/editor.c:265
+#, c-format
+msgid "'%s' has been modified since the commit began (restart the commit)"
+msgstr "自提交开始，“%s” 已有本地修改 (重新提交)"
+
+#: ../libsvn_fs/editor.c:323
+#, c-format
+msgid "'%s' already exists, so may be out of date; try updating"
+msgstr "“%s” 已经存在，因此可能过时；请先更新"
+
+#: ../libsvn_fs/editor.c:456
+msgid "The filesystem does not support 'absent' nodes"
+msgstr "此文件系统不支持 'absent' 节点"
+
+#: ../libsvn_fs/fs-loader.c:121
+#, c-format
+msgid "Invalid name for FS type '%s'"
+msgstr "文件类型“%s”的名称无效"
+
+#: ../libsvn_fs/fs-loader.c:138 ../libsvn_ra/ra_loader.c:161
+#: ../libsvn_ra/ra_loader.c:174
+#, c-format
+msgid "'%s' does not define '%s()'"
+msgstr "“%s” 未定义 “%s()”"
+
+#: ../libsvn_fs/fs-loader.c:164
 #, c-format
 msgid "Failed to load module for FS type '%s'"
 msgstr "加载 “%s” 文件系统模块失败"
 
-#: ../libsvn_fs/fs-loader.c:200
+#: ../libsvn_fs/fs-loader.c:186
 #, c-format
 msgid ""
 "Mismatched FS module version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
 msgstr "文件系统模块 “%s” 版本不匹配 : 找到 %d.%d.%d%s，期望 %d.%d.%d%s"
 
-#: ../libsvn_fs/fs-loader.c:225
+#: ../libsvn_fs/fs-loader.c:266
 #, c-format
 msgid "Unknown FS type '%s'"
 msgstr "未知的文件系统类型 “%s”"
 
-#: ../libsvn_fs/fs-loader.c:328
-#, c-format
-msgid "Can't allocate FS mutex"
-msgstr "不能分配文件系统互斥体"
-
-#: ../libsvn_fs/fs-loader.c:358
+#: ../libsvn_fs/fs-loader.c:389
 #, c-format
 msgid "Path '%s' is not in UTF-8"
 msgstr "路径 “%s” 不是 UTF-8 编码"
 
-#: ../libsvn_fs/fs-loader.c:366
+#: ../libsvn_fs/fs-loader.c:397
 #, c-format
 msgid "Path '%s' contains '.' or '..' element"
 msgstr "路径 “%s” 包含 “.” 或 “..” 元素"
 
-#: ../libsvn_fs/fs-loader.c:1247
+#: ../libsvn_fs/fs-loader.c:554 ../libsvn_repos/repos.c:1990
+msgid "Hotcopy source and destination are equal"
+msgstr "热复制的源地址与目标地址相同"
+
+#: ../libsvn_fs/fs-loader.c:564
+#, c-format
+msgid "'%s' already exists and is a file"
+msgstr "“%s”已存在，它是文件"
+
+#: ../libsvn_fs/fs-loader.c:569
+#, c-format
+msgid "'%s' already exists and has an unknown node kind"
+msgstr "“%s”已存在，具有未知的节点类型"
+
+#: ../libsvn_fs/fs-loader.c:587
+#, c-format
+msgid ""
+"The filesystem type of the hotcopy source ('%s') does not match the "
+"filesystem type of the hotcopy destination ('%s')"
+msgstr "热复制源地址的文件系统类型('%s') 与目标地址('%s') 的不相同"
+
+#: ../libsvn_fs/fs-loader.c:1395
 #, c-format
 msgid "Malformed UUID '%s'"
 msgstr "非法 UUID “%s”"
 
-#: ../libsvn_fs/fs-loader.c:1275
+#: ../libsvn_fs/fs-loader.c:1423
 #, c-format
 msgid "Lock token URI '%s' has bad scheme; expected '%s'"
 msgstr "锁令牌 URI '%s' 的方案错误；期望是 '%s'"
 
-#: ../libsvn_fs/fs-loader.c:1282
+#: ../libsvn_fs/fs-loader.c:1430
 #, c-format
 msgid "Lock token '%s' is not ASCII at byte %u"
 msgstr "锁令牌  '%s' 在字节 %u 处不是 ASCII 字符"
 
-#: ../libsvn_fs/fs-loader.c:1289
+#: ../libsvn_fs/fs-loader.c:1437
 #, c-format
 msgid "Lock token URI '%s' is not XML-safe"
 msgstr "锁令牌 URI '%s' 不是 XML 安全的"
 
-#: ../libsvn_fs/fs-loader.c:1296
+#: ../libsvn_fs/fs-loader.c:1444
 msgid "Negative expiration date passed to svn_fs_lock"
 msgstr "传递到 svn_fs_lock 的有效期非法"
 
@@ -2415,48 +2556,48 @@
 msgid "Berkeley DB error for filesystem '%s' while %s:\n"
 msgstr "当 %s 关闭文件系统 “%s” 的 BDB 环境句柄时出错:\n"
 
-#: ../libsvn_fs_base/bdb/changes-table.c:93
+#: ../libsvn_fs_base/bdb/changes-table.c:94
 msgid "creating change"
 msgstr "正在创建修改"
 
-#: ../libsvn_fs_base/bdb/changes-table.c:117
+#: ../libsvn_fs_base/bdb/changes-table.c:118
 msgid "deleting changes"
 msgstr "正在删除修改"
 
-#: ../libsvn_fs_base/bdb/changes-table.c:149 ../libsvn_fs_fs/fs_fs.c:4243
+#: ../libsvn_fs_base/bdb/changes-table.c:150 ../libsvn_fs_fs/fs_fs.c:5911
 msgid "Missing required node revision ID"
 msgstr "缺少必须的节点版本 ID"
 
-#: ../libsvn_fs_base/bdb/changes-table.c:160 ../libsvn_fs_fs/fs_fs.c:4253
+#: ../libsvn_fs_base/bdb/changes-table.c:161 ../libsvn_fs_fs/fs_fs.c:5921
 msgid "Invalid change ordering: new node revision ID without delete"
 msgstr "无效的改变顺序: 没有删除新节点版本 ID"
 
-#: ../libsvn_fs_base/bdb/changes-table.c:170 ../libsvn_fs_fs/fs_fs.c:4264
+#: ../libsvn_fs_base/bdb/changes-table.c:171 ../libsvn_fs_fs/fs_fs.c:5932
 msgid "Invalid change ordering: non-add change on deleted path"
 msgstr "无效的改变顺序: 在已经删除的路径执行非增加修改"
 
-#: ../libsvn_fs_base/bdb/changes-table.c:179 ../libsvn_fs_fs/fs_fs.c:4273
+#: ../libsvn_fs_base/bdb/changes-table.c:180 ../libsvn_fs_fs/fs_fs.c:5941
 msgid "Invalid change ordering: add change on preexisting path"
 msgstr "无效的改变顺序: 在已有路径增加修改"
 
-#: ../libsvn_fs_base/bdb/changes-table.c:271
-#: ../libsvn_fs_base/bdb/changes-table.c:394
+#: ../libsvn_fs_base/bdb/changes-table.c:272
+#: ../libsvn_fs_base/bdb/changes-table.c:395
 msgid "creating cursor for reading changes"
 msgstr "正在为读取修改创建指针"
 
-#: ../libsvn_fs_base/bdb/changes-table.c:296
-#: ../libsvn_fs_base/bdb/changes-table.c:415
+#: ../libsvn_fs_base/bdb/changes-table.c:297
+#: ../libsvn_fs_base/bdb/changes-table.c:416
 #, c-format
 msgid "Error reading changes for key '%s'"
 msgstr "读取键 “%s” 的修改时出错"
 
-#: ../libsvn_fs_base/bdb/changes-table.c:355
-#: ../libsvn_fs_base/bdb/changes-table.c:438
+#: ../libsvn_fs_base/bdb/changes-table.c:356
+#: ../libsvn_fs_base/bdb/changes-table.c:439
 msgid "fetching changes"
 msgstr "正在获取修改"
 
-#: ../libsvn_fs_base/bdb/changes-table.c:368
-#: ../libsvn_fs_base/bdb/changes-table.c:451
+#: ../libsvn_fs_base/bdb/changes-table.c:369
+#: ../libsvn_fs_base/bdb/changes-table.c:452
 msgid "closing changes cursor"
 msgstr "正在关闭修改指针"
 
@@ -2475,6 +2616,10 @@
 msgid "storing checksum-reps record"
 msgstr "正在存储校验和展现记录"
 
+#: ../libsvn_fs_base/bdb/checksum-reps-table.c:164
+msgid "deleting entry from 'checksum-reps' table"
+msgstr "正在从 “checksum-reps” 表中删除条目"
+
 #: ../libsvn_fs_base/bdb/checksum-reps-table.c:186
 msgid "allocating new representation reuse ID (getting 'next-key')"
 msgstr "正在分配新展现的复用 ID(正在获取 “next-key”)"
@@ -2503,6 +2648,54 @@
 msgid "reading copy"
 msgstr "正在读取副本"
 
+#: ../libsvn_fs_base/bdb/lock-tokens-table.c:87
+msgid "storing lock token record"
+msgstr "正在存储加锁令牌记录"
+
+#: ../libsvn_fs_base/bdb/lock-tokens-table.c:108
+msgid "deleting entry from 'lock-tokens' table"
+msgstr "正在从 “lock-tokens” 表中删除条目"
+
+#: ../libsvn_fs_base/bdb/lock-tokens-table.c:135
+msgid "reading lock token"
+msgstr "正在读取加锁令牌"
+
+#: ../libsvn_fs_base/bdb/locks-table.c:93
+msgid "storing lock record"
+msgstr "正在存储加锁记录"
+
+#: ../libsvn_fs_base/bdb/locks-table.c:116
+msgid "deleting lock from 'locks' table"
+msgstr "正在从“locks”表删除锁"
+
+#: ../libsvn_fs_base/bdb/locks-table.c:143
+msgid "reading lock"
+msgstr "正在读取锁"
+
+#: ../libsvn_fs_base/bdb/locks-table.c:246
+msgid "creating cursor for reading lock tokens"
+msgstr "正在为读取加锁令牌创建游标"
+
+#: ../libsvn_fs_base/bdb/locks-table.c:321
+msgid "fetching lock tokens"
+msgstr "正在取出加锁令牌"
+
+#: ../libsvn_fs_base/bdb/locks-table.c:323
+msgid "fetching lock tokens (closing cursor)"
+msgstr "正在取出加锁令牌 (正在关闭游标)"
+
+#: ../libsvn_fs_base/bdb/miscellaneous-table.c:95
+msgid "deleting record from 'miscellaneous' table"
+msgstr "正在从“miscellaneous”表删除条目"
+
+#: ../libsvn_fs_base/bdb/miscellaneous-table.c:103
+msgid "storing miscellaneous record"
+msgstr "正在存储杂项记录"
+
+#: ../libsvn_fs_base/bdb/miscellaneous-table.c:131
+msgid "fetching miscellaneous record"
+msgstr "正在取出杂项记录"
+
 #: ../libsvn_fs_base/bdb/node-origins-table.c:117
 #, c-format
 msgid ""
@@ -2514,6 +2707,10 @@
 msgid "storing node-origins record"
 msgstr "正在存储节点原始记录"
 
+#: ../libsvn_fs_base/bdb/node-origins-table.c:142
+msgid "deleting entry from 'node-origins' table"
+msgstr "正在从“node-origins”表删除条目"
+
 #: ../libsvn_fs_base/bdb/nodes-table.c:102
 msgid "allocating new node ID (getting 'next-key')"
 msgstr "正在分配新的节点 ID (正在获取“next-key”)"
@@ -2573,14 +2770,132 @@
 msgid "reading filesystem revision"
 msgstr "正在读取文件系统版本"
 
+#: ../libsvn_fs_base/bdb/rev-table.c:141
+msgid "updating filesystem revision"
+msgstr "正在更新文件系统版本"
+
+#: ../libsvn_fs_base/bdb/rev-table.c:149
+msgid "storing filesystem revision"
+msgstr "正在存储文件系统版本"
+
+#: ../libsvn_fs_base/bdb/rev-table.c:179
+msgid "getting youngest revision (creating cursor)"
+msgstr "正在取出最新版本(创建游标)"
+
+#: ../libsvn_fs_base/bdb/rev-table.c:203
+msgid "getting youngest revision (finding last entry)"
+msgstr "正在取出最新版本(查找最新项)"
+
+#. You can't commit a transaction with open cursors, because:
+#. 1) key/value pairs don't get deleted until the cursors referring
+#. to them are closed, so closing a cursor can fail for various
+#. reasons, and txn_commit shouldn't fail that way, and
+#. 2) using a cursor after committing its transaction can cause
+#. undetectable database corruption.
+#: ../libsvn_fs_base/bdb/rev-table.c:213
+msgid "getting youngest revision (closing cursor)"
+msgstr "正在取出最新版本(关闭游标)"
+
 #: ../libsvn_fs_base/bdb/strings-table.c:94
+#: ../libsvn_fs_base/bdb/strings-table.c:300
+#: ../libsvn_fs_base/bdb/strings-table.c:491
 msgid "creating cursor for reading a string"
 msgstr "正在为读取字符串创建指针"
 
+#: ../libsvn_fs_base/bdb/strings-table.c:124
+msgid "moving cursor"
+msgstr "正在移动指针"
+
+#: ../libsvn_fs_base/bdb/strings-table.c:136
+msgid "rerunning cursor move"
+msgstr "重新执行游标移动"
+
+#: ../libsvn_fs_base/bdb/strings-table.c:228
+#: ../libsvn_fs_base/bdb/strings-table.c:247
+#: ../libsvn_fs_base/bdb/strings-table.c:265
+msgid "reading string"
+msgstr "正在读取字符串"
+
+#. Done with the cursor.
+#: ../libsvn_fs_base/bdb/strings-table.c:254
+#: ../libsvn_fs_base/bdb/strings-table.c:334
+#: ../libsvn_fs_base/bdb/strings-table.c:539
+msgid "closing string-reading cursor"
+msgstr "正在关闭读取字符串的游标"
+
+#: ../libsvn_fs_base/bdb/strings-table.c:313
+#: ../libsvn_fs_base/bdb/strings-table.c:505
+msgid "getting next-key value"
+msgstr "正在取出 next-key 的值"
+
+#. ignore the error, the original is
+#. more important.
+#: ../libsvn_fs_base/bdb/strings-table.c:331
+msgid "bumping next string key"
+msgstr "正在跳到下一个字符串键"
+
+#: ../libsvn_fs_base/bdb/strings-table.c:358
+msgid "appending string"
+msgstr "正在追加字符串"
+
+#. Handle any other error conditions.
+#: ../libsvn_fs_base/bdb/strings-table.c:390
+msgid "clearing string"
+msgstr "正在清理字符串"
+
+#: ../libsvn_fs_base/bdb/strings-table.c:399
+msgid "storing empty contents"
+msgstr "正在存储空内容"
+
+#: ../libsvn_fs_base/bdb/strings-table.c:436
+msgid "fetching string length"
+msgstr "正在获取字符串的长度"
+
+#. Handle any other error conditions.
+#: ../libsvn_fs_base/bdb/strings-table.c:466
+msgid "deleting string"
+msgstr "正在删除字符串"
+
+#: ../libsvn_fs_base/bdb/strings-table.c:524
+msgid "writing copied data"
+msgstr "正在写入已复制的数据"
+
+#: ../libsvn_fs_base/bdb/strings-table.c:535
+msgid "fetching string data for a copy"
+msgstr "正在取出字符数据"
+
 #: ../libsvn_fs_base/bdb/txn-table.c:99
 msgid "storing transaction record"
 msgstr "正在存储事务记录"
 
+#: ../libsvn_fs_base/bdb/txn-table.c:123
+msgid "allocating new transaction ID (getting 'next-key')"
+msgstr "正在分配新事务 ID(正在获取 “next-key”)"
+
+#: ../libsvn_fs_base/bdb/txn-table.c:142
+msgid "bumping next transaction key"
+msgstr "正在跳到下一个事务键"
+
+#: ../libsvn_fs_base/bdb/txn-table.c:188
+msgid "deleting entry from 'transactions' table"
+msgstr "正在从“transactions”表删除条目"
+
+#: ../libsvn_fs_base/bdb/txn-table.c:218
+msgid "reading transaction"
+msgstr "正在读取事务"
+
+#: ../libsvn_fs_base/bdb/txn-table.c:251
+msgid "reading transaction list (opening cursor)"
+msgstr "正在读取事务列表(游标已打开)"
+
+#: ../libsvn_fs_base/bdb/txn-table.c:314
+msgid "reading transaction list (listing keys)"
+msgstr "正在读取事务列表(正在枚举键)"
+
+#: ../libsvn_fs_base/bdb/txn-table.c:317
+msgid "reading transaction list (closing cursor)"
+msgstr "正在读取事务列表(游标已关闭)"
+
 #: ../libsvn_fs_base/bdb/uuids-table.c:119
 msgid "get repository uuid"
 msgstr "获取版本库 UUID"
@@ -2608,17 +2923,17 @@
 msgid "Attempted to get entries of a non-directory node"
 msgstr "试图从非目录节点中获取条目"
 
-#: ../libsvn_fs_base/dag.c:461 ../libsvn_fs_fs/dag.c:376
+#: ../libsvn_fs_base/dag.c:461 ../libsvn_fs_fs/dag.c:372
 #, c-format
 msgid "Attempted to create a node with an illegal name '%s'"
 msgstr "试图用非法的名字“%s”创建节点"
 
-#: ../libsvn_fs_base/dag.c:467 ../libsvn_fs_fs/dag.c:382
+#: ../libsvn_fs_base/dag.c:467 ../libsvn_fs_fs/dag.c:378
 msgid "Attempted to create entry in non-directory parent"
 msgstr "试图在非目录的父节点创建条目"
 
 #: ../libsvn_fs_base/dag.c:473 ../libsvn_fs_base/dag.c:737
-#: ../libsvn_fs_fs/dag.c:388
+#: ../libsvn_fs_fs/dag.c:384
 #, c-format
 msgid "Attempted to clone child of non-mutable node"
 msgstr "试图克隆非可变节点的子节点"
@@ -2628,11 +2943,11 @@
 msgid "Attempted to create entry that already exists"
 msgstr "试图创建已经存在的条目"
 
-#: ../libsvn_fs_base/dag.c:529 ../libsvn_fs_fs/dag.c:468
+#: ../libsvn_fs_base/dag.c:529 ../libsvn_fs_fs/dag.c:462
 msgid "Attempted to set entry in non-directory node"
 msgstr "试图在非目录节点中设置条目"
 
-#: ../libsvn_fs_base/dag.c:535 ../libsvn_fs_fs/dag.c:474
+#: ../libsvn_fs_base/dag.c:535 ../libsvn_fs_fs/dag.c:468
 msgid "Attempted to set entry in immutable node"
 msgstr "试图在不变节点设置条目"
 
@@ -2696,7 +3011,7 @@
 msgid "Attempted to set textual contents of an immutable node"
 msgstr "试图设置不变节点的文本内容"
 
-#: ../libsvn_fs_base/dag.c:1279 ../libsvn_fs_base/reps-strings.c:830
+#: ../libsvn_fs_base/dag.c:1279 ../libsvn_fs_base/reps-strings.c:829
 #, c-format
 msgid "Checksum mismatch on representation '%s'"
 msgstr "'%s' 的校验和不匹配"
@@ -2711,17 +3026,17 @@
 msgid "Attempted to open node with an illegal name '%s'"
 msgstr "试图以非法名字“%s”打开节点"
 
-#: ../libsvn_fs_base/dag.c:1701
+#: ../libsvn_fs_base/dag.c:1700
 #, c-format
 msgid "Attempted merge tracking info change on immutable node"
 msgstr "试图在不变节点合并跟踪信息的修改"
 
-#: ../libsvn_fs_base/dag.c:1741
+#: ../libsvn_fs_base/dag.c:1740
 #, c-format
 msgid "Attempted mergeinfo count change on immutable node"
 msgstr "试图在不变节点修改合并信息计数"
 
-#: ../libsvn_fs_base/dag.c:1753
+#: ../libsvn_fs_base/dag.c:1752
 #, c-format
 msgid "Invalid value (%%%s) for node revision mergeinfo count"
 msgstr "节点合并信息计数的值非法(%%%s)"
@@ -2731,106 +3046,215 @@
 msgid "Corrupt filesystem revision %ld in filesystem '%s'"
 msgstr "文件系统版本 %ld 损坏，其文件系统是 “%s”"
 
-#: ../libsvn_fs_base/err.c:57 ../libsvn_fs_fs/fs_fs.c:2153
+#: ../libsvn_fs_base/err.c:57 ../libsvn_fs_fs/fs_fs.c:2268
 #, c-format
 msgid "Reference to non-existent node '%s' in filesystem '%s'"
 msgstr "引用不存在的节点 “%s”，其文件系统是 “%s”"
 
-#: ../libsvn_fs_base/err.c:67
+#: ../libsvn_fs_base/err.c:68
 #, c-format
 msgid "No such revision %ld in filesystem '%s'"
 msgstr "没有版本 %ld，其文件系统是“%s”"
 
-#: ../libsvn_fs_base/err.c:79
+#: ../libsvn_fs_base/err.c:80
 #, c-format
 msgid "Corrupt entry in 'transactions' table for '%s' in filesystem '%s'"
 msgstr "“%s” 的 “transactions” 表有无效入口，其文件系统是 “%s”"
 
-#: ../libsvn_fs_base/err.c:90
+#: ../libsvn_fs_base/err.c:91
 #, c-format
 msgid "Corrupt entry in 'copies' table for '%s' in filesystem '%s'"
 msgstr "“%s” 的 “copies” 表有无效入口，其文件系统是 “%s”"
 
-#: ../libsvn_fs_base/err.c:101
+#: ../libsvn_fs_base/err.c:102
 #, c-format
 msgid "No transaction named '%s' in filesystem '%s'"
 msgstr "事务 “%s” 不在文件系统 “%s” 中"
 
-#: ../libsvn_fs_base/err.c:112
+#: ../libsvn_fs_base/err.c:113
 #, c-format
 msgid "Cannot modify transaction named '%s' in filesystem '%s'"
 msgstr "无法修改名为 “%s” 的事务，其文件系统是 “%s”"
 
-#: ../libsvn_fs_base/err.c:123
+#: ../libsvn_fs_base/err.c:124
 #, c-format
 msgid "No copy with id '%s' in filesystem '%s'"
 msgstr "没有标识 “%s” 的副本，其文件系统是 “%s”"
 
-#: ../libsvn_fs_base/err.c:133
+#: ../libsvn_fs_base/err.c:134
 #, c-format
 msgid "Token '%s' does not point to any existing lock in filesystem '%s'"
 msgstr "标识“%s”没有指向文件系统“%s”中存在的锁"
 
-#: ../libsvn_fs_base/err.c:143
+#: ../libsvn_fs_base/err.c:144
 #, c-format
 msgid "No token given for path '%s' in filesystem '%s'"
 msgstr "路径 “%s” 没有令牌，其文件系统是 “%s”"
 
-#: ../libsvn_fs_base/err.c:152
+#: ../libsvn_fs_base/err.c:153
 #, c-format
 msgid "Corrupt lock in 'locks' table for '%s' in filesystem '%s'"
 msgstr "“%s” 的 “locks” 表锁损坏，其文件系统是 “%s”"
 
-#: ../libsvn_fs_base/err.c:162
+#: ../libsvn_fs_base/err.c:163
 #, c-format
 msgid "No record in 'node-origins' table for node id '%s' in filesystem '%s'"
 msgstr "在 “node-origins” 表中，没有节点 “%s” 的记录，其文件系统是 “%s”"
 
-#: ../libsvn_fs_base/err.c:172
+#: ../libsvn_fs_base/err.c:173
 #, c-format
 msgid ""
 "No record in 'checksum-reps' table for checksum '%s' in filesystem '%s'"
 msgstr "在 “checksum-reps” 表中，没有校验和 “%s” 的记录，其文件系统是 “%s”"
 
-#: ../libsvn_fs_base/fs.c:86
+#: ../libsvn_fs_base/fs.c:89
 #, c-format
 msgid "Bad database version: got %d.%d.%d, should be at least %d.%d.%d"
 msgstr "不正确的数据库版本: 得到 %d.%d.%d，应该最低是 %d.%d.%d"
 
-#: ../libsvn_fs_base/fs.c:97
+#: ../libsvn_fs_base/fs.c:100
 #, c-format
 msgid ""
 "Bad database version: compiled with %d.%d.%d, running against %d.%d.%d"
 msgstr "不正确的数据库版本: 用 %d.%d.%d 版本编译，正在运行版本 %d.%d.%d"
 
-#: ../libsvn_fs_base/fs.c:187
+#: ../libsvn_fs_base/fs.c:190
 #, c-format
 msgid "Berkeley DB error for filesystem '%s' while closing environment:\n"
 msgstr "关闭文件系统“%s”的BDB环境句柄时出错:\n"
 
-#: ../libsvn_fs_base/fs.c:537
+#: ../libsvn_fs_base/fs.c:553
 #, c-format
 msgid "Berkeley DB error for filesystem '%s' while creating environment:\n"
 msgstr "创建文件系统“%s”的BDB环境句柄时出错:\n"
 
-#: ../libsvn_fs_base/fs.c:543
+#: ../libsvn_fs_base/fs.c:559
 #, c-format
 msgid "Berkeley DB error for filesystem '%s' while opening environment:\n"
 msgstr "打开文件系统“%s”的BDB环境句柄时出错:\n"
 
-#: ../libsvn_fs_base/fs.c:706
+#: ../libsvn_fs_base/fs.c:574
+msgid "creating 'nodes' table"
+msgstr "正在创建“nodes”表"
+
+#: ../libsvn_fs_base/fs.c:575
+msgid "opening 'nodes' table"
+msgstr "正在打开“nodes”表"
+
+#: ../libsvn_fs_base/fs.c:580
+msgid "creating 'revisions' table"
+msgstr "正在创建“revisions”表"
+
+#: ../libsvn_fs_base/fs.c:581
+msgid "opening 'revisions' table"
+msgstr "正在打开“revisions”表"
+
+#: ../libsvn_fs_base/fs.c:586
+msgid "creating 'transactions' table"
+msgstr "正在创建“transactions”表"
+
+#: ../libsvn_fs_base/fs.c:587
+msgid "opening 'transactions' table"
+msgstr "正在打开“transactions”表"
+
+#: ../libsvn_fs_base/fs.c:592
+msgid "creating 'copies' table"
+msgstr "正在创建“copies”表"
+
+#: ../libsvn_fs_base/fs.c:593
+msgid "opening 'copies' table"
+msgstr "正在打开“copies”表"
+
+#: ../libsvn_fs_base/fs.c:598
+msgid "creating 'changes' table"
+msgstr "正在创建“changes”表"
+
+#: ../libsvn_fs_base/fs.c:599
+msgid "opening 'changes' table"
+msgstr "正在打开“changes”表"
+
+#: ../libsvn_fs_base/fs.c:604
+msgid "creating 'representations' table"
+msgstr "正在创建“representations”表"
+
+#: ../libsvn_fs_base/fs.c:605
+msgid "opening 'representations' table"
+msgstr "正在打开“representations”表"
+
+#: ../libsvn_fs_base/fs.c:610
+msgid "creating 'strings' table"
+msgstr "正在创建“strings”表"
+
+#: ../libsvn_fs_base/fs.c:611
+msgid "opening 'strings' table"
+msgstr "正在打开“strings”表"
+
+#: ../libsvn_fs_base/fs.c:616
+msgid "creating 'uuids' table"
+msgstr "正在创建“uuids”表"
+
+#: ../libsvn_fs_base/fs.c:617
+msgid "opening 'uuids' table"
+msgstr "正在打开“uuids”表"
+
+#: ../libsvn_fs_base/fs.c:622
+msgid "creating 'locks' table"
+msgstr "正在创建“locks”表"
+
+#: ../libsvn_fs_base/fs.c:623
+msgid "opening 'locks' table"
+msgstr "正在打开“locks”表"
+
+#: ../libsvn_fs_base/fs.c:628
+msgid "creating 'lock-tokens' table"
+msgstr "正在创建“lock-tokens”表"
+
+#: ../libsvn_fs_base/fs.c:629
+msgid "opening 'lock-tokens' table"
+msgstr "正在打开“lock-tokens”表"
+
+#: ../libsvn_fs_base/fs.c:637
+msgid "creating 'node-origins' table"
+msgstr "正在创建“node-origins”表"
+
+#: ../libsvn_fs_base/fs.c:638
+msgid "opening 'node-origins' table"
+msgstr "正在打开“node-origins”表"
+
+#: ../libsvn_fs_base/fs.c:647
+msgid "creating 'miscellaneous' table"
+msgstr "正在创建“miscellaneous”表"
+
+#: ../libsvn_fs_base/fs.c:648
+msgid "opening 'miscellaneous' table"
+msgstr "正在打开“miscellaneous”表"
+
+#: ../libsvn_fs_base/fs.c:657
+msgid "creating 'checksum-reps' table"
+msgstr "正在创建“checksum-reps”表"
+
+#: ../libsvn_fs_base/fs.c:658
+msgid "opening 'checksum-reps' table"
+msgstr "正在打开“checksum-reps”表"
+
+#: ../libsvn_fs_base/fs.c:730
 #, c-format
 msgid ""
 "The '%s' feature requires version %d of the filesystem schema; filesystem "
 "'%s' uses only version %d"
 msgstr "“%s”特性需要文件系统方案版本 %d；文件系统“%s”版本仅为 %d"
 
-#: ../libsvn_fs_base/fs.c:725
+#: ../libsvn_fs_base/fs.c:749
 #, c-format
 msgid "Expected FS format '%d'; found format '%d'"
 msgstr "期望文件系统格式“%d”；发现格式“%d”"
 
-#: ../libsvn_fs_base/fs.c:1268
+#: ../libsvn_fs_base/fs.c:1215
+#, c-format
+msgid "BDB repositories do not support incremental hotcopy"
+msgstr "BDB 版本库不支持增量热复制"
+
+#: ../libsvn_fs_base/fs.c:1319
 msgid ""
 "Error copying logfile;  the DB_LOG_AUTOREMOVE feature\n"
 "may be interfering with the hotcopy algorithm.  If\n"
@@ -2840,7 +3264,7 @@
 "复制日志文件出错；DB_LOG_AUTOREMOVE 特性可能妨碍热复制。如果问题一直存在，请\n"
 "尝试在 DB_CONFIG 中禁用此特性。"
 
-#: ../libsvn_fs_base/fs.c:1287
+#: ../libsvn_fs_base/fs.c:1338
 msgid ""
 "Error running catastrophic recovery on hotcopy;  the\n"
 "DB_LOG_AUTOREMOVE feature may be interfering with the\n"
@@ -2850,33 +3274,33 @@
 "热复制时执行灾难恢复出错；DB_LOG_AUTOREMOVE 特性可能妨碍热复制。如果问题一直\n"
 "存在，请尝试在 DB_CONFIG 中禁用此特性。"
 
-#: ../libsvn_fs_base/fs.c:1332
+#: ../libsvn_fs_base/fs.c:1383
 msgid "Module for working with a Berkeley DB repository."
 msgstr "模块只能操作BDB版本库。"
 
-#: ../libsvn_fs_base/fs.c:1368
+#: ../libsvn_fs_base/fs.c:1430
 #, c-format
 msgid "Unsupported FS loader version (%d) for bdb"
 msgstr "不支持的BDB之FS加载器版本 (%d)"
 
-#: ../libsvn_fs_base/lock.c:105 ../libsvn_fs_base/lock.c:110
-#: ../libsvn_fs_fs/lock.c:782 ../libsvn_fs_fs/lock.c:787
-#: ../libsvn_fs_fs/lock.c:809
+#: ../libsvn_fs_base/lock.c:108 ../libsvn_fs_base/lock.c:113
+#: ../libsvn_fs_fs/lock.c:786 ../libsvn_fs_fs/lock.c:791
+#: ../libsvn_fs_fs/lock.c:813
 #, c-format
 msgid "Path '%s' doesn't exist in HEAD revision"
 msgstr "HEAD中没有路径“%s”"
 
-#: ../libsvn_fs_base/lock.c:535 ../libsvn_fs_fs/lock.c:677
+#: ../libsvn_fs_base/lock.c:540 ../libsvn_fs_fs/lock.c:682
 #, c-format
 msgid "Cannot verify lock on path '%s'; no username available"
 msgstr "不能校验路径“%s”上的锁；没有用户名"
 
-#: ../libsvn_fs_base/lock.c:541 ../libsvn_fs_fs/lock.c:683
+#: ../libsvn_fs_base/lock.c:546 ../libsvn_fs_fs/lock.c:688
 #, c-format
 msgid "User '%s' does not own lock on path '%s' (currently locked by '%s')"
 msgstr "用户 “%s” 不是路径 “%s” 的锁的所有者(当前由用户 “%s” 锁定)"
 
-#: ../libsvn_fs_base/lock.c:548 ../libsvn_fs_fs/lock.c:690
+#: ../libsvn_fs_base/lock.c:552 ../libsvn_fs_fs/lock.c:694
 #, c-format
 msgid "Cannot verify lock on path '%s'; no matching lock-token available"
 msgstr "不能校验路径“%s”的锁；没有匹配的可用锁令牌"
@@ -2896,62 +3320,62 @@
 msgid "Svndiff source length inconsistency"
 msgstr "svndiff源长度不一致"
 
-#: ../libsvn_fs_base/reps-strings.c:507
+#: ../libsvn_fs_base/reps-strings.c:506
 #, c-format
 msgid "Diff version inconsistencies in representation '%s'"
 msgstr "在修订版“%s”中diff的版本不一致"
 
-#: ../libsvn_fs_base/reps-strings.c:533
+#: ../libsvn_fs_base/reps-strings.c:532
 #, c-format
 msgid ""
 "Corruption detected whilst reading delta chain from representation '%s' to "
 "'%s'"
 msgstr "从修订版“%s”到“%s”读差异链时检测到数据损坏"
 
-#: ../libsvn_fs_base/reps-strings.c:799
+#: ../libsvn_fs_base/reps-strings.c:798
 #, c-format
 msgid "Rep contents are too large: got %s, limit is %s"
 msgstr "版本内容太大: 得到 %s，上限是 %s"
 
-#: ../libsvn_fs_base/reps-strings.c:815
+#: ../libsvn_fs_base/reps-strings.c:814
 #, c-format
 msgid "Failure reading representation '%s'"
 msgstr "读取修订版“%s”失败"
 
-#: ../libsvn_fs_base/reps-strings.c:925
+#: ../libsvn_fs_base/reps-strings.c:924
 #, c-format
 msgid "MD5 checksum mismatch on representation '%s'"
 msgstr "“%s” 的 MD5 校验和不匹配"
 
-#: ../libsvn_fs_base/reps-strings.c:935
+#: ../libsvn_fs_base/reps-strings.c:934
 #, c-format
 msgid "SHA1 checksum mismatch on representation '%s'"
 msgstr "“%s” 的 SHA1 校验和不匹配"
 
-#: ../libsvn_fs_base/reps-strings.c:946
+#: ../libsvn_fs_base/reps-strings.c:945
 msgid "Null rep, but offset past zero already"
 msgstr "空的版本，但是偏移已经大于零"
 
-#: ../libsvn_fs_base/reps-strings.c:1063 ../libsvn_fs_base/reps-strings.c:1254
+#: ../libsvn_fs_base/reps-strings.c:1062 ../libsvn_fs_base/reps-strings.c:1253
 #, c-format
 msgid "Rep '%s' is not mutable"
 msgstr "版本“%s”是不可变的"
 
-#: ../libsvn_fs_base/reps-strings.c:1078
+#: ../libsvn_fs_base/reps-strings.c:1077
 #, c-format
 msgid "Rep '%s' both mutable and non-fulltext"
 msgstr "版本 “%s” 可变并且非全文本"
 
-#: ../libsvn_fs_base/reps-strings.c:1373
+#: ../libsvn_fs_base/reps-strings.c:1372
 msgid "Failed to get new string key"
 msgstr "取新的字符串键失败"
 
-#: ../libsvn_fs_base/reps-strings.c:1450
+#: ../libsvn_fs_base/reps-strings.c:1449
 #, c-format
 msgid "Attempt to deltify '%s' against itself"
 msgstr "“%s”试图与自身比较"
 
-#: ../libsvn_fs_base/reps-strings.c:1521
+#: ../libsvn_fs_base/reps-strings.c:1522
 #, c-format
 msgid "Failed to calculate MD5 digest for '%s'"
 msgstr "计算“%s”的MD5摘要失败"
@@ -2966,227 +3390,195 @@
 msgid "Transaction is dead: '%s'"
 msgstr "事务已结束: “%s”"
 
-#: ../libsvn_fs_base/revs-txns.c:273 ../libsvn_fs_fs/fs_fs.c:7575
+#: ../libsvn_fs_base/revs-txns.c:272 ../libsvn_fs_fs/fs_fs.c:9758
 #, c-format
 msgid "revprop '%s' has unexpected value in filesystem"
 msgstr "revprop“%s”在文件系统中有不期望的值"
 
-#: ../libsvn_fs_base/revs-txns.c:1031
+#: ../libsvn_fs_base/revs-txns.c:1030
 msgid "Transaction aborted, but cleanup failed"
 msgstr "事务终止，但清除失败"
 
-#: ../libsvn_fs_base/tree.c:773 ../libsvn_fs_fs/tree.c:697
+#: ../libsvn_fs_base/trail.c:99
+msgid "beginning Berkeley DB transaction"
+msgstr "正在开始 BDB 事务"
+
+#: ../libsvn_fs_base/trail.c:134
+msgid "aborting Berkeley DB transaction"
+msgstr "正在中止 BDB 事务"
+
+#: ../libsvn_fs_base/trail.c:158
+msgid "committing Berkeley DB transaction"
+msgstr "正在提交 BDB 事务"
+
+#: ../libsvn_fs_base/tree.c:772 ../libsvn_fs_fs/tree.c:1065
 #, c-format
 msgid "Failure opening '%s'"
 msgstr "打开“%s”失败"
 
-#: ../libsvn_fs_base/tree.c:1405 ../libsvn_fs_fs/tree.c:1126
+#: ../libsvn_fs_base/tree.c:1403 ../libsvn_fs_fs/tree.c:1516
 msgid "Cannot compare property value between two different filesystems"
 msgstr "不能在两个不同的文件系统之间比较属性值"
 
-#: ../libsvn_fs_base/tree.c:1851 ../libsvn_fs_base/tree.c:1921
+#: ../libsvn_fs_base/tree.c:1849 ../libsvn_fs_base/tree.c:1919
 msgid "Corrupt DB: faulty predecessor count"
 msgstr "损坏的数据库: 先前的数目不完整"
 
-#: ../libsvn_fs_base/tree.c:1978
+#: ../libsvn_fs_base/tree.c:1976
 #, c-format
 msgid "Unexpected immutable node at '%s'"
 msgstr "“%s”有意外的不变节点"
 
-#: ../libsvn_fs_base/tree.c:1999 ../libsvn_fs_fs/tree.c:1156
+#: ../libsvn_fs_base/tree.c:1997 ../libsvn_fs_fs/tree.c:1546
+#: ../libsvn_repos/commit.c:1255
 #, c-format
 msgid "Conflict at '%s'"
 msgstr "在“%s”冲突"
 
-#: ../libsvn_fs_base/tree.c:2052 ../libsvn_fs_base/tree.c:2804
-#: ../libsvn_fs_fs/tree.c:1206 ../libsvn_fs_fs/tree.c:1744
+#: ../libsvn_fs_base/tree.c:2050 ../libsvn_fs_base/tree.c:2802
+#: ../libsvn_fs_fs/tree.c:1597 ../libsvn_fs_fs/tree.c:2134
 msgid "Bad merge; ancestor, source, and target not all in same fs"
 msgstr "错误的合并；初始，原始，目标不在同一个文件系统"
 
-#: ../libsvn_fs_base/tree.c:2068 ../libsvn_fs_fs/tree.c:1222
+#: ../libsvn_fs_base/tree.c:2066 ../libsvn_fs_fs/tree.c:1613
 #, c-format
 msgid "Bad merge; target '%s' has id '%s', same as ancestor"
 msgstr "错误的合并: 目标“%s”拥有标识“%s”，与初始相同"
 
-#: ../libsvn_fs_base/tree.c:2612
+#: ../libsvn_fs_base/tree.c:2610
 #, c-format
 msgid "Transaction '%s' out-of-date with respect to revision '%s'"
 msgstr "事务 “%s” 过时，对于版本 “%s”"
 
-#: ../libsvn_fs_base/tree.c:2888
+#: ../libsvn_fs_base/tree.c:2886
 #, c-format
 msgid "Cannot deltify revisions prior to r%ld"
 msgstr "不能在 r%ld 之前计算增量变化"
 
-#: ../libsvn_fs_base/tree.c:3006 ../libsvn_fs_fs/tree.c:1955
+#: ../libsvn_fs_base/tree.c:3004 ../libsvn_fs_fs/tree.c:2289
 msgid "The root directory cannot be deleted"
 msgstr "不能删除根目录"
 
-#: ../libsvn_fs_base/tree.c:3229 ../libsvn_fs_fs/tree.c:2036
+#: ../libsvn_fs_base/tree.c:3217 ../libsvn_fs_fs/tree.c:2359
 #, c-format
 msgid "Cannot copy between two different filesystems ('%s' and '%s')"
 msgstr "不能在两个不同的文件系统(“%s”和“%s”)之间复制"
 
-#: ../libsvn_fs_base/tree.c:3238 ../libsvn_fs_fs/tree.c:2042
+#: ../libsvn_fs_base/tree.c:3226 ../libsvn_fs_fs/tree.c:2365
 msgid "Copy from mutable tree not currently supported"
 msgstr "当前不支持从可变的树复制"
 
-#: ../libsvn_fs_base/tree.c:3749 ../libsvn_fs_fs/tree.c:2494
+#: ../libsvn_fs_base/tree.c:3736 ../libsvn_fs_fs/tree.c:2842
 #, c-format
 msgid "Base checksum mismatch on '%s'"
 msgstr "'%s' 的校验和错误"
 
-#: ../libsvn_fs_base/tree.c:3994 ../libsvn_fs_fs/tree.c:2722
+#: ../libsvn_fs_base/tree.c:3969 ../libsvn_fs_fs/tree.c:3057
 msgid "Cannot compare file contents between two different filesystems"
 msgstr "不能在两个不同的文件系统间比较文件内容"
 
-#: ../libsvn_fs_base/tree.c:5035 ../libsvn_fs_base/tree.c:5212
+#: ../libsvn_fs_base/tree.c:5013 ../libsvn_fs_base/tree.c:5188
 #, c-format
 msgid "Node-revision '%s' claims to have mergeinfo but doesn't"
 msgstr "节点版本“%s”声称自己有合并信息，实际上却没有"
 
-#: ../libsvn_fs_base/tree.c:5072
+#: ../libsvn_fs_base/tree.c:5049
 #, c-format
 msgid ""
 "Node-revision '%s' claims to sit atop a tree containing mergeinfo but is not "
 "a directory"
 msgstr "节点版本“%s”声称自己是包含合并信息的树顶，实际上却不是目录"
 
-#: ../libsvn_fs_fs/dag.c:431 ../libsvn_fs_fs/dag.c:448
-#: ../libsvn_ra_serf/serf.c:960
+#: ../libsvn_fs_fs/dag.c:426 ../libsvn_fs_fs/dag.c:442
+#: ../libsvn_ra_serf/serf.c:1038 ../libsvn_ra_serf/serf.c:1101
 msgid "Can't get entries of non-directory"
 msgstr "不能获取非目录的条目"
 
-#: ../libsvn_fs_fs/dag.c:557
+#: ../libsvn_fs_fs/dag.c:551
 #, c-format
 msgid ""
 "Can't increment mergeinfo count on node-revision %%s to negative value %%%s"
 msgstr "不能在节点版本 %%s 增加合并信息计数，因为会溢出到负值 %%%s"
 
-#: ../libsvn_fs_fs/dag.c:568
+#: ../libsvn_fs_fs/dag.c:562
 #, c-format
 msgid ""
 "Can't increment mergeinfo count on *file* node-revision %%s to %%%s (> 1)"
 msgstr "不能在*文件*修订节点增加合并信息计数 %%s 到 %%%s (> 1)"
 
-#: ../libsvn_fs_fs/dag.c:1117
+#: ../libsvn_fs_fs/dag.c:1134
 msgid "Empty noderev in cache"
 msgstr "缓存中 noderev 为空"
 
-#: ../libsvn_fs_fs/dag.c:1310
+#: ../libsvn_fs_fs/dag.c:1326
 #, c-format
 msgid "Attempted to update ancestry of non-mutable node"
-msgstr "试图更新非可变节点的祖先"
+msgstr "试图更新非可变节点的前驱"
 
-#: ../libsvn_fs_fs/fs.c:80
+#: ../libsvn_fs_fs/fs.c:83
 #, c-format
 msgid "Can't fetch FSFS shared data"
 msgstr "不能获取文件系统互斥体"
 
-#: ../libsvn_fs_fs/fs.c:96
-#, c-format
-msgid "Can't create FSFS write-lock mutex"
-msgstr "不能创建文件系统写互斥体"
-
-#: ../libsvn_fs_fs/fs.c:103
-#, c-format
-msgid "Can't create FSFS txn-current mutex"
-msgstr "不能创建 FSFS txn-current 互斥体"
-
-#: ../libsvn_fs_fs/fs.c:112
-#, c-format
-msgid "Can't create FSFS txn list mutex"
-msgstr "不能创建文件系统事务列表互斥体"
-
-#: ../libsvn_fs_fs/fs.c:119
+#: ../libsvn_fs_fs/fs.c:107
 #, c-format
 msgid "Can't store FSFS shared data"
 msgstr "不能存储文件系统共享数据"
 
-#: ../libsvn_fs_fs/fs.c:331
+#: ../libsvn_fs_fs/fs.c:401
 msgid "Module for working with a plain file (FSFS) repository."
 msgstr "模块与文本文件(FSFS)版本库一起工作。"
 
-#: ../libsvn_fs_fs/fs.c:367
+#: ../libsvn_fs_fs/fs.c:451
 #, c-format
 msgid "Unsupported FS loader version (%d) for fsfs"
 msgstr "不支持的FSFS之FS加载器版本 (%d)"
 
-#: ../libsvn_fs_fs/fs_fs.c:527
-#, c-format
-msgid "Can't grab FSFS txn list mutex"
-msgstr "不能获取文件系统事务列表互斥体"
-
-#: ../libsvn_fs_fs/fs_fs.c:535
-#, c-format
-msgid "Can't ungrab FSFS txn list mutex"
-msgstr "不能释放文件系统事务列表互斥体"
-
-#: ../libsvn_fs_fs/fs_fs.c:589
-#, c-format
-msgid "Can't grab FSFS mutex for '%s'"
-msgstr "无法为 “%s” 获取 FSFS 互斥体"
-
-#: ../libsvn_fs_fs/fs_fs.c:613
-#, c-format
-msgid "Can't ungrab FSFS mutex for '%s'"
-msgstr "不能为 “%s” 释放 FSFS 互斥体"
-
-#: ../libsvn_fs_fs/fs_fs.c:684
+#: ../libsvn_fs_fs/fs_fs.c:727
 #, c-format
 msgid "Can't unlock unknown transaction '%s'"
 msgstr "不能解锁未知事务“%s”"
 
-#: ../libsvn_fs_fs/fs_fs.c:688
+#: ../libsvn_fs_fs/fs_fs.c:731
 #, c-format
 msgid "Can't unlock nonlocked transaction '%s'"
 msgstr "不能解锁未锁事务“%s”"
 
-#: ../libsvn_fs_fs/fs_fs.c:695
+#: ../libsvn_fs_fs/fs_fs.c:738
 #, c-format
 msgid "Can't unlock prototype revision lockfile for transaction '%s'"
 msgstr "不能为事务“%s”解锁原型版本锁文件"
 
-#: ../libsvn_fs_fs/fs_fs.c:701
+#: ../libsvn_fs_fs/fs_fs.c:744
 #, c-format
 msgid "Can't close prototype revision lockfile for transaction '%s'"
 msgstr "不能为事务“%s”关闭原型版本锁文件"
 
-#: ../libsvn_fs_fs/fs_fs.c:763
+#: ../libsvn_fs_fs/fs_fs.c:806
 #, c-format
 msgid ""
 "Cannot write to the prototype revision file of transaction '%s' because a "
 "previous representation is currently being written by this process"
 msgstr "因为当前进程正在写入以前版本，所以不能为事务 '%s' 写入原型版本文件。"
 
-#: ../libsvn_fs_fs/fs_fs.c:799
+#: ../libsvn_fs_fs/fs_fs.c:842
 #, c-format
 msgid ""
 "Cannot write to the prototype revision file of transaction '%s' because a "
 "previous representation is currently being written by another process"
 msgstr "因为其它进程正在写入以前版本，所以不能为事务 '%s' 写入原型版本文件。"
 
-#: ../libsvn_fs_fs/fs_fs.c:806 ../libsvn_subr/io.c:1921
+#: ../libsvn_fs_fs/fs_fs.c:849 ../libsvn_subr/io.c:2002
 #, c-format
 msgid "Can't get exclusive lock on file '%s'"
 msgstr "不能获取文件“%s”的排它锁"
 
-#: ../libsvn_fs_fs/fs_fs.c:922
-#, c-format
-msgid "Format file '%s' contains unexpected non-digit '%c' within '%s'"
-msgstr "格式文件“%s”包含意外的非数字字符 '%c' 在 '%s' 中"
-
-#: ../libsvn_fs_fs/fs_fs.c:971
-#, c-format
-msgid "Can't read first line of format file '%s'"
-msgstr "不能读取格式文件“%s”的首行"
-
-#: ../libsvn_fs_fs/fs_fs.c:1015
+#: ../libsvn_fs_fs/fs_fs.c:968
 #, c-format
-msgid "'%s' contains invalid filesystem format option '%s'"
-msgstr "“%s”包含非法文件系统格式选项“%s”"
+msgid "%s file '%s' contains unexpected non-digit '%c' within '%s'"
+msgstr "%s 文件“%s”包含意外的非数字字符 '%c' 在 '%s' 中"
 
-#: ../libsvn_fs_fs/fs_fs.c:1081
+#: ../libsvn_fs_fs/fs_fs.c:995
 #, c-format
 msgid ""
 "Found format '%d', only created by unreleased dev builds; see "
@@ -3195,264 +3587,403 @@
 "发现了文件系统格式“%d”，它是由未发布的开发版本创建的；参见 http://subversion.apache.org/docs/release-"
 "notes/1.7#revprop-packing"
 
-#: ../libsvn_fs_fs/fs_fs.c:1092
+#: ../libsvn_fs_fs/fs_fs.c:1006
 #, c-format
 msgid "Expected FS format between '1' and '%d'; found format '%d'"
 msgstr "期望文件系统格式在“1”到“%d”之间；发现格式“%d”"
 
-#: ../libsvn_fs_fs/fs_fs.c:1288
+#: ../libsvn_fs_fs/fs_fs.c:1052
+#, c-format
+msgid "Can't read first line of format file '%s'"
+msgstr "不能读取格式文件“%s”的首行"
+
+#: ../libsvn_fs_fs/fs_fs.c:1092
+#, c-format
+msgid "'%s' contains invalid filesystem format option '%s'"
+msgstr "“%s”包含非法文件系统格式选项“%s”"
+
+#: ../libsvn_fs_fs/fs_fs.c:1582
 #, c-format
 msgid ""
 "'%s' is not a regular file. Please move it out of the way and try again"
 msgstr "'%s' 不是普通文件。请移除后重试"
 
-#: ../libsvn_fs_fs/fs_fs.c:1538
+#: ../libsvn_fs_fs/fs_fs.c:1753
 #, c-format
-msgid ""
-"Failed to create hotcopy at '%s'. The file '%s' is missing from the source "
-"repository. Please create this file, for instance by running 'svnadmin "
-"upgrade %s'"
-msgstr "在“%s”创建热备份失败。源版本库丢失了文件“%s”。请创建此文件，例如通过执行“svnadmin upgrade %s”来创建它。"
+msgid "Can't read '%s'"
+msgstr "不能读取“%s”"
 
-#: ../libsvn_fs_fs/fs_fs.c:1748 ../libsvn_fs_fs/fs_fs.c:1767
+#: ../libsvn_fs_fs/fs_fs.c:1816 ../libsvn_fs_fs/fs_fs.c:1835
 #, c-format
 msgid "Found malformed header '%s' in revision file"
 msgstr "在版本文件中找到非法文件头“%s”"
 
-#: ../libsvn_fs_fs/fs_fs.c:1803
+#: ../libsvn_fs_fs/fs_fs.c:1871
 #, c-format
 msgid "Invalid revision number '%ld'"
 msgstr "无效的版本号“%ld”"
 
-#: ../libsvn_fs_fs/fs_fs.c:1818 ../libsvn_fs_fs/fs_fs.c:1862
-#: ../libsvn_fs_fs/fs_fs.c:3018 ../libsvn_repos/log.c:2157
-#: ../libsvn_repos/log.c:2161
+#: ../libsvn_fs_fs/fs_fs.c:1886 ../libsvn_fs_fs/fs_fs.c:1941
+#: ../libsvn_fs_fs/fs_fs.c:1952 ../libsvn_repos/log.c:2268
+#: ../libsvn_repos/log.c:2272
 #, c-format
 msgid "No such revision %ld"
 msgstr "没有版本 %ld"
 
-#: ../libsvn_fs_fs/fs_fs.c:1934
+#: ../libsvn_fs_fs/fs_fs.c:1986
+msgid "Unexpected EOF"
+msgstr "流意外结束"
+
+#: ../libsvn_fs_fs/fs_fs.c:1993
 #, c-format
-msgid "Manifest offset '%s' too large"
-msgstr "清单偏移“%s”太大"
+msgid "Number '%s' invalid or too large"
+msgstr "数字“%s”不合法，或者太大"
 
-#: ../libsvn_fs_fs/fs_fs.c:2045 ../libsvn_fs_fs/fs_fs.c:2059
-#: ../libsvn_fs_fs/fs_fs.c:2067 ../libsvn_fs_fs/fs_fs.c:2075
-#: ../libsvn_fs_fs/fs_fs.c:2084 ../libsvn_fs_fs/fs_fs.c:2097
-#: ../libsvn_fs_fs/fs_fs.c:2106
+#: ../libsvn_fs_fs/fs_fs.c:2160 ../libsvn_fs_fs/fs_fs.c:2174
+#: ../libsvn_fs_fs/fs_fs.c:2182 ../libsvn_fs_fs/fs_fs.c:2190
+#: ../libsvn_fs_fs/fs_fs.c:2199 ../libsvn_fs_fs/fs_fs.c:2212
+#: ../libsvn_fs_fs/fs_fs.c:2221
 msgid "Malformed text representation offset line in node-rev"
 msgstr "node-rev 中有非法的文本修订版偏移行"
 
-#: ../libsvn_fs_fs/fs_fs.c:2137
+#: ../libsvn_fs_fs/fs_fs.c:2252
 #, c-format
 msgid "While reading representation offsets for node-revision '%s':"
 msgstr "读取节点版本“%s”的偏移失败："
 
-#: ../libsvn_fs_fs/fs_fs.c:2288
+#: ../libsvn_fs_fs/fs_fs.c:2407
 msgid "Missing id field in node-rev"
 msgstr "node-rev 中没有 id"
 
-#: ../libsvn_fs_fs/fs_fs.c:2302
+#: ../libsvn_fs_fs/fs_fs.c:2421
 #, c-format
 msgid "Missing kind field in node-rev '%s'"
 msgstr "node-rev '%s' 中没有 kind 字段"
 
-#: ../libsvn_fs_fs/fs_fs.c:2337
+#: ../libsvn_fs_fs/fs_fs.c:2456
 #, c-format
 msgid "Missing cpath field in node-rev '%s'"
 msgstr "node-rev '%s' 中没有 cpath 字段"
 
-#: ../libsvn_fs_fs/fs_fs.c:2365 ../libsvn_fs_fs/fs_fs.c:2372
+#: ../libsvn_fs_fs/fs_fs.c:2484 ../libsvn_fs_fs/fs_fs.c:2491
 #, c-format
 msgid "Malformed copyroot line in node-rev '%s'"
 msgstr "node-rev '%s' 中的 copyroot 行非法"
 
-#: ../libsvn_fs_fs/fs_fs.c:2391 ../libsvn_fs_fs/fs_fs.c:2398
+#: ../libsvn_fs_fs/fs_fs.c:2508 ../libsvn_fs_fs/fs_fs.c:2515
 #, c-format
 msgid "Malformed copyfrom line in node-rev '%s'"
 msgstr "node-rev '%s' 中的 copyfrom 行非法"
 
-#: ../libsvn_fs_fs/fs_fs.c:2559 ../libsvn_fs_fs/fs_fs.c:5752
+#: ../libsvn_fs_fs/fs_fs.c:2684 ../libsvn_fs_fs/fs_fs.c:7632
 #, c-format
 msgid "Attempted to write to non-transaction '%s'"
 msgstr "试图写至非事务 '%s'"
 
-#: ../libsvn_fs_fs/fs_fs.c:2653
+#: ../libsvn_fs_fs/fs_fs.c:2821
 #, c-format
 msgid "Malformed representation header at %s"
 msgstr "位于 %s 的修订版头非法"
 
-#: ../libsvn_fs_fs/fs_fs.c:2685
+#: ../libsvn_fs_fs/fs_fs.c:2853
 #, c-format
 msgid "Missing node-id in node-rev at r%ld (offset %s)"
 msgstr "node-rev r%ld (偏移 %s) 中没有 node-id"
 
-#: ../libsvn_fs_fs/fs_fs.c:2694
+#: ../libsvn_fs_fs/fs_fs.c:2862
 #, c-format
 msgid "Corrupt node-id '%s' in node-rev at r%ld (offset %s)"
 msgstr "node-id '%s' 损坏，位于 node-rev r%ld (偏移 %s)"
 
-#: ../libsvn_fs_fs/fs_fs.c:2785
+#: ../libsvn_fs_fs/fs_fs.c:2953
 #, c-format
 msgid "Revision file (r%ld) lacks trailing newline"
 msgstr "版本文件 (r%ld) 缺少结尾换行"
 
-#: ../libsvn_fs_fs/fs_fs.c:2799
+#: ../libsvn_fs_fs/fs_fs.c:2967
 #, c-format
 msgid "Final line in revision file (r%ld) longer than 64 characters"
 msgstr "版本文件 (r%ld) 的最后一行大于 64 个字符"
 
-#: ../libsvn_fs_fs/fs_fs.c:2814
+#: ../libsvn_fs_fs/fs_fs.c:2982
 #, c-format
 msgid "Final line in revision file r%ld missing space"
 msgstr "版本文件 (r%ld) 的最后一行缺少空白字符"
 
-#: ../libsvn_fs_fs/fs_fs.c:3111
+#: ../libsvn_fs_fs/fs_fs.c:3686
+#, c-format
+msgid "Packed revprop manifest for r%ld too small"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:3743
+#, c-format
+msgid "Revprop pack for revision r%ld contains revprops for r%ld .. r%ld"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:3754
+#, c-format
+msgid "Revprop pack for revision r%ld starts at non-packed revisions r%ld"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:3763
+msgid "Header end not found"
+msgstr "找不到 Header 的结束标记"
+
+#: ../libsvn_fs_fs/fs_fs.c:3791
+msgid "Packed revprop size exceeds pack file size"
+msgstr "打包的版本属性大小超出了打包文件长度"
+
+#: ../libsvn_fs_fs/fs_fs.c:3850
+#, c-format
+msgid "No such packed revision %ld"
+msgstr "没有此打包版本 %ld"
+
+#: ../libsvn_fs_fs/fs_fs.c:3890
+#, c-format
+msgid "Failed to read revprop pack file for r%ld"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:3897
+#, c-format
+msgid "Revprop pack file for r%ld is corrupt"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:3970
+#, c-format
+msgid "Could not read revprops for revision %ld"
+msgstr "无法找到版本 %ld 的版本属性"
+
+#: ../libsvn_fs_fs/fs_fs.c:4199
+#, c-format
+msgid "Packed file '%s' misses a tag"
+msgstr "打包文件“%s”去哦少标签"
+
+#: ../libsvn_fs_fs/fs_fs.c:4537
 msgid "Malformed svndiff data in representation"
 msgstr "修订版的 svndiff 数据非法"
 
-#: ../libsvn_fs_fs/fs_fs.c:3427 ../libsvn_fs_fs/fs_fs.c:3446
+#: ../libsvn_fs_fs/fs_fs.c:4973 ../libsvn_fs_fs/fs_fs.c:4992
 msgid "Reading one svndiff window read beyond the end of the representation"
 msgstr "读svndiff窗口时超出了结尾"
 
-#: ../libsvn_fs_fs/fs_fs.c:3600
-msgid "svndiff data requested non-existent source"
-msgstr "svndiff 数据请求不存在的来源"
-
-#: ../libsvn_fs_fs/fs_fs.c:3606
-msgid "svndiff requested position beyond end of stream"
-msgstr "svndiff 请求的位置超出了流的结尾"
-
-#: ../libsvn_fs_fs/fs_fs.c:3629 ../libsvn_fs_fs/fs_fs.c:3646
+#: ../libsvn_fs_fs/fs_fs.c:5080
 msgid "svndiff window length is corrupt"
 msgstr "svndiff 的窗体长度已损坏"
 
-#: ../libsvn_fs_fs/fs_fs.c:3699
+#: ../libsvn_fs_fs/fs_fs.c:5248
 msgid "Checksum mismatch while reading representation"
 msgstr "读取修订版时校验和不匹配"
 
-#: ../libsvn_fs_fs/fs_fs.c:3963 ../libsvn_fs_fs/fs_fs.c:3977
-#: ../libsvn_fs_fs/fs_fs.c:3984
+#: ../libsvn_fs_fs/fs_fs.c:5613 ../libsvn_fs_fs/fs_fs.c:5627
+#: ../libsvn_fs_fs/fs_fs.c:5634
 #, c-format
 msgid "Directory entry corrupt in '%s'"
 msgstr "'%s' 的目录入口损坏"
 
-#: ../libsvn_fs_fs/fs_fs.c:4442 ../libsvn_fs_fs/fs_fs.c:4447
-#: ../libsvn_fs_fs/fs_fs.c:4453 ../libsvn_fs_fs/fs_fs.c:4470
-#: ../libsvn_fs_fs/fs_fs.c:4503 ../libsvn_fs_fs/fs_fs.c:4523
-#: ../libsvn_fs_fs/fs_fs.c:4557 ../libsvn_fs_fs/fs_fs.c:4562
+#: ../libsvn_fs_fs/fs_fs.c:6112 ../libsvn_fs_fs/fs_fs.c:6117
+#: ../libsvn_fs_fs/fs_fs.c:6123 ../libsvn_fs_fs/fs_fs.c:6140
+#: ../libsvn_fs_fs/fs_fs.c:6173 ../libsvn_fs_fs/fs_fs.c:6193
+#: ../libsvn_fs_fs/fs_fs.c:6228 ../libsvn_fs_fs/fs_fs.c:6233
 msgid "Invalid changes line in rev-file"
 msgstr "rev-file 中有非法修改行"
 
-#: ../libsvn_fs_fs/fs_fs.c:4496
+#: ../libsvn_fs_fs/fs_fs.c:6166
 msgid "Invalid change kind in rev file"
 msgstr "rev 文件中有无效的改变种类"
 
-#: ../libsvn_fs_fs/fs_fs.c:4516
+#: ../libsvn_fs_fs/fs_fs.c:6186
 msgid "Invalid text-mod flag in rev-file"
 msgstr "rev-file 中有无效的 text-mod 标志"
 
-#: ../libsvn_fs_fs/fs_fs.c:4536
+#: ../libsvn_fs_fs/fs_fs.c:6206
 msgid "Invalid prop-mod flag in rev-file"
 msgstr "rev-file 中有无效的 prop-mod 标志"
 
-#: ../libsvn_fs_fs/fs_fs.c:4713
+#: ../libsvn_fs_fs/fs_fs.c:6464
 msgid "Copying from transactions not allowed"
 msgstr "不允许从事务复制"
 
-#: ../libsvn_fs_fs/fs_fs.c:4869
+#: ../libsvn_fs_fs/fs_fs.c:6597
 #, c-format
 msgid "Unable to create transaction directory in '%s' for revision %ld"
 msgstr "无法在“%s”中为版本 %ld 创建事务目录"
 
-#: ../libsvn_fs_fs/fs_fs.c:4934
+#: ../libsvn_fs_fs/fs_fs.c:6662
 msgid ""
 "Internal error: a null transaction id was passed to get_txn_proplist()"
 msgstr "内部错误: 向 get_txn_proplist() 传递了空事务标识"
 
-#: ../libsvn_fs_fs/fs_fs.c:5093 ../libsvn_fs_fs/fs_fs.c:5100
+#: ../libsvn_fs_fs/fs_fs.c:6821 ../libsvn_fs_fs/fs_fs.c:6828
 msgid "next-id file corrupt"
 msgstr "next-id 文件损坏"
 
-#: ../libsvn_fs_fs/fs_fs.c:5196
+#: ../libsvn_fs_fs/fs_fs.c:6924
 #, c-format
 msgid "Transaction '%s' cleanup failed"
 msgstr "事务 '%s' 清理失败"
 
-#: ../libsvn_fs_fs/fs_fs.c:5337
+#: ../libsvn_fs_fs/fs_fs.c:7064
 #, c-format
 msgid "Invalid change type %d"
 msgstr "无效的修改类型 %d"
 
-#: ../libsvn_fs_fs/fs_fs.c:5772
+#: ../libsvn_fs_fs/fs_fs.c:7652
 msgid "Can't set text contents of a directory"
 msgstr "无法设定目录的文本内容"
 
-#: ../libsvn_fs_fs/fs_fs.c:5856 ../libsvn_fs_fs/fs_fs.c:5861
-#: ../libsvn_fs_fs/fs_fs.c:5868
+#: ../libsvn_fs_fs/fs_fs.c:7738 ../libsvn_fs_fs/fs_fs.c:7743
+#: ../libsvn_fs_fs/fs_fs.c:7750
 msgid "Corrupt 'current' file"
 msgstr "文件 “current” 损坏"
 
-#: ../libsvn_fs_fs/fs_fs.c:5983
+#: ../libsvn_fs_fs/fs_fs.c:8010
 #, c-format
 msgid ""
 "predecessor count for the root node-revision is wrong: found (%d+%ld != %d), "
 "committing r%ld"
 msgstr "根节点版本的前任计数错误: 发现 (%d+%ld != %d), 正在提交 r%ld"
 
-#: ../libsvn_fs_fs/fs_fs.c:6110
+#: ../libsvn_fs_fs/fs_fs.c:8145
 msgid "Truncated protorev file detected"
 msgstr "检测到文件 protorev 被截断"
 
-#: ../libsvn_fs_fs/fs_fs.c:6432
+#: ../libsvn_fs_fs/fs_fs.c:8545
 msgid "Transaction out of date"
 msgstr "事务过时"
 
-#: ../libsvn_fs_fs/fs_fs.c:6935
+#: ../libsvn_fs_fs/fs_fs.c:9039
 msgid "Recovery encountered a non-directory node"
 msgstr "修复时遇到非目录节点"
 
-#: ../libsvn_fs_fs/fs_fs.c:6957
+#: ../libsvn_fs_fs/fs_fs.c:9061
 msgid "Recovery encountered a deltified directory representation"
 msgstr "修复时遇到差异目录表示"
 
-#: ../libsvn_fs_fs/fs_fs.c:6993 ../libsvn_fs_fs/fs_fs.c:7002
-#: ../libsvn_fs_fs/fs_fs.c:7008
+#: ../libsvn_fs_fs/fs_fs.c:9097 ../libsvn_fs_fs/fs_fs.c:9106
+#: ../libsvn_fs_fs/fs_fs.c:9112
 msgid "Directory entry corrupt"
 msgstr "目录条目损坏"
 
-#: ../libsvn_fs_fs/fs_fs.c:7107
+#: ../libsvn_fs_fs/fs_fs.c:9285
 #, c-format
 msgid "Expected current rev to be <= %ld but found %ld"
 msgstr "期望当前版本 <= %ld，但它是 %ld"
 
-#: ../libsvn_fs_fs/fs_fs.c:7161
+#: ../libsvn_fs_fs/fs_fs.c:9342
 #, c-format
 msgid "Revision %ld has a revs file but no revprops file"
 msgstr "版本 %ld 有版本文件，但是没有版本属性文件"
 
-#: ../libsvn_fs_fs/fs_fs.c:7169
+#: ../libsvn_fs_fs/fs_fs.c:9349
+#, c-format
+msgid "Revision %ld has a revs file but the revprops file is inaccessible"
+msgstr "版本 %ld 有版本文件，但是版本属性文件不可访问"
+
+#: ../libsvn_fs_fs/fs_fs.c:9358
 #, c-format
 msgid "Revision %ld has a non-file where its revprops file should be"
 msgstr "版本 %ld 有非文件项目，与其属性文件的记录矛盾"
 
-#: ../libsvn_fs_fs/fs_fs.c:7351
+#: ../libsvn_fs_fs/fs_fs.c:9536
 #, c-format
 msgid ""
 "Node origin for '%s' exists with a different value (%s) than what we were "
 "about to store (%s)"
 msgstr "“%s” 的 origin 节点取值(%s)与我们要存储的值(%s)不同"
 
-#: ../libsvn_fs_fs/fs_fs.c:7457
+#: ../libsvn_fs_fs/fs_fs.c:9642
 #, c-format
 msgid "No such transaction '%s'"
 msgstr "没有事务 '%s'"
 
-#: ../libsvn_fs_fs/fs_fs.c:7870
+#: ../libsvn_fs_fs/fs_fs.c:10359
 #, c-format
 msgid "FSFS format (%d) too old to pack; please upgrade the filesystem."
 msgstr "要打包的 FSFS 格式 (%d) 太旧，请升级。"
 
+#: ../libsvn_fs_fs/fs_fs.c:10638 ../libsvn_subr/io.c:248
+#, c-format
+msgid "Error converting entry in directory '%s' to UTF-8"
+msgstr "目录 “%s” 中的条目从本地编码转换到 UTF8 失败"
+
+#: ../libsvn_fs_fs/fs_fs.c:10675 ../libsvn_subr/io.c:1021
+#, c-format
+msgid "Source '%s' is not a directory"
+msgstr "源 “%s” 不是目录"
+
+#: ../libsvn_fs_fs/fs_fs.c:10681 ../libsvn_subr/io.c:1027
+#, c-format
+msgid "Destination '%s' is not a directory"
+msgstr "目的 “%s” 不是目录"
+
+#: ../libsvn_fs_fs/fs_fs.c:10753 ../libsvn_subr/io.c:1104
+#: ../libsvn_subr/io.c:2480
+#, c-format
+msgid "Can't read directory '%s'"
+msgstr "无法读取目录 “%s”"
+
+#: ../libsvn_fs_fs/fs_fs.c:10758 ../libsvn_subr/io.c:1109
+#: ../libsvn_subr/io.c:2485 ../libsvn_subr/io.c:3990
+#, c-format
+msgid "Error closing directory '%s'"
+msgstr "关闭目录 “%s” 出错"
+
+#: ../libsvn_fs_fs/fs_fs.c:11041
+#, c-format
+msgid ""
+"The FSFS format (%d) of the hotcopy source does not match the FSFS format "
+"(%d) of the hotcopy destination; please upgrade both repositories to the "
+"same format"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:11050
+msgid ""
+"The UUID of the hotcopy source does not match the UUID of the hotcopy "
+"destination"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:11057
+msgid ""
+"The sharding layout configuration of the hotcopy source does not match the "
+"sharding layout configuration of the hotcopy destination"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:11183
+#, c-format
+msgid ""
+"Failed to create hotcopy at '%s'. The file '%s' is missing from the source "
+"repository. Please create this file, for instance by running 'svnadmin "
+"upgrade %s'"
+msgstr "在“%s”创建热备份失败。源版本库丢失了文件“%s”。请创建此文件，例如通过执行“svnadmin upgrade %s”来创建它。"
+
+#: ../libsvn_fs_fs/fs_fs.c:11209
+#, c-format
+msgid ""
+"The hotcopy destination already contains more revisions (%lu) than the "
+"hotcopy source contains (%lu); are source and destination swapped?"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:11245
+#, c-format
+msgid ""
+"The hotcopy destination already contains more packed revisions (%lu) than "
+"the hotcopy source contains (%lu)"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:11360
+#, c-format
+msgid ""
+"The assumed HEAD revision (%lu) of the hotcopy source has been packed while "
+"the hotcopy was in progress; please restart the hotcopy operation"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:11375
+#, c-format
+msgid ""
+"Revision %lu disappeared from the hotcopy source while hotcopy was in "
+"progress"
+msgstr "当正在进行热复制时，版本 %lu 从热复制源地址消失"
+
 #: ../libsvn_fs_fs/lock.c:120
 #, c-format
 msgid "Corrupt lockfile for path '%s' in filesystem '%s'"
@@ -3468,25 +3999,20 @@
 msgid "Can't parse lock/entries hashfile '%s'"
 msgstr "不能解析锁/条目的哈希文件“%s“"
 
-#: ../libsvn_fs_fs/lock.c:814
+#: ../libsvn_fs_fs/lock.c:818
 #, c-format
 msgid "Lock failed: newer version of '%s' exists"
 msgstr "加锁失败: “%s”的新版本已经存在"
 
-#: ../libsvn_fs_fs/rep-cache.c:82
+#: ../libsvn_fs_fs/rep-cache.c:138
 msgid "Couldn't open rep-cache database"
 msgstr "无法打开缓存数据库"
 
-#: ../libsvn_fs_fs/rep-cache.c:105 ../libsvn_fs_fs/rep-cache.c:165
+#: ../libsvn_fs_fs/rep-cache.c:267 ../libsvn_fs_fs/rep-cache.c:312
 msgid "Only SHA1 checksums can be used as keys in the rep_cache table.\n"
 msgstr "在表 rep_cache 中，只有 SHA1 校验和才能用作键。\n"
 
-#: ../libsvn_fs_fs/rep-cache.c:139
-#, c-format
-msgid "Youngest revision is r%ld, but rep-cache contains r%ld"
-msgstr "最小的版本是 r%ld，但是缓存中包含的是 r%ld"
-
-#: ../libsvn_fs_fs/rep-cache.c:201
+#: ../libsvn_fs_fs/rep-cache.c:348
 #, c-format
 msgid ""
 "Representation key for checksum '%%s' exists in filesystem '%%s' with a "
@@ -3496,171 +4022,184 @@
 "校验和 “%%s” 的展现键已经存在于文件系统 “%%s” "
 "中，取值(%%ld,%%%s,%%%s,%%%s)与我们要存储的值(%%ld,%%%s,%%%s,%%%s)不同"
 
-#: ../libsvn_fs_fs/tree.c:1876 ../libsvn_subr/path.c:1200
+#: ../libsvn_fs_fs/tree.c:2209 ../libsvn_subr/path.c:1233
 #, c-format
 msgid "Invalid control character '0x%02x' in path '%s'"
 msgstr "无效控制字符 “0x%02x” 在路径 “%s” 中"
 
-#: ../libsvn_fs_fs/tree.c:3467
+#: ../libsvn_fs_fs/tree.c:3808
 #, c-format
 msgid "Node-revision #'%s' claims to have mergeinfo but doesn't"
 msgstr "节点版本 #“%s” 声称有合并信息，实际上却没有"
 
-#: ../libsvn_fs_fs/tree.c:3576
+#: ../libsvn_fs_fs/tree.c:3924
 #, c-format
 msgid "Node-revision '%s@%ld' claims to have mergeinfo but doesn't"
 msgstr "节点版本“%s@%ld”声称有合并信息，实际上却没有"
 
-#: ../libsvn_fs_fs/tree.c:3721
+#: ../libsvn_fs_fs/tree.c:4124
 #, c-format
 msgid ""
 "Querying mergeinfo requires version %d of the FSFS filesystem schema; "
 "filesystem '%s' uses only version %d"
 msgstr "查询合并信息需要 FSFS 文件系统方案版本 %d；文件系统“%s”只使用版本 %d"
 
-#: ../libsvn_fs_util/fs-util.c:105
+#: ../libsvn_fs_util/fs-util.c:154
 msgid "Filesystem object has not been opened yet"
 msgstr "文件系统对象尚未打开"
 
-#: ../libsvn_fs_util/fs-util.c:108
+#: ../libsvn_fs_util/fs-util.c:157
 msgid "Filesystem object already open"
 msgstr "文件系统对象已经打开"
 
-#: ../libsvn_ra/compat.c:181
+#: ../libsvn_ra/compat.c:182
 #, c-format
 msgid "Missing changed-path information for '%s' in revision %ld"
 msgstr "未提供 “%s” 于版本 %ld 中的 changed-path 信息"
 
-#: ../libsvn_ra/compat.c:325 ../libsvn_ra/compat.c:569
+#: ../libsvn_ra/compat.c:326 ../libsvn_ra/compat.c:570
 #, c-format
 msgid "Path '%s' doesn't exist in revision %ld"
 msgstr "路径 “%s” 不在版本 %ld 中"
 
-#: ../libsvn_ra/compat.c:402
+#: ../libsvn_ra/compat.c:403
 #, c-format
 msgid "'%s' in revision %ld is an unrelated object"
 msgstr "“%s” 于版本 %ld 是一个无关对象"
 
-#: ../libsvn_ra/compat.c:852 ../libsvn_ra/ra_loader.c:1212
+#: ../libsvn_ra/compat.c:843 ../libsvn_ra/ra_loader.c:1291
 #, c-format
 msgid "Invalid peg revision %ld"
 msgstr "无效的铆钉版本 %ld"
 
-#: ../libsvn_ra/compat.c:855 ../libsvn_ra/ra_loader.c:1215
-#: ../libsvn_repos/rev_hunt.c:208 ../libsvn_repos/rev_hunt.c:323
+#: ../libsvn_ra/compat.c:846 ../libsvn_ra/ra_loader.c:1294
+#: ../libsvn_repos/rev_hunt.c:214 ../libsvn_repos/rev_hunt.c:329
 #, c-format
 msgid "Invalid end revision %ld"
 msgstr "无效结束版本 %ld"
 
-#: ../libsvn_ra/compat.c:858 ../libsvn_ra/ra_loader.c:1218
+#: ../libsvn_ra/compat.c:849 ../libsvn_ra/ra_loader.c:1297
 msgid "Peg revision must precede end revision"
 msgstr "铆钉版本必须小于结束版本"
 
-#: ../libsvn_ra/ra_loader.c:234
+#: ../libsvn_ra/ra_loader.c:215
 #, c-format
 msgid "Mismatched RA version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
 msgstr "“%s” 的 RA 版本不匹配: 找到 %d.%d.%d%s，期望 %d.%d.%d%s"
 
-#: ../libsvn_ra/ra_loader.c:311 ../libsvn_ra_serf/serf.c:479
+#: ../libsvn_ra/ra_loader.c:292 ../libsvn_ra_serf/serf.c:594
 #, c-format
 msgid "Illegal repository URL '%s'"
 msgstr "非法版本库 URL “%s”"
 
-#: ../libsvn_ra/ra_loader.c:420
+#: ../libsvn_ra/ra_loader.c:399
 #, c-format
 msgid "Invalid config: unknown HTTP library '%s'"
 msgstr "无效配置: 未知的 HTTP 库“%s”"
 
-#: ../libsvn_ra/ra_loader.c:484
+#: ../libsvn_ra/ra_loader.c:468
 #, c-format
 msgid "Unrecognized URL scheme for '%s'"
 msgstr "无法识别的URL方案(一般需要svn://，http://，file://等开头)“%s”"
 
-#: ../libsvn_ra/ra_loader.c:533
+#: ../libsvn_ra/ra_loader.c:519
 #, c-format
 msgid "Repository UUID '%s' doesn't match expected UUID '%s'"
 msgstr "版本库的 UUID“%s”与期望的 UUID“%s”不匹配"
 
-#: ../libsvn_ra/ra_loader.c:583
+#: ../libsvn_ra/ra_loader.c:540
+#, c-format
+msgid "'%s' isn't in the same repository as '%s'"
+msgstr "“%s”与“%s”并不在同一个版本库中"
+
+#: ../libsvn_ra/ra_loader.c:564
 #, c-format
 msgid "'%s' isn't a child of session URL '%s'"
 msgstr "“%s” 不是会话 URL “%s” 的子节点"
 
-#: ../libsvn_ra/ra_loader.c:605 ../libsvn_ra_neon/session.c:1157
-#: ../libsvn_ra_svn/client.c:2300
+#: ../libsvn_ra/ra_loader.c:580 ../libsvn_ra_svn/client.c:2465
 #, c-format
 msgid "'%s' isn't a child of repository root URL '%s'"
 msgstr "“%s” 不是版本库根 URL “%s” 的子节点"
 
-#: ../libsvn_ra/ra_loader.c:651
+#: ../libsvn_ra/ra_loader.c:624
 #, c-format
 msgid ""
 "Specifying 'old_value_p' is not allowed when the '%s' capability is not "
 "advertised, and could indicate a bug in your client"
 msgstr "当特性 '%s' 没有广告时，不允许指定 'old_value_p'，也说明您的客户端有问题"
 
-#: ../libsvn_ra/ra_loader.c:1277
+#: ../libsvn_ra/ra_loader.c:1445
 #, c-format
 msgid "  - handles '%s' scheme\n"
 msgstr "  - 处理“%s”方案\n"
 
-#: ../libsvn_ra/ra_loader.c:1361
+#: ../libsvn_ra/ra_loader.c:1538
 #, c-format
 msgid "Unrecognized URL scheme '%s'"
 msgstr "无法识别的URL方案(一般需要svn://，http://，file://等开头)“%s”"
 
-#: ../libsvn_ra/util.c:64
+#: ../libsvn_ra/util.c:55
+msgid "<repository>"
+msgstr ""
+
+#: ../libsvn_ra/util.c:73
 #, c-format
 msgid "Retrieval of mergeinfo unsupported by '%s'"
 msgstr "“%s” 不支持取回合并信息"
 
-#: ../libsvn_ra/util.c:104
+#: ../libsvn_ra/util.c:99
+#, c-format
+msgid "The '%s' feature is not supported by '%s'"
+msgstr "特性“%s”不被“%s”支持"
+
+#: ../libsvn_ra/util.c:142
 #, c-format
 msgid "Lock was stolen by '%s'; unable to remove it"
 msgstr "锁被 '%s' 窃取；不能删除"
 
-#: ../libsvn_ra/util.c:145
+#: ../libsvn_ra/util.c:183
 #, c-format
 msgid "Unable to determine local hostname"
 msgstr "无法确定本地主机名称"
 
-#: ../libsvn_ra/util.c:240
+#: ../libsvn_ra/util.c:278
 #, c-format
 msgid "Couldn't get lock on destination repos after %d attempts"
 msgstr "尝试 %d 次后，对目标版本库加锁失败"
 
-#: ../libsvn_ra_local/ra_plugin.c:155
+#: ../libsvn_ra_local/ra_plugin.c:162
 msgid "memory-cache-size invalid"
 msgstr "非法的 memory-cache-size"
 
 #. ----------------------------------------------------------------
 #. ** The RA vtable routines **
-#: ../libsvn_ra_local/ra_plugin.c:433
+#: ../libsvn_ra_local/ra_plugin.c:503
 msgid "Module for accessing a repository on local disk."
 msgstr "访问本地磁盘的版本库模块。"
 
-#: ../libsvn_ra_local/ra_plugin.c:509
+#: ../libsvn_ra_local/ra_plugin.c:579
 msgid "Unable to open an ra_local session to URL"
 msgstr "无法为 URL 打开 ra_local 会话"
 
-#: ../libsvn_ra_local/ra_plugin.c:544 ../libsvn_ra_serf/serf.c:471
+#: ../libsvn_ra_local/ra_plugin.c:612 ../libsvn_ra_serf/serf.c:586
 #, c-format
 msgid "URL '%s' is not a child of the session's repository root URL '%s'"
 msgstr "URL “%s” 不是会话版本库根 URL “%s” 的子节点"
 
-#: ../libsvn_ra_local/ra_plugin.c:1072 ../libsvn_ra_neon/util.c:597
-#: ../libsvn_ra_serf/util.c:2260
+#: ../libsvn_ra_local/ra_plugin.c:1140 ../libsvn_ra_local/ra_plugin.c:1597
+#: ../libsvn_ra_serf/util.c:2581
 #, c-format
 msgid "'%s' path not found"
 msgstr "找不到路径 “%s”"
 
-#: ../libsvn_ra_local/ra_plugin.c:1467 ../libsvn_ra_neon/options.c:468
-#: ../libsvn_ra_serf/options.c:637 ../libsvn_ra_svn/client.c:2492
+#: ../libsvn_ra_local/ra_plugin.c:1539 ../libsvn_ra_serf/options.c:675
+#: ../libsvn_ra_svn/client.c:2666
 #, c-format
 msgid "Don't know anything about capability '%s'"
 msgstr "不知道特性 “%s” 的任何信息"
 
-#: ../libsvn_ra_local/ra_plugin.c:1567
+#: ../libsvn_ra_local/ra_plugin.c:1745
 #, c-format
 msgid "Unsupported RA loader version (%d) for ra_local"
 msgstr "不支持ra_local RA加载器版本 %d"
@@ -3670,1079 +4209,812 @@
 msgid "Unable to open repository '%s'"
 msgstr "无法打开版本库“%s”"
 
-#: ../libsvn_ra_neon/commit.c:248
-msgid ""
-"Could not fetch the Version Resource URL (needed during an import or when it "
-"is missing from the local, cached props)"
-msgstr "不能获取版本资源URL(导入时需要或本地缓存属性中缺少)"
-
-#: ../libsvn_ra_neon/commit.c:512
+#: ../libsvn_ra_serf/commit.c:219
 #, c-format
-msgid "File or directory '%s' is out of date; try updating"
-msgstr "文件或目录 “%s” 已经过时；请先更新"
-
-#: ../libsvn_ra_neon/commit.c:520
-msgid "The CHECKOUT response did not contain a 'Location:' header"
-msgstr "检出(CHECKOUT)响应没有包含“Location:”头信息"
+msgid "%s of '%s': %d %s"
+msgstr "%s 于 '%s': %d %s"
 
-#: ../libsvn_ra_neon/commit.c:530 ../libsvn_ra_neon/props.c:217
-#: ../libsvn_ra_neon/util.c:571 ../libsvn_ra_serf/commit.c:1684
-#: ../libsvn_ra_serf/commit.c:2095 ../libsvn_ra_serf/update.c:2181
-#, c-format
-msgid "Unable to parse URL '%s'"
-msgstr "不能解析 URL “%s”"
+#: ../libsvn_ra_serf/commit.c:319
+msgid "No Location header received"
+msgstr "没有收到位置头"
 
-#: ../libsvn_ra_neon/commit.c:783 ../libsvn_ra_serf/commit.c:1348
-#, c-format
-msgid "POST request did not return transaction information"
-msgstr "POST 请求没有返回事务的信息"
+#: ../libsvn_ra_serf/commit.c:329
+msgid "Error parsing Location header value"
+msgstr "解析位置头出错"
 
-#: ../libsvn_ra_neon/commit.c:1214 ../libsvn_ra_serf/commit.c:1947
+#: ../libsvn_ra_serf/commit.c:439
 #, c-format
-msgid "File '%s' already exists"
-msgstr "文件“%s”已存在"
+msgid "Directory '%s' is out of date; try updating"
+msgstr "目录 “%s” 已经过时；请先更新"
 
-#: ../libsvn_ra_neon/commit.c:1325
+#: ../libsvn_ra_serf/commit.c:527 ../libsvn_repos/commit.c:512
 #, c-format
-msgid "Could not write svndiff to temp file"
-msgstr "无法将 svndiff 写入临时文件"
+msgid "Path '%s' not present"
+msgstr "路径 “%s” 不存在"
 
-#: ../libsvn_ra_neon/commit.c:1483
+#: ../libsvn_ra_serf/commit.c:577
 #, c-format
-msgid "No lock on path '%s' (Status %d on PUT Request)"
-msgstr "路径“%s”没有被锁定 (PUT 请求的状态码是 %d)"
-
-#: ../libsvn_ra_neon/fetch.c:247
-msgid "Could not save the URL of the version resource"
-msgstr "无法储存版本资源的URL"
-
-#: ../libsvn_ra_neon/fetch.c:424
-msgid "Could not get content-type from response"
-msgstr "不能从响应中获得内容类型"
-
-#: ../libsvn_ra_neon/fetch.c:517
-msgid "Could not save file"
-msgstr "无法保存文件"
+msgid "File '%s' is out of date; try updating"
+msgstr "文件 “%s” 已经过时；请先更新"
 
-#: ../libsvn_ra_neon/fetch.c:712 ../libsvn_ra_serf/update.c:2835
-msgid "Can't get text contents of a directory"
-msgstr "无法获得目录的文本内容"
+#: ../libsvn_ra_serf/commit.c:979
+msgid "At least one property change failed; repository is unchanged"
+msgstr "至少有一个属性变更失败；版本库未改变"
 
-#: ../libsvn_ra_neon/fetch.c:768
+#: ../libsvn_ra_serf/commit.c:1179
 #, c-format
-msgid "   expected:  %s"
-msgstr "   期望:  %s"
+msgid "Failed writing updated file"
+msgstr "更新文件失败"
 
-#: ../libsvn_ra_neon/fetch.c:769
+#: ../libsvn_ra_serf/commit.c:1367 ../libsvn_ra_serf/commit.c:1457
 #, c-format
-msgid "     actual:  %s"
-msgstr "     实际:  %s"
+msgid "%s of '%s': %d %s (%s://%s)"
+msgstr "%s 于 '%s': %d %s (%s://%s)"
 
-#: ../libsvn_ra_neon/fetch.c:983
-msgid "Server response missing the expected deadprop-count property"
-msgstr "服务器响应丢失了期望的 deadprop-count 属性"
+#: ../libsvn_ra_serf/commit.c:1377
+#, c-format
+msgid "POST request did not return transaction information"
+msgstr "POST 请求没有返回事务的信息"
 
-#: ../libsvn_ra_neon/fetch.c:1177 ../libsvn_ra_serf/commit.c:2502
+#: ../libsvn_ra_serf/commit.c:1421
 msgid ""
-"DAV request failed; it's possible that the repository's pre-revprop-change "
-"hook either failed or is non-existent"
-msgstr "DAV 请求失败；可能是版本库的 pre-revprop-change 钩子执行失败或者不存在"
+"The OPTIONS response did not include the requested activity-collection-set "
+"value"
+msgstr "OPTIONS 响应中没有包含请求的 activity-collection-set 值。"
 
-#: ../libsvn_ra_neon/fetch.c:1432
+#: ../libsvn_ra_serf/commit.c:1686 ../libsvn_ra_serf/commit.c:2095
+#: ../libsvn_ra_serf/update.c:2631
 #, c-format
-msgid "Missing rev attr in target-revision element"
-msgstr "元素 target-revision 没有 rev 属性"
+msgid "Unable to parse URL '%s'"
+msgstr "不能解析 URL “%s”"
 
-#: ../libsvn_ra_neon/fetch.c:1443 ../libsvn_ra_serf/update.c:1606
+#: ../libsvn_ra_serf/commit.c:1714 ../libsvn_ra_serf/util.c:2577
 #, c-format
-msgid "Missing name attr in absent-directory element"
-msgstr "元素 absent-directory 没有 name 属性"
+msgid "Access to '%s' forbidden"
+msgstr "禁止访问 '%s'"
 
-#: ../libsvn_ra_neon/fetch.c:1459 ../libsvn_ra_serf/update.c:1631
+#: ../libsvn_ra_serf/commit.c:1718
 #, c-format
-msgid "Missing name attr in absent-file element"
-msgstr "元素 absent-file 没有 name 属性"
+msgid "Adding directory failed: %s on %s (%d %s)"
+msgstr "增加目录失败: “%s” 于 “%s”(%d %s)"
 
-#: ../libsvn_ra_neon/fetch.c:1474
+#: ../libsvn_ra_serf/commit.c:1947
 #, c-format
-msgid "Missing path attr in resource element"
-msgstr "元素 resource 没有 path 属性"
+msgid "File '%s' already exists"
+msgstr "文件“%s”已存在"
 
-#: ../libsvn_ra_neon/fetch.c:1483
+#: ../libsvn_ra_serf/commit.c:2218
 #, c-format
-msgid "Missing rev attr in open-directory element"
-msgstr "元素 open-directory 没有 rev 属性"
+msgid "MERGE request failed: returned %d (during commit)"
+msgstr "MERGE 请求失败: 返回 %d (在提交期间)"
 
-#: ../libsvn_ra_neon/fetch.c:1514 ../libsvn_ra_serf/replay.c:288
-#: ../libsvn_ra_serf/update.c:1418
+#: ../libsvn_ra_serf/commit.c:2292
 #, c-format
-msgid "Missing name attr in open-directory element"
-msgstr "元素 open-directory 没有 name 属性"
+msgid "DELETE returned unexpected status: %d"
+msgstr ""
 
-#: ../libsvn_ra_neon/fetch.c:1541 ../libsvn_ra_serf/replay.c:314
-#: ../libsvn_ra_serf/update.c:1458
-#, c-format
-msgid "Missing name attr in add-directory element"
-msgstr "元素 add-directory 没有 name 属性"
+#: ../libsvn_ra_serf/commit.c:2485
+msgid ""
+"DAV request failed; it's possible that the repository's pre-revprop-change "
+"hook either failed or is non-existent"
+msgstr "DAV 请求失败；可能是版本库的 pre-revprop-change 钩子执行失败或者不存在"
 
-#: ../libsvn_ra_neon/fetch.c:1554
+#: ../libsvn_ra_serf/get_deleted_rev.c:173
 #, c-format
-msgid "Missing copyfrom-rev attr in add-directory element"
-msgstr "元素 add-directory 没有 copyfrom-rev 属性"
+msgid "'%s' REPORT not implemented"
+msgstr "未实现 “%s” REPORT"
 
-#: ../libsvn_ra_neon/fetch.c:1628
+#: ../libsvn_ra_serf/locks.c:234
 #, c-format
-msgid "Missing rev attr in open-file element"
-msgstr "元素 open-file 没有 rev 属性"
+msgid "Lock request failed: %d %s"
+msgstr "加锁请求失败: %d %s"
 
-#: ../libsvn_ra_neon/fetch.c:1635 ../libsvn_ra_serf/replay.c:350
-#: ../libsvn_ra_serf/update.c:1499
-#, c-format
-msgid "Missing name attr in open-file element"
-msgstr "元素 open-file 没有 name 属性"
+#: ../libsvn_ra_serf/locks.c:414
+msgid "Malformed URL for repository"
+msgstr "版本库的 URL 非法"
 
-#: ../libsvn_ra_neon/fetch.c:1661 ../libsvn_ra_serf/replay.c:377
-#: ../libsvn_ra_serf/update.c:1534
-#, c-format
-msgid "Missing name attr in add-file element"
-msgstr "元素 add-file 没有 name 属性"
+#: ../libsvn_ra_serf/locks.c:420
+msgid "Server does not support locking features"
+msgstr "服务器不支持加锁"
 
-#: ../libsvn_ra_neon/fetch.c:1674
+#: ../libsvn_ra_serf/locks.c:581
 #, c-format
-msgid "Missing copyfrom-rev attr in add-file element"
-msgstr "元素 add-file 没有 copyfrom-rev 属性"
+msgid "'%s' is not locked in the repository"
+msgstr "版本库中的“%s”没有被锁定"
 
-#: ../libsvn_ra_neon/fetch.c:1729
+#: ../libsvn_ra_serf/locks.c:632 ../libsvn_ra_serf/locks.c:638
 #, c-format
-msgid "Missing name attr in set-prop element"
-msgstr "元素 set-pro 没有 name 属性"
+msgid "Unlock request failed: %d %s"
+msgstr "解锁请求失败: %d %s"
 
-#: ../libsvn_ra_neon/fetch.c:1743
+#: ../libsvn_ra_serf/log.c:169
 #, c-format
-msgid "Missing name attr in remove-prop element"
-msgstr "元素 remove-prop 没有 name 属性"
+msgid "Unsupported encoding '%s'"
+msgstr "不支持的编码“%s”"
 
-#: ../libsvn_ra_neon/fetch.c:1817 ../libsvn_ra_serf/replay.c:262
-#: ../libsvn_ra_serf/update.c:1572
-#, c-format
-msgid "Missing name attr in delete-entry element"
-msgstr "元素 delete-entry 没有 attr 属性"
+#: ../libsvn_ra_serf/log.c:568 ../libsvn_ra_svn/client.c:1577
+msgid "Server does not support custom revprops via log"
+msgstr "服务器不支持通过日志自定义 revprops"
 
-#: ../libsvn_ra_neon/fetch.c:1983
+#: ../libsvn_ra_serf/merge.c:200
 #, c-format
-msgid "Error writing to '%s': unexpected EOF"
-msgstr "写入 “%s” 时出错: 意外的 EOF"
+msgid "A MERGE response for '%s' is not a child of the destination ('%s')"
+msgstr "“%s”的 MERGE 响应并不是目标 (“%s”) 的子项"
 
-#: ../libsvn_ra_neon/fetch.c:2128
+#: ../libsvn_ra_serf/options.c:658
 #, c-format
-msgid "Unknown XML encoding: '%s'"
-msgstr "未知的 XML 编码: “%s”"
+msgid "Don't know how to handle '%s' for capability '%s'"
+msgstr "不知道如何处理“%s”，对于特性“%s”"
 
-#: ../libsvn_ra_neon/fetch.c:2437
+#: ../libsvn_ra_serf/options.c:682
 #, c-format
-msgid "REPORT response handling failed to complete the editor drive"
-msgstr "处理报告响应失败，不能完成编辑"
-
-#: ../libsvn_ra_neon/file_revs.c:290
-msgid "Failed to write full amount to stream"
-msgstr "无法将全部数据写入流"
+msgid "Attempt to fetch capability '%s' resulted in '%s'"
+msgstr "试图取得特性 “%s” 导致 “%s”"
 
-#: ../libsvn_ra_neon/file_revs.c:375 ../libsvn_ra_neon/get_deleted_rev.c:168
-#: ../libsvn_ra_neon/get_location_segments.c:212
-#: ../libsvn_ra_neon/get_locations.c:192
-#: ../libsvn_ra_serf/get_deleted_rev.c:236
+#: ../libsvn_ra_serf/property.c:279 ../libsvn_ra_serf/update.c:2473
 #, c-format
-msgid "'%s' REPORT not implemented"
-msgstr "未实现 “%s” REPORT"
+msgid "Got unrecognized encoding '%s'"
+msgstr "得到不能识别的编码“%s”"
 
-#: ../libsvn_ra_neon/file_revs.c:382
-msgid "The file-revs report didn't contain any revisions"
-msgstr "file-revs 报告中没有包含任何版本"
-
-#: ../libsvn_ra_neon/get_dated_rev.c:158
-msgid "Server does not support date-based operations"
-msgstr "服务器不支持基于日期的操作"
-
-#: ../libsvn_ra_neon/get_dated_rev.c:165
-msgid "Invalid server response to dated-rev request"
-msgstr "服务器请求 dated-rev 的响应无效"
+#: ../libsvn_ra_serf/property.c:700
+msgid "The PROPFIND response did not include the requested properties"
+msgstr "PROPFIND 响应中没有包含请求的属性"
 
-#: ../libsvn_ra_neon/get_location_segments.c:122
-#: ../libsvn_ra_serf/getlocationsegments.c:109 ../libsvn_ra_svn/client.c:1746
-msgid "Expected valid revision range"
-msgstr "期望合法的版本范围"
+#: ../libsvn_ra_serf/property.c:993
+msgid ""
+"The PROPFIND response did not include the requested baseline-collection value"
+msgstr "PROPFIND 响应中没有包含请求的 baseline-collection 值。"
 
-#: ../libsvn_ra_neon/get_locations.c:112
-msgid "Expected a valid revnum and path"
-msgstr "期望合法的版本号和路径"
-
-#: ../libsvn_ra_neon/get_locks.c:239
-msgid "Incomplete lock data returned"
-msgstr "返回了不完全的锁数据"
+#: ../libsvn_ra_serf/property.c:1005
+msgid ""
+"The PROPFIND response did not include the requested version-name value"
+msgstr "PROPFIND 响应中没有包含请求的 version-name 值。"
 
-#: ../libsvn_ra_neon/get_locks.c:333 ../libsvn_ra_serf/property.c:370
-#: ../libsvn_ra_serf/update.c:2049
-#, c-format
-msgid "Got unrecognized encoding '%s'"
-msgstr "得到不能识别的编码“%s”"
+#: ../libsvn_ra_serf/property.c:1043
+msgid "The OPTIONS response did not include the requested checked-in value"
+msgstr "OPTIONS 响应中没有包含请求的 checked-in 值。"
 
-#: ../libsvn_ra_neon/get_locks.c:429 ../libsvn_ra_neon/get_locks.c:433
-#: ../libsvn_ra_serf/locks.c:560
-msgid "Server does not support locking features"
-msgstr "服务器不支持加锁"
+#: ../libsvn_ra_serf/property.c:1125
+msgid "The OPTIONS response did not include the youngest revision"
+msgstr "OPTIONS 响应中没有包含最新的版本"
 
-#: ../libsvn_ra_neon/lock.c:196
-msgid "Invalid creation date header value in response."
-msgstr "在响应头中有非法创建日期"
+#: ../libsvn_ra_serf/property.c:1218
+msgid ""
+"The PROPFIND response did not include the requested resourcetype value"
+msgstr "PROPFIND 响应中没有包含请求的 resourcetype 值"
 
-#: ../libsvn_ra_neon/lock.c:221
-msgid "Invalid timeout value"
-msgstr "非法超时取值"
+#: ../libsvn_ra_serf/property.c:1253
+msgid "The PROPFIND response did not include the requested 'DAV:' properties"
+msgstr "PROPFIND 响应中没有包含请求的 'DAV:' 属性"
 
-#: ../libsvn_ra_neon/lock.c:261 ../libsvn_ra_neon/lock.c:415
-#, c-format
-msgid "Failed to parse URI '%s'"
-msgstr "解析 URI “%s” 失败"
+#: ../libsvn_ra_serf/replay.c:222 ../libsvn_ra_serf/update.c:1660
+msgid "Missing revision attr in target-revision element"
+msgstr "元素“target-revision没有revision属性"
 
-#: ../libsvn_ra_neon/lock.c:321 ../libsvn_ra_serf/locks.c:382
-#: ../libsvn_ra_serf/locks.c:417
-#, c-format
-msgid "Lock request failed: %d %s"
-msgstr "加锁请求失败: %d %s"
+#: ../libsvn_ra_serf/replay.c:240
+msgid "Missing revision attr in open-root element"
+msgstr "元素“open-root没有revisioin属性"
 
-#: ../libsvn_ra_neon/lock.c:430 ../libsvn_ra_serf/locks.c:716
-#, c-format
-msgid "'%s' is not locked in the repository"
-msgstr "版本库中的“%s”没有被锁定"
+#: ../libsvn_ra_serf/replay.c:260 ../libsvn_ra_serf/update.c:1888
+msgid "Missing name attr in delete-entry element"
+msgstr "元素 delete-entry 没有 attr 属性"
 
-#: ../libsvn_ra_neon/lock.c:456
-#, c-format
-msgid "Unlock failed on '%s' (%d Forbidden)"
-msgstr "对 '%s' 解锁失败 (%d 禁止)"
+#: ../libsvn_ra_serf/replay.c:266
+msgid "Missing revision attr in delete-entry element"
+msgstr "delete-entry元素没有revision属性"
 
-#: ../libsvn_ra_neon/lock.c:460
-#, c-format
-msgid "No lock on path '%s' (%d Bad Request)"
-msgstr "路径“%s”没有被锁定 (%d 错误的请求)"
+#: ../libsvn_ra_serf/replay.c:286 ../libsvn_ra_serf/update.c:1727
+msgid "Missing name attr in open-directory element"
+msgstr "元素 open-directory 没有 name 属性"
 
-#: ../libsvn_ra_neon/lock.c:584
-msgid "Failed to fetch lock information"
-msgstr "获取锁信息失败"
+#: ../libsvn_ra_serf/replay.c:292 ../libsvn_ra_serf/update.c:1678
+#: ../libsvn_ra_serf/update.c:1718
+msgid "Missing revision attr in open-directory element"
+msgstr "open-directory元素没有revision属性"
 
-#: ../libsvn_ra_neon/log.c:187 ../libsvn_ra_serf/log.c:237
-#, c-format
-msgid "Missing name attr in revprop element"
-msgstr "元素 revprop 没有 name 属性"
+#: ../libsvn_ra_serf/replay.c:312 ../libsvn_ra_serf/update.c:1765
+msgid "Missing name attr in add-directory element"
+msgstr "元素 add-directory 没有 name 属性"
 
-#: ../libsvn_ra_neon/log.c:512 ../libsvn_ra_serf/log.c:686
-#: ../libsvn_ra_svn/client.c:1445
-msgid "Server does not support custom revprops via log"
-msgstr "服务器不支持通过日志自定义 revprops"
+#: ../libsvn_ra_serf/replay.c:349 ../libsvn_ra_serf/update.c:1809
+msgid "Missing name attr in open-file element"
+msgstr "元素 open-file 没有 name 属性"
 
-#: ../libsvn_ra_neon/merge.c:223
-#, c-format
-msgid ""
-"Protocol error: we told the server not to auto-merge any resources, but it "
-"said that '%s' was merged"
-msgstr "通讯协议错误: 我们让服务器不要自动合并任何资源，但是它报告“%s”已被合并"
+#: ../libsvn_ra_serf/replay.c:355 ../libsvn_ra_serf/update.c:1818
+msgid "Missing revision attr in open-file element"
+msgstr "open-file元素没有revision属性"
 
-#: ../libsvn_ra_neon/merge.c:232
-#, c-format
-msgid ""
-"Internal error: there is an unknown parent (%d) for the 'DAV:response' "
-"element within the MERGE response"
-msgstr "内部错误: 在 MERGE 响应中，“DAV:response”元素有未知的父项 (%d)"
+#: ../libsvn_ra_serf/replay.c:375 ../libsvn_ra_serf/update.c:1843
+msgid "Missing name attr in add-file element"
+msgstr "元素 add-file 没有 name 属性"
 
-#: ../libsvn_ra_neon/merge.c:247
+#: ../libsvn_ra_serf/replay.c:443 ../libsvn_ra_serf/update.c:1984
+#: ../libsvn_ra_serf/update.c:2071
 #, c-format
-msgid ""
-"Protocol error: the MERGE response for the '%s' resource did not return all "
-"of the properties that we asked for (and need to complete the commit)"
-msgstr "通讯协议错误: 对“%s”的 MERGE 响应并未返回所有我们请求的属性 (这些是完成提交所需要的)"
+msgid "Missing name attr in %s element"
+msgstr "元素“%s”没有name属性"
 
-#: ../libsvn_ra_neon/merge.c:266 ../libsvn_ra_serf/merge.c:298
-#, c-format
-msgid "A MERGE response for '%s' is not a child of the destination ('%s')"
-msgstr "“%s”的 MERGE 响应并不是目标 (“%s”) 的子项"
+#: ../libsvn_ra_serf/replay.c:578
+msgid "Error writing stream: unexpected EOF"
+msgstr "写入流出错: 意外的 EOF"
 
-#: ../libsvn_ra_neon/merge.c:520
-msgid "The MERGE property response had an error status"
-msgstr "MERGE 属性响应包含错误状态"
+#: ../libsvn_ra_serf/sb_bucket.c:65
+msgid "Failed to read the request"
+msgstr "读取请求失败"
 
-#: ../libsvn_ra_neon/options.c:337
-msgid ""
-"The OPTIONS response did not include the requested activity-collection-set; "
-"this often means that the URL is not WebDAV-enabled"
-msgstr "OPTIONS 响应没有包含请求的 activity-collection-set；通常是此 URL 没有启用 WebDAV。"
+#: ../libsvn_ra_serf/serf.c:62
+msgid "Module for accessing a repository via WebDAV protocol using serf."
+msgstr "通过 WebDAV 协议使用 serf 访问版本库的模块。"
 
-#: ../libsvn_ra_neon/options.c:451 ../libsvn_ra_serf/options.c:620
+#: ../libsvn_ra_serf/serf.c:65
 #, c-format
-msgid "Don't know how to handle '%s' for capability '%s'"
-msgstr "不知道如何处理“%s”，对于特性“%s”"
+msgid ""
+"Module for accessing a repository via WebDAV protocol using serf.\n"
+"  - using serf %d.%d.%d"
+msgstr ""
 
-#: ../libsvn_ra_neon/options.c:475 ../libsvn_ra_serf/options.c:644
+#: ../libsvn_ra_serf/serf.c:129
 #, c-format
-msgid "Attempt to fetch capability '%s' resulted in '%s'"
-msgstr "试图取得特性 “%s” 导致 “%s”"
+msgid "Invalid config: unknown %s '%s'"
+msgstr "无效配置: 未知 %s “%s”"
 
-#: ../libsvn_ra_neon/props.c:609
-#, c-format
-msgid "Failed to find label '%s' for URL '%s'"
-msgstr "无法找到标签 “%s” 于 URL “%s”"
+#: ../libsvn_ra_serf/serf.c:327
+msgid "Invalid config: illegal character in timeout value"
+msgstr "无效配置: 超时数值中有非法字符"
 
-#: ../libsvn_ra_neon/props.c:638
-#, c-format
-msgid "'%s' was not present on the resource '%s'"
-msgstr "'%s' 不在资源 '%s' 中"
+#: ../libsvn_ra_serf/serf.c:331
+msgid "Invalid config: negative timeout value"
+msgstr "无效配置: 负的超时"
 
-#: ../libsvn_ra_neon/props.c:725 ../libsvn_ra_neon/props.c:1376
-#: ../libsvn_ra_neon/util.c:1619
-#, c-format
-msgid "Neon was unable to parse URL '%s'"
-msgstr "Neon 不能解析URL“%s”"
+#: ../libsvn_ra_serf/serf.c:344
+msgid "Invalid URL: illegal character in proxy port number"
+msgstr "无效URL: 代理端口中有非法字符"
+
+#: ../libsvn_ra_serf/serf.c:348
+msgid "Invalid URL: negative proxy port number"
+msgstr "无效URL: 负的代理端口"
 
-#: ../libsvn_ra_neon/props.c:762
-msgid "The path was not part of a repository"
-msgstr "路径不是版本库的一部分"
+#: ../libsvn_ra_serf/serf.c:351
+msgid ""
+"Invalid URL: proxy port number greater than maximum TCP port number 65535"
+msgstr "无效URL: 代理端口大于TCP通信端口最大值65535"
 
-#: ../libsvn_ra_neon/props.c:771
+#: ../libsvn_ra_serf/serf.c:371
 #, c-format
-msgid "No part of path '%s' was found in repository HEAD"
-msgstr "路径“%s”的任何部分都不在版本库的 HEAD 中"
+msgid "Could not resolve proxy server '%s'"
+msgstr "不能解析代理服务器“%s”"
 
-#: ../libsvn_ra_neon/props.c:827 ../libsvn_ra_neon/props.c:883
-msgid "The VCC property was not found on the resource"
-msgstr "资源没有 VCC 属性"
+#: ../libsvn_ra_serf/serf.c:474
+#, c-format
+msgid "Illegal URL '%s'"
+msgstr "非法 URL “%s”"
 
-#: ../libsvn_ra_neon/props.c:896
-msgid "The relative-path property was not found on the resource"
-msgstr "资源没有 relative-path 属性"
+#: ../libsvn_ra_serf/serf.c:546
+#, c-format
+msgid "Connection to '%s' failed"
+msgstr "连接到“%s”失败"
 
-#: ../libsvn_ra_neon/props.c:1003 ../libsvn_ra_serf/property.c:1010
-msgid "The OPTIONS response did not include the youngest revision"
-msgstr "OPTIONS 响应中没有包含最新的版本"
+#: ../libsvn_ra_serf/serf.c:1216
+msgid "The UUID property was not found on the resource or any of its parents"
+msgstr "无法在本资源或其任何父项目中找到UUID属性"
 
-#: ../libsvn_ra_neon/props.c:1018
+#: ../libsvn_ra_serf/serf.c:1290
 #, c-format
-msgid "Url '%s' is not in repository '%s'"
-msgstr "URL '%s' 不在版本库 '%s' 中"
+msgid "Unsupported RA loader version (%d) for ra_serf"
+msgstr "不支持的 ra_serf RA 加载器版本(%d)"
 
-#: ../libsvn_ra_neon/props.c:1054
-msgid "'DAV:baseline-collection' was not present on the baseline resource"
-msgstr "基线资源没有“DAV:baseline-collection”"
+#: ../libsvn_ra_serf/serf.c:1304
+#, c-format
+msgid ""
+"ra_serf was compiled for serf %d.%d.%d but loaded an incompatible %d.%d.%d "
+"library"
+msgstr "ra_serf 为 serf %d.%d.%d 编译，但是加载了不兼容的共享库 %d.%d.%d"
 
-#: ../libsvn_ra_neon/props.c:1073
+#: ../libsvn_ra_serf/update.c:1118
 #, c-format
-msgid "'%s' was not present on the baseline resource"
-msgstr "“%s” 不在基线资源中"
+msgid "GET request returned unexpected delta base: %s"
+msgstr "GET 请求返回不期望的差异基础: %s"
 
-#: ../libsvn_ra_neon/props.c:1290
+#: ../libsvn_ra_serf/update.c:1136
 #, c-format
-msgid "No lock on path '%s';  repository is unchanged"
-msgstr "路径 '%s' 上没有锁；版本库未改变"
+msgid "GET request failed: %d %s"
+msgstr "GET 请求失败: %d %s"
 
-#: ../libsvn_ra_neon/props.c:1300 ../libsvn_ra_serf/commit.c:951
-msgid "At least one property change failed; repository is unchanged"
-msgstr "至少有一个属性变更失败；版本库未改变"
+#: ../libsvn_ra_serf/update.c:1922
+msgid "Missing name attr in absent-directory element"
+msgstr "元素 absent-directory 没有 name 属性"
 
-#: ../libsvn_ra_neon/replay.c:279
-msgid "Got apply-textdelta element without preceding add-file or open-file"
-msgstr "元素 apply-textdelta 之前没有 add-file 或者 open-file 元素"
-
-#: ../libsvn_ra_neon/replay.c:303
-msgid "Got close-file element without preceding add-file or open-file"
-msgstr "元素close-file之前没有add-file或者open-file元素"
-
-#: ../libsvn_ra_neon/replay.c:320
-msgid "Got close-directory element without ever opening a directory"
-msgstr "在没有打开目录的情况下发现了close-directory元素"
+#: ../libsvn_ra_serf/update.c:1947
+msgid "Missing name attr in absent-file element"
+msgstr "元素 absent-file 没有 name 属性"
 
-#: ../libsvn_ra_neon/replay.c:438 ../libsvn_ra_serf/replay.c:581
+#: ../libsvn_ra_serf/update.c:2015 ../libsvn_ra_serf/update.c:2122
 #, c-format
-msgid "Error writing stream: unexpected EOF"
-msgstr "写入流出错: 意外的 EOF"
+msgid "Unknown tag '%s' while at state %d"
+msgstr "未知标签“%s”，上下文状态 %d"
 
-#: ../libsvn_ra_neon/replay.c:445
-#, c-format
-msgid "Got cdata content for a prop delete"
-msgstr "删除属性时遇到cdata内容"
+#: ../libsvn_ra_serf/update.c:2190 ../libsvn_ra_serf/update.c:2314
+#: ../libsvn_ra_serf/update.c:2351
+msgid ""
+"The REPORT or PROPFIND response did not include the requested checked-in "
+"value"
+msgstr "REPORT 或 PROPFIND 响应中没有包含请求的 checked-in 值。"
 
-#: ../libsvn_ra_neon/session.c:340
+#: ../libsvn_ra_serf/update.c:2533
 #, c-format
-msgid "PIN for token \"%s\" in slot \"%s\""
-msgstr "钉住令牌“%s”于通道“%s”"
+msgid "Error writing to '%s': unexpected EOF"
+msgstr "写入“%s”出错: 意外的文件结束"
 
-#: ../libsvn_ra_neon/session.c:544 ../libsvn_ra_serf/serf.c:281
-msgid "Invalid URL: illegal character in proxy port number"
-msgstr "无效URL: 代理端口中有非法字符"
+#: ../libsvn_ra_serf/update.c:2902
+msgid "Error retrieving REPORT"
+msgstr "获取报告出错"
 
-#: ../libsvn_ra_neon/session.c:548 ../libsvn_ra_serf/serf.c:285
-msgid "Invalid URL: negative proxy port number"
-msgstr "无效URL: 负的代理端口"
+#: ../libsvn_ra_serf/update.c:3105
+msgid "Missing update-report close tag"
+msgstr "缺少更新报告的关闭标签"
 
-#: ../libsvn_ra_neon/session.c:551 ../libsvn_ra_serf/serf.c:288
-msgid ""
-"Invalid URL: proxy port number greater than maximum TCP port number 65535"
-msgstr "无效URL: 代理端口大于TCP通信端口最大值65535"
+#: ../libsvn_ra_serf/update.c:3575
+msgid "Can't get text contents of a directory"
+msgstr "无法获得目录的文本内容"
 
-#: ../libsvn_ra_neon/session.c:565 ../libsvn_ra_serf/serf.c:263
-msgid "Invalid config: illegal character in timeout value"
-msgstr "无效配置: 超时数值中有非法字符"
+#: ../libsvn_ra_serf/util.c:249
+msgid ": "
+msgstr ""
 
-#: ../libsvn_ra_neon/session.c:569 ../libsvn_ra_serf/serf.c:267
-msgid "Invalid config: negative timeout value"
-msgstr "无效配置: 负的超时"
+#: ../libsvn_ra_serf/util.c:251
+msgid ", "
+msgstr ""
 
-#: ../libsvn_ra_neon/session.c:582
-msgid "Invalid config: illegal character in debug mask value"
-msgstr "无效配置: 调试掩码中有非法字符"
+#: ../libsvn_ra_serf/util.c:445
+msgid "Server SSL certificate verification failed"
+msgstr ""
 
-#: ../libsvn_ra_neon/session.c:607 ../libsvn_ra_serf/serf.c:122
-#, c-format
-msgid "Invalid config: unknown http authtype '%s'"
-msgstr "无效配置: 未知的 http 认证类型“%s”"
+#: ../libsvn_ra_serf/util.c:450
+msgid "certificate is not yet valid"
+msgstr ""
 
-#: ../libsvn_ra_neon/session.c:668
-msgid "Module for accessing a repository via WebDAV protocol using Neon."
-msgstr "通过 WebDAV 协议使用 neon 访问版本库的模块。"
+#: ../libsvn_ra_serf/util.c:453
+msgid "certificate has expired"
+msgstr ""
 
-#: ../libsvn_ra_neon/session.c:748
-#, c-format
-msgid "URL '%s' is malformed or the scheme or host or path is missing"
-msgstr "非法 URL “%s”，缺少方案，主机或路径"
+#: ../libsvn_ra_serf/util.c:457
+msgid "certificate issued for a different hostname"
+msgstr ""
 
-#: ../libsvn_ra_neon/session.c:764
-msgid "Network socket initialization failed"
-msgstr "创建网络套接字失败"
+#: ../libsvn_ra_serf/util.c:461
+msgid "issuer is not trusted"
+msgstr ""
 
-#: ../libsvn_ra_neon/session.c:827
-msgid "SSL is not supported"
-msgstr "不支持 SSL"
+#: ../libsvn_ra_serf/util.c:464
+msgid "and other reason(s)"
+msgstr ""
 
-#: ../libsvn_ra_neon/session.c:1000 ../libsvn_ra_serf/util.c:340
+#: ../libsvn_ra_serf/util.c:511
 #, c-format
 msgid "Invalid config: unable to load certificate file '%s'"
 msgstr "无效的配置: 无法加载证书文件“%s”"
 
-#: ../libsvn_ra_neon/session.c:1028
+#: ../libsvn_ra_serf/util.c:943 ../libsvn_ra_serf/util.c:946
+msgid "Error running context"
+msgstr "执行上下文错误"
+
+#: ../libsvn_ra_serf/util.c:1274 ../libsvn_ra_serf/util.c:1279
 #, c-format
-msgid "Invalid config: unable to load PKCS#11 provider '%s'"
-msgstr "无效的配置: 无法加载 PKCS#11 提供者“%s”"
+msgid "Malformed DAV:status CDATA '%s'"
+msgstr "非法 DAV:status CDATA '%s'"
 
-#: ../libsvn_ra_neon/session.c:1183 ../libsvn_ra_serf/serf.c:1128
-msgid "The UUID property was not found on the resource or any of its parents"
-msgstr "无法在本资源或其任何父项目中找到UUID属性"
+#: ../libsvn_ra_serf/util.c:1576 ../libsvn_ra_serf/util.c:1679
+#, c-format
+msgid "XML parsing failed"
+msgstr "XML 解析失败"
 
-#: ../libsvn_ra_neon/session.c:1259
+#: ../libsvn_ra_serf/util.c:1579
 #, c-format
-msgid "Unsupported RA loader version (%d) for ra_neon"
-msgstr "不支持的 ra_neon RA 加载器版本(%d)"
+msgid "XML parsing failed: (%d %s)"
+msgstr "XML 解析失败: (%d %s)"
+
+#: ../libsvn_ra_serf/util.c:1866
+msgid "The XML response contains invalid XML"
+msgstr ""
 
-#: ../libsvn_ra_neon/util.c:234
-msgid "The request response contained at least one error"
-msgstr "请求的响应至少有一个错误"
+#: ../libsvn_ra_serf/util.c:1931
+msgid ""
+"No more credentials or we tried too many times.\n"
+"Authentication failed"
+msgstr ""
+"没有更多凭据或已经试了太多次。\n"
+"认证失败"
 
-#: ../libsvn_ra_neon/util.c:276
-msgid "The response contains a non-conforming HTTP status line"
-msgstr "响应包含了不一致的HTTP状态行"
+#: ../libsvn_ra_serf/util.c:1953
+msgid "Proxy authentication failed"
+msgstr "代理认证失败"
 
-#: ../libsvn_ra_neon/util.c:286
+#: ../libsvn_ra_serf/util.c:2006
 #, c-format
-msgid "Error setting property '%s': "
-msgstr "设置属性 “%s” 出错: "
+msgid "%s request on '%s' failed"
+msgstr ""
 
-#: ../libsvn_ra_neon/util.c:585
+#: ../libsvn_ra_serf/util.c:2078
 #, c-format
-msgid "%s of '%s'"
-msgstr "方法 %s 失败于 “%s”"
+msgid "Premature EOF seen from server (http status=%d)"
+msgstr "从服务器发现 EOF 太早 (http status=%d)"
 
-#: ../libsvn_ra_neon/util.c:601 ../libsvn_ra_serf/commit.c:1717
-#: ../libsvn_ra_serf/util.c:2256
+#: ../libsvn_ra_serf/util.c:2147
 #, c-format
-msgid "Access to '%s' forbidden"
-msgstr "禁止访问 '%s'"
+msgid "%s request on '%s' failed: %d %s"
+msgstr "%s 请求于 '%s' 失败: %d %s"
+
+#: ../libsvn_ra_serf/util.c:2469
+msgid ""
+"The PROPFIND response did not include the requested version-controlled-"
+"configuration value"
+msgstr "PROPFIND 响应中没有包含请求的 version-controlled-configuration 值。"
 
-#: ../libsvn_ra_neon/util.c:611 ../libsvn_ra_serf/util.c:2250
+#: ../libsvn_ra_serf/util.c:2571
 #, c-format
 msgid "Repository moved permanently to '%s'; please relocate"
 msgstr "版本库永久移到 “%s”；请重新定位。"
 
-#: ../libsvn_ra_neon/util.c:613 ../libsvn_ra_serf/util.c:2252
+#: ../libsvn_ra_serf/util.c:2573
 #, c-format
 msgid "Repository moved temporarily to '%s'; please relocate"
 msgstr "版本库临时移到‘%s’；请重新定位。"
 
-#: ../libsvn_ra_neon/util.c:621
+#: ../libsvn_ra_serf/util.c:2584
 #, c-format
-msgid ""
-"Server sent unexpected return value (%d %s) in response to %s request for "
-"'%s'"
-msgstr "服务器发送了意外的返回值(%d %s)，在响应 “%s” 的请求 “%s” 中"
+msgid "'%s': no lock token available"
+msgstr "“%s”：没有可用的锁定令牌"
 
-#: ../libsvn_ra_neon/util.c:634
+#: ../libsvn_ra_serf/util.c:2588
 #, c-format
-msgid "authorization failed: %s"
-msgstr "认证失败: %s"
-
-#: ../libsvn_ra_neon/util.c:636
-msgid "authorization failed"
-msgstr "认证失败"
-
-#: ../libsvn_ra_neon/util.c:641
-msgid "could not connect to server"
-msgstr "无法连接到服务器"
-
-#: ../libsvn_ra_neon/util.c:645
-msgid "timed out waiting for server"
-msgstr "等待服务器超时"
+msgid ""
+"DAV request failed: 411 Content length required. The server or an "
+"intermediate proxy does not accept chunked encoding. Try setting 'http-"
+"chunked-requests' to 'auto' or 'no' in your client configuration."
+msgstr ""
 
-#. ### This is a translation nightmare. Make sure to compose full strings
-#. and mark those for translation.
-#: ../libsvn_ra_neon/util.c:660
+#: ../libsvn_ra_serf/util.c:2594
 #, c-format
-msgid "%s: %s (%s://%s)"
-msgstr "%s: %s (%s://%s)"
-
-#: ../libsvn_ra_neon/util.c:780
-msgid "General svn error from server"
-msgstr "来自服务器的一般 svn 错误"
+msgid "The requested feature is not supported by '%s'"
+msgstr ""
 
-#: ../libsvn_ra_neon/util.c:989
+#: ../libsvn_ra_serf/util.c:2600
 #, c-format
-msgid "Can't calculate the request body size"
-msgstr "无法计算请求主体大小"
+msgid "Unexpected HTTP status %d '%s' on '%s'\n"
+msgstr "意外 HTTP 状态 %d “%s”于“%s”\n"
 
-#: ../libsvn_ra_neon/util.c:1153
+#: ../libsvn_ra_serf/util.c:2744
 #, c-format
-msgid "The %s request returned invalid XML in the response: %s (%s)"
-msgstr "%s 请求的响应返回无效 XML: %s (%s)"
+msgid "The %s response contains invalid XML (%d %s)"
+msgstr "响应 %s 包含非法 XML (%d %s)"
 
-#: ../libsvn_ra_neon/util.c:1338
+#: ../libsvn_ra_serf/xml.c:622
 #, c-format
-msgid "Error reading spooled %s request response"
-msgstr "读取请求 %s 响应的脱机数据时出现错误"
+msgid "XML Parsing failed: Unexpected root element '%s'"
+msgstr ""
 
-#: ../libsvn_ra_serf/commit.c:231
+#: ../libsvn_ra_serf/xml.c:682
 #, c-format
-msgid "%s of '%s': %d %s"
-msgstr "%s 于 '%s': %d %s"
+msgid "Missing XML attribute: '%s'"
+msgstr "缺少 XML 属性: '%s'"
 
-#: ../libsvn_ra_serf/commit.c:305
-msgid "No Location header received"
-msgstr "没有收到位置头"
+#: ../libsvn_ra_serf/xml.c:757
+msgid "The response contains invalid XML"
+msgstr "此响应包含非法 XML"
 
-#: ../libsvn_ra_serf/commit.c:395
+#: ../libsvn_ra_svn/client.c:142
 #, c-format
-msgid "Directory '%s' is out of date; try updating"
-msgstr "目录 “%s” 已经过时；请先更新"
+msgid "Unknown hostname '%s'"
+msgstr "未知的主机“%s”"
 
-#: ../libsvn_ra_serf/commit.c:498 ../libsvn_repos/commit.c:447
+#: ../libsvn_ra_svn/client.c:167
 #, c-format
-msgid "Path '%s' not present"
-msgstr "路径 “%s” 不存在"
+msgid "Can't connect to host '%s'"
+msgstr "无法连接主机“%s”"
 
-#: ../libsvn_ra_serf/commit.c:577
+#: ../libsvn_ra_svn/client.c:205
+msgid "Prop diffs element not a list"
+msgstr "Prop diffs 元素不是一个列表"
+
+#: ../libsvn_ra_svn/client.c:403
 #, c-format
-msgid "File '%s' is out of date; try updating"
-msgstr "文件 “%s” 已经过时；请先更新"
+msgid "Undefined tunnel scheme '%s'"
+msgstr "无法识别的隧道方案 “%s”"
 
-#: ../libsvn_ra_serf/commit.c:1169
+#: ../libsvn_ra_svn/client.c:420
 #, c-format
-msgid "Failed writing updated file"
-msgstr "更新文件失败"
+msgid "Tunnel scheme %s requires environment variable %s to be defined"
+msgstr "隧道方案 %s 需要设定环境变量 %s"
 
-#: ../libsvn_ra_serf/commit.c:1338 ../libsvn_ra_serf/commit.c:1441
+#: ../libsvn_ra_svn/client.c:431
 #, c-format
-msgid "%s of '%s': %d %s (%s://%s)"
-msgstr "%s 于 '%s': %d %s (%s://%s)"
+msgid "Can't tokenize command '%s'"
+msgstr "不能解析命令“%s”"
+
+#: ../libsvn_ra_svn/client.c:464
+#, c-format
+msgid "Error in child process: %s"
+msgstr "子进程错误: %s"
 
-#: ../libsvn_ra_serf/commit.c:1401
+#: ../libsvn_ra_svn/client.c:539
 msgid ""
-"The OPTIONS response did not include the requested activity-collection-set "
-"value"
-msgstr "OPTIONS 响应中没有包含请求的 activity-collection-set 值。"
+"To better debug SSH connection problems, remove the -q option from 'ssh' in "
+"the [tunnels] section of your Subversion configuration file."
+msgstr "为了更好的诊断 SSH 连接问题，请从你的 Subversion 配置文件中，[tunnels] 节，删除 ssh 命令行参数 -q 。"
 
-#: ../libsvn_ra_serf/commit.c:1722
+#: ../libsvn_ra_svn/client.c:557
 #, c-format
-msgid "Adding directory failed: %s on %s (%d %s)"
-msgstr "增加目录失败: “%s” 于 “%s”(%d %s)"
+msgid "Illegal svn repository URL '%s'"
+msgstr "非法的svn版本库URL“%s”"
 
-#: ../libsvn_ra_serf/commit.c:2235
+#: ../libsvn_ra_svn/client.c:637
 #, c-format
-msgid "MERGE request failed: returned %d (during commit)"
-msgstr "MERGE 请求失败：返回 %d (在提交期间)"
+msgid "Server requires minimum version %d"
+msgstr "服务器要求的最低版本是 %d"
 
-#: ../libsvn_ra_serf/getlocationsegments.c:233
+#: ../libsvn_ra_svn/client.c:641
 #, c-format
-msgid "Location segment report failed on '%s'@'%ld'"
-msgstr "位置分段报告失败于“%s”@“%ld”"
-
-#: ../libsvn_ra_serf/locks.c:554
-msgid "Malformed URL for repository"
-msgstr "版本库的 URL 非法"
+msgid "Server only supports versions up to %d"
+msgstr "服务器支持的版本不大于 %d"
 
-#: ../libsvn_ra_serf/locks.c:760 ../libsvn_ra_serf/locks.c:765
-#, c-format
-msgid "Unlock request failed: %d %s"
-msgstr "解锁请求失败: %d %s"
+#: ../libsvn_ra_svn/client.c:649
+msgid "Server does not support edit pipelining"
+msgstr "服务器不支持流水线编辑"
 
-#: ../libsvn_ra_serf/log.c:335
-#, c-format
-msgid "Unsupported encoding '%s'"
-msgstr "不支持的编码“%s”"
+#: ../libsvn_ra_svn/client.c:686
+msgid "Impossibly long repository root from server"
+msgstr "服务器返回的版本库根路径太长"
 
-#: ../libsvn_ra_serf/property.c:942
+#: ../libsvn_ra_svn/client.c:698
 msgid ""
-"The PROPFIND response did not include the requested baseline-collection value"
-msgstr "PROPFIND 响应中没有包含请求的 baseline-collection 值。"
+"Module for accessing a repository using the svn network protocol.\n"
+"  - with Cyrus SASL authentication"
+msgstr "使用 svn 网络协议访问版本库的模块。  - 使用 Cyrus SASL 认证"
 
-#: ../libsvn_ra_serf/property.c:953
-msgid ""
-"The PROPFIND response did not include the requested version-name value"
-msgstr "PROPFIND 响应中没有包含请求的 version-name 值。"
+#: ../libsvn_ra_svn/client.c:702
+msgid "Module for accessing a repository using the svn network protocol."
+msgstr "使用 svn 网络协议访问版本库的模块。"
 
-#: ../libsvn_ra_serf/property.c:1059 ../libsvn_ra_serf/update.c:1247
-#: ../libsvn_ra_serf/update.c:1848
-msgid "The OPTIONS response did not include the requested checked-in value"
-msgstr "OPTIONS 响应中没有包含请求的 checked-in 值。"
+#: ../libsvn_ra_svn/client.c:912
+msgid "Server did not send repository root"
+msgstr "服务器没有返回版本库根路径"
 
-#: ../libsvn_ra_serf/property.c:1112
+#: ../libsvn_ra_svn/client.c:985
+#, c-format
 msgid ""
-"The PROPFIND response did not include the requested resourcetype value"
-msgstr "PROPFIND 响应中没有包含请求的 resourcetype 值"
+"ra_svn does not support not specifying a log message with pre-1.5 servers; "
+"consider passing an empty one, or upgrading the server"
+msgstr ""
 
-#: ../libsvn_ra_serf/replay.c:224 ../libsvn_ra_serf/update.c:1349
-msgid "Missing revision attr in target-revision element"
-msgstr "元素“target-revision没有revision属性"
+#: ../libsvn_ra_svn/client.c:1008
+msgid ""
+"Server doesn't support setting arbitrary revision properties during commit"
+msgstr "在提交时，服务器不支持设置任意版本属性"
 
-#: ../libsvn_ra_serf/replay.c:242
-msgid "Missing revision attr in open-root element"
-msgstr "元素“open-root没有revisioin属性"
+#: ../libsvn_ra_svn/client.c:1111
+msgid "Inherited proplist element not a list"
+msgstr "继承的属性列表元素不是列表"
 
-#: ../libsvn_ra_serf/replay.c:268
-msgid "Missing revision attr in delete-entry element"
-msgstr "delete-entry元素没有revision属性"
+#: ../libsvn_ra_svn/client.c:1186
+msgid "Non-string as part of file contents"
+msgstr "部分文件内容不是字符串"
 
-#: ../libsvn_ra_serf/replay.c:294 ../libsvn_ra_serf/update.c:1367
-#: ../libsvn_ra_serf/update.c:1409
-msgid "Missing revision attr in open-directory element"
-msgstr "open-directory元素没有revision属性"
-
-#: ../libsvn_ra_serf/replay.c:356 ../libsvn_ra_serf/update.c:1508
-msgid "Missing revision attr in open-file element"
-msgstr "open-file元素没有revision属性"
-
-#: ../libsvn_ra_serf/replay.c:444 ../libsvn_ra_serf/update.c:1669
-#: ../libsvn_ra_serf/update.c:1758
-#, c-format
-msgid "Missing name attr in %s element"
-msgstr "元素“%s”没有name属性"
-
-#: ../libsvn_ra_serf/replay.c:880
-#, c-format
-msgid "Error retrieving replay REPORT (%d)"
-msgstr "获取重放报告出错(%d)"
-
-#: ../libsvn_ra_serf/serf.c:63
-msgid "Module for accessing a repository via WebDAV protocol using serf."
-msgstr "通过 WebDAV 协议使用 serf 访问版本库的模块。"
-
-#: ../libsvn_ra_serf/serf.c:306
-#, c-format
-msgid "Could not resolve proxy server '%s'"
-msgstr "不能解析代理服务器“%s”"
-
-#: ../libsvn_ra_serf/serf.c:375
-#, c-format
-msgid "Illegal URL '%s'"
-msgstr "无效 URL “%s”"
-
-#: ../libsvn_ra_serf/serf.c:1200
-#, c-format
-msgid "Unsupported RA loader version (%d) for ra_serf"
-msgstr "不支持的 ra_serf RA 加载器版本(%d)"
-
-#: ../libsvn_ra_serf/serf.c:1213
-#, c-format
-msgid ""
-"ra_serf was compiled for serf %d.%d.%d but loaded an incompatible %d.%d.%d "
-"library"
-msgstr "ra_serf 为 serf %d.%d.%d 编译，但是加载了不兼容的共享库 %d.%d.%d"
-
-#: ../libsvn_ra_serf/update.c:900
-#, c-format
-msgid "GET request failed: %d %s"
-msgstr "GET 请求失败: %d %s"
-
-#: ../libsvn_ra_serf/update.c:1701 ../libsvn_ra_serf/update.c:1786
-#, c-format
-msgid "Unknown tag '%s' while at state %d"
-msgstr "未知标签“%s”，上下文状态 %d"
-
-#: ../libsvn_ra_serf/update.c:2416
-#, c-format
-msgid "Error retrieving REPORT (%d)"
-msgstr "获取报告出错(%d)"
-
-#: ../libsvn_ra_serf/util.c:715 ../libsvn_ra_serf/util.c:718
-#, c-format
-msgid "Error running context"
-msgstr "执行上下文错误"
-
-#: ../libsvn_ra_serf/util.c:988 ../libsvn_ra_serf/util.c:993
-#, c-format
-msgid "Malformed DAV:status CDATA '%s'"
-msgstr "非法 DAV:status CDATA '%s'"
-
-#: ../libsvn_ra_serf/util.c:1366
-#, c-format
-msgid "XML parsing failed"
-msgstr "XML 解析失败"
-
-#: ../libsvn_ra_serf/util.c:1369
-#, c-format
-msgid "XML parsing failed: (%d %s)"
-msgstr "XML 解析失败: (%d %s)"
-
-#: ../libsvn_ra_serf/util.c:1755
-msgid ""
-"No more credentials or we tried too many times.\n"
-"Authentication failed"
-msgstr ""
-"没有凭证或已经试了太多次。\n"
-"认证失败"
-
-#: ../libsvn_ra_serf/util.c:1778
-msgid "Proxy authentication failed"
-msgstr "代理认证失败"
-
-#: ../libsvn_ra_serf/util.c:1852
-#, c-format
-msgid "Premature EOF seen from server (http status=%d)"
-msgstr "从服务器发现 EOF 太早 (http status=%d)"
-
-#: ../libsvn_ra_serf/util.c:1890
-#, c-format
-msgid "%s request on '%s' failed: %d %s"
-msgstr "%s 请求于 '%s' 失败: %d %s"
-
-#: ../libsvn_ra_serf/util.c:2141
-msgid ""
-"The PROPFIND response did not include the requested version-controlled-"
-"configuration value"
-msgstr "PROPFIND 响应中没有包含请求的 version-controlled-configuration 值。"
-
-#: ../libsvn_ra_serf/util.c:2263
-#, c-format
-msgid "'%s': no lock token available"
-msgstr "“%s”：没有可用的锁定令牌"
-
-#: ../libsvn_ra_svn/client.c:140
-#, c-format
-msgid "Unknown hostname '%s'"
-msgstr "未知的主机“%s”"
-
-#: ../libsvn_ra_svn/client.c:165
-#, c-format
-msgid "Can't connect to host '%s'"
-msgstr "无法连接主机“%s”"
-
-#: ../libsvn_ra_svn/client.c:203
-msgid "Prop diffs element not a list"
-msgstr "Prop diffs 元素不是一个列表"
-
-#: ../libsvn_ra_svn/client.c:399
-#, c-format
-msgid "Undefined tunnel scheme '%s'"
-msgstr "无法识别的隧道方案 “%s”"
-
-#: ../libsvn_ra_svn/client.c:416
-#, c-format
-msgid "Tunnel scheme %s requires environment variable %s to be defined"
-msgstr "隧道方案 %s 需要设定环境变量 %s"
-
-#: ../libsvn_ra_svn/client.c:427
-#, c-format
-msgid "Can't tokenize command '%s'"
-msgstr "不能解析命令“%s”"
-
-#: ../libsvn_ra_svn/client.c:459
-#, c-format
-msgid "Error in child process: %s"
-msgstr "子进程错误: %s"
-
-#: ../libsvn_ra_svn/client.c:485
-#, c-format
-msgid "Can't create tunnel"
-msgstr "无法创建隧道"
-
-#: ../libsvn_ra_svn/client.c:531
-msgid ""
-"To better debug SSH connection problems, remove the -q option from 'ssh' in "
-"the [tunnels] section of your Subversion configuration file."
-msgstr "为了更好的诊断 SSH 连接问题，请从你的 Subversion 配置文件中，[tunnels] 节，删除 ssh 命令行参数 -q 。"
-
-#: ../libsvn_ra_svn/client.c:549
-#, c-format
-msgid "Illegal svn repository URL '%s'"
-msgstr "非法的svn版本库URL“%s”"
-
-#: ../libsvn_ra_svn/client.c:612
-#, c-format
-msgid "Server requires minimum version %d"
-msgstr "服务器要求的最低版本是 %d"
-
-#: ../libsvn_ra_svn/client.c:616
-#, c-format
-msgid "Server only supports versions up to %d"
-msgstr "服务器支持的版本不大于 %d"
-
-#: ../libsvn_ra_svn/client.c:624
-msgid "Server does not support edit pipelining"
-msgstr "服务器不支持流水线编辑"
-
-#: ../libsvn_ra_svn/client.c:663
-msgid "Impossibly long repository root from server"
-msgstr "服务器返回的版本库根路径太长"
-
-#: ../libsvn_ra_svn/client.c:675
-msgid ""
-"Module for accessing a repository using the svn network protocol.\n"
-"  - with Cyrus SASL authentication"
-msgstr "使用 svn 网络协议访问版本库的模块。  - 使用 Cyrus SASL 认证"
-
-#: ../libsvn_ra_svn/client.c:679
-msgid "Module for accessing a repository using the svn network protocol."
-msgstr "使用 svn 网络协议访问版本库的模块。"
-
-#: ../libsvn_ra_svn/client.c:891
-msgid "Server did not send repository root"
-msgstr "服务器没有返回版本库根路径"
-
-#: ../libsvn_ra_svn/client.c:966
-msgid ""
-"Server doesn't support setting arbitrary revision properties during commit"
-msgstr "在提交时，服务器不支持设置任意版本属性"
-
-#: ../libsvn_ra_svn/client.c:1059
-msgid "Non-string as part of file contents"
-msgstr "部分文件内容不是字符串"
-
-#: ../libsvn_ra_svn/client.c:1145
+#: ../libsvn_ra_svn/client.c:1272
 msgid "Dirlist element not a list"
 msgstr "目录列表元素不是列表"
 
-#: ../libsvn_ra_svn/client.c:1234
+#: ../libsvn_ra_svn/client.c:1357
 msgid "Mergeinfo element is not a list"
 msgstr "Mergeinfo 元素不是列表"
 
-#: ../libsvn_ra_svn/client.c:1433
+#: ../libsvn_ra_svn/client.c:1565
 msgid "Log entry not a list"
 msgstr "日志条目不是列表"
 
-#: ../libsvn_ra_svn/client.c:1480
+#: ../libsvn_ra_svn/client.c:1612
 msgid "Changed-path entry not a list"
 msgstr "已修改路径条目不是列表"
 
-#: ../libsvn_ra_svn/client.c:1606
+#: ../libsvn_ra_svn/client.c:1778
 msgid "'stat' not implemented"
 msgstr "未实现“stat”"
 
-#: ../libsvn_ra_svn/client.c:1666
+#: ../libsvn_ra_svn/client.c:1837
 msgid "'get-locations' not implemented"
 msgstr "未实现“get-locations”"
 
-#: ../libsvn_ra_svn/client.c:1681
+#: ../libsvn_ra_svn/client.c:1852
 msgid "Location entry not a list"
 msgstr "区域条目不是列表"
 
-#: ../libsvn_ra_svn/client.c:1720
+#: ../libsvn_ra_svn/client.c:1891
 msgid "'get-location-segments' not implemented"
 msgstr "未实现 “get-location-segments”"
 
-#: ../libsvn_ra_svn/client.c:1736
+#: ../libsvn_ra_svn/client.c:1908
 msgid "Location segment entry not a list"
 msgstr "位置分段入口不是列表"
 
-#: ../libsvn_ra_svn/client.c:1787
+#: ../libsvn_ra_svn/client.c:1918
+msgid "Expected valid revision range"
+msgstr "期望合法的版本范围"
+
+#: ../libsvn_ra_svn/client.c:1959
 msgid "'get-file-revs' not implemented"
 msgstr "未实现“get-file-revs”"
 
-#: ../libsvn_ra_svn/client.c:1811
+#: ../libsvn_ra_svn/client.c:1983
 msgid "Revision entry not a list"
 msgstr "版本条目不是列表"
 
-#: ../libsvn_ra_svn/client.c:1828 ../libsvn_ra_svn/client.c:1858
+#: ../libsvn_ra_svn/client.c:2000 ../libsvn_ra_svn/client.c:2030
 msgid "Text delta chunk not a string"
 msgstr "文本差异块不是字符串"
 
-#: ../libsvn_ra_svn/client.c:1870
+#: ../libsvn_ra_svn/client.c:2042
 msgid "The get-file-revs command didn't return any revisions"
 msgstr "get-file-revs 命令没有返回任何版本"
 
-#: ../libsvn_ra_svn/client.c:1918
+#: ../libsvn_ra_svn/client.c:2089
 msgid "Server doesn't support the lock command"
 msgstr "服务器不支持加锁"
 
-#: ../libsvn_ra_svn/client.c:1982
+#: ../libsvn_ra_svn/client.c:2153
 msgid "Server doesn't support the unlock command"
 msgstr "服务器不支持解锁"
 
-#: ../libsvn_ra_svn/client.c:2080
+#: ../libsvn_ra_svn/client.c:2251
 msgid "Lock response not a list"
 msgstr "加锁响应不是列表"
 
-#: ../libsvn_ra_svn/client.c:2094
+#: ../libsvn_ra_svn/client.c:2265
 msgid "Unknown status for lock command"
 msgstr "加锁命令的状态未知"
 
-#: ../libsvn_ra_svn/client.c:2118
+#: ../libsvn_ra_svn/client.c:2289
 msgid "Didn't receive end marker for lock responses"
 msgstr "加锁响应没有结束标记"
 
-#: ../libsvn_ra_svn/client.c:2208
+#: ../libsvn_ra_svn/client.c:2379
 msgid "Unlock response not a list"
 msgstr "解锁响应不是列表"
 
-#: ../libsvn_ra_svn/client.c:2222
+#: ../libsvn_ra_svn/client.c:2393
 msgid "Unknown status for unlock command"
 msgstr "未知的解锁命令状态"
 
-#: ../libsvn_ra_svn/client.c:2245
+#: ../libsvn_ra_svn/client.c:2416
 msgid "Didn't receive end marker for unlock responses"
 msgstr "解锁响应没有结束标记"
 
-#: ../libsvn_ra_svn/client.c:2269 ../libsvn_ra_svn/client.c:2329
+#: ../libsvn_ra_svn/client.c:2440 ../libsvn_ra_svn/client.c:2492
 msgid "Server doesn't support the get-lock command"
 msgstr "服务器不支持命令 get-lock"
 
-#: ../libsvn_ra_svn/client.c:2343
+#: ../libsvn_ra_svn/client.c:2506
 msgid "Lock element not a list"
 msgstr "Lock元素不是列表"
 
-#: ../libsvn_ra_svn/client.c:2386
+#: ../libsvn_ra_svn/client.c:2549
 msgid "Server doesn't support the replay command"
 msgstr "服务器不支持重放命令"
 
-#: ../libsvn_ra_svn/client.c:2417
+#: ../libsvn_ra_svn/client.c:2580
 msgid "Server doesn't support the replay-range command"
 msgstr "服务器不支持重放范围命令"
 
-#: ../libsvn_ra_svn/client.c:2435
+#: ../libsvn_ra_svn/client.c:2598
 #, c-format
 msgid "Expected 'revprops', found '%s'"
 msgstr "期望“revprops”，发现“%s”"
 
-#: ../libsvn_ra_svn/client.c:2452
+#: ../libsvn_ra_svn/client.c:2615
 msgid "Error while replaying commit"
 msgstr "重演提交操作错误"
 
-#: ../libsvn_ra_svn/client.c:2516
+#: ../libsvn_ra_svn/client.c:2688
 msgid "'get-deleted-rev' not implemented"
 msgstr "未实现 “get-deleted-rev”"
 
-#: ../libsvn_ra_svn/client.c:2580
+#: ../libsvn_ra_svn/client.c:2787
 #, c-format
 msgid "Unsupported RA loader version (%d) for ra_svn"
 msgstr "不支持 ra_svn RA 加载器版本(%d)"
 
 #: ../libsvn_ra_svn/cram.c:199 ../libsvn_ra_svn/cram.c:217
-#: ../libsvn_ra_svn/cyrus_auth.c:511 ../libsvn_ra_svn/cyrus_auth.c:567
+#: ../libsvn_ra_svn/cyrus_auth.c:526 ../libsvn_ra_svn/cyrus_auth.c:582
 #: ../libsvn_ra_svn/internal_auth.c:66
 msgid "Unexpected server response to authentication"
 msgstr "服务器意外响应认证请求"
 
-#: ../libsvn_ra_svn/cyrus_auth.c:208
+#: ../libsvn_ra_svn/cyrus_auth.c:225
 #, c-format
 msgid "SASL authentication error: %s%s"
 msgstr "SASL 认证错误: %s%s"
 
-#: ../libsvn_ra_svn/cyrus_auth.c:218 ../svnserve/cyrus_auth.c:113
-#: ../svnserve/cyrus_auth.c:123
-#, c-format
-msgid "Could not initialize the SASL library"
-msgstr "不能初始化 SASL 库"
-
-#: ../libsvn_ra_svn/cyrus_auth.c:227
+#: ../libsvn_ra_svn/cyrus_auth.c:242
 #, c-format
 msgid "Could not initialized the SASL library: %s%s"
 msgstr "不能初始化 SASL 库: %s%s"
 
-#: ../libsvn_ra_svn/cyrus_auth.c:400
+#: ../libsvn_ra_svn/cyrus_auth.c:415
 #, c-format
 msgid "Could not create SASL context: %s%s"
 msgstr "不能创建 SASL 上下文: %s%s"
 
-#: ../libsvn_ra_svn/cyrus_auth.c:908 ../libsvn_ra_svn/internal_auth.c:63
+#: ../libsvn_ra_svn/cyrus_auth.c:921 ../libsvn_ra_svn/internal_auth.c:63
 #: ../libsvn_ra_svn/internal_auth.c:114
 #, c-format
 msgid "Authentication error from server: %s"
 msgstr "服务器报告认证错误: %s"
 
-#: ../libsvn_ra_svn/cyrus_auth.c:912
+#: ../libsvn_ra_svn/cyrus_auth.c:925
 msgid "Can't get username or password"
 msgstr "无法取得用户名称或密码"
 
-#: ../libsvn_ra_svn/editorp.c:134
+#: ../libsvn_ra_svn/editorp.c:145
 msgid "Successful edit status returned too soon"
 msgstr "太快返回编辑成功状态"
 
-#: ../libsvn_ra_svn/editorp.c:467
+#: ../libsvn_ra_svn/editorp.c:487
 msgid "Invalid file or dir token during edit"
 msgstr "编辑时遇到无效的文件或目录令牌"
 
-#: ../libsvn_ra_svn/editorp.c:694
+#: ../libsvn_ra_svn/editorp.c:715
 msgid "Apply-textdelta already active"
 msgstr "已经激活 Apply-textdelta"
 
-#: ../libsvn_ra_svn/editorp.c:716 ../libsvn_ra_svn/editorp.c:734
+#: ../libsvn_ra_svn/editorp.c:737 ../libsvn_ra_svn/editorp.c:755
 msgid "Apply-textdelta not active"
 msgstr "没有激活 Apply-textdelta"
 
-#: ../libsvn_ra_svn/editorp.c:829
+#: ../libsvn_ra_svn/editorp.c:850
 #, c-format
 msgid "Command 'finish-replay' invalid outside of replays"
 msgstr "finish-replay命令只在重放时有效"
 
-#: ../libsvn_ra_svn/editorp.c:931 ../libsvn_ra_svn/marshal.c:1023
+#: ../libsvn_ra_svn/editorp.c:954 ../libsvn_ra_svn/marshal.c:1498
 #, c-format
-msgid "Unknown command '%s'"
-msgstr "未知命令: “%s”"
+msgid "Unknown editor command '%s'"
+msgstr "未知编辑器命令“%s”"
 
-#: ../libsvn_ra_svn/internal_auth.c:101 ../libsvn_subr/prompt.c:163
-#, c-format
+#: ../libsvn_ra_svn/internal_auth.c:101
 msgid "Can't get password"
 msgstr "无法取得密码"
 
-#: ../libsvn_ra_svn/marshal.c:120
+#: ../libsvn_ra_svn/marshal.c:151
 msgid "Capability entry is not a word"
 msgstr "容量类型不是 word"
 
-#: ../libsvn_ra_svn/marshal.c:579
+#: ../libsvn_ra_svn/marshal.c:941
 msgid "String length larger than maximum"
 msgstr "字符串长度超出上限"
 
-#: ../libsvn_ra_svn/marshal.c:645
+#: ../libsvn_ra_svn/marshal.c:1007
 msgid "Too many nested items"
 msgstr "太多嵌套的项"
 
-#: ../libsvn_ra_svn/marshal.c:664
+#: ../libsvn_ra_svn/marshal.c:1027 ../libsvn_ra_svn/marshal.c:1105
 msgid "Number is larger than maximum"
 msgstr "数字超过上限"
 
-#: ../libsvn_ra_svn/marshal.c:879
+#: ../libsvn_ra_svn/marshal.c:1133
+msgid "Word too long"
+msgstr "单词太长"
+
+#: ../libsvn_ra_svn/marshal.c:1351
 msgid "Proplist element not a list"
 msgstr "Proplist 元素不是列表"
 
-#: ../libsvn_ra_svn/marshal.c:917
+#: ../libsvn_ra_svn/marshal.c:1390
 msgid "Empty error list"
 msgstr "错误列表为空"
 
-#: ../libsvn_ra_svn/marshal.c:926 ../libsvn_ra_svn/marshal.c:952
+#: ../libsvn_ra_svn/marshal.c:1399 ../libsvn_ra_svn/marshal.c:1425
 msgid "Malformed error list"
 msgstr "错误列表非法"
 
-#: ../libsvn_ra_svn/marshal.c:980
+#: ../libsvn_ra_svn/marshal.c:1454
 #, c-format
 msgid "Unknown status '%s' in command response"
 msgstr "命令响应中的状态 “%s” 未知"
@@ -4762,22 +5034,22 @@
 msgid "Can't get socket timeout"
 msgstr "无法获得 socket 超时"
 
-#: ../libsvn_repos/commit.c:141
+#: ../libsvn_repos/commit.c:170
 #, c-format
 msgid "'%s' is out of date"
 msgstr "“%s” 已经过时"
 
-#: ../libsvn_repos/commit.c:226
+#: ../libsvn_repos/commit.c:291
 #, c-format
 msgid "Got source path but no source revision for '%s'"
 msgstr "获得源路径，但“%s”没有源版本"
 
-#: ../libsvn_repos/commit.c:259
+#: ../libsvn_repos/commit.c:324
 #, c-format
 msgid "Source url '%s' is from different repository"
 msgstr "源 URL “%s” 来自其它版本库"
 
-#: ../libsvn_repos/commit.c:575
+#: ../libsvn_repos/commit.c:640
 #, c-format
 msgid ""
 "Checksum mismatch for resulting fulltext\n"
@@ -4786,15 +5058,15 @@
 "结果的校验和不匹配: \n"
 "(%s)"
 
-#: ../libsvn_repos/commit.c:620
+#: ../libsvn_repos/commit.c:685
 msgid "(no error)"
 msgstr "(没有错误)"
 
-#: ../libsvn_repos/commit.c:650 ../libsvn_repos/commit.c:656
+#: ../libsvn_repos/commit.c:716 ../libsvn_repos/commit.c:722
 msgid "post-commit hook failed with no error message."
 msgstr "调用 post-commit 钩子失败 (没有错误信息)。"
 
-#: ../libsvn_repos/commit.c:659
+#: ../libsvn_repos/commit.c:725
 #, c-format
 msgid ""
 "post commit FS processing had error:\n"
@@ -4805,11 +5077,11 @@
 "%s\n"
 "%s"
 
-#: ../libsvn_repos/commit.c:660 ../libsvn_repos/commit.c:669
+#: ../libsvn_repos/commit.c:726 ../libsvn_repos/commit.c:735
 msgid "(no error message)"
 msgstr "(没有错误信息)"
 
-#: ../libsvn_repos/commit.c:667
+#: ../libsvn_repos/commit.c:733
 #, c-format
 msgid ""
 "post commit FS processing had error:\n"
@@ -4818,35 +5090,40 @@
 "提交后的文件系统进程出错:\n"
 "%s"
 
-#: ../libsvn_repos/delta.c:191
+#: ../libsvn_repos/commit.c:1266 ../libsvn_repos/fs-wrap.c:98
+#: ../libsvn_repos/load-fs-vtable.c:978
+msgid "Commit succeeded, but post-commit hook failed"
+msgstr "提交成功，但是后置提交钩子(post-commit)失败"
+
+#: ../libsvn_repos/delta.c:192
 msgid "Unable to open root of edit"
 msgstr "无法打开根来编辑"
 
-#: ../libsvn_repos/delta.c:246
+#: ../libsvn_repos/delta.c:247
 msgid "Invalid target path"
 msgstr "无效目标路径"
 
-#: ../libsvn_repos/delta.c:250
+#: ../libsvn_repos/delta.c:251
 msgid "Delta depth 'exclude' not supported"
 msgstr "不支持差异深度 “exclude”"
 
-#: ../libsvn_repos/delta.c:276
+#: ../libsvn_repos/delta.c:277
 msgid ""
 "Invalid editor anchoring; at least one of the input paths is not a directory "
 "and there was no source entry"
 msgstr "无效编辑器定位；至少一个输入路径不是目录，并且没有源入口"
 
-#: ../libsvn_repos/deprecated.c:579 ../svnadmin/main.c:685
+#: ../libsvn_repos/deprecated.c:614 ../svnadmin/svnadmin.c:780
 #, c-format
 msgid "* Dumped revision %ld.\n"
 msgstr "* 已转存版本 %ld。\n"
 
-#: ../libsvn_repos/deprecated.c:585 ../svnadmin/main.c:691
+#: ../libsvn_repos/deprecated.c:620 ../svnadmin/svnadmin.c:786
 #, c-format
 msgid "* Verified revision %ld.\n"
 msgstr "* 已校验版本 %ld。\n"
 
-#: ../libsvn_repos/deprecated.c:593 ../svnadmin/main.c:731
+#: ../libsvn_repos/deprecated.c:628 ../svnadmin/svnadmin.c:834
 #, c-format
 msgid ""
 "\n"
@@ -4857,7 +5134,7 @@
 "------- 提交后版本 %ld >>>\n"
 "\n"
 
-#: ../libsvn_repos/deprecated.c:599 ../svnadmin/main.c:737
+#: ../libsvn_repos/deprecated.c:634 ../svnadmin/svnadmin.c:840
 #, c-format
 msgid ""
 "\n"
@@ -4868,281 +5145,272 @@
 "------- 提交新版本 %ld (从原始版本 %ld 装载) >>>\n"
 "\n"
 
-#: ../libsvn_repos/deprecated.c:612 ../svnadmin/main.c:750
+#: ../libsvn_repos/deprecated.c:647 ../svnadmin/svnadmin.c:853
 #, c-format
 msgid "     * editing path : %s ..."
 msgstr "     * 正在修改路径: %s ..."
 
-#: ../libsvn_repos/deprecated.c:618 ../svnadmin/main.c:756
+#: ../libsvn_repos/deprecated.c:653 ../svnadmin/svnadmin.c:859
 #, c-format
 msgid "     * deleting path : %s ..."
 msgstr "     * 正在删除路径: %s ..."
 
-#: ../libsvn_repos/deprecated.c:624 ../svnadmin/main.c:762
+#: ../libsvn_repos/deprecated.c:659 ../svnadmin/svnadmin.c:865
 #, c-format
 msgid "     * adding path : %s ..."
 msgstr "     * 正在增加路径: %s ..."
 
-#: ../libsvn_repos/deprecated.c:630 ../svnadmin/main.c:768
+#: ../libsvn_repos/deprecated.c:665 ../svnadmin/svnadmin.c:871
 #, c-format
 msgid "     * replacing path : %s ..."
 msgstr "     * 正在替换路径: %s ..."
 
-#: ../libsvn_repos/deprecated.c:640 ../svnadmin/main.c:778
+#: ../libsvn_repos/deprecated.c:675 ../svnadmin/svnadmin.c:881
 msgid " done.\n"
 msgstr " 完成。\n"
 
-#: ../libsvn_repos/deprecated.c:650 ../svnadmin/main.c:788
+#: ../libsvn_repos/deprecated.c:685 ../svnadmin/svnadmin.c:891
 #, c-format
 msgid "<<< Started new transaction, based on original revision %ld\n"
 msgstr "<<< 开始新的事务，基于原始版本 %ld\n"
 
-#: ../libsvn_repos/deprecated.c:657 ../svnadmin/main.c:795
+#: ../libsvn_repos/deprecated.c:692 ../svnadmin/svnadmin.c:904
 #, c-format
 msgid " removing '\\r' from %s ..."
 msgstr " 正在从 '%s' 删除 '\\r' ..."
 
-#: ../libsvn_repos/dump.c:263
+#: ../libsvn_repos/dump.c:267
 #, c-format
 msgid "E%06d: While validating fspath '%s': %s"
 msgstr "E%06d: 当验证文件系统路径“%s”时出错：%s"
 
-#: ../libsvn_repos/dump.c:387
+#: ../libsvn_repos/dump.c:389
 #, c-format
 msgid ""
 "Referencing data in revision %ld, which is older than the oldest dumped "
 "revision (r%ld).  Loading this dump into an empty repository will fail."
 msgstr "版本 %ld 引用的数据比最旧的转存版本 (r%ld) 还旧。加载这个转存到空的版本库会失败。"
 
-#: ../libsvn_repos/dump.c:492
+#: ../libsvn_repos/dump.c:494
 #, c-format
 msgid ""
 "Mergeinfo referencing revision(s) prior to the oldest dumped revision "
 "(r%ld). Loading this dump may result in invalid mergeinfo."
 msgstr "合并信息引用的版本比最旧的转存版本 (r%ld) 还旧。加载这个转存可能导致非法的合并信息。"
 
-#: ../libsvn_repos/dump.c:1017 ../libsvn_repos/dump.c:1280
+#: ../libsvn_repos/dump.c:1124 ../libsvn_repos/dump.c:1416
 #, c-format
 msgid "Start revision %ld is greater than end revision %ld"
 msgstr "起始版本 %ld 大于结束版本 %ld"
 
-#: ../libsvn_repos/dump.c:1022 ../libsvn_repos/dump.c:1285
+#: ../libsvn_repos/dump.c:1129 ../libsvn_repos/dump.c:1421
 #, c-format
 msgid "End revision %ld is invalid (youngest revision is %ld)"
 msgstr "结束版本 %ld 无效 (最新版本是 %ld)"
 
-#: ../libsvn_repos/dump.c:1162
+#: ../libsvn_repos/dump.c:1267
 msgid ""
 "The range of revisions dumped contained references to copy sources outside "
 "that range."
 msgstr "导出的版本范围包含的引用超出导出范围。"
 
-#: ../libsvn_repos/dump.c:1176
+#: ../libsvn_repos/dump.c:1281
 msgid ""
 "The range of revisions dumped contained mergeinfo which reference revisions "
 "outside that range."
 msgstr "导出的版本范围包含的合并信息，其引用的版本超出导出范围。"
 
-#: ../libsvn_repos/dump.c:1233
+#: ../libsvn_repos/dump.c:1340
 #, c-format
 msgid "Unexpected node kind %d for '%s'"
 msgstr "意外发现节点种类 %d 于“%s”"
 
-#: ../libsvn_repos/fs-wrap.c:68 ../libsvn_repos/load-fs-vtable.c:887
-msgid "Commit succeeded, but post-commit hook failed"
-msgstr "提交成功，但是后置提交钩子(post-commit)失败"
-
-#: ../libsvn_repos/fs-wrap.c:171
+#: ../libsvn_repos/fs-wrap.c:183
 #, c-format
 msgid ""
 "Storage of non-regular property '%s' is disallowed through the repository "
 "interface, and could indicate a bug in your client"
 msgstr "不允许通过版本库接口存储非正规属性“%s”，它说明您的客户端有漏洞"
 
-#: ../libsvn_repos/fs-wrap.c:186
+#: ../libsvn_repos/fs-wrap.c:198
 #, c-format
 msgid "Cannot accept '%s' property because it is not encoded in UTF-8"
 msgstr "不能接受属性 “%s”，因为它的编码不是 UTF-8"
 
-#: ../libsvn_repos/fs-wrap.c:196
+#: ../libsvn_repos/fs-wrap.c:208
 #, c-format
 msgid "Cannot accept non-LF line endings in '%s' property"
 msgstr "不能接受属性 “%s” 的非 LF 行结束符"
 
-#: ../libsvn_repos/fs-wrap.c:237
+#: ../libsvn_repos/fs-wrap.c:249
 #, c-format
 msgid ""
 "Commit rejected because mergeinfo on '%s' contains unexpected string "
 "terminator"
 msgstr "由于 '%s' 上的合并信息包含意外的字符串终结符，提交被拒绝"
 
-#: ../libsvn_repos/fs-wrap.c:244
+#: ../libsvn_repos/fs-wrap.c:256
 #, c-format
 msgid "Commit rejected because mergeinfo on '%s' is syntactically invalid"
 msgstr "由于 '%s' 上的合并信息非法，提交被拒绝"
 
-#: ../libsvn_repos/fs-wrap.c:366
+#: ../libsvn_repos/fs-wrap.c:386
 #, c-format
 msgid "Write denied:  not authorized to read all of revision %ld"
 msgstr "拒绝写入: 未授权读取版本 %ld 的所有数据。"
 
-#: ../libsvn_repos/fs-wrap.c:543
+#: ../libsvn_repos/fs-wrap.c:570
 #, c-format
 msgid "Cannot unlock path '%s', no authenticated username available"
 msgstr "不能解除路径“%s”的锁定，没有可用的已授权用户名"
 
-#: ../libsvn_repos/fs-wrap.c:558
+#: ../libsvn_repos/fs-wrap.c:586
 msgid "Unlock succeeded, but post-unlock hook failed"
 msgstr "解锁成功，但是后置解锁钩子(post-unlock)失败"
 
-#: ../libsvn_repos/hooks.c:89
+#: ../libsvn_repos/hooks.c:92
 #, c-format
 msgid "'%s' hook succeeded, but error output could not be read"
 msgstr "钩子执行“%s”成功，没有可用的错误输出"
 
-#: ../libsvn_repos/hooks.c:104
+#: ../libsvn_repos/hooks.c:107
 msgid ""
 "[Error output could not be translated from the native locale to UTF-8.]"
 msgstr "[错误输出不能从本地区域转变为 UTF-8。]"
 
-#: ../libsvn_repos/hooks.c:109
+#: ../libsvn_repos/hooks.c:112
 msgid "[Error output could not be read.]"
 msgstr "[没有可用的错误输出。]"
 
-#: ../libsvn_repos/hooks.c:118
+#: ../libsvn_repos/hooks.c:121
 #, c-format
 msgid ""
 "'%s' hook failed (did not exit cleanly: apr_exit_why_e was %d, exitcode was "
 "%d).  "
 msgstr "钩子“%s”失败(没有干净的退出: apr_exit_why_e 是 %d，exitcode 是 %d)。  "
 
-#: ../libsvn_repos/hooks.c:127
+#: ../libsvn_repos/hooks.c:130
 msgid "Commit"
 msgstr "提交"
 
-#: ../libsvn_repos/hooks.c:129
+#: ../libsvn_repos/hooks.c:132
 msgid "Revprop change"
 msgstr "版本属性改变"
 
-#: ../libsvn_repos/hooks.c:131
+#: ../libsvn_repos/hooks.c:134
 msgid "Lock"
 msgstr "加锁"
 
-#: ../libsvn_repos/hooks.c:133
+#: ../libsvn_repos/hooks.c:136
 msgid "Unlock"
 msgstr "解锁"
 
-#: ../libsvn_repos/hooks.c:138
+#: ../libsvn_repos/hooks.c:141
 #, c-format
 msgid "%s hook failed (exit code %d)"
 msgstr "钩子 “%s” 失败(退出代码 %d)"
 
-#: ../libsvn_repos/hooks.c:142
+#: ../libsvn_repos/hooks.c:145
 #, c-format
 msgid "%s blocked by %s hook (exit code %d)"
 msgstr "%s 被 %s 钩子阻塞(退出代码 %d)"
 
-#: ../libsvn_repos/hooks.c:149
+#: ../libsvn_repos/hooks.c:152
 msgid " with output:\n"
 msgstr " 输出：\n"
 
-#: ../libsvn_repos/hooks.c:155
+#: ../libsvn_repos/hooks.c:158
 msgid " with no output."
 msgstr " 没有输出。"
 
-#: ../libsvn_repos/hooks.c:196
+#: ../libsvn_repos/hooks.c:233
 #, c-format
 msgid "Can't create null stdout for hook '%s'"
 msgstr "无法为钩子“%s”创建空标准输出"
 
-#: ../libsvn_repos/hooks.c:207
+#: ../libsvn_repos/hooks.c:260
 #, c-format
 msgid "Failed to start '%s' hook"
 msgstr "启动钩子“%s”失败"
 
-#: ../libsvn_repos/hooks.c:220 ../libsvn_repos/hooks.c:229
-#, c-format
-msgid "Error closing read end of stderr pipe"
-msgstr "关闭读标准错误管道出错"
-
-#: ../libsvn_repos/hooks.c:237
+#: ../libsvn_repos/hooks.c:282
 #, c-format
 msgid "Error closing null file"
 msgstr "关闭空文件出错"
 
-#: ../libsvn_repos/hooks.c:321
+#: ../libsvn_repos/hooks.c:446
 #, c-format
 msgid "Failed to run '%s' hook; broken symlink"
 msgstr "运行钩子“%s”失败；符号连接损坏"
 
-#: ../libsvn_repos/hooks.c:531
+#: ../libsvn_repos/hooks.c:664
 msgid ""
 "Repository has not been enabled to accept revision propchanges;\n"
 "ask the administrator to create a pre-revprop-change hook"
 msgstr "此版本库不允许修改版本属性；请管理员创建 pre-revprop-change 钩子"
 
-#: ../libsvn_repos/load-fs-vtable.c:539 ../svnrdump/load_editor.c:643
+#: ../libsvn_repos/load-fs-vtable.c:565 ../svnrdump/load_editor.c:766
 #, c-format
 msgid "Relative source revision %ld is not available in current repository"
 msgstr "当前版本库不存在相对源版本 %ld"
 
-#: ../libsvn_repos/load-fs-vtable.c:553
+#: ../libsvn_repos/load-fs-vtable.c:579
 #, c-format
 msgid ""
 "Copy source checksum mismatch on copy from '%s'@%ld\n"
 "to '%s' in rev based on r%ld"
 msgstr "从 “%s@%ld” 复制到 “%s”，基于版本 r%ld 的源校验和不匹配"
 
-#: ../libsvn_repos/load-fs-vtable.c:605
+#: ../libsvn_repos/load-fs-vtable.c:638
 msgid "Malformed dumpstream: Revision 0 must not contain node records"
 msgstr "非法的转存流: 版本 0 不能包含节点记录"
 
-#: ../libsvn_repos/load-fs-vtable.c:614
+#: ../libsvn_repos/load-fs-vtable.c:654
 #, c-format
 msgid "Unrecognized node-action on node '%s'"
 msgstr "节点“%s”的动作不能识别"
 
-#: ../libsvn_repos/load.c:53
+#: ../libsvn_repos/load.c:54
 msgid "Premature end of content data in dumpstream"
 msgstr "转存流中内容数据过早结束"
 
-#: ../libsvn_repos/load.c:60
+#: ../libsvn_repos/load.c:61
 msgid "Dumpstream data appears to be malformed"
 msgstr "转存流中出现非法数据"
 
-#: ../libsvn_repos/load.c:109
+#: ../libsvn_repos/load.c:110
 #, c-format
 msgid "Dump stream contains a malformed header (with no ':') at '%.20s'"
 msgstr "转存流在“%.20s”包含错误头部(没有“:”)"
 
-#: ../libsvn_repos/load.c:122
+#: ../libsvn_repos/load.c:123
 #, c-format
 msgid "Dump stream contains a malformed header (with no value) at '%.20s'"
 msgstr "转存流在“%.20s”包含错误头部(没有值)"
 
-#: ../libsvn_repos/load.c:211
+#: ../libsvn_repos/load.c:212
 msgid "Incomplete or unterminated property block"
 msgstr "不完整或未结束的属性块"
 
-#: ../libsvn_repos/load.c:359
+#: ../libsvn_repos/load.c:360
 msgid "Unexpected EOF writing contents"
 msgstr "写内容时意外结束"
 
-#: ../libsvn_repos/load.c:388
+#: ../libsvn_repos/load.c:390
 #, c-format
 msgid "Malformed dumpfile header '%s'"
 msgstr "非法的转存文件头 '%s'"
 
-#: ../libsvn_repos/load.c:395 ../libsvn_repos/load.c:440
+#: ../libsvn_repos/load.c:397
 #, c-format
 msgid "Unsupported dumpfile version: %d"
 msgstr "不支持的转存文件版本: %d"
 
-#: ../libsvn_repos/load.c:543
+#: ../libsvn_repos/load.c:538
 msgid "Unrecognized record type in stream"
 msgstr "流中有无法识别的记录类型"
 
-#: ../libsvn_repos/load.c:656
+#: ../libsvn_repos/load.c:645
 msgid "Sum of subblock sizes larger than total block content length"
 msgstr "子块大小之和大于块内容长度"
 
@@ -5151,253 +5419,250 @@
 msgid "'%s' not found in filesystem"
 msgstr "在文件系统中找不到“%s”"
 
-#: ../libsvn_repos/replay.c:552
+#: ../libsvn_repos/replay.c:546 ../libsvn_repos/replay.c:1267
 #, c-format
 msgid "Filesystem path '%s' is neither a file nor a directory"
 msgstr "文件系统中路径“%s”既不是文件也不是目录"
 
-#: ../libsvn_repos/reporter.c:196
+#: ../libsvn_repos/reporter.c:205
 #, c-format
 msgid "Invalid length (%%%s) when about to read a string"
 msgstr "长度 (%%%s) 对于字符串非法"
 
-#: ../libsvn_repos/reporter.c:257
+#: ../libsvn_repos/reporter.c:270
 #, c-format
 msgid "Invalid depth (%c) for path '%s'"
 msgstr "非法深度(%c)于路径 “%s”"
 
-#: ../libsvn_repos/reporter.c:850
+#: ../libsvn_repos/reporter.c:951
 #, c-format
 msgid "Working copy path '%s' does not exist in repository"
 msgstr "工作副本路径“%s”不在版本库中"
 
-#: ../libsvn_repos/reporter.c:1232
+#: ../libsvn_repos/reporter.c:1355
 msgid "Not authorized to open root of edit operation"
 msgstr "无权打开根进行编辑操作"
 
-#: ../libsvn_repos/reporter.c:1249
+#: ../libsvn_repos/reporter.c:1372
 #, c-format
 msgid "Target path '%s' does not exist"
 msgstr "目标路径 “%s” 不存在"
 
-#: ../libsvn_repos/reporter.c:1257
+#: ../libsvn_repos/reporter.c:1380
 msgid "Cannot replace a directory from within"
 msgstr "不能在子目录中替换目录"
 
-#: ../libsvn_repos/reporter.c:1300
+#: ../libsvn_repos/reporter.c:1420
 msgid "Invalid report for top level of working copy"
 msgstr "最上层工作副本报告无效"
 
-#: ../libsvn_repos/reporter.c:1315
+#: ../libsvn_repos/reporter.c:1435
 msgid "Two top-level reports with no target"
 msgstr "两个最上层报告没有目标"
 
-#: ../libsvn_repos/reporter.c:1376
+#: ../libsvn_repos/reporter.c:1497
 #, c-format
 msgid "Unsupported report depth '%s'"
 msgstr "不支持报告深度“%s”"
 
-#: ../libsvn_repos/reporter.c:1404
+#: ../libsvn_repos/reporter.c:1527
 msgid "Depth 'exclude' not supported for link"
 msgstr "深度 “exclude” 不支持链接"
 
-#: ../libsvn_repos/reporter.c:1463
+#: ../libsvn_repos/reporter.c:1584
 msgid "Request depth 'exclude' not supported"
 msgstr "不支持请求的深度 “exclude”"
 
-#: ../libsvn_repos/repos.c:187
+#: ../libsvn_repos/repos.c:188
 #, c-format
 msgid "'%s' exists and is non-empty"
 msgstr "“%s”已存在并且非空"
 
-#: ../libsvn_repos/repos.c:233
+#: ../libsvn_repos/repos.c:234
 msgid "Creating db logs lock file"
 msgstr "正在创建数据库日值锁文件"
 
-#: ../libsvn_repos/repos.c:251
+#: ../libsvn_repos/repos.c:252
 msgid "Creating db lock file"
 msgstr "正在创建数据库锁文件"
 
-#: ../libsvn_repos/repos.c:261
+#: ../libsvn_repos/repos.c:262
 msgid "Creating lock dir"
 msgstr "正在创建锁文件目录"
 
-#: ../libsvn_repos/repos.c:290
+#: ../libsvn_repos/repos.c:291
 msgid "Creating hook directory"
 msgstr "正在创建钩子目录"
 
-#: ../libsvn_repos/repos.c:369
+#: ../libsvn_repos/repos.c:376
 msgid "Creating start-commit hook"
 msgstr "正在创建 start-commit 钩子"
 
-#: ../libsvn_repos/repos.c:462
+#: ../libsvn_repos/repos.c:471
 msgid "Creating pre-commit hook"
 msgstr "正在创建 pre-commit 钩子"
 
-#: ../libsvn_repos/repos.c:538
+#: ../libsvn_repos/repos.c:549
 msgid "Creating pre-revprop-change hook"
 msgstr "正在创建 pre-revprop-change 钩子"
 
-#: ../libsvn_repos/repos.c:770
+#: ../libsvn_repos/repos.c:789
 msgid "Creating post-commit hook"
 msgstr "正在创建 post-commit 钩子"
 
-#: ../libsvn_repos/repos.c:958
+#: ../libsvn_repos/repos.c:983
 msgid "Creating post-revprop-change hook"
 msgstr "正在创建 post-revprop-change 钩子"
 
-#: ../libsvn_repos/repos.c:968
+#: ../libsvn_repos/repos.c:995
 msgid "Creating conf directory"
 msgstr "正在创建 conf 目录"
 
-#: ../libsvn_repos/repos.c:1037
+#: ../libsvn_repos/repos.c:1079
 msgid "Creating svnserve.conf file"
 msgstr "正在创建 svnserve.conf 文件"
 
-#: ../libsvn_repos/repos.c:1055
+#: ../libsvn_repos/repos.c:1097
 msgid "Creating passwd file"
 msgstr "正在创建 passwd 文件"
 
-#: ../libsvn_repos/repos.c:1097
+#: ../libsvn_repos/repos.c:1139
 msgid "Creating authz file"
 msgstr "正在创建 authz 文件"
 
-#: ../libsvn_repos/repos.c:1132
+#: ../libsvn_repos/repos.c:1169
+msgid "Creating hooks-env file"
+msgstr "正在创建 hooks-env 文件"
+
+#: ../libsvn_repos/repos.c:1225
 msgid "Could not create top-level directory"
 msgstr "无法创建最上层目录"
 
-#: ../libsvn_repos/repos.c:1144
+#: ../libsvn_repos/repos.c:1235
 msgid "Creating DAV sandbox dir"
 msgstr "正在创建 DAV 沙箱目录"
 
-#: ../libsvn_repos/repos.c:1213
+#: ../libsvn_repos/repos.c:1304
 msgid "Error opening db lockfile"
 msgstr "打开数据库锁文件出错"
 
-#: ../libsvn_repos/repos.c:1250
+#: ../libsvn_repos/repos.c:1341
 #, c-format
 msgid "'%s' is an existing repository"
 msgstr "版本库的“%s”已经存在"
 
-#: ../libsvn_repos/repos.c:1254
+#: ../libsvn_repos/repos.c:1345
 #, c-format
 msgid "'%s' is a subdirectory of an existing repository rooted at '%s'"
 msgstr "“%s” 是当前根为 “%s” 的版本库的子目录"
 
-#: ../libsvn_repos/repos.c:1262
+#: ../libsvn_repos/repos.c:1353
 msgid "Repository creation failed"
 msgstr "创建版本库失败"
 
-#: ../libsvn_repos/repos.c:1347
+#: ../libsvn_repos/repos.c:1438
 #, c-format
 msgid "Expected repository format '%d' or '%d'; found format '%d'"
 msgstr "期望版本库格式是“%d”或“%d”；发现格式是“%d”"
 
-#: ../libsvn_repos/repos.c:1577
+#: ../libsvn_repos/repos.c:1682
 #, c-format
 msgid "unknown capability '%s'"
 msgstr "未知特性“%s”"
 
-#: ../libsvn_repos/rev_hunt.c:70
+#: ../libsvn_repos/rev_hunt.c:71
 #, c-format
 msgid "Failed to find time on revision %ld"
 msgstr "无法找到版本 %ld 的时间"
 
-#: ../libsvn_repos/rev_hunt.c:204 ../libsvn_repos/rev_hunt.c:319
+#: ../libsvn_repos/rev_hunt.c:210 ../libsvn_repos/rev_hunt.c:325
 #, c-format
 msgid "Invalid start revision %ld"
 msgstr "无效起始版本 %ld"
 
-#: ../libsvn_repos/rev_hunt.c:512
+#: ../libsvn_repos/rev_hunt.c:518
 msgid "Unreadable path encountered; access denied"
 msgstr "遇到不可读的路径；拒绝访问。"
 
-#: ../libsvn_repos/rev_hunt.c:1158
+#: ../libsvn_repos/rev_hunt.c:1156 ../libsvn_repos/rev_hunt.c:1495
 #, c-format
 msgid "'%s' is not a file in revision %ld"
 msgstr "“%s” 不是文件，版本 %ld"
 
-#: ../libsvn_subr/auth.c:187
+#: ../libsvn_subr/auth.c:223
 #, c-format
 msgid "No provider registered for '%s' credentials"
 msgstr "没有提供程序为 '%s' 凭据注册"
 
-#: ../libsvn_subr/cache-inprocess.c:196 ../libsvn_subr/cache-membuffer.c:453
+#: ../libsvn_subr/cache-membuffer.c:496
 #, c-format
 msgid "Can't lock cache mutex"
 msgstr "不能锁定缓存互斥体"
 
-#: ../libsvn_subr/cache-inprocess.c:214 ../libsvn_subr/cache-membuffer.c:473
+#: ../libsvn_subr/cache-membuffer.c:527 ../libsvn_subr/cache-membuffer.c:543
+#, c-format
+msgid "Can't write-lock cache mutex"
+msgstr "不能获得缓存互斥体的写入锁"
+
+#: ../libsvn_subr/cache-membuffer.c:562
 #, c-format
 msgid "Can't unlock cache mutex"
 msgstr "不能解锁缓存互斥体"
 
-#: ../libsvn_subr/cache-inprocess.c:613 ../libsvn_subr/cache-membuffer.c:1092
+#: ../libsvn_subr/cache-membuffer.c:1299
 #, c-format
 msgid "Can't create cache mutex"
-msgstr "不能创建缓存互斥体"
-
-#. We are OOM. There is no need to proceed with "half a cache".
-#. 
-#: ../libsvn_subr/cache-membuffer.c:1076
-#, c-format
-msgid "OOM"
-msgstr "内存不足"
-
-#: ../libsvn_subr/cache-membuffer.c:1096
-#, c-format
-msgid "APR doesn't support threads"
-msgstr "APR 不支持 线程"
+msgstr "无法创建缓存互斥体"
 
-#: ../libsvn_subr/cache-membuffer.c:1652
+#: ../libsvn_subr/cache-membuffer.c:2034
 msgid "Can't iterate a membuffer-based cache"
 msgstr "不能迭代基于内存的缓存"
 
-#: ../libsvn_subr/cache-memcache.c:162
+#: ../libsvn_subr/cache-memcache.c:170
 #, c-format
 msgid "Unknown memcached error while reading"
 msgstr "当读取时出现未知的 memcached 错误"
 
-#: ../libsvn_subr/cache-memcache.c:229
+#: ../libsvn_subr/cache-memcache.c:237
 #, c-format
 msgid "Unknown memcached error while writing"
 msgstr "当写入时出现未知的 memcached 错误"
 
-#: ../libsvn_subr/cache-memcache.c:332
+#: ../libsvn_subr/cache-memcache.c:343
 msgid "Can't iterate a memcached cache"
 msgstr "不能迭代 memcached 缓存"
 
-#: ../libsvn_subr/cache-memcache.c:432
+#: ../libsvn_subr/cache-memcache.c:443
 #, c-format
 msgid "Error parsing memcache server '%s'"
 msgstr "解析 memcache 服务器 “%s” 时出错"
 
-#: ../libsvn_subr/cache-memcache.c:440
+#: ../libsvn_subr/cache-memcache.c:451
 #, c-format
 msgid "Scope not allowed in memcache server '%s'"
 msgstr "memcache 服务器 “%s” 中不允许出现范围"
 
-#: ../libsvn_subr/cache-memcache.c:448
+#: ../libsvn_subr/cache-memcache.c:459
 #, c-format
 msgid "Must specify host and port for memcache server '%s'"
 msgstr "memcache 服务器 “%s” 中必须指定主机和端口"
 
-#: ../libsvn_subr/cache-memcache.c:468
+#: ../libsvn_subr/cache-memcache.c:479
 #, c-format
 msgid "Unknown error creating memcache server"
 msgstr "创建 memcache 服务器时出现未知错误"
 
-#: ../libsvn_subr/cache-memcache.c:476
+#: ../libsvn_subr/cache-memcache.c:487
 #, c-format
 msgid "Unknown error adding server to memcache"
 msgstr "增加 memcache 服务器时出现未知错误"
 
-#: ../libsvn_subr/cache-memcache.c:546
+#: ../libsvn_subr/cache-memcache.c:560
 #, c-format
 msgid "Unknown error creating apr_memcache_t"
 msgstr "创建 memcache apr_memcache_t 时出现未知错误"
 
-#: ../libsvn_subr/checksum.c:419
+#: ../libsvn_subr/checksum.c:470
 #, c-format
 msgid ""
 "%s:\n"
@@ -5408,57 +5673,185 @@
 "      期望:  %s\n"
 "      实际:  %s\n"
 
-#: ../libsvn_subr/cmdline.c:619
+#: ../libsvn_subr/cmdline.c:655
 #, c-format
 msgid "Error initializing command line arguments"
 msgstr "初始化命令行参数出错"
 
-#: ../libsvn_subr/cmdline.c:701
+#: ../libsvn_subr/cmdline.c:744
 msgid "Invalid syntax of argument of --config-option"
 msgstr "参数 --config-option 的语法无效"
 
-#: ../libsvn_subr/cmdline.c:728
+#: ../libsvn_subr/cmdline.c:771
 #, c-format
 msgid "Unrecognized file in argument of %s"
 msgstr "不能识别参数 %s 指定的文件"
 
-#: ../libsvn_subr/config.c:665
+#: ../libsvn_subr/cmdline.c:1017
+msgid ""
+"The EDITOR, SVN_EDITOR or VISUAL environment variable or 'editor-cmd' run-"
+"time configuration option is empty or consists solely of whitespace. "
+"Expected a shell command."
+msgstr ""
+"环境变量 EDITOR，SVN_EDITOR，或 VISUAL；或者运行时配置选项 “editor-cmd” "
+"为空或取值包含了不加引号的空格。期望外壳命令。"
+
+#: ../libsvn_subr/cmdline.c:1024
+msgid ""
+"None of the environment variables SVN_EDITOR, VISUAL or EDITOR are set, and "
+"no 'editor-cmd' run-time configuration option was found"
+msgstr "没有设置 SVN_EDITOR，VISUAL 或 EDITOR 环境变量，运行时的配置参数中也没有 “editor-cmd” 选项"
+
+#: ../libsvn_subr/cmdline.c:1049 ../libsvn_subr/cmdline.c:1133
+#, c-format
+msgid "Can't get working directory"
+msgstr "无法取得工作目录"
+
+#: ../libsvn_subr/cmdline.c:1060 ../libsvn_subr/cmdline.c:1144
+#: ../libsvn_subr/cmdline.c:1169
+#, c-format
+msgid "Can't change working directory to '%s'"
+msgstr "无法改变工作目录到“%s”"
+
+#: ../libsvn_subr/cmdline.c:1068 ../libsvn_subr/cmdline.c:1316
+#, c-format
+msgid "Can't restore working directory"
+msgstr "无法还原工作目录"
+
+#: ../libsvn_subr/cmdline.c:1075 ../libsvn_subr/cmdline.c:1251
+#, c-format
+msgid "system('%s') returned %d"
+msgstr "system('%s') 返回 %d"
+
+#: ../libsvn_subr/cmdline.c:1196
+#, c-format
+msgid "Can't write to '%s'"
+msgstr "无法写入“%s”"
+
+#: ../libsvn_subr/cmdline.c:1211 ../libsvn_subr/cmdline.c:1226
+#: ../libsvn_subr/cmdline.c:1260 ../libsvn_subr/io.c:3604
+#, c-format
+msgid "Can't stat '%s'"
+msgstr "不能取得“%s”的状态"
+
+#: ../libsvn_subr/cmdline.c:1285
+msgid "Error normalizing edited contents to internal format"
+msgstr "将编辑内容规格化为内部格式出错"
+
+#: ../libsvn_subr/config.c:739
 #, c-format
 msgid "Config error: invalid boolean value '%s' for '[%s] %s'"
 msgstr "配置错误: 无效布尔值 “%s”，对于 “[%s] %s”"
 
-#: ../libsvn_subr/config.c:670
+#: ../libsvn_subr/config.c:744
 #, c-format
 msgid "Config error: invalid boolean value '%s' for '%s'"
 msgstr "配置错误: 无效布尔值 “%s”，对于 “%s”"
 
-#: ../libsvn_subr/config.c:951
+#: ../libsvn_subr/config.c:1173
 #, c-format
 msgid "Config error: invalid integer value '%s'"
 msgstr "配置错误: 无效整数值“%s”"
 
-#: ../libsvn_subr/config_auth.c:95
+#: ../libsvn_subr/config_auth.c:99
 msgid "Unable to open auth file for reading"
 msgstr "不能打开认证文件读取数据"
 
-#: ../libsvn_subr/config_auth.c:100
+#: ../libsvn_subr/config_auth.c:104
 #, c-format
 msgid "Error parsing '%s'"
 msgstr "解析“%s”时出错"
 
-#: ../libsvn_subr/config_auth.c:125
+#: ../libsvn_subr/config_auth.c:129
 msgid "Unable to locate auth file"
 msgstr "无法定位认证文件文件"
 
-#: ../libsvn_subr/config_auth.c:136
+#: ../libsvn_subr/config_auth.c:140
 msgid "Unable to open auth file for writing"
 msgstr "无法打开认证文件写入数据"
 
-#: ../libsvn_subr/config_auth.c:140
+#: ../libsvn_subr/config_auth.c:144
 #, c-format
 msgid "Error writing hash to '%s'"
 msgstr "写哈希数据至“%s”时出错"
 
+#: ../libsvn_subr/crypto.c:93
+#, c-format
+msgid "Failed to initialize cryptography subsystem"
+msgstr "初始化加密子系统失败"
+
+#: ../libsvn_subr/crypto.c:108
+#, c-format
+msgid "code (%d), reason (\"%s\"), msg (\"%s\")"
+msgstr "代码 (%d), 原因 (\"%s\"), 消息 (\"%s\")"
+
+#: ../libsvn_subr/crypto.c:134
+#, c-format
+msgid "Fetching error from APR"
+msgstr "从 APR 取出错误"
+
+#: ../libsvn_subr/crypto.c:154
+#, c-format
+msgid "Error obtaining random data"
+msgstr "获得随机数据失败"
+
+#: ../libsvn_subr/crypto.c:224
+msgid "OpenSSL crypto driver error"
+msgstr "OpenSSL 加密的驱动程序错误"
+
+#: ../libsvn_subr/crypto.c:228
+msgid "Bad return value while loading crypto driver"
+msgstr "加载加密的驱动程序时返回不正确的值"
+
+#: ../libsvn_subr/crypto.c:234
+msgid "Error creating OpenSSL crypto context"
+msgstr "创建 OpenSSL 加密上下文失败"
+
+#: ../libsvn_subr/crypto.c:291 ../libsvn_subr/crypto.c:294
+#: ../libsvn_subr/crypto.c:419 ../libsvn_subr/crypto.c:422
+#: ../libsvn_subr/crypto.c:526 ../libsvn_subr/crypto.c:529
+#: ../libsvn_subr/crypto.c:641 ../libsvn_subr/crypto.c:644
+msgid "Error creating derived key"
+msgstr "创建衍生密钥失败"
+
+#: ../libsvn_subr/crypto.c:297 ../libsvn_subr/crypto.c:425
+#: ../libsvn_subr/crypto.c:532 ../libsvn_subr/crypto.c:647
+msgid "Unexpected IV length returned"
+msgstr "返回了意外的 IV 长度"
+
+#: ../libsvn_subr/crypto.c:308 ../libsvn_subr/crypto.c:543
+msgid "Error initializing block encryption"
+msgstr "初始化块加密失败"
+
+#: ../libsvn_subr/crypto.c:347 ../libsvn_subr/crypto.c:444
+#: ../libsvn_subr/crypto.c:565 ../libsvn_subr/crypto.c:666
+msgid "Error fetching result length"
+msgstr "获得结果的长度失败"
+
+#: ../libsvn_subr/crypto.c:360 ../libsvn_subr/crypto.c:578
+msgid "Error during block encryption"
+msgstr "在块加密期间出错"
+
+#: ../libsvn_subr/crypto.c:372 ../libsvn_subr/crypto.c:590
+msgid "Error finalizing block encryption"
+msgstr "在终结块加密时出错"
+
+#: ../libsvn_subr/crypto.c:428 ../libsvn_subr/crypto.c:650
+msgid "Provided IV has incorrect length"
+msgstr "提供的 IV 的长度不正确"
+
+#: ../libsvn_subr/crypto.c:436 ../libsvn_subr/crypto.c:658
+msgid "Error initializing block decryption"
+msgstr "初始化块解密失败"
+
+#: ../libsvn_subr/crypto.c:455 ../libsvn_subr/crypto.c:677
+msgid "Error during block decryption"
+msgstr "在块解密期间出错"
+
+#: ../libsvn_subr/crypto.c:464 ../libsvn_subr/crypto.c:686
+msgid "Error finalizing block decryption"
+msgstr "在终结块解密时出错"
+
 #: ../libsvn_subr/date.c:307
 #, c-format
 msgid "Can't manipulate current date"
@@ -5474,7 +5867,7 @@
 msgid "Can't expand time"
 msgstr "无法明确时间"
 
-#: ../libsvn_subr/deprecated.c:366 ../libsvn_subr/opt.c:301
+#: ../libsvn_subr/deprecated.c:361 ../libsvn_subr/opt.c:302
 msgid ""
 "\n"
 "Valid options:\n"
@@ -5482,7 +5875,7 @@
 "\n"
 "有效选项:\n"
 
-#: ../libsvn_subr/deprecated.c:442 ../libsvn_subr/opt.c:416
+#: ../libsvn_subr/deprecated.c:437 ../libsvn_subr/opt.c:417
 #, c-format
 msgid ""
 "\"%s\": unknown command.\n"
@@ -5491,306 +5884,335 @@
 "“%s”: 未知命令。\n"
 "\n"
 
-#: ../libsvn_subr/deprecated.c:589 ../libsvn_subr/opt.c:1149
-#: ../svnrdump/svnrdump.c:486
+#: ../libsvn_subr/deprecated.c:615 ../libsvn_subr/opt.c:1237
+#: ../svnrdump/svnrdump.c:646
 #, c-format
 msgid "Type '%s help' for usage.\n"
 msgstr "使用“%s help”得到用法。\n"
 
-#: ../libsvn_subr/deprecated.c:962
+#: ../libsvn_subr/deprecated.c:1023
 #, c-format
 msgid "'%s' is neither a file nor a directory name"
 msgstr "“%s”不是文件名也不是目录名"
 
-#: ../libsvn_subr/dirent_uri.c:1630
+#: ../libsvn_subr/dirent_uri.c:1604
 #, c-format
 msgid "Couldn't determine absolute path of '%s'"
 msgstr "不能确定“%s”的绝对路径"
 
-#: ../libsvn_subr/dirent_uri.c:2322
+#: ../libsvn_subr/dirent_uri.c:2313
 #, c-format
 msgid "Local URL '%s' does not contain 'file://' prefix"
 msgstr "本地URL“%s”没有“file://”前缀"
 
-#: ../libsvn_subr/dirent_uri.c:2401
+#: ../libsvn_subr/dirent_uri.c:2392
 #, c-format
 msgid "Local URL '%s' contains only a hostname, no path"
 msgstr "本地URL“%s”只有主机名称，没有路径"
 
-#: ../libsvn_subr/dirent_uri.c:2415
+#: ../libsvn_subr/dirent_uri.c:2406
 #, c-format
 msgid "Local URL '%s' contains unsupported hostname"
 msgstr "本地URL“%s”包含不支持的主机名称"
 
-#: ../libsvn_subr/dso.c:64
-#, c-format
-msgid "Can't create DSO mutex"
-msgstr "无法创建 DSO 互斥体"
-
-#: ../libsvn_subr/dso.c:83
-#, c-format
-msgid "Can't grab DSO mutex"
-msgstr "无法获取 DSO 互斥体"
-
-#: ../libsvn_subr/dso.c:97 ../libsvn_subr/dso.c:123 ../libsvn_subr/dso.c:138
-#, c-format
-msgid "Can't ungrab DSO mutex"
-msgstr "不能释放 DSO 互斥体"
+#: ../libsvn_subr/error.c:263
+msgid "Additional errors:"
+msgstr "额外错误:"
 
-#: ../libsvn_subr/error.c:472
+#: ../libsvn_subr/error.c:524
 msgid "Can't recode error string from APR"
 msgstr "无法重新编码 APR 的错误信息"
 
-#: ../libsvn_subr/error.c:572
+#: ../libsvn_subr/error.c:624
 #, c-format
 msgid "%swarning: W%06d: %s\n"
 msgstr "%s 警告: W%06d: %s\n"
 
-#: ../libsvn_subr/error.c:632
+#: ../libsvn_subr/error.c:706
 #, c-format
 msgid "In file '%s' line %d: assertion failed (%s)"
 msgstr "文件 “%s”，行 %d：断言失败(%s)"
 
-#: ../libsvn_subr/error.c:636
+#: ../libsvn_subr/error.c:710
 #, c-format
 msgid "In file '%s' line %d: internal malfunction"
 msgstr "文件 “%s” 行 %d：内部故障"
 
-#: ../libsvn_subr/hash.c:116
-msgid "Serialized hash missing terminator"
-msgstr "序列化哈希值没有终结符"
+#: ../libsvn_subr/error.c:766
+msgid "stream error"
+msgstr "流写入错误"
+
+#: ../libsvn_subr/error.c:771
+msgid "out of memory"
+msgstr "内存溢出"
+
+#: ../libsvn_subr/error.c:776
+msgid "buffer error"
+msgstr "缓冲区写入错误"
+
+#: ../libsvn_subr/error.c:781
+msgid "version error"
+msgstr "版本错误"
+
+#: ../libsvn_subr/error.c:786
+msgid "corrupt data"
+msgstr "损坏的数据"
+
+#: ../libsvn_subr/error.c:791
+msgid "unknown error"
+msgstr "未知错误"
 
-#: ../libsvn_subr/hash.c:124 ../libsvn_subr/hash.c:136
-#: ../libsvn_subr/hash.c:146 ../libsvn_subr/hash.c:157
-#: ../libsvn_subr/hash.c:165 ../libsvn_subr/hash.c:174
-#: ../libsvn_subr/hash.c:186 ../libsvn_subr/hash.c:194
-msgid "Serialized hash malformed"
-msgstr "畸形的序列化哈希值"
+#: ../libsvn_subr/gpg_agent.c:358 ../libsvn_subr/prompt.c:631
+#, c-format
+msgid "Password for '%s': "
+msgstr "“%s”的密码: "
 
-#: ../libsvn_subr/io.c:200
+#: ../libsvn_subr/gpg_agent.c:359
 #, c-format
-msgid "Error converting entry in directory '%s' to UTF-8"
-msgstr "目录 “%s” 中的条目从本地编码转换到 UTF8 失败"
+msgid "Enter your Subversion password for %s"
+msgstr "请为 %s 输入 Subversion 密码"
+
+#: ../libsvn_subr/hash.c:120
+msgid "Serialized hash missing terminator"
+msgstr "序列化哈希值没有终结符"
 
-#: ../libsvn_subr/io.c:260
+#: ../libsvn_subr/hash.c:129 ../libsvn_subr/hash.c:142
+#: ../libsvn_subr/hash.c:153 ../libsvn_subr/hash.c:165
+#: ../libsvn_subr/hash.c:173 ../libsvn_subr/hash.c:183
+#: ../libsvn_subr/hash.c:196 ../libsvn_subr/hash.c:204
+msgid "Serialized hash malformed"
+msgstr "畸形的序列化哈希值"
+
+#: ../libsvn_subr/hash.c:244
+msgid "Cannot serialize negative length"
+msgstr "不能序列化负数长度"
+
+#: ../libsvn_subr/io.c:309
 #, c-format
 msgid "Can't check path '%s'"
 msgstr "无法检查路径 “%s”"
 
-#: ../libsvn_subr/io.c:488 ../libsvn_subr/io.c:4109
+#: ../libsvn_subr/io.c:537 ../libsvn_subr/io.c:4546
 #, c-format
 msgid "Can't open '%s'"
 msgstr "不能打开 “%s”"
 
-#: ../libsvn_subr/io.c:514 ../libsvn_subr/io.c:600
+#: ../libsvn_subr/io.c:563 ../libsvn_subr/io.c:649
 #, c-format
 msgid "Unable to make name for '%s'"
 msgstr "不能为 “%s” 产生名字"
 
-#: ../libsvn_subr/io.c:587
+#: ../libsvn_subr/io.c:636
 #, c-format
 msgid "Can't create symbolic link '%s'"
 msgstr "无法创建符号连接 “%s”"
 
-#: ../libsvn_subr/io.c:604 ../libsvn_subr/io.c:637 ../libsvn_subr/io.c:665
+#: ../libsvn_subr/io.c:653 ../libsvn_subr/io.c:686 ../libsvn_subr/io.c:714
 msgid "Symbolic links are not supported on this platform"
 msgstr "此平台不支持符号链接"
 
-#: ../libsvn_subr/io.c:627
+#: ../libsvn_subr/io.c:676
 #, c-format
 msgid "Can't read contents of link"
 msgstr "不能读取链接的内容"
 
-#: ../libsvn_subr/io.c:685
+#: ../libsvn_subr/io.c:734
 #, c-format
 msgid "Can't find a temporary directory"
 msgstr "无法找到临时目录"
 
-#: ../libsvn_subr/io.c:803
+#: ../libsvn_subr/io.c:852
 #, c-format
 msgid "Can't copy '%s' to '%s'"
 msgstr "不能复制 “%s” 到 “%s”"
 
-#: ../libsvn_subr/io.c:846 ../libsvn_subr/io.c:868 ../libsvn_subr/io.c:914
+#: ../libsvn_subr/io.c:895 ../libsvn_subr/io.c:917 ../libsvn_subr/io.c:963
 #, c-format
 msgid "Can't set permissions on '%s'"
 msgstr "不能在 “%s” 设置权限"
 
-#: ../libsvn_subr/io.c:864 ../libsvn_subr/io.c:4147
+#: ../libsvn_subr/io.c:913 ../libsvn_subr/io.c:1972 ../libsvn_subr/io.c:2031
+#: ../libsvn_subr/io.c:4584
 #, c-format
 msgid "Can't get file name"
 msgstr "无法获取文件名"
 
-#: ../libsvn_subr/io.c:938
+#: ../libsvn_subr/io.c:987
 #, c-format
 msgid "Can't append '%s' to '%s'"
 msgstr "不能附加 “%s” 到 “%s”"
 
-#: ../libsvn_subr/io.c:972
-#, c-format
-msgid "Source '%s' is not a directory"
-msgstr "源 “%s” 不是目录"
-
-#: ../libsvn_subr/io.c:978
-#, c-format
-msgid "Destination '%s' is not a directory"
-msgstr "目的 “%s” 不是目录"
-
-#: ../libsvn_subr/io.c:984
+#: ../libsvn_subr/io.c:1033
 #, c-format
 msgid "Destination '%s' already exists"
 msgstr "目的 “%s” 已存在"
 
-#: ../libsvn_subr/io.c:1055 ../libsvn_subr/io.c:2335
-#, c-format
-msgid "Can't read directory '%s'"
-msgstr "无法读取目录 “%s”"
-
-#: ../libsvn_subr/io.c:1060 ../libsvn_subr/io.c:2340 ../libsvn_subr/io.c:3734
-#, c-format
-msgid "Error closing directory '%s'"
-msgstr "关闭目录 “%s” 出错"
-
-#: ../libsvn_subr/io.c:1088
+#: ../libsvn_subr/io.c:1137
 #, c-format
 msgid "Can't make directory '%s'"
 msgstr "无法创建目录 “%s”"
 
-#: ../libsvn_subr/io.c:1157
+#: ../libsvn_subr/io.c:1206
 #, c-format
 msgid "Can't set access time of '%s'"
 msgstr "不能设置 “%s” 的存取时间"
 
-#: ../libsvn_subr/io.c:1433 ../libsvn_subr/io.c:1540
+#: ../libsvn_subr/io.c:1523 ../libsvn_subr/io.c:1625
 #, c-format
 msgid "Can't change perms of file '%s'"
 msgstr "不能改变文件 “%s” 的权限"
 
-#: ../libsvn_subr/io.c:1706
+#: ../libsvn_subr/io.c:1791
 #, c-format
 msgid "Can't set file '%s' read-only"
 msgstr "无法设置文件 “%s” 只读"
 
-#: ../libsvn_subr/io.c:1738
+#: ../libsvn_subr/io.c:1823
 #, c-format
 msgid "Can't set file '%s' read-write"
 msgstr "无法设置文件 “%s” 可读写"
 
-#: ../libsvn_subr/io.c:1777 ../libsvn_subr/io.c:1811
+#: ../libsvn_subr/io.c:1862 ../libsvn_subr/io.c:1896
 #, c-format
 msgid "Error getting UID of process"
 msgstr "获取进程用户 ID(UID) 时出错"
 
-#: ../libsvn_subr/io.c:1917
+#: ../libsvn_subr/io.c:1998
 #, c-format
 msgid "Can't get shared lock on file '%s'"
 msgstr "不能获取文件 “%s” 的共享锁"
 
-#: ../libsvn_subr/io.c:1955 ../libsvn_subr/io.c:3270
+#: ../libsvn_subr/io.c:2036
+#, c-format
+msgid "Can't unlock file '%s'"
+msgstr "无法解锁文件“%s”"
+
+#: ../libsvn_subr/io.c:2091 ../libsvn_subr/io.c:3499
 #, c-format
 msgid "Can't flush file '%s'"
 msgstr "不能刷新文件 “%s”"
 
-#: ../libsvn_subr/io.c:1956 ../libsvn_subr/io.c:3271
+#: ../libsvn_subr/io.c:2092 ../libsvn_subr/io.c:3500
 #, c-format
 msgid "Can't flush stream"
 msgstr "不能刷新流"
 
-#: ../libsvn_subr/io.c:1968 ../libsvn_subr/io.c:1985
+#: ../libsvn_subr/io.c:2104 ../libsvn_subr/io.c:2121
 #, c-format
 msgid "Can't flush file to disk"
 msgstr "不能刷新文件到磁盘"
 
-#: ../libsvn_subr/io.c:2077 ../libsvn_subr/prompt.c:102 ../svnserve/main.c:735
+#: ../libsvn_subr/io.c:2213 ../libsvn_subr/prompt.c:197
+#: ../svnserve/svnserve.c:822
 #, c-format
 msgid "Can't open stdin"
 msgstr "无法打开标准输入"
 
-#: ../libsvn_subr/io.c:2097
+#: ../libsvn_subr/io.c:2233
 msgid "Reading from stdin is disallowed"
 msgstr "不接受从标准输入设备读取"
 
-#: ../libsvn_subr/io.c:2155
+#: ../libsvn_subr/io.c:2300
 #, c-format
 msgid "Can't remove file '%s'"
 msgstr "不能移动文件“%s”"
 
-#: ../libsvn_subr/io.c:2242
+#: ../libsvn_subr/io.c:2387
 #, c-format
 msgid "Can't remove '%s'"
 msgstr "无法删除“%s”"
 
-#: ../libsvn_subr/io.c:2440
+#: ../libsvn_subr/io.c:2550
+#, c-format
+msgid "Path '%s' not found, case obstructed by '%s'"
+msgstr "没有发现路径“%s”，大小写障碍“%s”"
+
+#: ../libsvn_subr/io.c:2589
+#, c-format
+msgid "Path '%s' not found"
+msgstr "路径“%s”找不到"
+
+#: ../libsvn_subr/io.c:2663
 #, c-format
 msgid "Can't create process '%s' attributes"
 msgstr "无法创建进程“%s”的属性"
 
-#: ../libsvn_subr/io.c:2447
+#: ../libsvn_subr/io.c:2670
 #, c-format
 msgid "Can't set process '%s' cmdtype"
 msgstr "无法设置进程“%s”的命令类型"
 
-#: ../libsvn_subr/io.c:2459
+#: ../libsvn_subr/io.c:2682
 #, c-format
 msgid "Can't set process '%s' directory"
 msgstr "无法设定进程“%s”的目录"
 
-#: ../libsvn_subr/io.c:2473
+#: ../libsvn_subr/io.c:2696
 #, c-format
 msgid "Can't set process '%s' child input"
 msgstr "无法设置“%s”的子进程输入文件"
 
-#: ../libsvn_subr/io.c:2481
+#: ../libsvn_subr/io.c:2704
 #, c-format
 msgid "Can't set process '%s' child outfile"
 msgstr "无法设置“%s”的子进程输出文件"
 
-#: ../libsvn_subr/io.c:2489
+#: ../libsvn_subr/io.c:2712
 #, c-format
 msgid "Can't set process '%s' child errfile"
 msgstr "无法设置“%s”的子进程错误输出文件"
 
-#: ../libsvn_subr/io.c:2503
+#: ../libsvn_subr/io.c:2726
 #, c-format
 msgid "Can't set process '%s' stdio pipes"
 msgstr "无法设置进程“%s”的标准 IO 管道"
 
-#: ../libsvn_subr/io.c:2511
+#: ../libsvn_subr/io.c:2734
 #, c-format
 msgid "Can't set process '%s' child errfile for error handler"
 msgstr "无法为错误处理函数设置“%s”的子进程错误输出文件"
 
-#: ../libsvn_subr/io.c:2518
+#: ../libsvn_subr/io.c:2741
 #, c-format
 msgid "Can't set process '%s' error handler"
 msgstr "无法设置进程“%s”的错误处理函数"
 
-#: ../libsvn_subr/io.c:2541
+#: ../libsvn_subr/io.c:2764
 #, c-format
 msgid "Can't start process '%s'"
 msgstr "不能取得进程“%s”状态"
 
-#: ../libsvn_subr/io.c:2565
+#: ../libsvn_subr/io.c:2788
 #, c-format
 msgid "Error waiting for process '%s'"
 msgstr "等待进程“%s”出错"
 
-#: ../libsvn_subr/io.c:2573
+#: ../libsvn_subr/io.c:2797
+#, c-format
+msgid "Process '%s' failed (signal %d, core dumped)"
+msgstr "进程“%s”失败(信号 %d，已经核心转储)"
+
+#: ../libsvn_subr/io.c:2802
 #, c-format
-msgid "Process '%s' failed (exitwhy %d)"
-msgstr "进程“%s”失败(返回 %d)"
+msgid "Process '%s' failed (signal %d)"
+msgstr "进程“%s”失败(信号 %d)"
 
-#: ../libsvn_subr/io.c:2580
+#: ../libsvn_subr/io.c:2808
+#, c-format
+msgid "Process '%s' failed (exitwhy %d, exitcode %d)"
+msgstr "进程“%s”失败(exitwhy %d, exitcode %d)"
+
+#: ../libsvn_subr/io.c:2816
 #, c-format
 msgid "Process '%s' returned error exitcode %d"
 msgstr "进程“%s”返回错误退出码 %d"
 
-#: ../libsvn_subr/io.c:2687
+#: ../libsvn_subr/io.c:2923
 #, c-format
 msgid "'%s' returned %d"
 msgstr "“%s” 返回 %d"
 
-#: ../libsvn_subr/io.c:2808
+#: ../libsvn_subr/io.c:3043
 #, c-format
 msgid ""
 "Error running '%s':  exitcode was %d, args were:\n"
@@ -5805,256 +6227,272 @@
 "%s\n"
 "%s"
 
-#: ../libsvn_subr/io.c:2949
+#: ../libsvn_subr/io.c:3184
 #, c-format
 msgid "Can't detect MIME type of non-file '%s'"
 msgstr "不能检测非文件的“%s”之MIME类型"
 
-#: ../libsvn_subr/io.c:3044
+#: ../libsvn_subr/io.c:3279
 #, c-format
 msgid "Can't open file '%s'"
 msgstr "不能打开文件“%s”"
 
-#: ../libsvn_subr/io.c:3085
+#: ../libsvn_subr/io.c:3319
 #, c-format
 msgid "Can't close file '%s'"
 msgstr "无法关闭文件“%s”"
 
-#: ../libsvn_subr/io.c:3086
+#: ../libsvn_subr/io.c:3320
 #, c-format
 msgid "Can't close stream"
 msgstr "无法关闭流"
 
-#: ../libsvn_subr/io.c:3096 ../libsvn_subr/io.c:3134 ../libsvn_subr/io.c:3160
+#: ../libsvn_subr/io.c:3329 ../libsvn_subr/io.c:3365 ../libsvn_subr/io.c:3390
 #, c-format
 msgid "Can't read file '%s'"
 msgstr "不能读取文件“%s”"
 
-#: ../libsvn_subr/io.c:3097 ../libsvn_subr/io.c:3135 ../libsvn_subr/io.c:3161
+#: ../libsvn_subr/io.c:3330 ../libsvn_subr/io.c:3366 ../libsvn_subr/io.c:3391
 #, c-format
 msgid "Can't read stream"
 msgstr "无法读取流"
 
-#: ../libsvn_subr/io.c:3107
+#: ../libsvn_subr/io.c:3339
 #, c-format
 msgid "Can't write file '%s'"
 msgstr "无法写入文件“%s”"
 
-#: ../libsvn_subr/io.c:3108
+#: ../libsvn_subr/io.c:3340
 #, c-format
 msgid "Can't write stream"
 msgstr "无法写入流"
 
-#: ../libsvn_subr/io.c:3122
+#: ../libsvn_subr/io.c:3354
 #, c-format
 msgid "Can't get attribute information from file '%s'"
 msgstr "无法从文件“%s”获取属性信息"
 
-#: ../libsvn_subr/io.c:3123
+#: ../libsvn_subr/io.c:3355
 #, c-format
 msgid "Can't get attribute information from stream"
 msgstr "无法从流获取属性信息"
 
-#: ../libsvn_subr/io.c:3172
+#: ../libsvn_subr/io.c:3402
 #, c-format
 msgid "Can't set position pointer in file '%s'"
 msgstr "无法在文件“%s”设置定位指针"
 
-#: ../libsvn_subr/io.c:3173
+#: ../libsvn_subr/io.c:3403
 #, c-format
 msgid "Can't set position pointer in stream"
 msgstr "无法在流中设置定位指针"
 
-#: ../libsvn_subr/io.c:3184 ../libsvn_subr/io.c:3231
+#: ../libsvn_subr/io.c:3414 ../libsvn_subr/io.c:3461
 #, c-format
 msgid "Can't write to file '%s'"
 msgstr "无法写入文件“%s”"
 
-#: ../libsvn_subr/io.c:3185 ../libsvn_subr/io.c:3232
+#: ../libsvn_subr/io.c:3415 ../libsvn_subr/io.c:3462
 #, c-format
 msgid "Can't write to stream"
 msgstr "无法写入流"
 
-#: ../libsvn_subr/io.c:3276
+#: ../libsvn_subr/io.c:3504
 #, c-format
 msgid "Can't truncate file '%s'"
 msgstr "不能截断文件 “%s”"
 
-#: ../libsvn_subr/io.c:3277
+#: ../libsvn_subr/io.c:3505
 #, c-format
 msgid "Can't truncate stream"
 msgstr "无法截断流"
 
-#: ../libsvn_subr/io.c:3317
+#: ../libsvn_subr/io.c:3578
 #, c-format
 msgid "Can't read length line in file '%s'"
 msgstr "不能从文件 “%s” 中读取长行"
 
-#: ../libsvn_subr/io.c:3321
+#: ../libsvn_subr/io.c:3582
 msgid "Can't read length line in stream"
 msgstr "无法从流中读取长行"
 
-#: ../libsvn_subr/io.c:3343 ../svn/util.c:423 ../svn/util.c:438
-#: ../svn/util.c:472
-#, c-format
-msgid "Can't stat '%s'"
-msgstr "不能取得“%s”的状态"
-
-#: ../libsvn_subr/io.c:3378
+#: ../libsvn_subr/io.c:3639
 #, c-format
 msgid "Can't move '%s' to '%s'"
 msgstr "不能移动 “%s” 到 “%s”"
 
-#: ../libsvn_subr/io.c:3459
+#: ../libsvn_subr/io.c:3720
 #, c-format
 msgid "Can't create directory '%s'"
 msgstr "无法创建目录 “%s”"
 
-#: ../libsvn_subr/io.c:3482
+#: ../libsvn_subr/io.c:3743
 #, c-format
 msgid "Can't hide directory '%s'"
 msgstr "无法隐藏目录 “%s”"
 
-#: ../libsvn_subr/io.c:3542 ../libsvn_subr/io.c:3670
+#: ../libsvn_subr/io.c:3803 ../libsvn_subr/io.c:3926
 #, c-format
 msgid "Can't open directory '%s'"
 msgstr "无法打开目录“%s”"
 
-#: ../libsvn_subr/io.c:3582
+#: ../libsvn_subr/io.c:3838
 #, c-format
 msgid "Can't remove directory '%s'"
 msgstr "无法删除目录 “%s”"
 
-#: ../libsvn_subr/io.c:3600
+#: ../libsvn_subr/io.c:3856
 #, c-format
 msgid "Can't read directory"
 msgstr "无法读取目录"
 
-#: ../libsvn_subr/io.c:3620
+#: ../libsvn_subr/io.c:3876
 #, c-format
 msgid "Error closing directory"
 msgstr "关闭目录失败"
 
-#: ../libsvn_subr/io.c:3689
+#: ../libsvn_subr/io.c:3945
 #, c-format
 msgid "Can't read directory entry in '%s'"
 msgstr "无法在 “%s” 读取目录内容"
 
-#: ../libsvn_subr/io.c:3815
+#: ../libsvn_subr/io.c:4071
 #, c-format
 msgid "Can't check directory '%s'"
 msgstr "无法检查目录 “%s”"
 
-#: ../libsvn_subr/io.c:3877
+#: ../libsvn_subr/io.c:4133
 #, c-format
 msgid "Reading '%s'"
 msgstr "正在读取 “%s”"
 
-#: ../libsvn_subr/io.c:3896
+#: ../libsvn_subr/io.c:4152
 #, c-format
 msgid "First line of '%s' contains non-digit"
 msgstr "“%s” 的第一行包含了非数字"
 
-#: ../libsvn_subr/io.c:4030
+#: ../libsvn_subr/io.c:4467
 #, c-format
 msgid "Can't create temporary file from template '%s'"
 msgstr "无法从模版“%s”创建临时文件"
 
-#: ../libsvn_subr/io.c:4119
+#: ../libsvn_subr/io.c:4556
 #, c-format
 msgid "Can't set aside '%s'"
 msgstr "不能撤销“%s”"
 
-#: ../libsvn_subr/io.c:4131
+#: ../libsvn_subr/io.c:4568
 #, c-format
 msgid "Unable to make name in '%s'"
 msgstr "不能按照“%s”生成名字"
 
-#: ../libsvn_subr/kitchensink.c:46
-#, c-format
-msgid "Invalid revision number found parsing '%s'"
-msgstr "解析 “%s” 时发现无效的版本号"
-
-#: ../libsvn_subr/kitchensink.c:58
-#, c-format
-msgid "Negative revision number found parsing '%s'"
-msgstr "解析 “%s” 时发现负的版本号"
-
-#: ../libsvn_subr/mergeinfo.c:98 ../libsvn_subr/mergeinfo.c:621
+#: ../libsvn_subr/mergeinfo.c:100 ../libsvn_subr/mergeinfo.c:677
 msgid "Pathname not terminated by ':'"
 msgstr "路径名称没有以 “:” 结束"
 
-#: ../libsvn_subr/mergeinfo.c:101
+#: ../libsvn_subr/mergeinfo.c:103
 msgid "No pathname preceding ':'"
 msgstr "没有路径名称前缀 “:”"
 
-#: ../libsvn_subr/mergeinfo.c:512
-#, c-format
-msgid "Mergeinfo for '%s' maps to an empty revision range"
-msgstr "“%s” 的合并信息映射到空的版本范围"
-
-#: ../libsvn_subr/mergeinfo.c:526
+#: ../libsvn_subr/mergeinfo.c:521
 #, c-format
 msgid "Invalid character '%c' found in revision list"
 msgstr "在版本列表中发现无效字符 “%c”"
 
-#: ../libsvn_subr/mergeinfo.c:534
+#: ../libsvn_subr/mergeinfo.c:529
 #, c-format
 msgid "Invalid revision number '0' found in range list"
 msgstr "在范围列表中发现无效的版本号　“0”"
 
-#: ../libsvn_subr/mergeinfo.c:545
+#: ../libsvn_subr/mergeinfo.c:540
 #, c-format
 msgid "Unable to parse reversed revision range '%ld-%ld'"
 msgstr "不能解析反向的版本范围 “%ld - %ld”"
 
-#: ../libsvn_subr/mergeinfo.c:550
+#: ../libsvn_subr/mergeinfo.c:545
 #, c-format
 msgid ""
 "Unable to parse revision range '%ld-%ld' with same start and end revisions"
 msgstr "不能解析开始与结束版本相同的版本范围 “%ld-%ld”"
 
-#: ../libsvn_subr/mergeinfo.c:587 ../libsvn_subr/mergeinfo.c:594
+#: ../libsvn_subr/mergeinfo.c:582 ../libsvn_subr/mergeinfo.c:589
 #, c-format
 msgid "Invalid character '%c' found in range list"
 msgstr "在范围列表中发现无效字符 “%c”"
 
-#: ../libsvn_subr/mergeinfo.c:601
+#: ../libsvn_subr/mergeinfo.c:596
 msgid "Range list parsing ended before hitting newline"
 msgstr "在遇到新行之前范围列表分析结束"
 
-#: ../libsvn_subr/mergeinfo.c:629
-#, c-format
-msgid "Could not find end of line in range list line in '%s'"
-msgstr "在“%s”的范围列表行中没有找到行结束符"
-
-#: ../libsvn_subr/mergeinfo.c:660
+#: ../libsvn_subr/mergeinfo.c:637
 #, c-format
 msgid ""
 "Unable to parse overlapping revision ranges '%s' and '%s' with different "
 "inheritance types"
 msgstr "不支持解析重叠且继承类型不同的版本范围 “%s” 和 “%s”"
 
-#: ../libsvn_subr/mergeinfo.c:724
+#: ../libsvn_subr/mergeinfo.c:685
+#, c-format
+msgid "Mergeinfo for '%s' maps to an empty revision range"
+msgstr "“%s” 的合并信息映射到空的版本范围"
+
+#: ../libsvn_subr/mergeinfo.c:689
+#, c-format
+msgid "Could not find end of line in range list line in '%s'"
+msgstr "在“%s”的范围列表行中没有找到行结束符"
+
+#: ../libsvn_subr/mergeinfo.c:753
 #, c-format
 msgid "Could not parse mergeinfo string '%s'"
 msgstr "不能解析合并信息字符串“%s”"
 
-#: ../libsvn_subr/mergeinfo.c:2275
+#: ../libsvn_subr/mergeinfo.c:2301
 msgid "NULL mergeinfo catalog\n"
 msgstr "空值合并信息目录\n"
 
-#: ../libsvn_subr/mergeinfo.c:2280
+#: ../libsvn_subr/mergeinfo.c:2306
 msgid "empty mergeinfo catalog\n"
 msgstr "空合并信息目录\n"
 
-#: ../libsvn_subr/mergeinfo.c:2313
-msgid "NULL mergeinfo\n"
-msgstr "空值合并信息\n"
-
-#: ../libsvn_subr/mergeinfo.c:2318
-msgid "empty mergeinfo\n"
-msgstr "空合并信息\n"
+#: ../libsvn_subr/mutex.c:45
+#, c-format
+msgid "Can't create mutex"
+msgstr "无法创建互斥体"
+
+#: ../libsvn_subr/mutex.c:62
+#, c-format
+msgid "Can't lock mutex"
+msgstr "不能锁定互斥体"
+
+#: ../libsvn_subr/mutex.c:78
+#, c-format
+msgid "Can't unlock mutex"
+msgstr "不能解锁互斥体"
+
+#: ../libsvn_subr/named_atomic.c:335
+msgid "Not a valid atomic"
+msgstr "不是合法的原子数据"
+
+#: ../libsvn_subr/named_atomic.c:474
+#, c-format
+msgid "MMAP failed for file '%s'"
+msgstr "创建内存映射文件“%s”失败"
+
+#: ../libsvn_subr/named_atomic.c:486
+msgid "Number of atomics in namespace is too large."
+msgstr "命名空间中的原子数量太多"
+
+#: ../libsvn_subr/named_atomic.c:537
+msgid "Atomic's name is too long."
+msgstr "原子的名称太长"
+
+#: ../libsvn_subr/named_atomic.c:543
+msgid "Namespace has not been initialized."
+msgstr "命名空间没有初始化"
+
+#: ../libsvn_subr/named_atomic.c:591
+msgid "Out of slots for named atomic."
+msgstr "命名原子的槽位已满"
 
 #: ../libsvn_subr/nls.c:80
 #, c-format
@@ -6070,11 +6508,11 @@
 msgid "Can't convert module path to UTF-8 from UCS-2: '%s'"
 msgstr "不能把模块路径从UCS-2转换为UTF-8: “%s”"
 
-#: ../libsvn_subr/opt.c:188
+#: ../libsvn_subr/opt.c:189
 msgid " ARG"
 msgstr " ARG"
 
-#: ../libsvn_subr/opt.c:323
+#: ../libsvn_subr/opt.c:324
 msgid ""
 "\n"
 "Global options:\n"
@@ -6082,117 +6520,148 @@
 "\n"
 "全局选项:\n"
 
-#: ../libsvn_subr/opt.c:789
+#: ../libsvn_subr/opt.c:816
 #, c-format
 msgid "Syntax error parsing peg revision '%s'; did you mean '%s@'?"
 msgstr "解析铆钉版本 '%s' 时发生语法错误；你是不是想执行 '%s@'?"
 
-#: ../libsvn_subr/opt.c:795
+#: ../libsvn_subr/opt.c:822
 #, c-format
 msgid "Syntax error parsing peg revision '%s'"
 msgstr "解析铆钉版本 '%s' 时发生语法错误"
 
-#: ../libsvn_subr/opt.c:932
+#: ../libsvn_subr/opt.c:959
 msgid "Revision property pair is empty"
 msgstr "版本属性对为空"
 
-#: ../libsvn_subr/opt.c:952 ../svn/propedit-cmd.c:87 ../svn/propget-cmd.c:218
+#: ../libsvn_subr/opt.c:979 ../svn/propedit-cmd.c:87 ../svn/propget-cmd.c:336
 #: ../svn/propset-cmd.c:68
 #, c-format
 msgid "'%s' is not a valid Subversion property name"
 msgstr "“%s”不是有效的 Subversion 属性名称"
 
-#: ../libsvn_subr/opt.c:989
+#: ../libsvn_subr/opt.c:1016
 #, c-format
 msgid "'%s' is just a peg revision. Maybe try '%s@' instead?"
 msgstr "“%s” 是铆钉版本。或许你应该使用 “%s@” ?"
 
-#: ../libsvn_subr/opt.c:1035
+#: ../libsvn_subr/opt.c:1062
 #, c-format
 msgid "URL '%s' contains a '..' element"
 msgstr "URL“%s”包含“..”元素"
 
-#: ../libsvn_subr/opt.c:1068
+#: ../libsvn_subr/opt.c:1095
 #, c-format
 msgid "Error resolving case of '%s'"
 msgstr "解析“%s”出错"
 
-#: ../libsvn_subr/opt.c:1087
+#: ../libsvn_subr/opt.c:1117
 #, c-format
 msgid ""
 "%s, version %s\n"
-"   compiled %s, %s\n"
+"   compiled %s, %s on %s\n"
 "\n"
 msgstr ""
 "%s，版本 %s\n"
-"   编译于 %s，%s\n"
+"   编译于 %s，%s 在 %s\n"
 "\n"
 
-#: ../libsvn_subr/opt.c:1091
+#: ../libsvn_subr/opt.c:1134
 msgid ""
-"Copyright (C) 2013 The Apache Software Foundation.\n"
-"This software consists of contributions made by many people; see the NOTICE\n"
-"file for more information.\n"
-"Subversion is open source software, see http://subversion.apache.org/\n"
+"System information:\n"
 "\n"
 msgstr ""
-"版权所有 (C) 2013 Apache 软件基金会。\n"
-"此软件包含了许多人的贡献，请查看文件 NOTICE 以获得更多信息。\n"
-"Subversion 是开放源代码软件，请参阅 http://subversion.apache.org/ 站点。\n"
+"系统信息:\n"
 "\n"
 
-#: ../libsvn_subr/path.c:1090
+#: ../libsvn_subr/opt.c:1135
+#, c-format
+msgid "* running on %s\n"
+msgstr "* 运行于 %s\n"
+
+#: ../libsvn_subr/opt.c:1139
+#, c-format
+msgid "  - %s\n"
+msgstr "  - %s\n"
+
+#: ../libsvn_subr/opt.c:1149
+msgid "* linked dependencies:\n"
+msgstr "* 链接的依赖库:\n"
+
+#: ../libsvn_subr/opt.c:1174
+msgid "* loaded shared libraries:\n"
+msgstr "* 已加载的共享库:\n"
+
+#: ../libsvn_subr/path.c:1114
 #, c-format
 msgid "Can't determine the native path encoding"
 msgstr "不能确定本地路径编码"
 
-#: ../libsvn_subr/prompt.c:120 ../libsvn_subr/prompt.c:124
+#: ../libsvn_subr/path.c:1303
+#, c-format
+msgid "Improper relative URL '%s'"
+msgstr "不正确的相对 URL“%s”"
+
+#: ../libsvn_subr/prompt.c:147
+msgid "Can't close terminal"
+msgstr "不能关闭终端"
+
+#: ../libsvn_subr/prompt.c:200
+#, c-format
+msgid "Can't open stderr"
+msgstr "不能打开标准错误"
+
+#: ../libsvn_subr/prompt.c:263
+#, c-format
+msgid "Can't write to terminal"
+msgstr "无法写入终端"
+
+#: ../libsvn_subr/prompt.c:385 ../libsvn_subr/prompt.c:472
 #, c-format
-msgid "Can't read stdin"
-msgstr "无法读取标准输入"
+msgid "Can't read from terminal"
+msgstr "无法读取终端"
+
+#: ../libsvn_subr/prompt.c:540
+msgid "End of file while reading from terminal"
+msgstr "从终端读到了文件结束标记"
 
-#: ../libsvn_subr/prompt.c:183
+#: ../libsvn_subr/prompt.c:602
 #, c-format
 msgid "Authentication realm: %s\n"
 msgstr "认证领域: %s\n"
 
-#: ../libsvn_subr/prompt.c:209 ../libsvn_subr/prompt.c:232
+#: ../libsvn_subr/prompt.c:629 ../libsvn_subr/prompt.c:652
 msgid "Username: "
 msgstr "用户名: "
 
-#: ../libsvn_subr/prompt.c:211
-#, c-format
-msgid "Password for '%s': "
-msgstr "“%s”的密码: "
-
-#: ../libsvn_subr/prompt.c:254
+#: ../libsvn_subr/prompt.c:674
 #, c-format
 msgid "Error validating server certificate for '%s':\n"
 msgstr "验证“%s”的服务器证书时出错:\n"
 
-#: ../libsvn_subr/prompt.c:260
+#: ../libsvn_subr/prompt.c:680
 msgid ""
 " - The certificate is not issued by a trusted authority. Use the\n"
 "   fingerprint to validate the certificate manually!\n"
 msgstr " - 此证书并不是由信任的权威机权颁发。请使用此指纹手工验证其有效性！\n"
 
-#: ../libsvn_subr/prompt.c:267
+#: ../libsvn_subr/prompt.c:687
 msgid " - The certificate hostname does not match.\n"
 msgstr " - 证书的主机名称不匹配。\n"
 
-#: ../libsvn_subr/prompt.c:273
+#: ../libsvn_subr/prompt.c:693
 msgid " - The certificate is not yet valid.\n"
 msgstr " - 证书未生效。\n"
 
-#: ../libsvn_subr/prompt.c:279
+#: ../libsvn_subr/prompt.c:699
 msgid " - The certificate has expired.\n"
 msgstr " - 证书已过期。\n"
 
-#: ../libsvn_subr/prompt.c:285
+#: ../libsvn_subr/prompt.c:705
 msgid " - The certificate has an unknown error.\n"
 msgstr " - 证书发生未知错误。\n"
 
-#: ../libsvn_subr/prompt.c:290
+#: ../libsvn_subr/prompt.c:710
 #, c-format
 msgid ""
 "Certificate information:\n"
@@ -6207,48 +6676,48 @@
 " - 发行者: %s\n"
 " - 指纹: %s\n"
 
-#: ../libsvn_subr/prompt.c:305
+#: ../libsvn_subr/prompt.c:725
 msgid "(R)eject, accept (t)emporarily or accept (p)ermanently? "
 msgstr "(R)拒绝，(t)暂时接受，或(p)永远接受？ "
 
-#: ../libsvn_subr/prompt.c:309
+#: ../libsvn_subr/prompt.c:729
 msgid "(R)eject or accept (t)emporarily? "
 msgstr "(R)拒绝 或 (t)暂时接受 ？ "
 
-#: ../libsvn_subr/prompt.c:349
+#: ../libsvn_subr/prompt.c:769
 msgid "Client certificate filename: "
 msgstr "客户证书文件名: "
 
-#: ../libsvn_subr/prompt.c:373
+#: ../libsvn_subr/prompt.c:793
 #, c-format
 msgid "Passphrase for '%s': "
 msgstr "“%s”的密码: "
 
-#: ../libsvn_subr/prompt.c:421
+#: ../libsvn_subr/prompt.c:845
 msgid "yes"
 msgstr "yes"
 
-#: ../libsvn_subr/prompt.c:422
+#: ../libsvn_subr/prompt.c:846
 msgid "y"
 msgstr "y"
 
-#: ../libsvn_subr/prompt.c:427
+#: ../libsvn_subr/prompt.c:851
 msgid "no"
 msgstr "no"
 
-#: ../libsvn_subr/prompt.c:428
+#: ../libsvn_subr/prompt.c:852
 msgid "n"
 msgstr "n"
 
-#: ../libsvn_subr/prompt.c:434
+#: ../libsvn_subr/prompt.c:858
 msgid "Please type 'yes' or 'no': "
 msgstr "请输入 'yes' 或 'no': "
 
-#: ../libsvn_subr/prompt.c:448
+#: ../libsvn_subr/prompt.c:872
 msgid "Store password unencrypted (yes/no)? "
 msgstr "保存未加密的密码(yes/no)? "
 
-#: ../libsvn_subr/prompt.c:450
+#: ../libsvn_subr/prompt.c:874
 #, c-format
 msgid ""
 "\n"
@@ -6279,11 +6748,11 @@
 "来避免再次出现此警告。\n"
 "-----------------------------------------------------------------------\n"
 
-#: ../libsvn_subr/prompt.c:477
+#: ../libsvn_subr/prompt.c:901
 msgid "Store passphrase unencrypted (yes/no)? "
 msgstr "保存未加密的密码(yes/no)? "
 
-#: ../libsvn_subr/prompt.c:479
+#: ../libsvn_subr/prompt.c:903
 #, c-format
 msgid ""
 "\n"
@@ -6314,66 +6783,78 @@
 " 或 “no” 来避免再次出现此警告。\n"
 "-----------------------------------------------------------------------\n"
 
-#: ../libsvn_subr/prompt.c:525
+#: ../libsvn_subr/prompt.c:949
 #, c-format
 msgid "Password for '%s' GNOME keyring: "
 msgstr "GNOME keyring [%s] 的密码: "
 
-#: ../libsvn_subr/simple_providers.c:462
-#: ../libsvn_subr/ssl_client_cert_pw_providers.c:304
+#: ../libsvn_subr/simple_providers.c:449
+#: ../libsvn_subr/ssl_client_cert_pw_providers.c:296
 #, c-format
 msgid "Config error: invalid value '%s' for option '%s'"
 msgstr "配置错误: 无效取值 “%s”，对于选项 “%s”"
 
-#: ../libsvn_subr/sqlite.c:151
+#: ../libsvn_subr/sqlite.c:176
 #, c-format
-msgid "%s, executing statement '%s'"
-msgstr "%s, 执行语句 '%s'"
+msgid "sqlite[S%d]: %s, executing statement '%s'"
+msgstr "sqlite[S%d]: %s, 执行语句 '%s'"
 
-#: ../libsvn_subr/sqlite.c:216
-msgid "Expected database row missing"
-msgstr "丢失了期待的数据库行"
+#: ../libsvn_subr/sqlite.c:265
+msgid "sqlite: Expected database row missing"
+msgstr "sqlite: 缺少期望的数据库行"
 
-#: ../libsvn_subr/sqlite.c:217
-msgid "Extra database row found"
-msgstr "发现了额外的数据库行"
-
-#: ../libsvn_subr/sqlite.c:731
-#, c-format
-msgid "Schema format %d not recognized"
-msgstr "不能识别方案格式 %d"
+#: ../libsvn_subr/sqlite.c:266
+msgid "sqlite: Extra database row found"
+msgstr "sqlite: 发现额外的数据库行"
 
-#: ../libsvn_subr/sqlite.c:747
+#: ../libsvn_subr/sqlite.c:726
 #, c-format
 msgid "SQLite compiled for %s, but running with %s"
 msgstr "SQLite 编译为 %s，但是运行于 %s"
 
-#: ../libsvn_subr/sqlite.c:759
+#: ../libsvn_subr/sqlite.c:738
 msgid "SQLite is required to be compiled and run in thread-safe mode"
 msgstr "SQLite 需要在编译和运行时都处于线程安全模式"
 
-#: ../libsvn_subr/sqlite.c:768
-msgid "Could not configure SQLite"
-msgstr "不能配置 SQLite"
+#: ../libsvn_subr/sqlite.c:747
+#, c-format
+msgid "Could not configure SQLite [S%d]"
+msgstr "不能配置 SQLite [S%d]"
 
-#: ../libsvn_subr/sqlite.c:770
+#: ../libsvn_subr/sqlite.c:749
 msgid "Could not initialize SQLite"
 msgstr "不能初始化 SQLite"
 
-#: ../libsvn_subr/sqlite.c:1163
+#: ../libsvn_subr/sqlite.c:1219
 #, c-format
 msgid "SQLite hotcopy failed for %s"
 msgstr "SQLite 由于 %s 导致热复制失败"
 
-#: ../libsvn_subr/subst.c:1743 ../libsvn_wc/props.c:2185
+#: ../libsvn_subr/string.c:943 ../libsvn_subr/string.c:987
+#, c-format
+msgid "Could not convert '%s' into a number"
+msgstr "无法转换 '%s' 到数字"
+
+#: ../libsvn_subr/subst.c:1807 ../libsvn_wc/props.c:1660
 #, c-format
 msgid "File '%s' has inconsistent newlines"
 msgstr "文件 “%s” 内的换行符不一致"
 
-#: ../libsvn_subr/svn_string.c:769 ../libsvn_subr/svn_string.c:813
-#, c-format
-msgid "Could not convert '%s' into a number"
-msgstr "无法转换 '%s' 到数字"
+#: ../libsvn_subr/sysinfo.c:1105
+msgid "Intel"
+msgstr "Intel"
+
+#: ../libsvn_subr/sysinfo.c:1106
+msgid "Intel 64-bit"
+msgstr "Intel 64 位"
+
+#: ../libsvn_subr/sysinfo.c:1107
+msgid "PowerPC"
+msgstr "PowerPC"
+
+#: ../libsvn_subr/sysinfo.c:1108
+msgid "PowerPC 64-bit"
+msgstr "PowerPC 64 位"
 
 #. Human explanatory part, generated by apr_strftime as "Sat, 01 Jan 2000"
 #: ../libsvn_subr/time.c:85
@@ -6385,58 +6866,60 @@
 msgid "Token '%s' is unrecognized"
 msgstr "无法识别令牌 “%s”"
 
-#: ../libsvn_subr/utf.c:247
-msgid "Can't lock charset translation mutex"
-msgstr "不能锁定字符转换互斥体"
-
-#: ../libsvn_subr/utf.c:265 ../libsvn_subr/utf.c:361
-msgid "Can't unlock charset translation mutex"
-msgstr "不能解锁字符转换互斥体"
+#: ../libsvn_subr/types.c:48
+#, c-format
+msgid "Invalid revision number found parsing '%s'"
+msgstr "解析 “%s” 时发现无效的版本号"
+
+#: ../libsvn_subr/types.c:60
+#, c-format
+msgid "Negative revision number found parsing '%s'"
+msgstr "解析 “%s” 时发现负的版本号"
 
-#: ../libsvn_subr/utf.c:319
+#: ../libsvn_subr/utf.c:245
 #, c-format
 msgid "Can't create a character converter from native encoding to '%s'"
 msgstr "不能创建从本地编码到“%s”的字符转换器"
 
-#: ../libsvn_subr/utf.c:323
+#: ../libsvn_subr/utf.c:249
 #, c-format
 msgid "Can't create a character converter from '%s' to native encoding"
 msgstr "不能创建从“%s”到本地编码的字符转换器"
 
-#: ../libsvn_subr/utf.c:327
+#: ../libsvn_subr/utf.c:253
 #, c-format
 msgid "Can't create a character converter from '%s' to '%s'"
 msgstr "不能创建从“%s”到“%s”的字符转换器"
 
-#: ../libsvn_subr/utf.c:567
+#: ../libsvn_subr/utf.c:601
 #, c-format
 msgid "Can't convert string from native encoding to '%s':"
 msgstr "不能把字符串从本地编码转换为“%s”编码:"
 
-#: ../libsvn_subr/utf.c:571
+#: ../libsvn_subr/utf.c:605
 #, c-format
 msgid "Can't convert string from '%s' to native encoding:"
 msgstr "不能把字符串从”%s“编码转换为本地编码。"
 
-#: ../libsvn_subr/utf.c:575
+#: ../libsvn_subr/utf.c:609
 #, c-format
 msgid "Can't convert string from '%s' to '%s':"
 msgstr "不能把字符串从“%s”编码转换为“%s”编码。"
 
-#: ../libsvn_subr/utf.c:620
+#: ../libsvn_subr/utf.c:654
 #, c-format
 msgid ""
 "Safe data '%s' was followed by non-ASCII byte %d: unable to convert to/from "
 "UTF-8"
 msgstr "安全数据“%s”后面是非ASCII字节 %d: 不能转换到/自 UTF-8"
 
-#: ../libsvn_subr/utf.c:628
+#: ../libsvn_subr/utf.c:662
 #, c-format
 msgid ""
 "Non-ASCII character (code %d) detected, and unable to convert to/from UTF-8"
 msgstr "检测到非ASCII字符 (代码 %d)，并且不能转换到/自 UTF-8"
 
-#: ../libsvn_subr/utf.c:673
+#: ../libsvn_subr/utf.c:707
 #, c-format
 msgid ""
 "Valid UTF-8 data\n"
@@ -6469,41 +6952,67 @@
 msgid "MIME type '%s' contains invalid character '0x%02x' in postfix"
 msgstr "MIME 类型“%s”中包含非法字符“0x%02x”"
 
-#: ../libsvn_subr/version.c:87
+#: ../libsvn_subr/version.c:91
+#, c-format
+msgid "Version mismatch in '%s'%s: found %d.%d.%d%s, expected %d.%d.%d%s"
+msgstr ""
+
+#: ../libsvn_subr/version.c:96
+msgid " (expecting equality)"
+msgstr ""
+
+#: ../libsvn_subr/version.c:98
+msgid " (expecting compatibility)"
+msgstr ""
+
+#: ../libsvn_subr/version.c:139
+msgid ""
+"Copyright (C) 2013 The Apache Software Foundation.\n"
+"This software consists of contributions made by many people;\n"
+"see the NOTICE file for more information.\n"
+"Subversion is open source software, see http://subversion.apache.org/\n"
+msgstr ""
+"版权所有 (C) 2013 Apache 软件基金会。\n"
+"此软件包含了许多人的贡献，请查看文件 NOTICE 以获得更多信息。\n"
+"Subversion 是开放源代码软件，请参阅 http://subversion.apache.org/ 站点。\n"
+
+#: ../libsvn_subr/version.c:217 ../libsvn_subr/version.c:228
+#: ../libsvn_subr/version.c:234 ../libsvn_subr/version.c:251
+#: ../libsvn_subr/version.c:258
 #, c-format
-msgid "Version mismatch in '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
-msgstr "“%s”的版本不一致: 找到 %d.%d.%d%s，期望 %d.%d.%d%s"
+msgid "Failed to parse version number string '%s'"
+msgstr "不能解析版本号字符串“%s”"
 
-#: ../libsvn_subr/xml.c:415
+#: ../libsvn_subr/xml.c:416
 #, c-format
 msgid "Malformed XML: %s at line %ld"
 msgstr "非法 XML: %s 在第 %ld 行"
 
-#: ../libsvn_wc/adm_crawler.c:112
+#: ../libsvn_wc/adm_crawler.c:114
 #, c-format
 msgid "The existing node '%s' can not be restored."
 msgstr "已有节点 '%s' 不能恢复。"
 
-#: ../libsvn_wc/adm_crawler.c:139
+#: ../libsvn_wc/adm_crawler.c:133
 #, c-format
 msgid "The node '%s' can not be restored."
 msgstr "节点 '%s' 不能恢复。"
 
-#: ../libsvn_wc/adm_crawler.c:871
+#: ../libsvn_wc/adm_crawler.c:851
 msgid "Error aborting report"
 msgstr "取消报告出错"
 
-#: ../libsvn_wc/adm_crawler.c:983
+#: ../libsvn_wc/adm_crawler.c:963
 #, c-format
 msgid "Pristine checksum for file '%s' is missing"
 msgstr "文件“%s”的原始内容校验和丢失"
 
-#: ../libsvn_wc/adm_crawler.c:1148
+#: ../libsvn_wc/adm_crawler.c:1128
 #, c-format
 msgid "Checksum mismatch for text base of '%s'"
 msgstr "'%s' 的文本校验和不匹配"
 
-#: ../libsvn_wc/adm_crawler.c:1159
+#: ../libsvn_wc/adm_crawler.c:1139
 #, c-format
 msgid "While preparing '%s' for commit"
 msgstr "当为提交操作准备“%s”时"
@@ -6513,92 +7022,77 @@
 msgid "'%s' is not a valid administrative directory name"
 msgstr "“%s”不是一个有效的管理目录名"
 
-#: ../libsvn_wc/adm_files.c:210 ../libsvn_wc/adm_files.c:266
+#: ../libsvn_wc/adm_files.c:185 ../libsvn_wc/adm_files.c:241
 #, c-format
 msgid "Can only get the pristine contents of files; '%s' is not a file"
 msgstr "只能取得文件的原始内容；“%s”不是文件"
 
-#: ../libsvn_wc/adm_files.c:219 ../libsvn_wc/adm_files.c:281
+#: ../libsvn_wc/adm_files.c:194 ../libsvn_wc/adm_files.c:256
 #, c-format
 msgid ""
 "Cannot get the pristine contents of '%s' because its delete is already "
 "committed"
 msgstr "不能取得“%s”的原始内容，因为其删除操作已经提交"
 
-#: ../libsvn_wc/adm_files.c:227 ../libsvn_wc/adm_files.c:289
+#: ../libsvn_wc/adm_files.c:202 ../libsvn_wc/adm_files.c:264
 #, c-format
 msgid ""
 "Cannot get the pristine contents of '%s' because it has an unexpected status"
 msgstr "不能取得“%s”的原始内容，因为其状态未知"
 
-#: ../libsvn_wc/adm_files.c:234
+#: ../libsvn_wc/adm_files.c:209
 #, c-format
 msgid "Node '%s' has no pristine text"
 msgstr "节点 '%s' 没有原始内容"
 
-#: ../libsvn_wc/adm_files.c:476
+#: ../libsvn_wc/adm_files.c:452
 #, c-format
 msgid "Revision %ld doesn't match existing revision %ld in '%s'"
 msgstr "版本 %ld 不匹配现有版本 %ld 于 “%s”"
 
-#: ../libsvn_wc/adm_files.c:522
+#: ../libsvn_wc/adm_files.c:489
 #, c-format
 msgid ""
 "URL '%s' (uuid: '%s') doesn't match existing URL '%s' (uuid: '%s') in '%s'"
 msgstr "URL “%s”(uuid: '%s') 不匹配现有 URL “%s”(uuid: '%s') 于 “%s”"
 
-#: ../libsvn_wc/adm_ops.c:644
-#, c-format
-msgid "'%s' cannot be deleted"
-msgstr "'%s' 不能被删除"
-
-#: ../libsvn_wc/adm_ops.c:660
-#, c-format
-msgid "'%s' is the root of a working copy and cannot be deleted"
-msgstr "不能删除工作副本根目录 '%s'"
-
-#: ../libsvn_wc/adm_ops.c:790 ../libsvn_wc/update_editor.c:5290
+#: ../libsvn_wc/adm_ops.c:602 ../libsvn_wc/update_editor.c:5281
 #, c-format
 msgid "Can't find parent directory's node while trying to add '%s'"
 msgstr "增加 “%s” 时无法找到父目录节点"
 
-#: ../libsvn_wc/adm_ops.c:799 ../libsvn_wc/update_editor.c:5284
+#: ../libsvn_wc/adm_ops.c:611 ../libsvn_wc/update_editor.c:5275
 #, c-format
 msgid "Can't add '%s' to a parent directory scheduled for deletion"
 msgstr "增加 “%s” 到调度删除的目录中"
 
-#: ../libsvn_wc/adm_ops.c:806 ../libsvn_wc/update_editor.c:5297
+#: ../libsvn_wc/adm_ops.c:618 ../libsvn_wc/update_editor.c:5288
 #, c-format
 msgid "Can't schedule an addition of '%s' below a not-directory node"
 msgstr "不能在非目录节点 '%s' 下调度增加"
 
-#: ../libsvn_wc/adm_ops.c:864
+#: ../libsvn_wc/adm_ops.c:677
 #, c-format
 msgid "Can't create an entry with a reserved name while trying to add '%s'"
 msgstr "增加 “%s” 时无法创建使用保留名称的条目"
 
-#: ../libsvn_wc/adm_ops.c:1061
+#: ../libsvn_wc/adm_ops.c:881
 #, c-format
 msgid "The URL '%s' has a different repository root than its parent"
 msgstr "URL “%s” 与其父目录的版本库根目录不相同"
 
-#: ../libsvn_wc/adm_ops.c:1079
+#: ../libsvn_wc/adm_ops.c:899
 #, c-format
 msgid ""
 "Can't schedule the working copy at '%s' from repository '%s' with uuid '%s' "
 "for addition under a working copy from repository '%s' with uuid '%s'."
 msgstr "不能调度工作副本 '%s' (版本库 '%s'，uuid '%s') 在版本库 '%s' (uuid '%s') 的工作副本下增加。"
 
-#: ../libsvn_wc/adm_ops.c:1093
+#: ../libsvn_wc/adm_ops.c:913
 #, c-format
 msgid "Can't add '%s' with URL '%s', but with the data from '%s'"
 msgstr "不能增加 '%s' 为 URL '%s' (数据来自 '%s')"
 
-#: ../libsvn_wc/adm_ops.c:2148
-#, c-format
-msgid "File '%s' has local modifications"
-msgstr "文件“%s”有本地修改"
-
 #: ../libsvn_wc/cleanup.c:58
 #, c-format
 msgid "'%s' is not a working copy directory"
@@ -6608,184 +7102,246 @@
 msgid "Log format too old, please use Subversion 1.6 or earlier"
 msgstr "日志格式太旧，请使用 Subversion 1.6 或更新的版本"
 
-#: ../libsvn_wc/conflicts.c:280
+#: ../libsvn_wc/conflicts.c:83
+msgid "Not a conflict skel"
+msgstr "不是冲突骨架"
+
+#: ../libsvn_wc/conflicts.c:610 ../libsvn_wc/conflicts.c:707
+msgid "Not a completed conflict skel"
+msgstr "不是完整的冲突骨架"
+
+#: ../libsvn_wc/conflicts.c:788 ../libsvn_wc/conflicts.c:861
+#: ../libsvn_wc/conflicts.c:951
+msgid "Conflict not set"
+msgstr "没有设置冲突"
+
+#: ../libsvn_wc/conflicts.c:1438 ../libsvn_wc/conflicts.c:1790
+msgid "Conflict callback violated API: returned no results"
+msgstr "冲突的回调函数违反 API：没有返回结果。"
+
+#: ../libsvn_wc/conflicts.c:1482
+msgid "Conflict callback violated API: returned no merged file"
+msgstr "冲突的回调函数违反 API：没有返回合并文件。"
+
+#: ../libsvn_wc/conflicts.c:2468 ../libsvn_wc/conflicts.c:2644
 msgid "Invalid 'conflict_result' argument"
 msgstr "无效的 “conflict_result” 参数"
 
-#: ../libsvn_wc/conflicts.c:383
+#: ../libsvn_wc/conflicts.c:2767 ../libsvn_wc/conflicts.c:2807
+#, c-format
+msgid ""
+"Tree conflict can only be resolved to 'working' or 'mine-conflict' state; "
+"'%s' not resolved"
+msgstr "树冲突只能解决为“working”或“mine-conflict”状态；“%s” 还没有解决"
+
+#: ../libsvn_wc/conflicts.c:2822
 #, c-format
 msgid ""
-"Tree conflicts can only be resolved to 'working' state; '%s' not resolved"
-msgstr "树冲突只能解决为 “working” 状态；“%s” 还没有解决"
+"Tree conflict can only be resolved to 'working' state; '%s' not resolved"
+msgstr "树冲突只能解决为“working”状态；“%s” 还没有解决"
 
-#: ../libsvn_wc/copy.c:78
+#: ../libsvn_wc/conflicts.c:2924
+msgid "No conflict-callback and no pre-defined conflict-choice provided"
+msgstr "没有提供冲突回调或预定义的冲突选择"
+
+#: ../libsvn_wc/copy.c:86
 #, c-format
 msgid "Source '%s' is unexpected kind"
 msgstr "源 “%s” 具有意外的类型"
 
-#: ../libsvn_wc/copy.c:472
+#: ../libsvn_wc/copy.c:410
 #, c-format
 msgid "cannot handle node kind for '%s'"
 msgstr "不能为 '%s'“处理节点类型"
 
-#: ../libsvn_wc/copy.c:494 ../libsvn_wc/wc_db.c:3520 ../libsvn_wc/wc_db.c:3802
-#: ../libsvn_wc/wc_db.c:4050
+#: ../libsvn_wc/copy.c:432 ../libsvn_wc/wc_db.c:4429 ../libsvn_wc/wc_db.c:5019
+#, c-format
+msgid "Cannot handle status of '%s'"
+msgstr "不能处理“%s”的状态"
+
+#: ../libsvn_wc/copy.c:441 ../libsvn_wc/wc_db.c:4420 ../libsvn_wc/wc_db.c:5013
+#: ../libsvn_wc/wc_db.c:5247
 #, c-format
 msgid "Cannot copy '%s' excluded by server"
 msgstr "不能复制被服务器排除的 '%s'"
 
-#: ../libsvn_wc/copy.c:622
+#: ../libsvn_wc/copy.c:578
 #, c-format
 msgid "Deleted node '%s' can't be copied."
 msgstr "已经删除的节点“%s”不能被复制。"
 
-#: ../libsvn_wc/copy.c:630 ../libsvn_wc/crop.c:250 ../libsvn_wc/crop.c:347
-#: ../libsvn_wc/info.c:363 ../libsvn_wc/props.c:254
-#: ../libsvn_wc/update_editor.c:5040 ../libsvn_wc/wc_db.c:2099
-#: ../libsvn_wc/wc_db.c:2242 ../libsvn_wc/wc_db.c:2300
-#: ../libsvn_wc/wc_db.c:2324 ../libsvn_wc/wc_db.c:2471
-#: ../libsvn_wc/wc_db.c:4844 ../libsvn_wc/wc_db.c:5225
-#: ../libsvn_wc/wc_db.c:5321 ../libsvn_wc/wc_db.c:6662
-#: ../libsvn_wc/wc_db.c:7125 ../libsvn_wc/wc_db.c:7778
-#: ../libsvn_wc/wc_db.c:7899 ../libsvn_wc/wc_db.c:9157
-#: ../libsvn_wc/wc_db.c:9228 ../libsvn_wc/wc_db.c:9501
-#: ../libsvn_wc/wc_db.c:10629 ../libsvn_wc/wc_db.c:10782
-#: ../libsvn_wc/wc_db.c:11178 ../libsvn_wc/wc_db.c:12221
+#: ../libsvn_wc/copy.c:596
 #, c-format
-msgid "The node '%s' was not found."
-msgstr "找不到节点 '%s'。"
+msgid "'%s' is the root of a working copy and cannot be moved"
+msgstr "“%s”是工作副本根目录，不能被移动"
+
+#: ../libsvn_wc/copy.c:604
+#, c-format
+msgid "'%s' represents the repository root and cannot be moved"
+msgstr "“%s”是版本库根目录，不能被移动"
 
-#: ../libsvn_wc/copy.c:684
+#: ../libsvn_wc/copy.c:673
 #, c-format
 msgid ""
 "Cannot copy to '%s', as it is not from repository '%s'; it is from '%s'"
 msgstr "无法复制到“%s”，因为它不在版本库“%s”中；它来自“%s”"
 
-#: ../libsvn_wc/copy.c:692
+#: ../libsvn_wc/copy.c:681
 #, c-format
 msgid "Cannot copy to '%s' as it is scheduled for deletion"
 msgstr "无法复制到“%s”，因为它已调度删除"
 
-#: ../libsvn_wc/copy.c:721
+#: ../libsvn_wc/copy.c:709
 #, c-format
 msgid "'%s' is already under version control but is excluded."
 msgstr "'%s' 已纳入版本控制，却被排除。"
 
-#: ../libsvn_wc/copy.c:736
+#: ../libsvn_wc/copy.c:724
 #, c-format
 msgid "There is already a versioned item '%s'"
 msgstr "已有纳入版本控制项“%s”"
 
-#: ../libsvn_wc/copy.c:752
+#: ../libsvn_wc/copy.c:740
 #, c-format
 msgid "'%s' already exists and is in the way"
 msgstr "“%s”已存在，变成拦路虎"
 
-#: ../libsvn_wc/crop.c:222
+#: ../libsvn_wc/copy.c:791
+#, c-format
+msgid ""
+"Cannot move mixed-revision subtree '%s' [%ld:%ld]; try updating it first"
+msgstr "不能移动有混合版本的子树“%s”[%ld:%ld] 中；请先更新"
+
+#: ../libsvn_wc/crop.c:208
 #, c-format
 msgid "Cannot exclude '%s': it is a working copy root"
 msgstr "不能排除 '%s': 它是工作副本根目录"
 
-#: ../libsvn_wc/crop.c:230
+#: ../libsvn_wc/crop.c:216
 #, c-format
 msgid "Cannot exclude '%s': it is a switched path"
 msgstr "不能排除 '%s':它是已切换的路径"
 
-#: ../libsvn_wc/crop.c:257
+#: ../libsvn_wc/crop.c:243
 #, c-format
 msgid ""
 "Cannot exclude '%s': it is to be added to the repository. Try commit instead"
 msgstr "不能排除 '%s': 它将要增加到版本库中。请先提交"
 
-#: ../libsvn_wc/crop.c:264
+#: ../libsvn_wc/crop.c:250
 #, c-format
 msgid ""
 "Cannot exclude '%s': it is to be deleted from the repository. Try commit "
 "instead"
 msgstr "不能排除 '%s': 它将要从版本库中删除。请先提交"
 
-#: ../libsvn_wc/crop.c:329
+#: ../libsvn_wc/crop.c:309
 msgid "Can only crop a working copy with a restrictive depth"
 msgstr "只能修剪工作副本到有限深度"
 
-#: ../libsvn_wc/crop.c:340
+#: ../libsvn_wc/crop.c:320
 msgid "Can only crop directories"
 msgstr "只能修剪目录"
 
-#: ../libsvn_wc/crop.c:353
+#: ../libsvn_wc/crop.c:333
 #, c-format
 msgid ""
 "Cannot crop '%s': it is going to be removed from repository. Try commit "
 "instead"
 msgstr "无法修剪 “%s”: 它将要从版本库中删除；请先提交"
 
-#: ../libsvn_wc/crop.c:360
+#: ../libsvn_wc/crop.c:340
 #, c-format
 msgid ""
 "Cannot crop '%s': it is to be added to the repository. Try commit instead"
 msgstr "无法修剪 '%s': 它将要增加到版本库中。请先提交"
 
-#: ../libsvn_wc/deprecated.c:2210
+#: ../libsvn_wc/delete.c:237 ../libsvn_wc/delete.c:357
+#, c-format
+msgid "'%s' cannot be deleted"
+msgstr "'%s' 不能被删除"
+
+#: ../libsvn_wc/delete.c:255 ../libsvn_wc/delete.c:373
+#, c-format
+msgid "'%s' is the root of a working copy and cannot be deleted"
+msgstr "不能删除工作副本根目录 '%s'"
+
+#: ../libsvn_wc/delete.c:262 ../libsvn_wc/delete.c:379
+#, c-format
+msgid "'%s' represents the repository root and cannot be deleted"
+msgstr "“%s”是版本库根目录，不能被删除"
+
+#: ../libsvn_wc/delete.c:476
+#, c-format
+msgid "File '%s' has local modifications"
+msgstr "文件“%s”有本地修改"
+
+#: ../libsvn_wc/deprecated.c:2284
 #, c-format
 msgid "Unexpectedly found '%s': path is marked 'missing'"
 msgstr "意外发现“%s”: 路径被标记为“丢失”"
 
-#: ../libsvn_wc/entries.c:1028
+#: ../libsvn_wc/entries.c:1044
 #, c-format
 msgid "'%s' is not a versioned working copy"
 msgstr "“%s”不是已版本控制的工作副本"
 
-#: ../libsvn_wc/entries.c:1274
+#: ../libsvn_wc/entries.c:1290
 #, c-format
 msgid "Admin area of '%s' is missing"
 msgstr "“%s”的管理目录丢失"
 
-#: ../libsvn_wc/entries.c:1294
+#: ../libsvn_wc/entries.c:1310
 #, c-format
 msgid "'%s' is not of the right kind"
 msgstr "“%s” 的类型错误"
 
-#: ../libsvn_wc/entries.c:1482
+#: ../libsvn_wc/entries.c:1507
 #, c-format
 msgid "The file '%s' has no checksum"
 msgstr "文件 '%s' 没有校验和。"
 
-#: ../libsvn_wc/entries.c:1757
+#: ../libsvn_wc/entries.c:1619
+#, c-format
+msgid "Unable to upgrade '%s' at line %d"
+msgstr "不能升级“%s”，第 %d 行"
+
+#: ../libsvn_wc/entries.c:1837
 #, c-format
 msgid "No copyfrom URL for '%s'"
 msgstr "'%s' 没有 copyfrom URL"
 
-#: ../libsvn_wc/entries.c:1973
+#: ../libsvn_wc/entries.c:2051
 #, c-format
 msgid "Bad base MD5 checksum for '%s'; expected: '%s'; found '%s'; "
 msgstr "'%s' 的基础的 MD5 校验和错误; 期望 '%s'; 发现 '%s'; "
 
-#: ../libsvn_wc/entries.c:2284
+#: ../libsvn_wc/entries.c:2398
 #, c-format
 msgid "No default entry in directory '%s'"
 msgstr "在目录“%s”中没有默认入口"
 
-#: ../libsvn_wc/entries.c:2439
+#: ../libsvn_wc/entries.c:2554
 #, c-format
 msgid "Directory '%s' has no THIS_DIR entry"
 msgstr "目录“%s”没有 THIS_DIR 入口"
 
-#: ../libsvn_wc/entries.c:2620 ../libsvn_wc/node.c:724
+#: ../libsvn_wc/entries.c:2735 ../libsvn_wc/node.c:528
 #, c-format
 msgid "'%s' has an unrecognized node kind"
 msgstr "“%s”有无法识别的节点种类"
 
-#: ../libsvn_wc/externals.c:152 ../libsvn_wc/externals.c:228
+#: ../libsvn_wc/externals.c:154 ../libsvn_wc/externals.c:232
 #, c-format
 msgid "Error parsing %s property on '%s': '%s'"
 msgstr "解析 %s 属性于“%s”出错: “%s”"
 
-#: ../libsvn_wc/externals.c:197
+#: ../libsvn_wc/externals.c:202
 #, c-format
 msgid "Can't split line into components: '%s'"
 msgstr "不能分割行到组件：“%s”"
 
-#: ../libsvn_wc/externals.c:253
+#: ../libsvn_wc/externals.c:257
 #, c-format
 msgid ""
 "Invalid %s property on '%s': cannot use two absolute URLs ('%s' and '%s') in "
@@ -6794,277 +7350,299 @@
 msgstr ""
 "非法属性 “%s” 于 “%s”: 不能在外部定义中使用 2 个绝对 URL(“%s” 和 “%s”)；绝对或相对 URL 必须检出到本地路径"
 
-#: ../libsvn_wc/externals.c:262 ../libsvn_wc/externals.c:270
+#: ../libsvn_wc/externals.c:266 ../libsvn_wc/externals.c:274
 #, c-format
 msgid ""
 "Invalid %s property on '%s': cannot use a URL '%s' as the target directory "
 "for an external definition"
 msgstr "非法属性 “%s” 于 “%s”: 对于外部定义，不能使用 URL \"%s\" 作为目标目录"
 
-#: ../libsvn_wc/externals.c:312
+#: ../libsvn_wc/externals.c:316
 #, c-format
 msgid ""
 "Invalid %s property on '%s': target '%s' is an absolute path or involves '..'"
 msgstr "无效属性 %s 位于 “%s”: 目标 “%s” 包含 “..” 或是绝对路径"
 
-#: ../libsvn_wc/externals.c:430 ../libsvn_wc/externals.c:452
+#: ../libsvn_wc/externals.c:491 ../libsvn_wc/externals.c:514
 #, c-format
 msgid "This editor can only update '%s'"
 msgstr "此编辑器只能更新“%s”"
 
-#: ../libsvn_wc/externals.c:467
+#: ../libsvn_wc/externals.c:529
 #, c-format
 msgid "Node '%s' is no existing file external"
 msgstr "节点 '%s' 的外部链接不是现存文件"
 
-#: ../libsvn_wc/lock.c:528
+#: ../libsvn_wc/externals.c:1517
+#, c-format
+msgid "URL '%s' does not begin with a scheme"
+msgstr "URL “%s” 没有以方案开始"
+
+#: ../libsvn_wc/externals.c:1572
+#, c-format
+msgid "Illegal parent directory URL '%s'"
+msgstr "非法父目录 URL “%s”"
+
+#: ../libsvn_wc/externals.c:1611
+#, c-format
+msgid "Illegal repository root URL '%s'"
+msgstr "非法版本库根 URL “%s”"
+
+#: ../libsvn_wc/externals.c:1656
+#, c-format
+msgid "The external relative URL '%s' cannot have backpaths, i.e. '..'"
+msgstr "外部相对 URL “%s” 不能包含后退路径，例如 “..”"
+
+#: ../libsvn_wc/externals.c:1684
+#, c-format
+msgid "Unrecognized format for the relative external URL '%s'"
+msgstr "外部相对 URL “%s” 的格式无法识别"
+
+#: ../libsvn_wc/lock.c:529
 #, c-format
 msgid "Path '%s' ends in '%s', which is unsupported for this operation"
 msgstr "路径“%s”以“%s”结束，此操作不支持"
 
-#: ../libsvn_wc/lock.c:772 ../libsvn_wc/wc_db.c:10905
+#: ../libsvn_wc/lock.c:773 ../libsvn_wc/wc_db.c:13687
 #, c-format
 msgid "Working copy '%s' locked"
 msgstr "工作副本“%s”已经锁定"
 
-#: ../libsvn_wc/lock.c:917
+#: ../libsvn_wc/lock.c:918
 #, c-format
 msgid "Unable to check path existence for '%s'"
 msgstr "无法检查路径“%s”是否存在"
 
-#: ../libsvn_wc/lock.c:937
+#: ../libsvn_wc/lock.c:941
 #, c-format
 msgid "Expected '%s' to be a directory but found a file"
 msgstr "期望“%s”是目录，但它是文件"
 
-#: ../libsvn_wc/lock.c:947
+#: ../libsvn_wc/lock.c:951
 #, c-format
 msgid "Can't retrieve an access baton for non-directory '%s'"
 msgstr "不能获取非目录对象 '%s' 的访问权"
 
-#: ../libsvn_wc/lock.c:956
+#: ../libsvn_wc/lock.c:960
 #, c-format
 msgid "Directory '%s' is missing"
 msgstr "目录“%s”丢失"
 
-#: ../libsvn_wc/lock.c:964
+#: ../libsvn_wc/lock.c:968
 #, c-format
 msgid "Working copy '%s' is not locked"
 msgstr "工作副本“%s”未被锁定"
 
-#: ../libsvn_wc/lock.c:1428
+#: ../libsvn_wc/lock.c:1382
 #, c-format
 msgid "No write-lock in '%s'"
 msgstr "“%s”没有写入锁定"
 
-#: ../libsvn_wc/lock.c:1524 ../libsvn_wc/lock.c:1590
+#: ../libsvn_wc/lock.c:1496
 #, c-format
 msgid "Can't obtain lock on non-directory '%s'."
 msgstr "不能获取非目录对象 '%s' 的锁"
 
-#: ../libsvn_wc/merge.c:887 ../libsvn_wc/merge.c:1265
-msgid "Conflict callback violated API: returned no results"
-msgstr "冲突的回调函数违反 API：没有返回结果。"
+#: ../libsvn_wc/merge.c:1281 ../libsvn_wc/props.c:257
+#, c-format
+msgid "Can't merge into conflicted node '%s'"
+msgstr "无法合并到已经冲突的节点“%s”"
 
-#: ../libsvn_wc/merge.c:1301
-msgid "Conflict callback violated API: returned no merged file"
-msgstr "冲突的回调函数违反 API：没有返回合并文件。"
+#: ../libsvn_wc/merge.c:1324 ../libsvn_wc/props.c:273
+#, c-format
+msgid "The property '%s' may not be merged into '%s'."
+msgstr "属性 “%s” 不能合并到 “%s”。"
 
-#: ../libsvn_wc/node.c:1415
+#: ../libsvn_wc/node.c:1047
 #, c-format
 msgid "Incomplete copy information on path '%s'."
-msgstr "位于路径“%s”上的复制信息不完整"
+msgstr "路径“%s”上的复制信息不完整"
 
-#: ../libsvn_wc/node.c:1630
+#: ../libsvn_wc/node.c:1211
 #, c-format
 msgid "'%s' is not the root of the working copy '%s'"
 msgstr "“%s”不是工作副本“%s”的根"
 
-#: ../libsvn_wc/old-and-busted.c:122
+#: ../libsvn_wc/old-and-busted.c:123
 msgid "Invalid escape sequence"
 msgstr "无效的转义序列"
 
-#: ../libsvn_wc/old-and-busted.c:129
+#: ../libsvn_wc/old-and-busted.c:130
 msgid "Invalid escaped character"
 msgstr "无效的转义字符"
 
-#: ../libsvn_wc/old-and-busted.c:147 ../libsvn_wc/old-and-busted.c:176
-#: ../libsvn_wc/old-and-busted.c:240 ../libsvn_wc/old-and-busted.c:252
+#: ../libsvn_wc/old-and-busted.c:148 ../libsvn_wc/old-and-busted.c:177
+#: ../libsvn_wc/old-and-busted.c:241 ../libsvn_wc/old-and-busted.c:253
 msgid "Unexpected end of entry"
 msgstr "入口意外结束"
 
-#: ../libsvn_wc/old-and-busted.c:202
+#: ../libsvn_wc/old-and-busted.c:203
 #, c-format
 msgid "Entry contains non-canonical path '%s'"
 msgstr "入口包含不规范的路径 “%s”"
 
-#: ../libsvn_wc/old-and-busted.c:274
+#: ../libsvn_wc/old-and-busted.c:275
 #, c-format
 msgid "Invalid value for field '%s'"
 msgstr "“%s”域的值无效"
 
-#: ../libsvn_wc/old-and-busted.c:346
+#: ../libsvn_wc/old-and-busted.c:347
 #, c-format
 msgid "Found an unexpected \\0 in the file external '%s'"
 msgstr "在外部引用的文件 “%s” 中，发现不期望的 \\0"
 
-#: ../libsvn_wc/old-and-busted.c:390
+#: ../libsvn_wc/old-and-busted.c:391
 #, c-format
 msgid "Illegal file external revision kind %d for path '%s'"
 msgstr "非法的外部引用文件的版本类型 %d，在路径 “%s” 中"
 
-#: ../libsvn_wc/old-and-busted.c:488 ../libsvn_wc/old-and-busted.c:846
+#: ../libsvn_wc/old-and-busted.c:489 ../libsvn_wc/old-and-busted.c:847
 #, c-format
 msgid "Entry '%s' has invalid node kind"
 msgstr "入口“%s”有无效的节点种类"
 
-#: ../libsvn_wc/old-and-busted.c:509 ../libsvn_wc/old-and-busted.c:826
+#: ../libsvn_wc/old-and-busted.c:510 ../libsvn_wc/old-and-busted.c:827
 #, c-format
 msgid "Entry for '%s' has invalid repository root"
 msgstr "“%s”条目的版本库根目录无效"
 
-#: ../libsvn_wc/old-and-busted.c:530 ../libsvn_wc/old-and-busted.c:871
+#: ../libsvn_wc/old-and-busted.c:531 ../libsvn_wc/old-and-busted.c:872
 #, c-format
 msgid "Entry '%s' has invalid 'schedule' value"
 msgstr "入口 '%s' 有无效 'schedule' 值"
 
-#: ../libsvn_wc/old-and-busted.c:680
+#: ../libsvn_wc/old-and-busted.c:681
 #, c-format
 msgid "Entry '%s' has invalid 'depth' value"
 msgstr "入口 '%s' 有无效 'depth' 值"
 
-#: ../libsvn_wc/old-and-busted.c:731
+#: ../libsvn_wc/old-and-busted.c:732
 #, c-format
 msgid "Entry '%s' has invalid '%s' value"
 msgstr "入口“%s”有无效值“%s”"
 
-#: ../libsvn_wc/old-and-busted.c:1088
+#: ../libsvn_wc/old-and-busted.c:1085
 #, c-format
 msgid "XML parser failed in '%s'"
 msgstr "XML 解析器失败于“%s”"
 
-#: ../libsvn_wc/old-and-busted.c:1144
+#: ../libsvn_wc/old-and-busted.c:1141
 msgid "Missing default entry"
 msgstr "丢失默认条目"
 
-#: ../libsvn_wc/old-and-busted.c:1149
+#: ../libsvn_wc/old-and-busted.c:1146
 msgid "Default entry has no revision number"
 msgstr "默认条目没有版本号"
 
-#: ../libsvn_wc/old-and-busted.c:1154
+#: ../libsvn_wc/old-and-busted.c:1151
 msgid "Default entry is missing URL"
 msgstr "默认条目没有URL"
 
-#: ../libsvn_wc/old-and-busted.c:1233
+#: ../libsvn_wc/old-and-busted.c:1230
 #, c-format
 msgid "Invalid version line in entries file of '%s'"
 msgstr "“%s”文件中的版本行无效"
 
-#: ../libsvn_wc/old-and-busted.c:1250
+#: ../libsvn_wc/old-and-busted.c:1247
 msgid "Missing entry terminator"
 msgstr "条目终结符丢失"
 
-#: ../libsvn_wc/old-and-busted.c:1253
+#: ../libsvn_wc/old-and-busted.c:1250
 msgid "Invalid entry terminator"
 msgstr "无效的条目终止符"
 
-#: ../libsvn_wc/old-and-busted.c:1257
+#: ../libsvn_wc/old-and-busted.c:1254
 #, c-format
 msgid "Error at entry %d in entries file for '%s':"
 msgstr "条目文件中的条目 %d 出错于 “%s”"
 
-#: ../libsvn_wc/props.c:263
+#: ../libsvn_wc/props.c:236
 #, c-format
 msgid "The node '%s' does not have properties in this state."
 msgstr "节点 '%s' 没有属性。"
 
-#: ../libsvn_wc/props.c:276
-#, c-format
-msgid "The property '%s' may not be merged into '%s'."
-msgstr "属性 “%s” 不能合并到 “%s”。"
-
-#: ../libsvn_wc/props.c:415
+#: ../libsvn_wc/props.c:401
 #, c-format
 msgid ""
 "Trying to add new property '%s'\n"
 "but the property already exists.\n"
 msgstr "试图增加新属性 “%s”，但是它已经存在。\n"
 
-#: ../libsvn_wc/props.c:424
+#: ../libsvn_wc/props.c:410
 #, c-format
 msgid ""
 "Trying to add new property '%s'\n"
 "but the property has been locally deleted.\n"
 msgstr "试图增加新属性 “%s”，但是它已经在本地被删除。\n"
 
-#: ../libsvn_wc/props.c:438
+#: ../libsvn_wc/props.c:424
 #, c-format
 msgid ""
 "Trying to delete property '%s'\n"
 "but the property has been locally added.\n"
 msgstr "试图删除属性 “%s”，但是它已经在本地被增加。\n"
 
-#: ../libsvn_wc/props.c:454
+#: ../libsvn_wc/props.c:440
 #, c-format
 msgid ""
 "Trying to delete property '%s'\n"
 "but the property has been locally modified.\n"
 msgstr "试图删除属性 “%s”，但是它已经在本地被修改。\n"
 
-#: ../libsvn_wc/props.c:464
+#: ../libsvn_wc/props.c:450
 #, c-format
 msgid ""
 "Trying to delete property '%s'\n"
 "but the property has been locally deleted and had a different value.\n"
 msgstr "试图删除属性 “%s”，但是它已经在本地被修改，并且具有不同的取值。\n"
 
-#: ../libsvn_wc/props.c:476
+#: ../libsvn_wc/props.c:462
 #, c-format
 msgid ""
 "Trying to delete property '%s'\n"
 "but the local property value is different.\n"
 msgstr "试图删除属性 “%s”，但是它的本地取值不同。\n"
 
-#: ../libsvn_wc/props.c:495
+#: ../libsvn_wc/props.c:481
 #, c-format
 msgid ""
 "Trying to change property '%s'\n"
 "but the local property value conflicts with the incoming change.\n"
 msgstr "试图修改属性 “%s”，但是它的本地取值不同。\n"
 
-#: ../libsvn_wc/props.c:503
+#: ../libsvn_wc/props.c:489
 #, c-format
 msgid ""
 "Trying to change property '%s'\n"
 "but the property has already been locally changed to a different value.\n"
 msgstr "试图修改属性 “%s”，但是它的本地取值已经改变。\n"
 
-#: ../libsvn_wc/props.c:510
+#: ../libsvn_wc/props.c:496
 #, c-format
 msgid ""
 "Trying to change property '%s'\n"
 "but the property has been locally deleted.\n"
 msgstr "试图修改属性 “%s”，但是它已经在本地被删除。\n"
 
-#: ../libsvn_wc/props.c:516
+#: ../libsvn_wc/props.c:502
 #, c-format
 msgid ""
 "Trying to change property '%s'\n"
 "but the property has been locally added with a different value.\n"
 msgstr "试图修改属性 “%s”，但是它已经在本地被增加，并且取值不同。\n"
 
-#: ../libsvn_wc/props.c:522
+#: ../libsvn_wc/props.c:508
 #, c-format
 msgid ""
 "Trying to change property '%s'\n"
 "but the property does not exist locally.\n"
 msgstr "试图修改属性 “%s”，但是它并不存在。\n"
 
-#: ../libsvn_wc/props.c:626
+#: ../libsvn_wc/props.c:612
 msgid "<<<<<<< (local property value)"
 msgstr "<<<<<<< (本地属性值)"
 
-#: ../libsvn_wc/props.c:627
+#: ../libsvn_wc/props.c:613
 msgid ">>>>>>> (incoming property value)"
 msgstr ">>>>>>> (服务器端属性值)"
 
@@ -7080,58 +7658,62 @@
 msgid "Incoming property value:\n"
 msgstr "外部属性取值:\n"
 
-#: ../libsvn_wc/props.c:960
-msgid "Conflict callback violated API: returned no results."
-msgstr "冲突的回调函数违反 API：没有返回结果。"
-
-#: ../libsvn_wc/props.c:1001
-msgid "Conflict callback violated API: returned no merged file."
-msgstr "冲突的回调函数违反 API：没有返回合并文件。"
-
-#: ../libsvn_wc/props.c:1992 ../libsvn_wc/props.c:2432
+#: ../libsvn_wc/props.c:1475 ../libsvn_wc/props.c:1884
+#: ../libsvn_wc/props.c:1985
 #, c-format
 msgid "Property '%s' is an entry property"
 msgstr "属性 “%s” 是条目属性"
 
-#: ../libsvn_wc/props.c:2039 ../libsvn_wc/props.c:2046
+#: ../libsvn_wc/props.c:1512 ../libsvn_wc/props.c:1519
 msgid "Failed to load properties"
 msgstr "加载属性失败"
 
-#: ../libsvn_wc/props.c:2088
+#: ../libsvn_wc/props.c:1555
 #, c-format
 msgid "Cannot set '%s' on a directory ('%s')"
 msgstr "无法设定“%s”于目录 (“%s”)"
 
-#: ../libsvn_wc/props.c:2096
+#: ../libsvn_wc/props.c:1562
 #, c-format
 msgid "Cannot set '%s' on a file ('%s')"
 msgstr "无法设定“%s”于文件 (“%s”)"
 
-#: ../libsvn_wc/props.c:2102
+#: ../libsvn_wc/props.c:1641
 #, c-format
-msgid "'%s' is not a file or directory"
-msgstr "“%s”不是文件或目录"
+msgid "Can't set '%s': file '%s' has binary mime type property"
+msgstr "不能设置“%s”: 文件“%s”有二进制的 mime 类型属性"
 
-#: ../libsvn_wc/props.c:2166
-#, c-format
-msgid "File '%s' has binary mime type property"
-msgstr "文件“%s”有二进制的 mime 类型属性"
+#: ../libsvn_wc/props.c:1686
+msgid "Failed to load current properties"
+msgstr "加载当前属性失败"
 
-#: ../libsvn_wc/props.c:2224
+#: ../libsvn_wc/props.c:1906
 #, c-format
 msgid "Can't set properties on '%s': invalid status for updating properties."
 msgstr "不能对 '%s' 设置属性: 对于更新属性，状态非法。"
 
-#: ../libsvn_wc/props.c:2263
-msgid "Failed to load current properties"
-msgstr "加载当前属性失败"
+#: ../libsvn_wc/props.c:1990
+#, c-format
+msgid "Property '%s' is a WC property, not a regular property"
+msgstr "“%s”是工作副本属性，不是常规属性"
 
-#: ../libsvn_wc/props.c:2531
+#: ../libsvn_wc/props.c:2084
 #, c-format
 msgid "Unrecognized line ending style '%s' for '%s'"
 msgstr "无法识别的行结束样式“%s”，对于“%s”"
 
-#: ../libsvn_wc/props.c:2591
+#. scratch_
+#: ../libsvn_wc/props.c:2135
+#, c-format
+msgid " (%d more duplicate targets found)"
+msgstr " (发现了 %d 个或更多地重复目标)"
+
+#: ../libsvn_wc/props.c:2140
+#, c-format
+msgid "Invalid %s property on '%s': target '%s' appears more than once%s"
+msgstr "无效属性 %s 于“%s”: 目标“%s”出现多次%s"
+
+#: ../libsvn_wc/props.c:2171
 #, c-format
 msgid "Cannot set non-inheritable mergeinfo on a non-directory ('%s')"
 msgstr "无法在非目录对象(“%s”)设定不可继承的合并信息"
@@ -7167,33 +7749,33 @@
 msgid "Invalid relocation destination: '%s' (does not point to target)"
 msgstr "非法迁移目标: '%s' (没有指向目标)"
 
-#: ../libsvn_wc/tree_conflicts.c:131
+#: ../libsvn_wc/tree_conflicts.c:136
 msgid "Unknown enumeration value in tree conflict description"
 msgstr "树冲突描述中有未知的枚举值"
 
-#: ../libsvn_wc/tree_conflicts.c:155
+#: ../libsvn_wc/tree_conflicts.c:160
 msgid "Invalid version info in tree conflict description"
 msgstr "树冲突描述中有非法的版本信息"
 
-#: ../libsvn_wc/tree_conflicts.c:212
+#: ../libsvn_wc/tree_conflicts.c:218
 #, c-format
 msgid "Invalid conflict info '%s' in tree conflict description"
 msgstr "树冲突描述中有非法的冲突信息 '%s'"
 
-#: ../libsvn_wc/tree_conflicts.c:223
+#: ../libsvn_wc/tree_conflicts.c:229
 msgid "Empty 'victim' field in tree conflict description"
 msgstr "树冲突描述中的 “victim” 域为空"
 
-#: ../libsvn_wc/tree_conflicts.c:231
+#: ../libsvn_wc/tree_conflicts.c:237
 msgid "Invalid 'node_kind' field in tree conflict description"
 msgstr "树冲突描述中有非法的 “node_kind” 域"
 
-#: ../libsvn_wc/tree_conflicts.c:408
+#: ../libsvn_wc/tree_conflicts.c:430
 #, c-format
 msgid "Attempt to add tree conflict that already exists at '%s'"
 msgstr "试图增加已经位于“%s”的树冲突"
 
-#: ../libsvn_wc/update_editor.c:931
+#: ../libsvn_wc/update_editor.c:999
 #, c-format
 msgid ""
 "Checksum mismatch while updating '%s':\n"
@@ -7204,47 +7786,47 @@
 "       期望:  %s\n"
 "       实际:  %s\n"
 
-#: ../libsvn_wc/update_editor.c:1053
+#: ../libsvn_wc/update_editor.c:1134
 #, c-format
-msgid "Path '%s' is not in the working copy"
-msgstr "路径 “%s” 不在工作副本中"
+msgid "'%s' is not valid as filename in directory '%s'"
+msgstr "“%s”不是合法文件名称于目录“%s”中"
 
-#: ../libsvn_wc/update_editor.c:1590
+#: ../libsvn_wc/update_editor.c:1611
 #, c-format
 msgid "Unexpected attempt to add a node at path '%s'"
 msgstr "意外的试图在路径“%s”增加节点"
 
-#: ../libsvn_wc/update_editor.c:1600
+#: ../libsvn_wc/update_editor.c:1622
 #, c-format
 msgid "Unexpected attempt to edit, delete, or replace a node at path '%s'"
 msgstr "意外的试图在路径“%s”编辑，删除或替换节点"
 
-#: ../libsvn_wc/update_editor.c:1978
+#: ../libsvn_wc/update_editor.c:2036
 #, c-format
 msgid ""
 "Failed to add directory '%s': object of the same name as the administrative "
 "directory"
 msgstr "无法增加目录“%s”: 对象与管理目录同名"
 
-#: ../libsvn_wc/update_editor.c:2608
+#: ../libsvn_wc/update_editor.c:2694
 msgid "Couldn't do property merge"
 msgstr "无法进行属性合并"
 
-#: ../libsvn_wc/update_editor.c:2920
+#: ../libsvn_wc/update_editor.c:3087
 #, c-format
 msgid ""
 "Failed to mark '%s' absent: item of the same name is already scheduled for "
 "addition"
 msgstr "无法将“%s”标记为不存在: 同名项目已加入增加调度"
 
-#: ../libsvn_wc/update_editor.c:3007
+#: ../libsvn_wc/update_editor.c:3175
 #, c-format
 msgid ""
 "Failed to add file '%s': object of the same name as the administrative "
 "directory"
 msgstr "无法增加文件“%s”: 对象与管理目录同名"
 
-#: ../libsvn_wc/update_editor.c:3434
+#: ../libsvn_wc/update_editor.c:3697
 #, c-format
 msgid ""
 "Checksum mismatch for '%s':\n"
@@ -7255,7 +7837,7 @@
 "       期望:  %s\n"
 "       记录:  %s\n"
 
-#: ../libsvn_wc/update_editor.c:5265
+#: ../libsvn_wc/update_editor.c:5256
 #, c-format
 msgid "Node '%s' exists."
 msgstr "节点“%s”已存在"
@@ -7265,49 +7847,59 @@
 msgid "Copyfrom-url '%s' has different repository root than '%s'"
 msgstr "Copyfrom-url“%s”与“%s”的版本库根目录不相同"
 
-#: ../libsvn_wc/upgrade.c:257
+#: ../libsvn_wc/update_editor.c:5514
+#, c-format
+msgid "'%s' is not an unmodified copied directory"
+msgstr "“%s”不是未修改的复制目录"
+
+#: ../libsvn_wc/update_editor.c:5525
+#, c-format
+msgid "Copyfrom '%s' doesn't match original location of '%s'"
+msgstr "Copyfrom“%s”与“%s”的原始位置不匹配"
+
+#: ../libsvn_wc/upgrade.c:255
 #, c-format
 msgid "Missing end of line in wcprops file for '%s'"
-msgstr "wcprops文件“%s”丢失了行结束符"
+msgstr "“%s”的工作副本属性文件丢失了行结束符"
 
-#: ../libsvn_wc/upgrade.c:634
+#: ../libsvn_wc/upgrade.c:631
 #, c-format
 msgid ""
 "Working copy '%s' can't be upgraded because the repository root is not "
 "available and can't be retrieved"
 msgstr "由于版本库的根不可用，并且不能找回，所以工作副本“%s”不能被升级"
 
-#: ../libsvn_wc/upgrade.c:641
+#: ../libsvn_wc/upgrade.c:638
 #, c-format
 msgid ""
 "Working copy '%s' can't be upgraded because the repository uuid is not "
 "available and can't be retrieved"
 msgstr "由于版本库的 UUID 不可用，并且不能找回，所以工作副本“%s”不能被升级"
 
-#: ../libsvn_wc/upgrade.c:648
+#: ../libsvn_wc/upgrade.c:645
 #, c-format
 msgid "Working copy '%s' can't be upgraded because it doesn't have a url"
 msgstr "由于没有 URL，所以工作副本“%s”不能被升级"
 
-#: ../libsvn_wc/upgrade.c:693
+#: ../libsvn_wc/upgrade.c:690
 msgid "Error parsing tree conflict skel"
 msgstr "解析树冲突骨架出错"
 
-#: ../libsvn_wc/upgrade.c:1176
+#: ../libsvn_wc/upgrade.c:1173
 #, c-format
 msgid ""
 "The working copy at '%s' is format 22 with WORKING nodes; use a format 22 "
 "client to diff/revert before using this client"
 msgstr "位于 '%s' 的工作副本是有 WORKING 节点的格式 22；请先使用支持格式 22 的客户端比较/还原后，再使用此客户端"
 
-#: ../libsvn_wc/upgrade.c:1220
+#: ../libsvn_wc/upgrade.c:1217
 #, c-format
 msgid ""
 "The working copy at '%s' is format 26 with conflicts; use a format 26 client "
 "to resolve before using this client"
 msgstr "位于 '%s' 的工作副本是有冲突的格式 26；请先使用支持格式 26 的客户端解决冲突后，再使用此客户端"
 
-#: ../libsvn_wc/upgrade.c:1416
+#: ../libsvn_wc/upgrade.c:1723
 msgid ""
 "Cannot upgrade with existing logs; run a cleanup operation on this working "
 "copy using a client version which is compatible with this working copy's "
@@ -7315,22 +7907,22 @@
 "with the current version"
 msgstr "不能在有日志文件时升级；请先使用与此工作副本格式兼容的客户端(例如生成此工作副本的客户端)执行清理操作，再升级"
 
-#: ../libsvn_wc/upgrade.c:1486
+#: ../libsvn_wc/upgrade.c:1792
 msgid ""
 "This working copy is corrupt and cannot be upgraded. Please check out a new "
 "working copy."
 msgstr "此工作副本损坏，不能升级。请重新检出。"
 
-#: ../libsvn_wc/upgrade.c:1538
+#: ../libsvn_wc/upgrade.c:1837
 msgid "(unreleased development version)"
 msgstr "(未发布的开发版本)"
 
-#: ../libsvn_wc/upgrade.c:1553
+#: ../libsvn_wc/upgrade.c:1853
 #, c-format
 msgid "Working copy '%s' is too old (format %d, created by Subversion %s)"
 msgstr "工作副本 '%s' 格式太旧 (格式 %d, Subversion %s 创建)"
 
-#: ../libsvn_wc/upgrade.c:1563
+#: ../libsvn_wc/upgrade.c:1863
 #, c-format
 msgid ""
 "Working copy '%s' is an old development version (format %d); to upgrade it, "
@@ -7340,79 +7932,89 @@
 "工作副本 '%s' 是旧开发版本的格式(%d); 请使用格式 18 客户端清理后， 再使用 'tools/dev/wc-ng/bump-to-"
 "19.py' 升级，最后使用当前客户端"
 
-#: ../libsvn_wc/upgrade.c:1775
+#: ../libsvn_wc/upgrade.c:2092
 #, c-format
-msgid "Can't upgrade '%s' as it is not a pre-1.7 working copy directory"
-msgstr "不能升级 '%s'，因为它不是 1.7 之前的工作副本目录"
+msgid "Can't upgrade '%s' as it is not a working copy"
+msgstr "不能升级“%s”，因为它不是工作副本目录"
 
-#: ../libsvn_wc/upgrade.c:1824
+#: ../libsvn_wc/upgrade.c:2141
 #, c-format
-msgid ""
-"Can't upgrade '%s' as it is not a pre-1.7 working copy root, the root is '%s'"
-msgstr "不能升级 '%s'，因为它不是 1.7 之前的工作副本根目录，根目录是 '%s'"
+msgid "Can't upgrade '%s' as it is not a working copy root, the root is '%s'"
+msgstr "不能升级“%s”，因为它不是工作副本根目录，根目录是 '%s'"
 
-#: ../libsvn_wc/wc_db.c:539
+#: ../libsvn_wc/wc_db.c:452
 #, c-format
 msgid "No REPOSITORY table entry for id '%ld'"
 msgstr "对于标识 '%ld' 没有 REPOSITORY 表入口"
 
-#: ../libsvn_wc/wc_db.c:840
+#: ../libsvn_wc/wc_db.c:718
 #, c-format
 msgid "The file '%s' has no checksum."
 msgstr "文件 '%s' 没有校验和。"
 
-#: ../libsvn_wc/wc_db.c:1556
-#, c-format
-msgid "The node '%s' is not in a workingcopy."
-msgstr "节点 “%s” 不在工作副本中"
-
-#: ../libsvn_wc/wc_db.c:2075 ../libsvn_wc/wc_db.c:2451
-#: ../libsvn_wc/wc_db.c:7209
+#: ../libsvn_wc/wc_db.c:2485 ../libsvn_wc/wc_db.c:2866
+#: ../libsvn_wc/wc_db.c:8925
 #, c-format
 msgid "The node '%s' has a corrupt checksum value."
 msgstr "节点 '%s' 的校验和损坏。"
 
-#: ../libsvn_wc/wc_db.c:3050
+#: ../libsvn_wc/wc_db.c:2670
 #, c-format
-msgid "The node '%s' is not an external."
-msgstr "节点 “%s” 不是外部对象"
+msgid "The node '%s' has a BASE status that has no properties."
+msgstr ""
 
-#: ../libsvn_wc/wc_db.c:3526 ../libsvn_wc/wc_db.c:3808
+#: ../libsvn_wc/wc_db.c:3496
 #, c-format
-msgid "Cannot handle status of '%s'"
-msgstr "不能处理“%s”的状态"
+msgid "The node '%s' is not an external."
+msgstr "节点 “%s” 不是外部对象"
 
-#: ../libsvn_wc/wc_db.c:4684
+#: ../libsvn_wc/wc_db.c:3903
 #, c-format
-msgid "Can't store properties for '%s' in '%s'."
-msgstr "不能存储 '%s' 的属性，在 '%s' 中。"
+msgid "Expected node '%s' to be deleted."
+msgstr "期望节点“%s”被删除。"
 
-#: ../libsvn_wc/wc_db.c:5216 ../libsvn_wc/wc_db.c:5245
+#: ../libsvn_wc/wc_db.c:6399 ../libsvn_wc/wc_db.c:6478
 #, c-format
 msgid "Can't revert '%s' without reverting children"
 msgstr "不能恢复 '%s'，而不恢复孩子。"
 
-#: ../libsvn_wc/wc_db.c:5332
+#: ../libsvn_wc/wc_db.c:6575
 #, c-format
 msgid "Can't revert '%s' without reverting parent"
 msgstr "不能恢复 '%s'，而不恢复父亲。"
 
-#: ../libsvn_wc/wc_db.c:5394
+#: ../libsvn_wc/wc_db.c:6694
 #, c-format
 msgid "Unsupported depth for revert of '%s'"
 msgstr "对于恢复 '%s'，其深度不受支持"
 
-#: ../libsvn_wc/wc_db.c:6170
+#: ../libsvn_wc/wc_db.c:7537
 #, c-format
 msgid "Cannot delete '%s' as '%s' is excluded by server"
 msgstr "不能删除 '%s'，因为 '%s' 被服务器排除"
 
-#: ../libsvn_wc/wc_db.c:6599
+#: ../libsvn_wc/wc_db.c:7548
+#, c-format
+msgid "Cannot delete '%s' as it is excluded by server"
+msgstr "不能删除 '%s'，因为它被服务器排除"
+
+#: ../libsvn_wc/wc_db.c:7555
+#, c-format
+msgid "Cannot delete '%s' as it is excluded"
+msgstr "不能删除 '%s'，因为它被排除"
+
+#: ../libsvn_wc/wc_db.c:7969
+#, c-format
+msgid ""
+"Cannot move '%s' to '%s' because they are not in the same working copy"
+msgstr "不能移动 '%s' 到 '%s'，因为它们不是同一工作副本"
+
+#: ../libsvn_wc/wc_db.c:8327
 #, c-format
 msgid "Corrupt data for '%s'"
 msgstr "'%s' 的数据损坏"
 
-#: ../libsvn_wc/wc_db.c:6911
+#: ../libsvn_wc/wc_db.c:8631
 #, c-format
 msgid ""
 "The node '%s' comes from unexpected repository '%s', expected '%s'; if this "
@@ -7422,141 +8024,186 @@
 "节点“%s”来自不期望的版本库“%s”，期望的版本库是“%s”；如果此节点是文件外部引用，那么在外部定义中使用正确的 URL "
 "可以修正这个问题，请参见问题 #4087 以获得详细信息"
 
-#: ../libsvn_wc/wc_db.c:7321
+#: ../libsvn_wc/wc_db.c:9050
 #, c-format
 msgid "The node '%s' is not in working copy '%s'"
 msgstr "节点“%s”不在工作副本“%s”中"
 
-#: ../libsvn_wc/wc_db.c:7353
+#: ../libsvn_wc/wc_db.c:9087
 #, c-format
 msgid "The node '%s' is not installable"
 msgstr "节点 '%s' 不可安装"
 
-#: ../libsvn_wc/wc_db.c:9172
+#: ../libsvn_wc/wc_db.c:9516 ../libsvn_wc/wc_db.c:9775
+#, c-format
+msgid "The node '%s' has a status that has no properties."
+msgstr "节点 '%s' 有状态，没有属性。"
+
+#: ../libsvn_wc/wc_db.c:11615
 #, c-format
 msgid "Expected node '%s' to be added."
 msgstr "期望节点“%s”被增加。"
 
-#: ../libsvn_wc/wc_db.c:9549
+#: ../libsvn_wc/wc_db.c:11961
 #, c-format
-msgid "Expected node '%s' to be deleted."
-msgstr "期望节点“%s”被删除。"
+msgid "Path '%s' was not moved here"
+msgstr "路径“%s”不是移到这里"
+
+#: ../libsvn_wc/wc_db.c:12030
+#, c-format
+msgid "The base node '%s' was not found."
+msgstr "找不到基础节点 '%s'。"
 
-#: ../libsvn_wc/wc_db.c:9867
+#: ../libsvn_wc/wc_db.c:12462
 #, c-format
 msgid ""
 "The properties of '%s' are in an indeterminate state and cannot be upgraded. "
 "See issue #2530."
 msgstr "'%s' 的属性处于不确定的状态，不能更新。详情参见问题 #2530。"
 
-#: ../libsvn_wc/wc_db.c:9879
+#: ../libsvn_wc/wc_db.c:12474
 #, c-format
 msgid "Insufficient NODES rows for '%s'"
 msgstr "'%s' 的节点行数不足"
 
-#: ../libsvn_wc/wc_db.c:10072
+#: ../libsvn_wc/wc_db.c:12621
 #, c-format
 msgid "Repository '%s' not found in the database"
 msgstr "在数据库中找不到版本库“%s”"
 
-#: ../libsvn_wc/wc_db.c:10826 ../libsvn_wc/wc_db.c:10874
+#: ../libsvn_wc/wc_db.c:13608 ../libsvn_wc/wc_db.c:13656
 #, c-format
 msgid "'%s' is already locked."
 msgstr "'%s' 已经锁定。"
 
-#: ../libsvn_wc/wc_db.c:10831 ../libsvn_wc/wc_db.c:10882
+#: ../libsvn_wc/wc_db.c:13613 ../libsvn_wc/wc_db.c:13664
 #, c-format
 msgid "Working copy '%s' locked."
 msgstr "工作副本 '%s' 已经锁定。"
 
-#: ../libsvn_wc/wc_db.c:10955
+#: ../libsvn_wc/wc_db.c:13736
 #, c-format
 msgid "'%s' is already locked via '%s'."
 msgstr "'%s' 已经通过 '%s' 锁定。"
 
-#: ../libsvn_wc/wc_db.c:11085
+#: ../libsvn_wc/wc_db.c:13910
 #, c-format
 msgid "Working copy not locked at '%s'."
 msgstr "工作副本 '%s' 未被锁定。"
 
-#: ../libsvn_wc/wc_db.c:11473
+#: ../libsvn_wc/wc_db.c:14293
 #, c-format
 msgid "Modification of '%s' already exists"
 msgstr "“%s” 的修改已存在"
 
-#: ../libsvn_wc/wc_db.c:11548 ../libsvn_wc/wc_db.c:11555
-#: ../libsvn_wc/wc_db.c:11565
-#, c-format
-msgid "Invalid conflict file '%s' for '%s'"
-msgstr "非法的冲突文件“%s”于“%s”"
-
-#: ../libsvn_wc/wc_db.c:11635
-#, c-format
-msgid "Invalid property reject file '%s' for '%s'"
-msgstr "非法的属性拒绝文件“%s”于“%s”"
-
 #. If EXPRESSION is false, cause the caller to return an SVN_ERR_WC_CORRUPT
 #. * error, showing EXPRESSION and the caller's LOCAL_RELPATH in the message.
-#: ../libsvn_wc/wc_db.c:12379
+#: ../libsvn_wc/wc_db.c:14935
 #, c-format
 msgid ""
 "database inconsistency at local_relpath='%s' verifying expression '%s'"
 msgstr "数据库不一致，路径是“%s”，校验表达式是“%s”"
 
-#: ../libsvn_wc/wc_db_pristine.c:124
+#: ../libsvn_wc/wc_db.c:15059
+#, c-format
+msgid "Can't upgrade '%s' as it is not a working copy root"
+msgstr "不能升级 '%s'，因为它不是工作副本目录"
+
+#: ../libsvn_wc/wc_db.c:15065
+#, c-format
+msgid ""
+"Working copy '%s' is too old and must be upgraded to at least format %d, as "
+"created by Subversion %s"
+msgstr "工作副本 '%s' 格式太旧，必须至少升级到格式 %d, 被 Subversion %s 创建"
+
+#: ../libsvn_wc/wc_db.c:15083
+msgid "Working copy upgrade failed"
+msgstr "工作副本升级失败"
+
+#: ../libsvn_wc/wc_db_pristine.c:125 ../libsvn_wc/wc_db_pristine.c:457
 #, c-format
-msgid "Pristine text not found"
-msgstr "找不到原始内容"
+msgid "The pristine text with checksum '%s' was not found"
+msgstr "找不到校验和为“%s”的原始内容"
 
-#: ../libsvn_wc/wc_db_pristine.c:200
+#: ../libsvn_wc/wc_db_pristine.c:191
 #, c-format
 msgid "Pristine text '%s' not present"
 msgstr "原始内容 “%s” 不存在"
 
-#: ../libsvn_wc/wc_db_pristine.c:233
+#: ../libsvn_wc/wc_db_pristine.c:224
 #, c-format
 msgid "Can't read '%s' from pristine store because no checksum supplied"
 msgstr "没有提供校验和，因此不能从原始内容仓库中读取 '%s'"
 
-#: ../libsvn_wc/wc_db_pristine.c:346
+#: ../libsvn_wc/wc_db_pristine.c:328
 #, c-format
 msgid "New pristine text '%s' has different size: %ld versus %ld"
 msgstr "新原始内容 '%s' 有不同的大小: %ld 与 %ld"
 
-#: ../libsvn_wc/wc_db_pristine.c:476
-#, c-format
-msgid "The pristine text with checksum '%s' was not found"
-msgstr "找不到校验和为“%s”的原始内容"
-
-#: ../libsvn_wc/wc_db_pristine.c:515
+#: ../libsvn_wc/wc_db_pristine.c:496
 #, c-format
 msgid "The pristine text with MD5 checksum '%s' was not found"
 msgstr "找不到 MD5 校验和为“%s”的原始内容"
 
-#: ../libsvn_wc/wc_db_pristine.c:777
+#: ../libsvn_wc/wc_db_update_move.c:282 ../libsvn_wc/wc_db_update_move.c:306
+#, c-format
+msgid "'%s' already in conflict"
+msgstr "“%s” 已在冲突中"
+
+#: ../libsvn_wc/wc_db_update_move.c:1382
+#, c-format
+msgid "'%s' is not in conflict"
+msgstr "“%s”不在冲突中"
+
+#: ../libsvn_wc/wc_db_update_move.c:1395
+#, c-format
+msgid "'%s' is not a tree-conflict victim"
+msgstr "'%s' 不是树冲突牺牲品"
+
+#: ../libsvn_wc/wc_db_update_move.c:1754
+#, c-format
+msgid "Cannot auto-resolve tree-conflict on '%s'"
+msgstr "不能在“%s”自动解决树冲突"
+
+#: ../libsvn_wc/wc_db_update_move.c:1817
 #, c-format
 msgid ""
-"The pristine text with checksum '%s' was found in the DB but not on disk"
-msgstr "在数据库中找到了校验和为“%s”的原始内容，但是它不在磁盘上"
+"Cannot apply update because move source %s' is a mixed-revision working copy"
+msgstr ""
+
+#: ../libsvn_wc/wc_db_update_move.c:1828
+#, c-format
+msgid "Cannot apply update because move source '%s' is a switched subtree"
+msgstr ""
+
+#: ../libsvn_wc/wc_db_update_move.c:1879
+#, c-format
+msgid "The node '%s' has not been moved away"
+msgstr "节点“%s”没有被移走"
+
+#: ../libsvn_wc/wc_db_update_move.c:1908
+#, c-format
+msgid "'%s' is not deleted"
+msgstr "“%s”没有被删除"
 
 #: ../libsvn_wc/wc_db_util.c:69
 #, c-format
 msgid "Missing a row in WCROOT."
 msgstr "WCROOT 中丢失了一行。"
 
-#: ../libsvn_wc/wc_db_util.c:134
+#: ../libsvn_wc/wc_db_util.c:135
 #, c-format
 msgid "Working copy database '%s' not found"
 msgstr "找不到工作副本数据库“%s”"
 
-#: ../libsvn_wc/wc_db_wcroot.c:258
+#: ../libsvn_wc/wc_db_wcroot.c:276
 #, c-format
 msgid ""
 "Working copy format of '%s' is too old (%d); please check out your working "
 "copy again"
 msgstr "“%s”的工作副本格式太旧(%d)；请重新取出工作副本"
 
-#: ../libsvn_wc/wc_db_wcroot.c:268
+#: ../libsvn_wc/wc_db_wcroot.c:286
 #, c-format
 msgid ""
 "This client is too old to work with the working copy at\n"
@@ -7569,55 +8216,89 @@
 "  http://subversion.apache.org/faq.html#working-copy-format-change\n"
 "以获得更详细的信息。\n"
 
-#: ../libsvn_wc/wc_db_wcroot.c:289
+#: ../libsvn_wc/wc_db_wcroot.c:307
 msgid "Cleanup with an older 1.7 client before upgrading with this client"
 msgstr "请在用此客户端升级之前，用旧的 1.7 客户端清理"
 
-#: ../libsvn_wc/wc_db_wcroot.c:595
+#: ../libsvn_wc/wc_db_wcroot.c:318
+#, c-format
+msgid ""
+"The working copy at '%s'\n"
+"is too old (format %d) to work with client version '%s' (expects format %d). "
+"You need to upgrade the working copy first.\n"
+msgstr ""
+
+#: ../libsvn_wc/wc_db_wcroot.c:396
+#, c-format
+msgid "The symlink at '%s' points nowhere"
+msgstr "位于“%s”的符号连接没有指向任何地方"
+
+#: ../libsvn_wc/wc_db_wcroot.c:665
 #, c-format
 msgid "Missing a row in WCROOT for '%s'."
 msgstr "WCROOT 中的 '%s' 丢失了一行。"
 
-#: ../libsvn_wc/wc_db_wcroot.c:764
+#: ../libsvn_wc/wc_db_wcroot.c:716
+#, c-format
+msgid "The working copy at '%s' is corrupt."
+msgstr "位于“%s”的工作副本已损坏。"
+
+#: ../libsvn_wc/wc_db_wcroot.c:732
+#, c-format
+msgid "The working copy database at '%s' is missing."
+msgstr "位于“%s”的工作副本数据库丢失。"
+
+#: ../libsvn_wc/wc_db_wcroot.c:741
+#, c-format
+msgid "The working copy database at '%s' is corrupt."
+msgstr "位于“%s”的工作副本数据库损坏。"
+
+#: ../libsvn_wc/wc_db_wcroot.c:899
 #, c-format
 msgid "'%s' is not a working copy root"
 msgstr "'%s' 不是工作副本根目录"
 
-#: ../libsvn_wc/workqueue.c:681
+#: ../libsvn_wc/workqueue.c:518
 #, c-format
 msgid ""
 "Can't install '%s' from pristine store, because no checksum is recorded for "
 "this file"
 msgstr "文件 '%s' 没有校验和记录，因此不能从原始内容仓库中安装"
 
-#: ../libsvn_wc/workqueue.c:1529
+#: ../libsvn_wc/workqueue.c:1499
+#, c-format
+msgid "Unrecognized work item in the queue"
+msgstr "队列中有无法识别的工作项"
+
+#: ../libsvn_wc/workqueue.c:1579
 #, c-format
-msgid "Unrecognized work item in the queue associated with '%s'"
-msgstr "“%s” 关联的队列中的项目无法识别"
+msgid ""
+"Failed to run the WC DB work queue associated with '%s', work item %d %s"
+msgstr "运行与“%s”关联的工作副本数据库工作队列失败，工作项 %d %s"
 
-#: ../svn/add-cmd.c:100
+#: ../svn/add-cmd.c:101
 msgid "Could not add all targets because some targets don't exist"
 msgstr "因为一些目标不存在，所以不能增加全部目标"
 
-#: ../svn/add-cmd.c:104
+#: ../svn/add-cmd.c:105
 msgid "Could not add all targets because some targets are already versioned"
 msgstr "因为一些目标已经版本化，所以不能增加全部目标"
 
-#: ../svn/blame-cmd.c:303 ../svn/list-cmd.c:235
+#: ../svn/blame-cmd.c:303 ../svn/list-cmd.c:300
 msgid "'verbose' option invalid in XML mode"
 msgstr "在XML模式中“verbose”选项无效"
 
-#: ../svn/blame-cmd.c:315 ../svn/info-cmd.c:565 ../svn/list-cmd.c:247
-#: ../svn/status-cmd.c:297
+#: ../svn/blame-cmd.c:315 ../svn/info-cmd.c:613 ../svn/list-cmd.c:312
+#: ../svn/status-cmd.c:308
 msgid "'incremental' option only valid in XML mode"
 msgstr "只有在XML模式“incremental”选项才有效"
 
 #: ../svn/blame-cmd.c:378
 #, c-format
-msgid "Skipping binary file: '%s'\n"
-msgstr "略过二进制文件: “%s”\n"
+msgid "Skipping binary file (use --force to treat as text): '%s'\n"
+msgstr "略过二进制文件(使用 --force 将之视为纯文本):“%s”\n"
 
-#: ../svn/blame-cmd.c:412
+#: ../svn/blame-cmd.c:415
 msgid ""
 "Could not perform blame on all targets because some targets don't exist"
 msgstr "因为一些目标不存在，所以不能追溯全部目标"
@@ -7645,11 +8326,182 @@
 "versioned"
 msgstr "因为一些目标没有版本化，所以不能对全部目标设置修改列表"
 
-#: ../svn/checkout-cmd.c:133 ../svn/switch-cmd.c:137
+#: ../svn/checkout-cmd.c:133 ../svn/switch-cmd.c:138
 #, c-format
 msgid "'%s' does not appear to be a URL"
 msgstr "“%s”不像是URL"
 
+#: ../svn/cl-conflicts.c:80
+msgid "local file edit"
+msgstr "本地文件编辑"
+
+#: ../svn/cl-conflicts.c:82
+msgid "local file obstruction"
+msgstr "本地文件障碍"
+
+#: ../svn/cl-conflicts.c:84
+msgid "local file delete"
+msgstr "本地文件删除"
+
+#: ../svn/cl-conflicts.c:86
+msgid "local file missing"
+msgstr "本地文件缺失"
+
+#: ../svn/cl-conflicts.c:88
+msgid "local file unversioned"
+msgstr "本地文件未版本控制"
+
+#: ../svn/cl-conflicts.c:90
+msgid "local file add"
+msgstr "本地文件增加"
+
+#: ../svn/cl-conflicts.c:92
+msgid "local file replace"
+msgstr "本地文件替换"
+
+#: ../svn/cl-conflicts.c:94
+msgid "local file moved away"
+msgstr "本地文件移走"
+
+#: ../svn/cl-conflicts.c:96
+msgid "local file moved here"
+msgstr "本地文件移入"
+
+#: ../svn/cl-conflicts.c:103
+msgid "local dir edit"
+msgstr "本地目录编辑"
+
+#: ../svn/cl-conflicts.c:105
+msgid "local dir obstruction"
+msgstr "本地目录障碍"
+
+#: ../svn/cl-conflicts.c:107
+msgid "local dir delete"
+msgstr "本地目录删除"
+
+#: ../svn/cl-conflicts.c:109
+msgid "local dir missing"
+msgstr "本地目录缺失"
+
+#: ../svn/cl-conflicts.c:111
+msgid "local dir unversioned"
+msgstr "本地目录未版本控制"
+
+#: ../svn/cl-conflicts.c:113
+msgid "local dir add"
+msgstr "本地目录增加"
+
+#: ../svn/cl-conflicts.c:115
+msgid "local dir replace"
+msgstr "本地目录替换"
+
+#: ../svn/cl-conflicts.c:117
+msgid "local dir moved away"
+msgstr "本地目录移走"
+
+#: ../svn/cl-conflicts.c:119
+msgid "local dir moved here"
+msgstr "本地目录移入"
+
+#: ../svn/cl-conflicts.c:141
+msgid "incoming file edit"
+msgstr "进入的文件编辑"
+
+#: ../svn/cl-conflicts.c:143
+msgid "incoming file add"
+msgstr "进入的文件增加"
+
+#: ../svn/cl-conflicts.c:145
+msgid "incoming file delete"
+msgstr "进入的文件删除"
+
+#: ../svn/cl-conflicts.c:147
+msgid "incoming file replace"
+msgstr "进入的文件替换"
+
+#: ../svn/cl-conflicts.c:154
+msgid "incoming dir edit"
+msgstr "进入的目录编辑"
+
+#: ../svn/cl-conflicts.c:156
+msgid "incoming dir add"
+msgstr "进入的目录增加"
+
+#: ../svn/cl-conflicts.c:158
+msgid "incoming dir delete"
+msgstr "进入的目录删除"
+
+#: ../svn/cl-conflicts.c:160
+msgid "incoming dir replace"
+msgstr "进入的目录替换"
+
+#: ../svn/cl-conflicts.c:178
+msgid "upon update"
+msgstr "接着更新"
+
+#: ../svn/cl-conflicts.c:179
+msgid "upon switch"
+msgstr "接着切换"
+
+#: ../svn/cl-conflicts.c:180
+msgid "upon merge"
+msgstr "接着合并"
+
+#: ../svn/cl-conflicts.c:181
+msgid "upon none"
+msgstr "无"
+
+#: ../svn/cl-conflicts.c:200
+msgid "local edit"
+msgstr "本地编辑"
+
+#: ../svn/cl-conflicts.c:203
+msgid "local add"
+msgstr "本地增加"
+
+#: ../svn/cl-conflicts.c:206
+msgid "local delete"
+msgstr "本地删除"
+
+#: ../svn/cl-conflicts.c:209
+msgid "local obstruction"
+msgstr "本地障碍"
+
+#: ../svn/cl-conflicts.c:212
+#, c-format
+msgid "local %s"
+msgstr "本地%s"
+
+#: ../svn/cl-conflicts.c:220
+msgid "incoming edit"
+msgstr "进入的编辑"
+
+#: ../svn/cl-conflicts.c:223
+msgid "incoming add"
+msgstr "进入的增加"
+
+#: ../svn/cl-conflicts.c:226
+msgid "incoming delete"
+msgstr "进入的删除"
+
+#: ../svn/cl-conflicts.c:229
+#, c-format
+msgid "incoming %s"
+msgstr "进入的 %s"
+
+#: ../svn/cl-conflicts.c:235 ../svn/cl-conflicts.c:277
+#, c-format
+msgid "%s, %s %s"
+msgstr "%s, %s %s"
+
+#. A catch-all message for very rare or nominally impossible cases.
+#. It will not be pretty, but is closer to an internal error than
+#. an ordinary user-facing string.
+#: ../svn/cl-conflicts.c:285
+#, c-format
+msgid "local: %s %s incoming: %s %s %s"
+msgstr "本地: %s %s 进入的: %s %s %s"
+
 #: ../svn/cleanup-cmd.c:92
 #, c-format
 msgid ""
@@ -7657,237 +8509,413 @@
 "copy ('%s') instead."
 msgstr "工作副本被锁定；请先对工作副本(“%s”)根目录执行“svn cleanup”。"
 
-#: ../svn/commit-cmd.c:79
+#: ../svn/commit-cmd.c:80
 #, c-format
 msgid ""
 "svn: The depth of this commit is '%s', but copies are always performed "
 "recursively in the repository.\n"
 msgstr "svn: 此提交的深度是“%s”，但是在版本库中执行的复制总是递归的。\n"
 
-#: ../svn/commit-cmd.c:115
+#: ../svn/commit-cmd.c:116
 msgid "Commit targets must be local paths"
 msgstr "提交目标必须是本地路径"
 
-#: ../svn/conflict-callbacks.c:158
+#: ../svn/conflict-callbacks.c:155 ../svn/conflict-callbacks.c:172
+msgid "MINE"
+msgstr "我的"
+
+#: ../svn/conflict-callbacks.c:160 ../svn/conflict-callbacks.c:170
+msgid "THEIRS"
+msgstr "别人的"
+
+#: ../svn/conflict-callbacks.c:163
+msgid "MERGED"
+msgstr "已合并"
+
+#: ../svn/conflict-callbacks.c:220 ../svn/conflict-callbacks.c:276
 msgid "||||||| ORIGINAL"
 msgstr "||||||| 原始版本"
 
-#: ../svn/conflict-callbacks.c:159
+#: ../svn/conflict-callbacks.c:221
 msgid "<<<<<<< MINE (select with 'mc')"
 msgstr "<<<<<<< 我的版本 (使用 “mc” 选择)"
 
-#: ../svn/conflict-callbacks.c:160
+#: ../svn/conflict-callbacks.c:222
 msgid ">>>>>>> THEIRS (select with 'tc')"
 msgstr ">>>>>>> 他人版本 (使用 “tc” 选择)"
 
-#: ../svn/conflict-callbacks.c:192
+#: ../svn/conflict-callbacks.c:277
+msgid "<<<<<<< MINE"
+msgstr "<<<<<<< 我的"
+
+#: ../svn/conflict-callbacks.c:278
+msgid ">>>>>>> THEIRS"
+msgstr ">>>>>>> 别人的"
+
+#: ../svn/conflict-callbacks.c:333 ../svn/file-merge.c:503
 msgid "No editor found."
 msgstr "没有发现编辑器。"
 
-#: ../svn/conflict-callbacks.c:199
+#: ../svn/conflict-callbacks.c:342 ../svn/file-merge.c:515
 msgid "Error running editor."
 msgstr "执行编辑器错误。"
 
-#: ../svn/conflict-callbacks.c:209
+#: ../svn/conflict-callbacks.c:352
 #, c-format
 msgid ""
 "Invalid option; there's no merged version to edit.\n"
 "\n"
 msgstr ""
-"非法选项；没有已合并的版本来编辑。\n"
+"无效选项；没有已合并的版本来编辑。\n"
 "\n"
 
-#: ../svn/conflict-callbacks.c:239
-msgid "No merge tool found.\n"
-msgstr "没有发现合并工具。\n"
+#: ../svn/conflict-callbacks.c:411
+msgid "No merge tool found, try '(m) merge' instead.\n"
+msgstr "没有发现合并工具，请尝试“(m) merge”。\n"
 
-#: ../svn/conflict-callbacks.c:246
-msgid "Error running merge tool."
-msgstr "执行合并工具错误。"
-
-#: ../svn/conflict-callbacks.c:316
-msgid "No editor found; leaving all conflicts."
-msgstr "没有发现编辑器；不处理冲突。"
+#: ../svn/conflict-callbacks.c:419
+msgid "Error running merge tool, try '(m) merge' instead."
+msgstr "执行合并工具错误，请尝试“(m) merge”。"
 
-#: ../svn/conflict-callbacks.c:325
-msgid "Error running editor; leaving all conflicts."
-msgstr "执行编辑器错误；不处理冲突。"
+#: ../svn/conflict-callbacks.c:451
+msgid "change merged file in an editor  [edit]"
+msgstr "在编辑器中修改合并后的文件  [edit]"
+
+#. Translators: keep long_desc below 70 characters (wrap with a left
+#. margin of 9 spaces if needed); don't translate the words within square
+#. brackets.
+#: ../svn/conflict-callbacks.c:451
+msgid "edit file"
+msgstr "编辑文件"
+
+#: ../svn/conflict-callbacks.c:454
+msgid "show all changes made to merged file"
+msgstr "显示写入合并文件的所有改动"
+
+#: ../svn/conflict-callbacks.c:454
+msgid "show diff"
+msgstr "显示差异"
+
+#: ../svn/conflict-callbacks.c:456
+msgid "accept merged version of file"
+msgstr "接受文件的合并版本"
+
+#: ../svn/conflict-callbacks.c:456 ../svn/conflict-callbacks.c:501
+#: ../svn/conflict-callbacks.c:533
+msgid "mark resolved"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:459 ../svn/conflict-callbacks.c:498
+msgid "display conflict"
+msgstr "显示冲突"
+
+#: ../svn/conflict-callbacks.c:459
+msgid "show all conflicts (ignoring merged version)"
+msgstr "显示所有冲突 (忽略已合并版本)"
+
+#: ../svn/conflict-callbacks.c:461
+msgid "accept my version for all conflicts (same)  [mine-conflict]"
+msgstr "对于所有冲突，使用我的版本 [mine-conflict]"
+
+#: ../svn/conflict-callbacks.c:461
+msgid "my side of conflict"
+msgstr "我这边的冲突"
+
+#: ../svn/conflict-callbacks.c:464
+msgid "accept their version for all conflicts (same)  [theirs-conflict]"
+msgstr "对于所有冲突，使用他们的版本 [theirs-conflict]"
+
+#: ../svn/conflict-callbacks.c:464
+msgid "their side of conflict"
+msgstr "他们的冲突"
+
+#: ../svn/conflict-callbacks.c:469
+msgid "accept my version of entire file (even non-conflicts)  [mine-full]"
+msgstr "整个文件使用我的版本(纵然没有冲突) [mine-full]"
+
+#: ../svn/conflict-callbacks.c:469 ../svn/conflict-callbacks.c:492
+#: ../svn/conflict-callbacks.c:515
+msgid "my version"
+msgstr "我的版本"
 
-#: ../svn/conflict-callbacks.c:361
-msgid "No merge tool found; leaving all conflicts."
-msgstr "没有发现合并工具；不处理冲突。"
+#: ../svn/conflict-callbacks.c:472
+msgid "accept their version of entire file (same)  [theirs-full]"
+msgstr "整个文件使用他们的版本 [theirs-full]"
 
-#: ../svn/conflict-callbacks.c:370
-msgid "Error running merge tool; leaving all conflicts."
-msgstr "执行合并工具错误；不处理冲突。"
+#: ../svn/conflict-callbacks.c:472 ../svn/conflict-callbacks.c:495
+#: ../svn/conflict-callbacks.c:518
+msgid "their version"
+msgstr "他们的版本"
 
-#: ../svn/conflict-callbacks.c:414
-#, c-format
-msgid "Conflict discovered in '%s'.\n"
-msgstr "在 “%s” 中发现冲突。\n"
+#: ../svn/conflict-callbacks.c:476 ../svn/util.c:774
+msgid "merge"
+msgstr "合并"
 
-#: ../svn/conflict-callbacks.c:419
-#, c-format
-msgid "Conflict for property '%s' discovered on '%s'.\n"
-msgstr "属性 “%s” 冲突，位于 “%s”。\n"
+#: ../svn/conflict-callbacks.c:476
+msgid "use internal merge tool to resolve conflict"
+msgstr "使用内部合并工具解决冲突"
+
+#: ../svn/conflict-callbacks.c:478
+msgid "launch external tool to resolve conflict  [launch]"
+msgstr "执行外部工具解决冲突 [launch]"
+
+#: ../svn/conflict-callbacks.c:478
+msgid "launch tool"
+msgstr "执行工具"
+
+#: ../svn/conflict-callbacks.c:480 ../svn/conflict-callbacks.c:503
+#: ../svn/conflict-callbacks.c:521
+msgid "mark the conflict to be resolved later  [postpone]"
+msgstr "编辑冲突推迟解决 [postpone]"
+
+#: ../svn/conflict-callbacks.c:480 ../svn/conflict-callbacks.c:503
+#: ../svn/conflict-callbacks.c:521 ../svn/conflict-callbacks.c:535
+#: ../svn/conflict-callbacks.c:553 ../svn/conflict-callbacks.c:567
+#: ../svn/conflict-callbacks.c:583 ../svn/conflict-callbacks.c:599
+msgid "postpone"
+msgstr "推迟"
+
+#: ../svn/conflict-callbacks.c:483 ../svn/conflict-callbacks.c:506
+#: ../svn/conflict-callbacks.c:524 ../svn/conflict-callbacks.c:537
+#: ../svn/conflict-callbacks.c:555 ../svn/conflict-callbacks.c:569
+#: ../svn/conflict-callbacks.c:585 ../svn/conflict-callbacks.c:601
+msgid "postpone all remaining conflicts"
+msgstr "推迟解决所有剩余的冲突"
+
+#: ../svn/conflict-callbacks.c:483 ../svn/conflict-callbacks.c:506
+#: ../svn/conflict-callbacks.c:524 ../svn/conflict-callbacks.c:537
+#: ../svn/conflict-callbacks.c:555 ../svn/conflict-callbacks.c:569
+#: ../svn/conflict-callbacks.c:585 ../svn/conflict-callbacks.c:601
+msgid "quit resolution"
+msgstr "退出解决冲突"
+
+#: ../svn/conflict-callbacks.c:485
+msgid "show all options"
+msgstr "显示全部选项"
+
+#: ../svn/conflict-callbacks.c:485
+msgid "show this list (also 'h', '?')"
+msgstr "显示此列表(同 'h' 或 '?')"
 
-#: ../svn/conflict-callbacks.c:436
-#, c-format
+#: ../svn/conflict-callbacks.c:492
 msgid ""
-"They want to delete the property, you want to change the value to '%s'.\n"
-msgstr "他人想删除此属性，你想改变其取值为 “%s”。\n"
+"accept my version of entire property (even non-conflicts)  [mine-full]"
+msgstr ""
 
-#: ../svn/conflict-callbacks.c:445
-#, c-format
-msgid ""
-"They want to change the property value to '%s', you want to delete the "
-"property.\n"
-msgstr "他人想改变其取值为 “%s”，你想删除此属性。\n"
+#: ../svn/conflict-callbacks.c:495
+msgid "accept their version of entire property (same)  [theirs-full]"
+msgstr ""
 
-#: ../svn/conflict-callbacks.c:467
-msgid "Select: (p) postpone"
-msgstr "选择: (p) 推迟"
+#: ../svn/conflict-callbacks.c:498
+msgid "show conflicts in this property"
+msgstr "显示此属性的冲突"
 
-#: ../svn/conflict-callbacks.c:472
-msgid ", (df) diff-full, (e) edit"
-msgstr "，(df) 显示全部差异，(e) 编辑"
+#: ../svn/conflict-callbacks.c:499
+msgid "change merged property value in an editor  [edit]"
+msgstr "在编辑器中修改已经合并的属性值 [edit]"
 
-#: ../svn/conflict-callbacks.c:476 ../svn/conflict-callbacks.c:489
-msgid ", (r) resolved"
-msgstr "，(r) 已解决"
+#: ../svn/conflict-callbacks.c:499
+msgid "edit property"
+msgstr "编辑属性"
 
-#: ../svn/conflict-callbacks.c:482
-msgid ""
-",\n"
-"        (mc) mine-conflict, (tc) theirs-conflict"
+#: ../svn/conflict-callbacks.c:501
+msgid "accept edited version of property"
+msgstr "接受属性的编辑版本"
+
+#: ../svn/conflict-callbacks.c:508 ../svn/conflict-callbacks.c:526
+#: ../svn/conflict-callbacks.c:539 ../svn/conflict-callbacks.c:557
+#: ../svn/conflict-callbacks.c:571 ../svn/conflict-callbacks.c:587
+#: ../svn/conflict-callbacks.c:603
+msgid "help"
+msgstr "帮助"
+
+#: ../svn/conflict-callbacks.c:508 ../svn/conflict-callbacks.c:526
+#: ../svn/conflict-callbacks.c:539 ../svn/conflict-callbacks.c:557
+#: ../svn/conflict-callbacks.c:571 ../svn/conflict-callbacks.c:587
+#: ../svn/conflict-callbacks.c:603
+msgid "show this help (also '?')"
+msgstr "显示此帮助(同 '?')"
+
+#: ../svn/conflict-callbacks.c:515
+msgid "accept pre-existing item (ignore upstream addition)  [mine-full]"
+msgstr "接受已有项 (覆盖进入的项)  [mine-full]"
+
+#: ../svn/conflict-callbacks.c:518
+msgid "accept incoming item (overwrite pre-existing item)  [theirs-full]"
+msgstr "接受进入的项 (覆盖已有项)  [theirs-full]"
+
+#: ../svn/conflict-callbacks.c:533
+msgid "accept current working copy state"
+msgstr "接受当前的工作副本路径状态"
+
+#: ../svn/conflict-callbacks.c:535 ../svn/conflict-callbacks.c:553
+#: ../svn/conflict-callbacks.c:567 ../svn/conflict-callbacks.c:583
+#: ../svn/conflict-callbacks.c:599
+msgid "resolve the conflict later  [postpone]"
+msgstr "推迟解决冲突 [postpone]"
+
+#: ../svn/conflict-callbacks.c:545
+msgid "apply update (recommended)"
 msgstr ""
-",\n"
-"        (mc) 我的版本, (tc) 他人的版本"
 
-#: ../svn/conflict-callbacks.c:492
-msgid ""
-",\n"
-"        (mf) mine-full, (tf) theirs-full"
+#: ../svn/conflict-callbacks.c:546
+msgid "apply update to the move destination  [mine-conflict]"
 msgstr ""
-",\n"
-"        (mf) 全用我的, (tf) 全用他人的"
 
-#: ../svn/conflict-callbacks.c:499
-msgid "(s) show all options: "
-msgstr "(s) 显示全部选项: "
+#: ../svn/conflict-callbacks.c:549
+msgid "discard update (breaks move)"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:549
+msgid "discard update, mark resolved, the move will will become a copy"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:563
+msgid "apply update to move destination"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:564
+msgid "apply incoming update to move destination  [mine-conflict]"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:577 ../svn/conflict-callbacks.c:593
+msgid "keep affected local moves"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:577
+msgid "keep any local moves affected by this deletion  [mine-conflict]"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:580 ../svn/conflict-callbacks.c:596
+msgid "mark resolved (breaks moves)"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:580
+msgid "mark resolved, any affected moves will become copies"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:593
+msgid "keep any moves affected by this replacement  [mine-conflict]"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:596
+msgid "mark resolved (any affected moves will become copies)"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:632
+msgid "Select:"
+msgstr "选择:"
 
-#: ../svn/conflict-callbacks.c:508
+#: ../svn/conflict-callbacks.c:659
 #, c-format
+msgid " (%s) %s"
+msgstr " (%s) %s"
+
+#: ../svn/conflict-callbacks.c:699
 msgid ""
-"\n"
-"  (e)  edit             - change merged file in an editor\n"
-"  (df) diff-full        - show all changes made to merged file\n"
-"  (r)  resolved         - accept merged version of file\n"
-"\n"
-"  (dc) display-conflict - show all conflicts (ignoring merged version)\n"
-"  (mc) mine-conflict    - accept my version for all conflicts (same)\n"
-"  (tc) theirs-conflict  - accept their version for all conflicts (same)\n"
-"\n"
-"  (mf) mine-full        - accept my version of entire file (even non-"
-"conflicts)\n"
-"  (tf) theirs-full      - accept their version of entire file (same)\n"
-"\n"
-"  (p)  postpone         - mark the conflict to be resolved later\n"
-"  (l)  launch           - launch external tool to resolve conflict\n"
-"  (s)  show all         - show this list\n"
-"\n"
+"Words in square brackets are the corresponding --accept option arguments.\n"
 msgstr ""
+
+#: ../svn/conflict-callbacks.c:738
+#, c-format
+msgid ""
+"Unrecognized option.\n"
 "\n"
-"  (e)  编辑           - 使用编辑器修改合并后的文件\n"
-"  (df) 显示全部差异   - 显示合并文件后的所有修改\n"
-"  (r)  解决           - 使用合并后的文件\n"
-"\n"
-"  (dc) 显示冲突       - 显示全部冲突(忽略已经合并的版本)\n"
-"  (mc) 我的版本       - 使用我的版本解决冲突(同上)\n"
-"  (tc) 他人的版本     - 使用他人的版本解决冲突(同上)\n"
-"\n"
-"  (mf) 全用我的       - 全部使用我的版本(包含不冲突的文件)\n"
-"  (tf) 全用他人的     - 全部使用他人的版本(同上)\n"
-"\n"
-"  (p)  推迟           - 标记以后解决冲突\n"
-"  (l)  执行           - 使用第三方工具解决冲突\n"
-"  (s)  显示全部选项   - 显示这个列表\n"
+msgstr ""
+"不能识别的选项。\n"
 "\n"
 
-#: ../svn/conflict-callbacks.c:543 ../svn/conflict-callbacks.c:567
+#: ../svn/conflict-callbacks.c:766
+#, c-format
+msgid "Conflict discovered in file '%s'.\n"
+msgstr "在文件“%s”中发现冲突。\n"
+
+#: ../svn/conflict-callbacks.c:836
 #, c-format
 msgid ""
-"Invalid option; cannot choose based on conflicts in a binary file.\n"
+"Invalid option; cannot display conflicts for a binary file.\n"
 "\n"
 msgstr ""
-"非法选项；不能为二进制文件冲突选择基准。\n"
+"无效选项；不能显示二进制文件的冲突。\n"
 "\n"
 
-#: ../svn/conflict-callbacks.c:551 ../svn/conflict-callbacks.c:575
+#: ../svn/conflict-callbacks.c:845
 #, c-format
 msgid ""
-"Invalid option; cannot choose based on conflicts for properties.\n"
+"Invalid option; original files not available.\n"
 "\n"
 msgstr ""
-"非法选项；不能为属性冲突选择基准。\n"
+"无效选项；原始文件不可用。\n"
 "\n"
 
-#: ../svn/conflict-callbacks.c:604
+#: ../svn/conflict-callbacks.c:857
 #, c-format
 msgid ""
-"Invalid option; cannot display conflicts for a binary file.\n"
+"Invalid option; there's no merged version to diff.\n"
 "\n"
 msgstr ""
-"非法选项；不能显示二进制文件的冲突。\n"
+"无效选项；没有已合并的版本来比较差异。\n"
 "\n"
 
-#: ../svn/conflict-callbacks.c:612
+#: ../svn/conflict-callbacks.c:877
 #, c-format
 msgid ""
-"Invalid option; cannot display conflicts for properties.\n"
+"Invalid option; can only resolve text conflicts with the internal merge "
+"tool.\n"
 "\n"
 msgstr ""
-"非法选项；不能显示属性的冲突。\n"
+"无效选项；只能使用内部合并工具来解决纯文本冲突。\n"
 "\n"
 
-#: ../svn/conflict-callbacks.c:620
+#: ../svn/conflict-callbacks.c:903 ../svn/conflict-callbacks.c:920
 #, c-format
 msgid ""
-"Invalid option; original files not available.\n"
+"Invalid option.\n"
 "\n"
 msgstr ""
-"非法选项；原始文件不可用。\n"
+"无效选项。\n"
 "\n"
 
-#: ../svn/conflict-callbacks.c:632
+#: ../svn/conflict-callbacks.c:929
 #, c-format
 msgid ""
-"Invalid option; there's no merged version to diff.\n"
+"Invalid option; cannot choose based on conflicts in a binary file.\n"
 "\n"
 msgstr ""
-"非法选项；没有已合并的版本来比较差异。\n"
+"无效选项；不能为二进制文件冲突选择基准。\n"
 "\n"
 
-#: ../svn/conflict-callbacks.c:651
+#: ../svn/conflict-callbacks.c:943
 #, c-format
 msgid ""
-"Invalid option; cannot resolve property conflicts with an external merge "
-"tool.\n"
+"Invalid option; use diff/edit/merge/launch before choosing 'mark resolved'.\n"
 "\n"
 msgstr ""
-"非法选项；不能使用外部合并工具来解决属性冲突。\n"
-"\n"
 
-#: ../svn/conflict-callbacks.c:666 ../svn/conflict-callbacks.c:680
+#: ../svn/conflict-callbacks.c:984
+#, c-format
+msgid "Conflict for property '%s' discovered on '%s'.\n"
+msgstr "属性 “%s” 冲突，位于 “%s”。\n"
+
+#: ../svn/conflict-callbacks.c:1042
 #, c-format
 msgid ""
-"Invalid option.\n"
+"Invalid option; please edit the property first.\n"
 "\n"
 msgstr ""
-"无效选项。\n"
+"无效选项；请先编辑属性。\n"
 "\n"
 
-#: ../svn/conflict-callbacks.c:710
+#: ../svn/conflict-callbacks.c:1079
+#, c-format
+msgid ""
+"Tree conflict on '%s'\n"
+"   > %s\n"
+msgstr ""
+"树冲突于“%s”\n"
+"   > %s\n"
+
+#: ../svn/conflict-callbacks.c:1149
 #, c-format
 msgid ""
 "Conflict discovered when trying to add '%s'.\n"
@@ -7896,50 +8924,51 @@
 "增加 “%s” 时出现冲突。\n"
 "同名对象已存在。\n"
 
-#: ../svn/conflict-callbacks.c:713
-msgid "Select: (p) postpone, (mf) mine-full, (tf) theirs-full, (h) help:"
-msgstr "选择：(p) 推迟，(mf) 全用我的，(tf) 全用他人的，(h) 帮助："
+#: ../svn/conflict-callbacks.c:1247
+msgid "No editor found; leaving all conflicts."
+msgstr "没有发现编辑器；不处理冲突。"
+
+#: ../svn/conflict-callbacks.c:1256
+msgid "Error running editor; leaving all conflicts."
+msgstr "执行编辑器错误；不处理冲突。"
+
+#: ../svn/conflict-callbacks.c:1292
+msgid "No merge tool found; leaving all conflicts."
+msgstr "没有发现合并工具；不处理冲突。"
+
+#: ../svn/conflict-callbacks.c:1301
+msgid "Error running merge tool; leaving all conflicts."
+msgstr "执行合并工具错误；不处理冲突。"
 
-#: ../svn/conflict-callbacks.c:725
+#: ../svn/copy-cmd.c:123 ../svn/util.c:957
 #, c-format
-msgid ""
-"  (p)  postpone    - resolve the conflict later\n"
-"  (mf) mine-full   - accept pre-existing item (ignore upstream addition)\n"
-"  (tf) theirs-full - accept incoming item (overwrite pre-existing item)\n"
-"  (h)  help        - show this help\n"
-"\n"
-msgstr ""
-"  (p)  推迟            - 以后解决冲突\n"
-"  (mf) 全用我的        - 使用先前的项目(忽略上游的修改)\n"
-"  (tf) 全用他人的      - 使用引入的项目(覆盖先前的项目)\n"
-"  (h)  帮助            - 显示这个列表\n"
-"\n"
+msgid "'%s': a peg revision is not allowed here"
+msgstr "'%s': 此处不允许铆钉版本范围"
 
-#: ../svn/copy-cmd.c:119 ../svn/delete-cmd.c:69 ../svn/mkdir-cmd.c:68
-#: ../svn/move-cmd.c:77 ../svn/propedit-cmd.c:259
+#: ../svn/copy-cmd.c:163 ../svn/delete-cmd.c:69 ../svn/mkdir-cmd.c:68
+#: ../svn/move-cmd.c:77 ../svn/propedit-cmd.c:260
 msgid ""
 "Local, non-commit operations do not take a log message or revision properties"
 msgstr "本地操作，非提交操作无须日志信息或版本属性"
 
-#: ../svn/diff-cmd.c:186 ../svn/log-cmd.c:289 ../svnserve/main.c:742
-#, c-format
-msgid "Can't open stdout"
-msgstr "无法打开标准输出"
-
-#: ../svn/diff-cmd.c:188 ../svn/log-cmd.c:291
-#, c-format
-msgid "Can't open stderr"
-msgstr "无法打开标准错误"
-
-#: ../svn/diff-cmd.c:197
+#: ../svn/diff-cmd.c:208
 msgid "'--xml' option only valid with '--summarize' option"
 msgstr "“--xml” 选项只能与 “--summarize” 同时使用"
 
-#: ../svn/diff-cmd.c:278
+#: ../svn/diff-cmd.c:299
 msgid "'--new' option only valid with '--old' option"
 msgstr "“--new” 选项只能与 “--old” 同时使用"
 
-#: ../svn/diff-cmd.c:331
+#: ../svn/diff-cmd.c:317
+msgid ""
+"'svn diff [-r N[:M]] [TARGET[@REV]...]' does not support mixed target types. "
+"Try using the --old and --new options or one of the shorthand invocations "
+"listed in 'svn help diff'."
+msgstr ""
+"“svn diff [-r N[:M]] [TARGET[@REV]...]”不支持混合目标类型。请尝试使用 --old 和 --new "
+"选项或者“svn help diff”列出的缩写。"
+
+#: ../svn/diff-cmd.c:355
 #, c-format
 msgid "Path '%s' not relative to base URLs"
 msgstr "路径“%s”不是相对于基础 URL"
@@ -7950,11 +8979,73 @@
 "overwrite"
 msgstr "目的目录已存在；请删除目录或用 --force 来覆盖目录"
 
-#: ../svn/export-cmd.c:118 ../svn/switch-cmd.c:183 ../svn/update-cmd.c:177
+#: ../svn/export-cmd.c:122 ../svn/list-cmd.c:412 ../svn/switch-cmd.c:188
+#: ../svn/update-cmd.c:177
 msgid "Failure occurred processing one or more externals definitions"
 msgstr "处理一个或更多的外部定义失败"
 
-#: ../svn/help-cmd.c:50
+#: ../svn/file-merge.c:135 ../svn/file-merge.c:805
+msgid "Could not write data to merged file"
+msgstr "无法写入数据到已经合并文件"
+
+#: ../svn/file-merge.c:491
+msgid "Could not write data to temporary file"
+msgstr "无法写入数据到临时文件"
+
+#: ../svn/file-merge.c:600
+msgid "Conflicting section found during merge:"
+msgstr ""
+
+#: ../svn/file-merge.c:603
+#, c-format
+msgid "(1) their version (at line %lu)"
+msgstr "(1) 他们的版本 (第 %lu 行)"
+
+#: ../svn/file-merge.c:608
+#, c-format
+msgid "(2) your version (at line %lu)"
+msgstr "(2) 你的版本 (第 %lu 行)"
+
+#: ../svn/file-merge.c:657
+msgid ""
+"Select: (1) use their version, (2) use your version,\n"
+"        (12) their version first, then yours,\n"
+"        (21) your version first, then theirs,\n"
+"        (e1) edit their version and use the result,\n"
+"        (e2) edit your version and use the result,\n"
+"        (eb) edit both versions and use the result,\n"
+"        (p) postpone this conflicting section leaving conflict markers,\n"
+"        (a) abort file merge and return to main menu: "
+msgstr ""
+
+#: ../svn/file-merge.c:888
+#, c-format
+msgid "Merging '%s'.\n"
+msgstr "正在合并“%s”。\n"
+
+#: ../svn/file-merge.c:935
+#, c-format
+msgid "Merge of '%s' aborted.\n"
+msgstr "路径 '%s' 的合并中止。\n"
+
+#: ../svn/file-merge.c:953
+#, c-format
+msgid ""
+"Could not write merged result to '%s', saved instead at '%s'.\n"
+"'%s' remains in conflict.\n"
+msgstr ""
+
+#: ../svn/file-merge.c:971
+#, c-format
+msgid "Merge of '%s' completed (remains in conflict).\n"
+msgstr "“%s”的合并完成(仍旧处于冲突状态)。\n"
+
+#: ../svn/file-merge.c:975
+#, c-format
+msgid "Merge of '%s' completed.\n"
+msgstr "“%s”的合并完成。\n"
+
+#: ../svn/help-cmd.c:53
 #, c-format
 msgid ""
 "usage: svn <subcommand> [options] [args]\n"
@@ -7980,7 +9071,7 @@
 "\n"
 "可用的子命令:\n"
 
-#: ../svn/help-cmd.c:63
+#: ../svn/help-cmd.c:66
 msgid ""
 "Subversion is a tool for version control.\n"
 "For additional information, see http://subversion.apache.org/\n"
@@ -7988,7 +9079,7 @@
 "Subversion 是版本控制工具。\n"
 "欲取得详细资料，请参阅 http://subversion.apache.org/\n"
 
-#: ../svn/help-cmd.c:70 ../svnrdump/svnrdump.c:499 ../svnsync/main.c:1706
+#: ../svn/help-cmd.c:73 ../svnrdump/svnrdump.c:659 ../svnsync/svnsync.c:1857
 msgid ""
 "The following repository access (RA) modules are available:\n"
 "\n"
@@ -7996,6 +9087,12 @@
 "可使用以下的版本库访问模块:\n"
 "\n"
 
+#: ../svn/help-cmd.c:127
+msgid ""
+"WARNING: Plaintext password storage is enabled!\n"
+"\n"
+msgstr ""
+
 #: ../svn/import-cmd.c:87
 msgid "Repository URL required when importing"
 msgstr "导入时必须提供版本库的URL"
@@ -8013,191 +9110,206 @@
 msgid "Resource is not under version control."
 msgstr "资源尚未纳入版本控制"
 
-#: ../svn/info-cmd.c:263 ../svnadmin/main.c:1423
+#: ../svn/info-cmd.c:266 ../svnadmin/svnadmin.c:1744
 #, c-format
 msgid "Path: %s\n"
 msgstr "路径: %s\n"
 
-#: ../svn/info-cmd.c:270
+#: ../svn/info-cmd.c:273
 #, c-format
 msgid "Name: %s\n"
 msgstr "名称: %s\n"
 
-#: ../svn/info-cmd.c:274
+#: ../svn/info-cmd.c:277
 #, c-format
 msgid "Working Copy Root Path: %s\n"
 msgstr "工作副本根目录: %s\n"
 
-#: ../svn/info-cmd.c:280
+#: ../svn/info-cmd.c:283
 #, c-format
 msgid "URL: %s\n"
 msgstr "URL: %s\n"
 
-#: ../svn/info-cmd.c:283
+#: ../svn/info-cmd.c:286
+#, c-format
+msgid "Relative URL: ^/%s\n"
+msgstr "正确的相对 URL: ^/%s\n"
+
+#: ../svn/info-cmd.c:293
 #, c-format
 msgid "Repository Root: %s\n"
 msgstr "版本库根: %s\n"
 
-#: ../svn/info-cmd.c:287
+#: ../svn/info-cmd.c:297
 #, c-format
 msgid "Repository UUID: %s\n"
 msgstr "版本库 UUID: %s\n"
 
-#: ../svn/info-cmd.c:291
+#: ../svn/info-cmd.c:301
 #, c-format
 msgid "Revision: %ld\n"
 msgstr "版本: %ld\n"
 
-#: ../svn/info-cmd.c:296
+#: ../svn/info-cmd.c:306
 #, c-format
 msgid "Node Kind: file\n"
 msgstr "节点种类: 文件\n"
 
-#: ../svn/info-cmd.c:300
+#: ../svn/info-cmd.c:310
 #, c-format
 msgid "Node Kind: directory\n"
 msgstr "节点种类: 目录\n"
 
-#: ../svn/info-cmd.c:304
+#: ../svn/info-cmd.c:314
 #, c-format
 msgid "Node Kind: none\n"
 msgstr "节点种类: 无\n"
 
-#: ../svn/info-cmd.c:309
+#: ../svn/info-cmd.c:319
 #, c-format
 msgid "Node Kind: unknown\n"
 msgstr "节点种类: 未知\n"
 
-#: ../svn/info-cmd.c:318
+#: ../svn/info-cmd.c:328
 #, c-format
 msgid "Schedule: normal\n"
 msgstr "调度: 正常\n"
 
-#: ../svn/info-cmd.c:322
+#: ../svn/info-cmd.c:332
 #, c-format
 msgid "Schedule: add\n"
 msgstr "调度: 增加\n"
 
-#: ../svn/info-cmd.c:326
+#: ../svn/info-cmd.c:336
 #, c-format
 msgid "Schedule: delete\n"
 msgstr "调度: 删除\n"
 
-#: ../svn/info-cmd.c:330
+#: ../svn/info-cmd.c:340
 #, c-format
 msgid "Schedule: replace\n"
 msgstr "调度: 替换\n"
 
-#: ../svn/info-cmd.c:346
+#: ../svn/info-cmd.c:356
 #, c-format
 msgid "Depth: empty\n"
 msgstr "深度: 空\n"
 
-#: ../svn/info-cmd.c:350
+#: ../svn/info-cmd.c:360
 #, c-format
 msgid "Depth: files\n"
 msgstr "深度: 文件\n"
 
-#: ../svn/info-cmd.c:354
+#: ../svn/info-cmd.c:364
 #, c-format
 msgid "Depth: immediates\n"
 msgstr "深度: 直接\n"
 
-#: ../svn/info-cmd.c:358
+#: ../svn/info-cmd.c:368
 #, c-format
 msgid "Depth: exclude\n"
 msgstr "深度: 排除\n"
 
 #. Other depths should never happen here.
-#: ../svn/info-cmd.c:369
+#: ../svn/info-cmd.c:379
 #, c-format
 msgid "Depth: INVALID\n"
 msgstr "深度: 非法\n"
 
-#: ../svn/info-cmd.c:373
+#: ../svn/info-cmd.c:383
 #, c-format
 msgid "Copied From URL: %s\n"
 msgstr "从URL %s 复制:\n"
 
-#: ../svn/info-cmd.c:377
+#: ../svn/info-cmd.c:387
 #, c-format
 msgid "Copied From Rev: %ld\n"
 msgstr "从版本 %ld 复制:\n"
 
-#: ../svn/info-cmd.c:382
+#: ../svn/info-cmd.c:396 ../svn/info-cmd.c:398
+#, c-format
+msgid "Moved From: %s\n"
+msgstr "移自: %s\n"
+
+#: ../svn/info-cmd.c:409 ../svn/info-cmd.c:411
+#, c-format
+msgid "Moved To: %s\n"
+msgstr "移到: %s\n"
+
+#: ../svn/info-cmd.c:417
 #, c-format
 msgid "Last Changed Author: %s\n"
 msgstr "最后修改的作者: %s\n"
 
-#: ../svn/info-cmd.c:386
+#: ../svn/info-cmd.c:421
 #, c-format
 msgid "Last Changed Rev: %ld\n"
 msgstr "最后修改的版本: %ld\n"
 
-#: ../svn/info-cmd.c:391
+#: ../svn/info-cmd.c:426
 msgid "Last Changed Date"
 msgstr "最后修改的时间"
 
-#: ../svn/info-cmd.c:397
+#: ../svn/info-cmd.c:432
 msgid "Text Last Updated"
 msgstr "文本最后更新"
 
-#: ../svn/info-cmd.c:400
+#: ../svn/info-cmd.c:435
 #, c-format
 msgid "Checksum: %s\n"
 msgstr "校验和: %s\n"
 
-#: ../svn/info-cmd.c:422
+#: ../svn/info-cmd.c:456
 #, c-format
 msgid "Conflict Previous Base File: %s\n"
 msgstr "与之前的参考文件冲突: %s\n"
 
-#: ../svn/info-cmd.c:429
+#: ../svn/info-cmd.c:463
 #, c-format
 msgid "Conflict Previous Working File: %s\n"
 msgstr "与之前的工作文件冲突: %s\n"
 
-#: ../svn/info-cmd.c:436
+#: ../svn/info-cmd.c:470
 #, c-format
 msgid "Conflict Current Base File: %s\n"
 msgstr "与当前的参考文件冲突: %s\n"
 
-#: ../svn/info-cmd.c:444
+#: ../svn/info-cmd.c:479
 #, c-format
 msgid "Conflict Properties File: %s\n"
 msgstr "属性冲突的文件: %s\n"
 
-#: ../svn/info-cmd.c:463
+#: ../svn/info-cmd.c:491
 msgid "Tree conflict"
 msgstr "树冲突"
 
-#: ../svn/info-cmd.c:467
+#: ../svn/info-cmd.c:517
 msgid "Source  left"
 msgstr "源      左边"
 
-#: ../svn/info-cmd.c:476
+#: ../svn/info-cmd.c:526
 msgid "Source right"
 msgstr "源      右边"
 
-#: ../svn/info-cmd.c:487
+#: ../svn/info-cmd.c:535
 #, c-format
 msgid "Lock Token: %s\n"
 msgstr "锁定令牌: %s\n"
 
-#: ../svn/info-cmd.c:491
+#: ../svn/info-cmd.c:539
 #, c-format
 msgid "Lock Owner: %s\n"
 msgstr "锁定所有者: %s\n"
 
-#: ../svn/info-cmd.c:496
+#: ../svn/info-cmd.c:544
 msgid "Lock Created"
 msgstr "已创建锁定"
 
-#: ../svn/info-cmd.c:500
+#: ../svn/info-cmd.c:548
 msgid "Lock Expires"
 msgstr "锁定过期"
 
-#: ../svn/info-cmd.c:508
+#: ../svn/info-cmd.c:556
 #, c-format
 msgid ""
 "Lock Comment (%i line):\n"
@@ -8209,2980 +9321,3072 @@
 "锁定注释(%i 行): \n"
 "%s\n"
 
-#: ../svn/info-cmd.c:517
+#: ../svn/info-cmd.c:565
 #, c-format
 msgid "Changelist: %s\n"
 msgstr "修改列表: %s\n"
 
-#: ../svn/info-cmd.c:631
+#: ../svn/info-cmd.c:679
 msgid ""
 "Could not display info for all targets because some targets don't exist"
 msgstr "因为一些目标不存在，所以不能显示全部目标"
 
-#: ../svn/list-cmd.c:93
+#: ../svn/list-cmd.c:73
 msgid "%b %d %H:%M"
 msgstr "%b %d %H:%M"
 
-#: ../svn/list-cmd.c:98
+#: ../svn/list-cmd.c:75
 msgid "%b %d  %Y"
 msgstr "%Y-%m-%d"
 
-#: ../svn/list-cmd.c:325
-msgid "Could not list all targets because some targets don't exist"
-msgstr "因为一些目标不存在，所以不能列出全部目标"
+#: ../svn/list-cmd.c:101
+#, c-format
+msgid "Listing external '%s' defined on '%s':\n"
+msgstr ""
+
+#: ../svn/list-cmd.c:421
+msgid "Could not list all targets because some targets don't exist"
+msgstr "因为一些目标不存在，所以不能列出全部目标"
 
 #: ../svn/lock-cmd.c:58
 msgid "Lock comment contains a zero byte"
 msgstr "加锁注释中有一个零字节"
 
-#: ../svn/log-cmd.c:188
+#: ../svn/log-cmd.c:144
+msgid "\n"
+msgstr "\n"
+
+#: ../svn/log-cmd.c:354
 msgid "(no author)"
 msgstr "(没有作者信息)"
 
-#: ../svn/log-cmd.c:194
+#: ../svn/log-cmd.c:360
 msgid "(no date)"
 msgstr "(没有时间信息)"
 
-#: ../svn/log-cmd.c:209
+#: ../svn/log-cmd.c:385
 #, c-format
 msgid " | %d line"
 msgid_plural " | %d lines"
 msgstr[0] " | %d 行"
 
-#: ../svn/log-cmd.c:225
+#: ../svn/log-cmd.c:401
 #, c-format
 msgid "Changed paths:\n"
 msgstr "改变的路径:\n"
 
-#: ../svn/log-cmd.c:243
+#: ../svn/log-cmd.c:418
 #, c-format
 msgid " (from %s:%ld)"
 msgstr " (从 %s:%ld)"
 
-#: ../svn/log-cmd.c:259
+#: ../svn/log-cmd.c:434
 #, c-format
 msgid "Reverse merged via:"
 msgstr "已经撤销合并，通过:"
 
-#: ../svn/log-cmd.c:261
+#: ../svn/log-cmd.c:436
 #, c-format
 msgid "Merged via:"
 msgstr "合并通过:"
 
-#: ../svn/log-cmd.c:305 ../svn/log-cmd.c:323
-#, c-format
-msgid "\n"
-msgstr "\n"
-
-#: ../svn/log-cmd.c:527
+#: ../svn/log-cmd.c:689
 msgid "'with-all-revprops' option only valid in XML mode"
 msgstr "只有在 XML 模式 “with-all-revprops” 选项才有效"
 
-#: ../svn/log-cmd.c:531
+#: ../svn/log-cmd.c:693
 msgid "'with-no-revprops' option only valid in XML mode"
 msgstr "只有在 XML 模式 “with-no-revprops” 选项才有效"
 
-#: ../svn/log-cmd.c:535
+#: ../svn/log-cmd.c:697
 msgid "'with-revprop' option only valid in XML mode"
 msgstr "只有在 XML 模式 “with-revprop” 选项才有效"
 
-#: ../svn/log-cmd.c:542
+#: ../svn/log-cmd.c:704
 msgid "'diff' option is not supported in XML mode"
 msgstr "在 XML 模式不支持 'diff' 选项"
 
-#: ../svn/log-cmd.c:548
+#: ../svn/log-cmd.c:710
 msgid "'quiet' and 'diff' options are mutually exclusive"
 msgstr "'quiet' 与 'diff' 选项是互斥的"
 
-#: ../svn/log-cmd.c:552
+#: ../svn/log-cmd.c:714
 msgid "'diff-cmd' option requires 'diff' option"
 msgstr "'diff-cmd' 选项需要 'diff' 选项"
 
-#: ../svn/log-cmd.c:556
+#: ../svn/log-cmd.c:718
 msgid "'internal-diff' option requires 'diff' option"
 msgstr "'internal-diff' 选项需要 'diff' 选项"
 
-#: ../svn/log-cmd.c:560
+#: ../svn/log-cmd.c:722
 msgid "'extensions' option requires 'diff' option"
 msgstr "'extensions' 选项徐啊哟 'diff' 选项"
 
-#: ../svn/log-cmd.c:565
+#: ../svn/log-cmd.c:727
 msgid "'depth' option requires 'diff' option"
 msgstr "'depth' 选项需要 'diff' 选项"
 
-#: ../svn/log-cmd.c:581
+#: ../svn/log-cmd.c:743
 msgid "-c and -r are mutually exclusive"
 msgstr "-c 与 -r 是互斥的"
 
-#: ../svn/log-cmd.c:613
+#: ../svn/log-cmd.c:775
 #, c-format
 msgid ""
 "Only relative paths can be specified after a URL for 'svn log', but '%s' is "
 "not a relative path"
 msgstr "对于 'svn log'，在 URL 后只能指定相对路径，但 '%s' 不是相对路径"
 
-#: ../svn/log-cmd.c:658
+#: ../svn/log-cmd.c:821
 #, c-format
 msgid "cannot assign with 'with-revprop' option (drop the '=')"
 msgstr "选项 'with-revprop' 不接受赋值(请删除 '=')"
 
-#: ../svn/main.c:136
-msgid "force operation to run"
-msgstr "强制操作运行"
+#: ../svn/merge-cmd.c:107 ../svn/merge-cmd.c:131
+#, c-format
+msgid "--- Merging\n"
+msgstr "--- 正在合并\n"
 
-#: ../svn/main.c:138
-msgid "force validity of log message source"
-msgstr "强制校验日志信息资源"
+#: ../svn/merge-cmd.c:175
+msgid "-r and -c can't be used with --reintegrate"
+msgstr "-r 和 -c 不能与 --reintegrate 共存"
 
-#: ../svn/main.c:139 ../svn/main.c:140 ../svnadmin/main.c:199
-#: ../svnadmin/main.c:202 ../svndumpfilter/main.c:920
-#: ../svndumpfilter/main.c:923 ../svnlook/main.c:105 ../svnlook/main.c:117
-#: ../svnsync/main.c:234 ../svnsync/main.c:236
-msgid "show help on a subcommand"
-msgstr "显示子命令帮助信息"
+#: ../svn/merge-cmd.c:230
+msgid "Merge source required"
+msgstr "需要合并源"
 
-#: ../svn/main.c:141
-msgid "specify log message ARG"
-msgstr "指定日志信息ARG"
+#: ../svn/merge-cmd.c:276
+msgid "Second revision required"
+msgstr "需要第二个版本"
 
-#: ../svn/main.c:142
-msgid "print nothing, or only summary information"
-msgstr "不打印信息，或只打印概要信息"
+#: ../svn/merge-cmd.c:285 ../svn/merge-cmd.c:312 ../svn/mergeinfo-cmd.c:267
+#: ../svnadmin/svnadmin.c:1719 ../svnlook/svnlook.c:2061
+#: ../svnlook/svnlook.c:2254 ../svnlook/svnlook.c:2358
+#: ../svnlook/svnlook.c:2393
+msgid "Too many arguments given"
+msgstr "参数过多"
 
-#: ../svn/main.c:143
-msgid "descend recursively, same as --depth=infinity"
-msgstr "向下递归，与 --depth=infinity 相同"
+#: ../svn/merge-cmd.c:302
+msgid "Cannot specify a revision range with two URLs"
+msgstr "不能对两个 URL 指定版本范围"
 
-#: ../svn/main.c:144
-msgid "obsolete; try --depth=files or --depth=immediates"
-msgstr "过时；尝试 --depth=files 或 --depth=immediates"
+#: ../svn/merge-cmd.c:406
+msgid "--reintegrate cannot be used with --ignore-ancestry"
+msgstr "--reintegrate 不能与 --ignore-ancestry 共存"
 
-#: ../svn/main.c:146
-msgid ""
-"the change made by revision ARG (like -r ARG-1:ARG)\n"
-"                             If ARG is negative this is like -r ARG:ARG-1"
-msgstr ""
-"在ARG版本(如同 -r ARG-1:ARG)作的修改\n"
-"                             如果ARG为负数则等价于 -r ARG:ARG-1"
+#: ../svn/merge-cmd.c:411
+msgid "--reintegrate cannot be used with --record-only"
+msgstr "--reintegrate 不能与 --record-only 共存"
 
-#: ../svn/main.c:150
-msgid ""
-"ARG (some commands also take ARG1:ARG2 range)\n"
-"                             A revision argument can be one of:\n"
-"                                NUMBER       revision number\n"
-"                                '{' DATE '}' revision at start of the date\n"
-"                                'HEAD'       latest in repository\n"
-"                                'BASE'       base rev of item's working "
-"copy\n"
-"                                'COMMITTED'  last commit at or before BASE\n"
-"                                'PREV'       revision just before COMMITTED"
-msgstr ""
-"ARG (一些命令也接受ARG1:ARG2范围)\n"
-"                             版本参数可以是如下之一: \n"
-"                                NUMBER       版本号\n"
-"                                '{' DATE '}' 在指定时间以后的版本\n"
-"                                'HEAD'       版本库中的最新版本\n"
-"                                'BASE'       工作副本的基线版本\n"
-"                                'COMMITTED'  最后提交或基线之前\n"
-"                                'PREV'       COMMITTED的前一版本"
+#: ../svn/merge-cmd.c:416
+msgid "--depth cannot be used with --reintegrate"
+msgstr "--depth 不能与 --reintegrate 共存"
 
-#: ../svn/main.c:165
-msgid "read log message from file ARG"
-msgstr "从文件ARG读取日志信息"
+#: ../svn/merge-cmd.c:421
+msgid "--force cannot be used with --reintegrate"
+msgstr "--force 不能与 --reintegrate 共存"
 
-#: ../svn/main.c:167
-msgid "give output suitable for concatenation"
-msgstr "给予适合串联的输出"
+#: ../svn/merge-cmd.c:426
+msgid "--reintegrate can only be used with a single merge source"
+msgstr "--reintegrate 只能用于单一合并源"
 
-#: ../svn/main.c:169
-msgid "treat value as being in charset encoding ARG"
-msgstr "将ARG的值视为字符编码"
+#: ../svn/merge-cmd.c:430
+msgid "--allow-mixed-revisions cannot be used with --reintegrate"
+msgstr "--allow-mixed-revisions 不能与 --reintegrate 共存"
 
-#: ../svn/main.c:170 ../svnadmin/main.c:205 ../svndumpfilter/main.c:926
-#: ../svnlook/main.c:147 ../svnrdump/svnrdump.c:134 ../svnserve/main.c:253
-#: ../svnsync/main.c:232 ../svnversion/main.c:140
-msgid "show program version information"
-msgstr "显示程序版本信息"
+#: ../svn/merge-cmd.c:445
+msgid ""
+"Merge tracking not possible, use --ignore-ancestry or\n"
+"fix invalid mergeinfo in target with 'svn propset'"
+msgstr ""
+"不能执行合并跟踪，对目标使用“svn propset”修正非法合并信息，或者使用选项\n"
+"--ignore-ancestry"
 
-#: ../svn/main.c:171
-msgid "print extra information"
-msgstr "打印附加信息"
+#: ../svn/mergeinfo-cmd.c:171
+msgid "last full merge"
+msgstr ""
 
-#: ../svn/main.c:172
-msgid "display update information"
-msgstr "显示更新信息"
+#: ../svn/mergeinfo-cmd.c:171
+msgid "youngest common ancestor"
+msgstr ""
 
-#: ../svn/main.c:173 ../svnrdump/svnrdump.c:124
-msgid "specify a username ARG"
-msgstr "指定用户名称 ARG"
+#: ../svn/mergeinfo-cmd.c:172
+msgid "repository path"
+msgstr "版本库路径"
 
-#: ../svn/main.c:174 ../svnrdump/svnrdump.c:126
-msgid "specify a password ARG"
-msgstr "指定密码 ARG"
+#: ../svn/mergeinfo-cmd.c:172
+msgid "tip of branch"
+msgstr ""
 
-#: ../svn/main.c:176
-msgid ""
-"Default: '-u'. When Subversion is invoking an\n"
-"                             external diff program, ARG is simply passed "
-"along\n"
-"                             to the program. But when Subversion is using "
-"its\n"
-"                             default internal diff implementation, or when\n"
-"                             Subversion is displaying blame annotations, "
-"ARG\n"
-"                             could be any of the following:\n"
-"                                -u (--unified):\n"
-"                                   Output 3 lines of unified context.\n"
-"                                -b (--ignore-space-change):\n"
-"                                   Ignore changes in the amount of white "
-"space.\n"
-"                                -w (--ignore-all-space):\n"
-"                                   Ignore all white space.\n"
-"                                --ignore-eol-style:\n"
-"                                   Ignore changes in EOL style.\n"
-"                                -p (--show-c-function):\n"
-"                                   Show C function name in diff output."
-msgstr ""
-"缺省: “-u”。当 Subversion 调用外部比较程序时，ARG 直接传给它。但是当\n"
-"                             Subversion 使用缺省的内置比较实现，或者正\n"
-"                             显示追溯时, ARG 可以是: \n"
-"                                -u (--unified):\n"
-"                                   输出三行统一上下文。\n"
-"                                -b (--ignore-space-change):\n"
-"                                   忽略空白数量的修改。\n"
-"                                -w (--ignore-all-space):\n"
-"                                   忽略所有的空白。\n"
-"                                --ignore-eol-style:\n"
-"                                   忽略行尾样式的改变。                            -p "
-"(--show-c-function):\n"
-"                                   在比较输出中显示 C 函数名称。"
+#: ../svn/mergeinfo-cmd.c:264
+msgid "Not enough arguments given"
+msgstr "没有提供足够的参数"
 
-#: ../svn/main.c:208
-msgid "pass contents of file ARG as additional args"
-msgstr "传递文件 ARG 内容为附件参数"
+#: ../svn/mergeinfo-cmd.c:342
+msgid "--revision (-r) option valid only with --show-revs option"
+msgstr "--revision (-r) 选项只能与 --show-revs 同时使用"
 
-#: ../svn/main.c:210
-msgid ""
-"limit operation by depth ARG ('empty', 'files',\n"
-"                             'immediates', or 'infinity')"
+#: ../svn/mergeinfo-cmd.c:346
+msgid "Depth specification options valid only with --show-revs option"
 msgstr ""
-"限制操作深度是 ARG ('empty', 'files',\n"
-"                             'immediates', 或 'infinity')"
 
-#: ../svn/main.c:214
-msgid ""
-"set new working copy depth to ARG ('exclude',\n"
-"                             'empty', 'files', 'immediates', or 'infinity')"
-msgstr ""
-"设置工作副本的新深度为 ARG('exclude',\n"
-"                             'empty', 'files', 'immediates', 或 'infinity')"
+#: ../svn/mkdir-cmd.c:92
+msgid "Try 'svn add' or 'svn add --non-recursive' instead?"
+msgstr "尝试用 “svn add”或 “svn add --non-recursive”代替？"
 
-#: ../svn/main.c:217 ../svnlook/main.c:150
-msgid "output in XML"
-msgstr "输出为 XML"
+#: ../svn/mkdir-cmd.c:98
+msgid "Try 'svn mkdir --parents' instead?"
+msgstr "尝试 “svn mkdir --parents”？"
 
-#: ../svn/main.c:218
-msgid "use strict semantics"
-msgstr "使用严格的语法"
+#: ../svn/notify.c:132
+#, c-format
+msgid "%d remaining"
+msgid_plural "%d remaining"
+msgstr[0] "剩余 %d"
 
-#: ../svn/main.c:220
-msgid "do not cross copies while traversing history"
-msgstr "查看历史不要跨越不同的副本"
+#: ../svn/notify.c:141
+#, c-format
+msgid "and %d already resolved"
+msgid_plural "and %d already resolved"
+msgstr[0] "%d 个已经解决"
 
-#: ../svn/main.c:222
-msgid "disregard default and svn:ignore property ignores"
-msgstr "忽略默认值和 svn:ignore 属性"
+#: ../svn/notify.c:163 ../svn/status-cmd.c:93
+#, c-format
+msgid "Summary of conflicts:\n"
+msgstr "冲突概要：\n"
 
-#: ../svn/main.c:224 ../svnrdump/svnrdump.c:130 ../svnsync/main.c:178
-msgid "do not cache authentication tokens"
-msgstr "不要缓存用户认证令牌"
+#: ../svn/notify.c:169
+#, c-format
+msgid "  Text conflicts: %d\n"
+msgstr "  正文冲突：%d\n"
 
-#: ../svn/main.c:226 ../svnrdump/svnrdump.c:144 ../svnsync/main.c:188
-msgid ""
-"accept SSL server certificates from unknown\n"
-"                             certificate authorities without prompting (but "
-"only\n"
-"                             with '--non-interactive')"
-msgstr "不提示的接受未知的证书颁发机构发行的 SSL 服务器证书(只用于选项 “--non-interactive”)"
+#: ../svn/notify.c:173
+#, c-format
+msgid "  Property conflicts: %d\n"
+msgstr "  属性冲突：%d\n"
 
-#: ../svn/main.c:232 ../svnrdump/svnrdump.c:128 ../svnsync/main.c:176
-msgid "do no interactive prompting"
-msgstr "不要交互提示"
+#: ../svn/notify.c:177
+#, c-format
+msgid "  Tree conflicts: %d\n"
+msgstr "  树冲突：%d\n"
 
-#: ../svn/main.c:234
-msgid "try operation but make no changes"
-msgstr "尝试操作但没有修改"
+#: ../svn/notify.c:184
+#, c-format
+msgid "  Text conflicts: %s (%s)\n"
+msgstr "  正文冲突：%s (%s)\n"
 
-#: ../svn/main.c:236 ../svnlook/main.c:126
-msgid "do not print differences for deleted files"
-msgstr "不要输出删除文件造成的差异"
+#: ../svn/notify.c:189
+#, c-format
+msgid "  Property conflicts: %s (%s)\n"
+msgstr "  属性冲突：%s (%s)\n"
 
-#: ../svn/main.c:238
-msgid "notice ancestry when calculating differences"
-msgstr "比较差异时提示原始信息"
-
-#: ../svn/main.c:240
-msgid "ignore ancestry when calculating merges"
-msgstr "合并时忽略原始信息"
+#: ../svn/notify.c:194
+#, c-format
+msgid "  Tree conflicts: %s (%s)\n"
+msgstr "  树冲突：%s (%s)\n"
 
-#: ../svn/main.c:242
-msgid "ignore externals definitions"
-msgstr "忽略外部项目"
+#: ../svn/notify.c:200
+#, c-format
+msgid "  Skipped paths: %d\n"
+msgstr "  跳过的路径：%d\n"
 
-#: ../svn/main.c:243
-msgid "use ARG as diff command"
-msgstr "使用 ARG 作为比较命令"
+#: ../svn/notify.c:235
+#, c-format
+msgid "Skipped missing target: '%s'\n"
+msgstr "跳过缺少的目标: “%s”\n"
 
-#: ../svn/main.c:244
-msgid "use ARG as merge command"
-msgstr "使用 ARG 作为合并命令"
+#: ../svn/notify.c:242
+#, c-format
+msgid "Skipped target: '%s' -- copy-source is missing\n"
+msgstr "跳过目标: '%s' -- copy-source 丢失\n"
 
-#: ../svn/main.c:245
-msgid "use ARG as external editor"
-msgstr "使用 ARG 作为外部编辑器"
+#: ../svn/notify.c:249
+#, c-format
+msgid "Skipped '%s'\n"
+msgstr "跳过“%s”\n"
 
-#: ../svn/main.c:247
-msgid "merge only mergeinfo differences"
-msgstr "只合并合并信息的差异"
+#: ../svn/notify.c:256
+#, c-format
+msgid "Skipped '%s' -- An obstructing working copy was found\n"
+msgstr "忽略“%s” -- 发现障碍工作副本\n"
 
-#: ../svn/main.c:248
-msgid "use ARG as the older target"
-msgstr "使用 ARG 作为旧目标"
+#: ../svn/notify.c:263
+#, c-format
+msgid "Skipped '%s' -- Has no versioned parent\n"
+msgstr "已跳过 '%s' -- 没有已版本控制的父亲\n"
 
-#: ../svn/main.c:249
-msgid "use ARG as the newer target"
-msgstr "使用 ARG 作为新目标"
+#: ../svn/notify.c:270
+#, c-format
+msgid "Skipped '%s' -- Access denied\n"
+msgstr "已跳过 '%s' -- 拒绝访问\n"
 
-#: ../svn/main.c:251
-msgid "operate on a revision property (use with -r)"
-msgstr "在版本属性上操作(使用-r参数)"
+#: ../svn/notify.c:277
+#, c-format
+msgid "Skipped '%s' -- Node remains in conflict\n"
+msgstr "已跳过 '%s' -- 节点处于冲突状态\n"
 
-#: ../svn/main.c:252
-msgid "relocate via URL-rewriting"
-msgstr "通过URL改写重新定位"
+#: ../svn/notify.c:358
+#, c-format
+msgid "Restored '%s'\n"
+msgstr "已还原“%s”\n"
 
-#: ../svn/main.c:254 ../svnadmin/main.c:244 ../svnrdump/svnrdump.c:122
-#: ../svnsync/main.c:202
-msgid "read user configuration files from directory ARG"
-msgstr "从目录 ARG 读取用户配置文件"
+#: ../svn/notify.c:364
+#, c-format
+msgid "Reverted '%s'\n"
+msgstr "已恢复“%s”\n"
 
-#: ../svn/main.c:256 ../svnrdump/svnrdump.c:136 ../svnsync/main.c:204
-msgid ""
-"set user configuration option in the format:\n"
-"                                 FILE:SECTION:OPTION=[VALUE]\n"
-"                             For example:\n"
-"                                 servers:global:http-library=serf"
-msgstr ""
-"以下属格式设置用户配置选项：\n"
-"                                 FILE:SECTION:OPTION=[VALUE]\n"
-"                             例如：\n"
-"                                 servers:global:http-library=serf"
+#: ../svn/notify.c:370
+#, c-format
+msgid "Failed to revert '%s' -- try updating instead.\n"
+msgstr "无法恢复“%s”-- 请改用更新试试。\n"
 
-#: ../svn/main.c:263
-msgid "enable automatic properties"
-msgstr "启用自动属性"
+#: ../svn/notify.c:378
+#, c-format
+msgid "Resolved conflicted state of '%s'\n"
+msgstr "“%s”的冲突状态已解决\n"
 
-#: ../svn/main.c:264
-msgid "disable automatic properties"
-msgstr "关闭自动属性"
+#: ../svn/notify.c:473 ../svn/notify.c:513
+#, c-format
+msgid ">         applied hunk ## -%lu,%lu +%lu,%lu ## with offset %s"
+msgstr ">         已应用块 ## -%lu,%lu +%lu,%lu ##，偏移 %s"
 
-#: ../svn/main.c:266
-msgid ""
-"use a different EOL marker than the standard\n"
-"                             system marker for files with the svn:eol-style\n"
-"                             property set to 'native'.\n"
-"                             ARG may be one of 'LF', 'CR', 'CRLF'"
-msgstr ""
-"使用非标准的 EOL 标记\n"
-"                系统中立的文件标记 svn:eol-style 属性取值为 “native”。\n"
-"                ARG 可以是以下之一“LF”，“CR”，“CRLF”"
+#: ../svn/notify.c:490 ../svn/notify.c:527
+#, c-format
+msgid ">         applied hunk @@ -%lu,%lu +%lu,%lu @@ with offset %s"
+msgstr ">         已应用块 @@ -%lu,%lu +%lu,%lu @@ 偏移 %s"
 
-#: ../svn/main.c:273
-msgid "maximum number of log entries"
-msgstr "日值项最大值"
+#: ../svn/notify.c:548
+#, c-format
+msgid ">         applied hunk ## -%lu,%lu +%lu,%lu ## with fuzz %lu (%s)\n"
+msgstr ">         已应用块 ## -%lu,%lu +%lu,%lu ## 模糊 %lu (%s)\n"
 
-#: ../svn/main.c:274
-msgid "don't unlock the targets"
-msgstr "不要解锁目标"
+#: ../svn/notify.c:558
+#, c-format
+msgid ">         applied hunk @@ -%lu,%lu +%lu,%lu @@ with fuzz %lu\n"
+msgstr ">         已应用块 @@ -%lu,%lu +%lu,%lu @@ 模糊 %lu\n"
 
-#: ../svn/main.c:275
-msgid "show a summary of the results"
-msgstr "显示结果的概要"
+#: ../svn/notify.c:576
+#, c-format
+msgid ">         rejected hunk ## -%lu,%lu +%lu,%lu ## (%s)\n"
+msgstr ">         已拒绝块 ## -%lu,%lu +%lu,%lu ## (%s)\n"
 
-#: ../svn/main.c:276
-msgid "remove changelist association"
-msgstr "删除修改列表耦合"
+#: ../svn/notify.c:585
+#, c-format
+msgid ">         rejected hunk @@ -%lu,%lu +%lu,%lu @@\n"
+msgstr ">         已拒绝的块 @@ -%lu,%lu +%lu,%lu @@\n"
 
-#: ../svn/main.c:278
-msgid "operate only on members of changelist ARG"
-msgstr "只能对修改列表 ARG 的成员操作"
+#: ../svn/notify.c:599
+#, c-format
+msgid ">         hunk ## -%lu,%lu +%lu,%lu ## already applied (%s)\n"
+msgstr ">         块 ## -%lu,%lu +%lu,%lu ## 已经应用 (%s)\n"
 
-#: ../svn/main.c:280
-msgid "don't delete changelists after commit"
-msgstr "不要在提交后删除修改列表"
-
-#: ../svn/main.c:281
-msgid "keep path in working copy"
-msgstr "在工作副本中保留路径"
-
-#: ../svn/main.c:283
-msgid "retrieve all revision properties"
-msgstr "获取所有版本属性"
-
-#: ../svn/main.c:285
-msgid "retrieve no revision properties"
-msgstr "没有找回版本属性"
+#: ../svn/notify.c:609
+#, c-format
+msgid ">         hunk @@ -%lu,%lu +%lu,%lu @@ already applied\n"
+msgstr ">         块 @@ -%lu,%lu +%lu,%lu @@ 已经应用\n"
 
-#: ../svn/main.c:287
+#: ../svn/notify.c:669
+#, c-format
 msgid ""
-"set revision property ARG in new revision\n"
-"                             using the name[=value] format"
+"\n"
+"Fetching external item into '%s':\n"
 msgstr ""
-"在新版本设置版本属性 ARG\n"
-"                使用格式 name[=value]"
+"\n"
+"正在取得外部项目至 '%s':\n"
 
-#: ../svn/main.c:290
-msgid "make intermediate directories"
-msgstr "创建中间目录"
+#: ../svn/notify.c:695
+#, c-format
+msgid "Error handling externals definition for '%s':"
+msgstr "处理外部引用“%s”时出错："
 
-#: ../svn/main.c:292
-msgid ""
-"use/display additional information from merge\n"
-"                             history"
-msgstr "从合并历史使用/显示额外信息"
+#: ../svn/notify.c:708
+#, c-format
+msgid "Updating '%s':\n"
+msgstr "正在升级 '%s':\n"
 
-#: ../svn/main.c:296
-msgid ""
-"specify automatic conflict resolution action\n"
-"                             ('postpone', 'working', 'base', 'mine-"
-"conflict',\n"
-"                             'theirs-conflict', 'mine-full', 'theirs-full',\n"
-"                             'edit', 'launch')\n"
-"                             (shorthand: 'p', 'mc', 'tc', 'mf', 'tf', 'e', "
-"'l')"
-msgstr ""
-"指定自动解决冲突动作\n"
-"                             ('postpone', 'working', 'base', 'mine-"
-"conflict',\n"
-"                             'theirs-conflict', 'mine-full', 'theirs-full',\n"
-"                             'edit', 'launch')\n"
-"                             (shorthand: 'p', 'mc', 'tc', 'mf', 'tf', 'e', "
-"'l')"
+#: ../svn/notify.c:722
+#, c-format
+msgid "Exported external at revision %ld.\n"
+msgstr "已导出版本 %ld 的外部项目。\n"
 
-#: ../svn/main.c:307
-msgid ""
-"specify which collection of revisions to display\n"
-"                             ('merged', 'eligible')"
-msgstr ""
-"指定显示哪个版本集合\n"
-"                             ('merged', 'eligible')"
+#: ../svn/notify.c:723
+#, c-format
+msgid "Exported revision %ld.\n"
+msgstr "已导出版本 %ld。\n"
 
-#: ../svn/main.c:311
-msgid "merge a branch back into its parent branch"
-msgstr "合并分支回父分支"
+#: ../svn/notify.c:731
+#, c-format
+msgid "Checked out external at revision %ld.\n"
+msgstr "取出版本 %ld 的外部项目。\n"
 
-#: ../svn/main.c:313
-msgid ""
-"number of leading path components to strip from\n"
-"                             paths parsed from the patch file. --strip 0\n"
-"                             is the default and leaves paths unmodified.\n"
-"                             --strip 1 would change the path\n"
-"                             'doc/fudge/crunchy.html' to "
-"'fudge/crunchy.html'.\n"
-"                             --strip 2 would leave just 'crunchy.html'\n"
-"                             The expected component separator is '/' on all\n"
-"                             platforms. A leading '/' counts as one "
-"component."
-msgstr ""
-"需要从补丁文件中的路径中裁剪的前导路径组件数量。\n"
-"                             默认 --strip 0 不修改路径。指定 --strip 1 会将\n"
-"                             路径 'doc/fudge/crunchy.html' 转换为\n"
-"                             'fudge/crunchy.html'。指定 --strip 2 会得到\n"
-"                             'crunchy.html' 。在所有平台中期望的组件分隔符\n"
-"                             都是 '/'。前导 '/' 被计算为一个组件。"
+#: ../svn/notify.c:732
+#, c-format
+msgid "Checked out revision %ld.\n"
+msgstr "取出版本 %ld。\n"
 
-#: ../svn/main.c:329
-msgid "don't diff copied or moved files with their source"
-msgstr "请不要将复制或移动的文件与其源文件比较"
+#: ../svn/notify.c:743
+#, c-format
+msgid "Updated external to revision %ld.\n"
+msgstr "更新外部项目至版本 %ld。\n"
 
-#: ../svn/main.c:331
-msgid "don't expand keywords"
-msgstr "不要展开关键字"
+#: ../svn/notify.c:744
+#, c-format
+msgid "Updated to revision %ld.\n"
+msgstr "更新到版本 %ld。\n"
 
-#: ../svn/main.c:333
-msgid "apply the unidiff in reverse"
-msgstr "反向应用补丁"
+#: ../svn/notify.c:752
+#, c-format
+msgid "External at revision %ld.\n"
+msgstr "外部项目版本 %ld。\n"
 
-#: ../svn/main.c:335
-msgid "ignore whitespace during pattern matching"
-msgstr "在模式匹配时，忽略空白"
+#: ../svn/notify.c:753
+#, c-format
+msgid "At revision %ld.\n"
+msgstr "版本 %ld。\n"
 
-#: ../svn/main.c:336
-msgid "produce diff output"
-msgstr "产生差异输出"
+#: ../svn/notify.c:765
+#, c-format
+msgid "External export complete.\n"
+msgstr "完成外部项目导出。\n"
 
-#: ../svn/main.c:338
-msgid "override diff-cmd specified in config file"
-msgstr "覆盖配置文件中指定的 diff-cmd"
+#: ../svn/notify.c:766
+#, c-format
+msgid "Export complete.\n"
+msgstr "完成导出。\n"
 
-#: ../svn/main.c:340
-msgid "use git's extended diff format"
-msgstr "使用 git 的扩展差异格式"
+#: ../svn/notify.c:773
+#, c-format
+msgid "External checkout complete.\n"
+msgstr "完成取出外部项目。\n"
 
-#: ../svn/main.c:342
-msgid ""
-"Allow merge into mixed-revision working copy.\n"
-"                             Use of this option is not recommended!\n"
-"                             Please run 'svn update' instead."
-msgstr ""
-"允许合并到含有混合版本的工作副本.\n"
-"                             不建议使用此选项!\n"
-"                             请先执行 'svn update' 。"
+#: ../svn/notify.c:774
+#, c-format
+msgid "Checkout complete.\n"
+msgstr "完成取出。\n"
 
-#: ../svn/main.c:393
-msgid ""
-"Put files and directories under version control, scheduling\n"
-"them for addition to repository.  They will be added in next commit.\n"
-"usage: add PATH...\n"
-msgstr ""
-"把文件和目录纳入版本控制，通过调度加到版本库。它们会在下一次提交时加入。\n"
-"用法: add 路径...\n"
+#: ../svn/notify.c:781
+#, c-format
+msgid "External update complete.\n"
+msgstr "完成外部项目更新。\n"
 
-#: ../svn/main.c:398
-msgid "add intermediate parents"
-msgstr "增加中间父目录"
+#: ../svn/notify.c:782
+#, c-format
+msgid "Update complete.\n"
+msgstr "完成更新。\n"
 
-#: ../svn/main.c:401
+#: ../svn/notify.c:798
+#, c-format
 msgid ""
-"Output the content of specified files or\n"
-"URLs with revision and author information in-line.\n"
-"usage: blame TARGET[@REV]...\n"
 "\n"
-"  If specified, REV determines in which revision the target is first\n"
-"  looked up.\n"
+"Performing status on external item at '%s':\n"
 msgstr ""
-"输出指定文件或URL的追溯内容，包含版本和作者信息。\n"
-"\n"
-"用法: blame 目标[@版本]...\n"
 "\n"
-"      如果指定了版本，将从指定的版本开始查找。\n"
+"对外部项目“%s”进行状态检查:\n"
 
-#: ../svn/main.c:410
-msgid ""
-"Output the content of specified files or URLs.\n"
-"usage: cat TARGET[@REV]...\n"
-"\n"
-"  If specified, REV determines in which revision the target is first\n"
-"  looked up.\n"
-msgstr ""
-"输出指定文件或URL的内容。\n"
-"用法: cat 目标[@版本]...\n"
-"\n"
-"      如果指定了版本，将从指定的版本开始查找。\n"
+#: ../svn/notify.c:806
+#, c-format
+msgid "Status against revision: %6ld\n"
+msgstr "版本 %6ld 的状态\n"
 
-#: ../svn/main.c:418
-msgid ""
-"Associate (or dissociate) changelist CLNAME with the named files.\n"
-"usage: 1. changelist CLNAME PATH...\n"
-"       2. changelist --remove PATH...\n"
-msgstr ""
-"耦合(或解耦)命名文件与修改列表 CLNAME。\n"
-"使用: 1. changelist CLNAME PATH...\n"
-"      2. changelist --remove PATH...\n"
+#: ../svn/notify.c:815
+#, c-format
+msgid "Sending copy of       %s\n"
+msgstr "正在发送副本          %s\n"
 
-#: ../svn/main.c:424
-msgid ""
-"Check out a working copy from a repository.\n"
-"usage: checkout URL[@REV]... [PATH]\n"
-"\n"
-"  If specified, REV determines in which revision the URL is first\n"
-"  looked up.\n"
-"\n"
-"  If PATH is omitted, the basename of the URL will be used as\n"
-"  the destination. If multiple URLs are given each will be checked\n"
-"  out into a sub-directory of PATH, with the name of the sub-directory\n"
-"  being the basename of the URL.\n"
-"\n"
-"  If --force is used, unversioned obstructing paths in the working\n"
-"  copy destination do not automatically cause the check out to fail.\n"
-"  If the obstructing path is the same type (file or directory) as the\n"
-"  corresponding path in the repository it becomes versioned but its\n"
-"  contents are left 'as-is' in the working copy.  This means that an\n"
-"  obstructing directory's unversioned children may also obstruct and\n"
-"  become versioned.  For files, any content differences between the\n"
-"  obstruction and the repository are treated like a local modification\n"
-"  to the working copy.  All properties from the repository are applied\n"
-"  to the obstructing path.\n"
-"\n"
-"  See also 'svn help update' for a list of possible characters\n"
-"  reporting the action taken.\n"
-msgstr ""
-"从版本库签出工作副本。\n"
-"使用: checkout URL[@REV]... [PATH]\n"
-"\n"
-"  如果指定 REV，那么它确定了从 URL 首先查找的版本。\n"
-"\n"
-"  如果省略路径参数，则 URL 最末尾的目录名作为目标目录名。如果指定多个 URL，\n"
-"  则依次将其签出到 PATH 的子目录中，子目录名就是 URL 最末尾的目录名。\n"
-"\n"
-"  如果使用了 “--force” 选项，在工作副本中未版本控制的障碍路径，不会自动导\n"
-"  致签出失败。 如果障碍路径与版本库中的对应路径类型相同(文件或目录),它将成\n"
-"  为受版本控制的路径，但是内容不改变。它意味着障碍路径的孩子，如果也是障碍路\n"
-"  径，那么也会受版本控制。对于障碍路径中的文件，如果与版本库内的不同，将视为工\n"
-"  作副本发生本地修改。版本库中的所有属性都应用于障碍路径。\n"
-"\n"
-"  参见 “svn help update” 以获取报告执行动作的字符列表。\n"
+#: ../svn/notify.c:816
+#, c-format
+msgid "Sending        %s\n"
+msgstr "正在发送       %s\n"
 
-#: ../svn/main.c:451
-msgid ""
-"Recursively clean up the working copy, removing locks, resuming\n"
-"unfinished operations, etc.\n"
-"usage: cleanup [WCPATH...]\n"
-msgstr ""
-"递归清理工作副本，删除锁，继续未完成操作，等等。\n"
-"用法: cleanup [路径...]\n"
+#: ../svn/notify.c:827
+#, c-format
+msgid "Adding copy of (bin)  %s\n"
+msgstr "正在增加 (二进制)     %s\n"
 
-#: ../svn/main.c:457
-msgid ""
-"Send changes from your working copy to the repository.\n"
-"usage: commit [PATH...]\n"
-"\n"
-"  A log message must be provided, but it can be empty.  If it is not\n"
-"  given by a --message or --file option, an editor will be started.\n"
-"  If any targets are (or contain) locked items, those will be\n"
-"  unlocked after a successful commit.\n"
-msgstr ""
-"把工作副本的修改提交到版本库。\n"
-"用法: commit [路径...]\n"
-"\n"
-"     必须提供日志消息，但它可以是空的。如果没有指定 --message 或 --file\n"
-"     选项，编辑器会被启动。如果有目标是锁定的或者包含锁定条目，则在成功\n"
-"     提交后会被解锁。\n"
+#: ../svn/notify.c:828
+#, c-format
+msgid "Adding  (bin)  %s\n"
+msgstr "正在增加 (二进制) %s\n"
 
-#: ../svn/main.c:468
-msgid ""
-"Duplicate something in working copy or repository, remembering\n"
-"history.\n"
-"usage: copy SRC[@REV]... DST\n"
-"\n"
-"When copying multiple sources, they will be added as children of DST,\n"
-"which must be a directory.\n"
-"\n"
-"  SRC and DST can each be either a working copy (WC) path or URL:\n"
-"    WC  -> WC:   copy and schedule for addition (with history)\n"
-"    WC  -> URL:  immediately commit a copy of WC to URL\n"
-"    URL -> WC:   check out URL into WC, schedule for addition\n"
-"    URL -> URL:  complete server-side copy;  used to branch and tag\n"
-"  All the SRCs must be of the same type.\n"
-"\n"
-"WARNING: For compatibility with previous versions of Subversion,\n"
-"copies performed using two working copy paths (WC -> WC) will not\n"
-"contact the repository.  As such, they may not, by default, be able\n"
-"to propagate merge tracking information from the source of the copy\n"
-"to the destination.\n"
-msgstr ""
-"在工作副本或版本库中复制数据，保留历史。\n"
-"用法: copy SRC[@REV]... DST\n"
-"\n"
-"当复制多个源时，它们作为 DST 的子节点增加, DST 必须是目录。\n"
-"\n"
-"  SRC 和 DST 可以是工作副本路径(WC)或版本库地址(URL): \n"
-"    WC   -> WC:  复制和调度增加(包含历史)\n"
-"    WC   -> URL: 立即提交工作副本到版本库\n"
-"    URL  -> WC:  检出 URL 到工作副本，调度增加\n"
-"    URL  -> URL: 完全服务器端复制；一般用于分支和标签\n"
-"  所有 SRC 必须是同一类型。\n"
-"\n"
-"警告：为了与旧版本的 Subversion 兼容，使用两个工作副本复制(WC -> WC)的\n"
-"操作不会与版本库通信。同样地，在缺省情况下，不能从复制源到目的地传播合\n"
-"并跟踪信息。\n"
+#: ../svn/notify.c:836
+#, c-format
+msgid "Adding copy of        %s\n"
+msgstr "正在增加副本          %s\n"
 
-#: ../svn/main.c:490
-msgid ""
-"Remove files and directories from version control.\n"
-"usage: 1. delete PATH...\n"
-"       2. delete URL...\n"
-"\n"
-"  1. Each item specified by a PATH is scheduled for deletion upon\n"
-"    the next commit.  Files, and directories that have not been\n"
-"    committed, are immediately removed from the working copy\n"
-"    unless the --keep-local option is given.\n"
-"    PATHs that are, or contain, unversioned or modified items will\n"
-"    not be removed unless the --force or --keep-local option is given.\n"
-"\n"
-"  2. Each item specified by a URL is deleted from the repository\n"
-"    via an immediate commit.\n"
-msgstr ""
-"从版本库中删除文件和目录。\n"
-"用法: 1、delete PATH...\n"
-"      2、delete URL...\n"
-"\n"
-"  1、每个 PATH 指定的项目会被调度到下次提交时从版本库删除。除非给出\n"
-"    --keep-local 参数，工作副本中没有提交的文件和目录会被立即删除。\n"
-"    如果 PATH 未版本控制或者包含未版本控制的项目，或者包含已修改的\n"
-"    项目，那么仅当给出 --force 或 --keep-local 参数时这些项目才会被\n"
-"    删除。\n"
-"\n"
-"  2、每个 URL 指定的项目会通过立即提交从版本库中删除。\n"
+#: ../svn/notify.c:837
+#, c-format
+msgid "Adding         %s\n"
+msgstr "正在增加       %s\n"
 
-#: ../svn/main.c:506
-msgid ""
-"Display the differences between two revisions or paths.\n"
-"usage: 1. diff [-c M | -r N[:M]] [TARGET[@REV]...]\n"
-"       2. diff [-r N[:M]] --old=OLD-TGT[@OLDREV] [--new=NEW-TGT[@NEWREV]] \\"
-"\n"
-"               [PATH...]\n"
-"       3. diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]\n"
-"\n"
-"  1. Display the changes made to TARGETs as they are seen in REV between\n"
-"     two revisions.  TARGETs may be all working copy paths or all URLs.\n"
-"     If TARGETs are working copy paths, N defaults to BASE and M to the\n"
-"     working copy; if URLs, N must be specified and M defaults to HEAD.\n"
-"     The '-c M' option is equivalent to '-r N:M' where N = M-1.\n"
-"     Using '-c -M' does the reverse: '-r M:N' where N = M-1.\n"
-"\n"
-"  2. Display the differences between OLD-TGT as it was seen in OLDREV and\n"
-"     NEW-TGT as it was seen in NEWREV.  PATHs, if given, are relative to\n"
-"     OLD-TGT and NEW-TGT and restrict the output to differences for those\n"
-"     paths.  OLD-TGT and NEW-TGT may be working copy paths or URL[@REV].\n"
-"     NEW-TGT defaults to OLD-TGT if not specified.  -r N makes OLDREV "
-"default\n"
-"     to N, -r N:M makes OLDREV default to N and NEWREV default to M.\n"
-"\n"
-"  3. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]'\n"
-"\n"
-"  Use just 'svn diff' to display local modifications in a working copy.\n"
-msgstr ""
-"显示两个版本或路径的差异。\n"
-"用法: 1. diff [-c M | -r N[:M]] [TARGET[@REV]...]\n"
-"      2. diff [-r N[:M]] --old=OLD-TGT[@OLDREV] [--new=NEW-TGT[@NEWREV]] \\\n"
-"               [PATH...]\n"
-"       3. diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]\n"
-"\n"
-"  1、显示版本 REV 中 TARGET 在两个不同的版本之间的差异。TARGET 要么全是\n"
-"     工作副本路径，要么全是 URL。如果 TARGET 是工作副本路径，N 默认为\n"
-"     BASE，M 默认为工作副本；如果 TARGET 是 URL，N 必须指定， M 默认为 HEAD。\n"
-"    “-c M” 等价于 “-r M-1:M”，“-c -M” 等价于 “-r M:M-1”。\n"
-"\n"
-"  2、显示新旧版本中对应目标的差异。PATH 是相对于新旧目标的相对路径，\n"
-"     它限制只输出这些路径上的差异。新旧目标可以是工作副本路径或地址 URL[@REV]。\n"
-"     新目标默认与旧目标相同，OLDREV 默认为 N，NEWREV 默认为 M。\n"
-"\n"
-"  3、“svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]” 的简写。\n"
-"\n"
-"     使用不加参数的 “svn diff” 显示工作副本中的本地修改。\n"
+#: ../svn/notify.c:846
+#, c-format
+msgid "Deleting copy of      %s\n"
+msgstr "正在删除副本          %s\n"
 
-#: ../svn/main.c:534
-msgid ""
-"Create an unversioned copy of a tree.\n"
-"usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n"
-"       2. export [-r REV] PATH1[@PEGREV] [PATH2]\n"
-"\n"
-"  1. Exports a clean directory tree from the repository specified by\n"
-"     URL, at revision REV if it is given, otherwise at HEAD, into\n"
-"     PATH. If PATH is omitted, the last component of the URL is used\n"
-"     for the local directory name.\n"
-"\n"
-"  2. Exports a clean directory tree from the working copy specified by\n"
-"     PATH1, at revision REV if it is given, otherwise at WORKING, into\n"
-"     PATH2.  If PATH2 is omitted, the last component of the PATH1 is used\n"
-"     for the local directory name. If REV is not specified, all local\n"
-"     changes will be preserved.  Files not under version control will\n"
-"     not be copied.\n"
-"\n"
-"  If specified, PEGREV determines in which revision the target is first\n"
-"  looked up.\n"
-msgstr ""
-"产生一个无版本控制的目录树副本。\n"
-"用法: 1、export [-r REV] URL[@PEGREV] [PATH]\n"
-"      2、export [-r REV] PATH1[@PEGREV] [PATH2]\n"
-"\n"
-"  1、从 URL 指定的版本库，导出一个干净的目录树到 PATH。如果有指定\n"
-"     REV 的话，内容即为该版本的，否则就是 HEAD 版本。如果 PATH\n"
-"     被省略的话，URL的最后部分会被用来当成本地的目录名称。\n"
-"\n"
-"  2、在工作副本中，从指定的 PATH1 导出一个干净的目录树到 PATH2。如果\n"
-"     有指定 REV 的话，会从指定的版本导出，否则从工作副本导出。如果\n"
-"     PATH2 被省略的话，PATH1 的最后部分会被用来当成本地的目录名称。\n"
-"     如果没有指定 REV 的话，所有的本地修改都保留，但是未纳入版本控制\n"
-"     的文件不会被复制。\n"
-"\n"
-"     如果指定了 PEGREV ，将从指定的版本本开始查找。\n"
+#: ../svn/notify.c:847
+#, c-format
+msgid "Deleting       %s\n"
+msgstr "正在删除       %s\n"
 
-#: ../svn/main.c:556
-msgid ""
-"Describe the usage of this program or its subcommands.\n"
-"usage: help [SUBCOMMAND...]\n"
-msgstr ""
-"描述本程序或其子命令的用法。\n"
-"用法: help [子命令...]\n"
+#: ../svn/notify.c:856
+#, c-format
+msgid "Replacing copy of     %s\n"
+msgstr "正在替换副本          %s\n"
 
-#: ../svn/main.c:562
-msgid ""
-"Commit an unversioned file or tree into the repository.\n"
-"usage: import [PATH] URL\n"
-"\n"
-"  Recursively commit a copy of PATH to URL.\n"
-"  If PATH is omitted '.' is assumed.\n"
-"  Parent directories are created as necessary in the repository.\n"
-"  If PATH is a directory, the contents of the directory are added\n"
-"  directly under URL.\n"
-"  Unversionable items such as device files and pipes are ignored\n"
-"  if --force is specified.\n"
-msgstr ""
-"将未纳入版本控制的文件或目录树提交到版本库。\n"
-"用法: import [PATH] URL\n"
-"\n"
-"  递归地提交 PATH 的副本至 URL。\n"
-"  如果省略 PATH，则默认为 “.”。\n"
-"  父目录会根据需要在版本库内创建。\n"
-"  如果 PATH 是目录，则其下的内容直接加入到 URL 指定的位置内。\n"
-"  如果使用了 “--force”，那么不能纳入版本控制的项目，例如设备文件，管道等，会被忽略。\n"
+#: ../svn/notify.c:857
+#, c-format
+msgid "Replacing      %s\n"
+msgstr "正在替换       %s\n"
 
-#: ../svn/main.c:576
-msgid ""
-"Display information about a local or remote item.\n"
-"usage: info [TARGET[@REV]...]\n"
-"\n"
-"  Print information about each TARGET (default: '.').\n"
-"  TARGET may be either a working-copy path or URL.  If specified, REV\n"
-"  determines in which revision the target is first looked up.\n"
-msgstr ""
-"显示本地或远程条目的信息。\n"
-"用法: info [TARGET[@REV]...]\n"
-"\n"
-"  显示每个 TARGET 的信息 (默认: “.”)。\n"
-"  TARGET 可以是工作副本中的路径或版本库中的 URL。REV 指定从哪个\n"
-"  版本开始查找目标。\n"
+#: ../svn/notify.c:867 ../svnsync/sync.c:327
+#, c-format
+msgid "Transmitting file data "
+msgstr "传输文件数据 "
 
-#: ../svn/main.c:586
-msgid ""
-"List directory entries in the repository.\n"
-"usage: list [TARGET[@REV]...]\n"
-"\n"
-"  List each TARGET file and the contents of each TARGET directory as\n"
-"  they exist in the repository.  If TARGET is a working copy path, the\n"
-"  corresponding repository URL will be used. If specified, REV determines\n"
-"  in which revision the target is first looked up.\n"
-"\n"
-"  The default TARGET is '.', meaning the repository URL of the current\n"
-"  working directory.\n"
-"\n"
-"  With --verbose, the following fields will be shown for each item:\n"
-"\n"
-"    Revision number of the last commit\n"
-"    Author of the last commit\n"
-"    If locked, the letter 'O'.  (Use 'svn info URL' to see details)\n"
-"    Size (in bytes)\n"
-"    Date and time of the last commit\n"
-msgstr ""
-"列出版本库中的目录内容。\n"
-"用法: list [TARGET[@REV]...]\n"
-"\n"
-"  显示版本库中文件和子目录列表。如果 TARGET 是工作副本路径，那么操作对应的\n"
-"  版本库URL指定的TARGET。REV指定从在哪个版本查找TARGET。\n"
-"\n"
-"  TARGET默认是“.”，表示当前工作目录对应的版本库URL。\n"
-"\n"
-"  使用 --verbose 时，每个条目会显示以下额外信息: \n"
-"\n"
-"    最后一次提交的版本号码\n"
-"    最后一次提交的作者\n"
-"    如果被锁定，显示字母“O”。(使用“svn info URL”查看详细信息)\n"
-"    大小 (以字节为单位)\n"
-"    最后一次提交的日期与时间\n"
+#: ../svn/notify.c:876 ../svnadmin/svnadmin.c:1698
+#, c-format
+msgid "'%s' locked by user '%s'.\n"
+msgstr "“%s”被用户“%s”锁定。\n"
+
+#: ../svn/notify.c:882
+#, c-format
+msgid "'%s' unlocked.\n"
+msgstr "“%s”解除锁定。\n"
+
+#: ../svn/notify.c:909
+#, c-format
+msgid "--- Merging differences between repository URLs into '%s':\n"
+msgstr "--- 正在合并版本库 URL 之间的差异到 “%s”：\n"
+
+#: ../svn/notify.c:914
+#, c-format
+msgid "--- Merging r%ld into '%s':\n"
+msgstr "--- 正在合并 r%ld 到 “%s”:\n"
+
+#: ../svn/notify.c:918
+#, c-format
+msgid "--- Reverse-merging r%ld into '%s':\n"
+msgstr "--- 正在反向合并 r%ld 到 “%s”:\n"
+
+#: ../svn/notify.c:922
+#, c-format
+msgid "--- Merging r%ld through r%ld into '%s':\n"
+msgstr "--- 正在合并 r%ld，经由 r%ld，到 “%s”:\n"
+
+#: ../svn/notify.c:928
+#, c-format
+msgid "--- Reverse-merging r%ld through r%ld into '%s':\n"
+msgstr "--- 正在反向合并 r%ld，经由 r%ld，到 “%s”:\n"
 
-#: ../svn/main.c:607
+#: ../svn/notify.c:940
+#, c-format
 msgid ""
-"Lock working copy paths or URLs in the repository, so that\n"
-"no other user can commit changes to them.\n"
-"usage: lock TARGET...\n"
-"\n"
-"  Use --force to steal the lock from another user or working copy.\n"
-msgstr ""
-"锁定版本库中的路径，使得其他用户不能向其提交修改。\n"
-"用法: lock TARGET...\n"
-"\n"
-"     使用 --force 选项可以从其他用户或工作副本窃取到锁。\n"
+"--- Recording mergeinfo for merge between repository URLs into '%s':\n"
+msgstr "--- 记录版本库 URL 之间的合并信息到“%s”：\n"
 
-#: ../svn/main.c:613
-msgid "read lock comment from file ARG"
-msgstr "从文件 ARG 读取加锁注释"
+#: ../svn/notify.c:950
+#, c-format
+msgid "--- Recording mergeinfo for merge of r%ld into '%s':\n"
+msgstr "--- 记录合并 r%ld 到“%s”的信息:\n"
 
-#: ../svn/main.c:614
-msgid "specify lock comment ARG"
-msgstr "指定加锁注释ARG"
+#: ../svn/notify.c:955
+#, c-format
+msgid "--- Recording mergeinfo for reverse merge of r%ld into '%s':\n"
+msgstr "--- 记录反向合并 r%ld 到“%s”的信息:\n"
 
-#: ../svn/main.c:615
-msgid "force validity of lock comment source"
-msgstr "强制校验锁定注释源"
+#: ../svn/notify.c:960
+#, c-format
+msgid "--- Recording mergeinfo for merge of r%ld through r%ld into '%s':\n"
+msgstr "--- 记录合并 r%ld，经由 r%ld，到“%s”的信息:\n"
 
-#: ../svn/main.c:618
+#: ../svn/notify.c:965
+#, c-format
 msgid ""
-"Show the log messages for a set of revision(s) and/or path(s).\n"
-"usage: 1. log [PATH][@REV]\n"
-"       2. log URL[@REV] [PATH...]\n"
-"\n"
-"  1. Print the log messages for the URL corresponding to PATH\n"
-"     (default: '.'). If specified, REV is the revision in which the\n"
-"     URL is first looked up, and the default revision range is REV:1.\n"
-"     If REV is not specified, the default revision range is BASE:1,\n"
-"     since the URL might not exist in the HEAD revision.\n"
-"\n"
-"  2. Print the log messages for the PATHs (default: '.') under URL.\n"
-"     If specified, REV is the revision in which the URL is first\n"
-"     looked up, and the default revision range is REV:1; otherwise,\n"
-"     the URL is looked up in HEAD, and the default revision range is\n"
-"     HEAD:1.\n"
-"\n"
-"  Multiple '-c' or '-r' options may be specified (but not a\n"
-"  combination of '-c' and '-r' options), and mixing of forward and\n"
-"  reverse ranges is allowed.\n"
-"\n"
-"  With -v, also print all affected paths with each log message.\n"
-"  With -q, don't print the log message body itself (note that this is\n"
-"  compatible with -v).\n"
-"\n"
-"  Each log message is printed just once, even if more than one of the\n"
-"  affected paths for that revision were explicitly requested.  Logs\n"
-"  follow copy history by default.  Use --stop-on-copy to disable this\n"
-"  behavior, which can be useful for determining branchpoints.\n"
-"\n"
-"  The --depth option is only valid in combination with the --diff option\n"
-"  and limits the scope of the displayed diff to the specified depth.\n"
-"\n"
-"  Examples:\n"
-"    svn log\n"
-"    svn log foo.c\n"
-"    svn log bar.c@42\n"
-"    svn log http://www.example.com/repo/project/foo.c\n"
-"    svn log http://www.example.com/repo/project foo.c bar.c\n"
-"    svn log http://www.example.com/repo/project@50 foo.c bar.c\n"
-msgstr ""
-"显示一组版本与/或路径的日志信息。\n"
-"用法: 1、log [PATH][@REV]\n"
-"      2、log URL[@REV] [PATH...]\n"
-"\n"
-"  1、显示与本地 PATH (默认: “.”) 对应的 URL 的日志信息。如果指定了 REV，版本\n"
-"     范围是 REV:1。默认的版本范围是 BASE:1，因为 URL 未必在 HEAD 中存在。\n"
-"\n"
-"  2、显示 URL 中 PATH (默认: “.”) 的日志信息。如果指定了 REV，版本范围是\n"
-"     REV:1。否则版本范围是 HEAD:1。\n"
-"\n"
-"  可以指定多个 “-c” 或 “-r” 选项 (但是不允许同时使用 “-c” 和 “-r” 选项)，以及\n"
-"  混合使用前向和后向范围。\n"
-"\n"
-"  使用 -v 时，在日志信息中显示受影响的路径名。\n"
-"  使用 -q 时，不显示日志信息主体 (请注意，它可与 -v 并存)。\n"
-"\n"
-"  每条日志信息只会显示一次，即使指定了此版本涉及到的多个路径。默认日志信息\n"
-"  会追溯复制历史；使用 --stop-on-copy 可以关闭这种行为，这可以用来找出分支点。\n"
-"\n"
-"  选项 --depth 只能与选项 --diff 组合使用，用来限制在指定路径上显示差异的范围。\n"
-"\n"
-"  范例: \n"
-"    svn log\n"
-"    svn log foo.c\n"
-"    svn log bar.c@42\n"
-"    svn log http://www.example.com/repo/project/foo.c\n"
-"    svn log http://www.example.com/repo/project foo.c bar.c\n"
-"    svn log http://www.example.com/repo/project@50 foo.c bar.c\n"
+"--- Recording mergeinfo for reverse merge of r%ld through r%ld into '%s':\n"
+msgstr "--- 记录反向合并 r%ld，经由 r%ld，到“%s”的信息:\n"
 
-#: ../svn/main.c:661
-msgid "retrieve revision property ARG"
-msgstr "获取版本属性 ARG"
+#: ../svn/notify.c:975
+#, c-format
+msgid "--- Eliding mergeinfo from '%s':\n"
+msgstr "--- 正在从 '%s' 删除合并信息:\n"
 
-#: ../svn/main.c:662
-msgid "the change made in revision ARG"
-msgstr "版本 ARG 引起的改变"
+#: ../svn/notify.c:983
+#, c-format
+msgid "--- Merging differences between foreign repository URLs into '%s':\n"
+msgstr "--- 正在合并外部版本库 URL 之间的差异到 “%s”：\n"
 
-#. For this large section, let's keep it unindented for easier
-#. * viewing/editing. It has been vim-treated with a textwidth=75 and 'gw'
-#. * (with quotes and newlines removed).
-#: ../svn/main.c:668
+#: ../svn/notify.c:989
+#, c-format
+msgid "--- Merging (from foreign repository) r%ld into '%s':\n"
+msgstr "--- 正在合并(从外部版本库) r%ld 到 “%s”：\n"
+
+#: ../svn/notify.c:994
+#, c-format
+msgid "--- Reverse-merging (from foreign repository) r%ld into '%s':\n"
+msgstr "--- 正在反向合并(从外部版本库) r%ld 到 “%s”:\n"
+
+#: ../svn/notify.c:999
+#, c-format
+msgid "--- Merging (from foreign repository) r%ld through r%ld into '%s':\n"
+msgstr "--- 正在合并(从外部版本库) r%ld，经由 r%ld，到 “%s”:\n"
+
+#: ../svn/notify.c:1005
+#, c-format
+msgid ""
+"--- Reverse-merging (from foreign repository) r%ld through r%ld into '%s':\n"
+msgstr "--- 正在反向合并(从外部版本库) r%ld，经由 r%ld，到 “%s”:\n"
+
+#: ../svn/notify.c:1041
+#, c-format
+msgid "property '%s' set on '%s'\n"
+msgstr "设置属性 “%s” 于 “%s”\n"
+
+#: ../svn/notify.c:1049
+#, c-format
+msgid "property '%s' deleted from '%s'.\n"
+msgstr "删除属性 “%s” 于 “%s”。\n"
+
+#: ../svn/notify.c:1057
+#, c-format
+msgid "Attempting to delete nonexistent property '%s' on '%s'\n"
+msgstr "试图删除不存在的属性“%s”于“%s”\n"
+
+#: ../svn/notify.c:1066
+#, c-format
+msgid "property '%s' set on repository revision %ld\n"
+msgstr "设定属性 “%s” 于版本库版本 %ld\n"
+
+#: ../svn/notify.c:1074
+#, c-format
+msgid "property '%s' deleted from repository revision %ld\n"
+msgstr "删除属性 “%s” 于版本库版本 %ld\n"
+
+#: ../svn/notify.c:1081
+#, c-format
+msgid "Upgraded '%s'\n"
+msgstr "已升级的“%s”\n"
+
+#: ../svn/notify.c:1087
+#, c-format
+msgid "Redirecting to URL '%s':\n"
+msgstr "正在重定向到 URL '%s':\n"
+
+#: ../svn/notify.c:1115
+#, c-format
+msgid "--- Copying from foreign repository URL '%s':\n"
+msgstr "--- 正在从外部版本库 URL '%s' 复制:\n"
+
+#: ../svn/notify.c:1124
+#, c-format
+msgid "Breaking move with source path '%s'\n"
+msgstr "源路径“%s”移动失败\n"
+
+#: ../svn/propdel-cmd.c:88
+#, c-format
+msgid "Cannot specify revision for deleting versioned property '%s'"
+msgstr "删除纳入版本控制的属性 “%s” 时不可指定版本"
+
+#: ../svn/propedit-cmd.c:62 ../svn/propedit-cmd.c:341
+#, c-format
+msgid "Set new value for property '%s' on '%s'\n"
+msgstr "属性 “%s” 于 “%s” 被设为新值\n"
+
+#: ../svn/propedit-cmd.c:96 ../svn/propset-cmd.c:97
+msgid ""
+"--encoding option applies only to textual Subversion-controlled properties"
+msgstr "--encoding 选项只能用于 Subversion 的文本属性"
+
+#: ../svn/propedit-cmd.c:162
+#, c-format
+msgid "Set new value for property '%s' on revision %ld\n"
+msgstr "属性 “%s” 于版本 %ld 被设为新值\n"
+
+#: ../svn/propedit-cmd.c:168
+#, c-format
+msgid "No changes to property '%s' on revision %ld\n"
+msgstr "属性 “%s” 于版本 %ld 没有改变\n"
+
+#: ../svn/propedit-cmd.c:176
+#, c-format
+msgid "Cannot specify revision for editing versioned property '%s'"
+msgstr "编辑纳入版本控制的属性 “%s” 时不可指定版本"
+
+#: ../svn/propedit-cmd.c:204 ../svn/propset-cmd.c:172
+msgid "Explicit target argument required"
+msgstr "必须明确地提供目标参数"
+
+#: ../svn/propedit-cmd.c:271
+#, c-format
+msgid "'%s' does not appear to be a working copy path"
+msgstr "“%s”不像是工作副本路径"
+
+#: ../svn/propedit-cmd.c:348
+#, c-format
+msgid "No changes to property '%s' on '%s'\n"
+msgstr "属性 “%s” 于 “%s” 没有改变\n"
+
+#: ../svn/propget-cmd.c:66
+msgid "Error writing to stream"
+msgstr "写入流出错"
+
+#: ../svn/propget-cmd.c:186 ../svn/proplist-cmd.c:156
+#: ../svn/proplist-cmd.c:160 ../svnlook/svnlook.c:1754
+#: ../svnlook/svnlook.c:1908
+#, c-format
+msgid ""
+"Inherited properties on '%s',\n"
+"from '%s':\n"
+msgstr ""
+
+#. Not a --revprop
+#: ../svn/propget-cmd.c:196 ../svn/proplist-cmd.c:175
+#: ../svnlook/svnlook.c:1790 ../svnlook/svnlook.c:1943
+#, c-format
+msgid "Properties on '%s':\n"
+msgstr "“%s” 上的属性:\n"
+
+#: ../svn/propget-cmd.c:326
+msgid "--verbose cannot be used with --revprop or --strict or --xml"
+msgstr "--verbose 不能与 --revprop， --strict 或 --xml 共存"
+
+#: ../svn/propget-cmd.c:358 ../svn/proplist-cmd.c:214
+msgid "--show-inherited-props can't be used with --revprop"
+msgstr "--show-inherited-props 不能与 --revprop 共存"
+
+#: ../svn/propget-cmd.c:425
+msgid ""
+"Strict output of property values only available for single-target, non-"
+"recursive propget operations"
+msgstr "精确的输出属性值只适用于单一目标的非递归操作 propget"
+
+#: ../svn/proplist-cmd.c:246
+#, c-format
+msgid "Unversioned properties on revision %ld:\n"
+msgstr "版本 %ld 上的未纳入版本控制的属性:\n"
+
+#: ../svn/proplist-cmd.c:321
+msgid ""
+"Could not display properties of all targets because some targets don't exist"
+msgstr "因为一些目标不存在，所以不能显示全部目标的属性"
+
+#: ../svn/proplist-cmd.c:326
+msgid ""
+"Could not display properties of all targets because some targets are not "
+"versioned"
+msgstr "因为一些目标没有版本化，所以不能显示全部目标的属性"
+
+#: ../svn/props.c:66
+msgid ""
+"Must specify the revision as a number, a date or 'HEAD' when operating on a "
+"revision property"
+msgstr "操作版本属性时，必须指定数字、日期形式的版本号或“HEAD”。"
+
+#: ../svn/props.c:73
+msgid "Wrong number of targets specified"
+msgstr "指定的目标数目错误"
+
+#: ../svn/props.c:82
+msgid "Either a URL or versioned item is required"
+msgstr "必须提供URL或纳入版本控制的项目"
+
+#: ../svn/props.c:107
+#, c-format
+msgid ""
+"To turn off the %s property, use 'svn propdel';\n"
+"setting the property to '%s' will not turn it off."
+msgstr ""
+"使用 “svn propdel” 关闭属性 %s；\n"
+"设置属性为 “%s” 不会关闭它。"
+
+#: ../svn/props.c:177
+#, c-format
+msgid "(To set the '%s' property, re-run with '--force'.)"
+msgstr "(请使用“--force”重新执行，设置“%s”属性。)"
+
+#: ../svn/props.c:182
+#, c-format
+msgid "(To edit the '%s' property, re-run with '--force'.)"
+msgstr "(请使用“--force”重新执行，编辑“%s”属性。)"
+
+#: ../svn/props.c:188
+#, c-format
+msgid "(To use the '%s' property, re-run with '--force'.)"
+msgstr "(请使用“--force”重新执行，使用“%s”属性。)"
+
+#: ../svn/props.c:202
+#, c-format
+msgid "'%s' is not a valid %s property name; re-run with '--force' to set it"
+msgstr ""
+
+#: ../svn/props.c:208
+#, c-format
+msgid ""
+"'%s' is not a valid %s property name; re-run with '--force' to edit it"
+msgstr ""
+
+#: ../svn/props.c:215
+#, c-format
+msgid "'%s' is not a valid %s property name; re-run with '--force' to use it"
+msgstr ""
+
+#: ../svn/props.c:281 ../svn/props.c:332
+#, c-format
+msgid ""
+"'%s' is not a valid %s property name; did you mean '%s'?\n"
+"%s"
+msgstr ""
+
+#: ../svn/props.c:340
+#, c-format
+msgid ""
+"'%s' is not a valid %s property name\n"
+"Did you mean '%s' or '%s'?\n"
+"%s"
+msgstr ""
+
+#: ../svn/props.c:350
+#, c-format
+msgid ""
+"'%s' is not a valid %s property name\n"
+"Did you mean '%s', '%s' or '%s'?\n"
+"%s"
+msgstr ""
+
+#: ../svn/propset-cmd.c:132
+#, c-format
+msgid "Cannot specify revision for setting versioned property '%s'"
+msgstr "设置受版本控制的属性 “%s” 时不能指定版本"
+
+#: ../svn/propset-cmd.c:165
+#, c-format
+msgid "Explicit target required ('%s' interpreted as prop value)"
+msgstr "必须明确地提供目的 (“%s”解释为属性内容)"
+
+#: ../svn/resolve-cmd.c:79
+msgid "missing --accept option"
+msgstr "缺少选项 --accept"
+
+#: ../svn/resolve-cmd.c:84
+msgid "invalid 'accept' ARG"
+msgstr "无效的 “accept” 参数"
+
+#: ../svn/resolve-cmd.c:127
+msgid "Failure occurred resolving one or more conflicts"
+msgstr "处理一个或更多的冲突失败"
+
+#: ../svn/revert-cmd.c:77
+msgid "Try 'svn revert --depth infinity' instead?"
+msgstr "尝试 “svn revert --depth infinity”？"
+
+#: ../svn/status-cmd.c:97
+#, c-format
+msgid "  Text conflicts: %u\n"
+msgstr "  正文冲突：%u\n"
+
+#: ../svn/status-cmd.c:101
+#, c-format
+msgid "  Property conflicts: %u\n"
+msgstr "  属性冲突：%u\n"
+
+#: ../svn/status-cmd.c:105
+#, c-format
+msgid "  Tree conflicts: %u\n"
+msgstr "  树冲突：%u\n"
+
+#: ../svn/status-cmd.c:398
+#, c-format
 msgid ""
-"Merge changes into a working copy.\n"
-"usage: 1. merge SOURCE[@REV] [TARGET_WCPATH]\n"
-"          (the 'sync' merge)\n"
-"       2. merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [TARGET_WCPATH]\n"
-"          (the 'cherry-pick' merge)\n"
-"       3. merge --reintegrate SOURCE[@REV] [TARGET_WCPATH]\n"
-"          (the 'reintegrate' merge)\n"
-"       4. merge SOURCE1[@N] SOURCE2[@M] [TARGET_WCPATH]\n"
-"          (the '2-URL' merge)\n"
-"\n"
-"  1. This form is called a 'sync' (or 'catch-up') merge:\n"
-"\n"
-"       svn merge SOURCE[@REV] [TARGET_WCPATH]\n"
-"\n"
-"     A sync merge is used to fetch all the latest changes made on a parent\n"
-"     branch. In other words, the target branch has originally been created\n"
-"     by copying the source branch, and any changes committed on the source\n"
-"     branch since branching are applied to the target branch. This uses\n"
-"     merge tracking to skip all those revisions that have already been\n"
-"     merged, so a sync merge can be repeated periodically to stay up-to-\n"
-"     date with the source branch.\n"
 "\n"
-"     SOURCE specifies the branch from where the changes will be pulled, and\n"
-"     TARGET_WCPATH specifies a working copy of the target branch to which\n"
-"     the changes will be applied. Normally SOURCE and TARGET_WCPATH should\n"
-"     each correspond to the root of a branch. (If you want to merge only a\n"
-"     subtree, then the subtree path must be included in both SOURCE and\n"
-"     TARGET_WCPATH; this is discouraged, to avoid subtree mergeinfo.)\n"
+"--- Changelist '%s':\n"
+msgstr ""
 "\n"
-"     SOURCE is usually a URL. The optional '@REV' specifies both the peg\n"
-"     revision of the URL and the latest revision that will be considered\n"
-"     for merging; if REV is not specified, the HEAD revision is assumed. If\n"
-"     SOURCE is a working copy path, the corresponding URL of the path is\n"
-"     used, and the default value of 'REV' is the base revision (usually the\n"
-"     revision last updated to).\n"
-"\n"
-"     TARGET_WCPATH is a working copy path; if omitted, '.' is assumed.\n"
-"\n"
-"       - Sync Merge Example -\n"
-"\n"
-"     A feature is being developed on a branch called 'feature', which has\n"
-"     originally been a copy of trunk. The feature branch has been regularly\n"
-"     synced with trunk to keep up with the changes made there. The previous\n"
-"     sync merges are not shown on this diagram, and the last of them was\n"
-"     done when HEAD was r100. Currently, HEAD is r200.\n"
-"\n"
-"                feature  +------------------------o-----\n"
-"                        /                         ^\n"
-"                       /            ............  |\n"
-"                      /            .            . /\n"
-"         trunk ------+------------L--------------R------\n"
-"                                r100           r200\n"
-"\n"
-"     Subversion will locate all the changes on 'trunk' that have not yet\n"
-"     been merged into the 'feature' branch. In this case that is a single\n"
-"     range, r100:200. In the diagram above, L marks the left side\n"
-"     (trunk@100) and R marks the right side (trunk@200) of the merge. The\n"
-"     difference between L and R will be applied to the target working copy\n"
-"     path. In this case, the working copy is a clean checkout of the entire\n"
-"     'feature' branch.\n"
-"\n"
-"     To perform this sync merge, have a clean working copy of the feature\n"
-"     branch and run the following command in its top-level directory:\n"
-"\n"
-"         svn merge ^/trunk\n"
-"\n"
-"     Note that the merge is now only in your local working copy and still\n"
-"     needs to be committed to the repository so that it can be seen by\n"
-"     others. You can review the changes and you may have to resolve\n"
-"     conflicts before you commit the merge.\n"
-"\n"
-"\n"
-"  2. This form is called a 'cherry-pick' merge:\n"
-"\n"
-"       svn merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [TARGET_WCPATH]\n"
-"\n"
-"     A cherry-pick merge is used to merge specific revisions (or revision\n"
-"     ranges) from one branch to another. By default, this uses merge\n"
-"     tracking to automatically skip any revisions that have already been\n"
-"     merged to the target; you can use the --ignore-ancestry option to\n"
-"     disable such skipping.\n"
-"\n"
-"     SOURCE is usually a URL. The optional '@REV' specifies only the peg\n"
-"     revision of the URL and does not affect the merge range; if REV is not\n"
-"     specified, the HEAD revision is assumed. If SOURCE is a working copy\n"
-"     path, the corresponding URL of the path is used, and the default value\n"
-"     of 'REV' is the base revision (usually the revision last updated to).\n"
-"\n"
-"     TARGET_WCPATH is a working copy path; if omitted, '.' is assumed.\n"
-"\n"
-"     The revision ranges to be merged are specified by the '-r' and/or '-c'\n"
-"     options. '-r N:M' refers to the difference in the history of the\n"
-"     source branch between revisions N and M. You can use '-c M' to merge\n"
-"     single revisions: '-c M' is equivalent to '-r <M-1>:M'. Each such\n"
-"     difference is applied to TARGET_WCPATH.\n"
-"\n"
-"     If the mergeinfo in TARGET_WCPATH indicates that revisions within the\n"
-"     range were already merged, changes made in those revisions are not\n"
-"     merged again. If needed, the range is broken into multiple sub-ranges,\n"
-"     and each sub-range is merged separately.\n"
-"\n"
-"     A 'reverse range' can be used to undo changes. For example, when\n"
-"     source and target refer to the same branch, a previously committed\n"
-"     revision can be 'undone'. In a reverse range, N is greater than M in\n"
-"     '-r N:M', or the '-c' option is used with a negative number: '-c -M'\n"
-"     is equivalent to '-r M:<M-1>'.\n"
-"\n"
-"     Multiple '-c' and/or '-r' options may be specified and mixing of\n"
-"     forward and reverse ranges is allowed.\n"
-"\n"
-"       - Cherry-pick Merge Example -\n"
-"\n"
-"     A bug has been fixed on trunk in revision 50. This fix needs to\n"
-"     be merged from trunk onto the release branch.\n"
-"\n"
-"            1.x-release  +-----------------------o-----\n"
-"                        /                        ^\n"
-"                       /                         |\n"
-"                      /                          |\n"
-"         trunk ------+--------------------------LR-----\n"
-"                                                r50\n"
-"\n"
-"     In the above diagram, L marks the left side (trunk@49) and R marks the\n"
-"     right side (trunk@50) of the merge. The difference between the left\n"
-"     and right side is applied to the target working copy path.\n"
-"\n"
-"     Note that the difference between revision 49 and 50 is exactly those\n"
-"     changes that were committed in revision 50, not including changes\n"
-"     committed in revision 49.\n"
-"\n"
-"     To perform the merge, have a clean working copy of the release branch\n"
-"     and run the following command in its top-level directory; remember\n"
-"     that the default target is '.':\n"
-"\n"
-"         svn merge -c50 ^/trunk\n"
-"\n"
-"     You can also cherry-pick several revisions and/or revision ranges:\n"
-"\n"
-"         svn merge -c50,54,60 -r65:68 ^/trunk\n"
-"\n"
-"\n"
-"  3. This form is called a 'reintegrate merge':\n"
-"\n"
-"       svn merge --reintegrate SOURCE[@REV] [TARGET_WCPATH]\n"
-"\n"
-"     In a reintegrate merge, an (e.g. feature) branch is merged back to its\n"
-"     originating branch. In other words, the source branch has originally\n"
-"     been created by copying the target branch, development has concluded\n"
-"     on the source branch and it should now be merged back into the target\n"
-"     branch.\n"
-"     \n"
-"     SOURCE is the URL of a branch to be merged back. If REV is specified,\n"
-"     it is used as the peg revision for SOURCE; if REV is not specified,\n"
-"     the HEAD revision is assumed.\n"
-"\n"
-"     TARGET_WCPATH is a working copy of the branch the changes will be\n"
-"     applied to.\n"
-"\n"
-"       - Reintegrate Merge Example -\n"
-"\n"
-"     A feature has been developed on a branch called 'feature'. The feature\n"
-"     branch started as a copy of trunk@W. Work on the feature has completed\n"
-"     and it should be merged back into the trunk.\n"
-"\n"
-"     The feature branch was last synced with trunk up to revision X. So the\n"
-"     difference between trunk@X and feature@HEAD contains the complete set\n"
-"     of changes that implement the feature, and no other changes. These\n"
-"     changes are applied to trunk.\n"
-"\n"
-"                feature  +--------------------------------R\n"
-"                        /                                . \\\n"
-"                       /                    .............   \\\n"
-"                      /                    .                 v\n"
-"         trunk ------+--------------------L------------------o\n"
-"                    rW                   rX\n"
-"\n"
-"     In the diagram above, L marks the left side (trunk@X) and R marks the\n"
-"     right side (feature@HEAD) of the merge. The difference between the\n"
-"     left and right side is merged into trunk, the target.\n"
-"\n"
-"     To perform the merge, have a clean working copy of trunk and run the\n"
-"     following command in its top-level directory:\n"
-"\n"
-"         svn merge --reintegrate ^/feature\n"
-"\n"
-"     To prevent unnecessary merge conflicts, a reintegrate merge requires\n"
-"     that TARGET_WCPATH is not a mixed-revision working copy, has no local\n"
-"     modifications, and has no switched subtrees.\n"
-"\n"
-"     A reintegrate merge also requires that the source branch is coherently\n"
-"     synced with the target -- in the above example, this means that all\n"
-"     revisions between the branch point W and the last merged revision X\n"
-"     are merged to the feature branch, so that there are no unmerged\n"
-"     revisions in-between.\n"
-"\n"
-"     After the reintegrate merge, the feature branch cannot be synced to\n"
-"     the trunk again without merge conflicts. If further work must be done\n"
-"     on the feature branch, it should be deleted and then re-created.\n"
-"\n"
-"\n"
-"  4. This form is called a '2-URL merge':\n"
-"\n"
-"       svn merge SOURCE1[@N] SOURCE2[@M] [TARGET_WCPATH]\n"
-"\n"
-"     Two source URLs are specified, together with two revisions N and M.\n"
-"     The two sources are compared at the specified revisions, and the\n"
-"     difference is applied to TARGET_WCPATH, which is a path to a working\n"
-"     copy of another branch. The three branches involved can be completely\n"
-"     unrelated.\n"
-"\n"
-"     You should use this merge variant only if the other variants do not\n"
-"     apply to your situation, as this variant can be quite complex to\n"
-"     master.\n"
-"\n"
-"     If TARGET_WCPATH is omitted, a default value of '.' is assumed.\n"
-"     However, in the special case where both sources refer to a file node\n"
-"     with the same basename and a similarly named file is also found within\n"
-"     '.', the differences will be applied to that local file.  The source\n"
-"     revisions default to HEAD if omitted.\n"
-"\n"
-"     The sources can also be specified as working copy paths, in which case\n"
-"     the URLs of the merge sources are derived from the working copies.\n"
-"\n"
-"       - 2-URL Merge Example -\n"
-"\n"
-"     Two features have been developed on separate branches called 'foo' and\n"
-"     'bar'. It has since become clear that 'bar' should be combined with\n"
-"     the 'foo' branch for further development before reintegration.\n"
-"\n"
-"     Although both feature branches originate from trunk, they are not\n"
-"     directly related -- one is not a direct copy of the other. A 2-URL\n"
-"     merge is necessary.\n"
-"\n"
-"     The 'bar' branch has been synced with trunk up to revision 500.\n"
-"     (If this revision number is not known, it can be located using the\n"
-"     'svn log' and/or 'svn mergeinfo' commands.)\n"
-"     The difference between trunk@500 and bar@HEAD contains the complete\n"
-"     set of changes related to feature 'bar', and no other changes. These\n"
-"     changes are applied to the 'foo' branch.\n"
-"\n"
-"                           foo  +-----------------------------------o\n"
-"                               /                                    ^\n"
-"                              /                                    /\n"
-"                             /              r500                  /\n"
-"         trunk ------+------+-----------------L--------->        /\n"
-"                      \\                        .                /\n"
-"                       \\                        ............   /\n"
-"                        \\                                   . /\n"
-"                    bar  +-----------------------------------R\n"
+"--- 修改列表 '%s':\n"
+
+#: ../svn/status.c:318
+#, c-format
+msgid "swapped places with %s"
+msgstr ""
+
+#: ../svn/status.c:333
+#, c-format
+msgid "moved from %s"
+msgstr "移自 %s"
+
+#: ../svn/status.c:345
+#, c-format
+msgid "moved to %s"
+msgstr "移到 %s"
+
+#: ../svn/svn.c:147
+msgid "force operation to run"
+msgstr "强制操作运行"
+
+#: ../svn/svn.c:149
+msgid "force validity of log message source"
+msgstr "强制校验日志信息资源"
+
+#: ../svn/svn.c:150 ../svn/svn.c:151 ../svnadmin/svnadmin.c:208
+#: ../svnadmin/svnadmin.c:211 ../svndumpfilter/svndumpfilter.c:1019
+#: ../svndumpfilter/svndumpfilter.c:1022 ../svnlook/svnlook.c:114
+#: ../svnlook/svnlook.c:126 ../svnsync/svnsync.c:244 ../svnsync/svnsync.c:246
+msgid "show help on a subcommand"
+msgstr "显示子命令帮助信息"
+
+#: ../svn/svn.c:152
+msgid "specify log message ARG"
+msgstr "指定日志信息ARG"
+
+#: ../svn/svn.c:153
+msgid "print nothing, or only summary information"
+msgstr "不打印信息，或只打印概要信息"
+
+#: ../svn/svn.c:154
+msgid "descend recursively, same as --depth=infinity"
+msgstr "向下递归，与 --depth=infinity 相同"
+
+#: ../svn/svn.c:155
+msgid "obsolete; try --depth=files or --depth=immediates"
+msgstr "过时；尝试 --depth=files 或 --depth=immediates"
+
+#: ../svn/svn.c:157
+msgid ""
+"the change made by revision ARG (like -r ARG-1:ARG)\n"
+"                             If ARG is negative this is like -r ARG:ARG-1\n"
+"                             If ARG is of the form ARG1-ARG2 then this is "
+"like\n"
+"                             ARG1:ARG2, where ARG1 is inclusive"
+msgstr ""
+"版本 ARG (如同 -r ARG-1:ARG) 做的修改\n"
+"                             如果 ARG 为负数则等价于 -r ARG:ARG-1                     "
+"        如果 ARG 的格式是 ARG1-ARG2，那么它等价于\n"
+"                             ARG1:ARG2，包含 ARG1"
+
+#: ../svn/svn.c:165
+msgid ""
+"ARG (some commands also take ARG1:ARG2 range)\n"
+"                             A revision argument can be one of:\n"
+"                                NUMBER       revision number\n"
+"                                '{' DATE '}' revision at start of the date\n"
+"                                'HEAD'       latest in repository\n"
+"                                'BASE'       base rev of item's working "
+"copy\n"
+"                                'COMMITTED'  last commit at or before BASE\n"
+"                                'PREV'       revision just before COMMITTED"
+msgstr ""
+"ARG (一些命令也接受ARG1:ARG2范围)\n"
+"                             版本参数可以是如下之一: \n"
+"                                NUMBER       版本号\n"
+"                                '{' DATE '}' 在指定时间以后的版本\n"
+"                                'HEAD'       版本库中的最新版本\n"
+"                                'BASE'       工作副本的基线版本\n"
+"                                'COMMITTED'  最后提交或基线之前\n"
+"                                'PREV'       COMMITTED的前一版本"
+
+#: ../svn/svn.c:180
+msgid "read log message from file ARG"
+msgstr "从文件ARG读取日志信息"
+
+#: ../svn/svn.c:182
+msgid "give output suitable for concatenation"
+msgstr "给予适合串联的输出"
+
+#: ../svn/svn.c:184
+msgid "treat value as being in charset encoding ARG"
+msgstr "将ARG的值视为字符编码"
+
+#: ../svn/svn.c:185 ../svnadmin/svnadmin.c:214
+#: ../svndumpfilter/svndumpfilter.c:1025 ../svnlook/svnlook.c:168
+#: ../svnrdump/svnrdump.c:144 ../svnserve/svnserve.c:287
+#: ../svnsync/svnsync.c:242 ../svnversion/svnversion.c:141
+msgid "show program version information"
+msgstr "显示程序版本信息"
+
+#: ../svn/svn.c:186
+msgid "print extra information"
+msgstr "打印附加信息"
+
+#: ../svn/svn.c:187
+msgid "display update information"
+msgstr "显示更新信息"
+
+#: ../svn/svn.c:188 ../svnrdump/svnrdump.c:128
+msgid "specify a username ARG"
+msgstr "指定用户名称 ARG"
+
+#: ../svn/svn.c:189 ../svnrdump/svnrdump.c:130
+msgid "specify a password ARG"
+msgstr "指定密码 ARG"
+
+#: ../svn/svn.c:191
+msgid ""
+"Specify differencing options for external diff or\n"
+"                             internal diff or blame. Default: '-u'. Options "
+"are\n"
+"                             separated by spaces. Internal diff and blame "
+"take:\n"
+"                               -u, --unified: Show 3 lines of unified "
+"context\n"
+"                               -b, --ignore-space-change: Ignore changes in\n"
+"                                 amount of white space\n"
+"                               -w, --ignore-all-space: Ignore all white "
+"space\n"
+"                               --ignore-eol-style: Ignore changes in EOL "
+"style\n"
+"                               -p, --show-c-function: Show C function name"
+msgstr ""
+
+#: ../svn/svn.c:209
+msgid "pass contents of file ARG as additional args"
+msgstr "传递文件 ARG 内容为附件参数"
+
+#: ../svn/svn.c:211
+msgid ""
+"limit operation by depth ARG ('empty', 'files',\n"
+"                             'immediates', or 'infinity')"
+msgstr ""
+"限制操作深度是 ARG ('empty', 'files',\n"
+"                             'immediates', 或 'infinity')"
+
+#: ../svn/svn.c:215
+msgid ""
+"set new working copy depth to ARG ('exclude',\n"
+"                             'empty', 'files', 'immediates', or 'infinity')"
+msgstr ""
+"设置工作副本的新深度为 ARG('exclude',\n"
+"                             'empty', 'files', 'immediates', 或 'infinity')"
+
+#: ../svn/svn.c:218 ../svnlook/svnlook.c:171
+msgid "output in XML"
+msgstr "输出为 XML"
+
+#: ../svn/svn.c:219
+msgid "use strict semantics"
+msgstr "使用严格的语法"
+
+#: ../svn/svn.c:221
+msgid "do not cross copies while traversing history"
+msgstr "查看历史不要跨越不同的副本"
+
+#: ../svn/svn.c:223
+msgid ""
+"disregard default and svn:ignore and\n"
+"                             svn:global-ignores property ignores"
+msgstr ""
+
+#: ../svn/svn.c:227 ../svnrdump/svnrdump.c:140 ../svnsync/svnsync.c:188
+msgid "do not cache authentication tokens"
+msgstr "不要缓存用户认证令牌"
+
+#: ../svn/svn.c:229 ../svnrdump/svnrdump.c:154 ../svnsync/svnsync.c:198
+msgid ""
+"accept SSL server certificates from unknown\n"
+"                             certificate authorities without prompting (but "
+"only\n"
+"                             with '--non-interactive')"
+msgstr "不提示的接受未知的证书颁发机构发行的 SSL 服务器证书(只用于选项 “--non-interactive”)"
+
+#: ../svn/svn.c:235 ../svnrdump/svnrdump.c:132 ../svnsync/svnsync.c:180
+msgid ""
+"do no interactive prompting (default is to prompt\n"
+"                             only if standard input is a terminal device)"
+msgstr ""
+
+#: ../svn/svn.c:239 ../svnrdump/svnrdump.c:136 ../svnsync/svnsync.c:184
+msgid ""
+"do interactive prompting even if standard input\n"
+"                             is not a terminal device"
+msgstr ""
+
+#: ../svn/svn.c:243
+msgid "try operation but make no changes"
+msgstr "尝试操作但没有修改"
+
+#: ../svn/svn.c:245
+msgid "disable merge tracking; diff nodes as if related"
+msgstr ""
+
+#: ../svn/svn.c:247
+msgid "ignore externals definitions"
+msgstr "忽略外部项目"
+
+#: ../svn/svn.c:248
+msgid "use ARG as merge command"
+msgstr "使用 ARG 作为合并命令"
+
+#: ../svn/svn.c:249
+msgid "use ARG as external editor"
+msgstr "使用 ARG 作为外部编辑器"
+
+#: ../svn/svn.c:251
+msgid "merge only mergeinfo differences"
+msgstr "只合并合并信息的差异"
+
+#: ../svn/svn.c:252
+msgid "use ARG as the older target"
+msgstr "使用 ARG 作为旧目标"
+
+#: ../svn/svn.c:253
+msgid "use ARG as the newer target"
+msgstr "使用 ARG 作为新目标"
+
+#: ../svn/svn.c:255
+msgid "operate on a revision property (use with -r)"
+msgstr "在版本属性上操作(使用-r参数)"
+
+#: ../svn/svn.c:256
+msgid "relocate via URL-rewriting"
+msgstr "通过URL改写重新定位"
+
+#: ../svn/svn.c:258 ../svnadmin/svnadmin.c:256 ../svnrdump/svnrdump.c:126
+#: ../svnsync/svnsync.c:212
+msgid "read user configuration files from directory ARG"
+msgstr "从目录 ARG 读取用户配置文件"
+
+#: ../svn/svn.c:260 ../svnrdump/svnrdump.c:146 ../svnsync/svnsync.c:214
+msgid ""
+"set user configuration option in the format:\n"
+"                                 FILE:SECTION:OPTION=[VALUE]\n"
+"                             For example:\n"
+"                                 servers:global:http-library=serf"
+msgstr ""
+"以下属格式设置用户配置选项：\n"
+"                                 FILE:SECTION:OPTION=[VALUE]\n"
+"                             例如：\n"
+"                                 servers:global:http-library=serf"
+
+#: ../svn/svn.c:267
+msgid "enable automatic properties"
+msgstr "启用自动属性"
+
+#: ../svn/svn.c:268
+msgid "disable automatic properties"
+msgstr "关闭自动属性"
+
+#: ../svn/svn.c:270
+msgid ""
+"use a different EOL marker than the standard\n"
+"                             system marker for files with the svn:eol-style\n"
+"                             property set to 'native'.\n"
+"                             ARG may be one of 'LF', 'CR', 'CRLF'"
+msgstr ""
+"使用非标准的 EOL 标记\n"
+"                系统中立的文件标记 svn:eol-style 属性取值为 “native”。\n"
+"                ARG 可以是以下之一“LF”，“CR”，“CRLF”"
+
+#: ../svn/svn.c:277
+msgid "maximum number of log entries"
+msgstr "日值项最大值"
+
+#: ../svn/svn.c:278
+msgid "don't unlock the targets"
+msgstr "不要解锁目标"
+
+#: ../svn/svn.c:279
+msgid "remove changelist association"
+msgstr "删除修改列表耦合"
+
+#: ../svn/svn.c:281
+msgid "operate only on members of changelist ARG"
+msgstr "只能对修改列表 ARG 的成员操作"
+
+#: ../svn/svn.c:283
+msgid "don't delete changelists after commit"
+msgstr "不要在提交后删除修改列表"
+
+#: ../svn/svn.c:284
+msgid "keep path in working copy"
+msgstr "在工作副本中保留路径"
+
+#: ../svn/svn.c:286
+msgid "retrieve all revision properties"
+msgstr "获取所有版本属性"
+
+#: ../svn/svn.c:288
+msgid "retrieve no revision properties"
+msgstr "没有找回版本属性"
+
+#: ../svn/svn.c:290
+msgid ""
+"set revision property ARG in new revision\n"
+"                             using the name[=value] format"
+msgstr ""
+"在新版本设置版本属性 ARG\n"
+"                使用格式 name[=value]"
+
+#: ../svn/svn.c:293
+msgid "make intermediate directories"
+msgstr "创建中间目录"
+
+#: ../svn/svn.c:295
+msgid ""
+"use/display additional information from merge\n"
+"                             history"
+msgstr "从合并历史使用/显示额外信息"
+
+#: ../svn/svn.c:299
+msgid ""
+"specify automatic conflict resolution action\n"
+"                             ('postpone', 'working', 'base', 'mine-"
+"conflict',\n"
+"                             'theirs-conflict', 'mine-full', 'theirs-full',\n"
+"                             'edit', 'launch')\n"
+"                             (shorthand: 'p', 'mc', 'tc', 'mf', 'tf', 'e', "
+"'l')"
+msgstr ""
+"指定自动解决冲突动作\n"
+"                             ('postpone', 'working', 'base', 'mine-"
+"conflict',\n"
+"                             'theirs-conflict', 'mine-full', 'theirs-full',\n"
+"                             'edit', 'launch')\n"
+"                             (shorthand: 'p', 'mc', 'tc', 'mf', 'tf', 'e', "
+"'l')"
+
+#: ../svn/svn.c:310
+msgid ""
+"specify which collection of revisions to display\n"
+"                             ('merged', 'eligible')"
+msgstr ""
+"指定显示哪个版本集合\n"
+"                             ('merged', 'eligible')"
+
+#: ../svn/svn.c:314
+msgid "deprecated"
+msgstr "已经淘汰"
+
+#: ../svn/svn.c:316
+msgid ""
+"number of leading path components to strip from\n"
+"                             paths parsed from the patch file. --strip 0\n"
+"                             is the default and leaves paths unmodified.\n"
+"                             --strip 1 would change the path\n"
+"                             'doc/fudge/crunchy.html' to "
+"'fudge/crunchy.html'.\n"
+"                             --strip 2 would leave just 'crunchy.html'\n"
+"                             The expected component separator is '/' on all\n"
+"                             platforms. A leading '/' counts as one "
+"component."
+msgstr ""
+"需要从补丁文件中的路径中裁剪的前导路径组件数量。\n"
+"                             默认 --strip 0 不修改路径。指定 --strip 1 会将\n"
+"                             路径 'doc/fudge/crunchy.html' 转换为\n"
+"                             'fudge/crunchy.html'。指定 --strip 2 会得到\n"
+"                             'crunchy.html' 。在所有平台中期望的组件分隔符\n"
+"                             都是 '/'。前导 '/' 被计算为一个组件。"
+
+#: ../svn/svn.c:332
+msgid "don't expand keywords"
+msgstr "不要展开关键字"
+
+#: ../svn/svn.c:334
+msgid "apply the unidiff in reverse"
+msgstr "反向应用补丁"
+
+#: ../svn/svn.c:336
+msgid "ignore whitespace during pattern matching"
+msgstr "在模式匹配时，忽略空白"
+
+#: ../svn/svn.c:337
+msgid "produce diff output"
+msgstr "产生差异输出"
+
+#. maps to show_diff
+#. diff options
+#: ../svn/svn.c:339 ../svnlook/svnlook.c:138
+msgid "use ARG as diff command"
+msgstr "使用 ARG 作为比较命令"
+
+#: ../svn/svn.c:341
+msgid "override diff-cmd specified in config file"
+msgstr "覆盖配置文件中指定的 diff-cmd"
+
+#: ../svn/svn.c:343 ../svnlook/svnlook.c:132
+msgid "do not print differences for added files"
+msgstr "不要输出增加文件造成的差异"
+
+#: ../svn/svn.c:345 ../svnlook/svnlook.c:135
+msgid "do not print differences for deleted files"
+msgstr "不要输出删除文件造成的差异"
+
+#: ../svn/svn.c:347
+msgid "don't diff copied or moved files with their source"
+msgstr "请不要将复制或移动的文件与其源文件比较"
+
+#: ../svn/svn.c:349
+msgid "diff unrelated nodes as delete and add"
+msgstr ""
+
+#: ../svn/svn.c:350
+msgid "show a summary of the results"
+msgstr "显示结果的概要"
+
+#: ../svn/svn.c:352
+msgid "use git's extended diff format"
+msgstr "使用 git 的扩展差异格式"
+
+#: ../svn/svn.c:354 ../svnlook/svnlook.c:141
+msgid "ignore properties during the operation"
+msgstr "操作时忽略属性"
+
+#: ../svn/svn.c:356 ../svnlook/svnlook.c:144
+msgid "show only properties during the operation"
+msgstr "操作时只显示属性"
+
+#: ../svn/svn.c:358
+msgid ""
+"generate diff suitable for generic third-party\n"
+"                             patch tools; currently the same as\n"
+"                             --show-copies-as-adds --ignore-properties"
+msgstr ""
+
+#: ../svn/svn.c:366
+msgid ""
+"Allow operation on mixed-revision working copy.\n"
+"                             Use of this option is not recommended!\n"
+"                             Please run 'svn update' instead."
+msgstr ""
+
+#: ../svn/svn.c:372
+msgid ""
+"Also commit file and dir externals reached by\n"
+"                             recursion. This does not include externals with "
+"a\n"
+"                             fixed revision. (See the svn:externals property)"
+msgstr ""
+
+#: ../svn/svn.c:378
+msgid "retrieve target's inherited properties"
+msgstr "获取目标继承的属性"
+
+#: ../svn/svn.c:380
+msgid "use ARG as search pattern (glob syntax)"
+msgstr ""
+
+#: ../svn/svn.c:382
+msgid "combine ARG with the previous search pattern"
+msgstr ""
+
+#: ../svn/svn.c:430
+msgid ""
+"Put files and directories under version control, scheduling\n"
+"them for addition to repository.  They will be added in next commit.\n"
+"usage: add PATH...\n"
+msgstr ""
+"把文件和目录纳入版本控制，通过调度加到版本库。它们会在下一次提交时加入。\n"
+"用法: add 路径...\n"
+
+#: ../svn/svn.c:435
+msgid "add intermediate parents"
+msgstr "增加中间父目录"
+
+#: ../svn/svn.c:438
+msgid ""
+"Output the content of specified files or\n"
+"URLs with revision and author information in-line.\n"
+"usage: blame TARGET[@REV]...\n"
 "\n"
-"     In the diagram above, L marks the left side (trunk@500) and R marks\n"
-"     the right side (bar@HEAD) of the merge. The difference between the\n"
-"     left and right side is applied to the target working copy path, in\n"
-"     this case a working copy of the 'foo' branch.\n"
+"  If specified, REV determines in which revision the target is first\n"
+"  looked up.\n"
+msgstr ""
+"输出指定文件或URL的追溯内容，包含版本和作者信息。\n"
 "\n"
-"     To perform the merge, have a clean working copy of the 'foo' branch\n"
-"     and run the following command in its top-level directory:\n"
+"用法: blame 目标[@版本]...\n"
 "\n"
-"         svn merge ^/trunk@500 ^/bar\n"
+"      如果指定了版本，将从指定的版本开始查找。\n"
+
+#: ../svn/svn.c:447
+msgid ""
+"Output the content of specified files or URLs.\n"
+"usage: cat TARGET[@REV]...\n"
 "\n"
-"     The exact changes applied by a 2-URL merge can be previewed with svn's\n"
-"     diff command, which is a good idea to verify if you do not have the\n"
-"     luxury of a clean working copy to merge to. In this case:\n"
+"  If specified, REV determines in which revision the target is first\n"
+"  looked up.\n"
+msgstr ""
+"输出指定文件或URL的内容。\n"
+"用法: cat 目标[@版本]...\n"
 "\n"
-"         svn diff ^/trunk@500 ^/bar@HEAD\n"
+"      如果指定了版本，将从指定的版本开始查找。\n"
+
+#: ../svn/svn.c:455
+msgid ""
+"Associate (or dissociate) changelist CLNAME with the named files.\n"
+"usage: 1. changelist CLNAME PATH...\n"
+"       2. changelist --remove PATH...\n"
+msgstr ""
+"耦合(或解耦)命名文件与修改列表 CLNAME。\n"
+"使用: 1. changelist CLNAME PATH...\n"
+"      2. changelist --remove PATH...\n"
+
+#: ../svn/svn.c:461
+msgid ""
+"Check out a working copy from a repository.\n"
+"usage: checkout URL[@REV]... [PATH]\n"
 "\n"
+"  If specified, REV determines in which revision the URL is first\n"
+"  looked up.\n"
 "\n"
-"  The following applies to all types of merges:\n"
+"  If PATH is omitted, the basename of the URL will be used as\n"
+"  the destination. If multiple URLs are given each will be checked\n"
+"  out into a sub-directory of PATH, with the name of the sub-directory\n"
+"  being the basename of the URL.\n"
 "\n"
-"  To prevent unnecessary merge conflicts, svn merge requires that\n"
-"  TARGET_WCPATH is not a mixed-revision working copy. Running 'svn update'\n"
-"  before starting a merge ensures that all items in the working copy are\n"
-"  based on the same revision.\n"
+"  If --force is used, unversioned obstructing paths in the working\n"
+"  copy destination do not automatically cause the check out to fail.\n"
+"  If the obstructing path is the same type (file or directory) as the\n"
+"  corresponding path in the repository it becomes versioned but its\n"
+"  contents are left 'as-is' in the working copy.  This means that an\n"
+"  obstructing directory's unversioned children may also obstruct and\n"
+"  become versioned.  For files, any content differences between the\n"
+"  obstruction and the repository are treated like a local modification\n"
+"  to the working copy.  All properties from the repository are applied\n"
+"  to the obstructing path.\n"
 "\n"
-"  If possible, you should have no local modifications in the merge's target\n"
-"  working copy prior to the merge, to keep things simpler. It will be\n"
-"  easier to revert the merge and to understand the branch's history.\n"
+"  See also 'svn help update' for a list of possible characters\n"
+"  reporting the action taken.\n"
+msgstr ""
+"从版本库签出工作副本。\n"
+"使用: checkout URL[@REV]... [PATH]\n"
 "\n"
-"  Switched sub-paths should also be avoided during merging, as they may\n"
-"  cause incomplete merges and create subtree mergeinfo.\n"
+"  如果指定 REV，那么它确定了从 URL 首先查找的版本。\n"
 "\n"
-"  For each merged item a line will be printed with characters reporting the\n"
-"  action taken. These characters have the following meaning:\n"
+"  如果省略路径参数，则 URL 最末尾的目录名作为目标目录名。如果指定多个 URL，\n"
+"  则依次将其签出到 PATH 的子目录中，子目录名就是 URL 最末尾的目录名。\n"
 "\n"
-"    A  Added\n"
-"    D  Deleted\n"
-"    U  Updated\n"
-"    C  Conflict\n"
-"    G  Merged\n"
-"    E  Existed\n"
-"    R  Replaced\n"
+"  如果使用了 “--force” 选项，在工作副本中未版本控制的障碍路径，不会自动导\n"
+"  致签出失败。 如果障碍路径与版本库中的对应路径类型相同(文件或目录),它将成\n"
+"  为受版本控制的路径，但是内容不改变。它意味着障碍路径的孩子，如果也是障碍路\n"
+"  径，那么也会受版本控制。对于障碍路径中的文件，如果与版本库内的不同，将视为工\n"
+"  作副本发生本地修改。版本库中的所有属性都应用于障碍路径。\n"
 "\n"
-"  Characters in the first column report about the item itself.\n"
-"  Characters in the second column report about properties of the item.\n"
-"  A 'C' in the third column indicates a tree conflict, while a 'C' in\n"
-"  the first and second columns indicate textual conflicts in files\n"
-"  and in property values, respectively.\n"
+"  参见 “svn help update” 以获取报告执行动作的字符列表。\n"
+
+#: ../svn/svn.c:488
+msgid ""
+"Recursively clean up the working copy, removing write locks, resuming\n"
+"unfinished operations, etc.\n"
+"usage: cleanup [WCPATH...]\n"
 "\n"
-"    - Merge Tracking -\n"
+"  Finish any unfinished business in the working copy at WCPATH, and remove\n"
+"  write locks (shown as 'L' by the 'svn status' command) from the working\n"
+"  copy. Usually, this is only necessary if a Subversion client has crashed\n"
+"  while using the working copy, leaving it in an unusable state.\n"
+"\n"
+"  WARNING: There is no mechanism that will protect write locks still\n"
+"           being used by other Subversion clients. Running this command\n"
+"           while another client is using the working copy can corrupt\n"
+"           the working copy beyond repair!\n"
+msgstr ""
+
+#: ../svn/svn.c:504
+msgid ""
+"Send changes from your working copy to the repository.\n"
+"usage: commit [PATH...]\n"
 "\n"
-"  Subversion uses the svn:mergeinfo property to track merge history. This\n"
-"  property is considered at the start of a merge to determine what to merge\n"
-"  and it is updated at the conclusion of the merge to describe the merge\n"
-"  that took place. Mergeinfo is used only if the two sources are on the\n"
-"  same line of history -- if the first source is an ancestor of the second,\n"
-"  or vice-versa (i.e. if one has originally been created by copying the\n"
-"  other). This is verified and enforced when using sync merges and\n"
-"  reintegrate merges.\n"
+"  A log message must be provided, but it can be empty.  If it is not\n"
+"  given by a --message or --file option, an editor will be started.\n"
+"  If any targets are (or contain) locked items, those will be\n"
+"  unlocked after a successful commit.\n"
+msgstr ""
+"把工作副本的修改提交到版本库。\n"
+"用法: commit [路径...]\n"
 "\n"
-"  The --ignore-ancestry option prevents merge tracking and thus ignores\n"
-"  mergeinfo, neither considering it nor recording it.\n"
+"     必须提供日志消息，但它可以是空的。如果没有指定 --message 或 --file\n"
+"     选项，编辑器会被启动。如果有目标是锁定的或者包含锁定条目，则在成功\n"
+"     提交后会被解锁。\n"
+
+#: ../svn/svn.c:515
+msgid ""
+"Copy files and directories in a working copy or repository.\n"
+"usage: copy SRC[@REV]... DST\n"
 "\n"
-"    - Merging from foreign repositories -\n"
+"  SRC and DST can each be either a working copy (WC) path or URL:\n"
+"    WC  -> WC:   copy and schedule for addition (with history)\n"
+"    WC  -> URL:  immediately commit a copy of WC to URL\n"
+"    URL -> WC:   check out URL into WC, schedule for addition\n"
+"    URL -> URL:  complete server-side copy;  used to branch and tag\n"
+"  All the SRCs must be of the same type. When copying multiple sources,\n"
+"  they will be added as children of DST, which must be a directory.\n"
 "\n"
-"  Subversion does support merging from foreign repositories.\n"
-"  While all merge source URLs must point to the same repository, the merge\n"
-"  target working copy may come from a different repository than the source.\n"
-"  However, there are some caveats. Most notably, copies made in the\n"
-"  merge source will be transformed into plain additions in the merge\n"
-"  target. Also, merge-tracking is not supported for merges from foreign\n"
-"  repositories.\n"
+"  WARNING: For compatibility with previous versions of Subversion,\n"
+"  copies performed using two working copy paths (WC -> WC) will not\n"
+"  contact the repository.  As such, they may not, by default, be able\n"
+"  to propagate merge tracking information from the source of the copy\n"
+"  to the destination.\n"
 msgstr ""
 
-#: ../svn/main.c:994
+#: ../svn/svn.c:534
 msgid ""
-"Display merge-related information.\n"
-"usage: mergeinfo SOURCE[@REV] [TARGET[@REV]]\n"
+"Remove files and directories from version control.\n"
+"usage: 1. delete PATH...\n"
+"       2. delete URL...\n"
 "\n"
-"  Display information related to merges (or potential merges) between\n"
-"  SOURCE and TARGET (default: '.').  Display the type of information\n"
-"  specified by the --show-revs option.  If --show-revs isn't passed,\n"
-"  it defaults to --show-revs='merged'.\n"
+"  1. Each item specified by a PATH is scheduled for deletion upon\n"
+"    the next commit.  Files, and directories that have not been\n"
+"    committed, are immediately removed from the working copy\n"
+"    unless the --keep-local option is given.\n"
+"    PATHs that are, or contain, unversioned or modified items will\n"
+"    not be removed unless the --force or --keep-local option is given.\n"
 "\n"
-"  The depth can be 'empty' or 'infinity'; the default is 'empty'.\n"
+"  2. Each item specified by a URL is deleted from the repository\n"
+"    via an immediate commit.\n"
 msgstr ""
-"显示合并的相关信息。\n"
-"用法: mergeinfo SOURCE[@REV] [TARGET[@REV]]\n"
+"从版本库中删除文件和目录。\n"
+"用法: 1、delete PATH...\n"
+"      2、delete URL...\n"
 "\n"
-"  显示 SOURCE 与 TARGET(默认为“.”) 之间的合并(或潜在合并)信息。显示选项\n"
-"  --show-revs 指定的信息类型。如果没有传入 --show-revs，那么就使用其默认值\n"
-"  --show-revs='merged'。\n"
+"  1、每个 PATH 指定的项目会被调度到下次提交时从版本库删除。除非给出\n"
+"    --keep-local 参数，工作副本中没有提交的文件和目录会被立即删除。\n"
+"    如果 PATH 未版本控制或者包含未版本控制的项目，或者包含已修改的\n"
+"    项目，那么仅当给出 --force 或 --keep-local 参数时这些项目才会被\n"
+"    删除。\n"
 "\n"
-"  深度可以是“empty”或“infinity”；默认值是“empty”\n"
+"  2、每个 URL 指定的项目会通过立即提交从版本库中删除。\n"
 
-#: ../svn/main.c:1006
+#: ../svn/svn.c:550
 msgid ""
-"Create a new directory under version control.\n"
-"usage: 1. mkdir PATH...\n"
-"       2. mkdir URL...\n"
-"\n"
-"  Create version controlled directories.\n"
-"\n"
-"  1. Each directory specified by a working copy PATH is created locally\n"
-"    and scheduled for addition upon the next commit.\n"
-"\n"
-"  2. Each directory specified by a URL is created in the repository via\n"
-"    an immediate commit.\n"
+"Display local changes or differences between two revisions or paths.\n"
+"usage: 1. diff\n"
+"       2. diff [-c M | -r N[:M]] [TARGET[@REV]...]\n"
+"       3. diff [-r N[:M]] --old=OLD-TGT[@OLDREV] [--new=NEW-TGT[@NEWREV]] \\"
 "\n"
-"  In both cases, all the intermediate directories must already exist,\n"
-"  unless the --parents option is given.\n"
-msgstr ""
-"创建纳入版本控制的新目录。\n"
-"用法: 1、mkdir PATH...\n"
-"      2、mkdir URL...\n"
+"               [PATH...]\n"
+"       4. diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]\n"
+"       5. diff OLD-URL[@OLDREV] NEW-PATH[@NEWREV]\n"
+"       6. diff OLD-PATH[@OLDREV] NEW-URL[@NEWREV]\n"
 "\n"
-"  创建版本控制的目录。\n"
+"  1. Use just 'svn diff' to display local modifications in a working copy.\n"
 "\n"
-"  1、每个以工作副本 PATH 指定的目录，都会在本地创建，并且加入增加\n"
-"     调度，直到下次提交。\n"
+"  2. Display the changes made to TARGETs as they are seen in REV between\n"
+"     two revisions.  TARGETs may be all working copy paths or all URLs.\n"
+"     If TARGETs are working copy paths, N defaults to BASE and M to the\n"
+"     working copy; if URLs, N must be specified and M defaults to HEAD.\n"
+"     The '-c M' option is equivalent to '-r N:M' where N = M-1.\n"
+"     Using '-c -M' does the reverse: '-r M:N' where N = M-1.\n"
 "\n"
-"  2、每个以 URL 指定的目录，都会通过立即提交在版本库中创建。\n"
+"  3. Display the differences between OLD-TGT as it was seen in OLDREV and\n"
+"     NEW-TGT as it was seen in NEWREV.  PATHs, if given, are relative to\n"
+"     OLD-TGT and NEW-TGT and restrict the output to differences for those\n"
+"     paths.  OLD-TGT and NEW-TGT may be working copy paths or URL[@REV].\n"
+"     NEW-TGT defaults to OLD-TGT if not specified.  -r N makes OLDREV "
+"default\n"
+"     to N, -r N:M makes OLDREV default to N and NEWREV default to M.\n"
+"     If OLDREV or NEWREV are not specified, they default to WORKING for\n"
+"     working copy targets and to HEAD for URL targets.\n"
 "\n"
-"  在这两个情况下，所有的中间目录都必须事先存在，\n"
-"  除非使用选项 --parents。\n"
+"     Either or both OLD-TGT and NEW-TGT may also be paths to unversioned\n"
+"     targets. Revisions cannot be specified for unversioned targets.\n"
+"     Both targets must be of the same node kind (file or directory).\n"
+"     Diffing unversioned targets against URL targets is not supported.\n"
+"\n"
+"  4. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]'\n"
+"  5. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-"
+"PATH[@NEWREV]'\n"
+"  6. Shorthand for 'svn diff --old=OLD-PATH[@OLDREV] --new=NEW-"
+"URL[@NEWREV]'\n"
+msgstr ""
 
-#: ../svn/main.c:1023
+#: ../svn/svn.c:591
 msgid ""
-"Move and/or rename something in working copy or repository.\n"
-"usage: move SRC... DST\n"
+"Create an unversioned copy of a tree.\n"
+"usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n"
+"       2. export [-r REV] PATH1[@PEGREV] [PATH2]\n"
 "\n"
-"When moving multiple sources, they will be added as children of DST,\n"
-"which must be a directory.\n"
+"  1. Exports a clean directory tree from the repository specified by\n"
+"     URL, at revision REV if it is given, otherwise at HEAD, into\n"
+"     PATH. If PATH is omitted, the last component of the URL is used\n"
+"     for the local directory name.\n"
 "\n"
-"  Note:  this subcommand is equivalent to a 'copy' and 'delete'.\n"
-"  Note:  the --revision option has no use and is deprecated.\n"
+"  2. Exports a clean directory tree from the working copy specified by\n"
+"     PATH1, at revision REV if it is given, otherwise at WORKING, into\n"
+"     PATH2.  If PATH2 is omitted, the last component of the PATH1 is used\n"
+"     for the local directory name. If REV is not specified, all local\n"
+"     changes will be preserved.  Files not under version control will\n"
+"     not be copied.\n"
 "\n"
-"  SRC and DST can both be working copy (WC) paths or URLs:\n"
-"    WC  -> WC:   move and schedule for addition (with history)\n"
-"    URL -> URL:  complete server-side rename.\n"
-"  All the SRCs must be of the same type.\n"
+"  If specified, PEGREV determines in which revision the target is first\n"
+"  looked up.\n"
 msgstr ""
-"在工作副本或版本库中移动或改名文件或目录。\n"
-"用法: move SRC... DST\n"
+"产生一个无版本控制的目录树副本。\n"
+"用法: 1、export [-r REV] URL[@PEGREV] [PATH]\n"
+"      2、export [-r REV] PATH1[@PEGREV] [PATH2]\n"
 "\n"
-"当移动多个源时，它们作为 DST 的子节点增加，DST 必须是目录。\n"
+"  1、从 URL 指定的版本库，导出一个干净的目录树到 PATH。如果有指定\n"
+"     REV 的话，内容即为该版本的，否则就是 HEAD 版本。如果 PATH\n"
+"     被省略的话，URL的最后部分会被用来当成本地的目录名称。\n"
 "\n"
-"  注意: 本子命令等同于先 “copy”，然后 “delete”。\n"
-"  注意: 此命令中 --revision 选项没有作用，已经淘汰。\n"
+"  2、在工作副本中，从指定的 PATH1 导出一个干净的目录树到 PATH2。如果\n"
+"     有指定 REV 的话，会从指定的版本导出，否则从工作副本导出。如果\n"
+"     PATH2 被省略的话，PATH1 的最后部分会被用来当成本地的目录名称。\n"
+"     如果没有指定 REV 的话，所有的本地修改都保留，但是未纳入版本控制\n"
+"     的文件不会被复制。\n"
 "\n"
-"  SRC 可同时为工作副本(WC) 路径或 URL: \n"
-"    WC  -> WC  :  移动并加入新增调度 (连同历史记录)\n"
-"    URL -> URL :  完全是服务器端更名。\n"
-"  所有 SRC 必须是同一类型。\n"
+"     如果指定了 PEGREV ，将从指定的版本本开始查找。\n"
 
-#: ../svn/main.c:1039
+#: ../svn/svn.c:613
 msgid ""
-"Apply a patch to a working copy.\n"
-"usage: patch PATCHFILE [WCPATH]\n"
-"\n"
-"  Apply a unidiff patch in PATCHFILE to the working copy WCPATH.\n"
-"  If WCPATH is omitted, '.' is assumed.\n"
-"\n"
-"  A unidiff patch suitable for application to a working copy can be\n"
-"  produced with the 'svn diff' command or third-party diffing tools.\n"
-"  Any non-unidiff content of PATCHFILE is ignored.\n"
-"\n"
-"  Changes listed in the patch will either be applied or rejected.\n"
-"  If a change does not match at its exact line offset, it may be applied\n"
-"  earlier or later in the file if a match is found elsewhere for the\n"
-"  surrounding lines of context provided by the patch.\n"
-"  A change may also be applied with fuzz, which means that one\n"
-"  or more lines of context are ignored when matching the change.\n"
-"  If no matching context can be found for a change, the change conflicts\n"
-"  and will be written to a reject file with the extension .svnpatch.rej.\n"
-"\n"
-"  For each patched file a line will be printed with characters reporting\n"
-"  the action taken. These characters have the following meaning:\n"
-"\n"
-"    A  Added\n"
-"    D  Deleted\n"
-"    U  Updated\n"
-"    C  Conflict\n"
-"    G  Merged (with local uncommitted changes)\n"
-"\n"
-"  Changes applied with an offset or fuzz are reported on lines starting\n"
-"  with the '>' symbol. You should review such changes carefully.\n"
-"\n"
-"  If the patch removes all content from a file, that file is scheduled\n"
-"  for deletion. If the patch creates a new file, that file is scheduled\n"
-"  for addition. Use 'svn revert' to undo deletions and additions you\n"
-"  do not agree with.\n"
+"Describe the usage of this program or its subcommands.\n"
+"usage: help [SUBCOMMAND...]\n"
+msgstr ""
+"描述本程序或其子命令的用法。\n"
+"用法: help [子命令...]\n"
+
+#: ../svn/svn.c:619
+msgid ""
+"Commit an unversioned file or tree into the repository.\n"
+"usage: import [PATH] URL\n"
 "\n"
-"  Hint: If the patch file was created with Subversion, it will contain\n"
-"        the number of a revision N the patch will cleanly apply to\n"
-"        (look for lines like \"--- foo/bar.txt        (revision N)\").\n"
-"        To avoid rejects, first update to the revision N using \n"
-"        'svn update -r N', apply the patch, and then update back to the\n"
-"        HEAD revision. This way, conflicts can be resolved interactively.\n"
+"  Recursively commit a copy of PATH to URL.\n"
+"  If PATH is omitted '.' is assumed.\n"
+"  Parent directories are created as necessary in the repository.\n"
+"  If PATH is a directory, the contents of the directory are added\n"
+"  directly under URL.\n"
+"  Unversionable items such as device files and pipes are ignored\n"
+"  if --force is specified.\n"
 msgstr ""
+"将未纳入版本控制的文件或目录树提交到版本库。\n"
+"用法: import [PATH] URL\n"
+"\n"
+"  递归地提交 PATH 的副本至 URL。\n"
+"  如果省略 PATH，则默认为 “.”。\n"
+"  父目录会根据需要在版本库内创建。\n"
+"  如果 PATH 是目录，则其下的内容直接加入到 URL 指定的位置内。\n"
+"  如果使用了 “--force”，那么不能纳入版本控制的项目，例如设备文件，管道等，会被忽略。\n"
 
-#: ../svn/main.c:1086
+#: ../svn/svn.c:633
 msgid ""
-"Remove a property from files, dirs, or revisions.\n"
-"usage: 1. propdel PROPNAME [PATH...]\n"
-"       2. propdel PROPNAME --revprop -r REV [TARGET]\n"
+"Display information about a local or remote item.\n"
+"usage: info [TARGET[@REV]...]\n"
 "\n"
-"  1. Removes versioned props in working copy.\n"
-"  2. Removes unversioned remote prop on repos revision.\n"
-"     TARGET only determines which repository to access.\n"
+"  Print information about each TARGET (default: '.').\n"
+"  TARGET may be either a working-copy path or URL.  If specified, REV\n"
+"  determines in which revision the target is first looked up.\n"
 msgstr ""
-"删除目录、文件或版本的属性。\n"
-"用法: 1、propdel PROPNAME [PATH...]\n"
-"      2、propdel PROPNAME --revprop -r REV [URL]\n"
+"显示本地或远程条目的信息。\n"
+"用法: info [TARGET[@REV]...]\n"
 "\n"
-"  1、删除工作副本中纳入版本管理的文件或目录的属性。\n"
-"  2、删除版本库中版本的属性。TARGET只用来判断访问哪个版本库。\n"
+"  显示每个 TARGET 的信息 (默认: “.”)。\n"
+"  TARGET 可以是工作副本中的路径或版本库中的 URL。REV 指定从哪个\n"
+"  版本开始查找目标。\n"
 
-#: ../svn/main.c:1096
+#: ../svn/svn.c:643
 msgid ""
-"Edit a property with an external editor.\n"
-"usage: 1. propedit PROPNAME TARGET...\n"
-"       2. propedit PROPNAME --revprop -r REV [TARGET]\n"
+"List directory entries in the repository.\n"
+"usage: list [TARGET[@REV]...]\n"
 "\n"
-"  1. Edits versioned prop in working copy or repository.\n"
-"  2. Edits unversioned remote prop on repos revision.\n"
-"     TARGET only determines which repository to access.\n"
+"  List each TARGET file and the contents of each TARGET directory as\n"
+"  they exist in the repository.  If TARGET is a working copy path, the\n"
+"  corresponding repository URL will be used. If specified, REV determines\n"
+"  in which revision the target is first looked up.\n"
+"\n"
+"  The default TARGET is '.', meaning the repository URL of the current\n"
+"  working directory.\n"
 "\n"
-"See 'svn help propset' for more on setting properties.\n"
+"  With --verbose, the following fields will be shown for each item:\n"
+"\n"
+"    Revision number of the last commit\n"
+"    Author of the last commit\n"
+"    If locked, the letter 'O'.  (Use 'svn info URL' to see details)\n"
+"    Size (in bytes)\n"
+"    Date and time of the last commit\n"
 msgstr ""
-"使用外部编辑器编辑属性。\n"
-"用法: 1、propedit PROPNAME TARGET...\n"
-"      2、propedit PROPNAME --revprop -r REV [TARGET]\n"
+"列出版本库中的目录内容。\n"
+"用法: list [TARGET[@REV]...]\n"
 "\n"
-"  1、编辑工作副本或者版本库中受版本控制的属性。\n"
-"  2、编辑版本库中指定版本的未版本控制的远程属性。\n"
-"     TARGET 只用来判断访问哪一个版本库。\n"
+"  显示版本库中文件和子目录列表。如果 TARGET 是工作副本路径，那么操作对应的\n"
+"  版本库URL指定的TARGET。REV指定从在哪个版本查找TARGET。\n"
 "\n"
-"参见 “svn help propset” 以获得更多设置属性的信息。\n"
-
-#: ../svn/main.c:1108
-msgid ""
-"Print the value of a property on files, dirs, or revisions.\n"
-"usage: 1. propget PROPNAME [TARGET[@REV]...]\n"
-"       2. propget PROPNAME --revprop -r REV [TARGET]\n"
+"  TARGET默认是“.”，表示当前工作目录对应的版本库URL。\n"
 "\n"
-"  1. Prints versioned props. If specified, REV determines in which\n"
-"     revision the target is first looked up.\n"
-"  2. Prints unversioned remote prop on repos revision.\n"
-"     TARGET only determines which repository to access.\n"
+"  使用 --verbose 时，每个条目会显示以下额外信息: \n"
 "\n"
-"  By default, this subcommand will add an extra newline to the end\n"
-"  of the property values so that the output looks pretty.  Also,\n"
-"  whenever there are multiple paths involved, each property value\n"
-"  is prefixed with the path with which it is associated.  Use the\n"
-"  --strict option to disable these beautifications (useful when\n"
-"  redirecting a binary property value to a file, but available only\n"
-"  if you supply a single TARGET to a non-recursive propget operation).\n"
-msgstr ""
-"显示目录、文件或版本的属性取值。\n"
-"用法:  1、propget PROPNAME [TARGET[@REV]...]\n"
-"       2、propget PROPNAME --revprop -r REV [URL]\n"
-"\n"
-"  1、显示版本控制的属性。REV 指定从哪个版本开始查找目标。\n"
-"  2、显示版本库中版本的未版本控制的远程属性。\n"
-"     只用来判断访问哪个版本库。\n"
-"\n"
-"  本子命令默认会在属性内容加上额外的换行符，得到美观的输出。另外，\n"
-"  当同时处理多个路径时，每一个属性内容会在开头增加上它所对应的路径。\n"
-"  使用 --strict 选项可以关闭这些美化行为 (它很有用，例如将二进制属\n"
-"  性内容重定向到一个文件，但是仅用于单一目标的非递归操作)。\n"
+"    最后一次提交的版本号码\n"
+"    最后一次提交的作者\n"
+"    如果被锁定，显示字母“O”。(使用“svn info URL”查看详细信息)\n"
+"    大小 (以字节为单位)\n"
+"    最后一次提交的日期与时间\n"
+
+#: ../svn/svn.c:663
+msgid "include externals definitions"
+msgstr "包含外部定义"
 
-#: ../svn/main.c:1128
+#: ../svn/svn.c:666
 msgid ""
-"List all properties on files, dirs, or revisions.\n"
-"usage: 1. proplist [TARGET[@REV]...]\n"
-"       2. proplist --revprop -r REV [TARGET]\n"
+"Lock working copy paths or URLs in the repository, so that\n"
+"no other user can commit changes to them.\n"
+"usage: lock TARGET...\n"
 "\n"
-"  1. Lists versioned props. If specified, REV determines in which\n"
-"     revision the target is first looked up.\n"
-"  2. Lists unversioned remote props on repos revision.\n"
-"     TARGET only determines which repository to access.\n"
+"  Use --force to steal the lock from another user or working copy.\n"
 msgstr ""
-"列出目录、文件或版本的所有属性。\n"
-"用法:  1、proplist [TARGET[@REV]...]\n"
-"       2、proplist --revprop -r REV [TARGET]\n"
+"锁定版本库中的路径，使得其他用户不能向其提交修改。\n"
+"用法: lock TARGET...\n"
 "\n"
-"  1、显示目标的属性。REV 指定从哪个版本开始查找目标。\n"
-"  2、列出版本库中版本的属性。TARGET 只用来判断访问哪个版本库。\n"
+"     使用 --force 选项可以从其他用户或工作副本窃取到锁。\n"
+
+#: ../svn/svn.c:672
+msgid "read lock comment from file ARG"
+msgstr "从文件 ARG 读取加锁注释"
+
+#: ../svn/svn.c:673
+msgid "specify lock comment ARG"
+msgstr "指定加锁注释ARG"
 
-#: ../svn/main.c:1139
+#: ../svn/svn.c:674
+msgid "force validity of lock comment source"
+msgstr "强制校验锁定注释源"
+
+#: ../svn/svn.c:677
 msgid ""
-"Set the value of a property on files, dirs, or revisions.\n"
-"usage: 1. propset PROPNAME PROPVAL PATH...\n"
-"       2. propset PROPNAME --revprop -r REV PROPVAL [TARGET]\n"
+"Show the log messages for a set of revision(s) and/or path(s).\n"
+"usage: 1. log [PATH][@REV]\n"
+"       2. log URL[@REV] [PATH...]\n"
 "\n"
-"  1. Changes a versioned file or directory property in a working copy.\n"
-"  2. Changes an unversioned property on a repository revision.\n"
-"     (TARGET only determines which repository to access.)\n"
+"  1. Print the log messages for the URL corresponding to PATH\n"
+"     (default: '.'). If specified, REV is the revision in which the\n"
+"     URL is first looked up, and the default revision range is REV:1.\n"
+"     If REV is not specified, the default revision range is BASE:1,\n"
+"     since the URL might not exist in the HEAD revision.\n"
 "\n"
-"  The value may be provided with the --file option instead of PROPVAL.\n"
+"  2. Print the log messages for the PATHs (default: '.') under URL.\n"
+"     If specified, REV is the revision in which the URL is first\n"
+"     looked up, and the default revision range is REV:1; otherwise,\n"
+"     the URL is looked up in HEAD, and the default revision range is\n"
+"     HEAD:1.\n"
 "\n"
-"  Note: svn recognizes the following special versioned properties\n"
-"  but will store any arbitrary properties set:\n"
-"    svn:ignore     - A newline separated list of file glob patterns to "
-"ignore.\n"
-"    svn:keywords   - Keywords to be expanded.  Valid keywords are:\n"
-"      URL, HeadURL             - The URL for the head version of the "
-"object.\n"
-"      Author, LastChangedBy    - The last person to modify the file.\n"
-"      Date, LastChangedDate    - The date/time the object was last "
-"modified.\n"
-"      Rev, Revision,           - The last revision the object changed.\n"
-"      LastChangedRevision\n"
-"      Id                       - A compressed summary of the previous\n"
-"                                   4 keywords.\n"
-"      Header                   - Similar to Id but includes the full URL.\n"
-"    svn:executable - If present, make the file executable.  Use\n"
-"      'svn propdel svn:executable PATH...' to clear.\n"
-"    svn:eol-style  - One of 'native', 'LF', 'CR', 'CRLF'.\n"
-"    svn:mime-type  - The mimetype of the file.  Used to determine\n"
-"      whether to merge the file, and how to serve it from Apache.\n"
-"      A mimetype beginning with 'text/' (or an absent mimetype) is\n"
-"      treated as text.  Anything else is treated as binary.\n"
-"    svn:externals  - A newline separated list of module specifiers,\n"
-"      each of which consists of a URL and a relative directory path,\n"
-"      similar to the syntax of the 'svn checkout' command:\n"
-"        http://example.com/repos/zig foo/bar\n"
-"      A revision to check out can optionally be specified to pin the\n"
-"      external to a known revision:\n"
-"        -r25 http://example.com/repos/zig foo/bar\n"
-"      To unambiguously identify an element at a path which has been\n"
-"      deleted (possibly even deleted multiple times in its history),\n"
-"      an optional peg revision can be appended to the URL:\n"
-"        -r25 http://example.com/repos/zig@42 foo/bar\n"
-"      Relative URLs are indicated by starting the URL with one\n"
-"      of the following strings:\n"
-"        ../  to the parent directory of the extracted external\n"
-"        ^/   to the repository root\n"
-"        //   to the scheme\n"
-"        /    to the server root\n"
-"      The ambiguous format 'relative_path relative_path' is taken as\n"
-"      'relative_url relative_path' with peg revision support.\n"
-"      Lines in externals definitions starting with the '#' character\n"
-"      are considered comments and are ignored.\n"
-"      Subversion 1.4 and earlier only support the following formats\n"
-"      where peg revisions can only be specified using a -r modifier\n"
-"      and where URLs cannot be relative:\n"
-"        foo             http://example.com/repos/zig\n"
-"        foo/bar -r 1234 http://example.com/repos/zag\n"
-"      Use of these formats is discouraged. They should only be used if\n"
-"      interoperability with 1.4 clients is desired.\n"
-"    svn:needs-lock - If present, indicates that the file should be locked\n"
-"      before it is modified.  Makes the working copy file read-only\n"
-"      when it is not locked.  Use 'svn propdel svn:needs-lock PATH...'\n"
-"      to clear.\n"
+"  Multiple '-c' or '-r' options may be specified (but not a\n"
+"  combination of '-c' and '-r' options), and mixing of forward and\n"
+"  reverse ranges is allowed.\n"
 "\n"
-"  The svn:keywords, svn:executable, svn:eol-style, svn:mime-type and\n"
-"  svn:needs-lock properties cannot be set on a directory.  A non-recursive\n"
-"  attempt will fail, and a recursive attempt will set the property\n"
-"  only on the file children of the directory.\n"
-msgstr ""
-"设定目录、文件或版本的属性。\n"
-"用法: 1. propset PROPNAME PROPVAL PATH...\n"
-"      2. propset PROPNAME --revprop -r REV PROPVAL [TARGET]\n"
-"\n"
-"  1、在工作副本中修改一个受版本控制的属性。\n"
-"  2、在版本库的版本中修改一个非版本控制的属性。\n"
-"     (TARGET 只用来判断访问哪一个版本库。)\n"
-"\n"
-"  可以使用选项 --file 来代替 PROPVAL 赋值。\n"
-"\n"
-"  注意: svn 除了能存储任意属性外，还识别以下专用的版本控制属性: \n"
-"    svn:ignore     - 以换行符隔开的文件忽略模式列表。\n"
-"    svn:keywords   - 将被展开的关键字。有效的关键字为。\n"
-"      URL, HeadURL             - 此对象最新版本的 URL。\n"
-"      Author, LastChangedBy    - 最后修改文件的人。\n"
-"      Date, LastChangedDate    - 此对象最后修改的日期。\n"
-"      Rev, Revision,           - 此对象最后修改的版本号。\n"
-"      LastChangedRevision\n"
-"      Id                       - 前四个关键字的压缩摘要。\n"
-"      Header                   - 与 Id 类似，只是包含完整的 URL。\n"
-"    svn:executable   - 如果存在此属性则设置文件为可执行的。\n"
-"      使用 “svn propdel svn:executable PATH...” 清除。\n"
-"    svn:eol-style    - “native”，“LF”，“CR”，“CRLF” 之一。\n"
-"    svn:mime-type    - 文件的媒体类型。用以决定是否该合并该文件，\n"
-"      以及 Apache 如何处理它。媒体类型以“text/”开头(或是没有指\n"
-"      定媒体类型)的文件会被视为纯文本文件，否则就是二进制数据。\n"
-"    svn:externals  - 以换行符隔开的模块说明列表，每项都由一个 URL 和\n"
-"      相对目录路径组成，与命令“svn checkout”的句法类似：\n"
-"        http://example.com/repos/zig foo/bar\n"
-"      可以指定版本以钉住已知的版本：\n"
-"        -r25 http://example.com/repos/zig foo/bar\n"
-"      为了清楚的表明路径上的一个元素已经被删除（甚至可能被删除了多次），\n"
-"      可以在 URL 后追加一个 peg 版本:\n"
-"        -r25 http://example.com/repos/zig@42 foo/bar\n"
-"      下列开始字符串指示相对 URL:\n"
-"        ../  相对于外部引用的父目录\n"
-"        ^/   相对于版本库的根\n"
-"        //   相对于方案\n"
-"        /    相对于服务器根\n"
-"      相对路径“relative_path relative_path”这种不明确的格式来自\n"
-"      “relative_url relative_path”和 peg 版本支持。\n"
-"      以字符 '#' 开始的外部定义行被认为是注释，并且忽略。\n"
-"      Subversion 1.4 和早期的仅支持下列格式，peg 版本只能使用 -r 指定，\n"
-"      并且 URL 不能使用相对格式:\n"
-"        foo             http://example.com/repos/zig\n"
-"        foo/bar -r 1234 http://example.com/repos/zag\n"
-"      不赞同使用这些格式。它们只应该用于希望支持 1.4 客户端的情况。\n"
-"    svn:needs-lock - 此属性表明文件在修改前应该加锁。\n"
-"      如果没有加锁，则此文件在工作副本中应被设为只读。使用\n"
-"      “svn propdel svn:needs-lock PATH...” 清除。\n"
-"\n"
-"    svn:keywords, svn:executable, svn:eol-style, svn:mime-type 以及\n"
-"    svn:needs-lock 属性不能设置在目录上。使用非递归选项(-N)在目录上\n"
-"    设置这些属性时会失败，递归操作时只会作用于指定目录中的文件子孙上。\n"
-
-#: ../svn/main.c:1207
-msgid "read property value from file ARG"
-msgstr "从文件 ARG 读取属性值"
-
-#: ../svn/main.c:1210
-msgid ""
-"Relocate the working copy to point to a different repository root URL.\n"
-"usage: 1. relocate FROM-PREFIX TO-PREFIX [PATH...]\n"
-"       2. relocate TO-URL [PATH]\n"
+"  With -v, also print all affected paths with each log message.\n"
+"  With -q, don't print the log message body itself (note that this is\n"
+"  compatible with -v).\n"
 "\n"
-"  Rewrite working copy URL metadata to reflect a syntactic change only.\n"
-"  This is used when a repository's root URL changes (such as a scheme\n"
-"  or hostname change) but your working copy still reflects the same\n"
-"  directory within the same repository.\n"
+"  Each log message is printed just once, even if more than one of the\n"
+"  affected paths for that revision were explicitly requested.  Logs\n"
+"  follow copy history by default.  Use --stop-on-copy to disable this\n"
+"  behavior, which can be useful for determining branchpoints.\n"
 "\n"
-"  1. FROM-PREFIX and TO-PREFIX are initial substrings of the working\n"
-"     copy's current and new URLs, respectively.  (You may specify the\n"
-"     complete old and new URLs if you wish.)  Use 'svn info' to determine\n"
-"     the current working copy URL.\n"
+"  The --depth option is only valid in combination with the --diff option\n"
+"  and limits the scope of the displayed diff to the specified depth.\n"
 "\n"
-"  2. TO-URL is the (complete) new repository URL to use for PATH.\n"
+"  If the --search option is used, log messages are displayed only if the\n"
+"  provided search pattern matches any of the author, date, log message\n"
+"  text (unless --quiet is used), or, if the --verbose option is also\n"
+"  provided, a changed path.\n"
+"  The search pattern may include \"glob syntax\" wildcards:\n"
+"      ?      matches any single character\n"
+"      *      matches a sequence of arbitrary characters\n"
+"      [abc]  matches any of the characters listed inside the brackets\n"
+"  If multiple --search options are provided, a log message is shown if\n"
+"  it matches any of the provided search patterns. If the --search-and\n"
+"  option is used, that option's argument is combined with the pattern\n"
+"  from the previous --search or --search-and option, and a log message\n"
+"  is shown only if it matches the combined search pattern.\n"
+"  If --limit is used in combination with --search, --limit restricts the\n"
+"  number of log messages searched, rather than restricting the output\n"
+"  to a particular number of matching log messages.\n"
 "\n"
 "  Examples:\n"
-"    svn relocate http:// svn:// project1 project2\n"
-"    svn relocate http://www.example.com/repo/project \\\n"
-"                 svn://svn.example.com/repo/project\n"
-msgstr ""
-"重新定位工作副本，指向不同的版本库根 URL。\n"
-"用法:  1. relocate FROM-PREFIX TO-PREFIX [PATH...]\n"
-"       2. relocate TO-URL [PATH]\n"
 "\n"
-"  改写工作副本 URL 元数据，以反映仅版本库根 URL 的改变。这用于仅版本库根\n"
-"  URL 改变(例如方案或主机名称)，但是工作副本内容仍旧与版本库对应的情况。\n"
+"    Show the latest 5 log messages for the current working copy\n"
+"    directory and display paths changed in each commit:\n"
+"      svn log -l 5 -v\n"
 "\n"
-"  1. FROM-PREFIX 和 TO-PREFIX 分别对应工作副本的旧 URL 与新 URL 开始子串\n"
-"     (如果你喜欢，可以指定完整的 URL)。请使用 'svn info' 来确定当前工作\n"
-"     副本的 URL。\n"
+"    Show the log for bar.c as of revision 42:\n"
+"      svn log bar.c@42\n"
 "\n"
-"  2. TO-URL 是用于 PATH 的(完整的)新版本库 URL。\n"
+"    Show log messages and diffs for each commit to foo.c:\n"
+"      svn log --diff http://www.example.com/repo/project/foo.c\n"
+"    (Because the above command uses a full URL it does not require\n"
+"     a working copy.)\n"
 "\n"
-"  例如:\n"
-"    svn relocate http:// svn:// project1 project2\n"
-"    svn relocate http://www.example.com/repo/project \\\n"
-"                 svn://svn.example.com/repo/project\n"
-
-#: ../svn/main.c:1233
-msgid ""
-"Resolve conflicts on working copy files or directories.\n"
-"usage: resolve --accept=ARG [PATH...]\n"
+"    Show log messages for the children foo.c and bar.c of the directory\n"
+"    '/trunk' as it appeared in revision 50, using the ^/ URL shortcut:\n"
+"      svn log ^/trunk@50 foo.c bar.c\n"
 "\n"
-"  Note:  the --accept option is currently required.\n"
-msgstr ""
-"解决工作副本中目录或文件的冲突。\n"
-"用法: resolve --accept=ARG [PATH...]\n"
+"    Show the log messages for any incoming changes to foo.c during the\n"
+"    next 'svn update':\n"
+"      svn log -r BASE:HEAD foo.c\n"
 "\n"
-"  注意:  当前需要选项 --accept 。\n"
-
-#: ../svn/main.c:1238
-msgid ""
-"specify automatic conflict resolution source\n"
-"                             ('base', 'working', 'mine-conflict',\n"
-"                             'theirs-conflict', 'mine-full', 'theirs-full')"
+"    Show the log message for the revision in which /branches/foo\n"
+"    was created:\n"
+"      svn log --stop-on-copy --limit 1 -r0:HEAD ^/branches/foo\n"
 msgstr ""
-"指定自动解决冲突动作的源\n"
-"                            ('base', 'working', 'mine-conflict',\n"
-"                             'theirs-conflict', 'mine-full', 'theirs-full')"
 
-#: ../svn/main.c:1245
+#: ../svn/svn.c:755
+msgid "retrieve revision property ARG"
+msgstr "获取版本属性 ARG"
+
+#: ../svn/svn.c:756
+msgid "the change made in revision ARG"
+msgstr "版本 ARG 引起的改变"
+
+#. For this large section, let's keep it unindented for easier
+#. * viewing/editing. It has been vim-treated with a textwidth=75 and 'gw'
+#. * (with quotes and newlines removed).
+#: ../svn/svn.c:762
 msgid ""
-"Remove 'conflicted' state on working copy files or directories.\n"
-"usage: resolved PATH...\n"
+"Merge changes into a working copy.\n"
+"usage: 1. merge SOURCE[@REV] [TARGET_WCPATH]\n"
+"          (the 'complete' merge)\n"
+"       2. merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [TARGET_WCPATH]\n"
+"          (the 'cherry-pick' merge)\n"
+"       3. merge SOURCE1[@REV1] SOURCE2[@REV2] [TARGET_WCPATH]\n"
+"          (the '2-URL' merge)\n"
 "\n"
-"  Note:  this subcommand does not semantically resolve conflicts or\n"
-"  remove conflict markers; it merely removes the conflict-related\n"
-"  artifact files and allows PATH to be committed again.  It has been\n"
-"  deprecated in favor of running 'svn resolve --accept working'.\n"
-msgstr ""
-"删除工作副本中目录或文件的“冲突”状态。\n"
-"用法: resolved PATH...\n"
+"  1. This form, with one source path and no revision range, is called\n"
+"     a 'complete' merge:\n"
 "\n"
-"  注意: 本子命令不会依语法来解决冲突或是删除冲突标记；它只是删除冲突相关的\n"
-"        附加文件，让 PATH 可以被再次提交。它已经过时，被\n"
-"        “svn resolve --accept working”取代。\n"
-
-#: ../svn/main.c:1255
-msgid ""
-"Restore pristine working copy file (undo most local edits).\n"
-"usage: revert PATH...\n"
+"       svn merge SOURCE[@REV] [TARGET_WCPATH]\n"
 "\n"
-"  Note:  this subcommand does not require network access, and resolves\n"
-"  any conflicted states.\n"
-msgstr ""
-"将工作副本文件恢复到原始版本(恢复大部分的本地修改)。\n"
-"用法: revert PATH...\n"
+"     The complete merge is used for the 'sync' and 'reintegrate' merges\n"
+"     in the 'feature branch' pattern described below. It finds all the\n"
+"     changes on the source branch that have not already been merged to the\n"
+"     target branch, and merges them into the working copy. Merge tracking\n"
+"     is used to know which changes have already been merged.\n"
 "\n"
-"  注意: 本子命令不会访问网络，它解除任何冲突的状态。\n"
-
-#: ../svn/main.c:1263
-msgid ""
-"Print the status of working copy files and directories.\n"
-"usage: status [PATH...]\n"
+"     SOURCE specifies the branch from where the changes will be pulled, and\n"
+"     TARGET_WCPATH specifies a working copy of the target branch to which\n"
+"     the changes will be applied. Normally SOURCE and TARGET_WCPATH should\n"
+"     each correspond to the root of a branch. (If you want to merge only a\n"
+"     subtree, then the subtree path must be included in both SOURCE and\n"
+"     TARGET_WCPATH; this is discouraged, to avoid subtree mergeinfo.)\n"
 "\n"
-"  With no args, print only locally modified items (no network access).\n"
-"  With -q, print only summary information about locally modified items.\n"
-"  With -u, add working revision and server out-of-date information.\n"
-"  With -v, print full revision information on every item.\n"
+"     SOURCE is usually a URL. The optional '@REV' specifies both the peg\n"
+"     revision of the URL and the latest revision that will be considered\n"
+"     for merging; if REV is not specified, the HEAD revision is assumed. If\n"
+"     SOURCE is a working copy path, the corresponding URL of the path is\n"
+"     used, and the default value of 'REV' is the base revision (usually the\n"
+"     revision last updated to).\n"
 "\n"
-"  The first seven columns in the output are each one character wide:\n"
-"    First column: Says if item was added, deleted, or otherwise changed\n"
-"      ' ' no modifications\n"
-"      'A' Added\n"
-"      'C' Conflicted\n"
-"      'D' Deleted\n"
-"      'I' Ignored\n"
-"      'M' Modified\n"
-"      'R' Replaced\n"
-"      'X' an unversioned directory created by an externals definition\n"
-"      '?' item is not under version control\n"
-"      '!' item is missing (removed by non-svn command) or incomplete\n"
-"      '~' versioned item obstructed by some item of a different kind\n"
-"    Second column: Modifications of a file's or directory's properties\n"
-"      ' ' no modifications\n"
-"      'C' Conflicted\n"
-"      'M' Modified\n"
-"    Third column: Whether the working copy directory is locked\n"
-"      ' ' not locked\n"
-"      'L' locked\n"
-"    Fourth column: Scheduled commit will contain addition-with-history\n"
-"      ' ' no history scheduled with commit\n"
-"      '+' history scheduled with commit\n"
-"    Fifth column: Whether the item is switched or a file external\n"
-"      ' ' normal\n"
-"      'S' the item has a Switched URL relative to the parent\n"
-"      'X' a versioned file created by an eXternals definition\n"
-"    Sixth column: Repository lock token\n"
-"      (without -u)\n"
-"      ' ' no lock token\n"
-"      'K' lock token present\n"
-"      (with -u)\n"
-"      ' ' not locked in repository, no lock token\n"
-"      'K' locked in repository, lock toKen present\n"
-"      'O' locked in repository, lock token in some Other working copy\n"
-"      'T' locked in repository, lock token present but sTolen\n"
-"      'B' not locked in repository, lock token present but Broken\n"
-"    Seventh column: Whether the item is the victim of a tree conflict\n"
-"      ' ' normal\n"
-"      'C' tree-Conflicted\n"
-"    If the item is a tree conflict victim, an additional line is printed\n"
-"    after the item's status line, explaining the nature of the conflict.\n"
+"     TARGET_WCPATH is a working copy path; if omitted, '.' is generally\n"
+"     assumed. There are some special cases:\n"
 "\n"
-"  The out-of-date information appears in the ninth column (with -u):\n"
-"      '*' a newer revision exists on the server\n"
-"      ' ' the working copy is up to date\n"
+"       - If SOURCE is a URL:\n"
 "\n"
-"  Remaining fields are variable width and delimited by spaces:\n"
-"    The working revision (with -u or -v; '-' if the item is copied)\n"
-"    The last committed revision and last committed author (with -v)\n"
-"    The working copy path is always the final field, so it can\n"
-"      include spaces.\n"
+"           - If the basename of the URL and the basename of '.' are the\n"
+"             same, then the differences are applied to '.'. Otherwise,\n"
+"             if a file with the same basename as that of the URL is found\n"
+"             within '.', then the differences are applied to that file.\n"
+"             In all other cases, the target defaults to '.'.\n"
+"\n"
+"       - If SOURCE is a working copy path:\n"
+"\n"
+"           - If the source is a file, then differences are applied to that\n"
+"             file (useful for reverse-merging earlier changes). Otherwise,\n"
+"             if the source is a directory, then the target defaults to '.'.\n"
+"\n"
+"     In normal usage the working copy should be up to date, at a single\n"
+"     revision, with no local modifications and no switched subtrees.\n"
+"\n"
+"       - The 'Feature Branch' Merging Pattern -\n"
+"\n"
+"     In this commonly used work flow, known also as the 'development\n"
+"     branch' pattern, a developer creates a branch and commits a series of\n"
+"     changes that implement a new feature. The developer periodically\n"
+"     merges all the latest changes from the parent branch so as to keep the\n"
+"     development branch up to date with those changes. When the feature is\n"
+"     complete, the developer performs a merge from the feature branch to\n"
+"     the parent branch to re-integrate the changes.\n"
+"\n"
+"         parent --+----------o------o-o-------------o--\n"
+"                   \\            \\           \\      /\n"
+"                    \\          merge      merge  merge\n"
+"                     \\            \\           \\  /\n"
+"         feature      +--o-o-------o----o-o----o-------\n"
+"\n"
+"     A merge from the parent branch to the feature branch is called a\n"
+"     'sync' or 'catch-up' merge, and a merge from the feature branch to the\n"
+"     parent branch is called a 'reintegrate' merge.\n"
 "\n"
-"  The presence of a question mark ('?') where a working revision, last\n"
-"  committed revision, or last committed author was expected indicates\n"
-"  that the information is unknown or irrelevant given the state of the\n"
-"  item (for example, when the item is the result of a copy operation).\n"
-"  The question mark serves as a visual placeholder to facilitate parsing.\n"
+"       - Sync Merge Example -\n"
+"                                 ............\n"
+"                                .            .\n"
+"         trunk  --+------------L--------------R------\n"
+"                   \\                           \\\n"
+"                    \\                          |\n"
+"                     \\                         v\n"
+"         feature      +------------------------o-----\n"
+"                             r100            r200\n"
 "\n"
-"  Example output:\n"
-"    svn status wc\n"
-"     M      wc/bar.c\n"
-"    A  +    wc/qax.c\n"
+"     Subversion will locate all the changes on 'trunk' that have not yet\n"
+"     been merged into the 'feature' branch. In this case that is a single\n"
+"     range, r100:200. In the diagram above, L marks the left side "
+"(trunk@100)\n"
+"     and R marks the right side (trunk@200) of the merge source. The\n"
+"     difference between L and R will be applied to the target working copy\n"
+"     path. In this case, the working copy is a clean checkout of the entire\n"
+"     'feature' branch.\n"
 "\n"
-"    svn status -u wc\n"
-"     M             965   wc/bar.c\n"
-"            *      965   wc/foo.c\n"
-"    A  +             -   wc/qax.c\n"
-"    Status against revision:   981\n"
+"     To perform this sync merge, have a clean working copy of the feature\n"
+"     branch and run the following command in its top-level directory:\n"
 "\n"
-"    svn status --show-updates --verbose wc\n"
-"     M             965      938 kfogel       wc/bar.c\n"
-"            *      965      922 sussman      wc/foo.c\n"
-"    A  +             -      687 joe          wc/qax.c\n"
-"                   965      687 joe          wc/zig.c\n"
-"    Status against revision:   981\n"
+"         svn merge ^/trunk\n"
 "\n"
-"    svn status\n"
-"     M      wc/bar.c\n"
-"    !     C wc/qaz.c\n"
-"          >   local missing, incoming edit upon update\n"
-"    D       wc/qax.c\n"
-msgstr ""
-"显示工作副本中目录与文件的状态。\n"
-"用法: status [PATH...]\n"
+"     Note that the merge is now only in your local working copy and still\n"
+"     needs to be committed to the repository so that it can be seen by\n"
+"     others. You can review the changes and you may have to resolve\n"
+"     conflicts before you commit the merge.\n"
 "\n"
-"  未指定参数时，只显示本地修改的条目(没有网络访问)。\n"
-"  使用 -q 时，只显示本地修改条目的摘要信息。\n"
-"  使用 -u 时，增加工作版本和服务器上版本过期信息。\n"
-"  使用 -v 时，显示每个条目的完整版本信息。\n"
-"\n"
-"  输出的前七栏各占一个字符宽度: \n"
-"    第一栏: 表示一个项目是增加、删除，还是修改\n"
-"      “ ” 无修改\n"
-"      “A” 增加\n"
-"      “C” 冲突\n"
-"      “D” 删除\n"
-"      “I” 忽略\n"
-"      “M” 改变\n"
-"      “R” 替换\n"
-"      “X” 未纳入版本控制的目录，被外部引用的目录所创建\n"
-"      “?” 未纳入版本控制\n"
-"      “!” 该项目已遗失(被非 svn 命令删除)或不完整\n"
-"      “~” 版本控制下的项目与其它类型的项目重名\n"
-"    第二栏: 显示目录或文件的属性状态\n"
-"      “ ” 无修改\n"
-"      “C” 冲突\n"
-"      “M” 改变\n"
-"    第三栏: 工作副本目录是否被锁定\n"
-"      “ ” 未锁定\n"
-"      “L” 锁定\n"
-"    第四栏: 已调度的提交是否包含副本历史\n"
-"      “ ” 没有历史\n"
-"      “+” 包含历史\n"
-"    第五栏: 该条目相对其父目录是否已切换，或者是外部引用的文件\n"
-"      “ ” 正常\n"
-"      “S” 已切换\n"
-"      “X” 被外部引用创建的文件\n"
-"    第六栏: 版本库锁定标记\n"
-"      (没有 -u)\n"
-"      “ ” 没有锁定标记\n"
-"      “K” 存在锁定标记\n"
-"      (使用 -u)\n"
-"      “ ” 没有在版本库中锁定，没有锁定标记\n"
-"      “K” 在版本库中被锁定，存在锁定标记\n"
-"      “O” 在版本库中被锁定，锁定标记在一些其他工作副本中\n"
-"      “T” 在版本库中被锁定，存在锁定标记但已被窃取\n"
-"      “B” 没有在版本库中被锁定，存在锁定标记但已被破坏\n"
-"    第七栏: 项目冲突标记\n"
-"      “ ” 正常\n"
-"      “C” 树冲突\n"
-"    如果项目包含于树冲突之中，在项目状态行后会附加行，说明冲突的种类。\n"
-"\n"
-"  是否过期的信息出现的位置是第九栏(与 -u 并用时): \n"
-"      “*” 服务器上有更新版本\n"
-"      “ ” 工作副本是最新版的\n"
-"\n"
-"  剩余的栏位皆为变动宽度，并以空白隔开: \n"
-"    工作版本号(使用 -u 或 -v 时；被复制时显示“-”)\n"
-"    最后提交的版本与最后提交的作者(使用 -v 时)\n"
-"    工作副本路径总是最后一栏，所以它可以包含空白字符。\n"
-"\n"
-"  问号标记 (“?”) 出现在工作版本，最后提交的版本，或最后提交的作者位置时，\n"
-"  它指示信息未知，或者给出此项目的状态是不恰当的 (例如项目是复制操作的结果)。\n"
-"  问号标记用来作为一个视觉占位符，易于解析\n"
+"       - Reintegrate Merge Example -\n"
 "\n"
-"  范例输出: \n"
-"    svn status wc\n"
-"     M      wc/bar.c\n"
-"    A  +    wc/qax.c\n"
+"     The feature branch was last synced with trunk up to revision X. So the\n"
+"     difference between trunk@X and feature@HEAD contains the complete set\n"
+"     of changes that implement the feature, and no other changes. These\n"
+"     changes are applied to trunk.\n"
 "\n"
-"    svn status -u wc\n"
-"     M             965   wc/bar.c\n"
-"            *      965   wc/foo.c\n"
-"    A  +             -   wc/qax.c\n"
-"    版本 981 的状态\n"
+"                    rW                   rX\n"
+"         trunk ------+--------------------L------------------o\n"
+"                      \\                    .                 ^\n"
+"                       \\                    .............   /\n"
+"                        \\                                . /\n"
+"         feature         +--------------------------------R\n"
 "\n"
-"    svn status --show-updates --verbose wc\n"
-"     M             965      938 kfogel       wc/bar.c\n"
-"            *      965      922 sussman      wc/foo.c\n"
-"    A  +             -      687 joe          wc/qax.c\n"
-"                   965      687 joe          wc/zig.c\n"
-"    版本 981 的状态\n"
+"     In the diagram above, L marks the left side (trunk@X) and R marks the\n"
+"     right side (feature@HEAD) of the merge. The difference between the\n"
+"     left and right side is merged into trunk, the target.\n"
 "\n"
-"    svn status\n"
-"     M      wc/bar.c\n"
-"    !     C wc/qaz.c\n"
-"          >   local missing, incoming edit upon update\n"
-"    D       wc/qax.c\n"
-
-#: ../svn/main.c:1355
-msgid "don't print unversioned items"
-msgstr "不打印未版本控制的条目"
-
-#: ../svn/main.c:1358
-msgid ""
-"Update the working copy to a different URL within the same repository.\n"
-"usage: 1. switch URL[@PEGREV] [PATH]\n"
-"       2. switch --relocate FROM-PREFIX TO-PREFIX [PATH...]\n"
+"     To perform the merge, have a clean working copy of trunk and run the\n"
+"     following command in its top-level directory:\n"
 "\n"
-"  1. Update the working copy to mirror a new URL within the repository.\n"
-"     This behavior is similar to 'svn update', and is the way to\n"
-"     move a working copy to a branch or tag within the same repository.\n"
-"     If specified, PEGREV determines in which revision the target is first\n"
-"     looked up.\n"
+"         svn merge ^/feature\n"
 "\n"
-"     If --force is used, unversioned obstructing paths in the working\n"
-"     copy do not automatically cause a failure if the switch attempts to\n"
-"     add the same path.  If the obstructing path is the same type (file\n"
-"     or directory) as the corresponding path in the repository it becomes\n"
-"     versioned but its contents are left 'as-is' in the working copy.\n"
-"     This means that an obstructing directory's unversioned children may\n"
-"     also obstruct and become versioned.  For files, any content "
-"differences\n"
-"     between the obstruction and the repository are treated like a local\n"
-"     modification to the working copy.  All properties from the repository\n"
-"     are applied to the obstructing path.\n"
+"     To prevent unnecessary merge conflicts, a reintegrate merge requires\n"
+"     that TARGET_WCPATH is not a mixed-revision working copy, has no local\n"
+"     modifications, and has no switched subtrees.\n"
 "\n"
-"     Use the --set-depth option to set a new working copy depth on the\n"
-"     targets of this operation.\n"
+"     A reintegrate merge also requires that the source branch is coherently\n"
+"     synced with the target -- in the above example, this means that all\n"
+"     revisions between the branch point W and the last merged revision X\n"
+"     are merged to the feature branch, so that there are no unmerged\n"
+"     revisions in-between.\n"
+"\n"
+"\n"
+"  2. This form is called a 'cherry-pick' merge:\n"
+"\n"
+"       svn merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [TARGET_WCPATH]\n"
+"\n"
+"     A cherry-pick merge is used to merge specific revisions (or revision\n"
+"     ranges) from one branch to another. By default, this uses merge\n"
+"     tracking to automatically skip any revisions that have already been\n"
+"     merged to the target; you can use the --ignore-ancestry option to\n"
+"     disable such skipping.\n"
+"\n"
+"     SOURCE is usually a URL. The optional '@REV' specifies only the peg\n"
+"     revision of the URL and does not affect the merge range; if REV is not\n"
+"     specified, the HEAD revision is assumed. If SOURCE is a working copy\n"
+"     path, the corresponding URL of the path is used, and the default value\n"
+"     of 'REV' is the base revision (usually the revision last updated to).\n"
+"\n"
+"     TARGET_WCPATH is a working copy path; if omitted, '.' is generally\n"
+"     assumed. The special cases noted above in the 'complete' merge form\n"
+"     also apply here.\n"
+"\n"
+"     The revision ranges to be merged are specified by the '-r' and/or '-c'\n"
+"     options. '-r N:M' refers to the difference in the history of the\n"
+"     source branch between revisions N and M. You can use '-c M' to merge\n"
+"     single revisions: '-c M' is equivalent to '-r <M-1>:M'. Each such\n"
+"     difference is applied to TARGET_WCPATH.\n"
+"\n"
+"     If the mergeinfo in TARGET_WCPATH indicates that revisions within the\n"
+"     range were already merged, changes made in those revisions are not\n"
+"     merged again. If needed, the range is broken into multiple sub-ranges,\n"
+"     and each sub-range is merged separately.\n"
+"\n"
+"     A 'reverse range' can be used to undo changes. For example, when\n"
+"     source and target refer to the same branch, a previously committed\n"
+"     revision can be 'undone'. In a reverse range, N is greater than M in\n"
+"     '-r N:M', or the '-c' option is used with a negative number: '-c -M'\n"
+"     is equivalent to '-r M:<M-1>'. Undoing changes like this is also known\n"
+"     as performing a 'reverse merge'.\n"
 "\n"
-"     By default, Subversion will refuse to switch a working copy path to\n"
-"     a new URL with which it shares no common version control ancestry.\n"
-"     Use the '--ignore-ancestry' option to override this sanity check.\n"
+"     Multiple '-c' and/or '-r' options may be specified and mixing of\n"
+"     forward and reverse ranges is allowed.\n"
 "\n"
-"  2. The '--relocate' option is deprecated. This syntax is equivalent to\n"
-"     'svn relocate FROM-PREFIX TO-PREFIX [PATH]'.\n"
+"       - Cherry-pick Merge Example -\n"
 "\n"
-"  See also 'svn help update' for a list of possible characters\n"
-"  reporting the action taken.\n"
+"     A bug has been fixed on trunk in revision 50. This fix needs to\n"
+"     be merged from trunk onto the release branch.\n"
 "\n"
-"  Examples:\n"
-"    svn switch ^/branches/1.x-release\n"
-"    svn switch --relocate http:// svn://\n"
-"    svn switch --relocate http://www.example.com/repo/project \\\n"
-"                          svn://svn.example.com/repo/project\n"
-msgstr ""
-"更新工作副本至同一版本库中的不同 URL。\n"
-"用法:  1、switch URL[@PEGREV] [PATH]\n"
-"       2、switch --relocate FROM-PREFIX TO-PREFIX [PATH...]\n"
+"            1.x-release  +-----------------------o-----\n"
+"                        /                        ^\n"
+"                       /                         |\n"
+"                      /                          |\n"
+"         trunk ------+--------------------------LR-----\n"
+"                                                r50\n"
 "\n"
-"  1、更新工作副本，与同一版本库中的新 URL 对应。其行为跟 “svn update” 很像，\n"
-"     也是将工作副本切换到同一版本库中某个分支或者标签的方法。PEGREV 决定从\n"
-"     哪个版本查找目标。\n"
+"     In the above diagram, L marks the left side (trunk@49) and R marks the\n"
+"     right side (trunk@50) of the merge. The difference between the left\n"
+"     and right side is applied to the target working copy path.\n"
 "\n"
-"     如果使用了 “--force” 选项，在工作副本中未版本控制的障碍路径，不会自动\n"
-"     导致失败。如果障碍路径与版本库中的对应路径类型相同(文件或目录)，它将成\n"
-"     为受版本控制的路径，但是内容不改变。它意味着障碍路径的子孙，也可能是障\n"
-"     碍路径，同样会受版本控制。对于障碍路径中的文件，如果与版本库内的不同，\n"
-"     将视为工作副本发生本地修改。版本库中的所有属性都应用于障碍路径。\n"
+"     Note that the difference between revision 49 and 50 is exactly those\n"
+"     changes that were committed in revision 50, not including changes\n"
+"     committed in revision 49.\n"
 "\n"
-"     使用 “--set-depth” 选项设置此操作目标的工作副本之新深度。\n"
+"     To perform the merge, have a clean working copy of the release branch\n"
+"     and run the following command in its top-level directory; remember\n"
+"     that the default target is '.':\n"
 "\n"
-"     如果新 URL 与工作副本路径没有版本继承关系，Subversion 将会拒绝操作。选项\n"
-"     '--ignore-ancestry' 可以禁止此检查。\n"
+"         svn merge -c50 ^/trunk\n"
 "\n"
-"  2、选项 “--relocate” 已经淘汰。它的句法等价于\n"
-"     “svn relocate FROM-PREFIX TO-PREFIX [PATH]”。\n"
+"     You can also cherry-pick several revisions and/or revision ranges:\n"
 "\n"
-"  参见 “svn help update” 以获取报告执行动作的字符列表。\n"
+"         svn merge -c50,54,60 -r65:68 ^/trunk\n"
 "\n"
-"  样例:\n"
-"    svn switch ^/branches/1.x-release\n"
-"    svn switch --relocate http:// svn://\n"
-"    svn switch --relocate http://www.example.com/repo/project \\\n"
-"                          svn://svn.example.com/repo/project\n"
-
-#: ../svn/main.c:1401
-msgid ""
-"Unlock working copy paths or URLs.\n"
-"usage: unlock TARGET...\n"
 "\n"
-"  Use --force to break the lock.\n"
-msgstr ""
-"解除工作副本或URL的锁定。\n"
-"用法: unlock TARGET...\n"
+"  3. This form is called a '2-URL merge':\n"
 "\n"
-"    使用 --force 终止锁定。\n"
-
-#: ../svn/main.c:1408
-msgid ""
-"Bring changes from the repository into the working copy.\n"
-"usage: update [PATH...]\n"
+"       svn merge SOURCE1[@REV1] SOURCE2[@REV2] [TARGET_WCPATH]\n"
 "\n"
-"  If no revision is given, bring working copy up-to-date with HEAD rev.\n"
-"  Else synchronize working copy to revision given by -r.\n"
+"     You should use this merge variant only if the other variants do not\n"
+"     apply to your situation, as this variant can be quite complex to\n"
+"     master.\n"
 "\n"
-"  For each updated item a line will be printed with characters reporting\n"
-"  the action taken. These characters have the following meaning:\n"
+"     Two source URLs are specified, identifying two trees on the same\n"
+"     branch or on different branches. The trees are compared and the\n"
+"     difference from SOURCE1@REV1 to SOURCE2@REV2 is applied to the\n"
+"     working copy of the target branch at TARGET_WCPATH. The target\n"
+"     branch may be the same as one or both sources, or different again.\n"
+"     The three branches involved can be completely unrelated.\n"
+"\n"
+"     TARGET_WCPATH is a working copy path; if omitted, '.' is generally\n"
+"     assumed. The special cases noted above in the 'complete' merge form\n"
+"     also apply here.\n"
 "\n"
-"    A  Added\n"
-"    D  Deleted\n"
-"    U  Updated\n"
-"    C  Conflict\n"
-"    G  Merged\n"
-"    E  Existed\n"
-"    R  Replaced\n"
+"     SOURCE1 and/or SOURCE2 can also be specified as a working copy path,\n"
+"     in which case the merge source URL is derived from the working copy.\n"
 "\n"
-"  Characters in the first column report about the item itself.\n"
-"  Characters in the second column report about properties of the item.\n"
-"  A 'B' in the third column signifies that the lock for the file has\n"
-"  been broken or stolen.\n"
-"  A 'C' in the fourth column indicates a tree conflict, while a 'C' in\n"
-"  the first and second columns indicate textual conflicts in files\n"
-"  and in property values, respectively.\n"
+"       - 2-URL Merge Example -\n"
 "\n"
-"  If --force is used, unversioned obstructing paths in the working\n"
-"  copy do not automatically cause a failure if the update attempts to\n"
-"  add the same path.  If the obstructing path is the same type (file\n"
-"  or directory) as the corresponding path in the repository it becomes\n"
-"  versioned but its contents are left 'as-is' in the working copy.\n"
-"  This means that an obstructing directory's unversioned children may\n"
-"  also obstruct and become versioned.  For files, any content differences\n"
-"  between the obstruction and the repository are treated like a local\n"
-"  modification to the working copy.  All properties from the repository\n"
-"  are applied to the obstructing path.  Obstructing paths are reported\n"
-"  in the first column with code 'E'.\n"
+"     Two features have been developed on separate branches called 'foo' and\n"
+"     'bar'. It has since become clear that 'bar' should be combined with\n"
+"     the 'foo' branch for further development before reintegration.\n"
 "\n"
-"  If the specified update target is missing from the working copy but its\n"
-"  immediate parent directory is present, checkout the target into its\n"
-"  parent directory at the specified depth.  If --parents is specified,\n"
-"  create any missing parent directories of the target by checking them\n"
-"  out, too, at depth=empty.\n"
+"     Although both feature branches originate from trunk, they are not\n"
+"     directly related -- one is not a direct copy of the other. A 2-URL\n"
+"     merge is necessary.\n"
 "\n"
-"  Use the --set-depth option to set a new working copy depth on the\n"
-"  targets of this operation.\n"
-msgstr ""
-"将版本库的修改合并到工作副本中。\n"
-"用法: update [PATH...]\n"
+"     The 'bar' branch has been synced with trunk up to revision 500.\n"
+"     (If this revision number is not known, it can be located using the\n"
+"     'svn log' and/or 'svn mergeinfo' commands.)\n"
+"     The difference between trunk@500 and bar@HEAD contains the complete\n"
+"     set of changes related to feature 'bar', and no other changes. These\n"
+"     changes are applied to the 'foo' branch.\n"
 "\n"
-"  如果没有指定版本，则将工作副本更新到 HEAD 版本。否则同步到 -r 选项所\n"
-"  指定的版本。\n"
+"                           foo  +-----------------------------------o\n"
+"                               /                                    ^\n"
+"                              /                                    /\n"
+"                             /              r500                  /\n"
+"         trunk ------+------+-----------------L--------->        /\n"
+"                      \\                        .                /\n"
+"                       \\                        ............   /\n"
+"                        \\                                   . /\n"
+"                    bar  +-----------------------------------R\n"
 "\n"
-"  每更新一项就输出一行信息，使用首字符来报告执行的动作。这些字符的含义是: \n"
+"     In the diagram above, L marks the left side (trunk@500) and R marks\n"
+"     the right side (bar@HEAD) of the merge. The difference between the\n"
+"     left and right side is applied to the target working copy path, in\n"
+"     this case a working copy of the 'foo' branch.\n"
 "\n"
-"    A  已添加\n"
-"    D  已删除\n"
-"    U  已更新\n"
-"    C  合并冲突\n"
-"    G  合并成功\n"
-"    E  已存在\n"
-"    R  已替换\n"
+"     To perform the merge, have a clean working copy of the 'foo' branch\n"
+"     and run the following command in its top-level directory:\n"
 "\n"
-"  第一列字符报告项目本身。\n"
-"  第二列表示报告项目属性。\n"
-"  第三列中的字符“B”表示此文件上的锁被终止或窃取。\n"
-"  第四列中的字符“C”表示树冲突，同时“C”出现在第一列或第二列，分别表示\n"
-"  内容冲突或属性冲突。\n"
+"         svn merge ^/trunk@500 ^/bar\n"
 "\n"
-"  如果使用了 “--force” 选项，在工作副本中未版本控制的障碍路径，不会自动\n"
-"  导致签出失败。 如果障碍路径与版本库中的对应路径类型相同(文件或目录),它\n"
-"  将成为受版本控制的路径，但是内容不改变。它意味着障碍路径的子孙，也可能\n"
-"  是障碍路径，同样会受版本控制。对于障碍路径中的文件，如果与版本库内的\n"
-"  不同，将视为工作副本发生本地修改。版本库中的所有属性都应用于障碍路径。\n"
-"  用第一列字符 “E” 来报告障碍路径。\n"
+"     The exact changes applied by a 2-URL merge can be previewed with svn's\n"
+"     diff command, which is a good idea to verify if you do not have the\n"
+"     luxury of a clean working copy to merge to. In this case:\n"
 "\n"
-"  如果工作副本中并没有指定的更新目标，但是有其父目录，那么就在指定路径上\n"
-"  将目标检出到其父目录中。如果使用了选项 --parents，就会创建目标的所有不\n"
-"  存在的父目录 (使用选项 --depth=empty)。\n"
+"         svn diff ^/trunk@500 ^/bar@HEAD\n"
 "\n"
-"  使用“--set-depth”选项设置此操作目标的工作副本之新深度。\n"
-
-#: ../svn/main.c:1458
-msgid ""
-"Upgrade the metadata storage format for a working copy.\n"
-"usage: upgrade [WCPATH...]\n"
 "\n"
-"  Local modifications are preserved.\n"
-msgstr ""
-"升级工作副本的元数据存储格式。\n"
-"用法: upgrade [WCPATH...]\n"
+"  The following applies to all types of merges:\n"
 "\n"
-"  保留本地修改。\n"
-
-#: ../svn/main.c:1504 ../svnadmin/main.c:86 ../svnlook/main.c:364
-#: ../svnrdump/svnrdump.c:63 ../svnsync/main.c:287
-msgid "Caught signal"
-msgstr "捕捉到信号"
-
-#: ../svn/main.c:1624 ../svnlook/main.c:2392
-msgid "Non-numeric limit argument given"
-msgstr "--limit 取值不是数字"
-
-#: ../svn/main.c:1630 ../svnlook/main.c:2398
-msgid "Argument to --limit must be positive"
-msgstr "--limit 取值必须为正"
-
-#: ../svn/main.c:1651 ../svn/main.c:1937
-msgid "Can't specify -c with --old"
-msgstr "不能同时指定 -c 和 --old"
-
-#: ../svn/main.c:1683
-#, c-format
-msgid "Negative number in range (%s) not supported with -c"
-msgstr "-c 选项不支持负数在范围 (%s) 中"
-
-#: ../svn/main.c:1696
-#, c-format
-msgid "Non-numeric change argument (%s) given to -c"
-msgstr "-c 选项的取值(%s)不是数字"
-
-#: ../svn/main.c:1704
-msgid "There is no change 0"
-msgstr "没有版本 0"
-
-#: ../svn/main.c:1752 ../svnadmin/main.c:1684 ../svnrdump/svnrdump.c:774
-#: ../svnsync/main.c:1902
-#, c-format
-msgid "Syntax error in revision argument '%s'"
-msgstr "版本参数“%s”中有语法错误"
-
-#: ../svn/main.c:1825 ../svn/main.c:1844
-#, c-format
-msgid "Error converting depth from locale to UTF-8"
-msgstr "将深度从本地编码转换到 UTF8 失败"
-
-#: ../svn/main.c:1833
-#, c-format
-msgid ""
-"'%s' is not a valid depth; try 'empty', 'files', 'immediates', or 'infinity'"
-msgstr "“%s” 不是有效的深度；尝试 “empty”，“files”，“immediates”，或 “infinity”"
-
-#: ../svn/main.c:1852
-#, c-format
-msgid ""
-"'%s' is not a valid depth; try 'exclude', 'empty', 'files', 'immediates', or "
-"'infinity'"
-msgstr "“%s” 不是有效的深度；尝试 “exclude”，“empty”，“files”，“immediates”，或 “infinity”"
-
-#: ../svn/main.c:1983
-#, c-format
-msgid "Syntax error in native-eol argument '%s'"
-msgstr "原生换行符号参数 “%s” 中有语法错误"
-
-#: ../svn/main.c:2003
-msgid "Changelist names must not be empty"
-msgstr "修改列表的名称不能为空"
-
-#: ../svn/main.c:2039
-#, c-format
-msgid "'%s' is not a valid --accept value"
-msgstr "“%s” 是非法 --accept 取值"
-
-#: ../svn/main.c:2048
-#, c-format
-msgid "'%s' is not a valid --show-revs value"
-msgstr "“%s” 是非法 --show-revs 取值"
-
-#: ../svn/main.c:2061
-#, c-format
-msgid "Invalid strip count '%s'"
-msgstr "无效修剪计数 '%s'"
-
-#: ../svn/main.c:2067
-msgid "Argument to --strip must be positive"
-msgstr "--strip 参数的取值必须为正"
-
-#: ../svn/main.c:2148 ../svndumpfilter/main.c:1402 ../svnlook/main.c:2471
-#, c-format
-msgid "Subcommand argument required\n"
-msgstr "必须提供子命令参数\n"
-
-#: ../svn/main.c:2167 ../svnadmin/main.c:1828 ../svndumpfilter/main.c:1421
-#: ../svnlook/main.c:2490 ../svnrdump/svnrdump.c:862
-#, c-format
-msgid "Unknown command: '%s'\n"
-msgstr "未知命令: “%s”\n"
-
-#: ../svn/main.c:2201
-#, c-format
-msgid ""
-"Subcommand '%s' doesn't accept option '%s'\n"
-"Type 'svn help %s' for usage.\n"
+"  To prevent unnecessary merge conflicts, svn merge requires that\n"
+"  TARGET_WCPATH is not a mixed-revision working copy. Running 'svn update'\n"
+"  before starting a merge ensures that all items in the working copy are\n"
+"  based on the same revision.\n"
+"\n"
+"  If possible, you should have no local modifications in the merge's target\n"
+"  working copy prior to the merge, to keep things simpler. It will be\n"
+"  easier to revert the merge and to understand the branch's history.\n"
+"\n"
+"  Switched sub-paths should also be avoided during merging, as they may\n"
+"  cause incomplete merges and create subtree mergeinfo.\n"
+"\n"
+"  For each merged item a line will be printed with characters reporting the\n"
+"  action taken. These characters have the following meaning:\n"
+"\n"
+"    A  Added\n"
+"    D  Deleted\n"
+"    U  Updated\n"
+"    C  Conflict\n"
+"    G  Merged\n"
+"    E  Existed\n"
+"    R  Replaced\n"
+"\n"
+"  Characters in the first column report about the item itself.\n"
+"  Characters in the second column report about properties of the item.\n"
+"  A 'C' in the third column indicates a tree conflict, while a 'C' in\n"
+"  the first and second columns indicate textual conflicts in files\n"
+"  and in property values, respectively.\n"
+"\n"
+"    - Merge Tracking -\n"
+"\n"
+"  Subversion uses the svn:mergeinfo property to track merge history. This\n"
+"  property is considered at the start of a merge to determine what to merge\n"
+"  and it is updated at the conclusion of the merge to describe the merge\n"
+"  that took place. Mergeinfo is used only if the two sources are on the\n"
+"  same line of history -- if the first source is an ancestor of the second,\n"
+"  or vice-versa (i.e. if one has originally been created by copying the\n"
+"  other). This is verified and enforced when using sync merges and\n"
+"  reintegrate merges.\n"
+"\n"
+"  The --ignore-ancestry option prevents merge tracking and thus ignores\n"
+"  mergeinfo, neither considering it nor recording it.\n"
+"\n"
+"    - Merging from foreign repositories -\n"
+"\n"
+"  Subversion does support merging from foreign repositories.\n"
+"  While all merge source URLs must point to the same repository, the merge\n"
+"  target working copy may come from a different repository than the source.\n"
+"  However, there are some caveats. Most notably, copies made in the\n"
+"  merge source will be transformed into plain additions in the merge\n"
+"  target. Also, merge-tracking is not supported for merges from foreign\n"
+"  repositories.\n"
 msgstr ""
-"子命令“%s”不接受选项“%s”\n"
-"输入“svn help %s”得到用法。\n"
-
-#: ../svn/main.c:2216
-msgid ""
-"Multiple revision arguments encountered; can't specify -c twice, or both -c "
-"and -r"
-msgstr "遇到了多个版本参数；不能指定 -c 两次或者同时使用 -c 和 -r"
-
-#: ../svn/main.c:2228
-msgid "--depth and --set-depth are mutually exclusive"
-msgstr "--depth 与 --set-depth 是互斥的"
-
-#: ../svn/main.c:2238
-msgid "--with-all-revprops and --with-no-revprops are mutually exclusive"
-msgstr "--with-all-revprops 与 --with-no-revprops 是互斥的"
-
-#: ../svn/main.c:2248
-msgid "--with-revprop and --with-no-revprops are mutually exclusive"
-msgstr "--with-revprop 与 --with-no-revprops 是互斥的"
-
-#: ../svn/main.c:2261
-msgid "--message (-m) and --file (-F) are mutually exclusive"
-msgstr "--message (-m) 与 --file (-F) 是互斥的"
-
-#: ../svn/main.c:2270 ../svnrdump/svnrdump.c:921 ../svnsync/main.c:1983
-msgid "--trust-server-cert requires --non-interactive"
-msgstr "--trust-server-cert 需要 --non-interactive"
-
-#: ../svn/main.c:2280
-msgid "--diff-cmd and --internal-diff are mutually exclusive"
-msgstr "--diff-cmd 与 --internal-diff 是互斥的"
-
-#: ../svn/main.c:2340
-msgid "Log message file is a versioned file; use '--force-log' to override"
-msgstr "日志信息文件受版本控制；请使用 “--force-log” 强制执行"
 
-#: ../svn/main.c:2347
-msgid "Lock comment file is a versioned file; use '--force-log' to override"
-msgstr "锁注释文件受版本控制；请使用 “--force-log” 强制执行"
-
-#: ../svn/main.c:2368
-msgid ""
-"The log message is a pathname (was -F intended?); use '--force-log' to "
-"override"
-msgstr "日志信息是路径名称 (本来想用 -F 选项的吗？)；请使用“--force-log”强制执行"
-
-#: ../svn/main.c:2375
+#: ../svn/svn.c:1094
 msgid ""
-"The lock comment is a pathname (was -F intended?); use '--force-log' to "
-"override"
-msgstr "锁注释是路径名称 (本来想用-F 选项的吗？)；请使用“--force-log”强制执行"
-
-#: ../svn/main.c:2389
-msgid "--relocate and --depth are mutually exclusive"
-msgstr "--relocate 与 --depth 是互斥的"
-
-#: ../svn/main.c:2397
-msgid "--relocate and --non-recursive (-N) are mutually exclusive"
-msgstr "--relocate 与 --non-recursive (-N) 是互斥的"
-
-#: ../svn/main.c:2484
-msgid "--auto-props and --no-auto-props are mutually exclusive"
-msgstr "--auto-props 与 --no-auto-props 是互斥的"
-
-#: ../svn/main.c:2498
-msgid "--reintegrate cannot be used with --ignore-ancestry or --record-only"
-msgstr "--reintegrate 不能与 --ignore-ancestry 或 --record-only 共存"
-
-#: ../svn/main.c:2506
-msgid "--reintegrate cannot be used with --ignore-ancestry"
-msgstr "--reintegrate 不能与 --ignore-ancestry 共存"
-
-#: ../svn/main.c:2514
-msgid "--reintegrate cannot be used with --record-only"
-msgstr "--reintegrate 不能与 --record-only 共存"
-
-#: ../svn/main.c:2638 ../svn/main.c:2644
-#, c-format
-msgid "--accept=%s incompatible with --non-interactive"
-msgstr "--accept=%s 与 --non-interactive 不兼容"
-
-#: ../svn/main.c:2669
-msgid "Try 'svn help' for more info"
-msgstr "请使用 “svn help” 以得到更多信息"
-
-#: ../svn/main.c:2674
-msgid "Please see the 'svn upgrade' command"
-msgstr "请参阅命令 'svn upgrade'"
+"Display merge-related information.\n"
+"usage: 1. mergeinfo SOURCE[@REV] [TARGET[@REV]]\n"
+"       2. mergeinfo --show-revs=WHICH SOURCE[@REV] [TARGET[@REV]]\n"
+"\n"
+"  1. Summarize the history of merging between SOURCE and TARGET. The graph\n"
+"     shows, from left to right:\n"
+"       the youngest common ancestor of the branches;\n"
+"       the latest full merge in either direction, and thus the common base\n"
+"         that will be used for the next complete merge;\n"
+"       the repository path and revision number of the tip of each branch.\n"
+"\n"
+"  2. Print the revision numbers on SOURCE that have been merged to TARGET\n"
+"     (with --show-revs=merged), or that have not been merged to TARGET\n"
+"     (with --show-revs=eligible). Print only revisions in which there was\n"
+"     at least one change in SOURCE.\n"
+"\n"
+"     If --revision (-r) is provided, filter the displayed information to\n"
+"     show only that which is associated with the revisions within the\n"
+"     specified range.  Revision numbers, dates, and the 'HEAD' keyword are\n"
+"     valid range values.\n"
+"\n"
+"  SOURCE and TARGET are the source and target branch URLs, respectively.\n"
+"  (If a WC path is given, the corresponding base URL is used.) The default\n"
+"  TARGET is the current working directory ('.'). REV specifies the revision\n"
+"  to be considered the tip of the branch; the default for SOURCE is HEAD,\n"
+"  and the default for TARGET is HEAD for a URL or BASE for a WC path.\n"
+"\n"
+"  The depth can be 'empty' or 'infinity'; the default is 'empty'.\n"
+msgstr ""
 
-#: ../svn/main.c:2690
+#: ../svn/svn.c:1125
 msgid ""
-"svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for "
-"details)\n"
-msgstr "svn: 运行“svn cleanup”删除锁定 (输入“svn help cleanup”得到用法)\n"
-
-#: ../svn/merge-cmd.c:65
-msgid "-r and -c can't be used with --reintegrate"
-msgstr "-r 和 -c 不能与 --reintegrate 共存"
-
-#: ../svn/merge-cmd.c:120
-msgid "Merge source required"
-msgstr "需要合并源"
-
-#: ../svn/merge-cmd.c:166
-msgid "Second revision required"
-msgstr "需要第二个版本"
-
-#: ../svn/merge-cmd.c:175 ../svn/merge-cmd.c:208 ../svn/mergeinfo-cmd.c:84
-#: ../svnadmin/main.c:1398 ../svnlook/main.c:1888 ../svnlook/main.c:2077
-#: ../svnlook/main.c:2181 ../svnlook/main.c:2213
-msgid "Too many arguments given"
-msgstr "参数过多"
-
-#: ../svn/merge-cmd.c:197
-msgid "Cannot specify a revision range with two URLs"
-msgstr "不能对两个 URL 指定版本范围"
-
-#: ../svn/merge-cmd.c:224
-msgid "A working copy merge source needs an explicit revision"
-msgstr "工作副本的合并来源需要指定版本"
-
-#: ../svn/merge-cmd.c:283
-msgid "--depth cannot be used with --reintegrate"
-msgstr "--depth 不能与 --reintegrate 共存"
-
-#: ../svn/merge-cmd.c:288
-msgid "--force cannot be used with --reintegrate"
-msgstr "--force 不能与 --reintegrate 共存"
-
-#: ../svn/merge-cmd.c:293
-msgid "--reintegrate can only be used with a single merge source"
-msgstr "--reintegrate 只能用于单一合并源"
-
-#: ../svn/merge-cmd.c:297
-msgid "--allow-mixed-revisions cannot be used with --reintegrate"
-msgstr "--allow-mixed-revisions 不能与 --reintegrate 共存"
+"Create a new directory under version control.\n"
+"usage: 1. mkdir PATH...\n"
+"       2. mkdir URL...\n"
+"\n"
+"  Create version controlled directories.\n"
+"\n"
+"  1. Each directory specified by a working copy PATH is created locally\n"
+"    and scheduled for addition upon the next commit.\n"
+"\n"
+"  2. Each directory specified by a URL is created in the repository via\n"
+"    an immediate commit.\n"
+"\n"
+"  In both cases, all the intermediate directories must already exist,\n"
+"  unless the --parents option is given.\n"
+msgstr ""
+"创建纳入版本控制的新目录。\n"
+"用法: 1、mkdir PATH...\n"
+"      2、mkdir URL...\n"
+"\n"
+"  创建版本控制的目录。\n"
+"\n"
+"  1、每个以工作副本 PATH 指定的目录，都会在本地创建，并且加入增加\n"
+"     调度，直到下次提交。\n"
+"\n"
+"  2、每个以 URL 指定的目录，都会通过立即提交在版本库中创建。\n"
+"\n"
+"  在这两个情况下，所有的中间目录都必须事先存在，\n"
+"  除非使用选项 --parents。\n"
 
-#: ../svn/merge-cmd.c:373
+#: ../svn/svn.c:1142
 msgid ""
-"Merge tracking not possible, use --ignore-ancestry or\n"
-"fix invalid mergeinfo in target with 'svn propset'"
+"Move (rename) an item in a working copy or repository.\n"
+"usage: move SRC... DST\n"
+"\n"
+"  SRC and DST can both be working copy (WC) paths or URLs:\n"
+"    WC  -> WC:  move an item in a working copy, as a local change to\n"
+"                be committed later (with or without further changes)\n"
+"    URL -> URL: move an item in the repository directly, immediately\n"
+"                creating a new revision in the repository\n"
+"  All the SRCs must be of the same type. When moving multiple sources,\n"
+"  they will be added as children of DST, which must be a directory.\n"
+"\n"
+"  SRC and DST of WC -> WC moves must be committed in the same revision.\n"
+"  Furthermore, WC -> WC moves will refuse to move a mixed-revision subtree.\n"
+"  To avoid unnecessary conflicts, it is recommended to run 'svn update'\n"
+"  to update the subtree to a single revision before moving it.\n"
+"  The --allow-mixed-revisions option is provided for backward "
+"compatibility.\n"
+"\n"
+"  The --revision option has no use and is deprecated.\n"
 msgstr ""
-"不能执行合并跟踪，对目标使用“svn propset”修正非法合并信息，或者使用选项\n"
-"--ignore-ancestry"
-
-#: ../svn/mergeinfo-cmd.c:81
-msgid "Not enough arguments given"
-msgstr "没有提供足够的参数"
-
-#: ../svn/mkdir-cmd.c:92
-msgid "Try 'svn add' or 'svn add --non-recursive' instead?"
-msgstr "尝试用 “svn add”或 “svn add --non-recursive”代替？"
-
-#: ../svn/mkdir-cmd.c:98
-msgid "Try 'svn mkdir --parents' instead?"
-msgstr "尝试 “svn mkdir --parents”？"
-
-#: ../svn/notify.c:83 ../svn/status-cmd.c:87
-msgid "Summary of conflicts:\n"
-msgstr "冲突概要：\n"
-
-#: ../svn/notify.c:87 ../svn/status-cmd.c:91
-#, c-format
-msgid "  Text conflicts: %u\n"
-msgstr "  正文冲突：%u\n"
-
-#: ../svn/notify.c:91 ../svn/status-cmd.c:95
-#, c-format
-msgid "  Property conflicts: %u\n"
-msgstr "  属性冲突：%u\n"
-
-#: ../svn/notify.c:95 ../svn/status-cmd.c:99
-#, c-format
-msgid "  Tree conflicts: %u\n"
-msgstr "  树冲突：%u\n"
-
-#: ../svn/notify.c:99
-#, c-format
-msgid "  Skipped paths: %u\n"
-msgstr "  跳过的路径：%u\n"
-
-#: ../svn/notify.c:133
-#, c-format
-msgid "Skipped missing target: '%s'\n"
-msgstr "跳过缺少的目标: “%s”\n"
-
-#: ../svn/notify.c:140
-#, c-format
-msgid "Skipped target: '%s' -- copy-source is missing\n"
-msgstr "跳过目标: '%s' -- copy-source 丢失\n"
-
-#: ../svn/notify.c:147
-#, c-format
-msgid "Skipped '%s'\n"
-msgstr "跳过“%s”\n"
 
-#: ../svn/notify.c:154
-#, c-format
-msgid "Skipped '%s' -- An obstructing working copy was found\n"
-msgstr "忽略“%s” -- 发现障碍工作副本\n"
-
-#: ../svn/notify.c:161
-#, c-format
-msgid "Skipped '%s' -- Has no versioned parent\n"
-msgstr "已跳过 '%s' -- 没有已版本控制的父亲\n"
+#: ../svn/svn.c:1164
+msgid ""
+"Apply a patch to a working copy.\n"
+"usage: patch PATCHFILE [WCPATH]\n"
+"\n"
+"  Apply a unidiff patch in PATCHFILE to the working copy WCPATH.\n"
+"  If WCPATH is omitted, '.' is assumed.\n"
+"\n"
+"  A unidiff patch suitable for application to a working copy can be\n"
+"  produced with the 'svn diff' command or third-party diffing tools.\n"
+"  Any non-unidiff content of PATCHFILE is ignored, except for Subversion\n"
+"  property diffs as produced by 'svn diff'.\n"
+"\n"
+"  Changes listed in the patch will either be applied or rejected.\n"
+"  If a change does not match at its exact line offset, it may be applied\n"
+"  earlier or later in the file if a match is found elsewhere for the\n"
+"  surrounding lines of context provided by the patch.\n"
+"  A change may also be applied with fuzz, which means that one\n"
+"  or more lines of context are ignored when matching the change.\n"
+"  If no matching context can be found for a change, the change conflicts\n"
+"  and will be written to a reject file with the extension .svnpatch.rej.\n"
+"\n"
+"  For each patched file a line will be printed with characters reporting\n"
+"  the action taken. These characters have the following meaning:\n"
+"\n"
+"    A  Added\n"
+"    D  Deleted\n"
+"    U  Updated\n"
+"    C  Conflict\n"
+"    G  Merged (with local uncommitted changes)\n"
+"\n"
+"  Changes applied with an offset or fuzz are reported on lines starting\n"
+"  with the '>' symbol. You should review such changes carefully.\n"
+"\n"
+"  If the patch removes all content from a file, that file is scheduled\n"
+"  for deletion. If the patch creates a new file, that file is scheduled\n"
+"  for addition. Use 'svn revert' to undo deletions and additions you\n"
+"  do not agree with.\n"
+"\n"
+"  Hint: If the patch file was created with Subversion, it will contain\n"
+"        the number of a revision N the patch will cleanly apply to\n"
+"        (look for lines like '--- foo/bar.txt        (revision N)').\n"
+"        To avoid rejects, first update to the revision N using\n"
+"        'svn update -r N', apply the patch, and then update back to the\n"
+"        HEAD revision. This way, conflicts can be resolved interactively.\n"
+msgstr ""
 
-#: ../svn/notify.c:168
-#, c-format
-msgid "Skipped '%s' -- Access denied\n"
-msgstr "已跳过 '%s' -- 拒绝访问\n"
+#: ../svn/svn.c:1212
+msgid ""
+"Remove a property from files, dirs, or revisions.\n"
+"usage: 1. propdel PROPNAME [PATH...]\n"
+"       2. propdel PROPNAME --revprop -r REV [TARGET]\n"
+"\n"
+"  1. Removes versioned props in working copy.\n"
+"  2. Removes unversioned remote prop on repos revision.\n"
+"     TARGET only determines which repository to access.\n"
+msgstr ""
+"删除目录、文件或版本的属性。\n"
+"用法: 1、propdel PROPNAME [PATH...]\n"
+"      2、propdel PROPNAME --revprop -r REV [URL]\n"
+"\n"
+"  1、删除工作副本中纳入版本管理的文件或目录的属性。\n"
+"  2、删除版本库中版本的属性。TARGET只用来判断访问哪个版本库。\n"
 
-#: ../svn/notify.c:175
-#, c-format
-msgid "Skipped '%s' -- Node remains in conflict\n"
-msgstr "已跳过 '%s' -- 节点处于冲突状态\n"
+#: ../svn/svn.c:1222
+msgid ""
+"Edit a property with an external editor.\n"
+"usage: 1. propedit PROPNAME TARGET...\n"
+"       2. propedit PROPNAME --revprop -r REV [TARGET]\n"
+"\n"
+"  1. Edits versioned prop in working copy or repository.\n"
+"  2. Edits unversioned remote prop on repos revision.\n"
+"     TARGET only determines which repository to access.\n"
+"\n"
+"  See 'svn help propset' for more on setting properties.\n"
+msgstr ""
 
-#: ../svn/notify.c:246
-#, c-format
-msgid "Restored '%s'\n"
-msgstr "已还原“%s”\n"
+#: ../svn/svn.c:1234
+msgid ""
+"Print the value of a property on files, dirs, or revisions.\n"
+"usage: 1. propget PROPNAME [TARGET[@REV]...]\n"
+"       2. propget PROPNAME --revprop -r REV [TARGET]\n"
+"\n"
+"  1. Prints versioned props. If specified, REV determines in which\n"
+"     revision the target is first looked up.\n"
+"  2. Prints unversioned remote prop on repos revision.\n"
+"     TARGET only determines which repository to access.\n"
+"\n"
+"  With --verbose, the target path and the property name are printed on\n"
+"  separate lines before each value, like 'svn proplist --verbose'.\n"
+"  Otherwise, if there is more than one TARGET or a depth other than\n"
+"  'empty', the target path is printed on the same line before each value.\n"
+"\n"
+"  By default, an extra newline is printed after the property value so that\n"
+"  the output looks pretty.  With a single TARGET and depth 'empty', you can\n"
+"  use the --strict option to disable this (useful when redirecting a binary\n"
+"  property value to a file, for example).\n"
+msgstr ""
+
+#: ../svn/svn.c:1254 ../svn/svn.c:1271
+msgid "print path, name and value on separate lines"
+msgstr "在单独的行打印路径，名称和取值"
+
+#: ../svn/svn.c:1255
+msgid "don't print an extra newline"
+msgstr "不打印额外的新行"
 
-#: ../svn/notify.c:252
-#, c-format
-msgid "Reverted '%s'\n"
-msgstr "已恢复“%s”\n"
+#: ../svn/svn.c:1258
+msgid ""
+"List all properties on files, dirs, or revisions.\n"
+"usage: 1. proplist [TARGET[@REV]...]\n"
+"       2. proplist --revprop -r REV [TARGET]\n"
+"\n"
+"  1. Lists versioned props. If specified, REV determines in which\n"
+"     revision the target is first looked up.\n"
+"  2. Lists unversioned remote props on repos revision.\n"
+"     TARGET only determines which repository to access.\n"
+"\n"
+"  With --verbose, the property values are printed as well, like 'svn "
+"propget\n"
+"  --verbose'.  With --quiet, the paths are not printed.\n"
+msgstr ""
 
-#: ../svn/notify.c:258
-#, c-format
-msgid "Failed to revert '%s' -- try updating instead.\n"
-msgstr "无法恢复“%s”-- 请改用更新试试。\n"
+#: ../svn/svn.c:1272
+msgid "don't print the path"
+msgstr "不要打印路径"
 
-#: ../svn/notify.c:266
-#, c-format
-msgid "Resolved conflicted state of '%s'\n"
-msgstr "“%s”的冲突状态已解决\n"
+#: ../svn/svn.c:1275
+msgid ""
+"Set the value of a property on files, dirs, or revisions.\n"
+"usage: 1. propset PROPNAME PROPVAL PATH...\n"
+"       2. propset PROPNAME --revprop -r REV PROPVAL [TARGET]\n"
+"\n"
+"  1. Changes a versioned file or directory property in a working copy.\n"
+"  2. Changes an unversioned property on a repository revision.\n"
+"     (TARGET only determines which repository to access.)\n"
+"\n"
+"  The value may be provided with the --file option instead of PROPVAL.\n"
+"\n"
+"  Property names starting with 'svn:' are reserved.  Subversion recognizes\n"
+"  the following special versioned properties on a file:\n"
+"    svn:keywords   - Keywords to be expanded.  Valid keywords are:\n"
+"      URL, HeadURL             - The URL for the head version of the file.\n"
+"      Author, LastChangedBy    - The last person to modify the file.\n"
+"      Date, LastChangedDate    - The date/time the file was last modified.\n"
+"      Rev, Revision,           - The last revision the file changed.\n"
+"        LastChangedRevision\n"
+"      Id                       - A compressed summary of the previous four.\n"
+"      Header                   - Similar to Id but includes the full URL.\n"
+"\n"
+"      Custom keywords can be defined with a format string separated from\n"
+"      the keyword name with '='. Valid format substitutions are:\n"
+"        %a   - The author of the revision given by %r.\n"
+"        %b   - The basename of the URL of the file.\n"
+"        %d   - Short format of the date of the revision given by %r.\n"
+"        %D   - Long format of the date of the revision given by %r.\n"
+"        %P   - The file's path, relative to the repository root.\n"
+"        %r   - The number of the revision which last changed the file.\n"
+"        %R   - The URL to the root of the repository.\n"
+"        %u   - The URL of the file.\n"
+"        %_   - A space (keyword definitions cannot contain a literal "
+"space).\n"
+"        %%   - A literal '%'.\n"
+"        %H   - Equivalent to %P%_%r%_%d%_%a.\n"
+"        %I   - Equivalent to %b%_%r%_%d%_%a.\n"
+"      Example custom keyword definition: MyKeyword=%r%_%a%_%P\n"
+"      Once a custom keyword has been defined for a file, it can be used\n"
+"      within the file like any other keyword: $MyKeyword$\n"
+"\n"
+"    svn:executable - If present, make the file executable.  Use\n"
+"      'svn propdel svn:executable PATH...' to clear.\n"
+"    svn:eol-style  - One of 'native', 'LF', 'CR', 'CRLF'.\n"
+"    svn:mime-type  - The mimetype of the file.  Used to determine\n"
+"      whether to merge the file, and how to serve it from Apache.\n"
+"      A mimetype beginning with 'text/' (or an absent mimetype) is\n"
+"      treated as text.  Anything else is treated as binary.\n"
+"    svn:needs-lock - If present, indicates that the file should be locked\n"
+"      before it is modified.  Makes the working copy file read-only\n"
+"      when it is not locked.  Use 'svn propdel svn:needs-lock PATH...'\n"
+"      to clear.\n"
+"\n"
+"  Subversion recognizes the following special versioned properties on a\n"
+"  directory:\n"
+"    svn:ignore         - A list of file glob patterns to ignore, one per "
+"line.\n"
+"    svn:global-ignores - Like svn:ignore, but inheritable.\n"
+"    svn:externals      - A list of module specifiers, one per line, in the\n"
+"      following format similar to the syntax of 'svn checkout':\n"
+"        [-r REV] URL[@PEG] LOCALPATH\n"
+"      Example:\n"
+"        http://example.com/repos/zig foo/bar\n"
+"      The LOCALPATH is relative to the directory having this property.\n"
+"      To pin the external to a known revision, specify the optional REV:\n"
+"        -r25 http://example.com/repos/zig foo/bar\n"
+"      To unambiguously identify an element at a path which may have been\n"
+"      subsequently deleted or renamed, specify the optional PEG revision:\n"
+"        -r25 http://example.com/repos/zig@42 foo/bar\n"
+"      The URL may be a full URL or a relative URL starting with one of:\n"
+"        ../  to the parent directory of the extracted external\n"
+"        ^/   to the repository root\n"
+"        /    to the server root\n"
+"        //   to the URL scheme\n"
+"      Use of the following format is discouraged but is supported for\n"
+"      interoperability with Subversion 1.4 and earlier clients:\n"
+"        LOCALPATH [-r PEG] URL\n"
+"      The ambiguous format 'relative_path relative_path' is taken as\n"
+"      'relative_url relative_path' with peg revision support.\n"
+"      Lines starting with a '#' character are ignored.\n"
+msgstr ""
 
-#: ../svn/notify.c:355 ../svn/notify.c:395
-#, c-format
-msgid ">         applied hunk ## -%lu,%lu +%lu,%lu ## with offset %s"
-msgstr ">         已应用块 ## -%lu,%lu +%lu,%lu ##，偏移 %s"
+#: ../svn/svn.c:1354
+msgid "read property value from file ARG"
+msgstr "从文件 ARG 读取属性值"
 
-#: ../svn/notify.c:372 ../svn/notify.c:409
-#, c-format
-msgid ">         applied hunk @@ -%lu,%lu +%lu,%lu @@ with offset %s"
-msgstr ">         已应用块 @@ -%lu,%lu +%lu,%lu @@ 偏移 %s"
+#: ../svn/svn.c:1357
+msgid ""
+"Relocate the working copy to point to a different repository root URL.\n"
+"usage: 1. relocate FROM-PREFIX TO-PREFIX [PATH...]\n"
+"       2. relocate TO-URL [PATH]\n"
+"\n"
+"  Rewrite working copy URL metadata to reflect a syntactic change only.\n"
+"  This is used when a repository's root URL changes (such as a scheme\n"
+"  or hostname change) but your working copy still reflects the same\n"
+"  directory within the same repository.\n"
+"\n"
+"  1. FROM-PREFIX and TO-PREFIX are initial substrings of the working\n"
+"     copy's current and new URLs, respectively.  (You may specify the\n"
+"     complete old and new URLs if you wish.)  Use 'svn info' to determine\n"
+"     the current working copy URL.\n"
+"\n"
+"  2. TO-URL is the (complete) new repository URL to use for PATH.\n"
+"\n"
+"  Examples:\n"
+"    svn relocate http:// svn:// project1 project2\n"
+"    svn relocate http://www.example.com/repo/project \\\n"
+"                 svn://svn.example.com/repo/project\n"
+msgstr ""
+"重新定位工作副本，指向不同的版本库根 URL。\n"
+"用法:  1. relocate FROM-PREFIX TO-PREFIX [PATH...]\n"
+"       2. relocate TO-URL [PATH]\n"
+"\n"
+"  改写工作副本 URL 元数据，以反映仅版本库根 URL 的改变。这用于仅版本库根\n"
+"  URL 改变(例如方案或主机名称)，但是工作副本内容仍旧与版本库对应的情况。\n"
+"\n"
+"  1. FROM-PREFIX 和 TO-PREFIX 分别对应工作副本的旧 URL 与新 URL 开始子串\n"
+"     (如果你喜欢，可以指定完整的 URL)。请使用 'svn info' 来确定当前工作\n"
+"     副本的 URL。\n"
+"\n"
+"  2. TO-URL 是用于 PATH 的(完整的)新版本库 URL。\n"
+"\n"
+"  例如:\n"
+"    svn relocate http:// svn:// project1 project2\n"
+"    svn relocate http://www.example.com/repo/project \\\n"
+"                 svn://svn.example.com/repo/project\n"
 
-#: ../svn/notify.c:430
-#, c-format
-msgid ">         applied hunk ## -%lu,%lu +%lu,%lu ## with fuzz %lu (%s)\n"
-msgstr ">         已应用块 ## -%lu,%lu +%lu,%lu ## 模糊 %lu (%s)\n"
+#: ../svn/svn.c:1380
+msgid ""
+"Resolve conflicts on working copy files or directories.\n"
+"usage: resolve [PATH...]\n"
+"\n"
+"  By default, perform interactive conflict resolution on PATH.\n"
+"  In this mode, the command is recursive by default (depth 'infinity').\n"
+"\n"
+"  The --accept=ARG option prevents interactive prompting and forces\n"
+"  conflicts on PATH to be resolved in the manner specified by ARG.\n"
+"  In this mode, the command is not recursive by default (depth 'empty').\n"
+msgstr ""
 
-#: ../svn/notify.c:440
-#, c-format
-msgid ">         applied hunk @@ -%lu,%lu +%lu,%lu @@ with fuzz %lu\n"
-msgstr ">         已应用块 @@ -%lu,%lu +%lu,%lu @@ 模糊 %lu\n"
+#: ../svn/svn.c:1390
+msgid ""
+"specify automatic conflict resolution source\n"
+"                             ('base', 'working', 'mine-conflict',\n"
+"                             'theirs-conflict', 'mine-full', 'theirs-full')"
+msgstr ""
+"指定自动解决冲突动作的源\n"
+"                            ('base', 'working', 'mine-conflict',\n"
+"                             'theirs-conflict', 'mine-full', 'theirs-full')"
 
-#: ../svn/notify.c:458
-#, c-format
-msgid ">         rejected hunk ## -%lu,%lu +%lu,%lu ## (%s)\n"
-msgstr ">         已拒绝块 ## -%lu,%lu +%lu,%lu ## (%s)\n"
+#: ../svn/svn.c:1397
+msgid ""
+"Remove 'conflicted' state on working copy files or directories.\n"
+"usage: resolved PATH...\n"
+"\n"
+"  Note:  this subcommand does not semantically resolve conflicts or\n"
+"  remove conflict markers; it merely removes the conflict-related\n"
+"  artifact files and allows PATH to be committed again.  It has been\n"
+"  deprecated in favor of running 'svn resolve --accept working'.\n"
+msgstr ""
+"删除工作副本中目录或文件的“冲突”状态。\n"
+"用法: resolved PATH...\n"
+"\n"
+"  注意: 本子命令不会依语法来解决冲突或是删除冲突标记；它只是删除冲突相关的\n"
+"        附加文件，让 PATH 可以被再次提交。它已经过时，被\n"
+"        “svn resolve --accept working”取代。\n"
 
-#: ../svn/notify.c:467
-#, c-format
-msgid ">         rejected hunk @@ -%lu,%lu +%lu,%lu @@\n"
-msgstr ">         已拒绝的块 @@ -%lu,%lu +%lu,%lu @@\n"
+#: ../svn/svn.c:1407
+msgid ""
+"Restore pristine working copy state (undo local changes).\n"
+"usage: revert PATH...\n"
+"\n"
+"  Revert changes in the working copy at or within PATH, and remove\n"
+"  conflict markers as well, if any.\n"
+"\n"
+"  This subcommand does not revert already committed changes.\n"
+"  For information about undoing already committed changes, search\n"
+"  the output of 'svn help merge' for 'undo'.\n"
+msgstr ""
 
-#: ../svn/notify.c:481
-#, c-format
-msgid ">         hunk ## -%lu,%lu +%lu,%lu ## already applied (%s)\n"
-msgstr ">         块 ## -%lu,%lu +%lu,%lu ## 已经应用 (%s)\n"
+#: ../svn/svn.c:1419
+msgid ""
+"Print the status of working copy files and directories.\n"
+"usage: status [PATH...]\n"
+"\n"
+"  With no args, print only locally modified items (no network access).\n"
+"  With -q, print only summary information about locally modified items.\n"
+"  With -u, add working revision and server out-of-date information.\n"
+"  With -v, print full revision information on every item.\n"
+"\n"
+"  The first seven columns in the output are each one character wide:\n"
+"    First column: Says if item was added, deleted, or otherwise changed\n"
+"      ' ' no modifications\n"
+"      'A' Added\n"
+"      'C' Conflicted\n"
+"      'D' Deleted\n"
+"      'I' Ignored\n"
+"      'M' Modified\n"
+"      'R' Replaced\n"
+"      'X' an unversioned directory created by an externals definition\n"
+"      '?' item is not under version control\n"
+"      '!' item is missing (removed by non-svn command) or incomplete\n"
+"      '~' versioned item obstructed by some item of a different kind\n"
+"    Second column: Modifications of a file's or directory's properties\n"
+"      ' ' no modifications\n"
+"      'C' Conflicted\n"
+"      'M' Modified\n"
+"    Third column: Whether the working copy is locked for writing by\n"
+"                  another Subversion client modifying the working copy\n"
+"      ' ' not locked for writing\n"
+"      'L' locked for writing\n"
+"    Fourth column: Scheduled commit will contain addition-with-history\n"
+"      ' ' no history scheduled with commit\n"
+"      '+' history scheduled with commit\n"
+"    Fifth column: Whether the item is switched or a file external\n"
+"      ' ' normal\n"
+"      'S' the item has a Switched URL relative to the parent\n"
+"      'X' a versioned file created by an eXternals definition\n"
+"    Sixth column: Whether the item is locked in repository for exclusive "
+"commit\n"
+"      (without -u)\n"
+"      ' ' not locked by this working copy\n"
+"      'K' locked by this working copy, but lock might be stolen or broken\n"
+"      (with -u)\n"
+"      ' ' not locked in repository, not locked by this working copy\n"
+"      'K' locked in repository, lock owned by this working copy\n"
+"      'O' locked in repository, lock owned by another working copy\n"
+"      'T' locked in repository, lock owned by this working copy was stolen\n"
+"      'B' not locked in repository, lock owned by this working copy is "
+"broken\n"
+"    Seventh column: Whether the item is the victim of a tree conflict\n"
+"      ' ' normal\n"
+"      'C' tree-Conflicted\n"
+"    If the item is a tree conflict victim, an additional line is printed\n"
+"    after the item's status line, explaining the nature of the conflict.\n"
+"\n"
+"  The out-of-date information appears in the ninth column (with -u):\n"
+"      '*' a newer revision exists on the server\n"
+"      ' ' the working copy is up to date\n"
+"\n"
+"  Remaining fields are variable width and delimited by spaces:\n"
+"    The working revision (with -u or -v; '-' if the item is copied)\n"
+"    The last committed revision and last committed author (with -v)\n"
+"    The working copy path is always the final field, so it can\n"
+"      include spaces.\n"
+"\n"
+"  The presence of a question mark ('?') where a working revision, last\n"
+"  committed revision, or last committed author was expected indicates\n"
+"  that the information is unknown or irrelevant given the state of the\n"
+"  item (for example, when the item is the result of a copy operation).\n"
+"  The question mark serves as a visual placeholder to facilitate parsing.\n"
+"\n"
+"  Example output:\n"
+"    svn status wc\n"
+"     M      wc/bar.c\n"
+"    A  +    wc/qax.c\n"
+"\n"
+"    svn status -u wc\n"
+"     M             965   wc/bar.c\n"
+"            *      965   wc/foo.c\n"
+"    A  +             -   wc/qax.c\n"
+"    Status against revision:   981\n"
+"\n"
+"    svn status --show-updates --verbose wc\n"
+"     M             965      938 kfogel       wc/bar.c\n"
+"            *      965      922 sussman      wc/foo.c\n"
+"    A  +             -      687 joe          wc/qax.c\n"
+"                   965      687 joe          wc/zig.c\n"
+"    Status against revision:   981\n"
+"\n"
+"    svn status\n"
+"     M      wc/bar.c\n"
+"    !     C wc/qaz.c\n"
+"          >   local missing, incoming edit upon update\n"
+"    D       wc/qax.c\n"
+msgstr ""
 
-#: ../svn/notify.c:491
-#, c-format
-msgid ">         hunk @@ -%lu,%lu +%lu,%lu @@ already applied\n"
-msgstr ">         块 @@ -%lu,%lu +%lu,%lu @@ 已经应用\n"
+#: ../svn/svn.c:1512
+msgid "don't print unversioned items"
+msgstr "不打印未版本控制的条目"
 
-#: ../svn/notify.c:551
-#, c-format
+#: ../svn/svn.c:1515
 msgid ""
+"Update the working copy to a different URL within the same repository.\n"
+"usage: 1. switch URL[@PEGREV] [PATH]\n"
+"       2. switch --relocate FROM-PREFIX TO-PREFIX [PATH...]\n"
 "\n"
-"Fetching external item into '%s':\n"
+"  1. Update the working copy to mirror a new URL within the repository.\n"
+"     This behavior is similar to 'svn update', and is the way to\n"
+"     move a working copy to a branch or tag within the same repository.\n"
+"     If specified, PEGREV determines in which revision the target is first\n"
+"     looked up.\n"
+"\n"
+"     If --force is used, unversioned obstructing paths in the working\n"
+"     copy do not automatically cause a failure if the switch attempts to\n"
+"     add the same path.  If the obstructing path is the same type (file\n"
+"     or directory) as the corresponding path in the repository it becomes\n"
+"     versioned but its contents are left 'as-is' in the working copy.\n"
+"     This means that an obstructing directory's unversioned children may\n"
+"     also obstruct and become versioned.  For files, any content "
+"differences\n"
+"     between the obstruction and the repository are treated like a local\n"
+"     modification to the working copy.  All properties from the repository\n"
+"     are applied to the obstructing path.\n"
+"\n"
+"     Use the --set-depth option to set a new working copy depth on the\n"
+"     targets of this operation.\n"
+"\n"
+"     By default, Subversion will refuse to switch a working copy path to\n"
+"     a new URL with which it shares no common version control ancestry.\n"
+"     Use the '--ignore-ancestry' option to override this sanity check.\n"
+"\n"
+"  2. The '--relocate' option is deprecated. This syntax is equivalent to\n"
+"     'svn relocate FROM-PREFIX TO-PREFIX [PATH]'.\n"
+"\n"
+"  See also 'svn help update' for a list of possible characters\n"
+"  reporting the action taken.\n"
+"\n"
+"  Examples:\n"
+"    svn switch ^/branches/1.x-release\n"
+"    svn switch --relocate http:// svn://\n"
+"    svn switch --relocate http://www.example.com/repo/project \\\n"
+"                          svn://svn.example.com/repo/project\n"
 msgstr ""
+"更新工作副本至同一版本库中的不同 URL。\n"
+"用法:  1、switch URL[@PEGREV] [PATH]\n"
+"       2、switch --relocate FROM-PREFIX TO-PREFIX [PATH...]\n"
 "\n"
-"正在取得外部项目至 '%s':\n"
-
-#: ../svn/notify.c:577
-#, c-format
-msgid "Error handling externals definition for '%s':"
-msgstr "处理外部引用“%s”时出错："
-
-#: ../svn/notify.c:591
-#, c-format
-msgid "Updating '%s':\n"
-msgstr "正在升级 '%s':\n"
-
-#: ../svn/notify.c:607
-#, c-format
-msgid "Exported external at revision %ld.\n"
-msgstr "已导出版本 %ld 的外部项目。\n"
-
-#: ../svn/notify.c:608
-#, c-format
-msgid "Exported revision %ld.\n"
-msgstr "已导出版本 %ld。\n"
-
-#: ../svn/notify.c:616
-#, c-format
-msgid "Checked out external at revision %ld.\n"
-msgstr "取出版本 %ld 的外部项目。\n"
-
-#: ../svn/notify.c:617
-#, c-format
-msgid "Checked out revision %ld.\n"
-msgstr "取出版本 %ld。\n"
-
-#: ../svn/notify.c:628
-#, c-format
-msgid "Updated external to revision %ld.\n"
-msgstr "更新外部项目至版本 %ld。\n"
-
-#: ../svn/notify.c:629
-#, c-format
-msgid "Updated to revision %ld.\n"
-msgstr "更新到版本 %ld。\n"
-
-#: ../svn/notify.c:637
-#, c-format
-msgid "External at revision %ld.\n"
-msgstr "外部项目版本 %ld。\n"
-
-#: ../svn/notify.c:638
-#, c-format
-msgid "At revision %ld.\n"
-msgstr "版本 %ld。\n"
-
-#: ../svn/notify.c:650
-#, c-format
-msgid "External export complete.\n"
-msgstr "完成外部项目导出。\n"
-
-#: ../svn/notify.c:651
-#, c-format
-msgid "Export complete.\n"
-msgstr "完成导出。\n"
-
-#: ../svn/notify.c:658
-#, c-format
-msgid "External checkout complete.\n"
-msgstr "完成取出外部项目。\n"
+"  1、更新工作副本，与同一版本库中的新 URL 对应。其行为跟 “svn update” 很像，\n"
+"     也是将工作副本切换到同一版本库中某个分支或者标签的方法。PEGREV 决定从\n"
+"     哪个版本查找目标。\n"
+"\n"
+"     如果使用了 “--force” 选项，在工作副本中未版本控制的障碍路径，不会自动\n"
+"     导致失败。如果障碍路径与版本库中的对应路径类型相同(文件或目录)，它将成\n"
+"     为受版本控制的路径，但是内容不改变。它意味着障碍路径的子孙，也可能是障\n"
+"     碍路径，同样会受版本控制。对于障碍路径中的文件，如果与版本库内的不同，\n"
+"     将视为工作副本发生本地修改。版本库中的所有属性都应用于障碍路径。\n"
+"\n"
+"     使用 “--set-depth” 选项设置此操作目标的工作副本之新深度。\n"
+"\n"
+"     如果新 URL 与工作副本路径没有版本继承关系，Subversion 将会拒绝操作。选项\n"
+"     '--ignore-ancestry' 可以禁止此检查。\n"
+"\n"
+"  2、选项 “--relocate” 已经淘汰。它的句法等价于\n"
+"     “svn relocate FROM-PREFIX TO-PREFIX [PATH]”。\n"
+"\n"
+"  参见 “svn help update” 以获取报告执行动作的字符列表。\n"
+"\n"
+"  样例:\n"
+"    svn switch ^/branches/1.x-release\n"
+"    svn switch --relocate http:// svn://\n"
+"    svn switch --relocate http://www.example.com/repo/project \\\n"
+"                          svn://svn.example.com/repo/project\n"
 
-#: ../svn/notify.c:659
-#, c-format
-msgid "Checkout complete.\n"
-msgstr "完成取出。\n"
+#: ../svn/svn.c:1557
+msgid "allow switching to a node with no common ancestor"
+msgstr ""
 
-#: ../svn/notify.c:666
-#, c-format
-msgid "External update complete.\n"
-msgstr "完成外部项目更新。\n"
+#: ../svn/svn.c:1561
+msgid ""
+"Unlock working copy paths or URLs.\n"
+"usage: unlock TARGET...\n"
+"\n"
+"  Use --force to break the lock.\n"
+msgstr ""
+"解除工作副本或URL的锁定。\n"
+"用法: unlock TARGET...\n"
+"\n"
+"    使用 --force 终止锁定。\n"
 
-#: ../svn/notify.c:667
-#, c-format
-msgid "Update complete.\n"
-msgstr "完成更新。\n"
+#: ../svn/svn.c:1568
+msgid ""
+"Bring changes from the repository into the working copy.\n"
+"usage: update [PATH...]\n"
+"\n"
+"  If no revision is given, bring working copy up-to-date with HEAD rev.\n"
+"  Else synchronize working copy to revision given by -r.\n"
+"\n"
+"  For each updated item a line will be printed with characters reporting\n"
+"  the action taken. These characters have the following meaning:\n"
+"\n"
+"    A  Added\n"
+"    D  Deleted\n"
+"    U  Updated\n"
+"    C  Conflict\n"
+"    G  Merged\n"
+"    E  Existed\n"
+"    R  Replaced\n"
+"\n"
+"  Characters in the first column report about the item itself.\n"
+"  Characters in the second column report about properties of the item.\n"
+"  A 'B' in the third column signifies that the lock for the file has\n"
+"  been broken or stolen.\n"
+"  A 'C' in the fourth column indicates a tree conflict, while a 'C' in\n"
+"  the first and second columns indicate textual conflicts in files\n"
+"  and in property values, respectively.\n"
+"\n"
+"  If --force is used, unversioned obstructing paths in the working\n"
+"  copy do not automatically cause a failure if the update attempts to\n"
+"  add the same path.  If the obstructing path is the same type (file\n"
+"  or directory) as the corresponding path in the repository it becomes\n"
+"  versioned but its contents are left 'as-is' in the working copy.\n"
+"  This means that an obstructing directory's unversioned children may\n"
+"  also obstruct and become versioned.  For files, any content differences\n"
+"  between the obstruction and the repository are treated like a local\n"
+"  modification to the working copy.  All properties from the repository\n"
+"  are applied to the obstructing path.  Obstructing paths are reported\n"
+"  in the first column with code 'E'.\n"
+"\n"
+"  If the specified update target is missing from the working copy but its\n"
+"  immediate parent directory is present, checkout the target into its\n"
+"  parent directory at the specified depth.  If --parents is specified,\n"
+"  create any missing parent directories of the target by checking them\n"
+"  out, too, at depth=empty.\n"
+"\n"
+"  Use the --set-depth option to set a new working copy depth on the\n"
+"  targets of this operation.\n"
+msgstr ""
+"将版本库的修改合并到工作副本中。\n"
+"用法: update [PATH...]\n"
+"\n"
+"  如果没有指定版本，则将工作副本更新到 HEAD 版本。否则同步到 -r 选项所\n"
+"  指定的版本。\n"
+"\n"
+"  每更新一项就输出一行信息，使用首字符来报告执行的动作。这些字符的含义是: \n"
+"\n"
+"    A  已添加\n"
+"    D  已删除\n"
+"    U  已更新\n"
+"    C  合并冲突\n"
+"    G  合并成功\n"
+"    E  已存在\n"
+"    R  已替换\n"
+"\n"
+"  第一列字符报告项目本身。\n"
+"  第二列表示报告项目属性。\n"
+"  第三列中的字符“B”表示此文件上的锁被终止或窃取。\n"
+"  第四列中的字符“C”表示树冲突，同时“C”出现在第一列或第二列，分别表示\n"
+"  内容冲突或属性冲突。\n"
+"\n"
+"  如果使用了 “--force” 选项，在工作副本中未版本控制的障碍路径，不会自动\n"
+"  导致签出失败。 如果障碍路径与版本库中的对应路径类型相同(文件或目录),它\n"
+"  将成为受版本控制的路径，但是内容不改变。它意味着障碍路径的子孙，也可能\n"
+"  是障碍路径，同样会受版本控制。对于障碍路径中的文件，如果与版本库内的\n"
+"  不同，将视为工作副本发生本地修改。版本库中的所有属性都应用于障碍路径。\n"
+"  用第一列字符 “E” 来报告障碍路径。\n"
+"\n"
+"  如果工作副本中并没有指定的更新目标，但是有其父目录，那么就在指定路径上\n"
+"  将目标检出到其父目录中。如果使用了选项 --parents，就会创建目标的所有不\n"
+"  存在的父目录 (使用选项 --depth=empty)。\n"
+"\n"
+"  使用“--set-depth”选项设置此操作目标的工作副本之新深度。\n"
 
-#: ../svn/notify.c:684
-#, c-format
+#: ../svn/svn.c:1618
 msgid ""
+"Upgrade the metadata storage format for a working copy.\n"
+"usage: upgrade [WCPATH...]\n"
 "\n"
-"Performing status on external item at '%s':\n"
+"  Local modifications are preserved.\n"
 msgstr ""
+"升级工作副本的元数据存储格式。\n"
+"用法: upgrade [WCPATH...]\n"
 "\n"
-"对外部项目“%s”进行状态检查:\n"
-
-#: ../svn/notify.c:692
-#, c-format
-msgid "Status against revision: %6ld\n"
-msgstr "版本 %6ld 的状态\n"
-
-#: ../svn/notify.c:701
-#, c-format
-msgid "Sending copy of       %s\n"
-msgstr "正在发送副本          %s\n"
-
-#: ../svn/notify.c:702
-#, c-format
-msgid "Sending        %s\n"
-msgstr "正在发送       %s\n"
-
-#: ../svn/notify.c:713
-#, c-format
-msgid "Adding copy of (bin)  %s\n"
-msgstr "正在增加 (二进制)     %s\n"
-
-#: ../svn/notify.c:714
-#, c-format
-msgid "Adding  (bin)  %s\n"
-msgstr "正在增加 (二进制) %s\n"
-
-#: ../svn/notify.c:722
-#, c-format
-msgid "Adding copy of        %s\n"
-msgstr "正在增加副本          %s\n"
-
-#: ../svn/notify.c:723
-#, c-format
-msgid "Adding         %s\n"
-msgstr "正在增加       %s\n"
-
-#: ../svn/notify.c:732
-#, c-format
-msgid "Deleting copy of      %s\n"
-msgstr "正在删除副本          %s\n"
-
-#: ../svn/notify.c:733
-#, c-format
-msgid "Deleting       %s\n"
-msgstr "正在删除       %s\n"
-
-#: ../svn/notify.c:742
-#, c-format
-msgid "Replacing copy of     %s\n"
-msgstr "正在替换副本          %s\n"
+"  保留本地修改。\n"
 
-#: ../svn/notify.c:743
-#, c-format
-msgid "Replacing      %s\n"
-msgstr "正在替换       %s\n"
+#: ../svn/svn.c:1664 ../svnadmin/svnadmin.c:90 ../svnlook/svnlook.c:380
+#: ../svnrdump/svnrdump.c:65 ../svnsync/svnsync.c:297
+msgid "Caught signal"
+msgstr "捕捉到信号"
 
-#: ../svn/notify.c:753 ../svnsync/sync.c:330
-#, c-format
-msgid "Transmitting file data "
-msgstr "传输文件数据 "
+#: ../svn/svn.c:1817 ../svnlook/svnlook.c:2565
+msgid "Non-numeric limit argument given"
+msgstr "--limit 取值不是数字"
 
-#: ../svn/notify.c:762
-#, c-format
-msgid "'%s' locked by user '%s'.\n"
-msgstr "“%s”被用户“%s”锁定。\n"
+#: ../svn/svn.c:1823 ../svnlook/svnlook.c:2571
+msgid "Argument to --limit must be positive"
+msgstr "--limit 取值必须为正"
 
-#: ../svn/notify.c:768
-#, c-format
-msgid "'%s' unlocked.\n"
-msgstr "“%s”解除锁定。\n"
+#: ../svn/svn.c:1844 ../svn/svn.c:2121
+msgid "Can't specify -c with --old"
+msgstr "不能同时指定 -c 和 --old"
 
-#: ../svn/notify.c:795
+#: ../svn/svn.c:1875
 #, c-format
-msgid "--- Merging differences between repository URLs into '%s':\n"
-msgstr "--- 正在合并版本库 URL 之间的差异到 “%s”：\n"
+msgid "Negative number in range (%s) not supported with -c"
+msgstr "-c 选项不支持负数在范围 (%s) 中"
 
-#: ../svn/notify.c:800
+#: ../svn/svn.c:1888
 #, c-format
-msgid "--- Merging r%ld into '%s':\n"
-msgstr "--- 正在合并 r%ld 到 “%s”:\n"
+msgid "Non-numeric change argument (%s) given to -c"
+msgstr "-c 选项的取值(%s)不是数字"
 
-#: ../svn/notify.c:804
-#, c-format
-msgid "--- Reverse-merging r%ld into '%s':\n"
-msgstr "--- 正在反向合并 r%ld 到 “%s”:\n"
+#: ../svn/svn.c:1896
+msgid "There is no change 0"
+msgstr "没有版本 0"
 
-#: ../svn/notify.c:808
+#: ../svn/svn.c:1939 ../svnadmin/svnadmin.c:2037 ../svnrdump/svnrdump.c:937
+#: ../svnsync/svnsync.c:2052
 #, c-format
-msgid "--- Merging r%ld through r%ld into '%s':\n"
-msgstr "--- 正在合并 r%ld，经由 r%ld，到 “%s”:\n"
+msgid "Syntax error in revision argument '%s'"
+msgstr "版本参数“%s”中有语法错误"
 
-#: ../svn/notify.c:814
+#: ../svn/svn.c:2005 ../svn/svn.c:2024
 #, c-format
-msgid "--- Reverse-merging r%ld through r%ld into '%s':\n"
-msgstr "--- 正在反向合并 r%ld，经由 r%ld，到 “%s”:\n"
+msgid "Error converting depth from locale to UTF-8"
+msgstr "将深度从本地编码转换到 UTF8 失败"
 
-#: ../svn/notify.c:826
+#: ../svn/svn.c:2013
 #, c-format
 msgid ""
-"--- Recording mergeinfo for merge between repository URLs into '%s':\n"
-msgstr "--- 记录版本库 URL 之间的合并信息到“%s”：\n"
-
-#: ../svn/notify.c:836
-#, c-format
-msgid "--- Recording mergeinfo for merge of r%ld into '%s':\n"
-msgstr "--- 记录合并 r%ld 到“%s”的信息:\n"
-
-#: ../svn/notify.c:841
-#, c-format
-msgid "--- Recording mergeinfo for reverse merge of r%ld into '%s':\n"
-msgstr "--- 记录反向合并 r%ld 到“%s”的信息:\n"
-
-#: ../svn/notify.c:846
-#, c-format
-msgid "--- Recording mergeinfo for merge of r%ld through r%ld into '%s':\n"
-msgstr "--- 记录合并 r%ld，经由 r%ld，到“%s”的信息:\n"
+"'%s' is not a valid depth; try 'empty', 'files', 'immediates', or 'infinity'"
+msgstr "“%s” 不是有效的深度；尝试 “empty”，“files”，“immediates”，或 “infinity”"
 
-#: ../svn/notify.c:851
+#: ../svn/svn.c:2032
 #, c-format
 msgid ""
-"--- Recording mergeinfo for reverse merge of r%ld through r%ld into '%s':\n"
-msgstr "--- 记录反向合并 r%ld，经由 r%ld，到“%s”的信息:\n"
-
-#: ../svn/notify.c:861
-#, c-format
-msgid "--- Eliding mergeinfo from '%s':\n"
-msgstr "--- 正在从 '%s' 删除合并信息:\n"
-
-#: ../svn/notify.c:869
-#, c-format
-msgid "--- Merging differences between foreign repository URLs into '%s':\n"
-msgstr "--- 正在合并外部版本库 URL 之间的差异到 “%s”：\n"
-
-#: ../svn/notify.c:875
-#, c-format
-msgid "--- Merging (from foreign repository) r%ld into '%s':\n"
-msgstr "--- 正在合并(从外部版本库) r%ld 到 “%s”：\n"
-
-#: ../svn/notify.c:880
-#, c-format
-msgid "--- Reverse-merging (from foreign repository) r%ld into '%s':\n"
-msgstr "--- 正在反向合并(从外部版本库) r%ld 到 “%s”:\n"
-
-#: ../svn/notify.c:885
-#, c-format
-msgid "--- Merging (from foreign repository) r%ld through r%ld into '%s':\n"
-msgstr "--- 正在合并(从外部版本库) r%ld，经由 r%ld，到 “%s”:\n"
+"'%s' is not a valid depth; try 'exclude', 'empty', 'files', 'immediates', or "
+"'infinity'"
+msgstr "“%s” 不是有效的深度；尝试 “exclude”，“empty”，“files”，“immediates”，或 “infinity”"
 
-#: ../svn/notify.c:891
+#: ../svn/svn.c:2161
 #, c-format
-msgid ""
-"--- Reverse-merging (from foreign repository) r%ld through r%ld into '%s':\n"
-msgstr "--- 正在反向合并(从外部版本库) r%ld，经由 r%ld，到 “%s”:\n"
+msgid "Syntax error in native-eol argument '%s'"
+msgstr "原生换行符号参数 “%s” 中有语法错误"
 
-#: ../svn/notify.c:927
-#, c-format
-msgid "property '%s' set on '%s'\n"
-msgstr "设置属性 “%s” 于 “%s”\n"
+#: ../svn/svn.c:2181
+msgid "Changelist names must not be empty"
+msgstr "修改列表的名称不能为空"
 
-#: ../svn/notify.c:935
+#: ../svn/svn.c:2215
 #, c-format
-msgid "property '%s' deleted from '%s'.\n"
-msgstr "删除属性 “%s” 于 “%s”。\n"
+msgid "'%s' is not a valid --accept value"
+msgstr "“%s” 是非法 --accept 取值"
 
-#: ../svn/notify.c:943
+#: ../svn/svn.c:2223
 #, c-format
-msgid "Attempting to delete nonexistent property '%s' on '%s'\n"
-msgstr "试图删除不存在的属性“%s”于“%s”\n"
+msgid "'%s' is not a valid --show-revs value"
+msgstr "“%s” 是非法 --show-revs 取值"
 
-#: ../svn/notify.c:952
+#: ../svn/svn.c:2235
 #, c-format
-msgid "property '%s' set on repository revision %ld\n"
-msgstr "设定属性 “%s” 于版本库版本 %ld\n"
+msgid "Invalid strip count '%s'"
+msgstr "无效修剪计数 '%s'"
 
-#: ../svn/notify.c:960
-#, c-format
-msgid "property '%s' deleted from repository revision %ld\n"
-msgstr "删除属性 “%s” 于版本库版本 %ld\n"
+#: ../svn/svn.c:2241
+msgid "Argument to --strip must be positive"
+msgstr "--strip 参数的取值必须为正"
 
-#: ../svn/notify.c:967
-#, c-format
-msgid "Upgraded '%s'\n"
-msgstr "已升级的“%s”\n"
+#: ../svn/svn.c:2296 ../svnmucc/svnmucc.c:1208 ../svnrdump/svnrdump.c:993
+#: ../svnsync/svnsync.c:2096
+msgid "--non-interactive and --force-interactive are mutually exclusive"
+msgstr "--non-interactive 与 --force-interactive 是互斥的"
 
-#: ../svn/notify.c:973
+#: ../svn/svn.c:2350 ../svndumpfilter/svndumpfilter.c:1510
+#: ../svnlook/svnlook.c:2667
 #, c-format
-msgid "Redirecting to URL '%s':\n"
-msgstr "正在重定向到 URL '%s':\n"
+msgid "Subcommand argument required\n"
+msgstr "必须提供子命令参数\n"
 
-#: ../svn/propdel-cmd.c:88
+#: ../svn/svn.c:2367 ../svnadmin/svnadmin.c:2220
+#: ../svndumpfilter/svndumpfilter.c:1530 ../svnlook/svnlook.c:2686
+#: ../svnrdump/svnrdump.c:1039
 #, c-format
-msgid "Cannot specify revision for deleting versioned property '%s'"
-msgstr "删除纳入版本控制的属性 “%s” 时不可指定版本"
+msgid "Unknown subcommand: '%s'\n"
+msgstr "未知子命令: “%s”\n"
 
-#: ../svn/propedit-cmd.c:62 ../svn/propedit-cmd.c:336
+#: ../svn/svn.c:2376
 #, c-format
-msgid "Set new value for property '%s' on '%s'\n"
-msgstr "属性 “%s” 于 “%s” 被设为新值\n"
-
-#: ../svn/propedit-cmd.c:92 ../svn/propset-cmd.c:94
 msgid ""
-"--encoding option applies only to textual Subversion-controlled properties"
-msgstr "--encoding 选项只能用于 Subversion 的文本属性"
-
-#: ../svn/propedit-cmd.c:158
-#, c-format
-msgid "Set new value for property '%s' on revision %ld\n"
-msgstr "属性 “%s” 于版本 %ld 被设为新值\n"
+"Undo is done using either the 'svn revert' or the 'svn merge' command.\n"
+msgstr ""
 
-#: ../svn/propedit-cmd.c:164
+#: ../svn/svn.c:2411
 #, c-format
-msgid "No changes to property '%s' on revision %ld\n"
-msgstr "属性 “%s” 于版本 %ld 没有改变\n"
+msgid ""
+"Subcommand '%s' doesn't accept option '%s'\n"
+"Type 'svn help %s' for usage.\n"
+msgstr ""
+"子命令“%s”不接受选项“%s”\n"
+"输入“svn help %s”得到用法。\n"
 
-#: ../svn/propedit-cmd.c:172
-#, c-format
-msgid "Cannot specify revision for editing versioned property '%s'"
-msgstr "编辑纳入版本控制的属性 “%s” 时不可指定版本"
+#: ../svn/svn.c:2425
+msgid ""
+"Multiple revision arguments encountered; can't specify -c twice, or both -c "
+"and -r"
+msgstr "遇到了多个版本参数；不能指定 -c 两次或者同时使用 -c 和 -r"
 
-#: ../svn/propedit-cmd.c:200 ../svn/propset-cmd.c:169
-msgid "Explicit target argument required"
-msgstr "必须明确地提供目标参数"
+#: ../svn/svn.c:2437
+msgid "--depth and --set-depth are mutually exclusive"
+msgstr "--depth 与 --set-depth 是互斥的"
 
-#: ../svn/propedit-cmd.c:270
-#, c-format
-msgid "'%s' does not appear to be a working copy path"
-msgstr "“%s”不像是工作副本路径"
+#: ../svn/svn.c:2447
+msgid "--with-all-revprops and --with-no-revprops are mutually exclusive"
+msgstr "--with-all-revprops 与 --with-no-revprops 是互斥的"
 
-#: ../svn/propedit-cmd.c:343
-#, c-format
-msgid "No changes to property '%s' on '%s'\n"
-msgstr "属性 “%s” 于 “%s” 没有改变\n"
+#: ../svn/svn.c:2457
+msgid "--with-revprop and --with-no-revprops are mutually exclusive"
+msgstr "--with-revprop 与 --with-no-revprops 是互斥的"
 
-#: ../svn/propget-cmd.c:65
-msgid "Error writing to stream"
-msgstr "写入流出错"
+#: ../svn/svn.c:2470
+msgid "--message (-m) and --file (-F) are mutually exclusive"
+msgstr "--message (-m) 与 --file (-F) 是互斥的"
 
-#: ../svn/propget-cmd.c:151 ../svn/proplist-cmd.c:100
-#, c-format
-msgid "Properties on '%s':\n"
-msgstr "“%s” 上的属性:\n"
+#: ../svn/svn.c:2479 ../svnmucc/svnmucc.c:1219 ../svnrdump/svnrdump.c:1098
+#: ../svnsync/svnsync.c:2147
+msgid "--trust-server-cert requires --non-interactive"
+msgstr "--trust-server-cert 需要 --non-interactive"
 
-#: ../svn/propget-cmd.c:208
-msgid "--verbose cannot be used with --revprop or --strict or --xml"
-msgstr "--verbose 不能与 --revprop， --strict 或 --xml 共存"
+#: ../svn/svn.c:2489
+msgid "--diff-cmd and --internal-diff are mutually exclusive"
+msgstr "--diff-cmd 与 --internal-diff 是互斥的"
 
-#: ../svn/propget-cmd.c:301
-msgid ""
-"Strict output of property values only available for single-target, non-"
-"recursive propget operations"
-msgstr "精确的输出属性值只适用于单一目标的非递归操作 propget"
+#: ../svn/svn.c:2531
+msgid "--relocate and --depth are mutually exclusive"
+msgstr "--relocate 与 --depth 是互斥的"
 
-#: ../svn/proplist-cmd.c:161
-#, c-format
-msgid "Unversioned properties on revision %ld:\n"
-msgstr "版本 %ld 上的未纳入版本控制的属性:\n"
+#: ../svn/svn.c:2539
+msgid "--relocate and --non-recursive (-N) are mutually exclusive"
+msgstr "--relocate 与 --non-recursive (-N) 是互斥的"
 
-#: ../svn/proplist-cmd.c:234
-msgid ""
-"Could not display properties of all targets because some targets don't exist"
-msgstr "因为一些目标不存在，所以不能显示全部目标的属性"
+#: ../svn/svn.c:2661
+msgid "Log message file is a versioned file; use '--force-log' to override"
+msgstr "日志信息文件受版本控制；请使用 “--force-log” 强制执行"
 
-#: ../svn/proplist-cmd.c:239
-msgid ""
-"Could not display properties of all targets because some targets are not "
-"versioned"
-msgstr "因为一些目标没有版本化，所以不能显示全部目标的属性"
+#: ../svn/svn.c:2668
+msgid "Lock comment file is a versioned file; use '--force-log' to override"
+msgstr "锁注释文件受版本控制；请使用 “--force-log” 强制执行"
 
-#: ../svn/props.c:63
+#: ../svn/svn.c:2689
 msgid ""
-"Must specify the revision as a number, a date or 'HEAD' when operating on a "
-"revision property"
-msgstr "操作版本属性时，必须指定数字、日期形式的版本号或“HEAD”。"
+"The log message is a pathname (was -F intended?); use '--force-log' to "
+"override"
+msgstr "日志信息是路径名称 (本来想用 -F 选项的吗？)；请使用“--force-log”强制执行"
 
-#: ../svn/props.c:70
-msgid "Wrong number of targets specified"
-msgstr "指定的目标数目错误"
+#: ../svn/svn.c:2696
+msgid ""
+"The lock comment is a pathname (was -F intended?); use '--force-log' to "
+"override"
+msgstr "锁注释是路径名称 (本来想用-F 选项的吗？)；请使用“--force-log”强制执行"
 
-#: ../svn/props.c:79
-msgid "Either a URL or versioned item is required"
-msgstr "必须提供URL或纳入版本控制的项目"
+#: ../svn/svn.c:2720
+msgid "--auto-props and --no-auto-props are mutually exclusive"
+msgstr "--auto-props 与 --no-auto-props 是互斥的"
 
-#: ../svn/props.c:217
+#: ../svn/svn.c:2825 ../svn/svn.c:2832
 #, c-format
-msgid ""
-"To turn off the %s property, use 'svn propdel';\n"
-"setting the property to '%s' will not turn it off."
-msgstr ""
-"使用 “svn propdel” 关闭属性 %s；\n"
-"设置属性为 “%s” 不会关闭它。"
+msgid "--accept=%s incompatible with --non-interactive"
+msgstr "--accept=%s 与 --non-interactive 不兼容"
 
-#: ../svn/propset-cmd.c:129
+#: ../svn/svn.c:2888
 #, c-format
-msgid "Cannot specify revision for setting versioned property '%s'"
-msgstr "设置受版本控制的属性 “%s” 时不能指定版本"
+msgid "Try 'svn help %s' for more information"
+msgstr "请使用 “svn help %s” 以得到更多信息"
 
-#: ../svn/propset-cmd.c:162
-#, c-format
-msgid "Explicit target required ('%s' interpreted as prop value)"
-msgstr "必须明确地提供目的 (“%s”解释为属性内容)"
+#: ../svn/svn.c:2894
+msgid "Please see the 'svn upgrade' command"
+msgstr "请参阅命令 'svn upgrade'"
 
-#: ../svn/resolve-cmd.c:80
-msgid "missing --accept option"
-msgstr "缺少选项 --accept"
+#: ../svn/svn.c:2900 ../svnmucc/svnmucc.c:1457 ../svnrdump/svnrdump.c:1175
+msgid ""
+"Authentication failed and interactive prompting is disabled; see the --force-"
+"interactive option"
+msgstr ""
 
-#: ../svn/resolve-cmd.c:83
-msgid "invalid 'accept' ARG"
-msgstr "无效的 “accept” 参数"
+#: ../svn/svn.c:2905
+msgid ""
+"Reading file from standard input because of -F option; this can interfere "
+"with interactive prompting"
+msgstr ""
 
-#: ../svn/revert-cmd.c:77
-msgid "Try 'svn revert --depth infinity' instead?"
-msgstr "尝试 “svn revert --depth infinity”？"
+#: ../svn/svn.c:2916
+msgid ""
+"Run 'svn cleanup' to remove locks (type 'svn help cleanup' for details)"
+msgstr "运行“svn cleanup”删除锁 (运行“svn help cleanup”以得到详细信息)"
 
-#: ../svn/status-cmd.c:380
-#, c-format
+#: ../svn/svn.c:2923
 msgid ""
-"\n"
-"--- Changelist '%s':\n"
+"Another process is blocking the working copy database, or the underlying "
+"filesystem does not support file locking; if the working copy is on a "
+"network filesystem, make sure file locking has been enabled on the file "
+"server"
+msgstr ""
+
+#: ../svn/svn.c:2936
+msgid ""
+"When using svn+ssh:// URLs, keep in mind that the --username and --password "
+"options are ignored because authentication is performed by SSH, not "
+"Subversion"
 msgstr ""
-"\n"
-"--- 修改列表 '%s':\n"
 
 #: ../svn/switch-cmd.c:63
 #, c-format
 msgid "'%s' to '%s' is not a valid relocation"
 msgstr "“%s”到“%s”不是有效的重定位"
 
-#: ../svn/switch-cmd.c:169
+#: ../svn/switch-cmd.c:170
 #, c-format
 msgid ""
 "Path '%s' does not share common version control ancestry with the requested "
 "switch location.  Use --ignore-ancestry to disable this check."
 msgstr "路径“%s”与请求的切换位置没有共同的祖先。使用 --ignore-ancestry 可以禁用此检查。"
 
-#: ../svn/tree-conflicts.c:38 ../svn/tree-conflicts.c:58
-msgid "edit"
-msgstr "编辑"
-
-#: ../svn/tree-conflicts.c:39 ../svn/tree-conflicts.c:59
-msgid "delete"
-msgstr "删除"
-
-#: ../svn/tree-conflicts.c:40 ../svn/tree-conflicts.c:62
-msgid "add"
-msgstr "增加"
-
-#: ../svn/tree-conflicts.c:41 ../svn/tree-conflicts.c:63
-msgid "replace"
-msgstr "替换"
-
-#: ../svn/tree-conflicts.c:60
-msgid "missing"
-msgstr "失踪"
-
-#: ../svn/tree-conflicts.c:61
-msgid "obstruction"
-msgstr "阻塞"
-
-#: ../svn/tree-conflicts.c:64
-msgid "unversioned"
-msgstr "未版本控制"
-
-#: ../svn/tree-conflicts.c:107
-#, c-format
-msgid "local %s, incoming %s upon %s"
-msgstr "本地 %s，动作 %s，操作 %s"
+#: ../svn/switch-cmd.c:180
+msgid ""
+"'svn switch' does not support switching a working copy to a different "
+"repository"
+msgstr "“svn switch”不支持将工作副本切换到不同的版本库"
 
-#: ../svn/update-cmd.c:59
+#: ../svn/update-cmd.c:93
 #, c-format
 msgid "Summary of updates:\n"
 msgstr "更新概要：\n"
 
-#. Print an update summary for this target, removing the current
-#. working directory prefix from PATH (if PATH is at or under
-#. $CWD), and converting the path to local style for display.
-#: ../svn/update-cmd.c:90
+#: ../svn/update-cmd.c:97
 #, c-format
 msgid "  Updated '%s' to r%ld.\n"
 msgstr "  更新 '%s' 到版本 %ld。\n"
 
-#: ../svn/util.c:76
+#: ../svn/util.c:79
 #, c-format
 msgid ""
 "\n"
@@ -11191,11 +12395,11 @@
 "\n"
 "提交后的版本为 %ld%s。\n"
 
-#: ../svn/util.c:80
+#: ../svn/util.c:83
 msgid " (the answer to life, the universe, and everything)"
 msgstr " (生命，宇宙，和一切的答案)"
 
-#: ../svn/util.c:89
+#: ../svn/util.c:92
 #, c-format
 msgid ""
 "\n"
@@ -11204,93 +12408,49 @@
 "\n"
 "警告: %s\n"
 
-#: ../svn/util.c:149
-msgid ""
-"The EDITOR, SVN_EDITOR or VISUAL environment variable or 'editor-cmd' run-"
-"time configuration option is empty or consists solely of whitespace. "
-"Expected a shell command."
-msgstr ""
-"环境变量 EDITOR，SVN_EDITOR，或 VISUAL；或者运行时配置选项 “editor-cmd” "
-"为空或取值包含了不加引号的空格。期望外壳命令。"
-
-#: ../svn/util.c:156
-msgid ""
-"None of the environment variables SVN_EDITOR, VISUAL or EDITOR are set, and "
-"no 'editor-cmd' run-time configuration option was found"
-msgstr "没有设置 SVN_EDITOR，VISUAL 或 EDITOR 环境变量，运行时的配置参数中也没有 “editor-cmd” 选项"
-
-#: ../svn/util.c:184 ../svn/util.c:345
-#, c-format
-msgid "Can't get working directory"
-msgstr "无法取得工作目录"
-
-#: ../svn/util.c:195 ../svn/util.c:356 ../svn/util.c:381
-#, c-format
-msgid "Can't change working directory to '%s'"
-msgstr "无法改变工作目录到“%s”"
-
-#: ../svn/util.c:203 ../svn/util.c:528
-#, c-format
-msgid "Can't restore working directory"
-msgstr "无法还原工作目录"
-
-#: ../svn/util.c:210 ../svn/util.c:463
-#, c-format
-msgid "system('%s') returned %d"
-msgstr "system('%s') 返回 %d"
-
-#: ../svn/util.c:250
+#: ../svn/util.c:133
 msgid ""
 "The SVN_MERGE environment variable is empty or consists solely of "
 "whitespace. Expected a shell command.\n"
 msgstr "环境变量 SVN_MERGE 没有设置或者由空白组成。期望外壳命令。\n"
 
-#: ../svn/util.c:256
+#: ../svn/util.c:139
 msgid ""
 "The environment variable SVN_MERGE and the merge-tool-cmd run-time "
 "configuration option were not set.\n"
 msgstr "环境变量 SVN_MERGE 没有设置，运行时的配置中也没有设置 “merge-tool-cmd”。\n"
 
-#: ../svn/util.c:286
+#: ../svn/util.c:169
 #, c-format
 msgid "The external merge tool exited with exit code %d"
 msgstr "外部合并工具已经退出，代码是 %d"
 
-#: ../svn/util.c:408
-#, c-format
-msgid "Can't write to '%s'"
-msgstr "无法写入“%s”"
-
-#: ../svn/util.c:497
-msgid "Error normalizing edited contents to internal format"
-msgstr "将编辑内容规格化为内部格式出错"
-
-#: ../svn/util.c:570
+#: ../svn/util.c:211
 msgid "Log message contains a zero byte"
 msgstr "日志信息中有一个零字节"
 
-#: ../svn/util.c:629
+#: ../svn/util.c:269
 #, c-format
 msgid "   '%s'"
 msgstr "   '%s'"
 
-#: ../svn/util.c:633
+#: ../svn/util.c:273
 msgid "Your commit message was left in a temporary file:"
 msgstr "您的提交信息保留在临时文件中:"
 
-#: ../svn/util.c:685
+#: ../svn/util.c:325
 msgid "--This line, and those below, will be ignored--"
 msgstr "--此行及以下内容将会被忽略--"
 
-#: ../svn/util.c:720
+#: ../svn/util.c:360
 msgid "Error normalizing log message to internal format"
 msgstr "将日志内容规格化为内部格式出错"
 
-#: ../svn/util.c:807
+#: ../svn/util.c:447 ../svnmucc/svnmucc.c:764
 msgid "Cannot invoke editor to get log message when non-interactive"
 msgstr "在非交互式环境中不能调用编辑器获得日志信息"
 
-#: ../svn/util.c:820
+#: ../svn/util.c:460
 msgid ""
 "Could not use external editor to fetch log message; consider setting the "
 "$SVN_EDITOR environment variable or using the --message (-m) or --file (-F) "
@@ -11298,7 +12458,7 @@
 msgstr ""
 "无法使用外部编辑器获得日志信息；考虑设置环境变量 $SVN_EDITOR，或者使用 --message (-m) 或 --file (-F) 选项"
 
-#: ../svn/util.c:856
+#: ../svn/util.c:496
 msgid ""
 "\n"
 "Log message unchanged or not specified\n"
@@ -11308,135 +12468,130 @@
 "日志信息未修改，或未指定\n"
 "a)终止，c)继续，e)编辑：\n"
 
-#: ../svn/util.c:909
+#: ../svn/util.c:549
 msgid ""
 "Use --force to override this restriction (local modifications may be lost)"
 msgstr "请使用 --force 选项强制执行(可能会丢失本地修改)"
 
-#: ../svn/util.c:1098 ../svn/util.c:1131
+#: ../svn/util.c:738 ../svn/util.c:771
 msgid "none"
 msgstr "无"
 
-#: ../svn/util.c:1099
+#: ../svn/util.c:739
 msgid "file"
 msgstr "文件"
 
-#: ../svn/util.c:1100
+#: ../svn/util.c:740
 msgid "dir"
 msgstr "目录"
 
-#: ../svn/util.c:1132
+#: ../svn/util.c:772
 msgid "update"
 msgstr "更新"
 
-#: ../svn/util.c:1133
+#: ../svn/util.c:773
 msgid "switch"
 msgstr "切换"
 
-#: ../svn/util.c:1134
-msgid "merge"
-msgstr "合并"
-
-#: ../svn/util.c:1256
+#: ../svn/util.c:896
 msgid "(invalid date)"
 msgstr "(非法日期)"
 
-#: ../svnadmin/main.c:208 ../svnrdump/svnrdump.c:116
+#: ../svn/util.c:1056
+#, c-format
+msgid ""
+"svn: warning: '%s' is a binary mime-type but file '%s' looks like text; "
+"diff, merge, blame, and other operations will stop working on this file\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:217 ../svnrdump/svnrdump.c:120
 msgid "specify revision number ARG (or X:Y range)"
 msgstr "指定版本 ARG (或 X:Y 范围)"
 
-#: ../svnadmin/main.c:211 ../svnrdump/svnrdump.c:120
-msgid "dump incrementally"
-msgstr "以增量方式进行转存"
+#: ../svnadmin/svnadmin.c:220 ../svnlook/svnlook.c:162
+msgid "specify transaction name ARG"
+msgstr "指定事务名称 ARG"
+
+#: ../svnadmin/svnadmin.c:223
+msgid "dump or hotcopy incrementally"
+msgstr "以增量方式进行转存或热复制"
 
-#: ../svnadmin/main.c:214
+#: ../svnadmin/svnadmin.c:226
 msgid "use deltas in dump output"
 msgstr "在转存输出中使用差异"
 
-#: ../svnadmin/main.c:217
+#: ../svnadmin/svnadmin.c:229
 msgid "bypass the repository hook system"
 msgstr "跳过版本库钩子系统"
 
-#: ../svnadmin/main.c:220
+#: ../svnadmin/svnadmin.c:232
 msgid "bypass property validation logic"
 msgstr "跳过属性校验逻辑"
 
-#: ../svnadmin/main.c:223 ../svnlook/main.c:186 ../svnrdump/svnrdump.c:118
-#: ../svnserve/main.c:255 ../svnversion/main.c:142
+#: ../svnadmin/svnadmin.c:235 ../svnlook/svnlook.c:193
+#: ../svnrdump/svnrdump.c:122 ../svnserve/svnserve.c:289
+#: ../svnversion/svnversion.c:143
 msgid "no progress (only errors) to stderr"
 msgstr "在标准错误输出不显示进度 (仅错误)"
 
-#: ../svnadmin/main.c:226
+#: ../svnadmin/svnadmin.c:238
 msgid "ignore any repos UUID found in the stream"
 msgstr "忽略所有流中的版本库 UUID"
 
-#: ../svnadmin/main.c:229
+#: ../svnadmin/svnadmin.c:241
 msgid "set repos UUID to that found in stream, if any"
 msgstr "如果流中存在UUID,则设定为版本库的 UUID"
 
-#: ../svnadmin/main.c:232
+#: ../svnadmin/svnadmin.c:244
 msgid "type of repository: 'fsfs' (default) or 'bdb'"
 msgstr "版本库类型: “fsfs”(默认)或“bdb”"
 
-#: ../svnadmin/main.c:235
+#: ../svnadmin/svnadmin.c:247
 msgid "load at specified directory in repository"
 msgstr "加载到版本库指定的目录中"
 
-#: ../svnadmin/main.c:238
+#: ../svnadmin/svnadmin.c:250
 msgid "disable fsync at transaction commit [Berkeley DB]"
 msgstr "在提交事务时禁用fsync [BDB]"
 
-#: ../svnadmin/main.c:241
+#: ../svnadmin/svnadmin.c:253
 msgid "disable automatic log file removal [Berkeley DB]"
 msgstr "禁用自动删除日志文件 [BDB]"
 
-#: ../svnadmin/main.c:247
+#: ../svnadmin/svnadmin.c:259
 msgid ""
 "remove redundant Berkeley DB log files\n"
 "                             from source repository [Berkeley DB]"
 msgstr "删除源版本库中多余的BDB日志文件 [BDB]"
 
-#: ../svnadmin/main.c:251
+#: ../svnadmin/svnadmin.c:263
 msgid "call pre-commit hook before committing revisions"
 msgstr "提交版本前调用 pre-commit 钩子"
 
-#: ../svnadmin/main.c:254
+#: ../svnadmin/svnadmin.c:266
 msgid "call post-commit hook after committing revisions"
 msgstr "提交版本后调用 post-commit 钩子"
 
-#: ../svnadmin/main.c:257
+#: ../svnadmin/svnadmin.c:269
 msgid "call hook before changing revision property"
 msgstr "修改属性前调用钩子"
 
-#: ../svnadmin/main.c:260
+#: ../svnadmin/svnadmin.c:272
 msgid "call hook after changing revision property"
 msgstr "修改属性后调用钩子"
 
-#: ../svnadmin/main.c:263
+#: ../svnadmin/svnadmin.c:275
 msgid ""
 "wait instead of exit if the repository is in\n"
 "                             use by another process"
 msgstr "如果版本库被其他进程占用，等待而不直接退出"
 
-#: ../svnadmin/main.c:267
-msgid ""
-"use format compatible with Subversion versions\n"
-"                             earlier than 1.4"
-msgstr "使用与1.4之前版本兼容的格式"
-
-#: ../svnadmin/main.c:271
-msgid ""
-"use format compatible with Subversion versions\n"
-"                             earlier than 1.5"
-msgstr "使用 Subversion 1.5 之前版本的格式"
-
-#: ../svnadmin/main.c:275
-msgid ""
-"use format compatible with Subversion versions\n"
-"                             earlier than 1.6"
-msgstr "使用与 1.6 之前版本兼容的格式"
+#: ../svnadmin/svnadmin.c:279 ../svnadmin/svnadmin.c:282
+#: ../svnadmin/svnadmin.c:285
+msgid "deprecated; see --compatible-version"
+msgstr "已经淘汰; 参见 --compatible-version"
 
-#: ../svnadmin/main.c:279
+#: ../svnadmin/svnadmin.c:288
 msgid ""
 "size of the extra in-memory cache in MB used to\n"
 "                             minimize redundant operations. Default: 16.\n"
@@ -11446,7 +12601,17 @@
 "                             默认值: 16。\n"
 "                             [仅用于 FSFS 仓库]"
 
-#: ../svnadmin/main.c:293
+#: ../svnadmin/svnadmin.c:293
+msgid ""
+"use repository format compatible with Subversion\n"
+"                             version ARG (\"1.5.5\", \"1.7\", etc.)"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:296
+msgid "read repository paths from file ARG"
+msgstr "从文件 ARG 读取版本库路径"
+
+#: ../svnadmin/svnadmin.c:308
 msgid ""
 "usage: svnadmin crashtest REPOS_PATH\n"
 "\n"
@@ -11457,7 +12622,7 @@
 "\n"
 "打开位于 REPOS_PATH 的版本库, 然后终止, 从而模拟一个持有版本库句柄进程的崩溃。\n"
 
-#: ../svnadmin/main.c:299
+#: ../svnadmin/svnadmin.c:314
 msgid ""
 "usage: svnadmin create REPOS_PATH\n"
 "\n"
@@ -11467,7 +12632,7 @@
 "\n"
 "在 REPOS_PATH 创建一个新的空版本库。\n"
 
-#: ../svnadmin/main.c:307
+#: ../svnadmin/svnadmin.c:323
 msgid ""
 "usage: svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH\n"
 "\n"
@@ -11482,7 +12647,7 @@
 "在指定的版本范围中，对其中变动的路径增量计算。借助只储存与以前版本的差异，\n"
 "它本质上可压缩版本库。如果没有指定版本则直接对 HEAD 版本进行。\n"
 
-#: ../svnadmin/main.c:316
+#: ../svnadmin/svnadmin.c:332
 msgid ""
 "usage: svnadmin dump REPOS_PATH [-r LOWER[:UPPER] [--incremental]]\n"
 "\n"
@@ -11504,7 +12669,19 @@
 "第一个转存的版本只描述它改变的路径；否则它会描述此版本在版本库中涉及到的每个\n"
 "路径。(在任何情况下，第二个以及后续的版本，只描述这些版本改变的路径。)\n"
 
-#: ../svnadmin/main.c:329
+#: ../svnadmin/svnadmin.c:345
+msgid ""
+"usage: 1. svnadmin freeze REPOS_PATH PROGRAM [ARG...]\n"
+"               2. svnadmin freeze -F FILE PROGRAM [ARG...]\n"
+"\n"
+"1. Run PROGRAM passing ARGS while holding a write-lock on REPOS_PATH.\n"
+"\n"
+"2. Like 1 except all repositories listed in FILE are locked. The file\n"
+"   format is repository paths separated by newlines.  Repositories are\n"
+"   locked in the same order as they are listed in the file.\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:355
 msgid ""
 "usage: svnadmin help [SUBCOMMAND...]\n"
 "\n"
@@ -11514,17 +12691,17 @@
 "\n"
 "显示本程序或其子命令的用法。\n"
 
-#: ../svnadmin/main.c:334
+#: ../svnadmin/svnadmin.c:360
 msgid ""
 "usage: svnadmin hotcopy REPOS_PATH NEW_REPOS_PATH\n"
 "\n"
-"Makes a hot copy of a repository.\n"
+"Make a hot copy of a repository.\n"
+"If --incremental is passed, data which already exists at the destination\n"
+"is not copied again.  Incremental mode is implemented for FSFS "
+"repositories.\n"
 msgstr ""
-"用法: svnadmin hotcopy REPOS_PATH NEW_REPOS_PATH\n"
-"\n"
-"产生版本库的即时副本。\n"
 
-#: ../svnadmin/main.c:339
+#: ../svnadmin/svnadmin.c:367
 msgid ""
 "usage: svnadmin list-dblogs REPOS_PATH\n"
 "\n"
@@ -11539,7 +12716,7 @@
 "\n"
 "警告: 修改或删除仍在使用中的记录文件将导致版本库损坏。\n"
 
-#: ../svnadmin/main.c:346
+#: ../svnadmin/svnadmin.c:374
 msgid ""
 "usage: svnadmin list-unused-dblogs REPOS_PATH\n"
 "\n"
@@ -11551,7 +12728,7 @@
 "列出无用的BDB日志文件。\n"
 "\n"
 
-#: ../svnadmin/main.c:351
+#: ../svnadmin/svnadmin.c:379
 msgid ""
 "usage: svnadmin load REPOS_PATH\n"
 "\n"
@@ -11559,14 +12736,26 @@
 "new revisions into the repository's filesystem.  If the repository\n"
 "was previously empty, its UUID will, by default, be changed to the\n"
 "one specified in the stream.  Progress feedback is sent to stdout.\n"
+"If --revision is specified, limit the loaded revisions to only those\n"
+"in the dump stream whose revision numbers match the specified range.\n"
 msgstr ""
 "用法: svnadmin load REPOS_PATH\n"
 "\n"
 "从标准输入读取“转存”格式的流，将新的版本提交至版本库的文件\n"
 "系统中。如果版本库原先是空的，默认会将其 UUID 以流中的数值代替。\n"
-"进度报告会送至标准输出。\n"
+"进度报告会送至标准输出。如果使用了 --revision，那么就只加载转存\n"
+"流中与指定范围一致的版本。\n"
+
+#: ../svnadmin/svnadmin.c:391
+msgid ""
+"usage: svnadmin lock REPOS_PATH PATH USERNAME COMMENT-FILE [TOKEN]\n"
+"\n"
+"Lock PATH by USERNAME setting comments from COMMENT-FILE.\n"
+"If provided, use TOKEN as lock token.  Use --bypass-hooks to avoid\n"
+"triggering the pre-lock and post-lock hook scripts.\n"
+msgstr ""
 
-#: ../svnadmin/main.c:361
+#: ../svnadmin/svnadmin.c:398
 msgid ""
 "usage: svnadmin lslocks REPOS_PATH [PATH-IN-REPOS]\n"
 "\n"
@@ -11578,7 +12767,7 @@
 "显示位于 PATH-IN-REPOS 或其子孙上的所有锁的描述(如果没有提供 PATH-IN-REPOS，\n"
 "那么显示版本库根的信息)。\n"
 
-#: ../svnadmin/main.c:367
+#: ../svnadmin/svnadmin.c:404
 msgid ""
 "usage: svnadmin lstxns REPOS_PATH\n"
 "\n"
@@ -11588,7 +12777,7 @@
 "\n"
 "显示所有未提交事务的名称。\n"
 
-#: ../svnadmin/main.c:372
+#: ../svnadmin/svnadmin.c:409
 msgid ""
 "usage: svnadmin pack REPOS_PATH\n"
 "\n"
@@ -11600,7 +12789,7 @@
 "使用更有效的存储模型压缩版本库。\n"
 "它可能不适用于所有的版本库，此时直接结束。\n"
 
-#: ../svnadmin/main.c:378
+#: ../svnadmin/svnadmin.c:415
 msgid ""
 "usage: svnadmin recover REPOS_PATH\n"
 "\n"
@@ -11614,7 +12803,7 @@
 "对版本库运行修复程序。当你遇到应当执行修复的错误指示时，请执行此命令。\n"
 "修复 Berkeley DB 需要独占访问，如果版本库被其它进程使用，它会立即退出。\n"
 
-#: ../svnadmin/main.c:386
+#: ../svnadmin/svnadmin.c:423
 msgid ""
 "usage: svnadmin rmlocks REPOS_PATH LOCKED_PATH...\n"
 "\n"
@@ -11624,7 +12813,7 @@
 "\n"
 "无条件地从每个 LOCKED_PATH 删除锁。\n"
 
-#: ../svnadmin/main.c:391
+#: ../svnadmin/svnadmin.c:428
 msgid ""
 "usage: svnadmin rmtxns REPOS_PATH TXN_NAME...\n"
 "\n"
@@ -11634,7 +12823,7 @@
 "\n"
 "从版本库删除命名事务。\n"
 
-#: ../svnadmin/main.c:396
+#: ../svnadmin/svnadmin.c:433
 msgid ""
 "usage: svnadmin setlog REPOS_PATH -r REVISION FILE\n"
 "\n"
@@ -11656,7 +12845,7 @@
 "\n"
 "  注意: 修订属性并未纳入版本管理，所以这个命令会覆盖以前的属性取值。\n"
 
-#: ../svnadmin/main.c:408
+#: ../svnadmin/svnadmin.c:445
 msgid ""
 "usage: svnadmin setrevprop REPOS_PATH -r REVISION NAME FILE\n"
 "\n"
@@ -11677,7 +12866,7 @@
 "\n"
 "  注意: 修订属性并未纳入版本管理，所以这个命令会覆盖以前的属性取值。\n"
 
-#: ../svnadmin/main.c:419
+#: ../svnadmin/svnadmin.c:456
 msgid ""
 "usage: svnadmin setuuid REPOS_PATH [NEW_UUID]\n"
 "\n"
@@ -11690,7 +12879,16 @@
 "重置位于 REPOS_PATH 的版本库 UUID。如果提供 NEW_UUID，那么它就成为版本库的\n"
 "新 UUID；否则就为版本库生成一个新的 UUID。\n"
 
-#: ../svnadmin/main.c:426
+#: ../svnadmin/svnadmin.c:463
+msgid ""
+"usage: svnadmin unlock REPOS_PATH LOCKED_PATH USERNAME TOKEN\n"
+"\n"
+"Unlock LOCKED_PATH (as USERNAME) after verifying that the token\n"
+"associated with the lock matches TOKEN.  Use --bypass-hooks to avoid\n"
+"triggering the pre-unlock and post-unlock hook scripts.\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:470
 msgid ""
 "usage: svnadmin upgrade REPOS_PATH\n"
 "\n"
@@ -11714,50 +12912,78 @@
 "提下执行最少的工作来完成升级。它不担保版本库的状态与导出后加载的升级方\n"
 "案一样最优化。\n"
 
-#: ../svnadmin/main.c:439
+#: ../svnadmin/svnadmin.c:483
 msgid ""
 "usage: svnadmin verify REPOS_PATH\n"
 "\n"
-"Verifies the data stored in the repository.\n"
+"Verify the data stored in the repository.\n"
 msgstr ""
 "用法: svnadmin verify REPOS_PATH\n"
 "\n"
 "校验版本库中的数据。\n"
 
-#: ../svnadmin/main.c:498
+#: ../svnadmin/svnadmin.c:545
 msgid "Invalid revision specifier"
 msgstr "无效的版本说明"
 
-#: ../svnadmin/main.c:502
+#: ../svnadmin/svnadmin.c:549
 #, c-format
 msgid "Revisions must not be greater than the youngest revision (%ld)"
 msgstr "版本号不能大于最新的版本号(%ld)"
 
-#: ../svnadmin/main.c:644 ../svnadmin/main.c:902
+#: ../svnadmin/svnadmin.c:656
+#, c-format
+msgid ""
+"%swarning: The \"%s\" repository back-end is deprecated, consider using "
+"\"%s\" instead.\n"
+msgstr "%s警告: “%s”版本库后端已经淘汰，请考虑使用“%s”来代替。\n"
+
+#: ../svnadmin/svnadmin.c:696
+msgid "Repositories compatible with 1.0.x must use --fs-type=bdb"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:739 ../svnadmin/svnadmin.c:1011
+#: ../svnadmin/svnadmin.c:1192
 msgid "First revision cannot be higher than second"
 msgstr "第一个版本不可大于第二个"
 
-#: ../svnadmin/main.c:653
+#: ../svnadmin/svnadmin.c:748
 #, c-format
 msgid "Deltifying revision %ld..."
 msgstr "正在计算版本 %ld 差异..."
 
-#: ../svnadmin/main.c:657 ../svnadmin/main.c:708 ../svnadmin/main.c:724
+#: ../svnadmin/svnadmin.c:752 ../svnadmin/svnadmin.c:812
+#: ../svnadmin/svnadmin.c:827
 #, c-format
 msgid "done.\n"
 msgstr "完成。\n"
 
-#: ../svnadmin/main.c:701
+#: ../svnadmin/svnadmin.c:793
+#, c-format
+msgid "* Verifying repository metadata ...\n"
+msgstr "* 正在校验版本库元数据 ...\n"
+
+#: ../svnadmin/svnadmin.c:796
+#, c-format
+msgid "* Verifying metadata at revision %ld ...\n"
+msgstr "* 正在校验版本 %ld 的元数据 ...\n"
+
+#: ../svnadmin/svnadmin.c:806
 #, c-format
 msgid "Packing revisions in shard %s..."
 msgstr "正在打包版本碎片 %s ..."
 
-#: ../svnadmin/main.c:717
+#: ../svnadmin/svnadmin.c:821
 #, c-format
 msgid "Packing revprops in shard %s..."
 msgstr "正在打包版本属性碎片 %s ..."
 
-#: ../svnadmin/main.c:806
+#: ../svnadmin/svnadmin.c:898
+#, c-format
+msgid "<<< Skipped original revision %ld\n"
+msgstr "<<< 已跳过原始版本 %ld\n"
+
+#: ../svnadmin/svnadmin.c:915
 #, c-format
 msgid ""
 "Repository lock acquired.\n"
@@ -11766,8 +12992,7 @@
 "已取得版本库锁定。\n"
 "请稍候；修复版本库可能需要一段时间...\n"
 
-#: ../svnadmin/main.c:813
-#, c-format
+#: ../svnadmin/svnadmin.c:922
 msgid ""
 "Repository lock acquired.\n"
 "Please wait; upgrading the repository may take some time...\n"
@@ -11775,7 +13000,11 @@
 "已取得版本库锁定。\n"
 "请稍候；升级版本库可能需要一段时间...\n"
 
-#: ../svnadmin/main.c:925
+#: ../svnadmin/svnadmin.c:1072
+msgid "No program provided"
+msgstr "没有提供程序"
+
+#: ../svnadmin/svnadmin.c:1108
 msgid ""
 "general usage: svnadmin SUBCOMMAND REPOS_PATH  [ARGS & OPTIONS ...]\n"
 "Type 'svnadmin help <subcommand>' for help on a specific subcommand.\n"
@@ -11789,7 +13018,8 @@
 "\n"
 "可用的子命令:\n"
 
-#: ../svnadmin/main.c:932 ../svnlook/main.c:2050 ../svnserve/main.c:301
+#: ../svnadmin/svnadmin.c:1115 ../svnlook/svnlook.c:2226
+#: ../svnserve/svnserve.c:335
 msgid ""
 "The following repository back-end (FS) modules are available:\n"
 "\n"
@@ -11797,13 +13027,22 @@
 "下列版本库后端(FS) 模块可用:\n"
 "\n"
 
-#: ../svnadmin/main.c:980
+#: ../svnadmin/svnadmin.c:1144
+#, c-format
+msgid "Invalid revision number (%ld) specified"
+msgstr "指定了无效的版本 (%ld)"
+
+#: ../svnadmin/svnadmin.c:1154
+msgid "Non-numeric revision specified"
+msgstr "指定了非数字版本"
+
+#: ../svnadmin/svnadmin.c:1213
 msgid ""
 "Invalid property value found in dumpstream; consider repairing the source or "
 "using --bypass-prop-validation while loading."
 msgstr "在转储流中发现非法的属性值；考虑修复，或者在加载时使用选项 '--bypass-prop-validation' 。"
 
-#: ../svnadmin/main.c:1046 ../svnadmin/main.c:1549
+#: ../svnadmin/svnadmin.c:1279 ../svnadmin/svnadmin.c:1911
 msgid ""
 "Failed to get exclusive repository access; perhaps another process\n"
 "such as httpd, svnserve or svn has it open?"
@@ -11811,12 +13050,12 @@
 "无法独占访问版本库；可能是其它如 httpd，svnserve 或 svn 等进程已经打开它，\n"
 "尚未关闭？"
 
-#: ../svnadmin/main.c:1051 ../svnadmin/main.c:1554
+#: ../svnadmin/svnadmin.c:1284 ../svnadmin/svnadmin.c:1916
 #, c-format
 msgid "Waiting on repository lock; perhaps another process has it open?\n"
 msgstr "等待版本库锁定中；也许其它的进程把它打开了？\n"
 
-#: ../svnadmin/main.c:1059
+#: ../svnadmin/svnadmin.c:1292
 #, c-format
 msgid ""
 "\n"
@@ -11825,47 +13064,52 @@
 "\n"
 "完成修复。\n"
 
-#: ../svnadmin/main.c:1066
+#: ../svnadmin/svnadmin.c:1299
 #, c-format
 msgid "The latest repos revision is %ld.\n"
 msgstr "最新的版本库版本是 %ld。\n"
 
-#: ../svnadmin/main.c:1181
+#: ../svnadmin/svnadmin.c:1414
 #, c-format
 msgid "Transaction '%s' removed.\n"
 msgstr "事务“%s”被删除。\n"
 
-#: ../svnadmin/main.c:1243 ../svnadmin/main.c:1288
+#: ../svnadmin/svnadmin.c:1476 ../svnadmin/svnadmin.c:1521
 #, c-format
 msgid "Missing revision"
 msgstr "丢失版本"
 
-#: ../svnadmin/main.c:1246 ../svnadmin/main.c:1291
+#: ../svnadmin/svnadmin.c:1479 ../svnadmin/svnadmin.c:1524
 #, c-format
 msgid "Only one revision allowed"
 msgstr "只允许一个版本"
 
-#: ../svnadmin/main.c:1424 ../svnlook/main.c:2112
+#: ../svnadmin/svnadmin.c:1578
+#, c-format
+msgid "--revision (-r) and --transaction (-t) are mutually exclusive"
+msgstr "--revision (-r) 与 --transaction (-t) 是互斥的"
+
+#: ../svnadmin/svnadmin.c:1745 ../svnlook/svnlook.c:2289
 #, c-format
 msgid "UUID Token: %s\n"
 msgstr "UUID 标识: %s\n"
 
-#: ../svnadmin/main.c:1425 ../svnlook/main.c:2113
+#: ../svnadmin/svnadmin.c:1746 ../svnlook/svnlook.c:2290
 #, c-format
 msgid "Owner: %s\n"
 msgstr "所有者: %s\n"
 
-#: ../svnadmin/main.c:1426 ../svnlook/main.c:2114
+#: ../svnadmin/svnadmin.c:1747 ../svnlook/svnlook.c:2291
 #, c-format
 msgid "Created: %s\n"
 msgstr "已创建: %s\n"
 
-#: ../svnadmin/main.c:1427 ../svnlook/main.c:2115
+#: ../svnadmin/svnadmin.c:1748 ../svnlook/svnlook.c:2292
 #, c-format
 msgid "Expires: %s\n"
 msgstr "过期: %s\n"
 
-#: ../svnadmin/main.c:1429
+#: ../svnadmin/svnadmin.c:1750
 #, c-format
 msgid ""
 "Comment (%i line):\n"
@@ -11880,33 +13124,38 @@
 "%s\n"
 "\n"
 
-#: ../svnadmin/main.c:1475
+#: ../svnadmin/svnadmin.c:1796
 msgid "No paths to unlock provided"
 msgstr "没有提供解锁的路径"
 
-#: ../svnadmin/main.c:1493
+#: ../svnadmin/svnadmin.c:1814
 #, c-format
 msgid "Path '%s' isn't locked.\n"
 msgstr "路径 “%s” 没有被锁定。\n"
 
-#: ../svnadmin/main.c:1505
+#: ../svnadmin/svnadmin.c:1826
 #, c-format
 msgid "Removed lock on '%s'.\n"
 msgstr "删除 “%s” 上的锁。\n"
 
-#: ../svnadmin/main.c:1564
+#: ../svnadmin/svnadmin.c:1879
+#, c-format
+msgid "'%s' unlocked by user '%s'.\n"
+msgstr "“%s”被用户“%s”解锁。\n"
+
+#: ../svnadmin/svnadmin.c:1926
 msgid ""
 "Upgrade of this repository's underlying versioned filesystem is not "
 "supported; consider dumping and loading the data elsewhere"
 msgstr "文件系统不支持升级此版本库；请考虑使用导出后加载数据的升级方案"
 
-#: ../svnadmin/main.c:1571
+#: ../svnadmin/svnadmin.c:1933
 msgid ""
 "Upgrade of this repository is not supported; consider dumping and loading "
 "the data elsewhere"
 msgstr "不支持升级此版本库；请考虑使用导出后加载数据的升级方案"
 
-#: ../svnadmin/main.c:1577
+#: ../svnadmin/svnadmin.c:1939
 #, c-format
 msgid ""
 "\n"
@@ -11915,26 +13164,37 @@
 "\n"
 "完成升级。\n"
 
-#: ../svnadmin/main.c:1671 ../svnrdump/svnrdump.c:760
+#: ../svnadmin/svnadmin.c:2024 ../svnrdump/svnrdump.c:923
 msgid ""
 "Multiple revision arguments encountered; try '-r N:M' instead of '-r N -r M'"
 msgstr "遇到了多个版本参数；请使用“-r N:M”代替“-r M -r N”"
 
-#: ../svnadmin/main.c:1811
+#: ../svnadmin/svnadmin.c:2102
+#, c-format
+msgid "Cannot create pre-1.0-compatible repositories"
+msgstr "不能创建与早于 1.0 版本兼容的版本库"
+
+#: ../svnadmin/svnadmin.c:2115
+#, c-format
+msgid ""
+"Cannot guarantee compatibility beyond the current running version (%s)"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:2204
 #, c-format
 msgid "subcommand argument required\n"
 msgstr "必须提供子命令参数\n"
 
-#: ../svnadmin/main.c:1846
+#: ../svnadmin/svnadmin.c:2239
 msgid "Repository argument required"
 msgstr "需要版本库参数"
 
-#: ../svnadmin/main.c:1859
+#: ../svnadmin/svnadmin.c:2252
 #, c-format
 msgid "'%s' is a URL when it should be a local path"
 msgstr "“%s”应该是本地路径，实际上却是 URL"
 
-#: ../svnadmin/main.c:1890
+#: ../svnadmin/svnadmin.c:2283
 #, c-format
 msgid ""
 "Subcommand '%s' doesn't accept option '%s'\n"
@@ -11943,89 +13203,98 @@
 "子命令“%s”不接受选项“%s”\n"
 "使用“svnadmin help %s”得到用法。\n"
 
-#: ../svnadmin/main.c:1934
+#: ../svnadmin/svnadmin.c:2326
 msgid "Try 'svnadmin help' for more info"
 msgstr "请使用“svnadmin help”以得到更多信息"
 
-#: ../svndumpfilter/main.c:73
+#: ../svndumpfilter/svndumpfilter.c:79
 #, c-format
 msgid "Can't open stdio file"
 msgstr "无法打开标准输出/入文件"
 
-#: ../svndumpfilter/main.c:348
+#: ../svndumpfilter/svndumpfilter.c:406
 msgid "This is an empty revision for padding."
 msgstr "这是一个用来填充的空版本。"
 
-#: ../svndumpfilter/main.c:424
+#: ../svndumpfilter/svndumpfilter.c:489
 #, c-format
 msgid "Revision %ld committed as %ld.\n"
 msgstr "版本 %ld 提交为 %ld。\n"
 
-#: ../svndumpfilter/main.c:447
+#: ../svndumpfilter/svndumpfilter.c:512
 #, c-format
 msgid "Revision %ld skipped.\n"
 msgstr "跳过版本 %ld。\n"
 
-#: ../svndumpfilter/main.c:546
+#: ../svndumpfilter/svndumpfilter.c:606
 #, c-format
 msgid "Invalid copy source path '%s'"
 msgstr "复制源路径“%s”无效"
 
-#: ../svndumpfilter/main.c:592
+#: ../svndumpfilter/svndumpfilter.c:663
 #, c-format
 msgid "No valid copyfrom revision in filtered stream"
 msgstr "在过滤流中没有有效的copyfrom版本"
 
-#: ../svndumpfilter/main.c:717
+#: ../svndumpfilter/svndumpfilter.c:788
 #, c-format
 msgid "Missing merge source path '%s'; try with --skip-missing-merge-sources"
 msgstr "缺少合并源路径 “%s”；尝试 --skip-missing-merge-sources"
 
-#: ../svndumpfilter/main.c:739
+#: ../svndumpfilter/svndumpfilter.c:810
 #, c-format
 msgid "No valid revision range 'start' in filtered stream"
 msgstr "在过滤流中没有有效的版本范围 “start”"
 
-#: ../svndumpfilter/main.c:746
+#: ../svndumpfilter/svndumpfilter.c:817
 #, c-format
 msgid "No valid revision range 'end' in filtered stream"
 msgstr "在过滤流中没有有效的版本范围 “end”"
 
-#: ../svndumpfilter/main.c:792
-msgid "Delta property block detected - not supported by svndumpfilter"
-msgstr "检测到 Delta 属性块 - svndumpfilter 不支持"
+#: ../svndumpfilter/svndumpfilter.c:863 ../svndumpfilter/svndumpfilter.c:894
+#, c-format
+msgid ""
+"Delta property block detected, but deltas are not enabled for node '%s' in "
+"original revision %ld"
+msgstr ""
 
-#: ../svndumpfilter/main.c:928
+#: ../svndumpfilter/svndumpfilter.c:1027
 msgid "Do not display filtering statistics."
 msgstr "不显示过滤的统计数据。"
 
-#: ../svndumpfilter/main.c:930
+#: ../svndumpfilter/svndumpfilter.c:1029
 msgid "Treat the path prefixes as file glob patterns."
 msgstr "将路径前缀视为文件统配模式。"
 
-#: ../svndumpfilter/main.c:932
+#: ../svndumpfilter/svndumpfilter.c:1031
 msgid "Remove revisions emptied by filtering."
 msgstr "删除因过滤而产生的空版本。"
 
-#: ../svndumpfilter/main.c:934
+#: ../svndumpfilter/svndumpfilter.c:1033
+msgid ""
+"Remove all empty revisions found in dumpstream\n"
+"                             except revision 0."
+msgstr ""
+
+#: ../svndumpfilter/svndumpfilter.c:1036
 msgid "Renumber revisions left after filtering."
 msgstr "过滤后重编余下的版本。"
 
-#: ../svndumpfilter/main.c:937
+#: ../svndumpfilter/svndumpfilter.c:1039
 msgid "Skip missing merge sources."
 msgstr "跳过缺少的合并源"
 
-#: ../svndumpfilter/main.c:939
+#: ../svndumpfilter/svndumpfilter.c:1041
 msgid "Don't filter revision properties."
 msgstr "不过滤版本属性。"
 
-#: ../svndumpfilter/main.c:941
+#: ../svndumpfilter/svndumpfilter.c:1043
 msgid ""
 "Read additional prefixes, one per line, from\n"
 "                             file ARG."
 msgstr "从文件 ARG 中读取额外的前缀，每个一行。"
 
-#: ../svndumpfilter/main.c:953
+#: ../svndumpfilter/svndumpfilter.c:1055
 msgid ""
 "Filter out nodes with given prefixes from dumpstream.\n"
 "usage: svndumpfilter exclude PATH_PREFIX...\n"
@@ -12033,7 +13302,7 @@
 "从转存流删除匹配指定前缀的节点。\n"
 "用法: svndumpfilter exclude PATH_PREFIX...\n"
 
-#: ../svndumpfilter/main.c:961
+#: ../svndumpfilter/svndumpfilter.c:1064
 msgid ""
 "Filter out nodes without given prefixes from dumpstream.\n"
 "usage: svndumpfilter include PATH_PREFIX...\n"
@@ -12041,7 +13310,7 @@
 "从转储串流中删除未包含指定前缀的节点。\n"
 "用法: svndumpfilter include PATH_PREFIX...\n"
 
-#: ../svndumpfilter/main.c:969
+#: ../svndumpfilter/svndumpfilter.c:1073
 msgid ""
 "Describe the usage of this program or its subcommands.\n"
 "usage: svndumpfilter help [SUBCOMMAND...]\n"
@@ -12049,7 +13318,7 @@
 "描述本程序或其子命令的用法。\n"
 "用法: svndumpfilter help [SUBCOMMAND...]\n"
 
-#: ../svndumpfilter/main.c:1052
+#: ../svndumpfilter/svndumpfilter.c:1149
 msgid ""
 "general usage: svndumpfilter SUBCOMMAND [ARGS & OPTIONS ...]\n"
 "Type 'svndumpfilter help <subcommand>' for help on a specific subcommand.\n"
@@ -12063,47 +13332,47 @@
 "\n"
 "可用的子命令:\n"
 
-#: ../svndumpfilter/main.c:1108
+#: ../svndumpfilter/svndumpfilter.c:1207
 #, c-format
 msgid "Excluding (and dropping empty revisions for) prefix patterns:\n"
 msgstr "排除(以及丢弃空版本)的前缀匹配模式:\n"
 
-#: ../svndumpfilter/main.c:1110
+#: ../svndumpfilter/svndumpfilter.c:1209
 #, c-format
 msgid "Excluding prefix patterns:\n"
 msgstr "排除前缀匹配模式:\n"
 
-#: ../svndumpfilter/main.c:1112
+#: ../svndumpfilter/svndumpfilter.c:1212
 #, c-format
 msgid "Including (and dropping empty revisions for) prefix patterns:\n"
 msgstr "包含(以及丢弃空版本)的前缀匹配模式:\n"
 
-#: ../svndumpfilter/main.c:1114
+#: ../svndumpfilter/svndumpfilter.c:1214
 #, c-format
 msgid "Including prefix patterns:\n"
 msgstr "包含的前缀匹配模式:\n"
 
-#: ../svndumpfilter/main.c:1121
+#: ../svndumpfilter/svndumpfilter.c:1222
 #, c-format
 msgid "Excluding (and dropping empty revisions for) prefixes:\n"
 msgstr "排除 (以及丢弃空版本) 的前缀:\n"
 
-#: ../svndumpfilter/main.c:1123
+#: ../svndumpfilter/svndumpfilter.c:1224
 #, c-format
 msgid "Excluding prefixes:\n"
 msgstr "排除前缀:\n"
 
-#: ../svndumpfilter/main.c:1125
+#: ../svndumpfilter/svndumpfilter.c:1227
 #, c-format
 msgid "Including (and dropping empty revisions for) prefixes:\n"
 msgstr "包含 (以及丢弃空版本) 的前缀:\n"
 
-#: ../svndumpfilter/main.c:1127
+#: ../svndumpfilter/svndumpfilter.c:1229
 #, c-format
 msgid "Including prefixes:\n"
 msgstr "包含的前缀:\n"
 
-#: ../svndumpfilter/main.c:1155
+#: ../svndumpfilter/svndumpfilter.c:1257
 #, c-format
 msgid ""
 "Dropped %d revision.\n"
@@ -12115,22 +13384,26 @@
 "删除 %d 个版本。\n"
 "\n"
 
-#: ../svndumpfilter/main.c:1163
+#: ../svndumpfilter/svndumpfilter.c:1265
 msgid "Revisions renumbered as follows:\n"
 msgstr "版本被重新编号如下:\n"
 
-#: ../svndumpfilter/main.c:1191
+#: ../svndumpfilter/svndumpfilter.c:1293
 #, c-format
 msgid "   %ld => (dropped)\n"
 msgstr "   %ld => (丢弃)\n"
 
-#: ../svndumpfilter/main.c:1206
+#: ../svndumpfilter/svndumpfilter.c:1308
 #, c-format
 msgid "Dropped %d node:\n"
 msgid_plural "Dropped %d nodes:\n"
 msgstr[0] "丢弃 %d 个节点:\n"
 
-#: ../svndumpfilter/main.c:1488
+#: ../svndumpfilter/svndumpfilter.c:1477
+msgid "--drop-empty-revs cannot be used with --drop-all-empty-revs"
+msgstr "--drop-empty-rev 不能与 --drop-all-empty-revs 共存"
+
+#: ../svndumpfilter/svndumpfilter.c:1597
 #, c-format
 msgid ""
 "\n"
@@ -12139,7 +13412,7 @@
 "\n"
 "错误: 没有提供前缀。\n"
 
-#: ../svndumpfilter/main.c:1519
+#: ../svndumpfilter/svndumpfilter.c:1628
 #, c-format
 msgid ""
 "Subcommand '%s' doesn't accept option '%s'\n"
@@ -12148,92 +13421,67 @@
 "子命令“%s”不接受选项“%s”\n"
 "使用“svndumpfilter help %s”得到用法。\n"
 
-#: ../svndumpfilter/main.c:1537
+#: ../svndumpfilter/svndumpfilter.c:1646
 msgid "Try 'svndumpfilter help' for more info"
 msgstr "请使用“svndumpfilter help”以得到更多信息"
 
-#: ../svnlook/main.c:108
+#: ../svnlook/svnlook.c:117
 msgid "show details for copies"
 msgstr "显示每个副本的详细信息"
 
-#: ../svnlook/main.c:111
+#: ../svnlook/svnlook.c:120
 msgid "print differences against the copy source"
 msgstr "显示与原始内容的差异"
 
-#: ../svnlook/main.c:114
+#: ../svnlook/svnlook.c:123
 msgid "show full paths instead of indenting them"
 msgstr "显示完整路径(代替缩进)"
 
-#: ../svnlook/main.c:120
+#: ../svnlook/svnlook.c:129
 msgid "maximum number of history entries"
 msgstr "历史项最大数量"
 
-#: ../svnlook/main.c:123
-msgid "do not print differences for added files"
-msgstr "不要输出增加文件造成的差异"
-
-#: ../svnlook/main.c:129
+#: ../svnlook/svnlook.c:147
 msgid "operate on single directory only"
 msgstr "只在单个目录操作"
 
-#: ../svnlook/main.c:132
+#: ../svnlook/svnlook.c:150
 msgid "specify revision number ARG"
 msgstr "指定版本编号 ARG"
 
-#: ../svnlook/main.c:135
+#: ../svnlook/svnlook.c:153
 msgid "operate on a revision property (use with -r or -t)"
 msgstr "操作版本的属性(使用 -r 或 -t)"
 
-#: ../svnlook/main.c:138
+#: ../svnlook/svnlook.c:156
 msgid "show node revision ids for each path"
 msgstr "为每个路径显示节点版本编号"
 
-#: ../svnlook/main.c:141
-msgid "specify transaction name ARG"
-msgstr "指定事务名称 ARG"
+#: ../svnlook/svnlook.c:159
+msgid "show path's inherited properties"
+msgstr "显示路径继承的属性"
 
-#: ../svnlook/main.c:144
+#: ../svnlook/svnlook.c:165
 msgid "be verbose"
 msgstr "详细"
 
-#: ../svnlook/main.c:153
+#: ../svnlook/svnlook.c:174
 msgid ""
-"Default: '-u'. When Subversion is invoking an\n"
-"                             external diff program, ARG is simply passed "
-"along\n"
-"                             to the program. But when Subversion is using "
-"its\n"
-"                             default internal diff implementation, or when\n"
-"                             Subversion is displaying blame annotations, "
-"ARG\n"
-"                             could be any of the following:\n"
-"                                -u (--unified):\n"
-"                                   Output 3 lines of unified context.\n"
-"                                -b (--ignore-space-change):\n"
-"                                   Ignore changes in the amount of white "
-"space.\n"
-"                                -w (--ignore-all-space):\n"
-"                                   Ignore all white space.\n"
-"                                --ignore-eol-style:\n"
-"                                   Ignore changes in EOL style\n"
-"                                -p (--show-c-function):\n"
-"                                   Show C function name in diff output."
-msgstr ""
-"缺省: “-u”。当 Subversion 调用外部比较程序时，ARG 直接传给它。但是当\n"
-"                             Subversion 使用缺省的内置比较实现，或者正\n"
-"                             显示追溯时, ARG 可以是: \n"
-"                                -u (--unified):\n"
-"                                   输出三行统一上下文。\n"
-"                                -b (--ignore-space-change):\n"
-"                                   忽略空白数量的修改。\n"
-"                                -w (--ignore-all-space):\n"
-"                                   忽略所有的空白。\n"
-"                                --ignore-eol-style:\n"
-"                                   忽略行尾样式的改变。\n"
-"                                -p (--show-c-function):\n"
-"                                   在比较输出中显示 C 函数名称。"
+"Specify differencing options for external diff or\n"
+"                             internal diff. Default: '-u'. Options are\n"
+"                             separated by spaces. Internal diff takes:\n"
+"                               -u, --unified: Show 3 lines of unified "
+"context\n"
+"                               -b, --ignore-space-change: Ignore changes in\n"
+"                                 amount of white space\n"
+"                               -w, --ignore-all-space: Ignore all white "
+"space\n"
+"                               --ignore-eol-style: Ignore changes in EOL "
+"style\n"
+"                               -p, --show-c-function: Show C function name"
+msgstr ""
 
-#: ../svnlook/main.c:198
+#: ../svnlook/svnlook.c:205
 msgid ""
 "usage: svnlook author REPOS_PATH\n"
 "\n"
@@ -12243,7 +13491,7 @@
 "\n"
 "显示作者。\n"
 
-#: ../svnlook/main.c:203
+#: ../svnlook/svnlook.c:210
 msgid ""
 "usage: svnlook cat REPOS_PATH FILE_PATH\n"
 "\n"
@@ -12253,7 +13501,7 @@
 "\n"
 "显示文件的内容。可省略 FILE_PATH 前的“/”。\n"
 
-#: ../svnlook/main.c:208
+#: ../svnlook/svnlook.c:215
 msgid ""
 "usage: svnlook changed REPOS_PATH\n"
 "\n"
@@ -12263,7 +13511,7 @@
 "\n"
 "显示已改变的路径。\n"
 
-#: ../svnlook/main.c:213
+#: ../svnlook/svnlook.c:220
 msgid ""
 "usage: svnlook date REPOS_PATH\n"
 "\n"
@@ -12273,7 +13521,7 @@
 "\n"
 "显示时戳。\n"
 
-#: ../svnlook/main.c:218
+#: ../svnlook/svnlook.c:225
 msgid ""
 "usage: svnlook diff REPOS_PATH\n"
 "\n"
@@ -12283,7 +13531,7 @@
 "\n"
 "以 GNU 样式，显示版本库中改变的文件与属性差异。\n"
 
-#: ../svnlook/main.c:224
+#: ../svnlook/svnlook.c:232
 msgid ""
 "usage: svnlook dirs-changed REPOS_PATH\n"
 "\n"
@@ -12294,7 +13542,7 @@
 "\n"
 "显示本身改变 (编辑属性) 的目录，或是其中的文件修改过的目录。\n"
 
-#: ../svnlook/main.c:230
+#: ../svnlook/svnlook.c:238
 msgid ""
 "usage: svnlook filesize REPOS_PATH PATH_IN_REPOS\n"
 "\n"
@@ -12305,7 +13553,7 @@
 "\n"
 "显示位于 PATH_IN_REPOS 的文件在版本库中展现的大小(字节)\n"
 
-#: ../svnlook/main.c:236
+#: ../svnlook/svnlook.c:244
 msgid ""
 "usage: svnlook help [SUBCOMMAND...]\n"
 "\n"
@@ -12315,7 +13563,7 @@
 "\n"
 "显示本程序或其子命令的用法。\n"
 
-#: ../svnlook/main.c:241
+#: ../svnlook/svnlook.c:249
 msgid ""
 "usage: svnlook history REPOS_PATH [PATH_IN_REPOS]\n"
 "\n"
@@ -12326,7 +13574,7 @@
 "\n"
 "显示版本库中，某个路径的历史记录信息 (如果没有指定路径，则为根目录)。\n"
 
-#: ../svnlook/main.c:247
+#: ../svnlook/svnlook.c:255
 msgid ""
 "usage: svnlook info REPOS_PATH\n"
 "\n"
@@ -12336,7 +13584,7 @@
 "\n"
 "显示作者，时戳，日志信息大小，以及日志信息。\n"
 
-#: ../svnlook/main.c:252
+#: ../svnlook/svnlook.c:260
 msgid ""
 "usage: svnlook lock REPOS_PATH PATH_IN_REPOS\n"
 "\n"
@@ -12346,7 +13594,7 @@
 "\n"
 "如果版本库中的路径存在锁，显示其详细信息。\n"
 
-#: ../svnlook/main.c:257
+#: ../svnlook/svnlook.c:265
 msgid ""
 "usage: svnlook log REPOS_PATH\n"
 "\n"
@@ -12356,7 +13604,7 @@
 "\n"
 "显示日志信息。\n"
 
-#: ../svnlook/main.c:262
+#: ../svnlook/svnlook.c:270
 msgid ""
 "usage: 1. svnlook propget REPOS_PATH PROPNAME PATH_IN_REPOS\n"
 "                           2. svnlook propget --revprop REPOS_PATH PROPNAME\n"
@@ -12370,7 +13618,7 @@
 "显示版本库中指定路径上属性的原始值。\n"
 "用 --revprop 选项显示版本属性的原始值。\n"
 
-#: ../svnlook/main.c:271
+#: ../svnlook/svnlook.c:279
 msgid ""
 "usage: 1. svnlook proplist REPOS_PATH PATH_IN_REPOS\n"
 "                             2. svnlook proplist --revprop REPOS_PATH\n"
@@ -12386,7 +13634,7 @@
 "使用 --revprop 选项列出版本属性。\n"
 "使用 -v 选项显示属性的内容。\n"
 
-#: ../svnlook/main.c:281
+#: ../svnlook/svnlook.c:290
 msgid ""
 "usage: svnlook tree REPOS_PATH [PATH_IN_REPOS]\n"
 "\n"
@@ -12398,7 +13646,7 @@
 "显示目录树，从 PATH_IN_REPOS 开始 (如果省略此参数就从版本库的根目录开始)，\n"
 "可选的显示节点版本 id。\n"
 
-#: ../svnlook/main.c:287
+#: ../svnlook/svnlook.c:296
 msgid ""
 "usage: svnlook uuid REPOS_PATH\n"
 "\n"
@@ -12408,7 +13656,7 @@
 "\n"
 "显示版本库的 UUID。\n"
 
-#: ../svnlook/main.c:292
+#: ../svnlook/svnlook.c:301
 msgid ""
 "usage: svnlook youngest REPOS_PATH\n"
 "\n"
@@ -12418,28 +13666,28 @@
 "\n"
 "显示最新的版本号。\n"
 
-#: ../svnlook/main.c:960
+#: ../svnlook/svnlook.c:861
 #, c-format
 msgid "Copied: %s (from rev %ld, %s)\n"
 msgstr "已复制: %s (来自版本 %ld，%s)\n"
 
-#: ../svnlook/main.c:1028
+#: ../svnlook/svnlook.c:929
 msgid "Added"
 msgstr "已增加"
 
-#: ../svnlook/main.c:1029
+#: ../svnlook/svnlook.c:930
 msgid "Deleted"
 msgstr "已删除"
 
-#: ../svnlook/main.c:1030
+#: ../svnlook/svnlook.c:931
 msgid "Modified"
 msgstr "已修改"
 
-#: ../svnlook/main.c:1031
+#: ../svnlook/svnlook.c:932
 msgid "Index"
 msgstr "索引"
 
-#: ../svnlook/main.c:1043
+#: ../svnlook/svnlook.c:943
 msgid ""
 "(Binary files differ)\n"
 "\n"
@@ -12447,30 +13695,30 @@
 "(二进制文件不同)\n"
 "\n"
 
-#: ../svnlook/main.c:1254
+#: ../svnlook/svnlook.c:1222
 msgid "unknown"
 msgstr "未知"
 
-#: ../svnlook/main.c:1304
+#: ../svnlook/svnlook.c:1279
 #, c-format
 msgid "Transaction '%s' is not based on a revision; how odd"
 msgstr "事务“%s”并非基于某个版本；多神秘啊！"
 
-#: ../svnlook/main.c:1448
+#: ../svnlook/svnlook.c:1422
 #, c-format
 msgid "'%s' is a URL, probably should be a path"
 msgstr "“%s”是 URL，也许应该是路径。"
 
-#: ../svnlook/main.c:1471 ../svnlook/main.c:1494
+#: ../svnlook/svnlook.c:1445 ../svnlook/svnlook.c:1468
 #, c-format
 msgid "Path '%s' is not a file"
 msgstr "路径“%s”不是文件"
 
-#: ../svnlook/main.c:1604
+#: ../svnlook/svnlook.c:1604
 msgid "History item limit reached"
 msgstr "达到历史项目限制"
 
-#: ../svnlook/main.c:1623
+#: ../svnlook/svnlook.c:1623
 #, c-format
 msgid ""
 "REVISION   PATH <ID>\n"
@@ -12479,7 +13727,7 @@
 "修 订 版   路径 <ID>\n"
 "--------   ---------\n"
 
-#: ../svnlook/main.c:1628
+#: ../svnlook/svnlook.c:1628
 #, c-format
 msgid ""
 "REVISION   PATH\n"
@@ -12488,26 +13736,40 @@
 "修 订 版   路径\n"
 "--------   ----\n"
 
-#: ../svnlook/main.c:1677
+#: ../svnlook/svnlook.c:1700
 #, c-format
 msgid "Property '%s' not found on revision %ld"
 msgstr "属性“%s”在版本 %ld 中找不到"
 
-#: ../svnlook/main.c:1684
+#: ../svnlook/svnlook.c:1709
+#, c-format
+msgid ""
+"Property '%s' not found on path '%s' or inherited from a parent in revision "
+"%ld"
+msgstr ""
+
+#: ../svnlook/svnlook.c:1715
 #, c-format
 msgid "Property '%s' not found on path '%s' in revision %ld"
 msgstr "属性 “%s” 不在路径 “%s” 的版本 %ld 中"
 
-#: ../svnlook/main.c:1689
+#: ../svnlook/svnlook.c:1723
+#, c-format
+msgid ""
+"Property '%s' not found on path '%s' or inherited from a parent in "
+"transaction %s"
+msgstr ""
+
+#: ../svnlook/svnlook.c:1729
 #, c-format
 msgid "Property '%s' not found on path '%s' in transaction %s"
 msgstr "属性 “%s” 不在路径 “%s” 中，事务 “%s”"
 
-#: ../svnlook/main.c:1891
+#: ../svnlook/svnlook.c:2064
 msgid "Missing repository path argument"
 msgstr "未提供版本库路径参数"
 
-#: ../svnlook/main.c:2040
+#: ../svnlook/svnlook.c:2216
 msgid ""
 "general usage: svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
 "Note: any subcommand which takes the '--revision' and '--transaction'\n"
@@ -12526,7 +13788,7 @@
 "\n"
 "可用的子命令:\n"
 
-#: ../svnlook/main.c:2117
+#: ../svnlook/svnlook.c:2294
 #, c-format
 msgid ""
 "Comment (%i line):\n"
@@ -12538,40 +13800,50 @@
 "注释 (%i 行): \n"
 "%s\n"
 
-#: ../svnlook/main.c:2169
+#: ../svnlook/svnlook.c:2346
 #, c-format
 msgid "Missing propname argument"
 msgstr "丢失属性名参数"
 
-#: ../svnlook/main.c:2170
+#: ../svnlook/svnlook.c:2347
 #, c-format
 msgid "Missing propname and repository path arguments"
 msgstr "未提供属性名称与版本库路径参数"
 
-#: ../svnlook/main.c:2176
+#: ../svnlook/svnlook.c:2353
 msgid "Missing propname or repository path argument"
 msgstr "未提供属性名称或版本库路径参数"
 
-#: ../svnlook/main.c:2344
+#: ../svnlook/svnlook.c:2517
 msgid "Invalid revision number supplied"
 msgstr "提供了无效的版本号码"
 
-#: ../svnlook/main.c:2440
+#: ../svnlook/svnlook.c:2629
 msgid ""
 "The '--transaction' (-t) and '--revision' (-r) arguments cannot co-exist"
 msgstr "“--transaction” (-t) 与 “--revision” (-r) 参数不能同时存在"
 
-#: ../svnlook/main.c:2523
+#: ../svnlook/svnlook.c:2636
+msgid ""
+"Cannot use the '--show-inherited-props' option with the '--revprop' option"
+msgstr ""
+
+#: ../svnlook/svnlook.c:2695
+#, c-format
+msgid "Try 'svnadmin verify' instead.\n"
+msgstr "请运行“svnadmin verify”。\n"
+
+#: ../svnlook/svnlook.c:2729
 #, c-format
 msgid "Repository argument required\n"
 msgstr "需要版本库参数\n"
 
-#: ../svnlook/main.c:2532
+#: ../svnlook/svnlook.c:2738
 #, c-format
 msgid "'%s' is a URL when it should be a path\n"
 msgstr "“%s”应该是路径，却是URL\n"
 
-#: ../svnlook/main.c:2584
+#: ../svnlook/svnlook.c:2790
 #, c-format
 msgid ""
 "Subcommand '%s' doesn't accept option '%s'\n"
@@ -12580,22 +13852,72 @@
 "子命令“%s”并不接受选项“%s”\n"
 "使用“svnlook help %s”得到用法。\n"
 
-#: ../svnlook/main.c:2627
+#: ../svnlook/svnlook.c:2833
 msgid "Try 'svnlook help' for more info"
 msgstr "请使用“svnlook help”以得到更多信息"
 
-#: ../svnrdump/load_editor.c:382 ../svnsync/main.c:318
+#: ../svnmucc/svnmucc.c:927
+msgid ""
+"Subversion multiple URL command client\n"
+"usage: svnmucc ACTION...\n"
+"\n"
+"  Perform one or more Subversion repository URL-based ACTIONs, committing\n"
+"  the result as a (single) new revision.\n"
+"\n"
+"Actions:\n"
+"  cp REV SRC-URL DST-URL : copy SRC-URL@REV to DST-URL\n"
+"  mkdir URL              : create new directory URL\n"
+"  mv SRC-URL DST-URL     : move SRC-URL to DST-URL\n"
+"  rm URL                 : delete URL\n"
+"  put SRC-FILE URL       : add or modify file URL with contents copied from\n"
+"                           SRC-FILE (use \"-\" to read from standard input)\n"
+"  propset NAME VALUE URL : set property NAME on URL to VALUE\n"
+"  propsetf NAME FILE URL : set property NAME on URL to value read from FILE\n"
+"  propdel NAME URL       : delete property NAME from URL\n"
+"\n"
+"Valid options:\n"
+"  -h, -? [--help]        : display this text\n"
+"  -m [--message] ARG     : use ARG as a log message\n"
+"  -F [--file] ARG        : read log message from file ARG\n"
+"  -u [--username] ARG    : commit the changes as username ARG\n"
+"  -p [--password] ARG    : use ARG as the password\n"
+"  -U [--root-url] ARG    : interpret all action URLs relative to ARG\n"
+"  -r [--revision] ARG    : use revision ARG as baseline for changes\n"
+"  --with-revprop ARG     : set revision property in the following format:\n"
+"                               NAME[=VALUE]\n"
+"  --non-interactive      : do no interactive prompting (default is to\n"
+"                           prompt only if standard input is a terminal)\n"
+"  --force-interactive    : do interactive prompting even if standard\n"
+"                           input is not a terminal\n"
+"  --trust-server-cert    : accept SSL server certificates from unknown\n"
+"                           certificate authorities without prompting (but\n"
+"                           only with '--non-interactive')\n"
+"  -X [--extra-args] ARG  : append arguments from file ARG (one per line;\n"
+"                           use \"-\" to read from standard input)\n"
+"  --config-dir ARG       : use ARG to override the config directory\n"
+"  --config-option ARG    : use ARG to override a configuration option\n"
+"  --no-auth-cache        : do not cache authentication tokens\n"
+"  --version              : print version information\n"
+msgstr ""
+
+#: ../svnmucc/svnmucc.c:1003
+msgid ""
+"--message (-m), --file (-F), and --with-revprop=svn:log are mutually "
+"exclusive"
+msgstr "--message (-m)，--file (-F) 与 --with-revprop=svn:log 是互斥的"
+
+#: ../svnrdump/load_editor.c:382 ../svnsync/svnsync.c:327
 #, c-format
 msgid "Failed to get lock on destination repos, currently held by '%s'\n"
 msgstr "从目标版本库获得锁失败，当前被“%s”持有\n"
 
-#: ../svnrdump/load_editor.c:412
+#: ../svnrdump/load_editor.c:526
 msgid ""
 "Target server does not support atomic revision property edits; consider "
 "upgrading it to 1.7."
 msgstr "目标服务器不支持原子版本的属性编辑; 请考虑升级到 1.7 。"
 
-#: ../svnrdump/svnrdump.c:97
+#: ../svnrdump/svnrdump.c:101
 msgid ""
 "usage: svnrdump dump URL [-r LOWER[:UPPER]]\n"
 "\n"
@@ -12608,7 +13930,7 @@
 "以可移植的 'dumpfile' 格式导出远程版本库 URL 中的 LOWER 到 UPPER 的所有版本到标准输出。\n"
 "如果只给出 LOWER，那么就导出这一个版本。\n"
 
-#: ../svnrdump/svnrdump.c:103
+#: ../svnrdump/svnrdump.c:107
 msgid ""
 "usage: svnrdump load URL\n"
 "\n"
@@ -12618,7 +13940,7 @@
 "\n"
 "从标准输入加载 'dumpfile' 到远程版本库 URL。\n"
 
-#: ../svnrdump/svnrdump.c:107
+#: ../svnrdump/svnrdump.c:111
 msgid ""
 "usage: svnrdump help [SUBCOMMAND...]\n"
 "\n"
@@ -12628,11 +13950,16 @@
 "\n"
 "显示本程序或其子命令的用法。\n"
 
-#: ../svnrdump/svnrdump.c:132 ../svnserve/main.c:251 ../svnversion/main.c:138
+#: ../svnrdump/svnrdump.c:124
+msgid "dump incrementally"
+msgstr "以增量方式进行转存"
+
+#: ../svnrdump/svnrdump.c:142 ../svnserve/svnserve.c:281
+#: ../svnversion/svnversion.c:139
 msgid "display this help"
 msgstr "显示本帮助"
 
-#: ../svnrdump/svnrdump.c:562
+#: ../svnrdump/svnrdump.c:731
 msgid ""
 "general usage: svnrdump SUBCOMMAND URL [-r LOWER[:UPPER]]\n"
 "Type 'svnrdump help <subcommand>' for help on a specific subcommand.\n"
@@ -12646,23 +13973,23 @@
 "\n"
 "可用的子命令:\n"
 
-#: ../svnrdump/svnrdump.c:606 ../svnrdump/svnrdump.c:640
+#: ../svnrdump/svnrdump.c:775 ../svnrdump/svnrdump.c:809
 msgid ""
 "Unsupported revision specifier used; use only integer values or 'HEAD'"
 msgstr "使用了不支持的版本格式；请只使用 'HEAD' 或整数"
 
-#: ../svnrdump/svnrdump.c:614 ../svnrdump/svnrdump.c:648
+#: ../svnrdump/svnrdump.c:783 ../svnrdump/svnrdump.c:817
 #, c-format
 msgid "Revision '%ld' does not exist"
 msgstr "版本 '%ld' 不存在"
 
-#: ../svnrdump/svnrdump.c:658
+#: ../svnrdump/svnrdump.c:827
 msgid ""
 "LOWER revision cannot be greater than UPPER revision; consider reversing "
 "your revision range"
 msgstr "LOWER 版本号不能大于 UPPER 版本号；考虑将你的版本范围翻转"
 
-#: ../svnrdump/svnrdump.c:895
+#: ../svnrdump/svnrdump.c:1072
 #, c-format
 msgid ""
 "Subcommand '%s' doesn't accept option '%s'\n"
@@ -12671,84 +13998,99 @@
 "子命令“%s”不接受选项“%s”\n"
 "输入“svnrdump help %s”得到用法。\n"
 
-#: ../svnserve/cyrus_auth.c:264
+#: ../svnserve/cyrus_auth.c:119
+msgid "Could not initialize the SASL library"
+msgstr "不能初始化 SASL 库"
+
+#: ../svnserve/cyrus_auth.c:260
 #, c-format
 msgid "Can't get hostname"
 msgstr "无法获取主机名称"
 
-#: ../svnserve/cyrus_auth.c:329
+#: ../svnserve/cyrus_auth.c:325
 msgid "Could not obtain the list of SASL mechanisms"
 msgstr "不能获得SASL机制列表"
 
-#: ../svnserve/cyrus_auth.c:371
+#: ../svnserve/cyrus_auth.c:367
 msgid "Couldn't obtain the authenticated username"
 msgstr "不能获得已经认证的用户名称"
 
-#: ../svnserve/main.c:154
+#: ../svnserve/serve.c:2043
+msgid "Path is not a string"
+msgstr "路径不是字符串"
+
+#: ../svnserve/serve.c:2200
+msgid "Log revprop entry not a string"
+msgstr "日志 revprop 入口不是字符串"
+
+#: ../svnserve/serve.c:2206
+#, c-format
+msgid "Unknown revprop word '%s' in log command"
+msgstr "日志命令中有未知的 revprop 单词 “%s”"
+
+#: ../svnserve/serve.c:2222
+msgid "Log path entry not a string"
+msgstr "日志路径入口不是字符串"
+
+#: ../svnserve/svnserve.c:162
 msgid "daemon mode"
 msgstr "后台模式"
 
-#: ../svnserve/main.c:155
+#: ../svnserve/svnserve.c:163
 msgid "inetd mode"
 msgstr "inetd 模式"
 
-#: ../svnserve/main.c:156
+#: ../svnserve/svnserve.c:164
 msgid "tunnel mode"
 msgstr "隧道模式"
 
-#: ../svnserve/main.c:157
+#: ../svnserve/svnserve.c:165
 msgid "listen-once mode (useful for debugging)"
 msgstr "监听一次方式(调试用)"
 
-#: ../svnserve/main.c:160
+#: ../svnserve/svnserve.c:168
 msgid "Windows service mode (Service Control Manager)"
 msgstr "Windows 服务方式(服务管理器)"
 
-#: ../svnserve/main.c:162
+#: ../svnserve/svnserve.c:170
 msgid "root of directory to serve"
 msgstr "服务的根目录"
 
-#: ../svnserve/main.c:164
+#: ../svnserve/svnserve.c:172
 msgid "force read only, overriding repository config file"
 msgstr "强制只读；覆盖版本库配置文件"
 
-#: ../svnserve/main.c:166
+#: ../svnserve/svnserve.c:174
 msgid "read configuration from file ARG"
 msgstr "从文件 ARG 读取配置"
 
-#: ../svnserve/main.c:169
+#: ../svnserve/svnserve.c:177
 msgid ""
-"listen port\n"
+"listen port. The default port is 3690.\n"
 "                             [mode: daemon, service, listen-once]"
 msgstr ""
-"监听端口\n"
-"                             [方式: daemon, service, listen-once]"
 
-#: ../svnserve/main.c:173
+#: ../svnserve/svnserve.c:181
 msgid ""
-"listen port\n"
+"listen port. The default port is 3690.\n"
 "                             [mode: daemon, listen-once]"
 msgstr ""
-"监听端口\n"
-"                             [方式: daemon, listen-once]"
 
-#: ../svnserve/main.c:179
+#: ../svnserve/svnserve.c:187
 msgid ""
 "listen hostname or IP address\n"
+"                             By default svnserve listens on all addresses.\n"
 "                             [mode: daemon, service, listen-once]"
 msgstr ""
-"监听主机名称或IP地址\n"
-"                             [方式: daemon, service, listen-once]"
 
-#: ../svnserve/main.c:183
+#: ../svnserve/svnserve.c:193
 msgid ""
 "listen hostname or IP address\n"
+"                             By default svnserve listens on all addresses.\n"
 "                             [mode: daemon, listen-once]"
 msgstr ""
-"监听主机名称或IP地址\n"
-"                             [方式: daemon, listen-once]"
 
-#: ../svnserve/main.c:188
+#: ../svnserve/svnserve.c:200
 msgid ""
 "prefer IPv6 when resolving the listen hostname\n"
 "                             [IPv4 is preferred by default. Using IPv4 and "
@@ -12761,7 +14103,7 @@
 "                             [默认首选 IPv4。不支持在守护进程模式中同时使用 IPv4\n"
 "                             和 IPv6。如果需要，请使用 inetd 模式或隧道模式。]"
 
-#: ../svnserve/main.c:196
+#: ../svnserve/svnserve.c:208
 msgid ""
 "compression level to use for network transmissions\n"
 "                             [0 .. no compression, 5 .. default, \n"
@@ -12771,19 +14113,15 @@
 "                             [0 .. 不压缩, 5 .. 默认, \n"
 "                              9 .. 最大压缩]"
 
-#: ../svnserve/main.c:202
+#: ../svnserve/svnserve.c:214
 msgid ""
 "size of the extra in-memory cache in MB used to\n"
 "                             minimize redundant operations.\n"
-"                             Default is 128 for threaded and 16 for non-\n"
-"                             threaded mode.\n"
+"                             Default is 16.\n"
 "                             [used for FSFS repositories only]"
 msgstr ""
-"用来减少冗余操作的内存中的额外高速缓存的大小(MB)\n"
-"                             线程模型的默认值是 128，非线程模型的默认值是 16。\n"
-"                             [仅用于 FSFS 仓库]"
 
-#: ../svnserve/main.c:212
+#: ../svnserve/svnserve.c:222
 msgid ""
 "enable or disable caching of deltas between older\n"
 "                             revisions.\n"
@@ -12794,7 +14132,7 @@
 "                             默认值: 否。\n"
 "                             [仅用于 FSFS 仓库]"
 
-#: ../svnserve/main.c:220
+#: ../svnserve/svnserve.c:230
 msgid ""
 "enable or disable caching of file contents\n"
 "                             Default is yes.\n"
@@ -12804,13 +14142,31 @@
 "                             默认值: 是。\n"
 "                             [仅用于 FSFS 仓库]"
 
+#: ../svnserve/svnserve.c:236
+msgid ""
+"enable or disable caching of revision properties.\n"
+"                             Consult the documentation before activating "
+"this.\n"
+"                             Default is no.\n"
+"                             [used for FSFS repositories only]"
+msgstr ""
+
+#: ../svnserve/svnserve.c:244
+msgid ""
+"Optimize network handling based on the assumption\n"
+"                             that most clients are connected with a bitrate "
+"of\n"
+"                             ARG Mbit/s.\n"
+"                             Default is 0 (optimizations disabled)."
+msgstr ""
+
 #. ### Making the assumption here that WIN32 never has fork and so
 #. * ### this option never exists when --service exists.
-#: ../svnserve/main.c:228
+#: ../svnserve/svnserve.c:254
 msgid "use threads instead of fork [mode: daemon]"
 msgstr "使用线程代替进程 [方式: daemon]"
 
-#: ../svnserve/main.c:232
+#: ../svnserve/svnserve.c:258
 msgid ""
 "run in foreground (useful for debugging)\n"
 "                             [mode: daemon]"
@@ -12818,11 +14174,17 @@
 "在前台运行(调试用)\n"
 "                             [方式: daemon]"
 
-#: ../svnserve/main.c:236
+#: ../svnserve/svnserve.c:262
+msgid ""
+"handle one connection at a time in the parent process\n"
+"                             (useful for debugging)"
+msgstr ""
+
+#: ../svnserve/svnserve.c:266
 msgid "svnserve log file"
 msgstr "svnserve 日志文件"
 
-#: ../svnserve/main.c:239
+#: ../svnserve/svnserve.c:269
 msgid ""
 "write server process ID to file ARG\n"
 "                             [mode: daemon, listen-once, service]"
@@ -12830,7 +14192,7 @@
 "写进程 PID 到文件 ARG\n"
 "                             [方式: daemon, listen-once, service]"
 
-#: ../svnserve/main.c:243
+#: ../svnserve/svnserve.c:273
 msgid ""
 "write server process ID to file ARG\n"
 "                             [mode: daemon, listen-once]"
@@ -12838,7 +14200,7 @@
 "写进程 PID 到文件 ARG\n"
 "                             [方式: daemon, listen-once]"
 
-#: ../svnserve/main.c:248
+#: ../svnserve/svnserve.c:278
 msgid ""
 "tunnel username (default is current uid's name)\n"
 "                             [mode: tunnel]"
@@ -12846,12 +14208,18 @@
 "隧道用户名(默认是当前UID对应的用户名)\n"
 "                             [方式: tunnel]"
 
-#: ../svnserve/main.c:266
+#: ../svnserve/svnserve.c:283
+msgid ""
+"virtual host mode (look for repo in directory\n"
+"                             of provided hostname)"
+msgstr ""
+
+#: ../svnserve/svnserve.c:300
 #, c-format
 msgid "Type '%s --help' for usage.\n"
 msgstr "使用“%s --help”得到用法。\n"
 
-#: ../svnserve/main.c:276
+#: ../svnserve/svnserve.c:310
 msgid ""
 "usage: svnserve [-d | -i | -t | -X | --service] [options]\n"
 "\n"
@@ -12861,7 +14229,7 @@
 "\n"
 "有效选项:\n"
 
-#: ../svnserve/main.c:282
+#: ../svnserve/svnserve.c:316
 msgid ""
 "usage: svnserve [-d | -i | -t | -X] [options]\n"
 "\n"
@@ -12871,7 +14239,7 @@
 "\n"
 "有效选项:\n"
 
-#: ../svnserve/main.c:310
+#: ../svnserve/svnserve.c:344
 msgid ""
 "\n"
 "Cyrus SASL authentication is available.\n"
@@ -12879,88 +14247,80 @@
 "\n"
 "Cyrus SASL 认证可用。\n"
 
-#: ../svnserve/main.c:568
+#: ../svnserve/svnserve.c:616
 #, c-format
 msgid "Invalid port '%s'"
 msgstr "无效端口“%s”"
 
-#: ../svnserve/main.c:609
+#: ../svnserve/svnserve.c:657
 #, c-format
 msgid "svnserve: Root path '%s' does not exist or is not a directory.\n"
 msgstr "svnserve: 根路径“%s”不存在，或者不是目录。\n"
 
-#: ../svnserve/main.c:695
+#: ../svnserve/svnserve.c:770
 msgid "You must specify exactly one of -d, -i, -t, --service or -X.\n"
 msgstr "您必须指定 -d, -i, -t, --service 或 -X 中的一个。\n"
 
-#: ../svnserve/main.c:698
+#: ../svnserve/svnserve.c:773
 msgid "You must specify exactly one of -d, -i, -t or -X.\n"
 msgstr "您必须指定 -d, -i, -t 或 -X 中的一个。\n"
 
-#: ../svnserve/main.c:723
+#: ../svnserve/svnserve.c:782
+msgid "You may only specify one of -T or --single-thread\n"
+msgstr ""
+
+#: ../svnserve/svnserve.c:810
 #, c-format
 msgid "Option --tunnel-user is only valid in tunnel mode.\n"
 msgstr "选项 --tunnel-user 只在隧道模式有效。\n"
 
-#: ../svnserve/main.c:794
+#: ../svnserve/svnserve.c:829
+#, c-format
+msgid "Can't open stdout"
+msgstr "无法打开标准输出"
+
+#: ../svnserve/svnserve.c:883
 #, c-format
 msgid ""
 "svnserve: The --service flag is only valid if the process is started by the "
 "Service Control Manager.\n"
 msgstr "svnserve: 只有被服务控制管理器启动时 --service 选项才有效。\n"
 
-#: ../svnserve/main.c:844
+#: ../svnserve/svnserve.c:933
 #, c-format
 msgid "Can't get address info"
 msgstr "不能获取地址信息"
 
-#: ../svnserve/main.c:858
+#: ../svnserve/svnserve.c:947
 #, c-format
 msgid "Can't create server socket"
 msgstr "无法创建服务器套接字"
 
-#: ../svnserve/main.c:869
+#: ../svnserve/svnserve.c:958
 #, c-format
 msgid "Can't bind server socket"
 msgstr "不能绑定服务器套接字"
 
-#: ../svnserve/main.c:977
+#: ../svnserve/svnserve.c:1056
 #, c-format
 msgid "Can't accept client connection"
 msgstr "无法接受客户连接"
 
-#: ../svnserve/main.c:1056
+#: ../svnserve/svnserve.c:1137
 #, c-format
 msgid "Can't create threadattr"
 msgstr "无法创建线程属性"
 
-#: ../svnserve/main.c:1064
+#: ../svnserve/svnserve.c:1145
 #, c-format
 msgid "Can't set detached state"
 msgstr "不能设置分离的状态"
 
-#: ../svnserve/main.c:1077
+#: ../svnserve/svnserve.c:1158
 #, c-format
 msgid "Can't create thread"
 msgstr "无法创建线程"
 
-#: ../svnserve/serve.c:1872
-msgid "Path is not a string"
-msgstr "路径不是字符串"
-
-#: ../svnserve/serve.c:2025
-msgid "Log revprop entry not a string"
-msgstr "日志 revprop 入口不是字符串"
-
-#: ../svnserve/serve.c:2031
-#, c-format
-msgid "Unknown revprop word '%s' in log command"
-msgstr "日志命令中有未知的 revprop 单词 “%s”"
-
-#: ../svnserve/serve.c:2047
-msgid "Log path entry not a string"
-msgstr "日志路径入口不是字符串"
-
 #: ../svnserve/winservice.c:346
 #, c-format
 msgid "Failed to create winservice_start_event"
@@ -12983,7 +14343,7 @@
 "service"
 msgstr "发生内部错误，启动服务失败"
 
-#: ../svnsync/main.c:88
+#: ../svnsync/svnsync.c:92
 msgid ""
 "usage: svnsync initialize DEST_URL SOURCE_URL\n"
 "\n"
@@ -13022,7 +14382,7 @@
 "除了 svnsync 外，你不应该在目标版本库中提交，或者修改版本属性。也就是说，\n"
 "目标版本库应该是源版本库的只读镜像。\n"
 
-#: ../svnsync/main.c:114
+#: ../svnsync/svnsync.c:118
 msgid ""
 "usage: svnsync synchronize DEST_URL [SOURCE_URL]\n"
 "\n"
@@ -13043,7 +14403,7 @@
 "源 URL。如果有不信任的用户/管理员可以写入位于 DEST_URL 的版本库，那么特别\n"
 "推荐指定 SOURCE_URL。\n"
 
-#: ../svnsync/main.c:127
+#: ../svnsync/svnsync.c:131
 msgid ""
 "usage:\n"
 "\n"
@@ -13079,7 +14439,7 @@
 "\n"
 "格式 2 是已经废弃的语法，等价于指定 \"-rREV[:REV2]\" 。\n"
 
-#: ../svnsync/main.c:148
+#: ../svnsync/svnsync.c:152
 msgid ""
 "usage: svnsync info DEST_URL\n"
 "\n"
@@ -13090,7 +14450,7 @@
 "\n"
 "打印位于 DEST_URL 的同步目标版本库信息。\n"
 
-#: ../svnsync/main.c:154
+#: ../svnsync/svnsync.c:158
 msgid ""
 "usage: svnsync help [SUBCOMMAND...]\n"
 "\n"
@@ -13100,11 +14460,11 @@
 "\n"
 "显示本程序或其子命令的用法。\n"
 
-#: ../svnsync/main.c:164
+#: ../svnsync/svnsync.c:168
 msgid "print as little as possible"
 msgstr "尽可能少打印"
 
-#: ../svnsync/main.c:166
+#: ../svnsync/svnsync.c:170
 msgid ""
 "operate on revision ARG (or range ARG1:ARG2)\n"
 "                             A revision argument can be one of:\n"
@@ -13116,11 +14476,11 @@
 "                                 整数         版本号\n"
 "                                 'HEAD'       最新版本"
 
-#: ../svnsync/main.c:174
+#: ../svnsync/svnsync.c:178
 msgid "allow a non-empty destination repository"
 msgstr "允许非空目标版本库"
 
-#: ../svnsync/main.c:180
+#: ../svnsync/svnsync.c:190
 msgid ""
 "specify a username ARG (deprecated;\n"
 "                             see --source-username and --sync-username)"
@@ -13128,7 +14488,7 @@
 "指定用户名称 ARG (已经过时;\n"
 "                             参看 --source-username 和 --sync-username)"
 
-#: ../svnsync/main.c:184
+#: ../svnsync/svnsync.c:194
 msgid ""
 "specify a password ARG (deprecated;\n"
 "                             see --source-password and --sync-password)"
@@ -13136,23 +14496,23 @@
 "指定密码 ARG (已经过时;\n"
 "                             参看 --source-password 和 --sync-password)"
 
-#: ../svnsync/main.c:194
+#: ../svnsync/svnsync.c:204
 msgid "connect to source repository with username ARG"
 msgstr "使用用户名称 ARG 连接源版本库"
 
-#: ../svnsync/main.c:196
+#: ../svnsync/svnsync.c:206
 msgid "connect to source repository with password ARG"
 msgstr "使用密码 ARG 连接源版本库"
 
-#: ../svnsync/main.c:198
+#: ../svnsync/svnsync.c:208
 msgid "connect to sync repository with username ARG"
 msgstr "使用用户名称 ARG 连接目的版本库"
 
-#: ../svnsync/main.c:200
+#: ../svnsync/svnsync.c:210
 msgid "connect to sync repository with password ARG"
 msgstr "使用密码 ARG 连接目的版本库"
 
-#: ../svnsync/main.c:212
+#: ../svnsync/svnsync.c:222
 msgid ""
 "convert translatable properties from encoding ARG\n"
 "                             to UTF-8. If not specified, then properties "
@@ -13162,7 +14522,7 @@
 "将可翻译的属性从编码 ARG 转换到 UTF-8。如果不指定，那么假定属性的编码是\n"
 "                             UTF-8。"
 
-#: ../svnsync/main.c:218
+#: ../svnsync/svnsync.c:228
 msgid ""
 "Disable built-in locking.  Use of this option can\n"
 "                             corrupt the mirror unless you ensure that no "
@@ -13173,7 +14533,7 @@
 "                             会损坏镜像，除非你能确认没有其它 svnsync\n"
 "                             实例同时运行。"
 
-#: ../svnsync/main.c:224
+#: ../svnsync/svnsync.c:234
 msgid ""
 "Steal locks as necessary.  Use, with caution,\n"
 "                             if your mirror repository contains stale locks\n"
@@ -13185,40 +14545,40 @@
 "                             如果你的镜像包含过时的锁，并且没有其它 svnsync\n"
 "                             实例同时运行。"
 
-#: ../svnsync/main.c:348
+#: ../svnsync/svnsync.c:357
 msgid ""
 "Target server does not support atomic revision property edits; consider "
 "upgrading it to 1.7 or using an external locking program"
 msgstr "目标服务器不支持原子版本的属性编辑; 请考虑升级到 1.7 或者使用外部加锁程序"
 
-#: ../svnsync/main.c:362
+#: ../svnsync/svnsync.c:371
 #, c-format
 msgid "Stole lock previously held by '%s'\n"
 msgstr "窃取被 '%s' 持有的锁\n"
 
-#: ../svnsync/main.c:451
+#: ../svnsync/svnsync.c:460
 #, c-format
 msgid "Session is rooted at '%s' but the repos root is '%s'"
 msgstr "会话根是“%s”，但是版本库根是“%s”"
 
-#: ../svnsync/main.c:593
+#: ../svnsync/svnsync.c:602
 #, c-format
 msgid "Copied properties for revision %ld (%s* properties skipped).\n"
 msgstr "从版本 %ld (忽略 %s* 属性)复制属性。\n"
 
-#: ../svnsync/main.c:598
+#: ../svnsync/svnsync.c:607
 #, c-format
 msgid "Copied properties for revision %ld.\n"
 msgstr "复制版本 %ld 的属性。\n"
 
-#: ../svnsync/main.c:614
+#: ../svnsync/svnsync.c:623
 #, c-format
 msgid ""
 "NOTE: Normalized %s* properties to LF line endings (%d rev-props, %d node-"
 "props).\n"
 msgstr "注意: 已经标准化 %s* 属性为 LF 行尾 (%d rev-props, %d node-props)。\n"
 
-#: ../svnsync/main.c:742
+#: ../svnsync/svnsync.c:753
 msgid ""
 "Destination repository already contains revision history; consider using --"
 "allow-non-empty if the repository's revisions are known to mirror their "
@@ -13227,37 +14587,37 @@
 "目标版本库已经包含版本历史；如果你确信它们是镜像源版本库的对应版本的话，\n"
 "考虑使用选项 '--allow-non-empty'"
 
-#: ../svnsync/main.c:751
+#: ../svnsync/svnsync.c:762
 #, c-format
 msgid "Destination repository is already synchronizing from '%s'"
 msgstr "目标版本库已经与“%s”同步"
 
-#: ../svnsync/main.c:786
+#: ../svnsync/svnsync.c:797
 msgid "Destination repository has more revisions than source repository"
 msgstr "目标版本库的版本数量比源版本库多"
 
-#: ../svnsync/main.c:851 ../svnsync/main.c:854 ../svnsync/main.c:1364
-#: ../svnsync/main.c:1371 ../svnsync/main.c:1608 ../svnsync/main.c:1611
-#: ../svnsync/main.c:1655
+#: ../svnsync/svnsync.c:862 ../svnsync/svnsync.c:865 ../svnsync/svnsync.c:1518
+#: ../svnsync/svnsync.c:1525 ../svnsync/svnsync.c:1762
+#: ../svnsync/svnsync.c:1765 ../svnsync/svnsync.c:1809
 #, c-format
 msgid "Path '%s' is not a URL"
 msgstr "路径“%s”不是URL"
 
-#: ../svnsync/main.c:881
+#: ../svnsync/svnsync.c:892
 #, c-format
 msgid "Committed revision %ld.\n"
 msgstr "已提交版本 %ld。\n"
 
-#: ../svnsync/main.c:927
+#: ../svnsync/svnsync.c:935
 msgid "Destination repository has not been initialized"
 msgstr "目标版本库没有初始化"
 
-#: ../svnsync/main.c:1147
+#: ../svnsync/svnsync.c:1301
 #, c-format
-msgid "Commit created rev %ld but should have created %ld"
-msgstr "提交创建版本 %ld，应该创建版本 %ld"
+msgid "Commit created r%ld but should have created r%ld"
+msgstr ""
 
-#: ../svnsync/main.c:1262
+#: ../svnsync/svnsync.c:1416
 #, c-format
 msgid ""
 "Revision being currently copied (%ld), last merged revision (%ld), and "
@@ -13266,57 +14626,57 @@
 msgstr ""
 "当前复制版本(%ld), 最后合并版本(%ld), 和目标 HEAD (%ld) 不一致；你是否使用非svnsync方法提交到目标版本库？"
 
-#: ../svnsync/main.c:1299
+#: ../svnsync/svnsync.c:1453
 #, c-format
 msgid ""
 "Destination HEAD (%ld) is not the last merged revision (%ld); have you "
 "committed to the destination without using svnsync?"
 msgstr "目标 HEAD (%ld)不是最后合并版本(%ld)；你是否使用非 svnsync 方法提交到目标版本库？"
 
-#: ../svnsync/main.c:1422 ../svnsync/main.c:1427
+#: ../svnsync/svnsync.c:1576 ../svnsync/svnsync.c:1581
 #, c-format
 msgid ""
 "Cannot copy revprops for a revision (%ld) that has not been synchronized yet"
 msgstr "不能在尚未同步时复制版本(%ld)的 revprops"
 
-#: ../svnsync/main.c:1491 ../svnsync/main.c:1511
+#: ../svnsync/svnsync.c:1645 ../svnsync/svnsync.c:1665
 #, c-format
 msgid "Invalid revision number (%ld)"
 msgstr "无效的版本号 (%ld)"
 
-#: ../svnsync/main.c:1561
+#: ../svnsync/svnsync.c:1715
 msgid ""
 "Cannot specify revisions via both command-line arguments and the --revision "
 "(-r) option"
 msgstr "不能同时使用"
 
-#: ../svnsync/main.c:1569 ../svnsync/main.c:1916
+#: ../svnsync/svnsync.c:1723 ../svnsync/svnsync.c:2066
 #, c-format
 msgid "Invalid revision range '%s' provided"
 msgstr "提供了无效的版本范围 '%s'"
 
-#: ../svnsync/main.c:1669
+#: ../svnsync/svnsync.c:1822
 #, c-format
 msgid "Repository '%s' is not initialized for synchronization"
 msgstr "版本库“%s”没有为同步初始化"
 
 #. Print the info.
-#: ../svnsync/main.c:1677
+#: ../svnsync/svnsync.c:1828
 #, c-format
 msgid "Source URL: %s\n"
 msgstr "源 URL: %s\n"
 
-#: ../svnsync/main.c:1679
+#: ../svnsync/svnsync.c:1830
 #, c-format
 msgid "Source Repository UUID: %s\n"
 msgstr "源版本库 UUID: %s\n"
 
-#: ../svnsync/main.c:1682
+#: ../svnsync/svnsync.c:1833
 #, c-format
 msgid "Last Merged Revision: %s\n"
 msgstr "最后合并的版本: %s\n"
 
-#: ../svnsync/main.c:1699
+#: ../svnsync/svnsync.c:1850
 msgid ""
 "general usage: svnsync SUBCOMMAND DEST_URL  [ARGS & OPTIONS ...]\n"
 "Type 'svnsync help <subcommand>' for help on a specific subcommand.\n"
@@ -13330,7 +14690,7 @@
 "\n"
 "可用的子命令:\n"
 
-#: ../svnsync/main.c:1950
+#: ../svnsync/svnsync.c:2114
 msgid ""
 "Cannot use --username or --password with any of --source-username, --source-"
 "password, --sync-username, or --sync-password.\n"
@@ -13338,11 +14698,11 @@
 "不能将 --username 或 --password 与 --source-username, --source-password, --sync-"
 "username, 或 --sync-password 一起使用。\n"
 
-#: ../svnsync/main.c:1974
+#: ../svnsync/svnsync.c:2138
 msgid "--disable-locking and --steal-lock are mutually exclusive"
 msgstr "--disable-locking 与 --steal-lock 是互斥的"
 
-#: ../svnsync/main.c:2050
+#: ../svnsync/svnsync.c:2214
 #, c-format
 msgid ""
 "Subcommand '%s' doesn't accept option '%s'\n"
@@ -13351,33 +14711,33 @@
 "子命令“%s”不接受选项“%s”\n"
 "使用“svnsync help %s”得到用法。\n"
 
-#: ../svnsync/main.c:2134
+#: ../svnsync/svnsync.c:2297
 msgid "Try 'svnsync help' for more info"
 msgstr "请使用 “svnsync help” 以得到更多信息"
 
-#: ../svnversion/main.c:48
+#: ../svnversion/svnversion.c:50
 #, c-format
 msgid "Type 'svnversion --help' for usage.\n"
 msgstr "使用 “svnversion --help” 得到用法。\n"
 
-#: ../svnversion/main.c:59
+#: ../svnversion/svnversion.c:61
 #, c-format
 msgid ""
 "usage: svnversion [OPTIONS] [WC_PATH [TRAIL_URL]]\n"
 "\n"
-"  Produce a compact 'version number' for the working copy path\n"
+"  Produce a compact version identifier for the working copy path\n"
 "  WC_PATH.  TRAIL_URL is the trailing portion of the URL used to\n"
 "  determine if WC_PATH itself is switched (detection of switches\n"
-"  within WC_PATH does not rely on TRAIL_URL).  The version number\n"
+"  within WC_PATH does not rely on TRAIL_URL).  The version identifier\n"
 "  is written to standard output.  For example:\n"
 "\n"
 "    $ svnversion . /repos/svn/trunk\n"
 "    4168\n"
 "\n"
-"  The version number will be a single number if the working\n"
+"  The version identifier will be a single number if the working\n"
 "  copy is single revision, unmodified, not switched and with\n"
-"  an URL that matches the TRAIL_URL argument.  If the working\n"
-"  copy is unusual the version number will be more complex:\n"
+"  a URL that matches the TRAIL_URL argument.  If the working\n"
+"  copy is unusual the version identifier will be more complex:\n"
 "\n"
 "   4123:4168     mixed revision working copy\n"
 "   4168M         modified working copy\n"
@@ -13394,69 +14754,42 @@
 "\n"
 "Valid options:\n"
 msgstr ""
-"用法: svnversion [OPTIONS] [WC_PATH [TRAIL_URL]]\n"
-"\n"
-"  为工作副本路径 WC_PATH 产生紧凑的 “版本号”。 TRAIL_URL 是\n"
-"  URL 的结尾部分，用来判断 WC_PATH 是否已切换过 (检测 WC_PATH\n"
-"  内是否已经切换并不依赖于 TRAIL_URL)。版本号会写至标准输出。\n"
-"  例如: \n"
-"\n"
-"    $ svnversion . /repos/svn/trunk \n"
-"    4168\n"
-"\n"
-"  如果工作副本是单一版本，未经修改，未经切换，而且其 URL 匹配\n"
-"  TRAIL_URL 参数，那么版本号将会是单一数字。如果工作副本凌乱，\n"
-"  那么版本号就会复杂得多: \n"
-"\n"
-"   4123:4168     混合版本\n"
-"   4168M         已修改\n"
-"   4123S         已切换\n"
-"   4123P         局部工作副本，没有全部检出。\n"
-"   4123:4168MS   混合版本，有修改，工作副本已切换\n"
-"\n"
-"  如果 WC_PATH 不是工作副本，那么它会输出 '未版本控制的目录'\n"
-"  或者 '未版本控制的文件'。如果 WC_PATH 是新增，复制或移动后\n"
-"  的路径，那么它会输出 '未提交的本地增加，复制或移动'。\n"
-"\n"
-"  如果调用时没有参数，则 WC_PATH 默认为当前目录。\n"
-"\n"
-"有效选项:\n"
 
-#: ../svnversion/main.c:136
+#: ../svnversion/svnversion.c:137
 msgid "do not output the trailing newline"
 msgstr "不输出其后的换行符"
 
-#: ../svnversion/main.c:137
+#: ../svnversion/svnversion.c:138
 msgid "last changed rather than current revisions"
 msgstr "最近一次改变的，而不是目前的版本"
 
-#: ../svnversion/main.c:257
+#: ../svnversion/svnversion.c:246
 #, c-format
 msgid "Unversioned symlink%s"
 msgstr "未版本控制的符号链接 %s"
 
-#: ../svnversion/main.c:260
+#: ../svnversion/svnversion.c:249
 #, c-format
 msgid "Unversioned directory%s"
 msgstr "目录 %s 未版本控制"
 
-#: ../svnversion/main.c:263
+#: ../svnversion/svnversion.c:252
 #, c-format
 msgid "Unversioned file%s"
 msgstr "文件 %s 未版本控制"
 
-#: ../svnversion/main.c:269
+#: ../svnversion/svnversion.c:258
 #, c-format
 msgid "'%s' doesn't exist\n"
 msgstr "“%s” 不存在\n"
 
-#: ../svnversion/main.c:270
+#: ../svnversion/svnversion.c:259
 #, c-format
 msgid "'%s' is of unknown type\n"
 msgstr "“%s” 的类型未知\n"
 
 #. Local uncommitted modifications, no revision info was found.
-#: ../svnversion/main.c:285
+#: ../svnversion/svnversion.c:274
 #, c-format
 msgid "Uncommitted local addition, copy or move%s"
 msgstr "未提交的本地增加，复制或移动 %s"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/sudoers.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/sudoers.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/sudoers.po	2014-02-24 08:24:34.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/sudoers.po	2014-03-24 09:42:41.000000000 +0000
@@ -14,11 +14,11 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:53+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:08+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
-#: confstr.sh:2
+#: plugins/sudoers/auth/pam.c:333
 msgid "Password:"
 msgstr "密码："
 
@@ -30,21 +30,21 @@
 msgid "Sorry, try again."
 msgstr "对不起，请重试。"
 
-#: plugins/sudoers/alias.c:136
+#: plugins/sudoers/alias.c:125
 #, c-format
 msgid "Alias `%s' already defined"
 msgstr "别名“%s”已定义"
 
-#: plugins/sudoers/auth/bsdauth.c:75
+#: plugins/sudoers/auth/bsdauth.c:78
 #, c-format
 msgid "unable to get login class for user %s"
 msgstr "无法获取用户 %s 的登录类别(login class)"
 
-#: plugins/sudoers/auth/bsdauth.c:81
+#: plugins/sudoers/auth/bsdauth.c:84
 msgid "unable to begin bsd authentication"
 msgstr "无法开始 bsd 认证"
 
-#: plugins/sudoers/auth/bsdauth.c:89
+#: plugins/sudoers/auth/bsdauth.c:92
 msgid "invalid authentication type"
 msgstr "无效的认证类型"
 
@@ -52,20 +52,23 @@
 msgid "unable to initialize BSD authentication"
 msgstr "无法初始化 bsd 认证"
 
-#: plugins/sudoers/auth/fwtk.c:59
+#: plugins/sudoers/auth/fwtk.c:60
+#, c-format
 msgid "unable to read fwtk config"
 msgstr "无法读取 fwtk 配置"
 
-#: plugins/sudoers/auth/fwtk.c:64
+#: plugins/sudoers/auth/fwtk.c:65
+#, c-format
 msgid "unable to connect to authentication server"
 msgstr "无法连接到认证服务器"
 
-#: plugins/sudoers/auth/fwtk.c:70 plugins/sudoers/auth/fwtk.c:94
-#: plugins/sudoers/auth/fwtk.c:127
+#: plugins/sudoers/auth/fwtk.c:71 plugins/sudoers/auth/fwtk.c:95
+#: plugins/sudoers/auth/fwtk.c:128
+#, c-format
 msgid "lost connection to authentication server"
 msgstr "丢失了到认证服务器的连接"
 
-#: plugins/sudoers/auth/fwtk.c:74
+#: plugins/sudoers/auth/fwtk.c:75
 #, c-format
 msgid ""
 "authentication server error:\n"
@@ -79,7 +82,7 @@
 msgid "%s: unable to convert principal to string ('%s'): %s"
 msgstr "%s：无法将主体(principal)转换为字符串(“%s”)：%s"
 
-#: plugins/sudoers/auth/kerb5.c:159
+#: plugins/sudoers/auth/kerb5.c:160
 #, c-format
 msgid "%s: unable to parse '%s': %s"
 msgstr "%s：无法解析“%s”：%s"
@@ -89,12 +92,12 @@
 msgid "%s: unable to resolve credential cache: %s"
 msgstr "%s：无法解析凭据缓存：%s"
 
-#: plugins/sudoers/auth/kerb5.c:217
+#: plugins/sudoers/auth/kerb5.c:218
 #, c-format
 msgid "%s: unable to allocate options: %s"
 msgstr "%s：无法分配选项：%s"
 
-#: plugins/sudoers/auth/kerb5.c:233
+#: plugins/sudoers/auth/kerb5.c:234
 #, c-format
 msgid "%s: unable to get credentials: %s"
 msgstr "%s：无法获取凭据：%s"
@@ -109,25 +112,25 @@
 msgid "%s: unable to store credential in cache: %s"
 msgstr "%s：无法在缓存中储存凭据：%s"
 
-#: plugins/sudoers/auth/kerb5.c:315
+#: plugins/sudoers/auth/kerb5.c:316
 #, c-format
 msgid "%s: unable to get host principal: %s"
 msgstr "%s：无法获取主机主体(principal)：%s"
 
-#: plugins/sudoers/auth/kerb5.c:330
+#: plugins/sudoers/auth/kerb5.c:331
 #, c-format
 msgid "%s: Cannot verify TGT! Possible attack!: %s"
 msgstr "%s：无法验证目标！可能遭到了攻击！：%s"
 
-#: plugins/sudoers/auth/pam.c:98
+#: plugins/sudoers/auth/pam.c:100
 msgid "unable to initialize PAM"
 msgstr "无法初始化 PAM"
 
-#: plugins/sudoers/auth/pam.c:149
+#: plugins/sudoers/auth/pam.c:144
 msgid "account validation failure, is your account locked?"
 msgstr "账户验证失败，您的账户是不是上锁了？"
 
-#: plugins/sudoers/auth/pam.c:153
+#: plugins/sudoers/auth/pam.c:148
 msgid "Account or password is expired, reset your password and try again"
 msgstr "账户或密码过期，重置您的密码并重试"
 
@@ -136,11 +139,11 @@
 msgid "unable to change expired password: %s"
 msgstr "无法更改过期的密码：%s"
 
-#: plugins/sudoers/auth/pam.c:166
+#: plugins/sudoers/auth/pam.c:159
 msgid "Password expired, contact your system administrator"
 msgstr "密码过期，联系您的系统管理员"
 
-#: plugins/sudoers/auth/pam.c:170
+#: plugins/sudoers/auth/pam.c:163
 msgid ""
 "Account expired or PAM config lacks an \"account\" section for sudo, contact "
 "your system administrator"
@@ -151,44 +154,52 @@
 msgid "PAM authentication error: %s"
 msgstr "PAM 认证出错：%s"
 
-#: plugins/sudoers/auth/rfc1938.c:103 plugins/sudoers/visudo.c:222
+#: plugins/sudoers/auth/rfc1938.c:104 plugins/sudoers/visudo.c:220
 #, c-format
 msgid "you do not exist in the %s database"
 msgstr "%s 数据库中没有您"
 
-#: plugins/sudoers/auth/securid5.c:80
+#: plugins/sudoers/auth/securid5.c:81
+#, c-format
 msgid "failed to initialise the ACE API library"
 msgstr "初始化 ACE API 库失败"
 
-#: plugins/sudoers/auth/securid5.c:106
+#: plugins/sudoers/auth/securid5.c:107
+#, c-format
 msgid "unable to contact the SecurID server"
 msgstr "无法联络 SecurID 服务器"
 
-#: plugins/sudoers/auth/securid5.c:115
+#: plugins/sudoers/auth/securid5.c:116
+#, c-format
 msgid "User ID locked for SecurID Authentication"
 msgstr "为进行 SecurID 认证，已锁定用户 ID"
 
-#: plugins/sudoers/auth/securid5.c:119 plugins/sudoers/auth/securid5.c:170
+#: plugins/sudoers/auth/securid5.c:120 plugins/sudoers/auth/securid5.c:171
+#, c-format
 msgid "invalid username length for SecurID"
 msgstr "SecurID 的用户名长度无效"
 
-#: plugins/sudoers/auth/securid5.c:123 plugins/sudoers/auth/securid5.c:175
+#: plugins/sudoers/auth/securid5.c:124 plugins/sudoers/auth/securid5.c:176
+#, c-format
 msgid "invalid Authentication Handle for SecurID"
 msgstr "SecurID 的认证句柄无效"
 
-#: plugins/sudoers/auth/securid5.c:127
+#: plugins/sudoers/auth/securid5.c:128
+#, c-format
 msgid "SecurID communication failed"
 msgstr "SecurID 通讯失败"
 
-#: plugins/sudoers/auth/securid5.c:131 plugins/sudoers/auth/securid5.c:214
+#: plugins/sudoers/auth/securid5.c:132 plugins/sudoers/auth/securid5.c:215
+#, c-format
 msgid "unknown SecurID error"
 msgstr "未知的 SecurID 错误"
 
-#: plugins/sudoers/auth/securid5.c:165
+#: plugins/sudoers/auth/securid5.c:166
+#, c-format
 msgid "invalid passcode length for SecurID"
 msgstr "无效的 SecurID 密码长度"
 
-#: plugins/sudoers/auth/sia.c:108
+#: plugins/sudoers/auth/sia.c:109
 msgid "unable to initialize SIA session"
 msgstr "无法初始化 SIA 会话"
 
@@ -206,21 +217,23 @@
 msgid "no authentication methods"
 msgstr "无认证方法"
 
-#: plugins/sudoers/auth/sudo_auth.c:205
+#: plugins/sudoers/auth/sudo_auth.c:206
 msgid ""
 "There are no authentication methods compiled into sudo!  If you want to turn "
 "off authentication, use the --disable-authentication configure option."
 msgstr "sudo 编译时没有加入任何认证方法！如果您想关闭认证，使用 --disable-authentication 配置选项。"
 
-#: plugins/sudoers/auth/sudo_auth.c:389
+#: plugins/sudoers/auth/sudo_auth.c:374
 msgid "Authentication methods:"
 msgstr "认证方法："
 
-#: plugins/sudoers/bsm_audit.c:91 plugins/sudoers/bsm_audit.c:158
+#: plugins/sudoers/bsm_audit.c:90 plugins/sudoers/bsm_audit.c:153
+#, c-format
 msgid "Could not determine audit condition"
 msgstr "无法确定审核条件"
 
-#: plugins/sudoers/bsm_audit.c:134 plugins/sudoers/bsm_audit.c:199
+#: plugins/sudoers/bsm_audit.c:129 plugins/sudoers/bsm_audit.c:190
+#, c-format
 msgid "unable to commit audit record"
 msgstr "无法提交审核记录"
 
@@ -244,15 +257,15 @@
 "    #3) 权力越大，责任越大。\n"
 "\n"
 
-#: plugins/sudoers/check.c:227 plugins/sudoers/check.c:233
-#: plugins/sudoers/sudoers.c:562 plugins/sudoers/sudoers.c:588
+#: plugins/sudoers/check.c:758 plugins/sudoers/check.c:764
+#: plugins/sudoers/sudoers.c:851 plugins/sudoers/sudoers.c:855
 #, c-format
 msgid "unknown uid: %u"
 msgstr "未知的用户 ID：%u"
 
-#: plugins/sudoers/check.c:230 plugins/sudoers/policy.c:657
-#: plugins/sudoers/sudoers.c:850 plugins/sudoers/testsudoers.c:211
-#: plugins/sudoers/testsudoers.c:363
+#: plugins/sudoers/check.c:761 plugins/sudoers/sudoers.c:792
+#: plugins/sudoers/sudoers.c:1120 plugins/sudoers/testsudoers.c:225
+#: plugins/sudoers/testsudoers.c:369
 #, c-format
 msgid "unknown user: %s"
 msgstr "未知用户：%s"
@@ -649,65 +662,65 @@
 msgid "Maximum I/O log sequence number: %u"
 msgstr "最大 I/O 日志序列号：%u"
 
-#: plugins/sudoers/defaults.c:210 plugins/sudoers/defaults.c:596
-#: plugins/sudoers/visudo_json.c:611 plugins/sudoers/visudo_json.c:647
+#: plugins/sudoers/defaults.c:208
 #, c-format
 msgid "unknown defaults entry `%s'"
 msgstr "未知的默认条目“%s”"
 
-#: plugins/sudoers/defaults.c:218 plugins/sudoers/defaults.c:228
-#: plugins/sudoers/defaults.c:248 plugins/sudoers/defaults.c:261
-#: plugins/sudoers/defaults.c:274 plugins/sudoers/defaults.c:287
-#: plugins/sudoers/defaults.c:300 plugins/sudoers/defaults.c:320
-#: plugins/sudoers/defaults.c:330
+#: plugins/sudoers/defaults.c:216 plugins/sudoers/defaults.c:226
+#: plugins/sudoers/defaults.c:246 plugins/sudoers/defaults.c:259
+#: plugins/sudoers/defaults.c:272 plugins/sudoers/defaults.c:285
+#: plugins/sudoers/defaults.c:298 plugins/sudoers/defaults.c:318
+#: plugins/sudoers/defaults.c:328
 #, c-format
 msgid "value `%s' is invalid for option `%s'"
 msgstr "值“%s”对选项“%s”无效"
 
-#: plugins/sudoers/defaults.c:221 plugins/sudoers/defaults.c:231
-#: plugins/sudoers/defaults.c:239 plugins/sudoers/defaults.c:256
-#: plugins/sudoers/defaults.c:269 plugins/sudoers/defaults.c:282
-#: plugins/sudoers/defaults.c:295 plugins/sudoers/defaults.c:315
-#: plugins/sudoers/defaults.c:326
+#: plugins/sudoers/defaults.c:219 plugins/sudoers/defaults.c:229
+#: plugins/sudoers/defaults.c:237 plugins/sudoers/defaults.c:254
+#: plugins/sudoers/defaults.c:267 plugins/sudoers/defaults.c:280
+#: plugins/sudoers/defaults.c:293 plugins/sudoers/defaults.c:313
+#: plugins/sudoers/defaults.c:324
 #, c-format
 msgid "no value specified for `%s'"
 msgstr "没有给“%s”指定值"
 
-#: plugins/sudoers/defaults.c:244
+#: plugins/sudoers/defaults.c:242
 #, c-format
 msgid "values for `%s' must start with a '/'"
 msgstr "“%s”的值必须以“/”开头"
 
-#: plugins/sudoers/defaults.c:306
+#: plugins/sudoers/defaults.c:304
 #, c-format
 msgid "option `%s' does not take a value"
 msgstr "“%s”选项不带值"
 
-#: plugins/sudoers/env.c:288 plugins/sudoers/env.c:293
-#: plugins/sudoers/env.c:395 plugins/sudoers/linux_audit.c:82
-#: plugins/sudoers/policy.c:442 plugins/sudoers/policy.c:449
-#: plugins/sudoers/prompt.c:171 plugins/sudoers/sudoers.c:656
-#: plugins/sudoers/testsudoers.c:241
+#: plugins/sudoers/check.c:399 plugins/sudoers/env.c:289
+#: plugins/sudoers/env.c:294 plugins/sudoers/env.c:395
+#: plugins/sudoers/env.c:447 plugins/sudoers/linux_audit.c:82
+#: plugins/sudoers/sudoers.c:670 plugins/sudoers/sudoers.c:677
+#: plugins/sudoers/sudoers.c:936 plugins/sudoers/testsudoers.c:253
 #, c-format
 msgid "internal error, %s overflow"
 msgstr "内部错误，%s 溢出"
 
 #: plugins/sudoers/env.c:367
+#, c-format
 msgid "sudo_putenv: corrupted envp, length mismatch"
 msgstr "sudo_putenv：envp 损坏，长度不符"
 
-#: plugins/sudoers/env.c:1014
+#: plugins/sudoers/env.c:992
 #, c-format
 msgid ""
 "sorry, you are not allowed to set the following environment variables: %s"
 msgstr "对不起，您无权设置以下环境变量：%s"
 
-#: plugins/sudoers/group_plugin.c:94
+#: plugins/sudoers/group_plugin.c:103
 #, c-format
 msgid "%s must be owned by uid %d"
 msgstr "%s 必须属于用户 ID %d"
 
-#: plugins/sudoers/group_plugin.c:98
+#: plugins/sudoers/group_plugin.c:107
 #, c-format
 msgid "%s must only be writable by owner"
 msgstr "%s 必须只对所有者可写"
@@ -717,73 +730,77 @@
 msgid "unable to load %s: %s"
 msgstr "无法加载 %s：%s"
 
-#: plugins/sudoers/group_plugin.c:110
+#: plugins/sudoers/group_plugin.c:119
 #, c-format
 msgid "unable to find symbol \"group_plugin\" in %s"
 msgstr "无法在 %s 中找到符号“group_plugin”"
 
-#: plugins/sudoers/group_plugin.c:115
+#: plugins/sudoers/group_plugin.c:124
 #, c-format
 msgid "%s: incompatible group plugin major version %d, expected %d"
 msgstr "%s：不兼容的组插件主版本号 %d，应为 %d"
 
-#: plugins/sudoers/interfaces.c:118
+#: plugins/sudoers/interfaces.c:112
 msgid "Local IP address and netmask pairs:\n"
 msgstr "本地 IP 地址和网络掩码对：\n"
 
-#: plugins/sudoers/iolog.c:99 plugins/sudoers/iolog.c:112
-#: plugins/sudoers/timestamp.c:200 plugins/sudoers/timestamp.c:244
+#: plugins/sudoers/check.c:491 plugins/sudoers/check.c:535
+#: plugins/sudoers/iolog.c:158
 #, c-format
 msgid "%s exists but is not a directory (0%o)"
 msgstr "%s 存在，但不是目录(0%o)"
 
-#: plugins/sudoers/iolog.c:109 plugins/sudoers/iolog.c:123
-#: plugins/sudoers/iolog.c:127 plugins/sudoers/timestamp.c:165
-#: plugins/sudoers/timestamp.c:221 plugins/sudoers/timestamp.c:271
+#: plugins/sudoers/check.c:264 plugins/sudoers/check.c:512
+#: plugins/sudoers/check.c:562 plugins/sudoers/iolog.c:123
+#: plugins/sudoers/iolog.c:156
 #, c-format
 msgid "unable to mkdir %s"
 msgstr "无法创建目录 %s"
 
-#: plugins/sudoers/iolog.c:190 plugins/sudoers/sudoers.c:710
-#: plugins/sudoers/sudoreplay.c:340 plugins/sudoers/sudoreplay.c:811
-#: plugins/sudoers/sudoreplay.c:1005 plugins/sudoers/timestamp.c:155
-#: plugins/sudoers/visudo.c:824 plugins/sudoers/visudo_json.c:995
-#: plugins/sudoers/visudo_json.c:1003
+#: plugins/sudoers/check.c:252 plugins/sudoers/iolog.c:172
+#: plugins/sudoers/sudoers.c:988 plugins/sudoers/sudoreplay.c:355
+#: plugins/sudoers/sudoreplay.c:817 plugins/sudoers/sudoreplay.c:974
+#: plugins/sudoers/visudo.c:818
 #, c-format
 msgid "unable to open %s"
 msgstr "无法打开 %s"
 
-#: plugins/sudoers/iolog.c:223 plugins/sudoers/sudoers.c:713
-#: plugins/sudoers/sudoreplay.c:1112
+#: plugins/sudoers/iolog.c:205 plugins/sudoers/sudoers.c:991
 #, c-format
 msgid "unable to read %s"
 msgstr "无法读取 %s"
 
-#: plugins/sudoers/iolog.c:247 plugins/sudoers/sudoreplay.c:580
-#: plugins/sudoers/timestamp.c:159
+#: plugins/sudoers/check.c:256 plugins/sudoers/iolog.c:229
 #, c-format
 msgid "unable to write to %s"
 msgstr "无法写入 %s"
 
-#: plugins/sudoers/iolog.c:307 plugins/sudoers/iolog.c:500
+#: plugins/sudoers/iolog.c:258 plugins/sudoers/iolog.c:261
+#: plugins/sudoers/iolog.c:526 plugins/sudoers/iolog.c:531
+#: plugins/sudoers/iolog.c:537 plugins/sudoers/iolog.c:545
+#: plugins/sudoers/iolog.c:553 plugins/sudoers/iolog.c:561
+#: plugins/sudoers/iolog.c:569
 #, c-format
 msgid "unable to create %s"
 msgstr "无法创建 %s"
 
-#: plugins/sudoers/ldap.c:403
+#: plugins/sudoers/ldap.c:387
+#, c-format
 msgid "sudo_ldap_conf_add_ports: port too large"
 msgstr "sudo_ldap_conf_add_ports：端口太大"
 
-#: plugins/sudoers/ldap.c:426
+#: plugins/sudoers/ldap.c:410
+#, c-format
 msgid "sudo_ldap_conf_add_ports: out of space expanding hostbuf"
 msgstr "sudo_ldap_conf_add_ports：扩展主机缓存时空间不足"
 
-#: plugins/sudoers/ldap.c:458
+#: plugins/sudoers/ldap.c:440
 #, c-format
 msgid "unsupported LDAP uri type: %s"
 msgstr "不支持的 LDAP URI 类型：%s"
 
-#: plugins/sudoers/ldap.c:489
+#: plugins/sudoers/ldap.c:475
+#, c-format
 msgid "unable to mix ldap and ldaps URIs"
 msgstr "无法混合 ldap 和 ldaps URI"
 
@@ -791,33 +808,38 @@
 msgid "starttls not supported when using ldaps"
 msgstr "使用 ldaps 时不支持 starttls"
 
-#: plugins/sudoers/ldap.c:511
+#: plugins/sudoers/ldap.c:498
+#, c-format
 msgid "sudo_ldap_parse_uri: out of space building hostbuf"
 msgstr "sudo_ldap_parse_uri：构建主机缓存时空间不足"
 
-#: plugins/sudoers/ldap.c:592
+#: plugins/sudoers/ldap.c:572
 #, c-format
 msgid "unable to initialize SSL cert and key db: %s"
 msgstr "无法初始化 SSL 证书和密钥数据库：%s"
 
-#: plugins/sudoers/ldap.c:595
+#: plugins/sudoers/ldap.c:575
 #, c-format
 msgid "you must set TLS_CERT in %s to use SSL"
 msgstr "要使用 SSL，您必须在 %s 中设置 TLS_CERT"
 
-#: plugins/sudoers/ldap.c:1086
+#: plugins/sudoers/ldap.c:992
+#, c-format
 msgid "unable to get GMT time"
 msgstr "无法获取 GMT 时间"
 
-#: plugins/sudoers/ldap.c:1092
+#: plugins/sudoers/ldap.c:998
+#, c-format
 msgid "unable to format timestamp"
 msgstr "无法格式化时间戳"
 
-#: plugins/sudoers/ldap.c:1100
+#: plugins/sudoers/ldap.c:1006
+#, c-format
 msgid "unable to build time filter"
 msgstr "无法构建时间过滤器"
 
-#: plugins/sudoers/ldap.c:1319
+#: plugins/sudoers/ldap.c:1225
+#, c-format
 msgid "sudo_ldap_build_pass1 allocation mismatch"
 msgstr "sudo_ldap_build_pass1 分配不匹配"
 
@@ -826,7 +848,7 @@
 msgid "%s: %s: %s: %s"
 msgstr "%s：%s：%s：%s"
 
-#: plugins/sudoers/ldap.c:1899
+#: plugins/sudoers/ldap.c:1761
 #, c-format
 msgid ""
 "\n"
@@ -835,7 +857,7 @@
 "\n"
 "LDAP 角色：%s\n"
 
-#: plugins/sudoers/ldap.c:1901
+#: plugins/sudoers/ldap.c:1763
 #, c-format
 msgid ""
 "\n"
@@ -844,38 +866,40 @@
 "\n"
 "LDAP 角色：未知\n"
 
-#: plugins/sudoers/ldap.c:1948
+#: plugins/sudoers/ldap.c:1810
 #, c-format
 msgid "    Order: %s\n"
 msgstr "    顺序：%s\n"
 
-#: plugins/sudoers/ldap.c:1956 plugins/sudoers/parse.c:504
-#: plugins/sudoers/sssd.c:1295
+#: plugins/sudoers/ldap.c:1818 plugins/sudoers/sssd.c:1168
 #, c-format
 msgid "    Commands:\n"
 msgstr "    命令：\n"
 
-#: plugins/sudoers/ldap.c:2499
+#: plugins/sudoers/ldap.c:2240
 #, c-format
 msgid "unable to initialize LDAP: %s"
 msgstr "无法初始化 LDAP：%s"
 
-#: plugins/sudoers/ldap.c:2541
+#: plugins/sudoers/ldap.c:2274
+#, c-format
 msgid ""
 "start_tls specified but LDAP libs do not support ldap_start_tls_s() or "
 "ldap_start_tls_s_np()"
 msgstr "指定了 start_tls，但 LDAP 库不支持 ldap_start_tls_s() 或 ldap_start_tls_s_np()"
 
-#: plugins/sudoers/ldap.c:2774
+#: plugins/sudoers/ldap.c:2510
 #, c-format
 msgid "invalid sudoOrder attribute: %s"
 msgstr "无效的 sudoOrder 属性：%s"
 
 #: plugins/sudoers/linux_audit.c:57
+#, c-format
 msgid "unable to open audit system"
 msgstr "无法打开审核系统"
 
 #: plugins/sudoers/linux_audit.c:93
+#, c-format
 msgid "unable to send audit message"
 msgstr "无法发送审核消息"
 
@@ -889,66 +913,65 @@
 msgid "%8s : (command continued) %s"
 msgstr "%8s：(命令继续执行) %s"
 
-#: plugins/sudoers/logging.c:190
+#: plugins/sudoers/logging.c:202
 #, c-format
 msgid "unable to open log file: %s: %s"
 msgstr "无法打开日志文件：%s：%s"
 
-#: plugins/sudoers/logging.c:193
+#: plugins/sudoers/logging.c:205
 #, c-format
 msgid "unable to lock log file: %s: %s"
 msgstr "无法锁定日志文件：%s：%s"
 
-#: plugins/sudoers/logging.c:245
+#: plugins/sudoers/logging.c:317
 msgid "No user or host"
 msgstr "无用户或主机"
 
-#: plugins/sudoers/logging.c:247
+#: plugins/sudoers/logging.c:319
 msgid "validation failure"
 msgstr "校验失败"
 
-#: plugins/sudoers/logging.c:254
+#: plugins/sudoers/logging.c:260
 msgid "user NOT in sudoers"
 msgstr "用户不在 sudoers 中"
 
-#: plugins/sudoers/logging.c:256
+#: plugins/sudoers/logging.c:262
 msgid "user NOT authorized on host"
 msgstr "用户未获得此主机上的授权"
 
-#: plugins/sudoers/logging.c:258
+#: plugins/sudoers/logging.c:264
 msgid "command not allowed"
 msgstr "命令禁止使用"
 
-#: plugins/sudoers/logging.c:288
+#: plugins/sudoers/logging.c:274
 #, c-format
 msgid "%s is not in the sudoers file.  This incident will be reported.\n"
 msgstr "%s 不在 sudoers 文件中。此事将被报告。\n"
 
-#: plugins/sudoers/logging.c:291
+#: plugins/sudoers/logging.c:277
 #, c-format
 msgid ""
 "%s is not allowed to run sudo on %s.  This incident will be reported.\n"
 msgstr "%s 无权在 %s 上运行 sudo。此事将被报告。\n"
 
-#: plugins/sudoers/logging.c:295
+#: plugins/sudoers/logging.c:281
 #, c-format
 msgid "Sorry, user %s may not run sudo on %s.\n"
 msgstr "对不起，用户 %s 不能在 %s 上运行 sudo。\n"
 
-#: plugins/sudoers/logging.c:298
+#: plugins/sudoers/logging.c:284
 #, c-format
 msgid "Sorry, user %s is not allowed to execute '%s%s%s' as %s%s%s on %s.\n"
 msgstr "对不起，用户 %1$s 无权以 %5$s%6$s%7$s 的身份在 %8$s 上执行 %2$s%3$s%4$s。\n"
 
-#: plugins/sudoers/logging.c:335 plugins/sudoers/sudoers.c:382
-#: plugins/sudoers/sudoers.c:383 plugins/sudoers/sudoers.c:385
-#: plugins/sudoers/sudoers.c:386 plugins/sudoers/sudoers.c:1017
-#: plugins/sudoers/sudoers.c:1018
+#: plugins/sudoers/logging.c:336 plugins/sudoers/sudoers.c:502
+#: plugins/sudoers/sudoers.c:503 plugins/sudoers/sudoers.c:1539
+#: plugins/sudoers/sudoers.c:1540
 #, c-format
 msgid "%s: command not found"
 msgstr "%s：找不到命令"
 
-#: plugins/sudoers/logging.c:337 plugins/sudoers/sudoers.c:378
+#: plugins/sudoers/logging.c:338 plugins/sudoers/sudoers.c:499
 #, c-format
 msgid ""
 "ignoring `%s' found in '.'\n"
@@ -957,7 +980,7 @@
 "忽略在“.”中找到的“%s”\n"
 "请使用“sudo ./%s”，如果这是您想运行的“%s”。"
 
-#: plugins/sudoers/logging.c:353
+#: plugins/sudoers/logging.c:352
 msgid "authentication failure"
 msgstr "认证失败"
 
@@ -971,31 +994,33 @@
 msgid_plural "%u incorrect password attempts"
 msgstr[0] "%u 次错误密码尝试"
 
-#: plugins/sudoers/logging.c:582
+#: plugins/sudoers/logging.c:530
+#, c-format
 msgid "unable to fork"
 msgstr "无法执行 fork"
 
-#: plugins/sudoers/logging.c:589 plugins/sudoers/logging.c:645
+#: plugins/sudoers/logging.c:537 plugins/sudoers/logging.c:599
 #, c-format
 msgid "unable to fork: %m"
 msgstr "无法执行 fork：%m"
 
-#: plugins/sudoers/logging.c:635
+#: plugins/sudoers/logging.c:589
 #, c-format
 msgid "unable to open pipe: %m"
 msgstr "无法打开管道：%m"
 
-#: plugins/sudoers/logging.c:660
+#: plugins/sudoers/logging.c:614
 #, c-format
 msgid "unable to dup stdin: %m"
 msgstr "无法 dup stdin：%m"
 
-#: plugins/sudoers/logging.c:695
+#: plugins/sudoers/logging.c:650
 #, c-format
 msgid "unable to execute %s: %m"
 msgstr "无法执行 %s：%m"
 
-#: plugins/sudoers/logging.c:914
+#: plugins/sudoers/logging.c:865
+#, c-format
 msgid "internal error: insufficient space for log line"
 msgstr "内部错误：没有足够的空间存放日志行"
 
@@ -1014,17 +1039,17 @@
 msgid "digest for %s (%s) is not in %s form"
 msgstr "%s(%s) 的摘要不是 %s 形式"
 
-#: plugins/sudoers/parse.c:115
+#: plugins/sudoers/parse.c:123
 #, c-format
 msgid "parse error in %s near line %d"
 msgstr "%s 中第 %d 行附近有解析错误"
 
-#: plugins/sudoers/parse.c:118
+#: plugins/sudoers/parse.c:126
 #, c-format
 msgid "parse error in %s"
 msgstr "%s 中出现解析错误"
 
-#: plugins/sudoers/parse.c:451
+#: plugins/sudoers/parse.c:414
 #, c-format
 msgid ""
 "\n"
@@ -1033,12 +1058,12 @@
 "\n"
 "Sudoers 条目：\n"
 
-#: plugins/sudoers/parse.c:452
+#: plugins/sudoers/parse.c:416
 #, c-format
 msgid "    RunAsUsers: "
 msgstr "    RunAs 用户： "
 
-#: plugins/sudoers/parse.c:466
+#: plugins/sudoers/parse.c:431
 #, c-format
 msgid "    RunAsGroups: "
 msgstr "    RunAs 组： "
@@ -1048,34 +1073,29 @@
 msgid "    Options: "
 msgstr "    选项： "
 
-#: plugins/sudoers/policy.c:109 plugins/sudoers/policy.c:116
-#: plugins/sudoers/policy.c:123 plugins/sudoers/policy.c:145
-#: plugins/sudoers/policy.c:259 plugins/sudoers/policy.c:277
-#: plugins/sudoers/policy.c:284 plugins/sudoers/policy.c:312
-#: plugins/sudoers/policy.c:320 plugins/sudoers/policy.c:327
-#: plugins/sudoers/set_perms.c:363 plugins/sudoers/set_perms.c:702
-#: plugins/sudoers/set_perms.c:1061 plugins/sudoers/set_perms.c:1357
-#: plugins/sudoers/set_perms.c:1525
+#: plugins/sudoers/find_path.c:69 plugins/sudoers/find_path.c:108
+#: plugins/sudoers/find_path.c:123 plugins/sudoers/iolog.c:125
+#: plugins/sudoers/sudoers.c:945 toke.l:693 toke.l:883
 #, c-format
 msgid "%s: %s"
 msgstr "%s：%s"
 
-#: plugins/sudoers/policy.c:539 plugins/sudoers/visudo.c:765
+#: plugins/sudoers/visudo.c:759
 #, c-format
 msgid "unable to execute %s"
 msgstr "无法执行 %s"
 
-#: plugins/sudoers/policy.c:681
+#: plugins/sudoers/sudoers.c:1190
 #, c-format
 msgid "Sudoers policy plugin version %s\n"
 msgstr "Sudoers 策略插件版本 %s\n"
 
-#: plugins/sudoers/policy.c:683
+#: plugins/sudoers/sudoers.c:1192
 #, c-format
 msgid "Sudoers file grammar version %d\n"
 msgstr "Sudoers 文件语法版本 %d\n"
 
-#: plugins/sudoers/policy.c:687
+#: plugins/sudoers/sudoers.c:1196
 #, c-format
 msgid ""
 "\n"
@@ -1084,37 +1104,37 @@
 "\n"
 "Sudoers 路径：%s\n"
 
-#: plugins/sudoers/policy.c:690
+#: plugins/sudoers/sudoers.c:1199
 #, c-format
 msgid "nsswitch path: %s\n"
 msgstr "nsswitch 路径：%s\n"
 
-#: plugins/sudoers/policy.c:692
+#: plugins/sudoers/sudoers.c:1201
 #, c-format
 msgid "ldap.conf path: %s\n"
 msgstr "ldap.conf 路径：%s\n"
 
-#: plugins/sudoers/policy.c:693
+#: plugins/sudoers/sudoers.c:1202
 #, c-format
 msgid "ldap.secret path: %s\n"
 msgstr "ldap.secret 路径：%s\n"
 
-#: plugins/sudoers/pwutil.c:148
+#: plugins/sudoers/pwutil.c:286
 #, c-format
 msgid "unable to cache uid %u, already exists"
 msgstr "无法缓存用户 ID %u，已存在"
 
-#: plugins/sudoers/pwutil.c:190
+#: plugins/sudoers/pwutil.c:322 plugins/sudoers/pwutil.c:331
 #, c-format
 msgid "unable to cache user %s, already exists"
 msgstr "无法缓存用户 %s，已存在"
 
-#: plugins/sudoers/pwutil.c:393
+#: plugins/sudoers/pwutil.c:676
 #, c-format
 msgid "unable to cache gid %u, already exists"
 msgstr "无法缓存组 ID %u，已存在"
 
-#: plugins/sudoers/pwutil.c:429
+#: plugins/sudoers/pwutil.c:706 plugins/sudoers/pwutil.c:715
 #, c-format
 msgid "unable to cache group %s, already exists"
 msgstr "无法缓存组 %s，已存在"
@@ -1129,15 +1149,15 @@
 msgid "unable to parse groups for %s"
 msgstr "无法对 %s 解析组"
 
-#: plugins/sudoers/set_perms.c:124 plugins/sudoers/set_perms.c:449
-#: plugins/sudoers/set_perms.c:852 plugins/sudoers/set_perms.c:1149
-#: plugins/sudoers/set_perms.c:1441
+#: plugins/sudoers/set_perms.c:122 plugins/sudoers/set_perms.c:436
+#: plugins/sudoers/set_perms.c:828 plugins/sudoers/set_perms.c:1114
+#: plugins/sudoers/set_perms.c:1396
 msgid "perm stack overflow"
 msgstr "权限堆栈上溢"
 
-#: plugins/sudoers/set_perms.c:132 plugins/sudoers/set_perms.c:457
-#: plugins/sudoers/set_perms.c:860 plugins/sudoers/set_perms.c:1157
-#: plugins/sudoers/set_perms.c:1449
+#: plugins/sudoers/set_perms.c:130 plugins/sudoers/set_perms.c:444
+#: plugins/sudoers/set_perms.c:836 plugins/sudoers/set_perms.c:1122
+#: plugins/sudoers/set_perms.c:1404
 msgid "perm stack underflow"
 msgstr "权限堆栈下溢"
 
@@ -1146,28 +1166,28 @@
 msgid "unable to change to root gid"
 msgstr "无法切换为 root 组 ID"
 
-#: plugins/sudoers/set_perms.c:280 plugins/sudoers/set_perms.c:601
-#: plugins/sudoers/set_perms.c:989 plugins/sudoers/set_perms.c:1285
+#: plugins/sudoers/set_perms.c:270 plugins/sudoers/set_perms.c:580
+#: plugins/sudoers/set_perms.c:957 plugins/sudoers/set_perms.c:1243
 msgid "unable to change to runas gid"
 msgstr "无法切换为 runas 组 ID"
 
-#: plugins/sudoers/set_perms.c:292 plugins/sudoers/set_perms.c:613
-#: plugins/sudoers/set_perms.c:999 plugins/sudoers/set_perms.c:1295
+#: plugins/sudoers/set_perms.c:282 plugins/sudoers/set_perms.c:592
+#: plugins/sudoers/set_perms.c:967 plugins/sudoers/set_perms.c:1253
 msgid "unable to change to runas uid"
 msgstr "无法切换为 runas 用户 ID"
 
-#: plugins/sudoers/set_perms.c:310 plugins/sudoers/set_perms.c:631
-#: plugins/sudoers/set_perms.c:1015 plugins/sudoers/set_perms.c:1311
+#: plugins/sudoers/set_perms.c:300 plugins/sudoers/set_perms.c:610
+#: plugins/sudoers/set_perms.c:983 plugins/sudoers/set_perms.c:1269
 msgid "unable to change to sudoers gid"
 msgstr "无法切换为 sudoers 组 ID"
 
-#: plugins/sudoers/set_perms.c:363 plugins/sudoers/set_perms.c:702
-#: plugins/sudoers/set_perms.c:1061 plugins/sudoers/set_perms.c:1357
-#: plugins/sudoers/set_perms.c:1525
+#: plugins/sudoers/set_perms.c:353 plugins/sudoers/set_perms.c:681
+#: plugins/sudoers/set_perms.c:1029 plugins/sudoers/set_perms.c:1315
+#: plugins/sudoers/set_perms.c:1474
 msgid "too many processes"
 msgstr "进程过多"
 
-#: plugins/sudoers/set_perms.c:1595
+#: plugins/sudoers/set_perms.c:1542
 msgid "unable to set runas group vector"
 msgstr "无法设置 runas 组向量"
 
@@ -1175,9 +1195,9 @@
 msgid "unable to initialize SSS source. Is SSSD installed on your machine?"
 msgstr "无法初始化 SSS 资源。您的计算机上安装 SSSD 了吗？"
 
-#: plugins/sudoers/sssd.c:259 plugins/sudoers/sssd.c:267
-#: plugins/sudoers/sssd.c:275 plugins/sudoers/sssd.c:283
-#: plugins/sudoers/sssd.c:291
+#: plugins/sudoers/sssd.c:258 plugins/sudoers/sssd.c:266
+#: plugins/sudoers/sssd.c:273 plugins/sudoers/sssd.c:280
+#: plugins/sudoers/sssd.c:287
 #, c-format
 msgid "unable to find symbol \"%s\" in %s"
 msgstr "无法在 %s 中找到符号“%s”"
@@ -1187,7 +1207,7 @@
 msgid "Matching Defaults entries for %s on %s:\n"
 msgstr "匹配 %2$s 上 %1$s 的默认条目：\n"
 
-#: plugins/sudoers/sudo_nss.c:296
+#: plugins/sudoers/sudo_nss.c:280
 #, c-format
 msgid "Runas and Command-specific defaults for %s:\n"
 msgstr "%s Runas 和命令特定的默认值：\n"
@@ -1197,188 +1217,198 @@
 msgid "User %s may run the following commands on %s:\n"
 msgstr "用户 %s 可以在 %s 上运行以下命令：\n"
 
-#: plugins/sudoers/sudo_nss.c:318
+#: plugins/sudoers/sudo_nss.c:302
 #, c-format
 msgid "User %s is not allowed to run sudo on %s.\n"
 msgstr "用户 %s 无权在 %s 上运行 sudo。\n"
 
-#: plugins/sudoers/sudoers.c:154 plugins/sudoers/sudoers.c:188
-#: plugins/sudoers/sudoers.c:675
+#: plugins/sudoers/sudoers.c:210 plugins/sudoers/sudoers.c:243
+#: plugins/sudoers/sudoers.c:953
 msgid "problem with defaults entries"
 msgstr "默认条目有问题"
 
-#: plugins/sudoers/sudoers.c:160
+#: plugins/sudoers/sudoers.c:216
+#, c-format
 msgid "no valid sudoers sources found, quitting"
 msgstr "没有找到有效的 sudoers 资源，退出"
 
-#: plugins/sudoers/sudoers.c:222
+#: plugins/sudoers/sudoers.c:335
+#, c-format
 msgid "sudoers specifies that root is not allowed to sudo"
 msgstr "sudoers 指定 root 不允许执行 sudo"
 
-#: plugins/sudoers/sudoers.c:261
+#: plugins/sudoers/sudoers.c:342
+#, c-format
 msgid "you are not permitted to use the -C option"
 msgstr "您无权使用 -C 选项"
 
-#: plugins/sudoers/sudoers.c:314
+#: plugins/sudoers/sudoers.c:431
 #, c-format
 msgid "timestamp owner (%s): No such user"
 msgstr "时间戳所有者(%s)：无此用户"
 
-#: plugins/sudoers/sudoers.c:328
+#: plugins/sudoers/sudoers.c:447
 msgid "no tty"
 msgstr "无终端"
 
-#: plugins/sudoers/sudoers.c:329
+#: plugins/sudoers/sudoers.c:448
+#, c-format
 msgid "sorry, you must have a tty to run sudo"
 msgstr "抱歉，您必须拥有一个终端来执行 sudo"
 
-#: plugins/sudoers/sudoers.c:377
+#: plugins/sudoers/sudoers.c:498
 msgid "command in current directory"
 msgstr "当前目录中的命令"
 
-#: plugins/sudoers/sudoers.c:394
+#: plugins/sudoers/sudoers.c:510
+#, c-format
 msgid "sorry, you are not allowed to preserve the environment"
 msgstr "抱歉，您无权保留环境"
 
-#: plugins/sudoers/sudoers.c:725 plugins/sudoers/timestamp.c:216
-#: plugins/sudoers/timestamp.c:260 plugins/sudoers/timestamp.c:326
-#: plugins/sudoers/visudo.c:326 plugins/sudoers/visudo.c:591
+#: plugins/sudoers/check.c:507 plugins/sudoers/check.c:551
+#: plugins/sudoers/check.c:619 plugins/sudoers/sudoers.c:1003
+#: plugins/sudoers/visudo.c:319 plugins/sudoers/visudo.c:584
 #, c-format
 msgid "unable to stat %s"
 msgstr "无法 stat %s"
 
-#: plugins/sudoers/sudoers.c:728
+#: plugins/sudoers/sudoers.c:1006
 #, c-format
 msgid "%s is not a regular file"
 msgstr "%s 不是常规文件"
 
-#: plugins/sudoers/sudoers.c:731 toke.l:920
+#: plugins/sudoers/sudoers.c:1009 toke.l:846
 #, c-format
 msgid "%s is owned by uid %u, should be %u"
 msgstr "%s 属于用户 ID %u，应为 %u"
 
-#: plugins/sudoers/sudoers.c:735 toke.l:927
+#: plugins/sudoers/sudoers.c:1013 toke.l:853
 #, c-format
 msgid "%s is world writable"
 msgstr "%s 可被任何人写"
 
-#: plugins/sudoers/sudoers.c:738 toke.l:932
+#: plugins/sudoers/sudoers.c:1016 toke.l:858
 #, c-format
 msgid "%s is owned by gid %u, should be %u"
 msgstr "%s 属于组 ID %u，应为 %u"
 
-#: plugins/sudoers/sudoers.c:764
+#: plugins/sudoers/sudoers.c:1043
 #, c-format
 msgid "only root can use `-c %s'"
 msgstr "只有 root 才能使用“-c %s”"
 
-#: plugins/sudoers/sudoers.c:781 plugins/sudoers/sudoers.c:783
+#: plugins/sudoers/sudoers.c:1060 plugins/sudoers/sudoers.c:1062
 #, c-format
 msgid "unknown login class: %s"
 msgstr "未知的登录类别：%s"
 
-#: plugins/sudoers/sudoers.c:815
+#: plugins/sudoers/sudoers.c:1089
 #, c-format
 msgid "unable to resolve host %s"
 msgstr "无法解析主机：%s"
 
-#: plugins/sudoers/sudoers.c:878 plugins/sudoers/testsudoers.c:387
+#: plugins/sudoers/sudoers.c:1141 plugins/sudoers/testsudoers.c:387
 #, c-format
 msgid "unknown group: %s"
 msgstr "未知组：%s"
 
-#: plugins/sudoers/sudoreplay.c:272
+#: plugins/sudoers/sudoreplay.c:293
 #, c-format
 msgid "invalid filter option: %s"
 msgstr "无效的过滤器选项：%s"
 
-#: plugins/sudoers/sudoreplay.c:285
+#: plugins/sudoers/sudoreplay.c:306
 #, c-format
 msgid "invalid max wait: %s"
 msgstr "无效的最大等待：%s"
 
-#: plugins/sudoers/sudoreplay.c:291
+#: plugins/sudoers/sudoreplay.c:312
 #, c-format
 msgid "invalid speed factor: %s"
 msgstr "无法的速度系数：%s"
 
-#: plugins/sudoers/sudoreplay.c:294 plugins/sudoers/visudo.c:184
+#: plugins/sudoers/sudoreplay.c:315 plugins/sudoers/visudo.c:187
 #, c-format
 msgid "%s version %s\n"
 msgstr "%s 版本 %s\n"
 
-#: plugins/sudoers/sudoreplay.c:326
+#: plugins/sudoers/sudoreplay.c:340
 #, c-format
 msgid "%s/%.2s/%.2s/%.2s/timing: %s"
 msgstr "%s/%.2s/%.2s/%.2s/时序：%s"
 
-#: plugins/sudoers/sudoreplay.c:332
+#: plugins/sudoers/sudoreplay.c:346
 #, c-format
 msgid "%s/%s/timing: %s"
 msgstr "%s/%s/时序：%s"
 
-#: plugins/sudoers/sudoreplay.c:348
+#: plugins/sudoers/sudoreplay.c:364
 #, c-format
 msgid "Replaying sudo session: %s\n"
 msgstr "回放 sudo 会话：%s\n"
 
-#: plugins/sudoers/sudoreplay.c:354
+#: plugins/sudoers/sudoreplay.c:370
 #, c-format
 msgid "Warning: your terminal is too small to properly replay the log.\n"
 msgstr "警告：您的终端尺寸太小，不能正常地回放日志。\n"
 
-#: plugins/sudoers/sudoreplay.c:355
+#: plugins/sudoers/sudoreplay.c:371
 #, c-format
 msgid "Log geometry is %d x %d, your terminal's geometry is %d x %d."
 msgstr "日志的几何尺寸为 %dx%d，您终端的几何尺寸为 %dx%d。"
 
-#: plugins/sudoers/sudoreplay.c:410
+#: plugins/sudoers/sudoreplay.c:401
+#, c-format
 msgid "unable to set tty to raw mode"
 msgstr "无法将终端设为原始模式"
 
-#: plugins/sudoers/sudoreplay.c:441
+#: plugins/sudoers/sudoreplay.c:418
 #, c-format
 msgid "invalid timing file line: %s"
 msgstr "无效的时序文件行：%s"
 
-#: plugins/sudoers/sudoreplay.c:647 plugins/sudoers/sudoreplay.c:672
+#: plugins/sudoers/sudoreplay.c:643 plugins/sudoers/sudoreplay.c:668
 #, c-format
 msgid "ambiguous expression \"%s\""
 msgstr "有歧义的表达式“%s”"
 
-#: plugins/sudoers/sudoreplay.c:694
+#: plugins/sudoers/sudoreplay.c:696
+#, c-format
 msgid "unmatched ')' in expression"
 msgstr "表达式中的“)”不匹配"
 
-#: plugins/sudoers/sudoreplay.c:698
+#: plugins/sudoers/sudoreplay.c:702
 #, c-format
 msgid "unknown search term \"%s\""
 msgstr "未知的搜索词“%s”"
 
-#: plugins/sudoers/sudoreplay.c:712
+#: plugins/sudoers/sudoreplay.c:716
 #, c-format
 msgid "%s requires an argument"
 msgstr "%s 需要参数"
 
-#: plugins/sudoers/sudoreplay.c:716 plugins/sudoers/sudoreplay.c:1085
+#: plugins/sudoers/sudoreplay.c:720
 #, c-format
 msgid "invalid regular expression: %s"
 msgstr "无效的正则表达式：%s"
 
-#: plugins/sudoers/sudoreplay.c:722
+#: plugins/sudoers/sudoreplay.c:726
 #, c-format
 msgid "could not parse date \"%s\""
 msgstr "无法解析日期“%s”"
 
-#: plugins/sudoers/sudoreplay.c:731
+#: plugins/sudoers/sudoreplay.c:739
+#, c-format
 msgid "unmatched '(' in expression"
 msgstr "表达式中的“(”不匹配"
 
-#: plugins/sudoers/sudoreplay.c:733
+#: plugins/sudoers/sudoreplay.c:741
+#, c-format
 msgid "illegal trailing \"or\""
 msgstr "非法的结尾字符“or”"
 
-#: plugins/sudoers/sudoreplay.c:735
+#: plugins/sudoers/sudoreplay.c:743
+#, c-format
 msgid "illegal trailing \"!\""
 msgstr "非法的结尾字符“!”"
 
@@ -1427,7 +1457,7 @@
 msgid "usage: %s [-h] [-d dir] -l [search expression]\n"
 msgstr "用法：%s [-h] [-d 目录] -l [搜索表达式]\n"
 
-#: plugins/sudoers/sudoreplay.c:1237
+#: plugins/sudoers/sudoreplay.c:1186
 #, c-format
 msgid ""
 "%s - replay sudo session logs\n"
@@ -1458,11 +1488,11 @@
 "  -s, --speed=数值     加速或减慢输出\n"
 "  -V, --version        显示版本信息并退出"
 
-#: plugins/sudoers/testsudoers.c:326
+#: plugins/sudoers/testsudoers.c:338
 msgid "\thost  unmatched"
 msgstr "\t主机不匹配"
 
-#: plugins/sudoers/testsudoers.c:329
+#: plugins/sudoers/testsudoers.c:341
 msgid ""
 "\n"
 "Command allowed"
@@ -1470,7 +1500,7 @@
 "\n"
 "命令允许"
 
-#: plugins/sudoers/testsudoers.c:330
+#: plugins/sudoers/testsudoers.c:342
 msgid ""
 "\n"
 "Command denied"
@@ -1478,7 +1508,7 @@
 "\n"
 "命令被拒"
 
-#: plugins/sudoers/testsudoers.c:330
+#: plugins/sudoers/testsudoers.c:342
 msgid ""
 "\n"
 "Command unmatched"
@@ -1486,33 +1516,33 @@
 "\n"
 "命令不匹配"
 
-#: plugins/sudoers/timestamp.c:133
+#: plugins/sudoers/check.c:460
 #, c-format
 msgid "timestamp path too long: %s"
 msgstr "时间戳路径过长：%s"
 
-#: plugins/sudoers/timestamp.c:203 plugins/sudoers/timestamp.c:247
-#: plugins/sudoers/timestamp.c:290
+#: plugins/sudoers/check.c:494 plugins/sudoers/check.c:538
+#: plugins/sudoers/check.c:583
 #, c-format
 msgid "%s owned by uid %u, should be uid %u"
 msgstr "%s 属于用户 ID %u，应为用户 ID %u"
 
-#: plugins/sudoers/timestamp.c:208 plugins/sudoers/timestamp.c:252
+#: plugins/sudoers/check.c:499 plugins/sudoers/check.c:543
 #, c-format
 msgid "%s writable by non-owner (0%o), should be mode 0700"
 msgstr "%s 对非所有者可写(0%o)，模式应该为 0700"
 
-#: plugins/sudoers/timestamp.c:284
+#: plugins/sudoers/check.c:577
 #, c-format
 msgid "%s exists but is not a regular file (0%o)"
 msgstr "%s 存在，但不是常规文件(0%o)"
 
-#: plugins/sudoers/timestamp.c:296
+#: plugins/sudoers/check.c:589
 #, c-format
 msgid "%s writable by non-owner (0%o), should be mode 0600"
 msgstr "%s 对非所有者可写(0%o)，模式应该为 0600"
 
-#: plugins/sudoers/timestamp.c:351
+#: plugins/sudoers/check.c:643
 #, c-format
 msgid "timestamp too far in the future: %20.20s"
 msgstr "时间戳太超前：%20.20s"
@@ -1527,89 +1557,90 @@
 msgid "unable to reset %s to the Unix epoch"
 msgstr "无法将 %s 重设为 Unix 戳记"
 
-#: plugins/sudoers/toke_util.c:176
+#: plugins/sudoers/toke_util.c:218
 msgid "fill_args: buffer overflow"
 msgstr "fill_args：缓存溢出"
 
-#: plugins/sudoers/visudo.c:186
+#: plugins/sudoers/visudo.c:188
 #, c-format
 msgid "%s grammar version %d\n"
 msgstr "%s 语法版本 %d\n"
 
-#: plugins/sudoers/visudo.c:257 plugins/sudoers/visudo.c:544
+#: plugins/sudoers/visudo.c:252 plugins/sudoers/visudo.c:541
 #, c-format
 msgid "press return to edit %s: "
 msgstr "按回车键编辑 %s： "
 
-#: plugins/sudoers/visudo.c:342 plugins/sudoers/visudo.c:348
+#: plugins/sudoers/visudo.c:335 plugins/sudoers/visudo.c:341
+#, c-format
 msgid "write error"
 msgstr "写错误"
 
-#: plugins/sudoers/visudo.c:430
+#: plugins/sudoers/visudo.c:423
 #, c-format
 msgid "unable to stat temporary file (%s), %s unchanged"
 msgstr "无法 stat 临时文件(%s)，%s 未更改"
 
-#: plugins/sudoers/visudo.c:435
+#: plugins/sudoers/visudo.c:428
 #, c-format
 msgid "zero length temporary file (%s), %s unchanged"
 msgstr "零长度的临时文件(%s)，%s 未更改"
 
-#: plugins/sudoers/visudo.c:441
+#: plugins/sudoers/visudo.c:434
 #, c-format
 msgid "editor (%s) failed, %s unchanged"
 msgstr "编辑器(%s)失败，%s 未更改"
 
-#: plugins/sudoers/visudo.c:464
+#: plugins/sudoers/visudo.c:457
 #, c-format
 msgid "%s unchanged"
 msgstr "%s 未更改"
 
-#: plugins/sudoers/visudo.c:489
+#: plugins/sudoers/visudo.c:486
 #, c-format
 msgid "unable to re-open temporary file (%s), %s unchanged."
 msgstr "无法重新打开临时文件(%s)，%s 未更改"
 
-#: plugins/sudoers/visudo.c:499
+#: plugins/sudoers/visudo.c:496
 #, c-format
 msgid "unabled to parse temporary file (%s), unknown error"
 msgstr "无法解析临时文件(%s)，未知错误"
 
-#: plugins/sudoers/visudo.c:535
+#: plugins/sudoers/visudo.c:534
 #, c-format
 msgid "internal error, unable to find %s in list!"
 msgstr "内部错误，在列表中找不到 %s！"
 
-#: plugins/sudoers/visudo.c:593 plugins/sudoers/visudo.c:602
+#: plugins/sudoers/visudo.c:586 plugins/sudoers/visudo.c:595
 #, c-format
 msgid "unable to set (uid, gid) of %s to (%u, %u)"
 msgstr "无法将 %s 的 (uid, gid) 设为 (%u, %u)"
 
-#: plugins/sudoers/visudo.c:597 plugins/sudoers/visudo.c:607
+#: plugins/sudoers/visudo.c:590 plugins/sudoers/visudo.c:600
 #, c-format
 msgid "unable to change mode of %s to 0%o"
 msgstr "无法将 %s 的模式更改为 0%o"
 
-#: plugins/sudoers/visudo.c:624
+#: plugins/sudoers/visudo.c:617
 #, c-format
 msgid "%s and %s not on the same file system, using mv to rename"
 msgstr "%s 和 %s 不在同一个文件系统，使用 mv 进行重命名"
 
-#: plugins/sudoers/visudo.c:638
+#: plugins/sudoers/visudo.c:631
 #, c-format
 msgid "command failed: '%s %s %s', %s unchanged"
 msgstr "命令失败：“%s %s %s”，%s 未更改"
 
-#: plugins/sudoers/visudo.c:648
+#: plugins/sudoers/visudo.c:641
 #, c-format
 msgid "error renaming %s, %s unchanged"
 msgstr "重命名 %s 出错，%s 未更改"
 
-#: plugins/sudoers/visudo.c:710
+#: plugins/sudoers/visudo.c:704
 msgid "What now? "
 msgstr "现在做什么？ "
 
-#: plugins/sudoers/visudo.c:724
+#: plugins/sudoers/visudo.c:718
 msgid ""
 "Options are:\n"
 "  (e)dit sudoers file again\n"
@@ -1621,87 +1652,87 @@
 "  退出，不保存对 sudoers 文件的更改(x)\n"
 "  退出并将更改保存到 sudoers 文件(危险！)(Q)\n"
 
-#: plugins/sudoers/visudo.c:772
+#: plugins/sudoers/visudo.c:766
 #, c-format
 msgid "unable to run %s"
 msgstr "无法运行 %s"
 
-#: plugins/sudoers/visudo.c:798
+#: plugins/sudoers/visudo.c:792
 #, c-format
 msgid "%s: wrong owner (uid, gid) should be (%u, %u)\n"
 msgstr "%s：错误的所有者(uid, gid)，应为 (%u, %u)\n"
 
-#: plugins/sudoers/visudo.c:805
+#: plugins/sudoers/visudo.c:799
 #, c-format
 msgid "%s: bad permissions, should be mode 0%o\n"
 msgstr "%s：权限不正确，模式应该是 0%o\n"
 
-#: plugins/sudoers/visudo.c:830 plugins/sudoers/visudo_json.c:1009
+#: plugins/sudoers/visudo.c:824
 #, c-format
 msgid "failed to parse %s file, unknown error"
 msgstr "解析 %s 文件失败，未知错误"
 
-#: plugins/sudoers/visudo.c:846 plugins/sudoers/visudo_json.c:1018
+#: plugins/sudoers/visudo.c:837
 #, c-format
 msgid "parse error in %s near line %d\n"
 msgstr "%s 中第 %d 行附近出现解析错误\n"
 
-#: plugins/sudoers/visudo.c:849 plugins/sudoers/visudo_json.c:1021
+#: plugins/sudoers/visudo.c:840
 #, c-format
 msgid "parse error in %s\n"
 msgstr "%s 中出现解析错误\n"
 
-#: plugins/sudoers/visudo.c:857 plugins/sudoers/visudo.c:864
+#: plugins/sudoers/visudo.c:847 plugins/sudoers/visudo.c:852
 #, c-format
 msgid "%s: parsed OK\n"
 msgstr "%s：解析正确\n"
 
-#: plugins/sudoers/visudo.c:910
+#: plugins/sudoers/visudo.c:899
 #, c-format
 msgid "%s busy, try again later"
 msgstr "%s 忙，请稍后重试"
 
-#: plugins/sudoers/visudo.c:954
+#: plugins/sudoers/visudo.c:943
 #, c-format
 msgid "specified editor (%s) doesn't exist"
 msgstr "指定的编辑器(%s)不存在"
 
-#: plugins/sudoers/visudo.c:977
+#: plugins/sudoers/visudo.c:966
 #, c-format
 msgid "unable to stat editor (%s)"
 msgstr "无法 stat 编辑器(%s)"
 
-#: plugins/sudoers/visudo.c:1025
+#: plugins/sudoers/visudo.c:1014
 #, c-format
 msgid "no editor found (editor path = %s)"
 msgstr "未找到编辑器(编辑器路径 = %s)"
 
-#: plugins/sudoers/visudo.c:1118
+#: plugins/sudoers/visudo.c:1108
 #, c-format
 msgid "Error: cycle in %s_Alias `%s'"
 msgstr "错误：在 %s_Alias “%s”中循环"
 
-#: plugins/sudoers/visudo.c:1119
+#: plugins/sudoers/visudo.c:1109
 #, c-format
 msgid "Warning: cycle in %s_Alias `%s'"
 msgstr "警告：在 %s_Alias “%s”中循环"
 
-#: plugins/sudoers/visudo.c:1125
+#: plugins/sudoers/visudo.c:1112
 #, c-format
 msgid "Error: %s_Alias `%s' referenced but not defined"
 msgstr "错误：引用了 %s_Alias “%s”但尚未定义"
 
-#: plugins/sudoers/visudo.c:1126
+#: plugins/sudoers/visudo.c:1113
 #, c-format
 msgid "Warning: %s_Alias `%s' referenced but not defined"
 msgstr "警告：引用了 %s_Alias “%s”但尚未定义"
 
-#: plugins/sudoers/visudo.c:1268
+#: plugins/sudoers/visudo.c:1248
 #, c-format
 msgid "%s: unused %s_Alias %s"
 msgstr "%s：未使用的 %s_Alias %s"
 
-#: plugins/sudoers/visudo.c:1330
+#: plugins/sudoers/visudo.c:1304
 #, c-format
 msgid ""
 "%s - safely edit the sudoers file\n"
@@ -1732,6 +1763,6 @@
 "  -V, --version      显示版本信息并退出\n"
 "  -x, --export=文件  以 JSON 格式导出 sudoers"
 
-#: toke.l:892
+#: toke.l:820
 msgid "too many levels of includes"
 msgstr "include 嵌套层数过多"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/sudo.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/sudo.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/sudo.po	2014-02-24 08:24:34.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/sudo.po	2014-03-24 09:42:41.000000000 +0000
@@ -14,49 +14,51 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:52+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:08+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
-#: common/aix.c:93 common/aix.c:150
+#: common/aix.c:149
+#, c-format
 msgid "unable to open userdb"
 msgstr "无法打开 userdb"
 
-#: common/aix.c:153
+#: common/aix.c:152
 #, c-format
 msgid "unable to switch to registry \"%s\" for %s"
 msgstr "无法为 %2$s 切换到注册表“%1$s”"
 
-#: common/aix.c:170
+#: common/aix.c:169
+#, c-format
 msgid "unable to restore registry"
 msgstr "无法恢复注册表"
 
-#: common/alloc.c:81
+#: common/alloc.c:82
 msgid "internal error, tried to emalloc(0)"
 msgstr "内部错误，试图 emalloc(0)"
 
-#: common/alloc.c:98
+#: common/alloc.c:99
 msgid "internal error, tried to emalloc2(0)"
 msgstr "内部错误，试图 emalloc2(0)"
 
-#: common/alloc.c:100 common/alloc.c:122 common/alloc.c:162 common/alloc.c:185
+#: common/alloc.c:101 common/alloc.c:123 common/alloc.c:163 common/alloc.c:187
 #, c-format
 msgid "internal error, %s overflow"
 msgstr "内部错误，%s 溢出"
 
-#: common/alloc.c:119
+#: common/alloc.c:120
 msgid "internal error, tried to ecalloc(0)"
 msgstr "内部错误，试图 ecalloc(0)"
 
-#: common/alloc.c:141
+#: common/alloc.c:142
 msgid "internal error, tried to erealloc(0)"
 msgstr "内部错误，试图 erealloc(0)"
 
-#: common/alloc.c:160
+#: common/alloc.c:161 common/alloc.c:185
 msgid "internal error, tried to erealloc3(0)"
 msgstr "内部错误，试图 erealloc3(0)"
 
-#: common/alloc.c:183
+#: common/alloc.c:185
 msgid "internal error, tried to erecalloc(0)"
 msgstr "内部错误，试图 erecalloc(0)"
 
@@ -85,9 +87,7 @@
 msgid "%s: %s\n"
 msgstr "%s：%s\n"
 
-#: common/gidlist.c:80 src/load_plugins.c:63 src/load_plugins.c:76
-#: src/sudo.c:558 src/sudo.c:577 src/sudo.c:599 src/sudo.c:608 src/sudo.c:617
-#: src/sudo.c:632 src/sudo.c:679 src/sudo.c:689
+#: src/load_plugins.c:79
 #, c-format
 msgid "%s: %s"
 msgstr "%s：%s"
@@ -102,45 +102,47 @@
 msgid "invalid max groups `%s' in %s, line %d"
 msgstr "%2$s 第 %3$d 行的最大组数“%1$s”无效"
 
-#: common/sudo_conf.c:391
+#: common/sudo_conf.c:306
 #, c-format
 msgid "unable to stat %s"
 msgstr "无法 stat %s"
 
-#: common/sudo_conf.c:394
+#: common/sudo_conf.c:309
 #, c-format
 msgid "%s is not a regular file"
 msgstr "%s 不是常规文件"
 
-#: common/sudo_conf.c:397
+#: common/sudo_conf.c:312
 #, c-format
 msgid "%s is owned by uid %u, should be %u"
 msgstr "%s 属于用户 ID %u，应为 %u"
 
-#: common/sudo_conf.c:401
+#: common/sudo_conf.c:316
 #, c-format
 msgid "%s is world writable"
 msgstr "%s 可被任何人写"
 
-#: common/sudo_conf.c:404
+#: common/sudo_conf.c:319
 #, c-format
 msgid "%s is group writable"
 msgstr "%s 可被用户组写"
 
-#: common/sudo_conf.c:414 src/selinux.c:196 src/selinux.c:209 src/sudo.c:328
+#: common/sudo_conf.c:328 src/selinux.c:196 src/selinux.c:209 src/sudo.c:331
 #, c-format
 msgid "unable to open %s"
 msgstr "打不开 %s"
 
-#: compat/strsignal.c:50
+#: compat/strsignal.c:47
 msgid "Unknown signal"
 msgstr "未知信号"
 
-#: src/exec.c:133 src/exec_pty.c:744
+#: src/exec.c:107 src/exec_pty.c:628
+#, c-format
 msgid "policy plugin failed session initialization"
 msgstr "策略插件会话初始化失败"
 
-#: src/exec.c:138 src/exec_pty.c:760 src/exec_pty.c:1272 src/tgetpass.c:221
+#: src/exec.c:112 src/exec_pty.c:633 src/exec_pty.c:967 src/tgetpass.c:221
+#, c-format
 msgid "unable to fork"
 msgstr "无法执行 fork"
 
@@ -151,7 +153,8 @@
 msgid "unable to add event to queue"
 msgstr "无法将事件添加到队列"
 
-#: src/exec.c:394
+#: src/exec.c:259
+#, c-format
 msgid "unable to create sockets"
 msgstr "无法创建套接字"
 
@@ -159,45 +162,54 @@
 msgid "error in event loop"
 msgstr "事件循环中有错误"
 
-#: src/exec.c:492
+#: src/exec.c:441
+#, c-format
 msgid "unable to restore tty label"
 msgstr "无法恢复终端标签"
 
-#: src/exec_common.c:73
+#: src/exec_common.c:69
+#, c-format
 msgid "unable to remove PRIV_PROC_EXEC from PRIV_LIMIT"
 msgstr "无法从 PRIV_LIMIT 中移除 PRIV_PROC_EXEC"
 
-#: src/exec_pty.c:184
+#: src/exec_pty.c:144
+#, c-format
 msgid "unable to allocate pty"
 msgstr "无法分配伪终端"
 
-#: src/exec_pty.c:682 src/exec_pty.c:691 src/exec_pty.c:699
-#: src/exec_pty.c:1192 src/exec_pty.c:1269 src/signal.c:126 src/tgetpass.c:218
+#: src/exec.c:266 src/exec_pty.c:572 src/exec_pty.c:581 src/exec_pty.c:589
+#: src/exec_pty.c:902 src/exec_pty.c:964 src/tgetpass.c:218
+#, c-format
 msgid "unable to create pipe"
 msgstr "无法创建管道"
 
-#: src/exec_pty.c:735
+#: src/exec_pty.c:619
+#, c-format
 msgid "unable to set terminal to raw mode"
 msgstr "无法将终端设为原始模式"
 
-#: src/exec_pty.c:1091
+#: src/exec_pty.c:1038
+#, c-format
 msgid "error reading from signal pipe"
 msgstr "从单管道读取出错"
 
-#: src/exec_pty.c:1124
+#: src/exec_pty.c:1059
+#, c-format
 msgid "error reading from pipe"
 msgstr "从管道读取出错"
 
-#: src/exec_pty.c:1149
+#: src/exec_pty.c:1075
+#, c-format
 msgid "error reading from socketpair"
 msgstr "从套接字对读取出错"
 
-#: src/exec_pty.c:1158
+#: src/exec_pty.c:1079
 #, c-format
 msgid "unexpected reply type on backchannel: %d"
 msgstr "联络通道的回应类型异常：%d"
 
-#: src/exec_pty.c:1248
+#: src/exec_pty.c:945
+#, c-format
 msgid "unable to set controlling tty"
 msgstr "无法设置控制终端"
 
@@ -209,17 +221,17 @@
 msgid "error in %s, line %d while loading plugin `%s'"
 msgstr "在加载插件“%3$s”时在 %1$s 第 %2$d 行出错"
 
-#: src/load_plugins.c:93
+#: src/load_plugins.c:85
 #, c-format
 msgid "%s%s: %s"
 msgstr "%s%s：%s"
 
-#: src/load_plugins.c:152
+#: src/load_plugins.c:95
 #, c-format
 msgid "%s must be owned by uid %d"
 msgstr "%s 必须属于用户 ID %d(的用户)"
 
-#: src/load_plugins.c:158
+#: src/load_plugins.c:99
 #, c-format
 msgid "%s must be only be writable by owner"
 msgstr "%s 必须只对其所有者可写"
@@ -263,59 +275,69 @@
 msgid "ignoring duplicate I/O plugin `%s' in %s, line %d"
 msgstr "忽略位于 %2$s 第 %3$d 行的重复 I/O 插件“%1$s”"
 
-#: src/load_plugins.c:319
+#: src/load_plugins.c:153
 #, c-format
 msgid "policy plugin %s does not include a check_policy method"
 msgstr "策略插件 %s 不包含 check_policy 方法"
 
-#: src/net_ifs.c:156 src/net_ifs.c:165 src/net_ifs.c:177 src/net_ifs.c:186
-#: src/net_ifs.c:297 src/net_ifs.c:321
+#: src/net_ifs.c:157 src/net_ifs.c:166 src/net_ifs.c:178 src/net_ifs.c:187
+#: src/net_ifs.c:298 src/net_ifs.c:322
+#, c-format
 msgid "load_interfaces: overflow detected"
 msgstr "load_interfaces：检测到溢出"
 
-#: src/net_ifs.c:226
+#: src/net_ifs.c:227
+#, c-format
 msgid "unable to open socket"
 msgstr "无法打开套接字"
 
-#: src/parse_args.c:246
+#: src/parse_args.c:187
 #, c-format
 msgid "the argument to -C must be a number greater than or equal to 3"
 msgstr "-C 选项的参数必须是一个大于等于 3 的数字"
 
-#: src/parse_args.c:408
+#: src/parse_args.c:335
+#, c-format
 msgid "you may not specify both the `-i' and `-s' options"
 msgstr "您不能同时指定“-i”和“-s”选项"
 
-#: src/parse_args.c:412
+#: src/parse_args.c:339
+#, c-format
 msgid "you may not specify both the `-i' and `-E' options"
 msgstr "您不能同时指定“-i”和“-E”选项"
 
-#: src/parse_args.c:422
+#: src/parse_args.c:349
+#, c-format
 msgid "the `-E' option is not valid in edit mode"
 msgstr "“-E”选项在编辑模式中无效"
 
-#: src/parse_args.c:424
+#: src/parse_args.c:351
+#, c-format
 msgid "you may not specify environment variables in edit mode"
 msgstr "在编辑模式中您不能指定环境变量"
 
-#: src/parse_args.c:432
+#: src/parse_args.c:359
+#, c-format
 msgid "the `-U' option may only be used with the `-l' option"
 msgstr "“-U”选项只能与“-l”选项一起使用"
 
-#: src/parse_args.c:436
+#: src/parse_args.c:363
+#, c-format
 msgid "the `-A' and `-S' options may not be used together"
 msgstr "“-A”和“-S”选项不可同时使用"
 
-#: src/parse_args.c:519
+#: src/parse_args.c:445
+#, c-format
 msgid "sudoedit is not supported on this platform"
 msgstr "此平台不支持 sudoedit"
 
-#: src/parse_args.c:592
+#: src/parse_args.c:518
+#, c-format
 msgid ""
 "Only one of the -e, -h, -i, -K, -l, -s, -v or -V options may be specified"
 msgstr "只能指定 -e、-h、-i、-K、-l、-s、-v 或 -V 选项中的一个"
 
-#: src/parse_args.c:606
+#: src/parse_args.c:532
 #, c-format
 msgid ""
 "%s - edit files as another user\n"
@@ -324,7 +346,7 @@
 "%s - 以其他用户身份编辑文件\n"
 "\n"
 
-#: src/parse_args.c:608
+#: src/parse_args.c:534
 #, c-format
 msgid ""
 "%s - execute a command as another user\n"
@@ -333,7 +355,7 @@
 "%s - 以其他用户身份执行一条命令\n"
 "\n"
 
-#: src/parse_args.c:613
+#: src/parse_args.c:539
 #, c-format
 msgid ""
 "\n"
@@ -453,10 +475,12 @@
 msgstr "停止处理命令行参数"
 
 #: src/selinux.c:77
+#, c-format
 msgid "unable to open audit system"
 msgstr "无法打开审查系统"
 
 #: src/selinux.c:85
+#, c-format
 msgid "unable to send audit message"
 msgstr "无法发送审查消息"
 
@@ -481,14 +505,17 @@
 msgstr "无法打开 %s，将不重新标记终端"
 
 #: src/selinux.c:172
+#, c-format
 msgid "unable to get current tty context, not relabeling tty"
 msgstr "无法获取当前终端的环境，将不重新标记终端"
 
 #: src/selinux.c:179
+#, c-format
 msgid "unable to get new tty context, not relabeling tty"
 msgstr "无法获取新终端的环境，将不重新标记终端"
 
 #: src/selinux.c:186
+#, c-format
 msgid "unable to set new tty context"
 msgstr "无法设置新终端的环境"
 
@@ -518,10 +545,12 @@
 msgstr "%s 不是有效的环境"
 
 #: src/selinux.c:324
+#, c-format
 msgid "failed to get old_context"
 msgstr "无法获取 old_context"
 
 #: src/selinux.c:330
+#, c-format
 msgid "unable to determine enforcing mode."
 msgstr "无法确定强制模式。"
 
@@ -530,165 +559,174 @@
 msgid "unable to set tty context to %s"
 msgstr "无法将终端环境设置为 %s"
 
-#: src/selinux.c:381
+#: src/selinux.c:373
 #, c-format
 msgid "unable to set exec context to %s"
 msgstr "无法向 %s 设置 exec 环境"
 
-#: src/selinux.c:388
+#: src/selinux.c:380
 #, c-format
 msgid "unable to set key creation context to %s"
 msgstr "无法向 %s 设置键创建环境"
 
-#: src/sesh.c:57
+#: src/sesh.c:70
+#, c-format
 msgid "requires at least one argument"
 msgstr "要求至少有一个参数"
 
-#: src/sesh.c:78 src/sudo.c:1088
+#: src/sesh.c:91
 #, c-format
 msgid "unable to execute %s"
 msgstr "无法执行 %s"
 
-#: src/solaris.c:88
+#: src/sudo.c:838
+#, c-format
 msgid "resource control limit has been reached"
 msgstr "达到了资源控制限制"
 
-#: src/solaris.c:91
+#: src/sudo.c:841
 #, c-format
 msgid "user \"%s\" is not a member of project \"%s\""
 msgstr "用户“%s”不是项目“%s”的成员"
 
-#: src/solaris.c:95
+#: src/sudo.c:845
+#, c-format
 msgid "the invoking task is final"
 msgstr "调用的任务是最终的(final)"
 
-#: src/solaris.c:98
+#: src/sudo.c:848
 #, c-format
 msgid "could not join project \"%s\""
 msgstr "无法加入项目“%s”"
 
-#: src/solaris.c:103
+#: src/sudo.c:853
 #, c-format
 msgid "no resource pool accepting default bindings exists for project \"%s\""
 msgstr "不存在对应于项目“%s”的、接受默认绑定的资源池"
 
-#: src/solaris.c:107
+#: src/sudo.c:857
 #, c-format
 msgid "specified resource pool does not exist for project \"%s\""
 msgstr "指定的对应于项目“%s”的资源池不存在"
 
-#: src/solaris.c:111
+#: src/sudo.c:861
 #, c-format
 msgid "could not bind to default resource pool for project \"%s\""
 msgstr "无法为项目“%s”绑定到默认的资源池"
 
-#: src/solaris.c:117
+#: src/sudo.c:867
 #, c-format
 msgid "setproject failed for project \"%s\""
 msgstr "对项目“%s”执行 setproject 失败"
 
-#: src/solaris.c:119
+#: src/sudo.c:869
 #, c-format
 msgid "warning, resource control assignment failed for project \"%s\""
 msgstr "警告，对项目“%s”的资源控制分配失败"
 
-#: src/sudo.c:196
+#: src/sudo.c:211
 #, c-format
 msgid "Sudo version %s\n"
 msgstr "Sudo 版本 %s\n"
 
-#: src/sudo.c:198
+#: src/sudo.c:213
 #, c-format
 msgid "Configure options: %s\n"
 msgstr "当前选项：%s\n"
 
-#: src/sudo.c:203
+#: src/sudo.c:218
+#, c-format
 msgid "fatal error, unable to load plugins"
 msgstr "致命错误，无法加载插件"
 
-#: src/sudo.c:211
+#: src/sudo.c:226
+#, c-format
 msgid "unable to initialize policy plugin"
 msgstr "无法初始化策略插件"
 
-#: src/sudo.c:267
+#: src/sudo.c:281
 #, c-format
 msgid "error initializing I/O plugin %s"
 msgstr "初始化 I/O 插件 %s 出错"
 
-#: src/sudo.c:293
+#: src/sudo.c:306
 #, c-format
 msgid "unexpected sudo mode 0x%x"
 msgstr "异常的 sudo 模式 0x%x"
 
-#: src/sudo.c:413
+#: src/sudo.c:400
+#, c-format
 msgid "unable to get group vector"
 msgstr "无法获取组向量"
 
-#: src/sudo.c:465
+#: src/sudo.c:452
 #, c-format
 msgid "unknown uid %u: who are you?"
 msgstr "未知的用户 ID %u：您是？"
 
-#: src/sudo.c:762
+#: src/sudo.c:760
 #, c-format
 msgid "%s must be owned by uid %d and have the setuid bit set"
 msgstr "%s 必须属于用户 ID %d(的用户)并且设置 setuid 位"
 
-#: src/sudo.c:765
+#: src/sudo.c:763
 #, c-format
 msgid ""
 "effective uid is not %d, is %s on a file system with the 'nosuid' option set "
 "or an NFS file system without root privileges?"
 msgstr "有效用户 ID 不是 %d，%s 位于一个设置了“nosuid”选项的文件系统或没有 root 权限的 NFS 文件系统中吗？"
 
-#: src/sudo.c:771
+#: src/sudo.c:769
 #, c-format
 msgid "effective uid is not %d, is sudo installed setuid root?"
 msgstr "有效用户 ID 不是 %d，sudo 属于 root 并设置了 setuid 位吗？"
 
-#: src/sudo.c:897
+#: src/sudo.c:917
 #, c-format
 msgid "unknown login class %s"
 msgstr "未知的登录类别 %s"
 
-#: src/sudo.c:910
+#: src/sudo.c:931 src/sudo.c:934
+#, c-format
 msgid "unable to set user context"
 msgstr "无法设置用户环境"
 
-#: src/sudo.c:924
+#: src/sudo.c:946
+#, c-format
 msgid "unable to set supplementary group IDs"
 msgstr "无法设置补充组 ID"
 
-#: src/sudo.c:931
+#: src/sudo.c:953
 #, c-format
 msgid "unable to set effective gid to runas gid %u"
 msgstr "无法设置有效组 ID 来以组 ID %u 运行"
 
-#: src/sudo.c:937
+#: src/sudo.c:959
 #, c-format
 msgid "unable to set gid to runas gid %u"
 msgstr "无法设置组 ID 来以组 ID %u 运行"
 
-#: src/sudo.c:944
+#: src/sudo.c:966
+#, c-format
 msgid "unable to set process priority"
 msgstr "无法设置进程优先级"
 
-#: src/sudo.c:952
+#: src/sudo.c:974
 #, c-format
 msgid "unable to change root to %s"
 msgstr "无法从 root 切换到 %s"
 
-#: src/sudo.c:965 src/sudo.c:971 src/sudo.c:977
+#: src/sudo.c:981 src/sudo.c:987 src/sudo.c:993
 #, c-format
 msgid "unable to change to runas uid (%u, %u)"
 msgstr "无法切换到以用户 ID(%u，%u)运行"
 
-#: src/sudo.c:994
+#: src/sudo.c:1007
 #, c-format
 msgid "unable to change directory to %s"
 msgstr "无法将目录切换到 %s"
 
-#: src/sudo.c:1051
+#: src/sudo.c:1079
 #, c-format
 msgid "unexpected child termination condition: %d"
 msgstr "异常的子进程终止条件：%d"
@@ -698,95 +736,102 @@
 msgid "policy plugin %s is missing the `check_policy' method"
 msgstr "“check_policy”方法中缺少策略插件 %s"
 
-#: src/sudo.c:1121
+#: src/sudo.c:1140
 #, c-format
 msgid "policy plugin %s does not support listing privileges"
 msgstr "策略插件 %s 不支持列出权限"
 
-#: src/sudo.c:1133
+#: src/sudo.c:1152
 #, c-format
 msgid "policy plugin %s does not support the -v option"
 msgstr "策略插件 %s不支持 -v 选项"
 
-#: src/sudo.c:1145
+#: src/sudo.c:1164
 #, c-format
 msgid "policy plugin %s does not support the -k/-K options"
 msgstr "策略插件 %s 不支持 -k/-K 选项"
 
-#: src/sudo_edit.c:110
+#: src/sudo_edit.c:111
 #, c-format
 msgid "unable to change uid to root (%u)"
 msgstr "无法将用户 ID 切换到 root(%u)"
 
-#: src/sudo_edit.c:142
+#: src/sudo_edit.c:143
+#, c-format
 msgid "plugin error: missing file list for sudoedit"
 msgstr "插件错误：缺少 sudoedit 的文件列表"
 
-#: src/sudo_edit.c:170 src/sudo_edit.c:270
+#: src/sudo_edit.c:171 src/sudo_edit.c:271
 #, c-format
 msgid "%s: not a regular file"
 msgstr "%s：不是常规文件"
 
-#: src/sudo_edit.c:204 src/sudo_edit.c:306
+#: src/sudo_edit.c:205 src/sudo_edit.c:307
 #, c-format
 msgid "%s: short write"
 msgstr "%s：截短写入"
 
-#: src/sudo_edit.c:271
+#: src/sudo_edit.c:272
 #, c-format
 msgid "%s left unmodified"
 msgstr "%s 并未修改"
 
-#: src/sudo_edit.c:284
+#: src/sudo_edit.c:285
 #, c-format
 msgid "%s unchanged"
 msgstr "%s 已更改"
 
-#: src/sudo_edit.c:296 src/sudo_edit.c:317
+#: src/sudo_edit.c:297 src/sudo_edit.c:318
 #, c-format
 msgid "unable to write to %s"
 msgstr "无法写入 %s"
 
-#: src/sudo_edit.c:297 src/sudo_edit.c:315 src/sudo_edit.c:318
+#: src/sudo_edit.c:298 src/sudo_edit.c:316 src/sudo_edit.c:319
 #, c-format
 msgid "contents of edit session left in %s"
 msgstr "编辑会话的内容留在了 %s 中"
 
-#: src/sudo_edit.c:314
+#: src/sudo_edit.c:315
+#, c-format
 msgid "unable to read temporary file"
 msgstr "无法读取临时文件"
 
 #: src/tgetpass.c:90
+#, c-format
 msgid "no tty present and no askpass program specified"
 msgstr "没有终端存在，且未指定 askpass 程序"
 
 #: src/tgetpass.c:99
+#, c-format
 msgid "no askpass program specified, try setting SUDO_ASKPASS"
 msgstr "没有指定 askpass 程序，尝试设置 SUDO_ASKPASS"
 
-#: src/tgetpass.c:232
+#: src/tgetpass.c:231
 #, c-format
 msgid "unable to set gid to %u"
 msgstr "无法将组 ID 设为 %u"
 
-#: src/tgetpass.c:236
+#: src/tgetpass.c:235
 #, c-format
 msgid "unable to set uid to %u"
 msgstr "无法将用户 ID 设为 %u"
 
-#: src/tgetpass.c:241
+#: src/tgetpass.c:240
 #, c-format
 msgid "unable to run %s"
 msgstr "无法执行 %s"
 
 #: src/utmp.c:278
+#, c-format
 msgid "unable to save stdin"
 msgstr "无法保存 stdin"
 
 #: src/utmp.c:280
+#, c-format
 msgid "unable to dup2 stdin"
 msgstr "无法 dup2 stdin"
 
 #: src/utmp.c:283
+#, c-format
 msgid "unable to restore stdin"
 msgstr "无法恢复 stdin"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/swift.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/swift.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/swift.po	2014-02-24 08:24:46.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/swift.po	2014-03-24 09:42:53.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:32+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 14:09+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: swift/account/auditor.py:52 swift/account/auditor.py:75
 #, python-format
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/sysstat.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/sysstat.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/sysstat.po	2014-02-24 08:24:37.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/sysstat.po	2014-03-24 09:42:44.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:14+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:32+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: iostat.c:86 cifsiostat.c:71 mpstat.c:90 sar.c:94 pidstat.c:83
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/system-config-kickstart.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/system-config-kickstart.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/system-config-kickstart.po	2014-02-24 08:24:37.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/system-config-kickstart.po	2014-03-24 09:42:44.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:14+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:33+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: ../src/RHELPackageGroupList.py:12
 msgid "X Window System"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/system-service.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/system-service.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/system-service.po	2014-02-24 08:24:44.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/system-service.po	2014-03-24 09:42:51.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-system-service\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-18 18:22+0000\n"
+"POT-Creation-Date: 2014-02-23 15:02+0000\n"
 "PO-Revision-Date: 2012-10-01 12:45+0000\n"
 "Last-Translator: Wang Dianjin <Unknown>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-12 14:04+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: ../backend/com.ubuntu.systemservice.policy.in.h:1
 msgid "Get current global proxy"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/tar.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/tar.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/tar.po	2014-02-24 08:24:34.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/tar.po	2014-03-24 09:42:41.000000000 +0000
@@ -17,8 +17,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:53+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:09+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: gnu/argmatch.c:135
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/tasksel.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/tasksel.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/tasksel.po	2014-02-24 08:24:37.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/tasksel.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-# Simplified Chinese translation for tasksel.
-# This file is distributed under the same license as the tasksel package.
-#
-# Copyright:
-# Carlos Z.F. Liu <carlos_liu@yahoo.com>, 2004.
-# Ming Hua <minghua@rice.edu>, 2005.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: tasksel 1.4.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-19 15:28+0000\n"
-"PO-Revision-Date: 2013-03-20 00:44+0000\n"
-"Last-Translator: Ming Hua <minghua-list@sbcglobal.net>\n"
-"Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-12 12:48+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
-
-#: ../tasksel.pl:494
-msgid ""
-"Usage:\n"
-"tasksel install <task>\n"
-"tasksel remove <task>\n"
-"tasksel [options]\n"
-"\t-t, --test          test mode; don't really do anything\n"
-"\t    --new-install   automatically install some tasks\n"
-"\t    --list-tasks    list tasks that would be displayed and exit\n"
-"\t    --task-packages list available packages in a task\n"
-"\t    --task-desc     returns the description of a task\n"
-msgstr ""
-"用法：\n"
-"tasksel install <软件集>\n"
-"tasksel remove <软件集>\n"
-"tasksel [选项]\n"
-"\t-t, --test          测试模式，不会真正执行任何操作\n"
-"\t    --new-install   自动安装某些软件集\n"
-"\t    --list-tasks    列出将要显示的软件集并退出\n"
-"\t    --task-packages 列出某软件集中的软件包\n"
-"\t    --task-desc     显示某软件集的说明信息\n"
-
-#: ../tasksel.pl:848 ../tasksel.pl:852 ../tasksel.pl:863 ../tasksel.pl:867
-#: ../tasksel.pl:871
-msgid "aptitude failed"
-msgstr "aptitude 操作失败"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/texinfo.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/texinfo.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/texinfo.po	2014-02-24 08:24:29.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/texinfo.po	2014-03-24 09:42:37.000000000 +0000
@@ -16,8 +16,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:23+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 11:33+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: gnulib/lib/error.c:188
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/tmispell-voikko.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/tmispell-voikko.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/tmispell-voikko.po	2014-02-24 08:24:41.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/tmispell-voikko.po	2014-03-24 09:42:48.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:45+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:10+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: src/charset.cc:73
 #, c-format
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/ubuntuone-client.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/ubuntuone-client.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/ubuntuone-client.po	2014-02-24 08:24:44.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/ubuntuone-client.po	2014-03-24 09:42:52.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ubuntuone-client\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-10-08 22:53+0000\n"
+"POT-Creation-Date: 2014-02-23 15:04+0000\n"
 "PO-Revision-Date: 2013-10-09 15:38+0000\n"
 "Last-Translator: Aron Xu <Unknown>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2013-12-12 14:09+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:48+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: ../ubuntuone/status/aggregator.py:53
 msgid "Ubuntu One"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/ubuntuone-control-panel.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/ubuntuone-control-panel.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/ubuntuone-control-panel.po	2014-02-24 08:24:47.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/ubuntuone-control-panel.po	2014-03-24 09:42:54.000000000 +0000
@@ -16,8 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:35+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 14:13+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: \n"
 
 #: ../ubuntuone-installer.desktop.in.h:1
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/ubuntu-sso-client.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/ubuntu-sso-client.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/ubuntu-sso-client.po	2014-02-24 08:24:46.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/ubuntu-sso-client.po	2014-03-24 09:42:53.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-sso-client\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-10-24 14:34+0000\n"
+"POT-Creation-Date: 2014-03-05 12:29+0000\n"
 "PO-Revision-Date: 2013-09-11 07:32+0000\n"
 "Last-Translator: Aron Xu <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:32+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 14:08+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. Undefined variable '_', pylint: disable=E0602
 #. all the text that is used in the gui
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/ubuntu-wallpapers.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/ubuntu-wallpapers.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/ubuntu-wallpapers.po	2014-02-24 08:24:43.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/ubuntu-wallpapers.po	2014-03-24 09:42:50.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-wallpapers\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-09-11 13:36+0000\n"
+"POT-Creation-Date: 2014-03-17 10:25+0000\n"
 "PO-Revision-Date: 2013-09-17 19:01+0000\n"
 "Last-Translator: Aron Xu <Unknown>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-12 13:53+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:34+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: ../ubuntu-wallpapers.xml.in.h:1
 msgid "Ubuntu"
@@ -233,7 +233,7 @@
 msgid "Aubergine Sea"
 msgstr "紫海"
 
-#: ../natty-wallpapers.xml.in.h:4
+#: ../natty-wallpapers.xml.in.h:4 ../trusty-wallpapers.xml.in.h:3
 msgid "Berries"
 msgstr "浆果"
 
@@ -448,3 +448,171 @@
 #: ../quantal-wallpapers.xml.in.h:11
 msgid "Vanishing"
 msgstr "渐渐消失"
+
+#: ../raring-wallpapers.xml.in.h:1
+msgid "Begonia"
+msgstr "秋海棠"
+
+#: ../raring-wallpapers.xml.in.h:2
+msgid "Blue frost"
+msgstr "蓝霜"
+
+#: ../raring-wallpapers.xml.in.h:3
+msgid "Brother typewriter"
+msgstr "兄弟打字机"
+
+#: ../raring-wallpapers.xml.in.h:4
+msgid "Cacomixtle Ubunteño"
+msgstr "Cacomixtle Ubunteño"
+
+#: ../raring-wallpapers.xml.in.h:5
+msgid "Fleurs de Prunus 24"
+msgstr "杏花儿"
+
+#: ../raring-wallpapers.xml.in.h:6
+msgid "La Gomera"
+msgstr "拉戈梅拉"
+
+#: ../raring-wallpapers.xml.in.h:7
+msgid "Landing"
+msgstr "着陆"
+
+#: ../raring-wallpapers.xml.in.h:8
+msgid "Last breath…"
+msgstr "最后的呼吸"
+
+#: ../raring-wallpapers.xml.in.h:9
+msgid "Leftover"
+msgstr "残留"
+
+#: ../raring-wallpapers.xml.in.h:10
+msgid "Morning Sun on Frost-Covered Leaves"
+msgstr "霜叶上的晨曦"
+
+#: ../raring-wallpapers.xml.in.h:11
+msgid "Stop the light"
+msgstr "微光"
+
+#: ../raring-wallpapers.xml.in.h:12
+msgid "Trazo solitario"
+msgstr "蓝调"
+
+#: ../raring-wallpapers.xml.in.h:13
+msgid "Winter Fog"
+msgstr "冬雾"
+
+#: ../saucy-wallpapers.xml.in.h:1
+msgid "163"
+msgstr "163"
+
+#: ../saucy-wallpapers.xml.in.h:2
+msgid "Cyclotron"
+msgstr "回旋"
+
+#: ../saucy-wallpapers.xml.in.h:3
+msgid "Gota D'água"
+msgstr "Gota D'água"
+
+#: ../saucy-wallpapers.xml.in.h:4
+msgid "Grass"
+msgstr "青草"
+
+#: ../saucy-wallpapers.xml.in.h:5
+msgid "I am a Saucy Salamander..."
+msgstr "我是活泼的蝾螈"
+
+#: ../saucy-wallpapers.xml.in.h:6
+msgid "Mountains"
+msgstr "山脉"
+
+#: ../saucy-wallpapers.xml.in.h:7
+msgid "Mr. Tau and The Tree -"
+msgstr "Tau 先生和树"
+
+#: ../saucy-wallpapers.xml.in.h:8
+msgid "Nylon Rainbow"
+msgstr "尼龙彩虹"
+
+#: ../saucy-wallpapers.xml.in.h:9
+msgid "Oak"
+msgstr "橡树"
+
+#: ../saucy-wallpapers.xml.in.h:10
+msgid "Salamander"
+msgstr "蝾螈"
+
+#: ../saucy-wallpapers.xml.in.h:11
+msgid "Saucy Salamander Abstract"
+msgstr "抽象派活泼的蝾螈"
+
+#: ../saucy-wallpapers.xml.in.h:12
+msgid "Savannah Lilian Blot"
+msgstr "萨凡纳的莉莲黑色标记"
+
+#: ../saucy-wallpapers.xml.in.h:13
+msgid "Taxus baccata"
+msgstr "欧洲紫杉"
+
+#: ../saucy-wallpapers.xml.in.h:14
+msgid "The City of Polen"
+msgstr "花粉之城"
+
+#: ../saucy-wallpapers.xml.in.h:15
+msgid "THE 'OUT' STANDING"
+msgstr "“孤独”的屹立"
+
+#: ../saucy-wallpapers.xml.in.h:16
+msgid "Thingvellir"
+msgstr "辛格韦德利公园"
+
+#: ../saucy-wallpapers.xml.in.h:17
+msgid "Untitled"
+msgstr "无题"
+
+#: ../saucy-wallpapers.xml.in.h:18
+msgid "Water Lily"
+msgstr "睡莲"
+
+#: ../trusty-wallpapers.xml.in.h:1
+msgid "Backyard Mushrooms"
+msgstr ""
+
+#: ../trusty-wallpapers.xml.in.h:2
+msgid "Beach"
+msgstr ""
+
+#: ../trusty-wallpapers.xml.in.h:4
+msgid "Foggy Forest"
+msgstr ""
+
+#: ../trusty-wallpapers.xml.in.h:5
+msgid "Ibanez Infinity"
+msgstr ""
+
+#: ../trusty-wallpapers.xml.in.h:6
+msgid "Jelly Fish"
+msgstr ""
+
+#: ../trusty-wallpapers.xml.in.h:7
+msgid "Mono Lake"
+msgstr ""
+
+#: ../trusty-wallpapers.xml.in.h:8
+msgid "Partitura"
+msgstr ""
+
+#: ../trusty-wallpapers.xml.in.h:9
+msgid "Reflections"
+msgstr ""
+
+#: ../trusty-wallpapers.xml.in.h:10
+msgid "Sea Fury"
+msgstr ""
+
+#: ../trusty-wallpapers.xml.in.h:11
+msgid "Water web"
+msgstr ""
+
+#: ../trusty-wallpapers.xml.in.h:12
+msgid "Forever"
+msgstr ""
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/udisks2.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/udisks2.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/udisks2.po	2014-02-24 08:24:49.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/udisks2.po	2014-03-24 09:42:56.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: udisks\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-17 21:44+0000\n"
+"POT-Creation-Date: 2014-03-10 16:38+0000\n"
 "PO-Revision-Date: 2013-06-08 02:43+0000\n"
 "Last-Translator: Wylmer Wang <Unknown>\n"
 "Language-Team: Chinese (China) "
@@ -17,8 +17,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:47+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 14:29+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: ../data/org.freedesktop.udisks2.policy.in.h:1
@@ -330,38 +330,38 @@
 #. * the user is editing settings that involve system-level
 #. * passwords and secrets
 #. 
-#: ../src/udiskslinuxblock.c:999
+#: ../src/udiskslinuxblock.c:1011
 msgid "Authentication is required to read system-level secrets"
 msgstr "读取系统级别的机密信息需要身份验证"
 
 #. Translators: shown in authentication dialog - do not translate /etc/fstab
-#: ../src/udiskslinuxblock.c:1533
+#: ../src/udiskslinuxblock.c:1545
 msgid "Authentication is required to add an entry to the /etc/fstab file"
 msgstr "向 /etc/fstab 文件中添加条目需要身份验证"
 
 #. Translators: shown in authentication dialog - do not tranlsate /etc/crypttab
-#: ../src/udiskslinuxblock.c:1551
+#: ../src/udiskslinuxblock.c:1563
 msgid "Authentication is required to add an entry to the /etc/crypttab file"
 msgstr "向 /etc/crypttab 文件中添加条目需要身份验证"
 
 #. Translators: shown in authentication dialog - do not translate /etc/fstab
-#: ../src/udiskslinuxblock.c:1610
+#: ../src/udiskslinuxblock.c:1622
 msgid "Authentication is required to remove an entry from /etc/fstab file"
 msgstr "从 /etc/fstab 文件中移除条目需要身份验证"
 
 #. Translators: shown in authentication dialog - do not translate /etc/crypttab
-#: ../src/udiskslinuxblock.c:1628
+#: ../src/udiskslinuxblock.c:1640
 msgid ""
 "Authentication is required to remove an entry from the /etc/crypttab file"
 msgstr "来从 /etc/crypttab 文件中移除条目需要身份验证"
 
 #. Translators: shown in authentication dialog - do not translate /etc/fstab
-#: ../src/udiskslinuxblock.c:1700
+#: ../src/udiskslinuxblock.c:1712
 msgid "Authentication is required to modify the /etc/fstab file"
 msgstr "修改 /etc/fstab 文件需要身份验证"
 
 #. Translators: shown in authentication dialog - do not translate /etc/crypttab
-#: ../src/udiskslinuxblock.c:1718
+#: ../src/udiskslinuxblock.c:1730
 msgid "Authentication is required to modify the /etc/crypttab file"
 msgstr "修改 /etc/crypttab 文件需要身份验证"
 
@@ -378,7 +378,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: ../src/udiskslinuxblock.c:2225 ../src/udiskslinuxdriveata.c:2244
+#: ../src/udiskslinuxblock.c:2237 ../src/udiskslinuxdriveata.c:2244
 msgid "Authentication is required to perform a secure erase of $(drive)"
 msgstr "执行安全擦除 $(drive) 需要身份验证"
 
@@ -389,11 +389,11 @@
 #. * Do not translate $(drive), it's a placeholder and will
 #. * be replaced by the name of the drive/device in question
 #. 
-#: ../src/udiskslinuxblock.c:2237
+#: ../src/udiskslinuxblock.c:2249
 msgid "Authentication is required to format $(drive)"
 msgstr "格式化 $(drive) 需要身份验证"
 
-#: ../src/udiskslinuxblock.c:2274 ../src/udiskslinuxdriveata.c:2256
+#: ../src/udiskslinuxblock.c:2286 ../src/udiskslinuxdriveata.c:2256
 msgid "Formatting Device"
 msgstr "格式化设备"
 
@@ -403,7 +403,7 @@
 #. * Do not translate $(drive), it's a placeholder and will
 #. * be replaced by the name of the drive/device in question
 #. 
-#: ../src/udiskslinuxblock.c:2693
+#: ../src/udiskslinuxblock.c:2705
 msgid "Authentication is required to open $(drive) for reading"
 msgstr "打开$(drive) 进行读取需要身份验证"
 
@@ -413,7 +413,7 @@
 #. * Do not translate $(drive), it's a placeholder and will
 #. * be replaced by the name of the drive/device in question
 #. 
-#: ../src/udiskslinuxblock.c:2757
+#: ../src/udiskslinuxblock.c:2769
 msgid "Authentication is required to open $(drive) for writing"
 msgstr "打开 $(drive) 进行写入需要身份验证"
 
@@ -423,7 +423,7 @@
 #. * Do not translate $(drive), it's a placeholder and will
 #. * be replaced by the name of the drive/device in question
 #. 
-#: ../src/udiskslinuxblock.c:2823
+#: ../src/udiskslinuxblock.c:2835
 msgid "Authentication is required to open $(drive) for benchmarking"
 msgstr "打开 $(drive) 进行性能测试需要身份验证"
 
@@ -433,7 +433,7 @@
 #. * Do not translate $(drive), it's a placeholder and will
 #. * be replaced by the name of the drive/device in question
 #. 
-#: ../src/udiskslinuxblock.c:2884
+#: ../src/udiskslinuxblock.c:2896
 msgid "Authentication is required to rescan $(drive)"
 msgstr "重新扫描 $(drive) 需要认证"
 
@@ -443,7 +443,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: ../src/udiskslinuxdrive.c:1016
+#: ../src/udiskslinuxdrive.c:1022
 msgid "Authentication is required to eject $(drive)"
 msgstr "弹出 $(drive) 需要身份验证"
 
@@ -453,7 +453,7 @@
 #. * Do not translate $(drive), it's a placeholder and will be
 #. * replaced by the name of the drive/device in question
 #. 
-#: ../src/udiskslinuxdrive.c:1104
+#: ../src/udiskslinuxdrive.c:1110
 msgid "Authentication is required to configure settings for $(drive)"
 msgstr "配置 $(drive) 设置需要身份验证"
 
@@ -463,7 +463,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: ../src/udiskslinuxdrive.c:1302
+#: ../src/udiskslinuxdrive.c:1425
 msgid "Authentication is required to power off $(drive)"
 msgstr "给 $(drive) 断电需要认证"
 
@@ -586,7 +586,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: ../src/udiskslinuxfilesystem.c:1247 ../src/udiskslinuxfilesystem.c:1409
+#: ../src/udiskslinuxfilesystem.c:1253 ../src/udiskslinuxfilesystem.c:1415
 msgid "Authentication is required to mount $(drive)"
 msgstr "挂载 $(drive) 需要身份验证"
 
@@ -600,7 +600,7 @@
 #. *
 #. * Do not translate /etc/fstab
 #. 
-#: ../src/udiskslinuxfilesystem.c:1316
+#: ../src/udiskslinuxfilesystem.c:1322
 msgid ""
 "Authentication is required to mount $(drive) referenced in the /etc/fstab "
 "file"
@@ -616,7 +616,7 @@
 #. *
 #. * Do not translate /etc/fstab
 #. 
-#: ../src/udiskslinuxfilesystem.c:1663
+#: ../src/udiskslinuxfilesystem.c:1669
 msgid ""
 "Authentication is required to unmount $(drive) referenced in the /etc/fstab "
 "file"
@@ -629,7 +629,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: ../src/udiskslinuxfilesystem.c:1710
+#: ../src/udiskslinuxfilesystem.c:1716
 msgid ""
 "Authentication is required to unmount $(drive) mounted by another user"
 msgstr "需要授权来卸载由其他用户挂载的 $(drive)"
@@ -640,7 +640,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: ../src/udiskslinuxfilesystem.c:1955
+#: ../src/udiskslinuxfilesystem.c:1961
 msgid "Authentication is required to change the filesystem label on $(drive)"
 msgstr "更改  $(drive) 的文件系统标签需要身份验证"
 
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/ufw.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/ufw.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/ufw.po	2014-02-24 08:24:43.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/ufw.po	2014-03-24 09:42:51.000000000 +0000
@@ -7,21 +7,21 @@
 msgstr ""
 "Project-Id-Version: ufw\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-08-12 10:55-0500\n"
+"POT-Creation-Date: 2014-02-20 14:16-0600\n"
 "PO-Revision-Date: 2012-04-15 14:38+0000\n"
 "Last-Translator: Aron Xu <Unknown>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:08+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:41+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: src/ufw:56
 msgid ": Need at least python 2.6)\n"
 msgstr ""
 
-#: src/ufw:109 src/frontend.py:575 src/frontend.py:877
+#: src/ufw:109 src/frontend.py:596 src/frontend.py:898
 msgid "Aborted"
 msgstr "已中止"
 
@@ -99,75 +99,75 @@
 msgid "Invalid ports in profile '%s'"
 msgstr "配置 '%s' 中含有无效的端口"
 
-#: src/backend_iptables.py:72
+#: src/backend_iptables.py:77
 msgid "New profiles:"
 msgstr "新建配置文件:"
 
-#: src/backend_iptables.py:88 src/backend.py:322
+#: src/backend_iptables.py:93 src/backend.py:351
 #, python-format
 msgid "Unsupported policy '%s'"
 msgstr "策略 '%s' 未被支持"
 
-#: src/backend_iptables.py:92
+#: src/backend_iptables.py:98
 #, python-format
 msgid "Unsupported policy for direction '%s'"
 msgstr "'%s' 方向不支持的策略"
 
-#: src/backend_iptables.py:150
+#: src/backend_iptables.py:158
 #, python-format
 msgid "Default %(direction)s policy changed to '%(policy)s'\n"
 msgstr "默认的 %(direction)s 策略更改为 '%(policy)s'\n"
 
-#: src/backend_iptables.py:152
+#: src/backend_iptables.py:160
 msgid "(be sure to update your rules accordingly)"
 msgstr "（请相应地更新你的防火墙规则）"
 
-#: src/backend_iptables.py:159
+#: src/backend_iptables.py:167
 msgid "Checking raw iptables\n"
 msgstr "检查原始的 iptables\n"
 
-#: src/backend_iptables.py:160
+#: src/backend_iptables.py:168
 msgid "Checking raw ip6tables\n"
 msgstr "检查原始的 ip6tables\n"
 
-#: src/backend_iptables.py:250
+#: src/backend_iptables.py:261
 msgid "Checking iptables\n"
 msgstr "检查 iptables\n"
 
-#: src/backend_iptables.py:252
+#: src/backend_iptables.py:263
 msgid "Checking ip6tables\n"
 msgstr "检查 ip6tables\n"
 
-#: src/backend_iptables.py:255 src/backend_iptables.py:495
+#: src/backend_iptables.py:266 src/backend_iptables.py:541
 msgid "problem running"
 msgstr "运行时出现问题"
 
-#: src/backend_iptables.py:261
+#: src/backend_iptables.py:272
 msgid "Status: inactive"
 msgstr "状态：不活动"
 
-#: src/backend_iptables.py:397
+#: src/backend_iptables.py:432
 msgid "To"
 msgstr "至"
 
-#: src/backend_iptables.py:398
+#: src/backend_iptables.py:433
 msgid "From"
 msgstr "来自"
 
-#: src/backend_iptables.py:399
+#: src/backend_iptables.py:434
 msgid "Action"
 msgstr "动作"
 
-#: src/backend_iptables.py:415
+#: src/backend_iptables.py:450 src/backend_iptables.py:454
 msgid "\n"
 msgstr "\n"
 
-#: src/backend_iptables.py:423
+#: src/backend_iptables.py:462
 #, python-format
-msgid "Default: %(in)s (incoming), %(out)s (outgoing)"
+msgid "Default: %(in)s (incoming), %(out)s (outgoing), %(routed)s (routed)"
 msgstr ""
 
-#: src/backend_iptables.py:427
+#: src/backend_iptables.py:470
 #, python-format
 msgid ""
 "Status: active\n"
@@ -176,340 +176,357 @@
 "%(app)s%(status)s"
 msgstr ""
 
-#: src/backend_iptables.py:431
+#: src/backend_iptables.py:474
 #, python-format
 msgid "Status: active%s"
 msgstr "状态： 激活%s"
 
-#: src/backend_iptables.py:436 src/backend_iptables.py:446
+#: src/backend_iptables.py:479 src/backend_iptables.py:489
 msgid "running ufw-init"
 msgstr "运行 ufw-init"
 
-#: src/backend_iptables.py:440 src/backend_iptables.py:450
+#: src/backend_iptables.py:483 src/backend_iptables.py:493
 #, python-format
 msgid ""
 "problem running ufw-init\n"
 "%s"
 msgstr ""
 
-#: src/backend_iptables.py:459
+#: src/backend_iptables.py:502
 msgid "Could not set LOGLEVEL"
 msgstr "无法设置 LOGLEVEL"
 
-#: src/backend_iptables.py:465
+#: src/backend_iptables.py:508
 msgid "Could not load logging rules"
 msgstr "无法加载日志规则"
 
-#: src/backend_iptables.py:617 src/backend.py:229
+#: src/backend_iptables.py:663 src/backend.py:273
 #, python-format
 msgid "Couldn't open '%s' for reading"
 msgstr "无法打开 '%s' 进行读操作"
 
-#: src/backend_iptables.py:626
+#: src/backend_iptables.py:674
 #, python-format
 msgid "Skipping malformed tuple (bad length): %s"
 msgstr "忽略错误的多员组（长度错误）： %s"
 
-#: src/backend_iptables.py:657
+#: src/backend_iptables.py:685
+#, python-format
+msgid "Skipping malformed tuple (iface): %s"
+msgstr ""
+
+#: src/backend_iptables.py:731
 #, python-format
 msgid "Skipping malformed tuple: %s"
 msgstr "跳过错误的元组： %s"
 
-#: src/backend_iptables.py:679 src/backend.py:260
+#: src/backend_iptables.py:753 src/backend.py:304
 #, python-format
 msgid "'%s' is not writable"
 msgstr "%s 不可写"
 
-#: src/backend_iptables.py:837
+#: src/backend_iptables.py:925
 msgid "Adding IPv6 rule failed: IPv6 not enabled"
 msgstr "添加 IPv6 规则失败： IPv6 未被启用"
 
-#: src/backend_iptables.py:841
+#: src/backend_iptables.py:929
 #, python-format
 msgid "Skipping unsupported IPv6 '%s' rule"
 msgstr "忽略未被支持的 IPv6 '%s' 规则"
 
-#: src/backend_iptables.py:845
+#: src/backend_iptables.py:933
 #, python-format
 msgid "Skipping unsupported IPv4 '%s' rule"
 msgstr ""
 
-#: src/backend_iptables.py:848
+#: src/backend_iptables.py:936
 msgid "Must specify 'tcp' or 'udp' with multiple ports"
 msgstr "必须在复合的端口中指定 'tcp' 或者 'udp'"
 
-#: src/backend_iptables.py:860
+#: src/backend_iptables.py:948
 msgid "Skipping IPv6 application rule. Need at least iptables 1.4"
 msgstr "忽略 IPv6 应用规则。需要 iptables 1.4 以上"
 
-#: src/backend_iptables.py:865
+#: src/backend_iptables.py:953
 #, python-format
 msgid "Invalid position '%d'"
 msgstr "无效的位置 '%d'"
 
-#: src/backend_iptables.py:869
+#: src/backend_iptables.py:957
 msgid "Cannot specify insert and delete"
 msgstr "无法指定插入和删除"
 
-#: src/backend_iptables.py:872
+#: src/backend_iptables.py:960
 #, python-format
 msgid "Cannot insert rule at position '%d'"
 msgstr "无法在'%d'处插入规则"
 
-#: src/backend_iptables.py:930
+#: src/backend_iptables.py:1018
 msgid "Skipping inserting existing rule"
 msgstr "跳过插入已存在的规则"
 
-#: src/backend_iptables.py:941 src/frontend.py:386
+#: src/backend_iptables.py:1029 src/frontend.py:403
 msgid "Could not delete non-existent rule"
 msgstr "无法删除不存在的规则"
 
-#: src/backend_iptables.py:946
+#: src/backend_iptables.py:1034
 msgid "Skipping adding existing rule"
 msgstr "跳过添加已经存在的规则"
 
-#: src/backend_iptables.py:962
+#: src/backend_iptables.py:1050
 msgid "Couldn't update rules file"
 msgstr "无法更新防火墙规则文件"
 
-#: src/backend_iptables.py:967
+#: src/backend_iptables.py:1055
 msgid "Rules updated"
 msgstr "防火墙规则已更新"
 
-#: src/backend_iptables.py:969
+#: src/backend_iptables.py:1057
 msgid "Rules updated (v6)"
 msgstr "规则已更新（v6）"
 
-#: src/backend_iptables.py:977
+#: src/backend_iptables.py:1065
 msgid "Rule inserted"
 msgstr "规则已插入"
 
-#: src/backend_iptables.py:979
+#: src/backend_iptables.py:1067
 msgid "Rule updated"
 msgstr "规则已更新"
 
-#: src/backend_iptables.py:989
+#: src/backend_iptables.py:1077
 msgid " (skipped reloading firewall)"
 msgstr " (跳过重新加载的防火墙)"
 
-#: src/backend_iptables.py:992
+#: src/backend_iptables.py:1080
 msgid "Rule deleted"
 msgstr "规则已删除"
 
-#: src/backend_iptables.py:995
+#: src/backend_iptables.py:1083
 msgid "Rule added"
 msgstr "规则已添加"
 
-#: src/backend_iptables.py:1010 src/backend_iptables.py:1098
+#: src/backend_iptables.py:1100 src/backend_iptables.py:1191
 msgid "Could not update running firewall"
 msgstr "无法更新正在运行的防火墙"
 
-#: src/backend_iptables.py:1065
+#: src/backend_iptables.py:1155
 #, python-format
 msgid "Could not perform '%s'"
 msgstr "无法进行’％s'"
 
-#: src/backend_iptables.py:1089
+#: src/backend_iptables.py:1182
 msgid "Couldn't update rules file for logging"
 msgstr ""
 
-#: src/backend_iptables.py:1147 src/backend.py:578
+#: src/backend_iptables.py:1240 src/backend.py:591
 #, python-format
 msgid "Invalid log level '%s'"
 msgstr "无效的日志级别 '%s'"
 
-#: src/backend_iptables.py:1244
+#: src/backend_iptables.py:1337
 #, python-format
 msgid "Could not find '%s'. Aborting"
 msgstr "找不到 %s。中止"
 
-#: src/backend_iptables.py:1256
+#: src/backend_iptables.py:1349
 #, python-format
 msgid "'%s' already exists. Aborting"
 msgstr "'%s' 已存在。正在中止"
 
-#: src/backend_iptables.py:1262
+#: src/backend_iptables.py:1355
 #, python-format
 msgid "Backing up '%(old)s' to '%(new)s'\n"
 msgstr ""
 
-#: src/backend_iptables.py:1278 src/backend.py:185
+#: src/backend_iptables.py:1371 src/backend.py:229
 #, python-format
 msgid "Couldn't stat '%s'"
 msgstr "无法在 '%s' 上运行 stat 命令"
 
-#: src/backend_iptables.py:1283
+#: src/backend_iptables.py:1376
 #, python-format
 msgid "WARN: '%s' is world writable"
 msgstr "警告：%s 可被任意用户修改"
 
-#: src/backend_iptables.py:1285
+#: src/backend_iptables.py:1378
 #, python-format
 msgid "WARN: '%s' is world readable"
 msgstr ""
 
-#: src/backend.py:68
+#: src/backend.py:69
 msgid "Couldn't determine iptables version"
 msgstr ""
 
-#: src/backend.py:138
+#: src/backend.py:143
+msgid "problem running sysctl"
+msgstr ""
+
+#: src/backend.py:182
 msgid "Checks disabled"
 msgstr "检查被禁用"
 
-#: src/backend.py:144
+#: src/backend.py:188
 msgid "ERROR: this script should not be SUID"
 msgstr "错误： 这个脚本不能被 SUID"
 
-#: src/backend.py:147
+#: src/backend.py:191
 msgid "ERROR: this script should not be SGID"
 msgstr "错误： 这个脚本不能被 SGID"
 
-#: src/backend.py:152
+#: src/backend.py:196
 msgid "You need to be root to run this script"
 msgstr "只有 root 用户才能运行此脚本"
 
-#: src/backend.py:162
+#: src/backend.py:206
 #, python-format
 msgid "'%s' does not exist"
 msgstr "“%s”不存在"
 
-#: src/backend.py:191
+#: src/backend.py:235
 #, python-format
 msgid "uid is %(uid)s but '%(path)s' is owned by %(st_uid)s"
 msgstr "uid 是 %(uid)s 但是 '%(path)s' 属于 %(st_uid)s"
 
-#: src/backend.py:198
+#: src/backend.py:242
 #, python-format
 msgid "%s is world writable!"
 msgstr "%s 是全局可写属性！"
 
-#: src/backend.py:202
+#: src/backend.py:246
 #, python-format
 msgid "%s is group writable!"
 msgstr "%s 是全组可写属性！"
 
-#: src/backend.py:218
+#: src/backend.py:262
 #, python-format
 msgid "'%(f)s' file '%(name)s' does not exist"
 msgstr "'%(f)s' 文件 '%(name)s' 不存在"
 
-#: src/backend.py:243
+#: src/backend.py:287
 #, python-format
 msgid "Missing policy for '%s'"
 msgstr "针对  '%s' 的策略不存在"
 
-#: src/backend.py:247
+#: src/backend.py:291
 #, python-format
 msgid "Invalid policy '%(policy)s' for '%(chain)s'"
 msgstr "'%(chain)s' 的策略 '%(policy)s' 无效"
 
-#: src/backend.py:254
+#: src/backend.py:298
 msgid "Invalid option"
 msgstr "无效选项"
 
-#: src/backend.py:325
+#: src/backend.py:354
 #, python-format
 msgid "Default application policy changed to '%s'"
 msgstr "'%s' 的默认应用程序策略已改变"
 
-#: src/backend.py:407
+#: src/backend.py:421
 msgid "No rules found for application profile"
 msgstr "没有发现程序配置的规则"
 
-#: src/backend.py:466
+#: src/backend.py:477
 #, python-format
 msgid "Rules updated for profile '%s'"
 msgstr "配置 '%s' 的规则已经升级"
 
-#: src/backend.py:472
+#: src/backend.py:483
 msgid "Couldn't update application rules"
 msgstr "不能更新应用程序规则"
 
-#: src/backend.py:494
+#: src/backend.py:505
 #, python-format
 msgid "Found multiple matches for '%s'. Please use exact profile name"
 msgstr "'%s' 找到了多个匹配。清使用更精确的配置名称。"
 
-#: src/backend.py:496
+#: src/backend.py:508
 #, python-format
 msgid "Could not find a profile matching '%s'"
 msgstr "无法为 '%s' 找到相匹配的配置"
 
-#: src/backend.py:562
+#: src/backend.py:575
 msgid "Logging: "
 msgstr "日志: "
 
-#: src/backend.py:566
+#: src/backend.py:579
 msgid "unknown"
 msgstr "未知"
 
-#: src/backend.py:596
+#: src/backend.py:606
 msgid "Logging disabled"
 msgstr "日志被禁用"
 
-#: src/backend.py:598
+#: src/backend.py:608
 msgid "Logging enabled"
 msgstr "日志被启用"
 
-#: src/common.py:186
+#: src/common.py:191
 #, python-format
 msgid "Bad port '%s'"
 msgstr "错误的端口 '%s'"
 
-#: src/common.py:251
+#: src/common.py:252
 #, python-format
 msgid "Unsupported protocol '%s'"
 msgstr "未被支持的协议 '%s'"
 
-#: src/common.py:279
+#: src/common.py:280
 msgid "Bad source address"
 msgstr "错误的源地址"
 
-#: src/common.py:289
+#: src/common.py:290
 msgid "Bad destination address"
 msgstr "错误的目标地址"
 
-#: src/common.py:297
+#: src/common.py:298
 msgid "Bad interface type"
 msgstr "错误的接口类型"
 
-#: src/common.py:301
+#: src/common.py:302
+msgid "Bad interface name: reserved character: '!'"
+msgstr ""
+
+#: src/common.py:306
 msgid "Bad interface name"
 msgstr "错误的接口名称"
 
-#: src/common.py:305
+#: src/common.py:310
 msgid "Bad interface name: can't use interface aliases"
 msgstr "错误的接口名称：无法使用接口别名"
 
-#: src/common.py:316
+#: src/common.py:321
 #, python-format
 msgid "Insert position '%s' is not a valid position"
 msgstr "插入位置‘%s'不是一个有效的位置"
 
-#: src/common.py:326
+#: src/common.py:331
 #, python-format
 msgid "Invalid log type '%s'"
 msgstr "无效的日志类型'%s'"
 
-#: src/common.py:334
+#: src/common.py:339
 #, python-format
 msgid "Unsupported direction '%s'"
 msgstr "不支持的方向 '%s'"
 
-#: src/common.py:355
+#: src/common.py:350
+msgid "Could not normalize source address"
+msgstr "不能标准化源地址"
+
+#: src/common.py:361
 msgid "Could not normalize destination address"
 msgstr "不能标准化目标地址"
 
-#: src/common.py:416
+#: src/common.py:425
 msgid "Found exact match"
 msgstr "找到完全匹配项"
 
-#: src/common.py:420
+#: src/common.py:429
 #, python-format
 msgid "Found non-action/non-logtype match (%(xa)s/%(ya)s %(xl)s/%(yl)s)"
 msgstr ""
 
-#: src/frontend.py:88
+#: src/frontend.py:90
 #, python-format
 msgid ""
 "\n"
@@ -526,6 +543,7 @@
 " %(limit)-31s add limit %(rule)s\n"
 " %(delete)-31s delete %(urule)s\n"
 " %(insert)-31s insert %(urule)s at %(number)s\n"
+" %(reload)-31s reload firewall\n"
 " %(reset)-31s reset firewall\n"
 " %(status)-31s show firewall status\n"
 " %(statusnum)-31s show firewall status as numbered list of %(rules)s\n"
@@ -540,63 +558,63 @@
 " %(appdefault)-31s set default application policy\n"
 msgstr ""
 
-#: src/frontend.py:160
+#: src/frontend.py:164
 msgid "n"
 msgstr "n"
 
-#: src/frontend.py:161
+#: src/frontend.py:165
 msgid "y"
 msgstr "y"
 
-#: src/frontend.py:162
+#: src/frontend.py:166
 msgid "yes"
 msgstr "是"
 
-#: src/frontend.py:207
+#: src/frontend.py:211
 msgid "Firewall is active and enabled on system startup"
 msgstr "在系统启动时启用和激活防火墙"
 
-#: src/frontend.py:214
+#: src/frontend.py:218
 msgid "Firewall stopped and disabled on system startup"
 msgstr "防火墙在系统启动时自动禁用"
 
-#: src/frontend.py:265
+#: src/frontend.py:270
 msgid "Could not get listening status"
 msgstr "无法取得监听状态"
 
-#: src/frontend.py:326
+#: src/frontend.py:339
 msgid "Added user rules (see 'ufw status' for running firewall):"
 msgstr ""
 
-#: src/frontend.py:329
+#: src/frontend.py:342
 msgid ""
 "\n"
 "(None)"
 msgstr ""
 
-#: src/frontend.py:381 src/frontend.py:479 src/frontend.py:489
+#: src/frontend.py:398 src/frontend.py:496 src/frontend.py:506
 #, python-format
 msgid "Invalid IP version '%s'"
 msgstr "错误的 IP 协议版本 '%s'"
 
-#: src/frontend.py:412
+#: src/frontend.py:429
 msgid "Invalid position '"
 msgstr "无效位置 '"
 
-#: src/frontend.py:486
+#: src/frontend.py:503
 msgid "IPv6 support not enabled"
 msgstr "IPv6 支持未被启用"
 
-#: src/frontend.py:497
+#: src/frontend.py:514
 msgid "Rule changed after normalization"
 msgstr "标准化后规则被改变"
 
-#: src/frontend.py:521
+#: src/frontend.py:538
 #, python-format
 msgid "Could not back out rule '%s'"
 msgstr "无法备份规则 '%s'"
 
-#: src/frontend.py:525
+#: src/frontend.py:542
 msgid ""
 "\n"
 "Error applying application rules."
@@ -604,25 +622,25 @@
 "\n"
 "应用规则时出错。"
 
-#: src/frontend.py:527
+#: src/frontend.py:544
 msgid " Some rules could not be unapplied."
 msgstr " 一些规则不能被撤销。"
 
-#: src/frontend.py:529
+#: src/frontend.py:546
 msgid " Attempted rules successfully unapplied."
 msgstr " 成功撤销了对尝试规则的应用。"
 
-#: src/frontend.py:540
+#: src/frontend.py:557
 #, python-format
 msgid "Could not find rule '%s'"
 msgstr "无法找到规则 '%s'"
 
-#: src/frontend.py:545 src/frontend.py:550
+#: src/frontend.py:562 src/frontend.py:567
 #, python-format
 msgid "Could not find rule '%d'"
 msgstr "无法找到规则 '%d'"
 
-#: src/frontend.py:562
+#: src/frontend.py:583
 #, python-format
 msgid ""
 "Deleting:\n"
@@ -630,51 +648,51 @@
 "Proceed with operation (%(yes)s|%(no)s)? "
 msgstr ""
 
-#: src/frontend.py:593
+#: src/frontend.py:614
 msgid "Unsupported default policy"
 msgstr "不支持的默认策略"
 
-#: src/frontend.py:622 src/frontend.py:767
+#: src/frontend.py:643 src/frontend.py:788
 msgid "Firewall reloaded"
 msgstr "已经重新载入防火墙"
 
-#: src/frontend.py:624
+#: src/frontend.py:645
 msgid "Firewall not enabled (skipping reload)"
 msgstr "未启用防火墙(跳过重新载入)"
 
-#: src/frontend.py:641 src/frontend.py:655 src/frontend.py:692
+#: src/frontend.py:662 src/frontend.py:676 src/frontend.py:713
 msgid "Invalid profile name"
 msgstr "非法的配置文件名"
 
-#: src/frontend.py:660 src/frontend.py:842
+#: src/frontend.py:681 src/frontend.py:863
 #, python-format
 msgid "Unsupported action '%s'"
 msgstr "不支持的动作'%s'"
 
-#: src/frontend.py:679
+#: src/frontend.py:700
 msgid "Available applications:"
 msgstr "可用应用程序："
 
-#: src/frontend.py:700
+#: src/frontend.py:721
 #, python-format
 msgid "Could not find profile '%s'"
 msgstr "无法找到配置文件 '%s'"
 
-#: src/frontend.py:705
+#: src/frontend.py:726
 msgid "Invalid profile"
 msgstr "非法配置文件"
 
-#: src/frontend.py:708
+#: src/frontend.py:729
 #, python-format
 msgid "Profile: %s\n"
 msgstr "配置: %s\n"
 
-#: src/frontend.py:709
+#: src/frontend.py:730
 #, python-format
 msgid "Title: %s\n"
 msgstr "标题：%s\n"
 
-#: src/frontend.py:712
+#: src/frontend.py:733
 #, python-format
 msgid ""
 "Description: %s\n"
@@ -683,91 +701,91 @@
 "描述： %s\n"
 "\n"
 
-#: src/frontend.py:718
+#: src/frontend.py:739
 msgid "Ports:"
 msgstr "端口："
 
-#: src/frontend.py:720
+#: src/frontend.py:741
 msgid "Port:"
 msgstr "端口:"
 
-#: src/frontend.py:769
+#: src/frontend.py:790
 msgid "Skipped reloading firewall"
 msgstr "跳过重新加载防火墙"
 
-#: src/frontend.py:779
+#: src/frontend.py:800
 msgid "Cannot specify 'all' with '--add-new'"
 msgstr "不能指定 'all' 使用 '--add-new'"
 
-#: src/frontend.py:794
+#: src/frontend.py:815
 #, python-format
 msgid "Unknown policy '%s'"
 msgstr "未知的策略 '%s'"
 
-#: src/frontend.py:851
+#: src/frontend.py:872
 #, python-format
 msgid ""
 "Command may disrupt existing ssh connections. Proceed with operation "
 "(%(yes)s|%(no)s)? "
 msgstr ""
 
-#: src/frontend.py:864
+#: src/frontend.py:885
 #, python-format
 msgid ""
 "Resetting all rules to installed defaults. Proceed with operation "
 "(%(yes)s|%(no)s)? "
 msgstr ""
 
-#: src/frontend.py:868
+#: src/frontend.py:889
 #, python-format
 msgid ""
 "Resetting all rules to installed defaults. This may disrupt existing ssh "
 "connections. Proceed with operation (%(yes)s|%(no)s)? "
 msgstr ""
 
-#: src/parser.py:107
+#: src/parser.py:108
 #, python-format
 msgid "Cannot insert rule at position '%s'"
 msgstr "无法在'%s'处插入规则"
 
-#: src/parser.py:145
+#: src/parser.py:142
 msgid "Invalid interface clause"
 msgstr ""
 
-#: src/parser.py:171
+#: src/parser.py:168
 msgid "Option 'log' not allowed here"
 msgstr "此处不允许使用 'log' 选项"
 
-#: src/parser.py:175
+#: src/parser.py:172
 msgid "Option 'log-all' not allowed here"
 msgstr "此处不允许使用 'log-all' 选项"
 
-#: src/parser.py:208 src/parser.py:222
+#: src/parser.py:205 src/parser.py:219
 msgid "Bad port"
 msgstr "错误的端口"
 
-#: src/parser.py:213 src/parser.py:333
+#: src/parser.py:210 src/parser.py:342
 msgid "Port ranges must be numeric"
 msgstr "端口范围必须为数字"
 
-#: src/parser.py:227 src/parser.py:419
+#: src/parser.py:224 src/parser.py:441
 #, python-format
 msgid "Invalid port with protocol '%s'"
 msgstr ""
 
-#: src/parser.py:231
+#: src/parser.py:228
 msgid "Wrong number of arguments"
 msgstr "参数数目错误"
 
-#: src/parser.py:235
+#: src/parser.py:232
 msgid "Need 'to' or 'from' clause"
 msgstr "需要 'to' 或者 'from' 从句"
 
-#: src/parser.py:250
+#: src/parser.py:247
 msgid "Improper rule syntax"
 msgstr "防火墙规则的语法不正确"
 
-#: src/parser.py:257
+#: src/parser.py:254
 #, python-format
 msgid "Invalid token '%s'"
 msgstr "无效的标记 '%s'"
@@ -776,85 +794,84 @@
 msgid "Invalid 'proto' clause"
 msgstr "无效的 'proto' 从句"
 
-#: src/parser.py:278
+#: src/parser.py:281
 #, python-format
 msgid "Invalid '%s' clause"
 msgstr ""
 
-#: src/parser.py:297
+#: src/parser.py:303
 msgid "Invalid 'from' clause"
 msgstr "无效的 'from' 从句"
 
-#: src/parser.py:316
+#: src/parser.py:325
 msgid "Invalid 'to' clause"
 msgstr "无效的 'to' 从句"
 
-#: src/parser.py:321
+#: src/parser.py:330
 #, python-format
 msgid "Need 'from' or 'to' with '%s'"
 msgstr "需要 'from' 或者 'to' 使用 '%s'"
 
-#: src/parser.py:345
+#: src/parser.py:357
 msgid "Invalid 'port' clause"
 msgstr "无效的 'port' 从句"
 
-#: src/parser.py:354
+#: src/parser.py:366
 msgid "Mixed IP versions for 'from' and 'to'"
 msgstr "'from' 和 'to' 的 IP 版本不同"
 
-#: src/parser.py:368 src/parser.py:375 src/parser.py:381
+#: src/parser.py:383 src/parser.py:393 src/parser.py:402
 msgid "Could not find protocol"
 msgstr "无法找到协议"
 
-#: src/parser.py:388
+#: src/parser.py:409
 msgid "Protocol mismatch (from/to)"
 msgstr "from 和 to 的协议不匹配"
 
-#: src/parser.py:395
+#: src/parser.py:416
 #, python-format
 msgid "Protocol mismatch with specified protocol %s"
 msgstr "协议与指定的协议 %s 不匹配"
 
-#: src/parser.py:402
+#: src/parser.py:423
 #, python-format
 msgid "Improper rule syntax ('%s' specified with app rule)"
 msgstr "不正确的规则语法 ('%s' 是由程序规则指定的)"
 
-#: src/parser.py:409
+#: src/parser.py:430
 #, python-format
 msgid "Invalid IPv6 address with protocol '%s'"
 msgstr ""
 
-#: src/parser.py:740
-#, python-format
-msgid "Invalid command '%s'"
+#: src/parser.py:563
+msgid "Invalid interface clause for route rule"
 msgstr ""
 
-#: src/parser.py:762
+#: src/parser.py:849
 #, python-format
 msgid "Command '%s' already exists"
 msgstr ""
 
-#: src/util.py:414
+#: src/util.py:434
 msgid "Couldn't find pid (is /proc mounted?)"
 msgstr "无法找到 pid (/proc 是否已经加载？)"
 
-#: src/util.py:418
+#: src/util.py:438
 #, python-format
 msgid "Couldn't find parent pid for '%s'"
 msgstr "无法找到 '%s' 的父 pid"
 
-#: src/util.py:428
+#: src/util.py:448
 #, python-format
 msgid "Couldn't find '%s'"
 msgstr "无法找到 '%s'"
 
-#: src/util.py:434
+#: src/util.py:454
 #, python-format
 msgid "Could not find executable for '%s'"
 msgstr "无法找到针对 '%s' 的可执行文件"
 
-#: src/util.py:985
+#: src/util.py:1006
 #, python-format
 msgid "Could not get statistics for '%s'"
 msgstr ""
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/unattended-upgrades.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/unattended-upgrades.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/unattended-upgrades.po	2014-02-24 08:24:38.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/unattended-upgrades.po	2014-03-24 09:42:46.000000000 +0000
@@ -7,57 +7,57 @@
 msgstr ""
 "Project-Id-Version: unattended-upgrades\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-02-06 17:13+0000\n"
+"POT-Creation-Date: 2014-02-25 08:55+0000\n"
 "PO-Revision-Date: 2009-09-23 14:19+0000\n"
 "Last-Translator: Wylmer Wang <Unknown>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:27+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:48+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: ../unattended-upgrade:142
 #, c-format
 msgid "Progress: %s %% (%s)"
 msgstr ""
 
-#: ../unattended-upgrade:358 ../unattended-upgrade:442
+#: ../unattended-upgrade:358 ../unattended-upgrade:444
 #: ../unattended-upgrade-shutdown:161
 msgid "All upgrades installed"
 msgstr "安装了所有的更新"
 
-#: ../unattended-upgrade:360 ../unattended-upgrade:434
+#: ../unattended-upgrade:360 ../unattended-upgrade:436
 msgid "Installing the upgrades failed!"
 msgstr "安装更新失败！"
 
-#: ../unattended-upgrade:361 ../unattended-upgrade:435
+#: ../unattended-upgrade:361 ../unattended-upgrade:437
 #, c-format
 msgid "error message: '%s'"
 msgstr "错误信息：‘%s’"
 
-#: ../unattended-upgrade:362 ../unattended-upgrade:436
+#: ../unattended-upgrade:362 ../unattended-upgrade:438
 #, c-format
 msgid "dpkg returned a error! See '%s' for details"
 msgstr "dpkg 返回错误！详细信息参见‘%s’"
 
-#: ../unattended-upgrade:697
+#: ../unattended-upgrade:699
 msgid ""
 "No '/usr/bin/mail' or '/usr/sbin/sendmail',can not send mail. You probably "
 "want to install the 'mailx' package."
 msgstr ""
 
-#: ../unattended-upgrade:710
+#: ../unattended-upgrade:712
 #, c-format
 msgid "[reboot required] unattended-upgrades result for '%s': %s"
 msgstr ""
 
-#: ../unattended-upgrade:713
+#: ../unattended-upgrade:715
 #, c-format
 msgid "unattended-upgrades result for '%s': '%s'"
 msgstr ""
 
-#: ../unattended-upgrade:715
+#: ../unattended-upgrade:717
 #, c-format
 msgid ""
 "Unattended upgrade returned: %s\n"
@@ -66,7 +66,7 @@
 "无人照管更新返回：%s\n"
 "\n"
 
-#: ../unattended-upgrade:718
+#: ../unattended-upgrade:720
 msgid ""
 "Warning: A reboot is required to complete this upgrade.\n"
 "\n"
@@ -74,138 +74,138 @@
 "警告：需要重新启动以完成此次升级。\n"
 "\n"
 
-#: ../unattended-upgrade:720
+#: ../unattended-upgrade:722
 msgid "Packages that were upgraded:\n"
 msgstr ""
 
-#: ../unattended-upgrade:722
+#: ../unattended-upgrade:724
 msgid "Packages that attempted to upgrade:\n"
 msgstr ""
 
-#: ../unattended-upgrade:726
+#: ../unattended-upgrade:728
 msgid "Packages with upgradable origin but kept back:\n"
 msgstr "可更新但保留了原始版本的软件包:\n"
 
-#: ../unattended-upgrade:731
+#: ../unattended-upgrade:733
 msgid "Package installation log:"
 msgstr "软件包安装日志："
 
-#: ../unattended-upgrade:735
+#: ../unattended-upgrade:737
 msgid "Unattended-upgrades log:\n"
 msgstr "无人照管更新日志：\n"
 
-#: ../unattended-upgrade:755
+#: ../unattended-upgrade:757
 #, c-format
 msgid "Writing dpkg log to '%s'"
 msgstr "写 dpkg 日志到‘%s’"
 
-#: ../unattended-upgrade:887
+#: ../unattended-upgrade:889
 #, c-format
 msgid "Initial blacklisted packages: %s"
 msgstr "初始化黑名单软件包：%s"
 
-#: ../unattended-upgrade:889
+#: ../unattended-upgrade:891
 msgid "Starting unattended upgrades script"
 msgstr "启动无人照管的更新脚本"
 
-#: ../unattended-upgrade:892
+#: ../unattended-upgrade:894
 #, c-format
 msgid "Allowed origins are: %s"
 msgstr "允许的源：%s"
 
-#: ../unattended-upgrade:905 ../unattended-upgrade:906
+#: ../unattended-upgrade:907 ../unattended-upgrade:908
 msgid "Unclean dpkg state detected, trying to correct"
 msgstr ""
 
-#: ../unattended-upgrade:915
+#: ../unattended-upgrade:917
 #, c-format
 msgid ""
 "dpkg --configure -a output:\n"
 "%s"
 msgstr ""
 
-#: ../unattended-upgrade:924
+#: ../unattended-upgrade:926
 msgid "Lock could not be acquired (another package manager running?)"
 msgstr "无法获取锁(另一个软件包管理器在运行？)"
 
-#: ../unattended-upgrade:926
+#: ../unattended-upgrade:928
 msgid "Cache lock can not be acquired, exiting"
 msgstr "无法获取缓存锁，退出"
 
-#: ../unattended-upgrade:933 ../unattended-upgrade:934
+#: ../unattended-upgrade:935 ../unattended-upgrade:936
 msgid "Cache has broken packages, exiting"
 msgstr "缓存存在不完整的软件包，退出"
 
-#: ../unattended-upgrade:980
+#: ../unattended-upgrade:982
 #, c-format
 msgid "package '%s' upgradable but fails to be marked for upgrade (%s)"
 msgstr "软件包 '%s' 可以升级，但是标记为升级时失败（%s）"
 
-#: ../unattended-upgrade:1005
+#: ../unattended-upgrade:1007
 #, c-format
 msgid "GetArchives() failed: '%s'"
 msgstr "GetArchives()失败：‘%s’"
 
-#: ../unattended-upgrade:1015 ../unattended-upgrade:1016
+#: ../unattended-upgrade:1017 ../unattended-upgrade:1018
 #, c-format
 msgid "An error occurred: '%s'"
 msgstr ""
 
-#: ../unattended-upgrade:1018 ../unattended-upgrade:1020
+#: ../unattended-upgrade:1020 ../unattended-upgrade:1022
 #, c-format
 msgid "The URI '%s' failed to download, aborting"
 msgstr "下载‘%s’失败，异常中断"
 
-#: ../unattended-upgrade:1024
+#: ../unattended-upgrade:1026
 #, c-format
 msgid "Download finished, but file '%s' not there?!?"
 msgstr "下载完成，但 '%s' 文件没在那里?!?"
 
-#: ../unattended-upgrade:1040 ../unattended-upgrade:1044
+#: ../unattended-upgrade:1042 ../unattended-upgrade:1046
 #, c-format
 msgid "Package '%s' has conffile prompt and needs to be upgraded manually"
 msgstr "软件包‘%s’有冲突提示，需要手工更新"
 
-#: ../unattended-upgrade:1067
+#: ../unattended-upgrade:1069
 #, c-format
 msgid "package '%s' not upgraded"
 msgstr "软件包‘%s’没有更新"
 
-#: ../unattended-upgrade:1082
+#: ../unattended-upgrade:1084
 #, c-format
 msgid "Packages that are auto removed: '%s'"
 msgstr "自动移除了的软件包：“%s”"
 
-#: ../unattended-upgrade:1091
+#: ../unattended-upgrade:1093
 msgid "No packages found that can be upgraded unattended"
 msgstr "没有发现可以无人照管的升级包"
 
-#: ../unattended-upgrade:1113
+#: ../unattended-upgrade:1115
 #, c-format
 msgid "Packages that will be upgraded: %s"
 msgstr ""
 
-#: ../unattended-upgrade:1154
+#: ../unattended-upgrade:1157
 msgid "print debug messages"
 msgstr "打印调试信息"
 
-#: ../unattended-upgrade:1157
+#: ../unattended-upgrade:1160
 msgid "make apt/libapt print verbose debug messages"
 msgstr ""
 
-#: ../unattended-upgrade:1160
+#: ../unattended-upgrade:1163
 msgid "print info messages"
 msgstr ""
 
-#: ../unattended-upgrade:1163
+#: ../unattended-upgrade:1166
 msgid "Simulation, download but do not install"
 msgstr "模拟，下载但不安装"
 
-#: ../unattended-upgrade:1166
+#: ../unattended-upgrade:1169
 msgid "Upgrade in minimal steps (and allow interrupting with SIGINT"
 msgstr ""
 
-#: ../unattended-upgrade:1175
+#: ../unattended-upgrade:1178
 msgid "You need to be root to run this application"
 msgstr "您需要 roo t的权限来运行这个程序"
 
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/unity_firefox_extension.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/unity_firefox_extension.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/unity_firefox_extension.po	2014-02-24 08:24:48.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/unity_firefox_extension.po	2014-03-24 09:42:54.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:42+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 14:23+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: unity_webapps.properties:0
 msgid ""
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/update-manager.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/update-manager.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/update-manager.po	2014-02-24 08:24:34.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/update-manager.po	2014-03-24 09:42:41.000000000 +0000
@@ -9,51 +9,51 @@
 msgstr ""
 "Project-Id-Version: update-manager HEAD\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2014-01-16 12:05+0000\n"
-"PO-Revision-Date: 2014-01-16 08:57+0000\n"
+"POT-Creation-Date: 2014-03-17 16:42+0000\n"
+"PO-Revision-Date: 2014-03-18 13:26+0000\n"
 "Last-Translator: Yiding He <yiding.he@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:54+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:11+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: \n"
 
-#: ../UpdateManager/backend/InstallBackendAptdaemon.py:62
+#: ../UpdateManager/backend/InstallBackendAptdaemon.py:67
 msgid "Checking for updates…"
 msgstr "正在检查更新..."
 
-#: ../UpdateManager/backend/InstallBackendAptdaemon.py:84
+#: ../UpdateManager/backend/InstallBackendAptdaemon.py:92
 msgid "Installing updates…"
 msgstr "正在安装更新..."
 
-#: ../UpdateManager/backend/InstallBackendSynaptic.py:62
+#: ../UpdateManager/backend/InstallBackendSynaptic.py:60
 msgid "Please wait, this can take some time."
 msgstr "请稍候，这需要花一些时间。"
 
-#: ../UpdateManager/backend/InstallBackendSynaptic.py:64
+#: ../UpdateManager/backend/InstallBackendSynaptic.py:62
 msgid "Update is complete"
 msgstr "更新完成"
 
-#: ../UpdateManager/ChangelogViewer.py:79
+#: ../UpdateManager/ChangelogViewer.py:73
 msgid "Open Link in Browser"
 msgstr "在浏览器中打开链接"
 
-#: ../UpdateManager/ChangelogViewer.py:83
+#: ../UpdateManager/ChangelogViewer.py:76
 msgid "Copy Link to Clipboard"
 msgstr "复制链接到剪贴板"
 
-#: ../UpdateManager/Dialogs.py:80
+#: ../UpdateManager/Dialogs.py:115
 msgid "Settings…"
 msgstr "设置..."
 
-#: ../UpdateManager/Dialogs.py:112 ../UpdateManager/UpdateManager.py:192
+#: ../UpdateManager/Dialogs.py:144 ../UpdateManager/UpdateManager.py:247
 msgid "You stopped the check for updates."
 msgstr "您停止了更新检查。"
 
-#: ../UpdateManager/Dialogs.py:114
+#: ../UpdateManager/Dialogs.py:146
 msgid "_Check Again"
 msgstr "重新检查(_C)"
 
@@ -61,37 +61,38 @@
 msgid "No software updates are available."
 msgstr "没有可用的软件更新。"
 
-#: ../UpdateManager/Dialogs.py:124 ../UpdateManager/Dialogs.py:133
+#. FIXME: this should go into DistUpgradeController
+#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:678
 msgid "The software on this computer is up to date."
 msgstr "此计算机中的软件是最新软件。"
 
 #. Translators: these are Ubuntu version names like "Ubuntu 12.04"
-#: ../UpdateManager/Dialogs.py:135
+#: ../UpdateManager/Dialogs.py:172
 #, python-format
 msgid "However, %s %s is now available (you have %s)."
 msgstr "然而， %s %s 现在是可用的（正在使用 %s）。"
 
-#: ../UpdateManager/Dialogs.py:140
+#: ../UpdateManager/Dialogs.py:177
 msgid "Upgrade…"
 msgstr "升级..."
 
 #. Translators: this is an Ubuntu version name like "Ubuntu 12.04"
-#: ../UpdateManager/Dialogs.py:162
+#: ../UpdateManager/Dialogs.py:200
 #, python-format
 msgid "Software updates are no longer provided for %s %s."
 msgstr "不再为 %s %s 提供软件更新。"
 
 #. Translators: this is an Ubuntu version name like "Ubuntu 12.04"
-#: ../UpdateManager/Dialogs.py:166
+#: ../UpdateManager/Dialogs.py:204
 #, python-format
 msgid "To stay secure, you should upgrade to %s %s."
 msgstr "为了保持安全，您应该升级到 %s %s。"
 
-#: ../UpdateManager/Dialogs.py:179
+#: ../UpdateManager/Dialogs.py:217
 msgid "Not all updates can be installed"
 msgstr "不是全部更新都可以安装"
 
-#: ../UpdateManager/Dialogs.py:181
+#: ../UpdateManager/Dialogs.py:219
 msgid ""
 "Run a partial upgrade, to install as many updates as possible.\n"
 "\n"
@@ -109,11 +110,11 @@
 "     *非官方的软件不是由Ubuntu提供的软件包\n"
 "     *正常变化的预发行版本的Ubuntu"
 
-#: ../UpdateManager/Dialogs.py:189
+#: ../data/gtkbuilder/UpdateManager.ui.h:3
 msgid "_Partial Upgrade"
 msgstr "部分升级(_P)"
 
-#: ../UpdateManager/Dialogs.py:190
+#: ../DistUpgrade/DistUpgrade.ui.h:12
 msgid "_Continue"
 msgstr "继续(_C)"
 
@@ -121,7 +122,7 @@
 msgid "_Try Again"
 msgstr "再试一次(_T)"
 
-#: ../UpdateManager/Dialogs.py:232
+#: ../UpdateManager/Dialogs.py:279
 msgid "The computer needs to restart to finish installing updates."
 msgstr "计算机需要重启以完成安装更新。"
 
@@ -134,7 +135,7 @@
 msgstr ""
 
 #. Basic GTK+ parameters
-#: ../UpdateManager/UpdateManager.py:82 ../data/update-manager.desktop.in.h:1
+#: ../UpdateManager/UpdateManager.py:87 ../data/update-manager.desktop.in.h:1
 msgid "Software Updater"
 msgstr "软件更新器"
 
@@ -142,27 +143,27 @@
 msgid "Some software couldn’t be checked for updates."
 msgstr "无法为某些软件检查更新"
 
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:248
 msgid "Updated software is available from a previous check."
 msgstr "之前的检查发现有软件升级可用。"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:269
+#: ../UpdateManager/UpdateManager.py:1153
 msgid "Software index is broken"
 msgstr "软件索引已经损坏"
 
-#: ../UpdateManager/UpdateManager.py:270
+#: ../UpdateManager/UpdateManager.py:1154
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
 "this issue at first."
 msgstr "无法安装或删除任何软件。请使用新立得软件包管理器或在终端运行 \"sudo apt-get install -f\" 来修正这个问题。"
 
-#: ../UpdateManager/UpdateManager.py:276
+#: ../UpdateManager/UpdateManager.py:1003
 msgid "Could not initialize the package information"
 msgstr "无法初始化软件包信息"
 
-#: ../UpdateManager/UpdateManager.py:277
+#: ../UpdateManager/UpdateManager.py:1004
 msgid ""
 "An unresolvable problem occurred while initializing the package "
 "information.\n"
@@ -174,11 +175,12 @@
 "\n"
 "请汇报这个“update-manager”软件包的错误，并且将如下信息包含在报告中：\n"
 
-#: ../UpdateManager/UpdateManager.py:292
+#: ../DistUpgrade/DistUpgradeCache.py:697
+#: ../UpdateManager/UpdateManager.py:1032
 msgid "Could not calculate the upgrade"
 msgstr "无法计算升级"
 
-#: ../UpdateManager/UpdateManager.py:293
+#: ../UpdateManager/UpdateManager.py:352
 msgid ""
 "An unresolvable problem occurred while calculating the upgrade.\n"
 "\n"
@@ -193,8 +195,8 @@
 msgid "Install Now"
 msgstr "立即安装"
 
-#: ../UpdateManager/UpdatesAvailable.py:151
-#: ../UpdateManagerText/UpdateManagerText.py:36
+#: ../UpdateManager/UpdateManager.py:229
+#: ../UpdateManagerText/UpdateManagerText.py:32
 msgid "Install"
 msgstr "安装"
 
@@ -202,59 +204,59 @@
 msgid "Download"
 msgstr "下载"
 
-#: ../UpdateManager/UpdatesAvailable.py:204
+#: ../UpdateManager/UpdatesAvailable.py:377
 msgid "_Remind Me Later"
 msgstr "稍后提醒(_R)"
 
 #. upload_archive = version_match.group(2).strip()
-#: ../UpdateManager/UpdatesAvailable.py:250
+#: ../UpdateManager/UpdateManager.py:391
 #, python-format
 msgid "Version %s: \n"
 msgstr "版本 %s： \n"
 
-#: ../UpdateManager/UpdatesAvailable.py:308
+#: ../UpdateManager/UpdateManager.py:448
 msgid ""
 "No network connection detected, you can not download changelog information."
 msgstr "未检测到网络连接，您无法下载更新日志。"
 
-#: ../UpdateManager/UpdatesAvailable.py:318
+#: ../UpdateManager/UpdateManager.py:456
 msgid "Downloading list of changes..."
 msgstr "正在下载更新列表..."
 
-#: ../UpdateManager/UpdatesAvailable.py:363
+#: ../UpdateManager/UpdateManager.py:500
 msgid "_Deselect All"
 msgstr "全部不选(_D)"
 
-#: ../UpdateManager/UpdatesAvailable.py:366
+#: ../UpdateManager/UpdateManager.py:506
 msgid "Select _All"
 msgstr "选择全部(_A)"
 
-#: ../UpdateManager/UpdatesAvailable.py:427
+#: ../UpdateManager/UpdateManager.py:570
 #, python-format
 msgid "%s will be downloaded."
 msgstr "将会下载 %s。"
 
-#: ../UpdateManager/UpdatesAvailable.py:441
+#: ../UpdateManager/UpdatesAvailable.py:746
 msgid "The update has already been downloaded."
 msgid_plural "The updates have already been downloaded."
 msgstr[0] "更新已经下载。"
 
-#: ../UpdateManager/UpdatesAvailable.py:447
+#: ../UpdateManager/UpdateManager.py:587
 msgid "There are no updates to install."
 msgstr "没有更新需要安装。"
 
-#: ../UpdateManager/UpdatesAvailable.py:456
+#: ../UpdateManager/UpdateManager.py:600
 msgid "Unknown download size."
 msgstr "未知下载大小。"
 
-#: ../UpdateManager/UpdatesAvailable.py:476
+#: ../UpdateManager/UpdatesAvailable.py:788
 #, python-format
 msgid ""
 "Updated software has been issued since %s %s was released. Do you want to "
 "install it now?"
 msgstr "因为%s %s的发布，更新后的软件已发行。你想现在安装吗？"
 
-#: ../UpdateManager/UpdatesAvailable.py:481
+#: ../UpdateManager/UpdatesAvailable.py:793
 msgid ""
 "Updated software is available for this computer. Do you want to install it "
 "now?"
@@ -265,12 +267,13 @@
 "The computer also needs to restart to finish installing previous updates."
 msgstr ""
 
-#. print("on_button_install_clicked")
-#: ../UpdateManager/UpdatesAvailable.py:546
+#. print "on_button_install_clicked"
+#: ../DistUpgrade/DistUpgradeController.py:866
+#: ../UpdateManager/UpdateManager.py:753
 msgid "Not enough free disk space"
 msgstr "磁盘空间不足"
 
-#: ../UpdateManager/UpdatesAvailable.py:547
+#: ../UpdateManager/UpdateManager.py:754
 #, python-format
 msgid ""
 "The upgrade needs a total of %s free space on disk '%s'. Please free at "
@@ -280,11 +283,11 @@
 "这个更新需要花去 %s 磁盘上总计 %s 的空间。请在 %s 磁盘上留出 %s 空间。清空您的回收站和临时文件，用“sudo apt-get "
 "clean”清理以前的安装文件。"
 
-#: ../UpdateManager/UpdatesAvailable.py:573
+#: ../UpdateManager/UpdateManager.py:858
 msgid "Connecting..."
 msgstr "正在连接..."
 
-#: ../UpdateManager/UpdatesAvailable.py:589
+#: ../UpdateManager/UpdateManager.py:875
 msgid "You may not be able to check for updates or download new updates."
 msgstr "您可能无法检查更新或下载新的更新。"
 
@@ -292,27 +295,27 @@
 msgid "Security updates"
 msgstr "安全更新"
 
-#: ../UpdateManager/Core/UpdateList.py:105
+#: ../UpdateManager/Core/UpdateList.py:70
 msgid "Other updates"
 msgstr "其它更新"
 
-#: ../UpdateManager/UnitySupport.py:70
+#: ../UpdateManager/UnitySupport.py:66
 msgid "Install All Available Updates"
 msgstr "安装全部可利用的更新"
 
-#: ../UpdateManagerText/UpdateManagerText.py:35
+#: ../UpdateManagerText/UpdateManagerText.py:31
 msgid "Cancel"
 msgstr "取消"
 
-#: ../UpdateManagerText/UpdateManagerText.py:38
+#: ../UpdateManagerText/UpdateManagerText.py:34
 msgid "Changelog"
 msgstr "变更日志"
 
-#: ../UpdateManagerText/UpdateManagerText.py:41
+#: ../UpdateManagerText/UpdateManagerText.py:37
 msgid "Updates"
 msgstr "更新"
 
-#: ../UpdateManagerText/UpdateManagerText.py:54
+#: ../UpdateManagerText/UpdateManagerText.py:50
 msgid "Building Updates List"
 msgstr "正在建立更新列表"
 
@@ -340,15 +343,15 @@
 " * 不是 Ubuntu 提供的非官方软件包\n"
 " * Ubuntu 预览版本的正常更新"
 
-#: ../UpdateManagerText/UpdateManagerText.py:127
+#: ../UpdateManagerText/UpdateManagerText.py:122
 msgid "Downloading changelog"
 msgstr "正在下载变更日志"
 
-#: ../UpdateManager/Core/MyCache.py:346
+#: ../UpdateManager/Core/MyCache.py:316
 msgid "This update does not come from a source that supports changelogs."
 msgstr "更新不是来源于支持日志变更的源。"
 
-#: ../UpdateManager/Core/MyCache.py:352 ../UpdateManager/Core/MyCache.py:388
+#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
@@ -365,7 +368,7 @@
 "\n"
 msgstr ""
 
-#: ../UpdateManager/Core/MyCache.py:374
+#: ../UpdateManager/Core/MyCache.py:339
 #, python-format
 msgid ""
 "The changelog does not contain any relevant changes.\n"
@@ -378,7 +381,7 @@
 "请访问 http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
 "直到变更可用或再试一遍。"
 
-#: ../UpdateManager/Core/MyCache.py:381
+#: ../UpdateManager/Core/MyCache.py:344
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -399,27 +402,27 @@
 msgstr "%s 核心组件"
 
 #. TRANSLATORS: download size of small updates, e.g. "250 kB"
-#: ../UpdateManager/Core/utils.py:462
+#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399
 #, python-format
 msgid "%(size).0f kB"
 msgid_plural "%(size).0f kB"
 msgstr[0] "%(size).0f kB"
 
 #. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/Core/utils.py:466
+#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402
 #, python-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:1
+#: ../data/gtkbuilder/UpdateManager.ui.h:27
 msgid "updates"
 msgstr "更新"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:2
+#: ../data/gtkbuilder/UpdateManager.ui.h:32
 msgid "Changes"
 msgstr "变更"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:3
+#: ../data/gtkbuilder/UpdateManager.ui.h:33
 msgid "Description"
 msgstr "描述"
 
@@ -435,18 +438,18 @@
 msgid "The computer will need to restart."
 msgstr ""
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:6
+#: ../data/gtkbuilder/UpdateManager.ui.h:28
 msgid ""
 "You are connected via roaming and may be charged for the data consumed by "
 "this update."
 msgstr "您正在使用漫游连接，更新可能会耗费很多流量。"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:7
+#: ../data/gtkbuilder/UpdateManager.ui.h:8
 msgid ""
 "You may want to wait until you’re not using a mobile broadband connection."
 msgstr "您可能需要等待直到您不再使用移动宽带连接。"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:8
+#: ../data/gtkbuilder/UpdateManager.ui.h:30
 msgid "It’s safer to connect the computer to AC power before updating."
 msgstr "在更新前最好将计算机连接电源。"
 
@@ -458,131 +461,128 @@
 msgid "Show and install available updates"
 msgstr "显示并安装可用更新"
 
-#: ../update-manager:70 ../update-manager-text:55
+#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46
 msgid "Show version and exit"
 msgstr "显示版本并退出"
 
-#: ../update-manager:73
+#: ../update-manager:64
 msgid "Directory that contains the data files"
 msgstr "包含数据文件的文件夹"
 
-#: ../update-manager:76
+#: ../update-manager:67
 msgid "Check if a new Ubuntu release is available"
 msgstr "检查是否有新的 Ubuntu 发行版可用"
 
-#: ../update-manager:79
+#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182
 msgid "Check if upgrading to the latest devel release is possible"
 msgstr "验证是否能够升级到最新版本"
 
-#: ../update-manager:83
+#: ../update-manager:74
 msgid "Upgrade using the latest proposed version of the release upgrader"
 msgstr "使用最新 proposed 版本的升级器升级"
 
-#: ../update-manager:90
+#: ../update-manager:81
 msgid "Do not focus on map when starting"
 msgstr "开始时焦点不要定位在图上"
 
-#: ../update-manager:93
+#: ../update-manager:87
 msgid "Do not check for updates when starting"
 msgstr "启动时不检查更新"
 
-#: ../update-manager:97
+#: ../update-manager:91 ../do-release-upgrade:65
 msgid "Test upgrade with a sandbox aufs overlay"
 msgstr "进行带沙盒 aufs 隔离层的测试升级"
 
-#: ../update-manager-text:59
+#: ../update-manager-text:54
 msgid "Show description of the package instead of the changelog"
 msgstr "显示包的说明而不是变更日志"
 
-#: ../ubuntu-support-status:91
+#: ../ubuntu-support-status:79
 msgid "Show unsupported packages on this machine"
 msgstr "显示此计算机中不受支持的包"
 
-#: ../ubuntu-support-status:94
+#: ../ubuntu-support-status:82
 msgid "Show supported packages on this machine"
 msgstr "显示此计算机中受支持的包"
 
-#: ../ubuntu-support-status:97
+#: ../ubuntu-support-status:85
 msgid "Show all packages with their status"
 msgstr "显示所有包及其状态"
 
-#: ../ubuntu-support-status:100
+#: ../ubuntu-support-status:88
 msgid "Show all packages in a list"
 msgstr "列出所有包"
 
-#: ../ubuntu-support-status:142
+#: ../ubuntu-support-status:130
 #, c-format
 msgid "Support status summary of '%s':"
 msgstr "'%s' 的支持状态摘要："
 
-#: ../ubuntu-support-status:145
+#: ../ubuntu-support-status:133
 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s"
 msgstr "有 %(num)s 个包(%(percent).1f%%)的支持截止时间是 %(time)s"
 
-#: ../ubuntu-support-status:151
+#: ../ubuntu-support-status:139
 msgid ""
 "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be "
 "downloaded"
 msgstr "有 %(num)s 个包(%(percent).1f%%) (已)不能不能下载"
 
-#: ../ubuntu-support-status:154
+#: ../ubuntu-support-status:142
 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported"
 msgstr "有 %(num)s 个包(%(percent).1f%%)不受支持"
 
-#: ../ubuntu-support-status:162
+#: ../ubuntu-support-status:150
 msgid ""
 "Run with --show-unsupported, --show-supported or --show-all to see more "
 "details"
 msgstr "通过 --show-unsupported、--show-supported 或 --show-all 运行以查看更多详细信息"
 
-#: ../ubuntu-support-status:166
+#: ../ubuntu-support-status:154
 msgid "No longer downloadable:"
 msgstr "已不能下载："
 
-#: ../ubuntu-support-status:169
+#: ../ubuntu-support-status:157
 msgid "Unsupported: "
 msgstr "不受支持： "
 
-#: ../ubuntu-support-status:174
+#: ../ubuntu-support-status:162
 #, c-format
 msgid "Supported until %s:"
 msgstr "支持截止时间 %s："
 
-#: ../ubuntu-support-status:183
+#: ../ubuntu-support-status:171
 msgid "Unsupported"
 msgstr "不受支持"
 
-#. Why do we use %s here instead of $strings or {} format placeholders?
-#. It's because we don't want to break existing translations.
-#: ../janitor/plugincore/exceptions.py:43
+#: ../Janitor/computerjanitor/exc.py:30
 #, python-format
 msgid "Unimplemented method: %s"
 msgstr "尚未实现的方法：%s"
 
-#: ../janitor/plugincore/core/file_cruft.py:41
+#: ../Janitor/computerjanitor/file_cruft.py:46
 msgid "A file on disk"
 msgstr "磁盘上的文件"
 
-#: ../janitor/plugincore/core/missing_package_cruft.py:40
+#: ../Janitor/computerjanitor/missing_package_cruft.py:33
 msgid "Install missing package."
 msgstr "安装缺失的软件包。"
 
-#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292.
-#: ../janitor/plugincore/core/missing_package_cruft.py:50
+#: ../Janitor/computerjanitor/missing_package_cruft.py:42
 #, python-format
 msgid "Package %s should be installed."
 msgstr "包 %s 应当被安装。"
 
-#: ../janitor/plugincore/core/package_cruft.py:50
+#: ../Janitor/computerjanitor/package_cruft.py:45
 msgid ".deb package"
 msgstr ".deb 软件包"
 
-#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:47
+#: ../Janitor/plugins/langpack_manual_plugin.py:34
 #, python-format
 msgid "%s needs to be marked as manually installed."
 msgstr "%s 需要标记为手动安装。"
 
-#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:50
+#: ../Janitor/plugins/kdelibs4to5_plugin.py:39
 msgid ""
 "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be "
 "installed. See bugs.launchpad.net, bug #279621 for details."
@@ -590,21 +590,22 @@
 "在升级时， 如果已经安装了 kdelibs4-dev， 那么需要安装 kdelibs5-dev。参阅 bugs.launchpad.net 上的 bug "
 "#279621 来了解详情。"
 
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:45
+#. pragma: no cover
+#: ../Janitor/plugins/dpkg_status_plugin.py:36
 #, python-format
 msgid "%i obsolete entries in the status file"
 msgstr "状态文件中包含 %i 项过期条目"
 
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:48
+#: ../Janitor/plugins/dpkg_status_plugin.py:39
 msgid "Obsolete entries in dpkg status"
 msgstr "dpkg 状态中的过期条目"
 
 #. pragma: no cover
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:51
+#: ../Janitor/plugins/dpkg_status_plugin.py:42
 msgid "Obsolete dpkg status entries"
 msgstr "过期的 dpkg 状态条目"
 
-#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:43
+#: ../Janitor/plugins/remove_lilo_plugin.py:28
 msgid ""
 "Remove lilo since grub is also installed.(See bug #314004 for details.)"
 msgstr "由于 grub 已安装，移除 lilo。(详情参见 bug #314004 。)"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/upower.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/upower.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/upower.po	2014-02-24 08:24:45.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/upower.po	2014-03-24 09:42:53.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:24+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:59+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: ../policy/org.freedesktop.upower.policy.in.h:1
 msgid "Suspend the system"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/upstart.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/upstart.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/upstart.po	2014-02-24 08:24:39.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/upstart.po	2014-03-24 09:42:46.000000000 +0000
@@ -7,43 +7,43 @@
 msgstr ""
 "Project-Id-Version: upstart\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-14 14:18+0000\n"
+"POT-Creation-Date: 2014-03-11 14:33+0000\n"
 "PO-Revision-Date: 2009-10-26 09:21+0000\n"
 "Last-Translator: Tao Wei <weitao1979@gmail.com>\n"
 "Language-Team: Chinese (China) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:35+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:57+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
-#: init/conf.c:488 init/session.c:254
+#: init/conf.c:505 init/session.c:254
 msgid "Unable to load configuration"
 msgstr "无法加载配置文件"
 
-#: init/conf.c:521
+#: init/conf.c:538
 #, c-format
 msgid "Loading configuration from %s"
 msgstr "正从 %s 加载配置"
 
-#: init/conf.c:558
+#: init/conf.c:575
 #, c-format
 msgid "Handling deletion of %s"
 msgstr "正在处理 %s 的删除"
 
-#: init/conf.c:635
+#: init/conf.c:652
 msgid "Unable to watch configuration file"
 msgstr "无法监视配置文件"
 
-#: init/conf.c:730
+#: init/conf.c:747
 msgid "Unable to watch configuration directory"
 msgstr "无法监视配置目录"
 
-#: init/conf.c:854
+#: init/conf.c:871
 msgid "Error while loading configuration file"
 msgstr "加载配置文件时出错"
 
-#: init/conf.c:968
+#: init/conf.c:985
 msgid "Configuration directory deleted"
 msgstr "配置目录已删除"
 
@@ -64,7 +64,7 @@
 msgid "You do not have permission to reload configuration"
 msgstr ""
 
-#: init/control.c:462 init/main.c:951
+#: init/control.c:462 init/main.c:972
 msgid "Reloading configuration"
 msgstr "正在重新加载配置"
 
@@ -82,7 +82,7 @@
 msgstr ""
 
 #: init/control.c:675 init/job_class.c:835 init/job_class.c:1045
-#: init/job_class.c:1185 init/job_class.c:1320
+#: init/job_class.c:1185 init/job_class.c:1321
 msgid "Env must be KEY=VALUE pairs"
 msgstr "环境变量必须是 KEY=VALUE 对"
 
@@ -130,56 +130,60 @@
 msgid "Restarting"
 msgstr ""
 
-#: init/control.c:1301 init/control.c:1406 init/control.c:1660
+#: init/control.c:1295 init/control.c:1398 init/control.c:1671
+msgid "You do not have permission to modify job environment"
+msgstr ""
+
+#: init/control.c:1307 init/control.c:1416 init/control.c:1683
 msgid "Not permissible to modify PID 1 job environment"
 msgstr ""
 
-#: init/control.c:1308 init/control.c:1394 init/control.c:1667
-msgid "You do not have permission to modify job environment"
+#: init/control.c:1313 init/control.c:1404 init/control.c:1505
+msgid "Variable may not be empty string"
 msgstr ""
 
-#: init/control.c:1315 init/control.c:1413 init/control.c:1503
-#: init/control.c:1599 init/control.c:1674
+#: init/control.c:1320 init/control.c:1423 init/control.c:1519
+#: init/control.c:1615 init/control.c:1690
 msgid "Job may not be empty string"
 msgstr ""
 
-#: init/control.c:1326
+#: init/control.c:1331
 msgid "Ignoring set env request from chroot session"
 msgstr ""
 
-#: init/control.c:1424
+#: init/control.c:1434
 msgid "Ignoring unset env request from chroot session"
 msgstr ""
 
-#: init/control.c:1450 init/control.c:1547
+#: init/control.c:1460 init/control.c:1563
 msgid "No such variable"
 msgstr ""
 
-#: init/control.c:1489 init/control.c:1585
+#: init/control.c:1499 init/control.c:1601
 msgid "You do not have permission to query job environment"
 msgstr ""
 
-#: init/control.c:1514
+#: init/control.c:1530
 msgid "Ignoring get env request from chroot session"
 msgstr ""
 
-#: init/control.c:1685
+#: init/control.c:1701
 msgid "Ignoring reset env request from chroot session"
 msgstr ""
 
-#: init/control.c:1818
+#: init/control.c:1834
 msgid "unable to create session file"
 msgstr ""
 
-#: init/control.c:1825
+#: init/control.c:1841
 msgid "unable to write session file"
 msgstr ""
 
-#: init/control.c:1874
+#: init/control.c:1890
 msgid "You do not have permission to end session"
 msgstr ""
 
-#: init/control.c:1882
+#: init/control.c:1898
 msgid "Ignoring session end request from chroot session"
 msgstr ""
 
@@ -348,7 +352,7 @@
 msgstr "结束后"
 
 #: init/job.c:1205 init/job.c:1280 init/job.c:1356 init/job.c:1425
-#: init/job_class.c:1037 init/job_class.c:1177 init/job_class.c:1312
+#: init/job_class.c:1037 init/job_class.c:1177 init/job_class.c:1313
 #, c-format
 msgid "You do not have permission to modify job: %s"
 msgstr "你无权变更此作业: %s"
@@ -358,7 +362,7 @@
 msgid "Job is already running: %s"
 msgstr "作业已运行：%s"
 
-#: init/job.c:1288 init/job.c:1364 init/job_class.c:1231 init/job_class.c:1365
+#: init/job.c:1288 init/job.c:1364 init/job_class.c:1231 init/job_class.c:1366
 #, c-format
 msgid "Job has already been stopped: %s"
 msgstr "作业已停止：%s"
@@ -368,7 +372,7 @@
 msgid "Job is not running: %s"
 msgstr ""
 
-#: init/job.c:1911 init/job_class.c:2231 init/job_class.c:2266
+#: init/job.c:1911 init/job_class.c:2232 init/job_class.c:2267
 msgid "BUG"
 msgstr ""
 
@@ -381,20 +385,20 @@
 msgstr "用法"
 
 #: init/job_class.c:883 init/job_class.c:928 init/job_class.c:1223
-#: init/job_class.c:1357
+#: init/job_class.c:1358
 #, c-format
 msgid "Unknown instance: %s"
 msgstr "未知实例： %s"
 
-#: init/job_class.c:2232
+#: init/job_class.c:2233
 msgid "'start on' parse error"
 msgstr ""
 
-#: init/job_class.c:2267
+#: init/job_class.c:2268
 msgid "'stop on' parse error"
 msgstr ""
 
-#: init/job_class.c:2602
+#: init/job_class.c:2606
 msgid "unable to clear CLOEXEC bit on log fd"
 msgstr ""
 
@@ -426,229 +430,229 @@
 msgid "Failed to open system console: %s"
 msgstr "无法打开系统控制台： %s"
 
-#: init/job_process.c:1034
+#: init/job_process.c:1040
 #, c-format
 msgid "unable to move script fd: %s"
 msgstr ""
 
-#: init/job_process.c:1039
+#: init/job_process.c:1045
 #, c-format
 msgid "unable to open console: %s"
 msgstr "无法打开控制台：%s"
 
-#: init/job_process.c:1094
+#: init/job_process.c:1100
 #, c-format
 msgid "unable to set \"%s\" resource limit: %s"
 msgstr "无法设置 “%s” 资源限制：%s"
 
-#: init/job_process.c:1099
+#: init/job_process.c:1105
 #, c-format
 msgid "unable to set priority: %s"
 msgstr "无法设置优先级：%s"
 
-#: init/job_process.c:1104
+#: init/job_process.c:1110
 #, c-format
 msgid "unable to set oom adjustment: %s"
 msgstr "无法设置 oom 调整：%s"
 
-#: init/job_process.c:1109
+#: init/job_process.c:1115
 #, c-format
 msgid "unable to change root directory: %s"
 msgstr "无法更改根目录：%s"
 
-#: init/job_process.c:1114
+#: init/job_process.c:1120
 #, c-format
 msgid "unable to change working directory: %s"
 msgstr "无法更改工作目录：%s"
 
-#: init/job_process.c:1119
+#: init/job_process.c:1125
 #, c-format
 msgid "unable to set trace: %s"
 msgstr "无法设置路径：%s"
 
-#: init/job_process.c:1124
+#: init/job_process.c:1130
 #, c-format
 msgid "unable to execute: %s"
 msgstr "无法执行：%s"
 
-#: init/job_process.c:1129
+#: init/job_process.c:1135
 #, c-format
 msgid "unable to getpwnam: %s"
 msgstr ""
 
-#: init/job_process.c:1134
+#: init/job_process.c:1140
 #, c-format
 msgid "unable to getgrnam: %s"
 msgstr ""
 
-#: init/job_process.c:1139
+#: init/job_process.c:1145
 #, c-format
 msgid "unable to getpwuid: %s"
 msgstr ""
 
-#: init/job_process.c:1144
+#: init/job_process.c:1150
 #, c-format
 msgid "unable to getgrgid: %s"
 msgstr ""
 
-#: init/job_process.c:1149
+#: init/job_process.c:1155
 msgid "unable to find setuid user"
 msgstr ""
 
-#: init/job_process.c:1153
+#: init/job_process.c:1159
 msgid "unable to find setgid group"
 msgstr ""
 
-#: init/job_process.c:1157
+#: init/job_process.c:1163
 #, c-format
 msgid "unable to setuid: %s"
 msgstr ""
 
-#: init/job_process.c:1162
+#: init/job_process.c:1168
 #, c-format
 msgid "unable to setgid: %s"
 msgstr ""
 
-#: init/job_process.c:1167
+#: init/job_process.c:1173
 #, c-format
 msgid "unable to chown: %s"
 msgstr ""
 
-#: init/job_process.c:1172
+#: init/job_process.c:1178
 #, c-format
 msgid "unable to unlockpt: %s"
 msgstr ""
 
-#: init/job_process.c:1177
+#: init/job_process.c:1183
 #, c-format
 msgid "unable to granpt: %s"
 msgstr ""
 
-#: init/job_process.c:1182
+#: init/job_process.c:1188
 #, c-format
 msgid "unable to get ptsname: %s"
 msgstr ""
 
-#: init/job_process.c:1187
+#: init/job_process.c:1193
 #, c-format
 msgid "unable to open pty slave: %s"
 msgstr ""
 
-#: init/job_process.c:1192
+#: init/job_process.c:1198
 #, c-format
 msgid "unable to modify signal handler: %s"
 msgstr ""
 
-#: init/job_process.c:1197
+#: init/job_process.c:1203
 #, c-format
 msgid "unable to allocate memory: %s"
 msgstr ""
 
-#: init/job_process.c:1202
+#: init/job_process.c:1208
 #, c-format
 msgid "unable to initgroups: %s"
 msgstr ""
 
-#: init/job_process.c:1207
+#: init/job_process.c:1213
 #, c-format
 msgid "unable to switch security profile: %s"
 msgstr ""
 
-#: init/job_process.c:1238 init/job_process.c:1380
+#: init/job_process.c:1244 init/job_process.c:1386
 #, c-format
 msgid "Sending %s signal to %s %s process (%d)"
 msgstr ""
 
-#: init/job_process.c:1247 init/job_process.c:1389
+#: init/job_process.c:1253 init/job_process.c:1395
 #, c-format
 msgid "Failed to send %s signal to %s %s process (%d): %s"
 msgstr ""
 
-#: init/job_process.c:1450
+#: init/job_process.c:1456
 #, c-format
 msgid "%s %s process (%d) terminated with status %d"
 msgstr "%s %s 进程 (%d)以状态 %d 结束"
 
-#: init/job_process.c:1455
+#: init/job_process.c:1461
 #, c-format
 msgid "%s %s process (%d) exited normally"
 msgstr "%s %s 进程 (%d) 正常退出"
 
-#: init/job_process.c:1470
+#: init/job_process.c:1476
 #, c-format
 msgid "%s %s process (%d) killed by %s signal"
 msgstr "%s %s 进程 (%d)已经被%s 信号杀死"
 
-#: init/job_process.c:1474
+#: init/job_process.c:1480
 #, c-format
 msgid "%s %s process (%d) killed by signal %d"
 msgstr "%s %s 进程 (%d)已经被信号 %d杀死"
 
-#: init/job_process.c:1488
+#: init/job_process.c:1494
 #, c-format
 msgid "%s %s process (%d) stopped by %s signal"
 msgstr "%s %s 进程 (%d) 已通过 %s 信号暂停(stopped)"
 
-#: init/job_process.c:1492
+#: init/job_process.c:1498
 #, c-format
 msgid "%s %s process (%d) stopped by signal %d"
 msgstr "%s %s 进程 (%d) 已通过信号 %d 暂停(stopped)"
 
-#: init/job_process.c:1506
+#: init/job_process.c:1512
 #, c-format
 msgid "%s %s process (%d) continued by %s signal"
 msgstr "%s %s 进程 (%d) 已通过 %s 信号继续运行"
 
-#: init/job_process.c:1510
+#: init/job_process.c:1516
 #, c-format
 msgid "%s %s process (%d) continued by signal %d"
 msgstr "%s %s 进程 (%d) 已通过信号 %d 继续运行"
 
-#: init/job_process.c:1645
+#: init/job_process.c:1651
 #, c-format
 msgid "%s respawning too fast, stopped"
 msgstr "%s 重新建立过快，停止"
 
-#: init/job_process.c:1651
+#: init/job_process.c:1657
 #, c-format
 msgid "%s %s process ended, respawning"
 msgstr "%s %s 进程结束, 重新产生"
 
-#: init/job_process.c:1762
+#: init/job_process.c:1768
 msgid "Failed to add log to unflushed queue"
 msgstr ""
 
-#: init/job_process.c:1928
+#: init/job_process.c:1934
 #, c-format
 msgid "Failed to set ptrace options for %s %s process (%d): %s"
 msgstr "为  %s %s 进程 (%d) 设置 ptrace 选项失败：%s"
 
-#: init/job_process.c:1941 init/job_process.c:2136
+#: init/job_process.c:1947 init/job_process.c:2142
 #, c-format
 msgid "Failed to continue traced %s %s process (%d): %s"
 msgstr "继续追踪 %s %s 进程 (%d) 失败：%s"
 
-#: init/job_process.c:1981 init/job_process.c:2072 init/job_process.c:2127
+#: init/job_process.c:1987 init/job_process.c:2078 init/job_process.c:2133
 #, c-format
 msgid "Failed to detach traced %s %s process (%d): %s"
 msgstr "分离对 %s %s 进程 (%d) 的追踪失败：%s"
 
-#: init/job_process.c:2021
+#: init/job_process.c:2027
 #, c-format
 msgid "Failed to deliver signal to traced %s %s process (%d): %s"
 msgstr "传送用以追踪 %s %s 进程 (%d) 的信号失败：%s"
 
-#: init/job_process.c:2056
+#: init/job_process.c:2062
 #, c-format
 msgid "Failed to obtain child process id for %s %s process (%d): %s"
 msgstr "为 %s %s 进程 (%d) 进程获得子进程 ID 失败：%s"
 
-#: init/job_process.c:2063
+#: init/job_process.c:2069
 #, c-format
 msgid "%s %s process (%d) became new process (%d)"
 msgstr "%s %s 进程 (%d) 变为新进程 (%d)"
 
-#: init/job_process.c:2122
+#: init/job_process.c:2128
 #, c-format
 msgid "%s %s process (%d) executable changed"
 msgstr "%s %s 进程 (%d) 可执行性已设置"
@@ -657,176 +661,176 @@
 msgid "Failed to write to log file"
 msgstr ""
 
-#: init/main.c:148
+#: init/main.c:149
 msgid "specify alternative directory to load configuration files from"
 msgstr ""
 
-#: init/main.c:151
+#: init/main.c:152
 msgid "default value for console stanza"
 msgstr ""
 
-#: init/main.c:154
+#: init/main.c:155
 msgid "do not connect to a D-Bus bus"
 msgstr ""
 
-#: init/main.c:157
+#: init/main.c:158
 msgid "jobs will not inherit environment of init"
 msgstr ""
 
-#: init/main.c:160
+#: init/main.c:161
 msgid "specify alternative directory to store job output logs in"
 msgstr ""
 
-#: init/main.c:163
+#: init/main.c:164
 msgid "disable job logging"
 msgstr ""
 
-#: init/main.c:166
+#: init/main.c:167
 msgid "disable chroot sessions"
 msgstr ""
 
-#: init/main.c:169
+#: init/main.c:170
 msgid "do not emit any startup event (for testing)"
 msgstr ""
 
-#: init/main.c:173
+#: init/main.c:174
 msgid "flag a re-exec has occurred"
 msgstr ""
 
-#: init/main.c:177
+#: init/main.c:178
 msgid "specify file descriptor to read serialisation data from"
 msgstr ""
 
-#: init/main.c:180
+#: init/main.c:181
 msgid "use D-Bus session bus rather than system bus (for testing)"
 msgstr ""
 
-#: init/main.c:183
+#: init/main.c:184
 msgid "specify an alternative initial event (for testing)"
 msgstr ""
 
-#: init/main.c:186
+#: init/main.c:187
 msgid "start in user mode (as used for user sessions)"
 msgstr ""
 
-#: init/main.c:189
+#: init/main.c:190
 msgid "attempt to write state file on every re-exec"
 msgstr ""
 
-#: init/main.c:212
+#: init/main.c:213
 msgid "Process management daemon."
 msgstr "管理守护进程"
 
-#: init/main.c:214
+#: init/main.c:215
 msgid ""
 "This daemon is normally executed by the kernel and given process id 1 to "
 "denote its special status.  When executed by a user process, it will "
 "actually run /sbin/telinit."
 msgstr "本守护进程一般是由内核执行，并被赋以进程id 1 以显示其特殊性。当以用户进程执行时，将会实际运行/sbin/telinit"
 
-#: init/main.c:241 util/reboot.c:172 util/shutdown.c:373 util/telinit.c:250
+#: init/main.c:245 util/reboot.c:172 util/shutdown.c:373 util/telinit.c:251
 msgid "Need to be root"
 msgstr "只有 root 能够执行"
 
-#: init/main.c:250
+#: init/main.c:254
 msgid "Not being executed as init"
 msgstr "未以init执行"
 
-#: init/main.c:301
+#: init/main.c:305
 msgid "Unable to mount /dev filesystem"
 msgstr ""
 
-#: init/main.c:310
+#: init/main.c:314
 msgid "Cannot create directory"
 msgstr ""
 
-#: init/main.c:318
+#: init/main.c:322
 msgid "Unable to mount /dev/pts filesystem"
 msgstr ""
 
-#: init/main.c:344
+#: init/main.c:348
 msgid "Unable to initialize console, will try /dev/null"
 msgstr ""
 
-#: init/main.c:350
+#: init/main.c:354
 msgid "Unable to initialize console as /dev/null"
 msgstr ""
 
-#: init/main.c:366 init/main.c:833
+#: init/main.c:370 init/main.c:854
 msgid "Unable to set root directory"
 msgstr "不能设置根目录"
 
-#: init/main.c:379
+#: init/main.c:383
 msgid "Unable to mount /proc filesystem"
 msgstr "无法挂载 /proc 文件系统"
 
-#: init/main.c:389
+#: init/main.c:393
 msgid "Unable to mount /sys filesystem"
 msgstr "无法挂载 /sys 文件系统"
 
-#: init/main.c:512 init/main.c:518
+#: init/main.c:516 init/main.c:522
 msgid "Unable to set default oom score"
 msgstr ""
 
-#: init/main.c:527
+#: init/main.c:531
 msgid "Stateful re-exec supported but stateless re-exec requested"
 msgstr ""
 
-#: init/main.c:541
+#: init/main.c:545
 msgid "Failed to read serialisation data"
 msgstr ""
 
-#: init/main.c:542 init/state.c:1989
+#: init/main.c:546 init/state.c:2020
 msgid "reverting to stateless re-exec"
 msgstr ""
 
-#: init/main.c:554
+#: init/main.c:558
 msgid "Both stateful and stateless re-execs failed"
 msgstr ""
 
-#: init/main.c:609
+#: init/main.c:613
 msgid "Unable to listen for private connections"
 msgstr "不能监听私有连接"
 
-#: init/main.c:623
+#: init/main.c:627
 #, c-format
 msgid "Not connecting to %s bus"
 msgstr ""
 
-#: init/main.c:648
+#: init/main.c:652
 msgid "Unable to setup standard file descriptors"
 msgstr ""
 
-#: init/main.c:704
+#: init/main.c:708
 msgid "Unable to register as subreaper"
 msgstr ""
 
-#: init/main.c:850
+#: init/main.c:871
 #, c-format
 msgid "Caught %s, core dumped"
 msgstr "捕获 %s ，core dumped"
 
-#: init/main.c:854
+#: init/main.c:875
 #, c-format
 msgid "Caught %s, unable to dump core"
 msgstr "捕获 %s ，无法dump core"
 
-#: init/main.c:885
+#: init/main.c:906
 #, c-format
 msgid "Re-executing %s"
 msgstr "重新执行%s"
 
-#: init/main.c:978
+#: init/main.c:999
 #, c-format
 msgid "Reconnecting to D-Bus %s bus"
 msgstr ""
 
-#: init/main.c:985
+#: init/main.c:1006
 #, c-format
 msgid "Unable to connect to the D-Bus %s bus: %s"
 msgstr ""
 
-#: init/main.c:1064
+#: init/main.c:1085
 msgid "invalid console type specified"
 msgstr ""
 
@@ -852,60 +856,68 @@
 msgid "Quiesce %s sequence took %s%d second%s"
 msgstr ""
 
-#: init/state.c:355 init/state.c:363 init/state.c:373 init/state.c:382
-#: init/state.c:391
+#: init/state.c:357 init/state.c:365 init/state.c:378 init/state.c:389
+#: init/state.c:398 init/state.c:407
 msgid "Failed to serialise"
 msgstr ""
 
-#: init/state.c:443
+#: init/state.c:379
+msgid "control bus address"
+msgstr ""
+
+#: init/state.c:460
 msgid "Detected invalid serialisation data"
 msgstr ""
 
-#: init/state.c:452 init/state.c:457 init/state.c:466 init/state.c:478
-#: init/state.c:486
+#: init/state.c:469 init/state.c:474 init/state.c:482 init/state.c:497
+#: init/state.c:509 init/state.c:517
 msgid "Failed to deserialise"
 msgstr ""
 
-#: init/state.c:470
+#: init/state.c:489
+msgid "No control details present in state data"
+msgstr ""
+
+#: init/state.c:501
 msgid "No ConfSources present in state data"
 msgstr ""
 
-#: init/state.c:482
+#: init/state.c:513
 msgid "No global job environment data present in state data"
 msgstr ""
 
-#: init/state.c:491
+#: init/state.c:522
 msgid "Failed to resolve deserialisation dependencies"
 msgstr ""
 
-#: init/state.c:1684
+#: init/state.c:1715
 msgid "failed to demarshal D-Bus message"
 msgstr ""
 
-#: init/state.c:1949
+#: init/state.c:1980
 #, c-format
 msgid "Failed to re-execute %s: %s"
 msgstr "重新执行 %s 失败: %s"
 
-#: init/state.c:1988
+#: init/state.c:2019
 msgid "Failed to generate serialisation data"
 msgstr ""
 
-#: init/state.c:1996
+#: init/state.c:2027
 msgid "Performing stateful re-exec"
 msgstr ""
 
-#: init/state.c:2036
+#: init/state.c:2067
 #, c-format
 msgid "Passing state from PID %d to parent"
 msgstr ""
 
-#: init/state.c:2045
+#: init/state.c:2076
 #, c-format
 msgid "Failed to release D-Bus name: %s"
 msgstr ""
 
-#: init/state.c:2054
+#: init/state.c:2085
 msgid "Failed to write serialisation data"
 msgstr ""
 
@@ -1334,7 +1346,7 @@
 msgstr ""
 "此命令将指示内核重启或关闭系统；在没有 -f 选项运行时，或当处于系统运行级别不是 0 或 6 时，其将真的执行 /sbin/shutdown。\n"
 
-#: util/reboot.c:169 util/shutdown.c:370 util/telinit.c:247
+#: util/reboot.c:169 util/shutdown.c:370 util/telinit.c:248
 msgid "Couldn't set uid."
 msgstr ""
 
@@ -1516,15 +1528,15 @@
 msgid "(%s) at %d:%02d ..."
 msgstr "(%s) 于 %d:%02d ..."
 
-#: util/telinit.c:194
+#: util/telinit.c:195
 msgid "set environment variable in the runlevel event"
 msgstr "在运行级别事件设置环境变量"
 
-#: util/telinit.c:215
+#: util/telinit.c:216
 msgid "Change runlevel."
 msgstr "更改运行级别。"
 
-#: util/telinit.c:217
+#: util/telinit.c:218
 msgid ""
 "RUNLEVEL should be one of 0123456sS, where s and S are considered "
 "identical.\n"
@@ -1543,17 +1555,17 @@
 "\n"
 "运行级别 可以是 U 或 u 以指示 init 守护进程重新执行自身，不推荐这样，以为 Upstart 现在不保存其状态。\n"
 
-#: util/telinit.c:234
+#: util/telinit.c:235
 #, c-format
 msgid "%s: missing runlevel\n"
 msgstr "%s：丢失运行级别\n"
 
-#: util/telinit.c:239
+#: util/telinit.c:240
 #, c-format
 msgid "%s: illegal runlevel: %s\n"
 msgstr "%s: 非法的运行级别: %s\n"
 
-#: extra/upstart-udev-bridge.c:85 extra/upstart-socket-bridge.c:130
+#: extra/upstart-udev-bridge.c:85 extra/upstart-socket-bridge.c:131
 msgid "Detach and run in the background"
 msgstr ""
 
@@ -1571,144 +1583,144 @@
 "in the foreground.  Use the --daemon option to have it detach."
 msgstr ""
 
-#: extra/upstart-udev-bridge.c:122 extra/upstart-socket-bridge.c:180
+#: extra/upstart-udev-bridge.c:122 extra/upstart-socket-bridge.c:181
 msgid "Could not connect to Upstart"
 msgstr ""
 
-#: extra/upstart-udev-bridge.c:136 extra/upstart-socket-bridge.c:194
+#: extra/upstart-udev-bridge.c:136 extra/upstart-socket-bridge.c:195
 msgid "Could not create Upstart proxy"
 msgstr ""
 
-#: extra/upstart-udev-bridge.c:160 extra/upstart-socket-bridge.c:250
+#: extra/upstart-udev-bridge.c:160 extra/upstart-socket-bridge.c:251
 msgid "Unable to become daemon"
 msgstr "无法成为守护进程"
 
-#: extra/upstart-udev-bridge.c:336 extra/upstart-socket-bridge.c:623
+#: extra/upstart-udev-bridge.c:336 extra/upstart-socket-bridge.c:665
 msgid "Disconnected from Upstart"
 msgstr ""
 
-#: extra/upstart-socket-bridge.c:148
+#: extra/upstart-socket-bridge.c:149
 msgid "Bridge socket events into upstart"
 msgstr ""
 
-#: extra/upstart-socket-bridge.c:150
+#: extra/upstart-socket-bridge.c:151
 msgid ""
 "By default, upstart-socket-bridge does not detach from the console and "
 "remains in the foreground.  Use the --daemon option to have it detach."
 msgstr ""
 
-#: extra/upstart-socket-bridge.c:163
+#: extra/upstart-socket-bridge.c:164
 msgid "Could not create epoll descriptor"
 msgstr ""
 
-#: extra/upstart-socket-bridge.c:207
+#: extra/upstart-socket-bridge.c:208
 msgid "Could not create JobAdded signal connection"
 msgstr ""
 
-#: extra/upstart-socket-bridge.c:219
+#: extra/upstart-socket-bridge.c:220
 msgid "Could not create JobRemoved signal connection"
 msgstr ""
 
-#: extra/upstart-socket-bridge.c:231
+#: extra/upstart-socket-bridge.c:232
 msgid "Could not obtain job list"
 msgstr ""
 
-#: extra/upstart-socket-bridge.c:287
+#: extra/upstart-socket-bridge.c:288
 msgid "Error from epoll"
 msgstr ""
 
-#: extra/upstart-socket-bridge.c:350
+#: extra/upstart-socket-bridge.c:369
 msgid "Could not send socket event"
 msgstr ""
 
-#: extra/upstart-socket-bridge.c:642
+#: extra/upstart-socket-bridge.c:684
 msgid "Error emitting socket event"
 msgstr ""
 
-#: scripts/upstart-monitor.py:64
+#: scripts/upstart-monitor.py:65
 msgid "WARNING"
 msgstr ""
 
-#: scripts/upstart-monitor.py:64
+#: scripts/upstart-monitor.py:65
 msgid "GUI modules not available - falling back to CLI"
 msgstr ""
 
-#: scripts/upstart-monitor.py:286
+#: scripts/upstart-monitor.py:287
 msgid "Version"
 msgstr ""
 
-#: scripts/upstart-monitor.py:333
+#: scripts/upstart-monitor.py:334
 msgid "Error saving file"
 msgstr ""
 
-#: scripts/upstart-monitor.py:350
+#: scripts/upstart-monitor.py:351
 msgid "No events to save"
 msgstr ""
 
-#: scripts/upstart-monitor.py:358
+#: scripts/upstart-monitor.py:359
 msgid "Save File"
 msgstr ""
 
-#: scripts/upstart-monitor.py:486
+#: scripts/upstart-monitor.py:487
 msgid "Clear events"
 msgstr ""
 
-#: scripts/upstart-monitor.py:488
+#: scripts/upstart-monitor.py:489
 msgid "Save events to default file"
 msgstr ""
 
-#: scripts/upstart-monitor.py:490
+#: scripts/upstart-monitor.py:491
 msgid "Save events to specified file"
 msgstr ""
 
-#: scripts/upstart-monitor.py:492
+#: scripts/upstart-monitor.py:493
 msgid "Exit application"
 msgstr ""
 
-#: scripts/upstart-monitor.py:496
+#: scripts/upstart-monitor.py:497
 msgid "Application details"
 msgstr ""
 
-#: scripts/upstart-monitor.py:501
+#: scripts/upstart-monitor.py:502
 msgid "Copy"
 msgstr ""
 
-#: scripts/upstart-monitor.py:558
+#: scripts/upstart-monitor.py:559
 msgid "Index"
 msgstr ""
 
-#: scripts/upstart-monitor.py:562
+#: scripts/upstart-monitor.py:563
 msgid "Time"
 msgstr ""
 
-#: scripts/upstart-monitor.py:566
+#: scripts/upstart-monitor.py:567
 msgid "Event and environment"
 msgstr ""
 
-#: scripts/upstart-monitor.py:591 scripts/upstart-monitor.py:673
+#: scripts/upstart-monitor.py:592 scripts/upstart-monitor.py:674
 msgid "Connected to"
 msgstr ""
 
-#: scripts/upstart-monitor.py:622
+#: scripts/upstart-monitor.py:623
 msgid "Upstart Event Monitor"
 msgstr ""
 
-#: scripts/upstart-monitor.py:626
+#: scripts/upstart-monitor.py:627
 msgid "run in command-line mode"
 msgstr ""
 
-#: scripts/upstart-monitor.py:629
+#: scripts/upstart-monitor.py:630
 msgid "field separator to use for command-line output"
 msgstr ""
 
-#: scripts/upstart-monitor.py:633
+#: scripts/upstart-monitor.py:634
 msgid "connect to Upstart via specified D-Bus route"
 msgstr ""
 
-#: scripts/upstart-monitor.py:671
+#: scripts/upstart-monitor.py:672
 msgid "console mode"
 msgstr ""
 
-#: scripts/upstart-monitor.py:675
+#: scripts/upstart-monitor.py:676
 msgid "Columns: time, event and environment"
 msgstr ""
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/ureadahead.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/ureadahead.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/ureadahead.po	2014-02-24 08:24:45.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/ureadahead.po	2014-03-24 09:42:52.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:22+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:57+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: src/ureadahead.c:111
 #, c-format
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/usbcreator.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/usbcreator.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/usbcreator.po	2014-02-24 08:24:44.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/usbcreator.po	2014-03-24 09:42:51.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: usb-creator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-19 18:39+0000\n"
+"POT-Creation-Date: 2014-03-13 12:00+0000\n"
 "PO-Revision-Date: 2013-07-13 15:53+0000\n"
 "Last-Translator: Aron Xu <Unknown>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:12+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:45+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: .././dbus/com.ubuntu.usbcreator.policy.in.h:1
 msgid "Install the bootloader"
@@ -61,35 +61,35 @@
 
 #. #-#-#-#-#  usbcreator.pot (PACKAGE VERSION)  #-#-#-#-#
 #. set title of progress window (same as gtk frontend)
-#: .././usbcreator/frontends/kde/frontend.py:210
+#: .././usbcreator/frontends/kde/frontend.py:209
 #: .././usbcreator/frontends/winui/install_window.py:23
-#: .././gui/usbcreator-gtk.ui.h:8 usbcreator/frontends/kde/frontend.py:210
+#: .././gui/usbcreator-gtk.ui.h:8 usbcreator/frontends/kde/frontend.py:209
 msgid "Installing"
 msgstr "正在安装"
 
 #. #-#-#-#-#  usbcreator.pot (PACKAGE VERSION)  #-#-#-#-#
 #. TODO evand 2009-07-28: Better error message.
-#: .././usbcreator/frontends/kde/frontend.py:238
+#: .././usbcreator/frontends/kde/frontend.py:237
 #: .././usbcreator/frontends/gtk/frontend.py:730
 #: .././usbcreator/frontends/winui/frontend.py:87
-#: usbcreator/frontends/kde/frontend.py:238
+#: usbcreator/frontends/kde/frontend.py:237
 msgid "Installation failed."
 msgstr "安装失败。"
 
-#: .././usbcreator/frontends/kde/frontend.py:414
+#: .././usbcreator/frontends/kde/frontend.py:413
 #: .././usbcreator/frontends/gtk/frontend.py:471
-#: usbcreator/frontends/kde/frontend.py:414
+#: usbcreator/frontends/kde/frontend.py:413
 msgid "The device is not large enough to hold this image."
 msgstr "设备空间不够容纳此映像。"
 
-#: .././usbcreator/frontends/kde/frontend.py:416
+#: .././usbcreator/frontends/kde/frontend.py:415
 #: .././usbcreator/frontends/gtk/frontend.py:473
-#: usbcreator/frontends/kde/frontend.py:416
+#: usbcreator/frontends/kde/frontend.py:415
 msgid "There is not enough free space for this image."
 msgstr "没有足够的剩余空间来容纳此映像。"
 
-#: .././usbcreator/frontends/kde/frontend.py:419
-#: usbcreator/frontends/kde/frontend.py:419
+#: .././usbcreator/frontends/kde/frontend.py:418
+#: usbcreator/frontends/kde/frontend.py:418
 msgid "The device needs to be formatted for use."
 msgstr "要使用，需要格式化该设备。"
 
@@ -97,58 +97,58 @@
 #. TODO evand 2009-07-28: The list itself needs to be moved into the
 #. base frontend.
 #. To be displayed as a list of file type filters.
-#: .././usbcreator/frontends/kde/frontend.py:453
+#: .././usbcreator/frontends/kde/frontend.py:452
 #: .././usbcreator/frontends/gtk/frontend.py:623
 #: .././usbcreator/frontends/winui/frontend.py:181
-#: usbcreator/frontends/kde/frontend.py:453
+#: usbcreator/frontends/kde/frontend.py:452
 msgid "CD Images"
 msgstr "CD 映像"
 
-#: .././usbcreator/frontends/kde/frontend.py:453
+#: .././usbcreator/frontends/kde/frontend.py:452
 #: .././usbcreator/frontends/gtk/frontend.py:624
 #: .././usbcreator/frontends/winui/frontend.py:182
-#: usbcreator/frontends/kde/frontend.py:453
+#: usbcreator/frontends/kde/frontend.py:452
 msgid "Disk Images"
 msgstr "磁盘映像"
 
-#: .././usbcreator/frontends/kde/frontend.py:481
-#: usbcreator/frontends/kde/frontend.py:481
+#: .././usbcreator/frontends/kde/frontend.py:480
+#: usbcreator/frontends/kde/frontend.py:480
 msgid "Starting up"
 msgstr "正在启动"
 
-#: .././usbcreator/frontends/kde/frontend.py:490
-#: usbcreator/frontends/kde/frontend.py:490
+#: .././usbcreator/frontends/kde/frontend.py:489
+#: usbcreator/frontends/kde/frontend.py:489
 msgid "You must select both source image and target device first."
 msgstr "您必须首先选择源镜像和目标设备。"
 
-#: .././usbcreator/frontends/kde/frontend.py:517
+#: .././usbcreator/frontends/kde/frontend.py:516
 #: .././usbcreator/frontends/winui/frontend.py:73
-#: usbcreator/frontends/kde/frontend.py:517
+#: usbcreator/frontends/kde/frontend.py:516
 msgid ""
 "The installation is complete.  You may now reboot your computer with this "
 "device inserted to try or install Ubuntu."
 msgstr "安装完成。现在您可以重新启动计算机并插入此设备试用或安装 Ubuntu。"
 
-#: .././usbcreator/frontends/kde/frontend.py:528
-#: usbcreator/frontends/kde/frontend.py:528
+#: .././usbcreator/frontends/kde/frontend.py:527
+#: usbcreator/frontends/kde/frontend.py:527
 msgid "Retry?"
 msgstr "重试？"
 
-#: .././usbcreator/frontends/kde/frontend.py:540
-#: .././gui/usbcreator-gtk.ui.h:9 usbcreator/frontends/kde/frontend.py:540
+#: .././usbcreator/frontends/kde/frontend.py:539
+#: .././gui/usbcreator-gtk.ui.h:9 usbcreator/frontends/kde/frontend.py:539
 msgid "Quit the installation?"
 msgstr "退出安装？"
 
-#: .././usbcreator/frontends/kde/frontend.py:541
-#: .././gui/usbcreator-gtk.ui.h:10 usbcreator/frontends/kde/frontend.py:541
+#: .././usbcreator/frontends/kde/frontend.py:540
+#: .././gui/usbcreator-gtk.ui.h:10 usbcreator/frontends/kde/frontend.py:540
 msgid "Do you really want to quit the installation now?"
 msgstr "您确定现在要退出安装吗？"
 
 #. #-#-#-#-#  usbcreator.pot (PACKAGE VERSION)  #-#-#-#-#
 #. TODO information about the device we're about to format.
-#: .././usbcreator/frontends/kde/frontend.py:572
+#: .././usbcreator/frontends/kde/frontend.py:571
 #: .././usbcreator/frontends/gtk/frontend.py:791
-#: usbcreator/frontends/kde/frontend.py:572
+#: usbcreator/frontends/kde/frontend.py:571
 msgid "Are you sure you want to erase the entire disk?"
 msgstr "您确定要格式化整个磁盘吗？"
 
@@ -513,6 +513,6 @@
 msgid "Error"
 msgstr "错误"
 
-#: usbcreator/frontends/kde/frontend.py:208
+#: usbcreator/frontends/kde/frontend.py:207
 msgid "Cancel"
 msgstr "取消"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/util-linux.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/util-linux.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/util-linux.po	2014-02-24 08:24:24.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/util-linux.po	2014-03-24 09:42:32.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-02-20 10:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 10:43+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: disk-utils/blockdev.c:61
 msgid "set read-only"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/virtinst.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/virtinst.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/virtinst.po	2014-02-24 08:24:43.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/virtinst.po	2014-03-24 09:42:49.000000000 +0000
@@ -16,8 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:00+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:31+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: virtinst/CapabilitiesParser.py:104
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/virt-manager.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/virt-manager.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/virt-manager.po	2014-02-24 08:24:43.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/virt-manager.po	2014-03-24 09:42:49.000000000 +0000
@@ -12,15 +12,15 @@
 msgstr ""
 "Project-Id-Version: virt-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-13 19:47+0000\n"
-"PO-Revision-Date: 2013-12-14 16:49+0000\n"
+"POT-Creation-Date: 2014-03-16 22:03+0000\n"
+"PO-Revision-Date: 2014-03-17 19:08+0000\n"
 "Last-Translator: Leah Liu <Unknown>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:01+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:32+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: ../src/virt-manager.desktop.in.in.h:1 ../src/virtManager/systray.py:133
@@ -859,82 +859,82 @@
 "\n"
 "恢复错误：%s"
 
-#: ../src/virtManager/console.py:363
+#: ../src/virtManager/console.py:366
 msgid "Unable to provide requested credentials to the VNC server"
 msgstr "无法为 VNC 服务器提供需要的证书"
 
-#: ../src/virtManager/console.py:365
+#: ../src/virtManager/console.py:368
 #, python-format
 msgid "The credential type %s is not supported"
 msgstr "不支持证书类型 %s"
 
-#: ../src/virtManager/console.py:367
+#: ../src/virtManager/console.py:370
 msgid "Unable to authenticate"
 msgstr "无法验证"
 
-#: ../src/virtManager/console.py:374
+#: ../src/virtManager/console.py:377
 msgid "Unsupported console authentication type"
 msgstr "不支持的控制台验证类型"
 
-#: ../src/virtManager/console.py:422
+#: ../src/virtManager/console.py:425
 #, python-format
 msgid "Error opening socket path '%s': %s"
 msgstr "打开插槽路径 '%s' 出错：%s"
 
-#: ../src/virtManager/console.py:427
+#: ../src/virtManager/console.py:430
 #, python-format
 msgid "Error opening socket path '%s'"
 msgstr "打开插槽路径 '%s' 出错"
 
-#: ../src/virtManager/console.py:665
+#: ../src/virtManager/console.py:671
 msgid "Leave fullscreen"
 msgstr "离开全屏"
 
-#: ../src/virtManager/console.py:686
+#: ../src/virtManager/console.py:692
 msgid "Send key combination"
 msgstr "发送键组合"
 
-#: ../src/virtManager/console.py:704 ../src/vmm-details.ui.h:1
+#: ../src/virtManager/console.py:710 ../src/vmm-details.ui.h:1
 msgid "Virtual Machine"
 msgstr "虚拟机"
 
-#: ../src/virtManager/console.py:708
+#: ../src/virtManager/console.py:714
 #, python-format
 msgid "Press %s to release pointer."
 msgstr "按 %s 释放光标。"
 
 #. Guest isn't running, schedule another try
-#: ../src/virtManager/console.py:880 ../src/virtManager/console.py:1073
+#: ../src/virtManager/console.py:886 ../src/virtManager/console.py:1092
 msgid "Guest not running"
 msgstr "虚拟机系统没有运行"
 
-#: ../src/virtManager/console.py:883
+#: ../src/virtManager/console.py:889
 msgid "Guest has crashed"
 msgstr "虚拟机系统崩溃"
 
-#: ../src/virtManager/console.py:1012
+#: ../src/virtManager/console.py:1018
 msgid ""
 "Error: viewer connection to hypervisor host got refused or disconnected!"
 msgstr "错误：连接到 hypervisor 主机的 viewer 连接遭到拒绝或断开连接！"
 
-#: ../src/virtManager/console.py:1092
+#: ../src/virtManager/console.py:1111
 msgid "Graphical console not configured for guest"
 msgstr "没有为虚拟机系统配置图形控制台"
 
-#: ../src/virtManager/console.py:1099
+#: ../src/virtManager/console.py:1118
 #, python-format
 msgid "Cannot display graphical console type '%s'"
 msgstr "无法显示图形控制台类型 '%s'"
 
-#: ../src/virtManager/console.py:1109
+#: ../src/virtManager/console.py:1128
 msgid "Graphical console is not yet active for guest"
 msgstr "没有为虚拟机系统激活图形控制台"
 
-#: ../src/virtManager/console.py:1114
+#: ../src/virtManager/console.py:1133
 msgid "Connecting to graphical console for guest"
 msgstr "为虚拟机系统连接到图形控制台"
 
-#: ../src/virtManager/console.py:1140
+#: ../src/virtManager/console.py:1159
 msgid "Error connecting to graphical console"
 msgstr "连接到图形控制台出错"
 
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/vorbis-tools.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/vorbis-tools.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/vorbis-tools.po	2014-02-24 08:24:34.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/vorbis-tools.po	2014-03-24 09:42:42.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:57+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:13+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: ogg123/buffer.c:117
 #, c-format
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/w3m.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/w3m.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/w3m.po	2014-02-24 08:24:34.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/w3m.po	2014-03-24 09:42:42.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:57+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:13+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "X-Poedit-Country: CHINA\n"
 "X-Poedit-Language: Chinese\n"
 
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/wdiff-gnulib.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/wdiff-gnulib.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/wdiff-gnulib.po	2014-02-24 08:24:37.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/wdiff-gnulib.po	2014-03-24 09:42:44.000000000 +0000
@@ -17,8 +17,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:15+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:33+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: lib/error.c:188
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/wdiff.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/wdiff.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/wdiff.po	2014-02-24 08:24:37.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/wdiff.po	2014-03-24 09:42:44.000000000 +0000
@@ -14,8 +14,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:15+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:33+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: src/mdiff.c:375
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/wget.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/wget.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/wget.po	2014-02-24 08:24:34.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/wget.po	2014-03-24 09:42:42.000000000 +0000
@@ -19,8 +19,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:57+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:14+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: lib/error.c:188
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/whois.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/whois.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/whois.po	2014-02-24 08:24:35.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/whois.po	2014-03-24 09:42:42.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:57+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:14+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: ../whois.c:149
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/xdiagnose.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/xdiagnose.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/xdiagnose.po	2014-02-24 08:24:46.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/xdiagnose.po	2014-03-24 09:42:53.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: xdiagnose\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-10-22 08:36+0000\n"
+"POT-Creation-Date: 2014-03-13 16:27+0000\n"
 "PO-Revision-Date: 2012-05-04 15:43+0000\n"
 "Last-Translator: Heling Yao <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:32+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 14:09+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: ../com.canonical.xdiagnose.policy.in.h:1
 msgid "Authentication is needed to diagnose graphics issues"
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/xfsprogs.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/xfsprogs.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/xfsprogs.po	2014-02-24 08:24:35.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/xfsprogs.po	2014-03-24 09:42:42.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:58+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:16+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: .././repair/dinode.c:46
 #, c-format
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/xkeyboard-config.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/xkeyboard-config.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/xkeyboard-config.po	2014-02-24 08:24:38.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/xkeyboard-config.po	2014-03-24 09:42:45.000000000 +0000
@@ -17,8 +17,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 12:23+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:42+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: zh_CN\n"
 
 #: ../rules/base.xml.in.h:1
@@ -737,61 +737,61 @@
 msgid "Sun Type 6 (Japanese layout)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:180
+#: ../rules/base.xml.in.h:172
 msgid "Targa Visionary 811"
 msgstr ""
 
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:173
 msgid "Unitek KB-1925"
 msgstr ""
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:174
 msgid "FL90"
 msgstr "FL90"
 
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:175
 msgid "Creative Desktop Wireless 7000"
 msgstr "创新台式机无限键盘 7000"
 
-#: ../rules/base.xml.in.h:184
+#: ../rules/base.xml.in.h:176
 msgid "Htc Dream phone"
 msgstr "Htc Dream 电话(Google G1)"
 
 #. Keyboard indicator for English layouts
-#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:33
+#: ../rules/base.xml.in.h:178 ../rules/base.extras.xml.in.h:29
 msgid "en"
 msgstr "en"
 
-#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:34
+#: ../rules/base.xml.in.h:179 ../rules/base.extras.xml.in.h:30
 msgid "English (US)"
 msgstr "英语(美国)"
 
 #. Keyboard indicator for Cherokee layouts
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:181
 msgid "chr"
 msgstr "chr"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:182
 msgid "Cherokee"
 msgstr ""
 
-#: ../rules/base.xml.in.h:191
+#: ../rules/base.xml.in.h:183
 msgid "English (US, with euro on 5)"
 msgstr "英语(美国，5 键上是欧元符号)"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:184
 msgid "English (US, international with dead keys)"
 msgstr "英语(美国，国际，有死键)"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:185
 msgid "English (US, alternative international)"
 msgstr "英语(美国，替代，国际)"
 
-#: ../rules/base.xml.in.h:194
+#: ../rules/base.xml.in.h:186
 msgid "English (Colemak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:195
+#: ../rules/base.xml.in.h:187
 msgid "English (Dvorak)"
 msgstr "英语(Dvorak布局)"
 
@@ -799,40 +799,40 @@
 msgid "English (Dvorak, international with dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:189
 msgid "English (Dvorak alternative international no dead keys)"
 msgstr "英语(Dvorak，替代，国际，无死键)"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:190
 msgid "English (left handed Dvorak)"
 msgstr "英语(左手 Dvorak 布局)"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:191
 msgid "English (right handed Dvorak)"
 msgstr "英语(右手 Dvorak 布局)"
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:192
 msgid "English (classic Dvorak)"
 msgstr "英语(经典Dvorak布局)"
 
-#: ../rules/base.xml.in.h:201
+#: ../rules/base.xml.in.h:193
 msgid "English (programmer Dvorak)"
 msgstr "英语(适合程序员的 Dvorak 布局)"
 
 #. Keyboard indicator for Russian layouts
-#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:54
+#: ../rules/base.xml.in.h:195 ../rules/base.extras.xml.in.h:46
 msgid "ru"
 msgstr "ru"
 
-#: ../rules/base.xml.in.h:204
+#: ../rules/base.xml.in.h:196
 msgid "Russian (US, phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:197
 msgid "English (Macintosh)"
 msgstr "英语(Macintosh)"
 
-#: ../rules/base.xml.in.h:206
+#: ../rules/base.xml.in.h:198
 msgid "English (international AltGr dead keys)"
 msgstr ""
 
@@ -840,7 +840,7 @@
 msgid "English (the divide/multiply keys toggle the layout)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:200
 msgid "Serbo-Croatian (US)"
 msgstr "塞尔维亚-克罗地亚语(美国键盘)"
 
@@ -853,176 +853,176 @@
 msgstr ""
 
 #. Keyboard indicator for Persian layouts
-#: ../rules/base.xml.in.h:212 ../rules/base.extras.xml.in.h:15
+#: ../rules/base.xml.in.h:205 ../rules/base.extras.xml.in.h:13
 msgid "fa"
 msgstr "fa"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:206
 msgid "Afghani"
 msgstr "阿富汗"
 
 #. Keyboard indicator for Pashto layouts
-#: ../rules/base.xml.in.h:215
+#: ../rules/base.xml.in.h:208
 msgid "ps"
 msgstr "ps"
 
-#: ../rules/base.xml.in.h:216
+#: ../rules/base.xml.in.h:209
 msgid "Pashto"
 msgstr "普什图式"
 
 #. Keyboard indicator for Uzbek layouts
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:211
 msgid "uz"
 msgstr "uz"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:212
 msgid "Uzbek (Afghanistan)"
 msgstr "乌兹别克语(阿富汗)"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:213
 msgid "Pashto (Afghanistan, OLPC)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:214
 msgid "Persian (Afghanistan, Dari OLPC)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:215
 msgid "Uzbek (Afghanistan, OLPC)"
 msgstr "乌兹别克语(阿富汗，OLPC)"
 
 #. Keyboard indicator for Arabic layouts
-#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:64
+#: ../rules/base.xml.in.h:217
 msgid "ar"
 msgstr "ar"
 
-#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:65
+#: ../rules/base.xml.in.h:218
 msgid "Arabic"
 msgstr "阿拉伯语"
 
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:219
 msgid "Arabic (azerty)"
 msgstr "阿拉伯语(azerty)"
 
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:220
 msgid "Arabic (azerty/digits)"
 msgstr "阿拉伯语(azerty/数字)"
 
-#: ../rules/base.xml.in.h:228
+#: ../rules/base.xml.in.h:221
 msgid "Arabic (digits)"
 msgstr "阿拉伯语(数字)"
 
-#: ../rules/base.xml.in.h:229
+#: ../rules/base.xml.in.h:222
 msgid "Arabic (qwerty)"
 msgstr "阿拉伯语(qwerty)"
 
-#: ../rules/base.xml.in.h:230
+#: ../rules/base.xml.in.h:223
 msgid "Arabic (qwerty/digits)"
 msgstr "阿拉伯语(qwerty/数字)"
 
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:224
 msgid "Arabic (Buckwalter)"
 msgstr "阿拉伯语(Buckwalter)"
 
 #. Keyboard indicator for Albanian layouts
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:226
 msgid "sq"
 msgstr "sq"
 
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:227
 msgid "Albanian"
 msgstr "阿尔巴尼亚"
 
 #. Keyboard indicator for Armenian layouts
-#: ../rules/base.xml.in.h:236 ../rules/base.extras.xml.in.h:58
+#: ../rules/base.xml.in.h:229 ../rules/base.extras.xml.in.h:49
 msgid "hy"
 msgstr "hy"
 
-#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:59
+#: ../rules/base.xml.in.h:230 ../rules/base.extras.xml.in.h:50
 msgid "Armenian"
 msgstr "亚美尼亚语"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:231
 msgid "Armenian (phonetic)"
 msgstr "亚美尼亚语(音标)"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:232
 msgid "Armenian (alternative phonetic)"
 msgstr "亚美尼亚语(替代音标)"
 
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:233
 msgid "Armenian (eastern)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:234
 msgid "Armenian (western)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:242
+#: ../rules/base.xml.in.h:235
 msgid "Armenian (alternative eastern)"
 msgstr ""
 
 #. Keyboard indicator for German layouts
-#: ../rules/base.xml.in.h:244 ../rules/base.extras.xml.in.h:10
+#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:9
 msgid "de"
 msgstr "de"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:238
 msgid "German (Austria)"
 msgstr "德语(奥地利)"
 
-#: ../rules/base.xml.in.h:246
+#: ../rules/base.xml.in.h:239
 msgid "German (Austria, eliminate dead keys)"
 msgstr "德语(奥地利，除去死键)"
 
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:240
 msgid "German (Austria, Sun dead keys)"
 msgstr "德语(奥地利，Sun 死键)"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:241
 msgid "German (Austria, Macintosh)"
 msgstr ""
 
 #. Keyboard indicator for Azerbaijani layouts
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:243
 msgid "az"
 msgstr "az"
 
-#: ../rules/base.xml.in.h:251
+#: ../rules/base.xml.in.h:244
 msgid "Azerbaijani"
 msgstr "阿塞拜疆语"
 
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:245
 msgid "Azerbaijani (Cyrillic)"
 msgstr "阿塞拜疆语(西里尔)"
 
 #. Keyboard indicator for Belarusian layouts
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:247
 msgid "by"
 msgstr ""
 
-#: ../rules/base.xml.in.h:255
+#: ../rules/base.xml.in.h:248
 msgid "Belarusian"
 msgstr "白俄罗斯语"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:249
 msgid "Belarusian (legacy)"
 msgstr "白俄罗斯语(的)"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:250
 msgid "Belarusian (Latin)"
 msgstr "白俄罗斯语(拉丁)"
 
 #. Keyboard indicator for Belgian layouts
-#: ../rules/base.xml.in.h:259 ../rules/base.extras.xml.in.h:67
+#: ../rules/base.xml.in.h:252
 msgid "be"
 msgstr "be"
 
-#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:68
+#: ../rules/base.xml.in.h:253
 msgid "Belgian"
 msgstr "比利时语"
 
-#: ../rules/base.xml.in.h:261
+#: ../rules/base.xml.in.h:254
 msgid "Belgian (alternative)"
 msgstr "比利时语(替代)"
 
@@ -1030,28 +1030,28 @@
 msgid "Belgian (alternative, Latin-9 only)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:256
 msgid "Belgian (alternative, Sun dead keys)"
 msgstr "比利时语(替代，Sun 死键)"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:257
 msgid "Belgian (ISO alternate)"
 msgstr "比利时语(ISO 替代)"
 
-#: ../rules/base.xml.in.h:265
+#: ../rules/base.xml.in.h:258
 msgid "Belgian (eliminate dead keys)"
 msgstr "比利时语(除去死键)"
 
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:259
 msgid "Belgian (Sun dead keys)"
 msgstr "比利时语(Sun 死键)"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:260
 msgid "Belgian (Wang model 724 azerty)"
 msgstr "比利时语(王安 724 型 azerty)"
 
-#. Keyboard indicator for Bangla layouts
-#: ../rules/base.xml.in.h:269
+#. Keyboard indicator for Bengali layouts
+#: ../rules/base.xml.in.h:262
 msgid "bn"
 msgstr "bn"
 
@@ -1064,11 +1064,11 @@
 msgstr ""
 
 #. Keyboard indicator for Indian layouts
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:266
 msgid "in"
 msgstr "in"
 
-#: ../rules/base.xml.in.h:274
+#: ../rules/base.xml.in.h:267
 msgid "Indian"
 msgstr "印地语"
 
@@ -1097,33 +1097,33 @@
 msgstr ""
 
 #. Keyboard indicator for Gujarati layouts
-#: ../rules/base.xml.in.h:282
+#: ../rules/base.xml.in.h:275
 msgid "gu"
 msgstr "gu"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:276
 msgid "Gujarati"
 msgstr "古吉拉特"
 
 #. Keyboard indicator for Punjabi layouts
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:278
 msgid "pa"
 msgstr "pa"
 
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:279
 msgid "Punjabi (Gurmukhi)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:280
 msgid "Punjabi (Gurmukhi Jhelum)"
 msgstr ""
 
 #. Keyboard indicator for Kannada layouts
-#: ../rules/base.xml.in.h:289
+#: ../rules/base.xml.in.h:282
 msgid "kn"
 msgstr "kn"
 
-#: ../rules/base.xml.in.h:290
+#: ../rules/base.xml.in.h:283
 msgid "Kannada"
 msgstr "埃纳德"
 
@@ -1132,62 +1132,62 @@
 msgstr ""
 
 #. Keyboard indicator for Malayalam layouts
-#: ../rules/base.xml.in.h:293
+#: ../rules/base.xml.in.h:285
 msgid "ml"
 msgstr "ml"
 
-#: ../rules/base.xml.in.h:294
+#: ../rules/base.xml.in.h:286
 msgid "Malayalam"
 msgstr "马来西亚"
 
-#: ../rules/base.xml.in.h:295
+#: ../rules/base.xml.in.h:287
 msgid "Malayalam (Lalitha)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:296
+#: ../rules/base.xml.in.h:288
 msgid "Malayalam (enhanced Inscript with Rupee Sign)"
 msgstr ""
 
 #. Keyboard indicator for Oriya layouts
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:290
 msgid "or"
 msgstr "or"
 
-#: ../rules/base.xml.in.h:299
+#: ../rules/base.xml.in.h:291
 msgid "Oriya"
 msgstr "Oriya"
 
 #. Keyboard indicator for Tamil layouts
-#: ../rules/base.xml.in.h:301
+#: ../rules/base.xml.in.h:293
 msgid "ta"
 msgstr "ta"
 
-#: ../rules/base.xml.in.h:302
+#: ../rules/base.xml.in.h:294
 msgid "Tamil (Unicode)"
 msgstr "泰米尔语(Unicode)"
 
-#: ../rules/base.xml.in.h:303
+#: ../rules/base.xml.in.h:295
 msgid "Tamil (keyboard with numerals)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:304
+#: ../rules/base.xml.in.h:296
 msgid "Tamil (TAB typewriter)"
 msgstr "泰米尔语(TAB 打字机)"
 
-#: ../rules/base.xml.in.h:305
+#: ../rules/base.xml.in.h:297
 msgid "Tamil (TSCII typewriter)"
 msgstr "泰米尔语(TSCII 打字机)"
 
-#: ../rules/base.xml.in.h:306
+#: ../rules/base.xml.in.h:298
 msgid "Tamil"
 msgstr "泰米尔语"
 
 #. Keyboard indicator for Telugu layouts
-#: ../rules/base.xml.in.h:308
+#: ../rules/base.xml.in.h:300
 msgid "te"
 msgstr "te"
 
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:301
 msgid "Telugu"
 msgstr "泰卢固"
 
@@ -1196,32 +1196,32 @@
 msgstr ""
 
 #. Keyboard indicator for Urdu layouts
-#: ../rules/base.xml.in.h:312
+#: ../rules/base.xml.in.h:303
 msgid "ur"
 msgstr "ur"
 
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:304
 msgid "Urdu (phonetic)"
 msgstr "乌尔都语(音标)"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:305
 msgid "Urdu (alternative phonetic)"
 msgstr "乌尔都语(替代音标)"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:306
 msgid "Urdu (WinKeys)"
 msgstr ""
 
 #. Keyboard indicator for Hindi layouts
-#: ../rules/base.xml.in.h:317
+#: ../rules/base.xml.in.h:308
 msgid "hi"
 msgstr "hi"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:309
 msgid "Hindi (Bolnagri)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:319
+#: ../rules/base.xml.in.h:310
 msgid "Hindi (Wx)"
 msgstr ""
 
@@ -1247,53 +1247,53 @@
 msgid "Marathi (KaGaPa phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:327
+#: ../rules/base.xml.in.h:311
 msgid "English (India, with RupeeSign)"
 msgstr ""
 
 #. Keyboard indicator for Bosnian layouts
-#: ../rules/base.xml.in.h:329
+#: ../rules/base.xml.in.h:313
 msgid "bs"
 msgstr "bs"
 
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:314
 msgid "Bosnian"
 msgstr "波斯尼亚语"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:315
 msgid "Bosnian (use guillemets for quotes)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:316
 msgid "Bosnian (use Bosnian digraphs)"
 msgstr "波斯尼亚语(使用波斯尼亚二重字)"
 
-#: ../rules/base.xml.in.h:333
+#: ../rules/base.xml.in.h:317
 msgid "Bosnian (US keyboard with Bosnian digraphs)"
 msgstr "波斯尼亚语(带罗马尼亚二重字的美国键盘)"
 
-#: ../rules/base.xml.in.h:334
+#: ../rules/base.xml.in.h:318
 msgid "Bosnian (US keyboard with Bosnian letters)"
 msgstr "波斯尼亚语(带波斯尼亚字母的美国键盘)"
 
 #. Keyboard indicator for Portuguese layouts
-#: ../rules/base.xml.in.h:336 ../rules/base.extras.xml.in.h:70
+#: ../rules/base.xml.in.h:320
 msgid "pt"
 msgstr "pt"
 
-#: ../rules/base.xml.in.h:337 ../rules/base.extras.xml.in.h:71
+#: ../rules/base.xml.in.h:321
 msgid "Portuguese (Brazil)"
 msgstr "葡萄牙(巴西)"
 
-#: ../rules/base.xml.in.h:338
+#: ../rules/base.xml.in.h:322
 msgid "Portuguese (Brazil, eliminate dead keys)"
 msgstr "葡萄牙语(巴西，除去死键)"
 
-#: ../rules/base.xml.in.h:339
+#: ../rules/base.xml.in.h:323
 msgid "Portuguese (Brazil, Dvorak)"
 msgstr "葡萄牙语(巴西，Dvorak)"
 
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:324
 msgid "Portuguese (Brazil, nativo)"
 msgstr ""
 
@@ -1301,395 +1301,395 @@
 msgid "Portuguese (Brazil, nativo for US keyboards)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:326
 msgid "Portuguese (Brazil, nativo for Esperanto)"
 msgstr ""
 
 #. Keyboard indicator for Bulgarian layouts
-#: ../rules/base.xml.in.h:344
+#: ../rules/base.xml.in.h:328
 msgid "bg"
 msgstr "bg"
 
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:329
 msgid "Bulgarian"
 msgstr "保加利亚"
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:330
 msgid "Bulgarian (traditional phonetic)"
 msgstr "保加利亚(传统音标)"
 
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:331
 msgid "Bulgarian (new phonetic)"
 msgstr "保加利亚(新音标)"
 
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:332
 msgid "Arabic (Morocco)"
 msgstr "阿拉伯语(摩洛哥)"
 
 #. Keyboard indicator for French layouts
-#: ../rules/base.xml.in.h:350 ../rules/base.extras.xml.in.h:3
+#: ../rules/base.xml.in.h:334 ../rules/base.extras.xml.in.h:3
 msgid "fr"
 msgstr "fr"
 
-#: ../rules/base.xml.in.h:351
+#: ../rules/base.xml.in.h:335
 msgid "French (Morocco)"
 msgstr "法语(摩洛哥)"
 
 #. Keyboard indicator for Berber layouts
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:337
 msgid "ber"
 msgstr "ber"
 
-#: ../rules/base.xml.in.h:354
+#: ../rules/base.xml.in.h:338
 msgid "Berber (Morocco, Tifinagh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:355
+#: ../rules/base.xml.in.h:339
 msgid "Berber (Morocco, Tifinagh alternative)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:340
 msgid "Berber (Morocco, Tifinagh alternative phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:341
 msgid "Berber (Morocco, Tifinagh extended)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:342
 msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:343
 msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr ""
 
 #. Keyboard indicator for Cameroon layouts
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:345
 msgid "cm"
 msgstr ""
 
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:346
 msgid "English (Cameroon)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:347
 msgid "French (Cameroon)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:348
 msgid "Cameroon Multilingual (qwerty)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:365
+#: ../rules/base.xml.in.h:349
 msgid "Cameroon Multilingual (azerty)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:350
 msgid "Cameroon Multilingual (Dvorak)"
 msgstr ""
 
 #. Keyboard indicator for Burmese layouts
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:352
 msgid "my"
 msgstr "my"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:353
 msgid "Burmese"
 msgstr "缅甸"
 
-#: ../rules/base.xml.in.h:370 ../rules/base.extras.xml.in.h:4
+#: ../rules/base.xml.in.h:354 ../rules/base.extras.xml.in.h:4
 msgid "French (Canada)"
 msgstr "法语(加拿大)"
 
-#: ../rules/base.xml.in.h:371
+#: ../rules/base.xml.in.h:355
 msgid "French (Canada, Dvorak)"
 msgstr "法语(加拿大，Dvorak)"
 
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:356
 msgid "French (Canada, legacy)"
 msgstr "法语(加拿大，传统)"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:357
 msgid "Canadian Multilingual"
 msgstr ""
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:358
 msgid "Canadian Multilingual (first part)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:359
 msgid "Canadian Multilingual (second part)"
 msgstr ""
 
 #. Keyboard indicator for Inuktikut layouts
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:361
 msgid "ike"
 msgstr "ike"
 
-#: ../rules/base.xml.in.h:378
+#: ../rules/base.xml.in.h:362
 msgid "Inuktitut"
 msgstr "因纽特语"
 
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:363
 msgid "English (Canada)"
 msgstr "英语(加拿大)"
 
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:364
 msgid "French (Democratic Republic of the Congo)"
 msgstr "法语(刚果民主共和国，刚果(金))"
 
 #. Keyboard indicator for Taiwanese layouts
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:366
 msgid "zh"
 msgstr "zh"
 
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:367
 msgid "Chinese"
 msgstr "汉语"
 
-#: ../rules/base.xml.in.h:384
+#: ../rules/base.xml.in.h:368
 msgid "Tibetan"
 msgstr ""
 
-#: ../rules/base.xml.in.h:385
+#: ../rules/base.xml.in.h:369
 msgid "Tibetan (with ASCII numerals)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:386
+#: ../rules/base.xml.in.h:370
 msgid "Uyghur"
 msgstr ""
 
 #. Keyboard indicator for Croatian layouts
-#: ../rules/base.xml.in.h:388
+#: ../rules/base.xml.in.h:372
 msgid "hr"
 msgstr "hr"
 
-#: ../rules/base.xml.in.h:389
+#: ../rules/base.xml.in.h:373
 msgid "Croatian"
 msgstr "克罗地亚"
 
-#: ../rules/base.xml.in.h:390
+#: ../rules/base.xml.in.h:374
 msgid "Croatian (use guillemets for quotes)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:391
+#: ../rules/base.xml.in.h:375
 msgid "Croatian (use Croatian digraphs)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:392
+#: ../rules/base.xml.in.h:376
 msgid "Croatian (US keyboard with Croatian digraphs)"
 msgstr "克罗地亚(带克罗地亚语二重字的美国键盘)"
 
-#: ../rules/base.xml.in.h:393
+#: ../rules/base.xml.in.h:377
 msgid "Croatian (US keyboard with Croatian letters)"
 msgstr "克罗地亚(带罗马尼亚字母的美国键盘)"
 
 #. Keyboard indicator for Chech layouts
-#: ../rules/base.xml.in.h:395 ../rules/base.extras.xml.in.h:73
+#: ../rules/base.xml.in.h:379
 msgid "cs"
 msgstr "cs"
 
-#: ../rules/base.xml.in.h:396 ../rules/base.extras.xml.in.h:74
+#: ../rules/base.xml.in.h:380
 msgid "Czech"
 msgstr "捷克"
 
-#: ../rules/base.xml.in.h:397
+#: ../rules/base.xml.in.h:381
 msgid "Czech (with &lt;\\|&gt; key)"
 msgstr "捷克(带 &lt;\\|&gt; 键)"
 
-#: ../rules/base.xml.in.h:398
+#: ../rules/base.xml.in.h:382
 msgid "Czech (qwerty)"
 msgstr "捷克(qwerty)"
 
-#: ../rules/base.xml.in.h:399
+#: ../rules/base.xml.in.h:383
 msgid "Czech (qwerty, extended Backslash)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:400
+#: ../rules/base.xml.in.h:384
 msgid "Czech (UCW layout, accented letters only)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:401
+#: ../rules/base.xml.in.h:385
 msgid "Czech (US Dvorak with CZ UCW support)"
 msgstr "捷克(带 CZ UCW 支持的美国Dvorak布局键盘)"
 
 #. Keyboard indicator for Danish layouts
-#: ../rules/base.xml.in.h:403 ../rules/base.extras.xml.in.h:76
+#: ../rules/base.xml.in.h:387
 msgid "da"
 msgstr "da"
 
-#: ../rules/base.xml.in.h:404 ../rules/base.extras.xml.in.h:77
+#: ../rules/base.xml.in.h:388
 msgid "Danish"
 msgstr "丹麦语"
 
-#: ../rules/base.xml.in.h:405
+#: ../rules/base.xml.in.h:389
 msgid "Danish (eliminate dead keys)"
 msgstr "丹麦语(除去死键)"
 
-#: ../rules/base.xml.in.h:406
+#: ../rules/base.xml.in.h:390
 msgid "Danish (Macintosh)"
 msgstr "丹麦语(Mac)"
 
-#: ../rules/base.xml.in.h:407
+#: ../rules/base.xml.in.h:391
 msgid "Danish (Macintosh, eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:408
+#: ../rules/base.xml.in.h:392
 msgid "Danish (Dvorak)"
 msgstr "丹麦语(Dvorak)"
 
 #. Keyboard indicator for Dutch layouts
-#: ../rules/base.xml.in.h:410 ../rules/base.extras.xml.in.h:79
+#: ../rules/base.xml.in.h:394
 msgid "nl"
 msgstr "nl"
 
-#: ../rules/base.xml.in.h:411 ../rules/base.extras.xml.in.h:80
+#: ../rules/base.xml.in.h:395
 msgid "Dutch"
 msgstr "荷兰语"
 
-#: ../rules/base.xml.in.h:412
+#: ../rules/base.xml.in.h:396
 msgid "Dutch (Sun dead keys)"
 msgstr "荷兰(Sun 死键)"
 
-#: ../rules/base.xml.in.h:413
+#: ../rules/base.xml.in.h:397
 msgid "Dutch (Macintosh)"
 msgstr "荷兰语(Mac)"
 
-#: ../rules/base.xml.in.h:414
+#: ../rules/base.xml.in.h:398
 msgid "Dutch (standard)"
 msgstr "荷兰(标准)"
 
 #. Keyboard indicator for Dzongkha layouts
-#: ../rules/base.xml.in.h:416
+#: ../rules/base.xml.in.h:400
 msgid "dz"
 msgstr "dz"
 
-#: ../rules/base.xml.in.h:417
+#: ../rules/base.xml.in.h:401
 msgid "Dzongkha"
 msgstr "宗喀语"
 
 #. Keyboard indicator for Estonian layouts
-#: ../rules/base.xml.in.h:419 ../rules/base.extras.xml.in.h:82
+#: ../rules/base.xml.in.h:403
 msgid "et"
 msgstr "et"
 
-#: ../rules/base.xml.in.h:420 ../rules/base.extras.xml.in.h:83
+#: ../rules/base.xml.in.h:404
 msgid "Estonian"
 msgstr "爱沙尼亚"
 
-#: ../rules/base.xml.in.h:421
+#: ../rules/base.xml.in.h:405
 msgid "Estonian (eliminate dead keys)"
 msgstr "爱沙尼亚语(除去死键)"
 
-#: ../rules/base.xml.in.h:422
+#: ../rules/base.xml.in.h:406
 msgid "Estonian (Dvorak)"
 msgstr "爱沙尼亚(Dvorak)"
 
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:407
 msgid "Estonian (US keyboard with Estonian letters)"
 msgstr "爱沙尼亚语(带爱沙尼亚字母的美国键盘)"
 
-#: ../rules/base.xml.in.h:424 ../rules/base.extras.xml.in.h:16
+#: ../rules/base.xml.in.h:408 ../rules/base.extras.xml.in.h:14
 msgid "Persian"
 msgstr "波斯语"
 
-#: ../rules/base.xml.in.h:425
+#: ../rules/base.xml.in.h:409
 msgid "Persian (with Persian Keypad)"
 msgstr ""
 
 #. Keyboard indicator for Kurdish layouts
-#: ../rules/base.xml.in.h:427
+#: ../rules/base.xml.in.h:411
 msgid "ku"
 msgstr "ku"
 
-#: ../rules/base.xml.in.h:428
+#: ../rules/base.xml.in.h:412
 msgid "Kurdish (Iran, Latin Q)"
 msgstr "库尔德语(伊朗，拉丁 Q)"
 
-#: ../rules/base.xml.in.h:429
+#: ../rules/base.xml.in.h:413
 msgid "Kurdish (Iran, F)"
 msgstr "库尔德语(伊朗，F)"
 
-#: ../rules/base.xml.in.h:430
+#: ../rules/base.xml.in.h:414
 msgid "Kurdish (Iran, Latin Alt-Q)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:431
+#: ../rules/base.xml.in.h:415
 msgid "Kurdish (Iran, Arabic-Latin)"
 msgstr "库尔德语(伊朗，阿拉伯-拉丁)"
 
-#: ../rules/base.xml.in.h:432
+#: ../rules/base.xml.in.h:416
 msgid "Iraqi"
 msgstr "伊拉克"
 
-#: ../rules/base.xml.in.h:433
+#: ../rules/base.xml.in.h:417
 msgid "Kurdish (Iraq, Latin Q)"
 msgstr "库尔德语(伊拉克，拉丁 Q)"
 
-#: ../rules/base.xml.in.h:434
+#: ../rules/base.xml.in.h:418
 msgid "Kurdish (Iraq, F)"
 msgstr "库尔德语(伊拉克，F)"
 
-#: ../rules/base.xml.in.h:435
+#: ../rules/base.xml.in.h:419
 msgid "Kurdish (Iraq, Latin Alt-Q)"
 msgstr "库尔德语(伊拉克，拉丁 Alt-Q)"
 
-#: ../rules/base.xml.in.h:436
+#: ../rules/base.xml.in.h:420
 msgid "Kurdish (Iraq, Arabic-Latin)"
 msgstr "库尔德语(伊拉克，阿拉伯-拉丁)"
 
 #. Keyboard indicator for Faroese layouts
-#: ../rules/base.xml.in.h:438
+#: ../rules/base.xml.in.h:422
 msgid "fo"
 msgstr "fo"
 
-#: ../rules/base.xml.in.h:439
+#: ../rules/base.xml.in.h:423
 msgid "Faroese"
 msgstr "法罗"
 
-#: ../rules/base.xml.in.h:440
+#: ../rules/base.xml.in.h:424
 msgid "Faroese (eliminate dead keys)"
 msgstr "法罗(除去死键)"
 
 #. Keyboard indicator for Finnish layouts
-#: ../rules/base.xml.in.h:442 ../rules/base.extras.xml.in.h:85
+#: ../rules/base.xml.in.h:426
 msgid "fi"
 msgstr "fi"
 
-#: ../rules/base.xml.in.h:443 ../rules/base.extras.xml.in.h:86
+#: ../rules/base.xml.in.h:427
 msgid "Finnish"
 msgstr "芬兰语"
 
-#: ../rules/base.xml.in.h:444
+#: ../rules/base.xml.in.h:428
 msgid "Finnish (classic)"
 msgstr "芬兰语(经典)"
 
-#: ../rules/base.xml.in.h:445
+#: ../rules/base.xml.in.h:429
 msgid "Finnish (classic, eliminate dead keys)"
 msgstr "芬兰语(经典，除去死键)"
 
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:430
 msgid "Northern Saami (Finland)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:447
+#: ../rules/base.xml.in.h:431
 msgid "Finnish (Macintosh)"
 msgstr "芬兰语(Mac)"
 
-#: ../rules/base.xml.in.h:448 ../rules/base.extras.xml.in.h:88
+#: ../rules/base.xml.in.h:432
 msgid "French"
 msgstr "法语"
 
-#: ../rules/base.xml.in.h:449
+#: ../rules/base.xml.in.h:433
 msgid "French (eliminate dead keys)"
 msgstr "法语(除去死键)"
 
-#: ../rules/base.xml.in.h:450
+#: ../rules/base.xml.in.h:434
 msgid "French (Sun dead keys)"
 msgstr "法语(Sun 死键)"
 
-#: ../rules/base.xml.in.h:451
+#: ../rules/base.xml.in.h:435
 msgid "French (alternative)"
 msgstr "法语(替代)"
 
@@ -1697,27 +1697,27 @@
 msgid "French (alternative, Latin-9 only)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:453
+#: ../rules/base.xml.in.h:437
 msgid "French (alternative, eliminate dead keys)"
 msgstr "法语(替代，除去死键)"
 
-#: ../rules/base.xml.in.h:454
+#: ../rules/base.xml.in.h:438
 msgid "French (alternative, Sun dead keys)"
 msgstr "法语(替代，Sun 死键)"
 
-#: ../rules/base.xml.in.h:455
+#: ../rules/base.xml.in.h:439
 msgid "French (legacy, alternative)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:456
+#: ../rules/base.xml.in.h:440
 msgid "French (legacy, alternative, eliminate dead keys)"
 msgstr "法语(传统，替代，除去死键)"
 
-#: ../rules/base.xml.in.h:457
+#: ../rules/base.xml.in.h:441
 msgid "French (legacy, alternative, Sun dead keys)"
 msgstr "法语(传统，替代，Sun 死键)"
 
-#: ../rules/base.xml.in.h:458
+#: ../rules/base.xml.in.h:442
 msgid "French (Bepo, ergonomic, Dvorak way)"
 msgstr ""
 
@@ -1725,134 +1725,134 @@
 msgid "French (Bepo, ergonomic, Dvorak way, Latin-9 only)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:460
+#: ../rules/base.xml.in.h:444
 msgid "French (Dvorak)"
 msgstr "法语(Dvorak)"
 
-#: ../rules/base.xml.in.h:461
+#: ../rules/base.xml.in.h:445
 msgid "French (Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:462
+#: ../rules/base.xml.in.h:446
 msgid "French (Breton)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:463
+#: ../rules/base.xml.in.h:447
 msgid "Occitan"
 msgstr ""
 
-#: ../rules/base.xml.in.h:464
+#: ../rules/base.xml.in.h:448
 msgid "Georgian (France, AZERTY Tskapo)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:449
 msgid "English (Ghana)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:466
+#: ../rules/base.xml.in.h:450
 msgid "English (Ghana, multilingual)"
 msgstr ""
 
 #. Keyboard indicator for Akan layouts
-#: ../rules/base.xml.in.h:468
+#: ../rules/base.xml.in.h:452
 msgid "ak"
 msgstr "ak"
 
-#: ../rules/base.xml.in.h:469
+#: ../rules/base.xml.in.h:453
 msgid "Akan"
 msgstr "阿肯"
 
 #. Keyboard indicator for Ewe layouts
-#: ../rules/base.xml.in.h:471
+#: ../rules/base.xml.in.h:455
 msgid "ee"
 msgstr "ee"
 
-#: ../rules/base.xml.in.h:472
+#: ../rules/base.xml.in.h:456
 msgid "Ewe"
 msgstr "Ewe"
 
 #. Keyboard indicator for Fula layouts
-#: ../rules/base.xml.in.h:474
+#: ../rules/base.xml.in.h:458
 msgid "ff"
 msgstr "ff"
 
-#: ../rules/base.xml.in.h:475
+#: ../rules/base.xml.in.h:459
 msgid "Fula"
 msgstr "富拉尼语式"
 
 #. Keyboard indicator for Ga layouts
-#: ../rules/base.xml.in.h:477
+#: ../rules/base.xml.in.h:461
 msgid "gaa"
 msgstr "gaa"
 
-#: ../rules/base.xml.in.h:478
+#: ../rules/base.xml.in.h:462
 msgid "Ga"
 msgstr "加纳式"
 
 #. Keyboard indicator for Hausa layouts
-#: ../rules/base.xml.in.h:480
+#: ../rules/base.xml.in.h:464
 msgid "ha"
 msgstr "ha"
 
-#: ../rules/base.xml.in.h:481
+#: ../rules/base.xml.in.h:465
 msgid "Hausa"
 msgstr "豪萨语"
 
 #. Keyboard indicator for Avatime layouts
-#: ../rules/base.xml.in.h:483
+#: ../rules/base.xml.in.h:467
 msgid "avn"
 msgstr "avn"
 
-#: ../rules/base.xml.in.h:484
+#: ../rules/base.xml.in.h:468
 msgid "Avatime"
 msgstr ""
 
-#: ../rules/base.xml.in.h:485
+#: ../rules/base.xml.in.h:469
 msgid "English (Ghana, GILLBT)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:486
+#: ../rules/base.xml.in.h:470
 msgid "French (Guinea)"
 msgstr ""
 
 #. Keyboard indicator for Georgian layouts
-#: ../rules/base.xml.in.h:488
+#: ../rules/base.xml.in.h:472
 msgid "ka"
 msgstr "ka"
 
-#: ../rules/base.xml.in.h:489
+#: ../rules/base.xml.in.h:473
 msgid "Georgian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:490
+#: ../rules/base.xml.in.h:474
 msgid "Georgian (ergonomic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:475
 msgid "Georgian (MESS)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:492
+#: ../rules/base.xml.in.h:476
 msgid "Russian (Georgia)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:493
+#: ../rules/base.xml.in.h:477
 msgid "Ossetian (Georgia)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:494 ../rules/base.extras.xml.in.h:11
+#: ../rules/base.xml.in.h:478 ../rules/base.extras.xml.in.h:10
 msgid "German"
 msgstr "德语"
 
-#: ../rules/base.xml.in.h:495
+#: ../rules/base.xml.in.h:479
 msgid "German (dead acute)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:496
+#: ../rules/base.xml.in.h:480
 msgid "German (dead grave acute)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:497
+#: ../rules/base.xml.in.h:481
 msgid "German (eliminate dead keys)"
 msgstr ""
 
@@ -1860,39 +1860,39 @@
 msgid "German (T3)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:499
+#: ../rules/base.xml.in.h:482
 msgid "Romanian (Germany)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:500
+#: ../rules/base.xml.in.h:483
 msgid "Romanian (Germany, eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:501
+#: ../rules/base.xml.in.h:484
 msgid "German (Dvorak)"
 msgstr "德语(Dvorak)"
 
-#: ../rules/base.xml.in.h:502
+#: ../rules/base.xml.in.h:485
 msgid "German (Sun dead keys)"
 msgstr "德语(Sun 死键)"
 
-#: ../rules/base.xml.in.h:503
+#: ../rules/base.xml.in.h:486
 msgid "German (Neo 2)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:504
+#: ../rules/base.xml.in.h:487
 msgid "German (Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:505
+#: ../rules/base.xml.in.h:488
 msgid "German (Macintosh, eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:506
+#: ../rules/base.xml.in.h:489
 msgid "Lower Sorbian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:507
+#: ../rules/base.xml.in.h:490
 msgid "Lower Sorbian (qwertz)"
 msgstr ""
 
@@ -1900,7 +1900,7 @@
 msgid "German (qwerty)"
 msgstr "德语(qwerty)"
 
-#: ../rules/base.xml.in.h:509
+#: ../rules/base.xml.in.h:491
 msgid "Russian (Germany, phonetic)"
 msgstr ""
 
@@ -1909,183 +1909,183 @@
 msgstr ""
 
 #. Keyboard indicator for Greek layouts
-#: ../rules/base.xml.in.h:512 ../rules/base.extras.xml.in.h:90
+#: ../rules/base.xml.in.h:493
 msgid "gr"
 msgstr "gr"
 
-#: ../rules/base.xml.in.h:513 ../rules/base.extras.xml.in.h:91
+#: ../rules/base.xml.in.h:494
 msgid "Greek"
 msgstr "希腊语"
 
-#: ../rules/base.xml.in.h:514
+#: ../rules/base.xml.in.h:495
 msgid "Greek (simple)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:515
+#: ../rules/base.xml.in.h:496
 msgid "Greek (extended)"
 msgstr "希腊语(扩展)"
 
-#: ../rules/base.xml.in.h:516
+#: ../rules/base.xml.in.h:497
 msgid "Greek (eliminate dead keys)"
 msgstr "希腊语(除去死键)"
 
-#: ../rules/base.xml.in.h:517
+#: ../rules/base.xml.in.h:498
 msgid "Greek (polytonic)"
 msgstr ""
 
 #. Keyboard indicator for Hungarian layouts
-#: ../rules/base.xml.in.h:519
+#: ../rules/base.xml.in.h:500
 msgid "hu"
 msgstr "hu"
 
-#: ../rules/base.xml.in.h:520
+#: ../rules/base.xml.in.h:501
 msgid "Hungarian"
 msgstr "匈牙利"
 
-#: ../rules/base.xml.in.h:521
+#: ../rules/base.xml.in.h:502
 msgid "Hungarian (standard)"
 msgstr "匈牙利(标准)"
 
-#: ../rules/base.xml.in.h:522
+#: ../rules/base.xml.in.h:503
 msgid "Hungarian (eliminate dead keys)"
 msgstr "匈牙利语(除去死键)"
 
-#: ../rules/base.xml.in.h:523
+#: ../rules/base.xml.in.h:504
 msgid "Hungarian (qwerty)"
 msgstr "匈牙利(qwerty)"
 
-#: ../rules/base.xml.in.h:524
+#: ../rules/base.xml.in.h:505
 msgid "Hungarian (101/qwertz/comma/dead keys)"
 msgstr "匈牙利语(101/qwertz/逗号/死键)"
 
-#: ../rules/base.xml.in.h:525
+#: ../rules/base.xml.in.h:506
 msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
 msgstr "匈牙利语(101/qwertz/逗号/除去死键)"
 
-#: ../rules/base.xml.in.h:526
+#: ../rules/base.xml.in.h:507
 msgid "Hungarian (101/qwertz/dot/dead keys)"
 msgstr "匈牙利语(101/qwertz/点/死键)"
 
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:508
 msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
 msgstr "匈牙利语(101/qwertz/点/除去死键)"
 
-#: ../rules/base.xml.in.h:528
+#: ../rules/base.xml.in.h:509
 msgid "Hungarian (101/qwerty/comma/dead keys)"
 msgstr "匈牙利语(101/qwerty/逗号/死键)"
 
-#: ../rules/base.xml.in.h:529
+#: ../rules/base.xml.in.h:510
 msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
 msgstr "匈牙利语(101/qwerty/逗号/除去死键)"
 
-#: ../rules/base.xml.in.h:530
+#: ../rules/base.xml.in.h:511
 msgid "Hungarian (101/qwerty/dot/dead keys)"
 msgstr "匈牙利语(101/qwerty/点/死键)"
 
-#: ../rules/base.xml.in.h:531
+#: ../rules/base.xml.in.h:512
 msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
 msgstr "匈牙利语(101/qwerty/点/除去死键)"
 
-#: ../rules/base.xml.in.h:532
+#: ../rules/base.xml.in.h:513
 msgid "Hungarian (102/qwertz/comma/dead keys)"
 msgstr "匈牙利语(102/qwertz/逗号/死键)"
 
-#: ../rules/base.xml.in.h:533
+#: ../rules/base.xml.in.h:514
 msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
 msgstr "匈牙利语(102/qwertz/逗号/除去死键)"
 
-#: ../rules/base.xml.in.h:534
+#: ../rules/base.xml.in.h:515
 msgid "Hungarian (102/qwertz/dot/dead keys)"
 msgstr "匈牙利语(102/qwertz/点/死键)"
 
-#: ../rules/base.xml.in.h:535
+#: ../rules/base.xml.in.h:516
 msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
 msgstr "匈牙利语(102/qwertz/点/除去死键)"
 
-#: ../rules/base.xml.in.h:536
+#: ../rules/base.xml.in.h:517
 msgid "Hungarian (102/qwerty/comma/dead keys)"
 msgstr "匈牙利语(102/qwerty/逗号/死键)"
 
-#: ../rules/base.xml.in.h:537
+#: ../rules/base.xml.in.h:518
 msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
 msgstr "匈牙利语(102/qwerty/逗号/除去死键)"
 
-#: ../rules/base.xml.in.h:538
+#: ../rules/base.xml.in.h:519
 msgid "Hungarian (102/qwerty/dot/dead keys)"
 msgstr "匈牙利语(102/qwerty/点/死键)"
 
-#: ../rules/base.xml.in.h:539
+#: ../rules/base.xml.in.h:520
 msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
 msgstr "匈牙利语(102/qwerty/点/除去死键)"
 
 #. Keyboard indicator for Icelandic layouts
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:522
 msgid "is"
 msgstr "is"
 
-#: ../rules/base.xml.in.h:542
+#: ../rules/base.xml.in.h:523
 msgid "Icelandic"
 msgstr "冰岛"
 
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:524
 msgid "Icelandic (Sun dead keys)"
 msgstr "冰岛(Sun 死键)"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:525
 msgid "Icelandic (eliminate dead keys)"
 msgstr "冰岛(除去死键)"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:526
 msgid "Icelandic (Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:527
 msgid "Icelandic (Dvorak)"
 msgstr "冰岛(Dvorak)"
 
 #. Keyboard indicator for Hebrew layouts
-#: ../rules/base.xml.in.h:548 ../rules/base.extras.xml.in.h:61
+#: ../rules/base.xml.in.h:529
 msgid "he"
 msgstr "he"
 
-#: ../rules/base.xml.in.h:549 ../rules/base.extras.xml.in.h:62
+#: ../rules/base.xml.in.h:530
 msgid "Hebrew"
 msgstr ""
 
-#: ../rules/base.xml.in.h:550
+#: ../rules/base.xml.in.h:531
 msgid "Hebrew (lyx)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:551
+#: ../rules/base.xml.in.h:532
 msgid "Hebrew (phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:533
 msgid "Hebrew (Biblical, Tiro)"
 msgstr ""
 
 #. Keyboard indicator for Italian layouts
-#: ../rules/base.xml.in.h:554 ../rules/base.extras.xml.in.h:93
+#: ../rules/base.xml.in.h:535
 msgid "it"
 msgstr "it"
 
-#: ../rules/base.xml.in.h:555 ../rules/base.extras.xml.in.h:94
+#: ../rules/base.xml.in.h:536
 msgid "Italian"
 msgstr "意大利语"
 
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:537
 msgid "Italian (eliminate dead keys)"
 msgstr "意大利语(除去死键)"
 
-#: ../rules/base.xml.in.h:557
+#: ../rules/base.xml.in.h:538
 msgid "Italian (Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:539
 msgid "Italian (US keyboard with Italian letters)"
 msgstr "意大利语(带意大利语字母的美国键盘)"
 
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:540
 msgid "Georgian (Italy)"
 msgstr ""
 
@@ -2094,27 +2094,27 @@
 msgstr ""
 
 #. Keyboard indicator for Japanese layouts
-#: ../rules/base.xml.in.h:562 ../rules/base.extras.xml.in.h:96
+#: ../rules/base.xml.in.h:542
 msgid "ja"
 msgstr "ja"
 
-#: ../rules/base.xml.in.h:563 ../rules/base.extras.xml.in.h:97
+#: ../rules/base.xml.in.h:543
 msgid "Japanese"
 msgstr "日语"
 
-#: ../rules/base.xml.in.h:564
+#: ../rules/base.xml.in.h:544
 msgid "Japanese (Kana)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:565
+#: ../rules/base.xml.in.h:545
 msgid "Japanese (Kana 86)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:566
+#: ../rules/base.xml.in.h:546
 msgid "Japanese (OADG 109A)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:547
 msgid "Japanese (Macintosh)"
 msgstr ""
 
@@ -2123,251 +2123,251 @@
 msgstr ""
 
 #. Keyboard indicator for Kikuyu layouts
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:549
 msgid "ki"
 msgstr "ki"
 
-#: ../rules/base.xml.in.h:571
+#: ../rules/base.xml.in.h:550
 msgid "Kyrgyz"
 msgstr "柯尔克孜语(吉尔吉斯语)"
 
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:551
 msgid "Kyrgyz (phonetic)"
 msgstr "柯尔克孜语(吉尔吉斯语，音标)"
 
 #. Keyboard indicator for Khmer layouts
-#: ../rules/base.xml.in.h:574
+#: ../rules/base.xml.in.h:553
 msgid "km"
 msgstr "km"
 
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:554
 msgid "Khmer (Cambodia)"
 msgstr ""
 
 #. Keyboard indicator for Kazakh layouts
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:556
 msgid "kk"
 msgstr "kk"
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:557
 msgid "Kazakh"
 msgstr "哈萨克语"
 
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:558
 msgid "Russian (Kazakhstan, with Kazakh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:580
+#: ../rules/base.xml.in.h:559
 msgid "Kazakh (with Russian)"
 msgstr ""
 
 #. Keyboard indicator for Lao layouts
-#: ../rules/base.xml.in.h:582
+#: ../rules/base.xml.in.h:561
 msgid "lo"
 msgstr "lo"
 
-#: ../rules/base.xml.in.h:583
+#: ../rules/base.xml.in.h:562
 msgid "Lao"
 msgstr "老挝语(寮语)"
 
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:563
 msgid "Lao (STEA proposed standard layout)"
 msgstr ""
 
 #. Keyboard indicator for Spanish layouts
-#: ../rules/base.xml.in.h:586 ../rules/base.extras.xml.in.h:109
+#: ../rules/base.xml.in.h:565
 msgid "es"
 msgstr "es"
 
-#: ../rules/base.xml.in.h:587
+#: ../rules/base.xml.in.h:566
 msgid "Spanish (Latin American)"
 msgstr "西班牙语(拉丁美洲)"
 
-#: ../rules/base.xml.in.h:588
+#: ../rules/base.xml.in.h:567
 msgid "Spanish (Latin American, eliminate dead keys)"
 msgstr "西班牙语(拉丁美洲，除去死键)"
 
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:568
 msgid "Spanish (Latin American, include dead tilde)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:569
 msgid "Spanish (Latin American, Sun dead keys)"
 msgstr "西班牙语(拉丁美洲，Sun 死键)"
 
 #. Keyboard indicator for Lithuanian layouts
-#: ../rules/base.xml.in.h:592 ../rules/base.extras.xml.in.h:18
+#: ../rules/base.xml.in.h:571 ../rules/base.extras.xml.in.h:16
 msgid "lt"
 msgstr "lt"
 
-#: ../rules/base.xml.in.h:593 ../rules/base.extras.xml.in.h:19
+#: ../rules/base.xml.in.h:572 ../rules/base.extras.xml.in.h:17
 msgid "Lithuanian"
 msgstr "立陶宛语"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:573
 msgid "Lithuanian (standard)"
 msgstr "立陶宛语(标准)"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:574
 msgid "Lithuanian (US keyboard with Lithuanian letters)"
 msgstr "立陶宛语(带立陶宛字母的美国键盘)"
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:575
 msgid "Lithuanian (IBM LST 1205-92)"
 msgstr "立陶宛语 (IBM LST 1205-92)"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:576
 msgid "Lithuanian (LEKP)"
 msgstr "立陶宛语 (LEKP)"
 
-#: ../rules/base.xml.in.h:598
+#: ../rules/base.xml.in.h:577
 msgid "Lithuanian (LEKPa)"
 msgstr "立陶宛语 (LEKPa)"
 
 #. Keyboard indicator for Latvian layouts
-#: ../rules/base.xml.in.h:600 ../rules/base.extras.xml.in.h:22
+#: ../rules/base.xml.in.h:579 ../rules/base.extras.xml.in.h:19
 msgid "lv"
 msgstr "lv"
 
-#: ../rules/base.xml.in.h:601 ../rules/base.extras.xml.in.h:23
+#: ../rules/base.xml.in.h:580 ../rules/base.extras.xml.in.h:20
 msgid "Latvian"
 msgstr "拉脱维亚"
 
-#: ../rules/base.xml.in.h:602
+#: ../rules/base.xml.in.h:581
 msgid "Latvian (apostrophe variant)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:582
 msgid "Latvian (tilde variant)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:583
 msgid "Latvian (F variant)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:584
 msgid "Latvian (modern)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:606
+#: ../rules/base.xml.in.h:585
 msgid "Latvian (ergonomic, ŪGJRMV)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:586
 msgid "Latvian (adapted)"
 msgstr ""
 
 #. Keyboard indicator for Maori layouts
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:588
 msgid "mi"
 msgstr "mi"
 
-#: ../rules/base.xml.in.h:610
+#: ../rules/base.xml.in.h:589
 msgid "Maori"
 msgstr ""
 
 #. Keyboard indicator for Serbian layouts
-#: ../rules/base.xml.in.h:612 ../rules/base.extras.xml.in.h:51
+#: ../rules/base.xml.in.h:591 ../rules/base.extras.xml.in.h:43
 msgid "sr"
 msgstr "sr"
 
-#: ../rules/base.xml.in.h:613
+#: ../rules/base.xml.in.h:592
 msgid "Montenegrin"
 msgstr "黑山语"
 
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:593
 msgid "Montenegrin (Cyrillic)"
 msgstr "黑山语(西里尔)"
 
-#: ../rules/base.xml.in.h:615
+#: ../rules/base.xml.in.h:594
 msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:595
 msgid "Montenegrin (Latin Unicode)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:596
 msgid "Montenegrin (Latin qwerty)"
 msgstr "黑山语(拉丁 qwerty)"
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:597
 msgid "Montenegrin (Latin Unicode qwerty)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:598
 msgid "Montenegrin (Cyrillic with guillemets)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:599
 msgid "Montenegrin (Latin with guillemets)"
 msgstr ""
 
 #. Keyboard indicator for Macedonian layouts
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:601
 msgid "mk"
 msgstr "mk"
 
-#: ../rules/base.xml.in.h:623
+#: ../rules/base.xml.in.h:602
 msgid "Macedonian"
 msgstr "马其顿语"
 
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:603
 msgid "Macedonian (eliminate dead keys)"
 msgstr "马其顿语(除去死键)"
 
 #. Keyboard indicator for Maltese layouts
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:605
 msgid "mt"
 msgstr "mt"
 
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:606
 msgid "Maltese"
 msgstr "马耳他语"
 
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:607
 msgid "Maltese (with US layout)"
 msgstr "马耳他语(美国布局)"
 
 #. Keyboard indicator for Mongolian layouts
-#: ../rules/base.xml.in.h:630
+#: ../rules/base.xml.in.h:609
 msgid "mn"
 msgstr "mn"
 
-#: ../rules/base.xml.in.h:631
+#: ../rules/base.xml.in.h:610
 msgid "Mongolian"
 msgstr "蒙古"
 
 #. Keyboard indicator for Norwegian layouts
-#: ../rules/base.xml.in.h:633 ../rules/base.extras.xml.in.h:101
+#: ../rules/base.xml.in.h:612
 msgid "no"
 msgstr "no"
 
-#: ../rules/base.xml.in.h:634 ../rules/base.extras.xml.in.h:102
+#: ../rules/base.xml.in.h:613
 msgid "Norwegian"
 msgstr "挪威语"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:614
 msgid "Norwegian (eliminate dead keys)"
 msgstr "挪威语(除去死键)"
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:615
 msgid "Norwegian (Dvorak)"
 msgstr "挪威语(Dvorak)"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:616
 msgid "Northern Saami (Norway)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:617
 msgid "Northern Saami (Norway, eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:639
+#: ../rules/base.xml.in.h:618
 msgid "Norwegian (Macintosh)"
 msgstr "挪威语(Mac)"
 
-#: ../rules/base.xml.in.h:640
+#: ../rules/base.xml.in.h:619
 msgid "Norwegian (Macintosh, eliminate dead keys)"
 msgstr "挪威语(Mac，除去死键)"
 
@@ -2376,11 +2376,11 @@
 msgstr ""
 
 #. Keyboard indicator for Polish layouts
-#: ../rules/base.xml.in.h:643 ../rules/base.extras.xml.in.h:40
+#: ../rules/base.xml.in.h:621 ../rules/base.extras.xml.in.h:35
 msgid "pl"
 msgstr "pl"
 
-#: ../rules/base.xml.in.h:644 ../rules/base.extras.xml.in.h:41
+#: ../rules/base.xml.in.h:622 ../rules/base.extras.xml.in.h:36
 msgid "Polish"
 msgstr "波兰语"
 
@@ -2388,59 +2388,59 @@
 msgid "Polish (legacy)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:646
+#: ../rules/base.xml.in.h:623
 msgid "Polish (qwertz)"
 msgstr "波兰(qwertz)"
 
-#: ../rules/base.xml.in.h:647
+#: ../rules/base.xml.in.h:624
 msgid "Polish (Dvorak)"
 msgstr "波兰语(Dvorak)"
 
-#: ../rules/base.xml.in.h:648
+#: ../rules/base.xml.in.h:625
 msgid "Polish (Dvorak, Polish quotes on quotemark key)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:649
+#: ../rules/base.xml.in.h:626
 msgid "Polish (Dvorak, Polish quotes on key 1)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:650
+#: ../rules/base.xml.in.h:627
 msgid "Kashubian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:628
 msgid "Russian (Poland, phonetic Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:652
+#: ../rules/base.xml.in.h:629
 msgid "Polish (programmer Dvorak)"
 msgstr "波兰语(适合程序员的Dvorak)"
 
-#: ../rules/base.xml.in.h:653 ../rules/base.extras.xml.in.h:104
+#: ../rules/base.xml.in.h:630
 msgid "Portuguese"
 msgstr "葡萄牙语"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:631
 msgid "Portuguese (eliminate dead keys)"
 msgstr "葡萄牙语(除去死键)"
 
-#: ../rules/base.xml.in.h:655
+#: ../rules/base.xml.in.h:632
 msgid "Portuguese (Sun dead keys)"
 msgstr "葡萄牙语(Sun 死键)"
 
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:633
 msgid "Portuguese (Macintosh)"
 msgstr "葡萄牙语(Mac)"
 
-#: ../rules/base.xml.in.h:657
+#: ../rules/base.xml.in.h:634
 msgid "Portuguese (Macintosh, eliminate dead keys)"
 msgstr "葡萄牙语(Mac，除去死键)"
 
-#: ../rules/base.xml.in.h:658
+#: ../rules/base.xml.in.h:635
 msgid "Portuguese (Macintosh, Sun dead keys)"
 msgstr "葡萄牙语(Mac，Sun 死键)"
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:636
 msgid "Portuguese (Nativo)"
 msgstr ""
 
@@ -2448,96 +2448,96 @@
 msgid "Portuguese (Nativo for US keyboards)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:638
 msgid "Esperanto (Portugal, Nativo)"
 msgstr ""
 
 #. Keyboard indicator for Romanian layouts
-#: ../rules/base.xml.in.h:663 ../rules/base.extras.xml.in.h:45
+#: ../rules/base.xml.in.h:640 ../rules/base.extras.xml.in.h:38
 msgid "ro"
 msgstr "ro"
 
-#: ../rules/base.xml.in.h:664 ../rules/base.extras.xml.in.h:46
+#: ../rules/base.xml.in.h:641 ../rules/base.extras.xml.in.h:39
 msgid "Romanian"
 msgstr "罗马尼亚语"
 
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:642
 msgid "Romanian (cedilla)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:643
 msgid "Romanian (standard)"
 msgstr "罗马尼亚语(标准)"
 
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:644
 msgid "Romanian (standard cedilla)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:668
+#: ../rules/base.xml.in.h:645
 msgid "Romanian (WinKeys)"
 msgstr "罗马尼亚语(Win 键)"
 
-#: ../rules/base.xml.in.h:669 ../rules/base.extras.xml.in.h:55
+#: ../rules/base.xml.in.h:646 ../rules/base.extras.xml.in.h:47
 msgid "Russian"
 msgstr "俄语"
 
-#: ../rules/base.xml.in.h:670
+#: ../rules/base.xml.in.h:647
 msgid "Russian (phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:671
+#: ../rules/base.xml.in.h:648
 msgid "Russian (phonetic WinKeys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:672
+#: ../rules/base.xml.in.h:649
 msgid "Russian (typewriter)"
 msgstr "俄语(打字机)"
 
-#: ../rules/base.xml.in.h:673
+#: ../rules/base.xml.in.h:650
 msgid "Russian (legacy)"
 msgstr "俄语(传统)"
 
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:651
 msgid "Russian (typewriter, legacy)"
 msgstr "俄语(打字机，传统)"
 
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:652
 msgid "Tatar"
 msgstr ""
 
-#: ../rules/base.xml.in.h:676
+#: ../rules/base.xml.in.h:653
 msgid "Ossetian (legacy)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:677
+#: ../rules/base.xml.in.h:654
 msgid "Ossetian (WinKeys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:655
 msgid "Chuvash"
 msgstr ""
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:656
 msgid "Chuvash (Latin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:657
 msgid "Udmurt"
 msgstr ""
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:658
 msgid "Komi"
 msgstr ""
 
-#: ../rules/base.xml.in.h:682
+#: ../rules/base.xml.in.h:659
 msgid "Yakut"
 msgstr ""
 
-#: ../rules/base.xml.in.h:683
+#: ../rules/base.xml.in.h:660
 msgid "Kalmyk"
 msgstr ""
 
-#: ../rules/base.xml.in.h:684
+#: ../rules/base.xml.in.h:661
 msgid "Russian (DOS)"
 msgstr "俄语(DOS)"
 
@@ -2545,695 +2545,695 @@
 msgid "Russian (Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:662
 msgid "Serbian (Russia)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:663
 msgid "Bashkirian"
 msgstr "巴什基尔期"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:664
 msgid "Mari"
 msgstr ""
 
-#: ../rules/base.xml.in.h:689 ../rules/base.extras.xml.in.h:52
+#: ../rules/base.extras.xml.in.h:44
 msgid "Serbian"
 msgstr "塞尔维亚"
 
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:666
 msgid "Serbian (Cyrillic, Z and ZHE swapped)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:667
 msgid "Serbian (Latin)"
 msgstr "塞尔维亚(拉丁)"
 
-#: ../rules/base.xml.in.h:692
+#: ../rules/base.xml.in.h:668
 msgid "Serbian (Latin Unicode)"
 msgstr "塞尔维亚(拉丁 Unicode)"
 
-#: ../rules/base.xml.in.h:693
+#: ../rules/base.xml.in.h:669
 msgid "Serbian (Latin qwerty)"
 msgstr "塞尔维亚(拉丁 qwerty)"
 
-#: ../rules/base.xml.in.h:694
+#: ../rules/base.xml.in.h:670
 msgid "Serbian (Latin Unicode qwerty)"
 msgstr "塞尔维亚(拉丁 Unicode qwerty)"
 
-#: ../rules/base.xml.in.h:695
+#: ../rules/base.xml.in.h:671
 msgid "Serbian (Cyrillic with guillemets)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:696
+#: ../rules/base.xml.in.h:672
 msgid "Serbian (Latin with guillemets)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:697
+#: ../rules/base.xml.in.h:673
 msgid "Pannonian Rusyn (homophonic)"
 msgstr ""
 
 #. Keyboard indicator for Slovenian layouts
-#: ../rules/base.xml.in.h:699
+#: ../rules/base.xml.in.h:675
 msgid "sl"
 msgstr "sl"
 
-#: ../rules/base.xml.in.h:700
+#: ../rules/base.xml.in.h:676
 msgid "Slovenian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:677
 msgid "Slovenian (use guillemets for quotes)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:702
+#: ../rules/base.xml.in.h:678
 msgid "Slovenian (US keyboard with Slovenian letters)"
 msgstr ""
 
 #. Keyboard indicator for Slovak layouts
-#: ../rules/base.xml.in.h:704 ../rules/base.extras.xml.in.h:106
+#: ../rules/base.xml.in.h:680
 msgid "sk"
 msgstr "sk"
 
-#: ../rules/base.xml.in.h:705 ../rules/base.extras.xml.in.h:107
+#: ../rules/base.xml.in.h:681
 msgid "Slovak"
 msgstr "斯洛伐克语"
 
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:682
 msgid "Slovak (extended Backslash)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:683
 msgid "Slovak (qwerty)"
 msgstr "斯洛伐克语(qwerty)"
 
-#: ../rules/base.xml.in.h:708
+#: ../rules/base.xml.in.h:684
 msgid "Slovak (qwerty, extended Backslash)"
 msgstr "斯洛伐克语(qwerty)"
 
-#: ../rules/base.xml.in.h:709 ../rules/base.extras.xml.in.h:110
+#: ../rules/base.xml.in.h:685
 msgid "Spanish"
 msgstr "西班牙"
 
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:686
 msgid "Spanish (eliminate dead keys)"
 msgstr "西班牙语(除去死键)"
 
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:687
 msgid "Spanish (include dead tilde)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:688
 msgid "Spanish (Sun dead keys)"
 msgstr "西班牙语(Sun 死键)"
 
-#: ../rules/base.xml.in.h:713
+#: ../rules/base.xml.in.h:689
 msgid "Spanish (Dvorak)"
 msgstr "西班牙语(Dvorak)"
 
-#: ../rules/base.xml.in.h:714
+#: ../rules/base.xml.in.h:690
 msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:715
+#: ../rules/base.xml.in.h:691
 msgid "Catalan (Spain, with middle-dot L)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:692
 msgid "Spanish (Macintosh)"
 msgstr "西班牙语(Mac)"
 
 #. Keyboard indicator for Swedish layouts
-#: ../rules/base.xml.in.h:718 ../rules/base.extras.xml.in.h:112
+#: ../rules/base.xml.in.h:694
 msgid "sv"
 msgstr "sv"
 
-#: ../rules/base.xml.in.h:719 ../rules/base.extras.xml.in.h:113
+#: ../rules/base.xml.in.h:695
 msgid "Swedish"
 msgstr "瑞典语"
 
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:696
 msgid "Swedish (eliminate dead keys)"
 msgstr "瑞典语(除去死键)"
 
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:697
 msgid "Swedish (Dvorak)"
 msgstr "瑞典语(Dvorak)"
 
-#: ../rules/base.xml.in.h:722
+#: ../rules/base.xml.in.h:698
 msgid "Russian (Sweden, phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:699
 msgid "Russian (Sweden, phonetic, eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:724
+#: ../rules/base.xml.in.h:700
 msgid "Northern Saami (Sweden)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:725
+#: ../rules/base.xml.in.h:701
 msgid "Swedish (Macintosh)"
 msgstr "瑞典语(Mac)"
 
-#: ../rules/base.xml.in.h:726
+#: ../rules/base.xml.in.h:702
 msgid "Swedish (Svdvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:727
+#: ../rules/base.xml.in.h:703
 msgid "Swedish Sign Language"
 msgstr ""
 
-#: ../rules/base.xml.in.h:728 ../rules/base.extras.xml.in.h:115
+#: ../rules/base.xml.in.h:704
 msgid "German (Switzerland)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:729
+#: ../rules/base.xml.in.h:705
 msgid "German (Switzerland, legacy)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:730
+#: ../rules/base.xml.in.h:706
 msgid "German (Switzerland, eliminate dead keys)"
 msgstr "德语(瑞士，除去死键)"
 
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:707
 msgid "German (Switzerland, Sun dead keys)"
 msgstr "德语(瑞士，Sun 死键)"
 
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:708
 msgid "French (Switzerland)"
 msgstr "法语(瑞士)"
 
-#: ../rules/base.xml.in.h:733
+#: ../rules/base.xml.in.h:709
 msgid "French (Switzerland, eliminate dead keys)"
 msgstr "法语(瑞士，除去死键)"
 
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:710
 msgid "French (Switzerland, Sun dead keys)"
 msgstr "法语(瑞士，Sun 死键)"
 
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:711
 msgid "French (Switzerland, Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:712
 msgid "German (Switzerland, Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:713
 msgid "Arabic (Syria)"
 msgstr "阿拉伯语(叙利亚)"
 
 #. Keyboard indicator for Syriac layouts
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:715
 msgid "syc"
 msgstr "syc"
 
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:716
 msgid "Syriac"
 msgstr "叙利亚语"
 
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:717
 msgid "Syriac (phonetic)"
 msgstr "叙利亚语(音标)"
 
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:718
 msgid "Kurdish (Syria, Latin Q)"
 msgstr "库尔德语(叙利亚，拉丁 Q)"
 
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:719
 msgid "Kurdish (Syria, F)"
 msgstr "库尔德语(叙利亚，F)"
 
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:720
 msgid "Kurdish (Syria, Latin Alt-Q)"
 msgstr "库尔德语(叙利亚，拉丁 Alt-Q)"
 
 #. Keyboard indicator for Tajik layouts
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:722
 msgid "tg"
 msgstr "tg"
 
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:723
 msgid "Tajik"
 msgstr "塔吉克"
 
-#: ../rules/base.xml.in.h:748
+#: ../rules/base.xml.in.h:724
 msgid "Tajik (legacy)"
 msgstr ""
 
 #. Keyboard indicator for Sinhala layouts
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:726
 msgid "si"
 msgstr "si"
 
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:727
 msgid "Sinhala (phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:728
 msgid "Tamil (Sri Lanka, Unicode)"
 msgstr "泰米尔语(斯里兰卡，Unicode)"
 
-#: ../rules/base.xml.in.h:753
+#: ../rules/base.xml.in.h:729
 msgid "Tamil (Sri Lanka, TAB Typewriter)"
 msgstr ""
 
 #. Keyboard indicator for Thai layouts
-#: ../rules/base.xml.in.h:755
+#: ../rules/base.xml.in.h:731
 msgid "th"
 msgstr "th"
 
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:732
 msgid "Thai"
 msgstr "泰语"
 
-#: ../rules/base.xml.in.h:757
+#: ../rules/base.xml.in.h:733
 msgid "Thai (TIS-820.2538)"
 msgstr "泰语(TIS-820.2538)"
 
-#: ../rules/base.xml.in.h:758
+#: ../rules/base.xml.in.h:734
 msgid "Thai (Pattachote)"
 msgstr "泰语(Pattachote)"
 
 #. Keyboard indicator for Turkish layouts
-#: ../rules/base.xml.in.h:760 ../rules/base.extras.xml.in.h:118
+#: ../rules/base.xml.in.h:736
 msgid "tr"
 msgstr "tr"
 
-#: ../rules/base.xml.in.h:761 ../rules/base.extras.xml.in.h:119
+#: ../rules/base.xml.in.h:737
 msgid "Turkish"
 msgstr "土耳其"
 
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:738
 msgid "Turkish (F)"
 msgstr "土耳其(F)"
 
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:739
 msgid "Turkish (Alt-Q)"
 msgstr "土耳其(Alt-Q)"
 
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:740
 msgid "Turkish (Sun dead keys)"
 msgstr "土耳其语(Sun 死键)"
 
-#: ../rules/base.xml.in.h:765
+#: ../rules/base.xml.in.h:741
 msgid "Kurdish (Turkey, Latin Q)"
 msgstr "库尔德语(土耳其，拉丁 Q)"
 
-#: ../rules/base.xml.in.h:766
+#: ../rules/base.xml.in.h:742
 msgid "Kurdish (Turkey, F)"
 msgstr "库尔德语(土耳其，F)"
 
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:743
 msgid "Kurdish (Turkey, Latin Alt-Q)"
 msgstr "库尔德语(土耳其，拉丁 Alt-Q)"
 
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:744
 msgid "Turkish (international with dead keys)"
 msgstr "土耳其语(国际，带死键)"
 
 #. Keyboard indicator for Crimean Tatar layouts
-#: ../rules/base.xml.in.h:770 ../rules/base.extras.xml.in.h:47
+#: ../rules/base.xml.in.h:746 ../rules/base.extras.xml.in.h:40
 msgid "crh"
 msgstr "crh"
 
-#: ../rules/base.xml.in.h:771
+#: ../rules/base.xml.in.h:747
 msgid "Crimean Tatar (Turkish Q)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:772
+#: ../rules/base.xml.in.h:748
 msgid "Crimean Tatar (Turkish F)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:773
+#: ../rules/base.xml.in.h:749
 msgid "Crimean Tatar (Turkish Alt-Q)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:774
+#: ../rules/base.xml.in.h:750
 msgid "Taiwanese"
 msgstr "台言"
 
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:751
 msgid "Taiwanese (indigenous)"
 msgstr "台湾原住民语言"
 
 #. Keyboard indicator for Saisiyat layouts
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:753
 msgid "xsy"
 msgstr "xsy"
 
-#: ../rules/base.xml.in.h:778
+#: ../rules/base.xml.in.h:754
 msgid "Saisiyat (Taiwan)"
 msgstr ""
 
 #. Keyboard indicator for Ukranian layouts
-#: ../rules/base.xml.in.h:780 ../rules/base.extras.xml.in.h:121
+#: ../rules/base.xml.in.h:756
 msgid "uk"
 msgstr "uk"
 
-#: ../rules/base.xml.in.h:781 ../rules/base.extras.xml.in.h:122
+#: ../rules/base.xml.in.h:757
 msgid "Ukrainian"
 msgstr "乌克兰语"
 
-#: ../rules/base.xml.in.h:782
+#: ../rules/base.xml.in.h:758
 msgid "Ukrainian (phonetic)"
 msgstr "乌克兰语(音标)"
 
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:759
 msgid "Ukrainian (typewriter)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:760
 msgid "Ukrainian (WinKeys)"
 msgstr "乌克兰语(Win 键)"
 
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:761
 msgid "Ukrainian (legacy)"
 msgstr "乌克兰语(传统)"
 
-#: ../rules/base.xml.in.h:786
+#: ../rules/base.xml.in.h:762
 msgid "Ukrainian (standard RSTU)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:787
+#: ../rules/base.xml.in.h:763
 msgid "Russian (Ukraine, standard RSTU)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:764
 msgid "Ukrainian (homophonic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:789 ../rules/base.extras.xml.in.h:124
+#: ../rules/base.xml.in.h:765
 msgid "English (UK)"
 msgstr "英语(英国)"
 
-#: ../rules/base.xml.in.h:790
+#: ../rules/base.xml.in.h:766
 msgid "English (UK, extended WinKeys)"
 msgstr "英语(英国，扩展 Win 键)"
 
-#: ../rules/base.xml.in.h:791
+#: ../rules/base.xml.in.h:767
 msgid "English (UK, international with dead keys)"
 msgstr "英语(英国，带死键的国际布局)"
 
-#: ../rules/base.xml.in.h:792
+#: ../rules/base.xml.in.h:768
 msgid "English (UK, Dvorak)"
 msgstr "英语(英国，Dvorak 布局)"
 
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:769
 msgid "English (UK, Dvorak with UK punctuation)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:770
 msgid "English (UK, Macintosh)"
 msgstr "英语(英国，Mac)"
 
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:771
 msgid "English (UK, Macintosh international)"
 msgstr "英语(英国，Mac 国际布局)"
 
-#: ../rules/base.xml.in.h:796
+#: ../rules/base.xml.in.h:772
 msgid "English (UK, Colemak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:797
+#: ../rules/base.xml.in.h:773
 msgid "Uzbek"
 msgstr "乌兹别克语"
 
-#: ../rules/base.xml.in.h:798
+#: ../rules/base.xml.in.h:774
 msgid "Uzbek (Latin)"
 msgstr "乌兹别克语(拉丁)"
 
 #. Keyboard indicator for Vietnamese layouts
-#: ../rules/base.xml.in.h:800
+#: ../rules/base.xml.in.h:776
 msgid "vi"
 msgstr "vi"
 
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:777
 msgid "Vietnamese"
 msgstr "越南语"
 
 #. Keyboard indicator for Korean layouts
-#: ../rules/base.xml.in.h:803 ../rules/base.extras.xml.in.h:126
+#: ../rules/base.xml.in.h:779
 msgid "ko"
 msgstr "ko"
 
-#: ../rules/base.xml.in.h:804 ../rules/base.extras.xml.in.h:127
+#: ../rules/base.xml.in.h:780
 msgid "Korean"
 msgstr "朝鲜语"
 
-#: ../rules/base.xml.in.h:805
+#: ../rules/base.xml.in.h:781
 msgid "Korean (101/104 key compatible)"
 msgstr "朝鲜语(兼容 101/104 键)"
 
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:782
 msgid "Japanese (PC-98xx Series)"
 msgstr "日语(PC-98xx 系列)"
 
 #. Keyboard indicator for Irish layouts
-#: ../rules/base.xml.in.h:808
+#: ../rules/base.xml.in.h:784
 msgid "ie"
 msgstr "ie"
 
-#: ../rules/base.xml.in.h:809
+#: ../rules/base.xml.in.h:785
 msgid "Irish"
 msgstr "爱尔兰"
 
-#: ../rules/base.xml.in.h:810
+#: ../rules/base.xml.in.h:786
 msgid "CloGaelach"
 msgstr "CloGaelach"
 
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:787
 msgid "Irish (UnicodeExpert)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:812
+#: ../rules/base.xml.in.h:788
 msgid "Ogham"
 msgstr "欧甘"
 
-#: ../rules/base.xml.in.h:813
+#: ../rules/base.xml.in.h:789
 msgid "Ogham (IS434)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:814
+#: ../rules/base.xml.in.h:790
 msgid "Urdu (Pakistan)"
 msgstr "乌尔都语(巴基斯坦)"
 
-#: ../rules/base.xml.in.h:815
+#: ../rules/base.xml.in.h:791
 msgid "Urdu (Pakistan, CRULP)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:792
 msgid "Urdu (Pakistan, NLA)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:817
+#: ../rules/base.xml.in.h:793
 msgid "Arabic (Pakistan)"
 msgstr "阿拉伯语(巴基斯坦)"
 
 #. Keyboard indicator for Sindhi layouts
-#: ../rules/base.xml.in.h:819
+#: ../rules/base.xml.in.h:795
 msgid "sd"
 msgstr "sd"
 
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:796
 msgid "Sindhi"
 msgstr "信德语"
 
 #. Keyboard indicator for Dhivehi layouts
-#: ../rules/base.xml.in.h:822
+#: ../rules/base.xml.in.h:798
 msgid "dv"
 msgstr "dv"
 
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:799
 msgid "Dhivehi"
 msgstr "迪维希语"
 
-#: ../rules/base.xml.in.h:824
+#: ../rules/base.xml.in.h:800
 msgid "English (South Africa)"
 msgstr "英语(南非)"
 
 #. Keyboard indicator for Esperanto layouts
-#: ../rules/base.xml.in.h:826
+#: ../rules/base.xml.in.h:802
 msgid "eo"
 msgstr "eo"
 
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:803
 msgid "Esperanto"
 msgstr "世界语"
 
-#: ../rules/base.xml.in.h:828
+#: ../rules/base.xml.in.h:804
 msgid "Esperanto (displaced semicolon and quote, obsolete)"
 msgstr ""
 
 #. Keyboard indicator for Nepali layouts
-#: ../rules/base.xml.in.h:830
+#: ../rules/base.xml.in.h:806
 msgid "ne"
 msgstr "ne"
 
-#: ../rules/base.xml.in.h:831
+#: ../rules/base.xml.in.h:807
 msgid "Nepali"
 msgstr "尼泊尔语"
 
-#: ../rules/base.xml.in.h:832
+#: ../rules/base.xml.in.h:808
 msgid "English (Nigeria)"
 msgstr "英语(尼日利亚)"
 
 #. Keyboard indicator for Igbo layouts
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:810
 msgid "ig"
 msgstr "ig"
 
-#: ../rules/base.xml.in.h:835
+#: ../rules/base.xml.in.h:811
 msgid "Igbo"
 msgstr "伊博语"
 
 #. Keyboard indicator for Yoruba layouts
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:813
 msgid "yo"
 msgstr "yo"
 
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:814
 msgid "Yoruba"
 msgstr ""
 
 #. Keyboard indicator for Amharic layouts
-#: ../rules/base.xml.in.h:840
+#: ../rules/base.xml.in.h:816
 msgid "am"
 msgstr "am"
 
-#: ../rules/base.xml.in.h:841
+#: ../rules/base.xml.in.h:817
 msgid "Amharic"
 msgstr "阿姆哈拉语"
 
 #. Keyboard indicator for Wolof layouts
-#: ../rules/base.xml.in.h:843
+#: ../rules/base.xml.in.h:819
 msgid "wo"
 msgstr "wo"
 
-#: ../rules/base.xml.in.h:844
+#: ../rules/base.xml.in.h:820
 msgid "Wolof"
 msgstr ""
 
 #. Keyboard indicator for Braille layouts
-#: ../rules/base.xml.in.h:846
+#: ../rules/base.xml.in.h:822
 msgid "brl"
 msgstr "brl"
 
-#: ../rules/base.xml.in.h:847
+#: ../rules/base.xml.in.h:823
 msgid "Braille"
 msgstr ""
 
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:824
 msgid "Braille (left hand)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:849
+#: ../rules/base.xml.in.h:825
 msgid "Braille (right hand)"
 msgstr ""
 
 #. Keyboard indicator for Turkmen layouts
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:827
 msgid "tk"
 msgstr "tk"
 
-#: ../rules/base.xml.in.h:852
+#: ../rules/base.xml.in.h:828
 msgid "Turkmen"
 msgstr ""
 
-#: ../rules/base.xml.in.h:853
+#: ../rules/base.xml.in.h:829
 msgid "Turkmen (Alt-Q)"
 msgstr ""
 
 #. Keyboard indicator for Bambara layouts
-#: ../rules/base.xml.in.h:855
+#: ../rules/base.xml.in.h:831
 msgid "bm"
 msgstr "bm"
 
-#: ../rules/base.xml.in.h:856
+#: ../rules/base.xml.in.h:832
 msgid "Bambara"
 msgstr "班巴拉语"
 
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:833
 msgid "French (Mali, alternative)"
 msgstr "法语(马里，替代)"
 
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:834
 msgid "English (Mali, US Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:859
+#: ../rules/base.xml.in.h:835
 msgid "English (Mali, US international)"
 msgstr ""
 
 #. Keyboard indicator for Swahili layouts
-#: ../rules/base.xml.in.h:861
+#: ../rules/base.xml.in.h:837
 msgid "sw"
 msgstr "sw"
 
-#: ../rules/base.xml.in.h:862
+#: ../rules/base.xml.in.h:838
 msgid "Swahili (Tanzania)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:839
 msgid "Swahili (Kenya)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:864
+#: ../rules/base.xml.in.h:840
 msgid "Kikuyu"
 msgstr ""
 
 #. Keyboard indicator for Tswana layouts
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:842
 msgid "tn"
 msgstr "tn"
 
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:843
 msgid "Tswana"
 msgstr ""
 
 #. Keyboard indicator for Filipino layouts
-#: ../rules/base.xml.in.h:869
+#: ../rules/base.xml.in.h:845
 msgid "ph"
 msgstr "ph"
 
-#: ../rules/base.xml.in.h:870
+#: ../rules/base.xml.in.h:846
 msgid "Filipino"
 msgstr "菲律宾语"
 
-#: ../rules/base.xml.in.h:871
+#: ../rules/base.xml.in.h:847
 msgid "Filipino (QWERTY Baybayin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:848
 msgid "Filipino (Capewell-Dvorak Latin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:849
 msgid "Filipino (Capewell-Dvorak Baybayin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:850
 msgid "Filipino (Capewell-QWERF 2006 Latin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:875
+#: ../rules/base.xml.in.h:851
 msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:876
+#: ../rules/base.xml.in.h:852
 msgid "Filipino (Colemak Latin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:853
 msgid "Filipino (Colemak Baybayin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:878
+#: ../rules/base.xml.in.h:854
 msgid "Filipino (Dvorak Latin)"
 msgstr "菲律宾语(Dvorak拉丁)"
 
-#: ../rules/base.xml.in.h:879
+#: ../rules/base.xml.in.h:855
 msgid "Filipino (Dvorak Baybayin)"
 msgstr ""
 
@@ -3257,152 +3257,152 @@
 msgid "Switching to another layout"
 msgstr ""
 
-#: ../rules/base.xml.in.h:885
+#: ../rules/base.xml.in.h:857
 msgid "Right Alt (while pressed)"
 msgstr "右 Alt (按下时)"
 
-#: ../rules/base.xml.in.h:886
+#: ../rules/base.xml.in.h:858
 msgid "Left Alt (while pressed)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:859
 msgid "Left Win (while pressed)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:860
 msgid "Right Win (while pressed)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:861
 msgid "Any Win key (while pressed)"
 msgstr "任意Win 键(按下时)"
 
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:862
 msgid ""
 "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
 msgstr ""
 
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:863
 msgid "Right Ctrl (while pressed)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:892
+#: ../rules/base.xml.in.h:864
 msgid "Right Alt"
 msgstr "右 Alt"
 
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:865
 msgid "Left Alt"
 msgstr "左 Alt"
 
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:866
 msgid "Caps Lock"
 msgstr "大写锁定"
 
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:867
 msgid "Shift+Caps Lock"
 msgstr "Shift+Caps Lock"
 
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:868
 msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:869
 msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:898
+#: ../rules/base.xml.in.h:870
 msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:871
 msgid "Alt+Caps Lock"
 msgstr "Alt+Caps Lock"
 
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:872
 msgid "Both Shift keys together"
 msgstr "同时按两个 Shift 键"
 
-#: ../rules/base.xml.in.h:901
+#: ../rules/base.xml.in.h:873
 msgid "Both Alt keys together"
 msgstr "同时按两个 Alt 键"
 
-#: ../rules/base.xml.in.h:902
+#: ../rules/base.xml.in.h:874
 msgid "Both Ctrl keys together"
 msgstr "同时按两个 Ctrl 键"
 
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:875
 msgid "Ctrl+Shift"
 msgstr "Ctrl+Shift"
 
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:876
 msgid "Left Ctrl+Left Shift"
 msgstr "左 Ctrl+左 Shift"
 
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:877
 msgid "Right Ctrl+Right Shift"
 msgstr "右 Ctrl+右 Shift"
 
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:878
 msgid "Alt+Ctrl"
 msgstr "Alt+Ctrl"
 
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:879
 msgid "Alt+Shift"
 msgstr "Alt+Shift"
 
-#: ../rules/base.xml.in.h:908
+#: ../rules/base.xml.in.h:880
 msgid "Left Alt+Left Shift"
 msgstr ""
 
-#: ../rules/base.xml.in.h:909
+#: ../rules/base.xml.in.h:881
 msgid "Alt+Space"
 msgstr "Alt+Space"
 
-#: ../rules/base.xml.in.h:910
+#: ../rules/base.xml.in.h:882
 msgid "Menu"
 msgstr "菜单"
 
-#: ../rules/base.xml.in.h:911
+#: ../rules/base.xml.in.h:883
 msgid "Left Win"
 msgstr "左 Win"
 
-#: ../rules/base.xml.in.h:912
+#: ../rules/base.xml.in.h:884
 msgid "Right Win"
 msgstr "右 Win"
 
-#: ../rules/base.xml.in.h:913
+#: ../rules/base.xml.in.h:885
 msgid "Left Shift"
 msgstr "左 Shift"
 
-#: ../rules/base.xml.in.h:914
+#: ../rules/base.xml.in.h:886
 msgid "Right Shift"
 msgstr "右 Shift"
 
-#: ../rules/base.xml.in.h:915
+#: ../rules/base.xml.in.h:887
 msgid "Left Ctrl"
 msgstr "左 Ctrl"
 
-#: ../rules/base.xml.in.h:916
+#: ../rules/base.xml.in.h:888
 msgid "Right Ctrl"
 msgstr "右 Ctrl"
 
-#: ../rules/base.xml.in.h:917
+#: ../rules/base.xml.in.h:889
 msgid "Scroll Lock"
 msgstr "滚动锁定"
 
-#: ../rules/base.xml.in.h:918
+#: ../rules/base.xml.in.h:890
 msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:919
+#: ../rules/base.xml.in.h:891
 msgid "Key to choose 3rd level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:920
+#: ../rules/base.xml.in.h:892
 msgid "Any Win key"
 msgstr "任意Win 键"
 
-#: ../rules/base.xml.in.h:921
+#: ../rules/base.xml.in.h:893
 msgid "Any Alt key"
 msgstr "任意Alt 键"
 
@@ -3410,81 +3410,81 @@
 msgid "Right Alt, Shift+Right Alt key is Compose"
 msgstr ""
 
-#: ../rules/base.xml.in.h:923
+#: ../rules/base.xml.in.h:895
 msgid "Right Alt key never chooses 3rd level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:924
+#: ../rules/base.xml.in.h:896
 msgid "Enter on keypad"
 msgstr "小键盘上的回车"
 
-#: ../rules/base.xml.in.h:925
+#: ../rules/base.xml.in.h:897
 msgid "Backslash"
 msgstr "反斜杠"
 
-#: ../rules/base.xml.in.h:926
+#: ../rules/base.xml.in.h:898
 msgid "&lt;Less/Greater&gt;"
 msgstr "&lt;小于/大于&gt;"
 
-#: ../rules/base.xml.in.h:927
+#: ../rules/base.xml.in.h:899
 msgid ""
 "Caps Lock chooses 3rd level, acts as onetime lock when pressed together with "
 "another 3rd-level-chooser"
 msgstr ""
 
-#: ../rules/base.xml.in.h:928
+#: ../rules/base.xml.in.h:900
 msgid ""
 "Backslash chooses 3rd level, acts as onetime lock when pressed together with "
 "another 3rd-level-chooser"
 msgstr ""
 
-#: ../rules/base.xml.in.h:929
+#: ../rules/base.xml.in.h:901
 msgid ""
 "&lt;Less/Greater&gt; chooses 3rd level, acts as onetime lock when pressed "
 "together with another 3rd-level-chooser"
 msgstr ""
 
-#: ../rules/base.xml.in.h:930
+#: ../rules/base.xml.in.h:902
 msgid "Ctrl key position"
 msgstr "Ctrl 键位置"
 
-#: ../rules/base.xml.in.h:931
+#: ../rules/base.xml.in.h:903
 msgid "Caps Lock as Ctrl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:932
+#: ../rules/base.xml.in.h:904
 msgid "Left Ctrl as Meta"
 msgstr ""
 
-#: ../rules/base.xml.in.h:933
+#: ../rules/base.xml.in.h:905
 msgid "Swap Ctrl and Caps Lock"
 msgstr "交换 Ctrl 和大写锁定"
 
-#: ../rules/base.xml.in.h:934
+#: ../rules/base.xml.in.h:906
 msgid "At left of 'A'"
 msgstr "在“A”左侧"
 
-#: ../rules/base.xml.in.h:935
+#: ../rules/base.xml.in.h:907
 msgid "At bottom left"
 msgstr "在左下角"
 
-#: ../rules/base.xml.in.h:936
+#: ../rules/base.xml.in.h:908
 msgid "Right Ctrl as Right Alt"
 msgstr "右 Ctrl 作为 Alt"
 
-#: ../rules/base.xml.in.h:937
+#: ../rules/base.xml.in.h:909
 msgid "Menu as Right Ctrl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:938
+#: ../rules/base.xml.in.h:910
 msgid "Right Alt as Right Ctrl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:939
+#: ../rules/base.xml.in.h:911
 msgid "Use keyboard LED to show alternative layout"
 msgstr "使用键盘灯显示替代布局"
 
-#: ../rules/base.xml.in.h:940
+#: ../rules/base.xml.in.h:912
 msgid "Num Lock"
 msgstr "数字锁定"
 
@@ -3492,11 +3492,11 @@
 msgid "Layout of numeric keypad"
 msgstr ""
 
-#: ../rules/base.xml.in.h:942
+#: ../rules/base.xml.in.h:914
 msgid "Legacy"
 msgstr "传统"
 
-#: ../rules/base.xml.in.h:943
+#: ../rules/base.xml.in.h:915
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Unicode 扩展(箭头和数学操作符)"
 
@@ -3506,11 +3506,11 @@
 "level)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:945
+#: ../rules/base.xml.in.h:917
 msgid "Legacy Wang 724"
 msgstr "传统王安 724"
 
-#: ../rules/base.xml.in.h:946
+#: ../rules/base.xml.in.h:918
 msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
 msgstr ""
 
@@ -3520,28 +3520,28 @@
 "operators on default level)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:948
+#: ../rules/base.xml.in.h:920
 msgid "Hexadecimal"
 msgstr ""
 
-#: ../rules/base.xml.in.h:949
+#: ../rules/base.xml.in.h:921
 msgid "ATM/phone-style"
 msgstr ""
 
-#: ../rules/base.xml.in.h:950
+#: ../rules/base.xml.in.h:922
 msgid "Numeric keypad delete key behaviour"
 msgstr "数字小键盘上删除键的行为"
 
-#: ../rules/base.xml.in.h:951
+#: ../rules/base.xml.in.h:923
 msgid "Legacy key with dot"
 msgstr ""
 
 #. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:953
+#: ../rules/base.xml.in.h:925
 msgid "Legacy key with comma"
 msgstr ""
 
-#: ../rules/base.xml.in.h:954
+#: ../rules/base.xml.in.h:926
 msgid "Four-level key with dot"
 msgstr ""
 
@@ -3549,17 +3549,17 @@
 msgid "Four-level key with dot, Latin-9 only"
 msgstr ""
 
-#: ../rules/base.xml.in.h:956
+#: ../rules/base.xml.in.h:928
 msgid "Four-level key with comma"
 msgstr ""
 
-#: ../rules/base.xml.in.h:957
+#: ../rules/base.xml.in.h:929
 msgid "Four-level key with momayyez"
 msgstr ""
 
 #. This assumes the KP_ abstract symbols are actually useful for some apps
 #. The description needs to be rewritten
-#: ../rules/base.xml.in.h:960
+#: ../rules/base.xml.in.h:932
 msgid "Four-level key with abstract separators"
 msgstr ""
 
@@ -3567,7 +3567,7 @@
 msgid "Semicolon on third level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:962
+#: ../rules/base.xml.in.h:934
 msgid "Caps Lock key behavior"
 msgstr "大写锁定键行为"
 
@@ -3588,31 +3588,31 @@
 msgid "Caps Lock acts as Shift with locking; Shift doesn't affect Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:967
+#: ../rules/base.xml.in.h:939
 msgid "Caps Lock toggles normal capitalization of alphabetic characters"
 msgstr ""
 
-#: ../rules/base.xml.in.h:968
+#: ../rules/base.xml.in.h:940
 msgid "Make Caps Lock an additional Num Lock"
 msgstr "将 CapsLock 作为额外的 Num Lock"
 
-#: ../rules/base.xml.in.h:969
+#: ../rules/base.xml.in.h:941
 msgid "Swap ESC and Caps Lock"
 msgstr "交换 ESC 和大写锁定"
 
-#: ../rules/base.xml.in.h:970
+#: ../rules/base.xml.in.h:942
 msgid "Make Caps Lock an additional ESC"
 msgstr "将 CapsLock 作为额外的 ESC"
 
-#: ../rules/base.xml.in.h:971
+#: ../rules/base.xml.in.h:943
 msgid "Make Caps Lock an additional Backspace"
 msgstr "将 CapsLock 作为额外的 Backspace"
 
-#: ../rules/base.xml.in.h:972
+#: ../rules/base.xml.in.h:944
 msgid "Make Caps Lock an additional Super"
 msgstr "将 CapsLock 作为额外的 Super"
 
-#: ../rules/base.xml.in.h:973
+#: ../rules/base.xml.in.h:945
 msgid "Make Caps Lock an additional Hyper"
 msgstr ""
 
@@ -3620,7 +3620,7 @@
 msgid "Caps Lock toggles ShiftLock (affects all keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:975
+#: ../rules/base.xml.in.h:947
 msgid "Caps Lock is disabled"
 msgstr "大写锁定被禁用"
 
@@ -3628,15 +3628,15 @@
 msgid "Make Caps Lock an additional Ctrl"
 msgstr "将 CapsLock 作为额外的 Ctrl"
 
-#: ../rules/base.xml.in.h:977
+#: ../rules/base.xml.in.h:949
 msgid "Alt/Win key behavior"
 msgstr "Alt/Win 键行为"
 
-#: ../rules/base.xml.in.h:978
+#: ../rules/base.xml.in.h:950
 msgid "Add the standard behavior to Menu key"
 msgstr "将标准行为添加到菜单键"
 
-#: ../rules/base.xml.in.h:979
+#: ../rules/base.xml.in.h:951
 msgid "Alt and Meta are on Alt keys"
 msgstr "Alt 和 Meta 都是 Alt 键"
 
@@ -3652,19 +3652,19 @@
 msgid "Ctrl is mapped to Alt keys, Alt is mapped to Win keys"
 msgstr ""
 
-#: ../rules/base.xml.in.h:983
+#: ../rules/base.xml.in.h:954
 msgid "Meta is mapped to Win keys"
 msgstr "Meta 被映射到 Win 键。"
 
-#: ../rules/base.xml.in.h:984
+#: ../rules/base.xml.in.h:955
 msgid "Meta is mapped to Left Win"
 msgstr "Meta 被映射到左 Win 键。"
 
-#: ../rules/base.xml.in.h:985
+#: ../rules/base.xml.in.h:956
 msgid "Hyper is mapped to Win-keys"
 msgstr "Hyper 被映射到 Win 键。"
 
-#: ../rules/base.xml.in.h:986
+#: ../rules/base.xml.in.h:957
 msgid "Alt is mapped to Right Win, Super to Menu"
 msgstr "Alt 键映射到右 Win，Super 映射到菜单键"
 
@@ -3704,49 +3704,49 @@
 msgid "3rd level of &lt;Less/Greater&gt;"
 msgstr ""
 
-#: ../rules/base.xml.in.h:996
+#: ../rules/base.xml.in.h:960
 msgid "Pause"
 msgstr "暂停"
 
-#: ../rules/base.xml.in.h:997
+#: ../rules/base.xml.in.h:961
 msgid "PrtSc"
 msgstr "截屏"
 
-#: ../rules/base.xml.in.h:998
+#: ../rules/base.xml.in.h:962
 msgid "Miscellaneous compatibility options"
 msgstr "其它兼容选项"
 
-#: ../rules/base.xml.in.h:999
+#: ../rules/base.xml.in.h:963
 msgid "Default numeric keypad keys"
 msgstr "默认数字小键盘键"
 
-#: ../rules/base.xml.in.h:1000
+#: ../rules/base.xml.in.h:964
 msgid "Numeric keypad keys always enter digits (as in Mac OS)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1001
+#: ../rules/base.xml.in.h:965
 msgid "Shift with numeric keypad keys works as in MS Windows"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1002
+#: ../rules/base.xml.in.h:966
 msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1003
+#: ../rules/base.xml.in.h:967
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
 msgstr "服务器处理的特殊键(Ctrl+Alt+&lt;key&gt;)"
 
-#: ../rules/base.xml.in.h:1004
+#: ../rules/base.xml.in.h:968
 msgid ""
 "Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num "
 "Lock)"
 msgstr "苹果铝键盘：模拟 PC 键(截屏、滚动锁定、暂停、数字锁定)"
 
-#: ../rules/base.xml.in.h:1005
+#: ../rules/base.xml.in.h:969
 msgid "Shift cancels Caps Lock"
 msgstr "Shift 取消大写锁定"
 
-#: ../rules/base.xml.in.h:1006
+#: ../rules/base.xml.in.h:970
 msgid "Enable extra typographic characters"
 msgstr ""
 
@@ -3767,163 +3767,163 @@
 msgid "Shift + NumLock toggles PointerKeys"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1011
+#: ../rules/base.xml.in.h:975
 msgid "Allow breaking grabs with keyboard actions (warning: security risk)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1012
+#: ../rules/base.xml.in.h:976
 msgid "Adding currency signs to certain keys"
 msgstr "向特定键添加货币符号"
 
-#: ../rules/base.xml.in.h:1013
+#: ../rules/base.xml.in.h:977
 msgid "Euro on E"
 msgstr "欧元符号在 E 键上"
 
-#: ../rules/base.xml.in.h:1014
+#: ../rules/base.xml.in.h:978
 msgid "Euro on 2"
 msgstr "欧元符号在 2 键上"
 
-#: ../rules/base.xml.in.h:1015
+#: ../rules/base.xml.in.h:979
 msgid "Euro on 4"
 msgstr "欧元符号在 4 键上"
 
-#: ../rules/base.xml.in.h:1016
+#: ../rules/base.xml.in.h:980
 msgid "Euro on 5"
 msgstr "欧元符号在 5 键上"
 
-#: ../rules/base.xml.in.h:1017
+#: ../rules/base.xml.in.h:981
 msgid "Rupee on 4"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1018
+#: ../rules/base.xml.in.h:982
 msgid "Key to choose 5th level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1019
+#: ../rules/base.xml.in.h:983
 msgid ""
 "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with "
 "another 5th-level-chooser"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1020
+#: ../rules/base.xml.in.h:984
 msgid ""
 "Right Alt chooses 5th level, locks when pressed together with another 5th-"
 "level-chooser"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1021
+#: ../rules/base.xml.in.h:985
 msgid ""
 "Left Win chooses 5th level, locks when pressed together with another 5th-"
 "level-chooser"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1022
+#: ../rules/base.xml.in.h:986
 msgid ""
 "Right Win chooses 5th level, locks when pressed together with another 5th-"
 "level-chooser"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1023
+#: ../rules/base.xml.in.h:987
 msgid "Using space key to input non-breakable space character"
 msgstr "使用空格键输入不可打断空白字符"
 
-#: ../rules/base.xml.in.h:1024
+#: ../rules/base.xml.in.h:988
 msgid "Usual space at any level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1025
+#: ../rules/base.xml.in.h:989
 msgid "Non-breakable space character at second level"
 msgstr "第二层的不可打断空白字符"
 
-#: ../rules/base.xml.in.h:1026
+#: ../rules/base.xml.in.h:990
 msgid "Non-breakable space character at third level"
 msgstr "第三层的不可打断空白字符"
 
-#: ../rules/base.xml.in.h:1027
+#: ../rules/base.xml.in.h:991
 msgid "Non-breakable space character at third level, nothing at fourth level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1028
+#: ../rules/base.xml.in.h:992
 msgid ""
 "Non-breakable space character at third level, thin non-breakable space "
 "character at fourth level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1029
+#: ../rules/base.xml.in.h:993
 msgid "Non-breakable space character at fourth level"
 msgstr "第四层的不可打断空白字符"
 
-#: ../rules/base.xml.in.h:1030
+#: ../rules/base.xml.in.h:994
 msgid ""
 "Non-breakable space character at fourth level, thin non-breakable space "
 "character at sixth level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1031
+#: ../rules/base.xml.in.h:995
 msgid ""
 "Non-breakable space character at fourth level, thin non-breakable space "
 "character at sixth level (via Ctrl+Shift)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1032
+#: ../rules/base.xml.in.h:996
 msgid "Zero-width non-joiner character at second level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1033
+#: ../rules/base.xml.in.h:997
 msgid ""
 "Zero-width non-joiner character at second level, zero-width joiner character "
 "at third level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1034
+#: ../rules/base.xml.in.h:998
 msgid ""
 "Zero-width non-joiner character at second level, zero-width joiner character "
 "at third level, non-breakable space character at fourth level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1035
+#: ../rules/base.xml.in.h:999
 msgid ""
 "Zero-width non-joiner character at second level, non-breakable space "
 "character at third level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1036
+#: ../rules/base.xml.in.h:1000
 msgid ""
 "Zero-width non-joiner character at second level, non-breakable space "
 "character at third level, nothing at fourth level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1037
+#: ../rules/base.xml.in.h:1001
 msgid ""
 "Zero-width non-joiner character at second level, non-breakable space "
 "character at third level, zero-width joiner at fourth level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1038
+#: ../rules/base.xml.in.h:1002
 msgid ""
 "Zero-width non-joiner character at second level, non-breakable space "
 "character at third level, thin non-breakable space at fourth level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1039
+#: ../rules/base.xml.in.h:1003
 msgid ""
 "Zero-width non-joiner character at third level, zero-width joiner at fourth "
 "level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1040
+#: ../rules/base.xml.in.h:1004
 msgid "Japanese keyboard options"
 msgstr "日语键盘选项"
 
-#: ../rules/base.xml.in.h:1041
+#: ../rules/base.xml.in.h:1005
 msgid "Kana Lock key is locking"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1042
+#: ../rules/base.xml.in.h:1006
 msgid "NICOLA-F style Backspace"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1043
+#: ../rules/base.xml.in.h:1007
 msgid "Make Zenkaku Hankaku an additional ESC"
 msgstr ""
 
@@ -3951,7 +3951,7 @@
 msgid "Sun Key compatibility"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1050
+#: ../rules/base.xml.in.h:1011
 msgid "Key sequence to kill the X server"
 msgstr "杀死 X 服务器的按键序列"
 
@@ -3987,11 +3987,11 @@
 msgid "Multilingual (Canada, Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:12
+#: ../rules/base.extras.xml.in.h:11
 msgid "German (US keyboard with German letters)"
 msgstr "德语(带德语字母的美式键盘)"
 
-#: ../rules/base.extras.xml.in.h:13
+#: ../rules/base.extras.xml.in.h:12
 msgid "German (with Hungarian letters and no dead keys)"
 msgstr ""
 
@@ -3999,11 +3999,11 @@
 msgid "German (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:17
+#: ../rules/base.extras.xml.in.h:15
 msgid "Avestan"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:20
+#: ../rules/base.extras.xml.in.h:18
 msgid "Lithuanian (US Dvorak with Lithuanian letters)"
 msgstr ""
 
@@ -4011,35 +4011,35 @@
 msgid "Lithuanian (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:24
+#: ../rules/base.extras.xml.in.h:21
 msgid "Latvian (US Dvorak)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:25
+#: ../rules/base.extras.xml.in.h:22
 msgid "Latvian (US Dvorak, Y variant)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:26
+#: ../rules/base.extras.xml.in.h:23
 msgid "Latvian (US Dvorak, minus variant)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:27
+#: ../rules/base.extras.xml.in.h:24
 msgid "Latvian (programmer US Dvorak)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:28
+#: ../rules/base.extras.xml.in.h:25
 msgid "Latvian (programmer US Dvorak, Y variant)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:29
+#: ../rules/base.extras.xml.in.h:26
 msgid "Latvian (programmer US Dvorak, minus variant)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:30
+#: ../rules/base.extras.xml.in.h:27
 msgid "Latvian (US Colemak)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:31
+#: ../rules/base.extras.xml.in.h:28
 msgid "Latvian (US Colemak, apostrophe variant)"
 msgstr ""
 
@@ -4047,15 +4047,15 @@
 msgid "Latvian (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:35
+#: ../rules/base.extras.xml.in.h:31
 msgid "English (US, international AltGr Unicode combining)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:36
+#: ../rules/base.extras.xml.in.h:32
 msgid "English (US, international AltGr Unicode combining, alternative)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:37
+#: ../rules/base.extras.xml.in.h:33
 msgid "Atsina"
 msgstr ""
 
@@ -4067,7 +4067,7 @@
 msgid "English (US, Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:42
+#: ../rules/base.extras.xml.in.h:37
 msgid "Polish (international with dead keys)"
 msgstr ""
 
@@ -4079,11 +4079,11 @@
 msgid "Polish (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:48
+#: ../rules/base.extras.xml.in.h:41
 msgid "Crimean Tatar (Dobruja Q)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:49
+#: ../rules/base.extras.xml.in.h:42
 msgid "Romanian (ergonomic Touchtype)"
 msgstr ""
 
@@ -4091,11 +4091,11 @@
 msgid "Romanian (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:53
+#: ../rules/base.extras.xml.in.h:45
 msgid "Serbian (combining accents instead of dead keys)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:56
+#: ../rules/base.extras.xml.in.h:48
 msgid "Russian (with Ukrainian-Belorussian layout)"
 msgstr ""
 
@@ -4103,7 +4103,7 @@
 msgid "Russian (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:60
+#: ../rules/base.extras.xml.in.h:51
 msgid "Armenian (OLPC phonetic)"
 msgstr ""
 
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/xz.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/xz.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/xz.po	2014-02-24 08:24:44.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/xz.po	2014-03-24 09:42:52.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2014-02-20 13:17+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 13:51+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: src/xz/args.c:337
 #, c-format
diff -Nru language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/zenmap.po language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/zenmap.po
--- language-pack-zh-hans-base-14.04+20140223/data/zh_CN/LC_MESSAGES/zenmap.po	2014-02-24 08:24:33.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/data/zh_CN/LC_MESSAGES/zenmap.po	2014-03-24 09:42:41.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 11:48+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-20 12:03+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: zenmapCore/NmapCommand.py:109
 msgid "Python 2.4 or later is required."
diff -Nru language-pack-zh-hans-base-14.04+20140223/debian/changelog language-pack-zh-hans-base-14.04+20140320/debian/changelog
--- language-pack-zh-hans-base-14.04+20140223/debian/changelog	2014-02-24 09:11:53.000000000 +0000
+++ language-pack-zh-hans-base-14.04+20140320/debian/changelog	2014-03-24 09:42:30.000000000 +0000
@@ -1,6 +1,6 @@
-language-pack-zh-hans-base (1:14.04+20140223) trusty; urgency=low
+language-pack-zh-hans-base (1:14.04+20140320) trusty; urgency=low
 
   * Initial Release.
 
- -- Ubuntu automatic language-pack builder <language-packs@ubuntu.com>  Mon, 24 Feb 2014 08:24:23 +0000
+ -- Ubuntu automatic language-pack builder <language-packs@ubuntu.com>  Mon, 24 Mar 2014 09:42:30 +0000